Changeset 797 in dev for branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp

Timestamp:

Feb 1, 2011, 11:13:15 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

プロパティシート周りを9x対応させた

File:

• branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp (modified) (7 diffs)

branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp

@@ -35 +35 @@
 }
 
-void* GetResource(HINSTANCE hinst, USHORT id, LPCTSTR type)
+HICON LoadIconCursorImpl(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load, bool isIcon)
+{
+    auto pResource = LoadResourceAlt(hinst, id, isIcon ? RT_GROUP_ICON : RT_GROUP_CURSOR);
+
+    auto idIcon = LookupIconIdFromDirectoryEx(reinterpret_cast<PBYTE>(pResource), isIcon, cxDesired, cyDesired, load);
+    auto icon = LoadResourceAltWithSize(hinst, numeric_cast<USHORT>(idIcon), isIcon ? RT_ICON : RT_CURSOR);
+
+    return CreateIconFromResourceEx(reinterpret_cast<PBYTE>(icon.first),
+        icon.second, isIcon, 0x00030000, cxDesired, cyDesired, load);
+}
+
+} // unnamed namespace
+
+void* LoadResourceAlt(HINSTANCE hinst, USHORT id, LPCTSTR type)
 {
     if (auto hrsrc = ::FindResource(hinst, MAKEINTRESOURCE(id), type))
@@ -47 +60 @@
 }
 
-std::pair<void*, DWORD> GetResourceWithSize(HINSTANCE hinst, USHORT id, LPCTSTR type)
+std::pair<void*, DWORD> LoadResourceAltWithSize(HINSTANCE hinst, USHORT id, LPCTSTR type)
 {
     typedef std::pair<void*, DWORD> result_type;
@@ -64 +77 @@
     return result_type(nullptr, 0);
 }
-
-HICON LoadIconCursorImpl(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load, bool isIcon)
-{
-    auto pResource = GetResource(hinst, id, isIcon ? RT_GROUP_ICON : RT_GROUP_CURSOR);
-
-    auto idIcon = LookupIconIdFromDirectoryEx(reinterpret_cast<PBYTE>(pResource), isIcon, cxDesired, cyDesired, load);
-    auto icon = GetResourceWithSize(hinst, numeric_cast<USHORT>(idIcon), isIcon ? RT_ICON : RT_CURSOR);
-
-    return CreateIconFromResourceEx(reinterpret_cast<PBYTE>(icon.first),
-        icon.second, isIcon, 0x00030000, cxDesired, cyDesired, load);
-}
-
-} // unnamed namespace
 
 HICON LoadIconAlt(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load)
@@ -152 +152 @@
     using namespace boost::adaptors;
 
-    auto accel = GetResourceWithSize(hinst, id, RT_ACCELERATOR);
+    auto accel = LoadResourceAltWithSize(hinst, id, RT_ACCELERATOR);
     if (accel.first == nullptr)
     {
@@ -173 +173 @@
 HMENU LoadMenuAlt(HINSTANCE hinst, USHORT id)
 {
-    return LoadMenuIndirect(GetResource(hinst, id, RT_MENU));
+    return LoadMenuIndirect(LoadResourceAlt(hinst, id, RT_MENU));
 }
 
 INT_PTR DialogBoxAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam)
 {
-    auto dlgTemplate = static_cast<DLGTEMPLATE*>(GetResource(hinst, id, RT_DIALOG));
+    auto dlgTemplate = static_cast<DLGTEMPLATE*>(LoadResourceAlt(hinst, id, RT_DIALOG));
     return ::DialogBoxIndirectParam(hinst, dlgTemplate, hwndParent, dialogFunc, initParam);
 }
@@ -184 +184 @@
 HWND CreateDialogAlt(HINSTANCE hinst, USHORT id, HWND hwndParent, DLGPROC dialogFunc, LPARAM initParam)
 {
-    auto dlgTemplate = static_cast<DLGTEMPLATE*>(GetResource(hinst, id, RT_DIALOG));
+    auto dlgTemplate = static_cast<DLGTEMPLATE*>(LoadResourceAlt(hinst, id, RT_DIALOG));
     return ::CreateDialogIndirectParam(hinst, dlgTemplate, hwndParent, dialogFunc, initParam);
 }
@@ -191 +191 @@
 {
     WTL::CDC dc = ::GetDC(nullptr);
-    auto pbi = static_cast<BITMAPINFO const*>(GetResource(hinst, id, RT_BITMAP));
+    auto pbi = static_cast<BITMAPINFO const*>(LoadResourceAlt(hinst, id, RT_BITMAP));
     return CreateDIBitmap(dc, &pbi->bmiHeader, CBM_INIT, reinterpret_cast<BYTE const*>(pbi) + pbi->bmiHeader.biSize, pbi, DIB_RGB_COLORS);
 }