Changeset 789 in dev for branches/egtra/ab5.0/abdev/ab-test

Timestamp:

Jan 30, 2011, 2:19:10 AM (14 years ago)

Author:

イグトランス (egtra)

Message:

LoadString代替関数の実装

File:

• branches/egtra/ab5.0/abdev/ab-test/ab-test.cpp (modified) (3 diffs)

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

@@ -72 +72 @@
         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);});
@@ -94 +94 @@
 }
 
-BOOST_AUTO_TEST_CASE( ResourceLoading )
+UniqueHModule LoadABModule(LPCWSTR name)
+{
+    TCHAR moduleName[MAX_PATH];
+    ::GetModuleFileName(nullptr, moduleName, MAX_PATH);
+
+    auto systemDir = fs::path(moduleName).parent_path().parent_path() / L"build/release/system";
+
+    UniqueHModule hmodRes(::LoadLibraryExW((systemDir / name).wstring().c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE));
+    BOOST_CHECK(hmodRes != nullptr);
+    return hmodRes;
+}
+
+BOOST_AUTO_TEST_CASE( IconResourceLoading )
 {
     Gdiplus::GdiplusStartupInput gdiplusStartupInput;
@@ -102 +114 @@
     AB_SCOPE_EXIT_2(std::bind(Gdiplus::GdiplusShutdown, gdiplusToken));
 
-    TCHAR moduleName[MAX_PATH];
-    ::GetModuleFileName(nullptr, moduleName, MAX_PATH);
+    UniqueHModule hmodRes = LoadABModule(L"res.dll");
 
-    auto systemDir = fs::path(moduleName).parent_path().parent_path() / "build/release/system";
+    auto hBasicProgramIconL = (HICON)::LoadImage(hmodRes.get(), MAKEINTRESOURCE(IDI_BASICPROGRAM), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+    auto hBasicProgramIconR = abres::LoadIcon(hmodRes.get(), IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
 
-    UniqueHModule hmodRes(::LoadLibraryExW((systemDir / "res.dll").wstring().c_str(), nullptr, LOAD_LIBRARY_AS_DATAFILE));
-    BOOST_CHECK(hmodRes != nullptr);
+    BOOST_CHECK(hBasicProgramIconL != nullptr);
+    BOOST_CHECK(hBasicProgramIconR != nullptr);
 
-    auto hBasicProgramIconTarget = (HICON)LoadImage(hmodRes.get(), MAKEINTRESOURCE(IDI_BASICPROGRAM), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
-    auto hBasicProgramIcon = abres::LoadIcon(hmodRes.get(), IDI_BASICPROGRAM, 16, 16, LR_DEFAULTCOLOR);
+    BOOST_CHECK(IconEquals(hBasicProgramIconL, hBasicProgramIconR));
 
-    BOOST_CHECK(hBasicProgramIconTarget != nullptr);
-    BOOST_CHECK(hBasicProgramIcon != nullptr);
+    auto hcurL = ::LoadCursor(hmodRes.get(), MAKEINTRESOURCE(IDC_CURSOR_PEN));
+    auto hcurR = abres::LoadCursor(hmodRes.get(), IDC_CURSOR_PEN);
 
-    BOOST_CHECK(IconEquals(hBasicProgramIconTarget, hBasicProgramIcon));
+    BOOST_CHECK(hcurL != nullptr);
+    BOOST_CHECK(hcurR != nullptr);
 
+    //BOOST_CHECK(IconEquals(hcurL, hcurR));
 }
+
+BOOST_AUTO_TEST_CASE( StringResourceLoading )
+{
+    UniqueHModule hmodRes = LoadABModule(L"res.dll");
+
+    WCHAR strL[1024];
+    ::LoadStringW(hmodRes.get(), IDS_DEV_GROUP, strL, ARRAYSIZE(strL));
+
+    boost::optional<std::wstring> strR = abres::LoadString(hmodRes.get(), IDS_DEV_GROUP);
+
+    BOOST_CHECK(!!strR);
+    BOOST_CHECK(strL == *strR);
+}