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

Timestamp:

Jan 30, 2011, 12:58:28 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

abdevにおいて、resについてアイコン・カーソルを自前関数での読込へ変更。

File:

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

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

@@ -1 +1 @@
 #include "stdafx.h"
+#include <map>
+#include <tuple>
+#include <Resource/Load.h>
 
 namespace ActiveBasic { namespace Resource {
 
+namespace {
+
+template<typename Map, typename Key, typename AddValueFunctor>
+typename Map::iterator GetCacheFromMap(Map& map, Key key, AddValueFunctor f)
+{
+    auto low = map.lower_bound(key);
+    if (low != map.end() && map.key_comp()(key, low->first))
+    {
+        return low;
+    }
+    else
+    {
+        typedef typename Map::key_type key_type;
+        typedef typename Map::value_type value_type;
+        return map.insert(low, std::make_pair(std::move(key), f()));
+    }
+}
+
+HICON LoadIconCursorImpl(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load, bool isIcon)
+{
+    auto hrsrc = FindResource(hinst, MAKEINTRESOURCE(id), isIcon ? RT_GROUP_ICON : RT_GROUP_CURSOR);
+    auto pResource = LockResource(LoadResource(hinst, hrsrc));
+
+    auto idIcon = LookupIconIdFromDirectoryEx(reinterpret_cast<PBYTE>(pResource), isIcon, cxDesired, cyDesired, load);
+    auto hrsrcIcon = FindResource(hinst, MAKEINTRESOURCE(idIcon), isIcon ? RT_ICON : RT_CURSOR);
+    auto pResourceIcon = LockResource(LoadResource(hinst, hrsrcIcon));
+
+    return CreateIconFromResourceEx(reinterpret_cast<PBYTE>(pResourceIcon),
+        SizeofResource(hinst, hrsrcIcon), isIcon, 0x00030000, cxDesired, cyDesired, load);
+}
+
+}
+
 HICON LoadIcon(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load)
 {
-    auto hrsrc = FindResource(hinst, MAKEINTRESOURCE(id), RT_GROUP_ICON);
-    auto hMem = LoadResource(hinst, hrsrc);
-    auto pResource = LockResource(hMem);
+    return LoadIconCursorImpl(hinst, id, cxDesired, cyDesired, load, true);
+}
 
-    auto idIcon = LookupIconIdFromDirectoryEx(reinterpret_cast<PBYTE>(pResource), TRUE, cxDesired, cyDesired, load);
-    auto hrsrcIcon = FindResource(hinst, MAKEINTRESOURCE(idIcon), MAKEINTRESOURCE(RT_ICON));
-    auto hIconMem = LoadResource(hinst, hrsrcIcon);
-    auto pResourceIcon = LockResource(hIconMem);
+HICON LoadIcon(HINSTANCE hinst, USHORT id)
+{
+    return LoadIconCursorImpl(hinst, id, 32, 32, LR_SHARED, true);
+}
 
-    return CreateIconFromResourceEx(reinterpret_cast<PBYTE>(pResourceIcon),
-        SizeofResource(hinst, hrsrcIcon), TRUE, 0x00030000, cxDesired, cyDesired, load);
+HCURSOR LoadCursor(HINSTANCE hinst, USHORT id)
+{
+    return LoadIconCursorImpl(hinst, id, 32, 32, LR_SHARED, false);
 }