apply to custom images too

wiktorwiktor12 · Mar 2, 2025 · fe6eae2 · fe6eae2
1 parent 8189aac
commit fe6eae2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 12 deletions.
diff --git a/ConsoleLogonUI/util/util.cpp b/ConsoleLogonUI/util/util.cpp
@@ -3,29 +3,21 @@
 #include <wincodec.h>
 #include <wincodecsdk.h>
 
-HBITMAP GetHBITMAPFromImageResource(int resourceID)
+HBITMAP ScaleBitmapToRes(HBITMAP oldBitmap)
 {
-	static auto SHCreateStreamOnModuleResourceW = (HRESULT(WINAPI*)(HMODULE hModule, LPCWSTR pwszName, LPCWSTR pwszType, IStream * *ppStream))(GetProcAddress(LoadLibrary(L"shcore.dll"), (PCSTR)109));
-
-	IStream* Stream = 0;
-	HRESULT hr = SHCreateStreamOnModuleResourceW(duiManager::Get()->hInstance, MAKEINTRESOURCEW(resourceID), L"IMAGE", &Stream);
-	if (FAILED(hr))
-	{
-		return 0;
-	}
 	Gdiplus::GdiplusStartupInput gpStartupInput;
 	ULONG_PTR gpToken;
 	Gdiplus::GdiplusStartup(&gpToken, &gpStartupInput, NULL);
 
-	Gdiplus::Bitmap* bitmap = Gdiplus::Bitmap::FromStream(Stream);
+	Gdiplus::Bitmap* bitmap = Gdiplus::Bitmap::FromHBITMAP(oldBitmap, 0);
 
 	HBITMAP hbitmap = 0;
 
 	if (bitmap)
 	{
 		UINT newWidth = GetSystemMetrics(SM_CXSCREEN);
 		UINT newHeight = GetSystemMetrics(SM_CYSCREEN);
-		Gdiplus::Bitmap bitmap2 = Gdiplus::Bitmap(newWidth,newHeight,PixelFormat32bppARGB);
+		Gdiplus::Bitmap bitmap2 = Gdiplus::Bitmap(newWidth, newHeight, PixelFormat32bppARGB);
 
 		Gdiplus::Graphics* graphic = Gdiplus::Graphics::FromImage(&bitmap2);
 		if (graphic)
@@ -38,7 +30,7 @@ HBITMAP GetHBITMAPFromImageResource(int resourceID)
 			UINT oldWidth = bitmap->GetWidth();
 			UINT oldHeight = bitmap->GetHeight();
 
-			graphic->DrawImage(bitmap, Gdiplus::Rect(0,0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)), 0,0, bitmap->GetWidth(), bitmap->GetHeight(), Gdiplus::Unit::UnitPixel, &attributes, (Gdiplus::DrawImageAbort)0, 0);
+			graphic->DrawImage(bitmap, Gdiplus::Rect(0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)), 0, 0, bitmap->GetWidth(), bitmap->GetHeight(), Gdiplus::Unit::UnitPixel, &attributes, (Gdiplus::DrawImageAbort)0, 0);
 
 			bitmap2.GetHBITMAP(Gdiplus::Color(0xFF000000), &hbitmap);
 
@@ -47,6 +39,36 @@ HBITMAP GetHBITMAPFromImageResource(int resourceID)
 
 		delete bitmap;
 	}
+	Gdiplus::GdiplusShutdown(gpToken);
+
+	return hbitmap;
+}
+
+HBITMAP GetHBITMAPFromImageResource(int resourceID)
+{
+	static auto SHCreateStreamOnModuleResourceW = (HRESULT(WINAPI*)(HMODULE hModule, LPCWSTR pwszName, LPCWSTR pwszType, IStream * *ppStream))(GetProcAddress(LoadLibrary(L"shcore.dll"), (PCSTR)109));
+
+	IStream* Stream = 0;
+	HRESULT hr = SHCreateStreamOnModuleResourceW(duiManager::Get()->hInstance, MAKEINTRESOURCEW(resourceID), L"IMAGE", &Stream);
+	if (FAILED(hr))
+	{
+		return 0;
+	}
+	Gdiplus::GdiplusStartupInput gpStartupInput;
+	ULONG_PTR gpToken;
+	Gdiplus::GdiplusStartup(&gpToken, &gpStartupInput, NULL);
+
+	Gdiplus::Bitmap* bitmap = Gdiplus::Bitmap::FromStream(Stream);
+
+	HBITMAP hbitmap = 0;
+
+	if (bitmap)
+	{
+		bitmap->GetHBITMAP(Gdiplus::Color(0xFF000000), &hbitmap);
+
+		//inefficient, but i cba to clean up my usage of gdiplus
+		hbitmap = ScaleBitmapToRes(hbitmap);
+	}
 	Stream->Release();
 	Gdiplus::GdiplusShutdown(gpToken);
 

diff --git a/ConsoleLogonUI/util/util.h b/ConsoleLogonUI/util/util.h
@@ -63,6 +63,7 @@ static std::vector<std::wstring> split(std::wstring s, std::wstring delimiter)
     return res;
 }
 
+HBITMAP ScaleBitmapToRes(HBITMAP oldBitmap);
 static HBITMAP GetHBITMAPFromImageFile(WCHAR* pFilePath)
 {
     Gdiplus::GdiplusStartupInput gpStartupInput;
@@ -73,6 +74,7 @@ static HBITMAP GetHBITMAPFromImageFile(WCHAR* pFilePath)
     if (bitmap)
     {
         bitmap->GetHBITMAP(Gdiplus::Color(255, 255, 255), &result);
+        result = ScaleBitmapToRes(result);
         delete bitmap;
     }
     Gdiplus::GdiplusShutdown(gpToken);