Changeset 782 in dev for branches/egtra

Timestamp:

Jan 29, 2011, 3:39:34 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

アイコン読込のテストのコードを整理。

Location:

branches/egtra/ab5.0/abdev

Files:

• ab-test/ab-test.cpp (modified) (4 diffs)
• ab-test/ab-test.vcxproj (modified) (4 diffs)
• abdev-impl/Resource/Load.cpp (modified) (2 diffs)

branches/egtra/ab5.0/abdev/ab-test/ab-test.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+#include <cstdint>
+#include <cstring>
 
 #include <GdiPlus.h>
@@ -6 +9 @@
 
 #include <boost/test/unit_test.hpp>
+
+#include <boost/preprocessor/cat.hpp>
 
 #include <Resource/Load.h>
@@ -27 +32 @@
 typedef std::unique_ptr<HMODULE, HModuleDeleter> UniqueHModule;
 
+template<typename F>
+struct ScopeExitHolder
+{   
+    ScopeExitHolder(F f) : f(f) {}
+
+    ~ScopeExitHolder()
+    {
+        f();
+    }
+
+private:
+    F f;
+
+    ScopeExitHolder(ScopeExitHolder const&);
+    ScopeExitHolder& operator =(ScopeExitHolder const&);
+};
+
+#define AB_SCOPE_EXIT_2(f) auto BOOST_PP_CAT(AB_SCOPE_EXIT_FUNCTION_TEMP_, __LINE__) = (f); \
+    ScopeExitHolder<decltype(BOOST_PP_CAT(AB_SCOPE_EXIT_FUNCTION_TEMP_, __LINE__))> BOOST_PP_CAT(AB_SCOPE_EXIT_FUNCTION_HOLDER_, __LINE__)_ (BOOST_PP_CAT(AB_SCOPE_EXIT_FUNCTION_TEMP_, __LINE__));
+#define AB_SCOPE_EXIT(f) AB_SCOPE_EXIT_2([&]() f)
+
+template<typename F>
+ScopeExitHolder<F> ScopeExit(F fn)
+{
+    return fn;
+}
+
+#define GET_AT(bd, y, x) (*reinterpret_cast<DWORD const*>(static_cast<BYTE const*>((bd).Scan0) + (y) * bdL.Stride + (x) * sizeof (DWORD)))
+
 bool IconEquals(HICON hiconL, HICON hiconR)
 {
+    Gdiplus::Bitmap bmpL(hiconL), bmpR(hiconR);
+
+    if (bmpL.GetWidth() == bmpR.GetWidth()
+        && bmpR.GetHeight() == bmpR.GetHeight())
+    {
+        Gdiplus::Rect rc(0, 0, bmpL.GetWidth(), bmpL.GetHeight());
+        Gdiplus::BitmapData bdL = {}, bdR = {};
+        BOOST_CHECK_EQUAL(bmpL.LockBits(&rc, Gdiplus::ImageLockModeRead, PixelFormat32bppARGB, &bdL), Gdiplus::Ok);
+        BOOST_CHECK_EQUAL(bmpR.LockBits(&rc, Gdiplus::ImageLockModeRead, PixelFormat32bppARGB, &bdR), Gdiplus::Ok);
+        
+        AB_SCOPE_EXIT({bmpL.UnlockBits(&bdL);});
+        AB_SCOPE_EXIT({bmpR.UnlockBits(&bdR);});
+
+        if (bdL.Width == bdR.Width && bdL.Height == bdR.Height)
+        {
+            for (UINT i = 0; i < bdL.Height; ++i)
+            {
+                if (std::memcmp(
+                    static_cast<BYTE const*>(bdL.Scan0) + i * bdL.Stride,
+                    static_cast<BYTE const*>(bdR.Scan0) + i * bdR.Stride,
+                    bdL.Width * sizeof (std::uint32_t)) != 0)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
     return false;
 }
@@ -34 +96 @@
 BOOST_AUTO_TEST_CASE( ResourceLoading )
 {
+    Gdiplus::GdiplusStartupInput gdiplusStartupInput;
+
+    ULONG_PTR gdiplusToken;
+    Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, nullptr);
+    AB_SCOPE_EXIT_2(std::bind(Gdiplus::GdiplusShutdown, gdiplusToken));
+
     TCHAR moduleName[MAX_PATH];
     ::GetModuleFileName(nullptr, moduleName, MAX_PATH);

branches/egtra/ab5.0/abdev/ab-test/ab-test.vcxproj

@@ -91 +91 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -103 +104 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -119 +121 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -135 +138 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

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

@@ -9 +9 @@
     auto pResource = LockResource(hMem);
 
-    int idIcon = LookupIconIdFromDirectoryEx(reinterpret_cast<PBYTE>(pResource), TRUE, cxDesired, cyDesired, load);
+    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);
@@ -15 +15 @@
 
     return CreateIconFromResourceEx(reinterpret_cast<PBYTE>(pResourceIcon),
-        SizeofResource(hinst, hrsrcIcon), TRUE, 0x00030000,
-        cxDesired, cyDesired, load);
+        SizeofResource(hinst, hrsrcIcon), TRUE, 0x00030000, cxDesired, cyDesired, load);
 }