diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp index 0765238062..c5e275903b 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp @@ -12,15 +12,7 @@ BOOL CALLBACK LoadingWindow_Win32::WndProc( HWND hWnd, UINT msg, WPARAM wParam, LoadingWindow_Win32::LoadingWindow_Win32() { - handle = NULL; - hwnd = NULL; - - /* Little trick to get an HINSTANCE of ourself without having access to the hwnd ... */ - TCHAR szFullAppPath[MAX_PATH]; - GetModuleFileName(NULL, szFullAppPath, MAX_PATH); - handle = LoadLibrary(szFullAppPath); - - hwnd = CreateDialog(handle, MAKEINTRESOURCE(IDD_LOADING_DIALOG), NULL, WndProc); + hwnd = CreateDialog(handle.Get(), MAKEINTRESOURCE(IDD_LOADING_DIALOG), NULL, WndProc); SetText("Initializing hardware..."); Paint(); @@ -30,8 +22,6 @@ LoadingWindow_Win32::~LoadingWindow_Win32() { if(hwnd) EndDialog(hwnd, 0); - if(handle) - FreeLibrary(handle); } void LoadingWindow_Win32::Paint() diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h index d1b2f435b1..4d8ca33668 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.h @@ -4,9 +4,10 @@ /* Loading window using a Windows dialog. */ #include "LoadingWindow.h" #include +#include "../../archutils/Win32/AppInstance.h" class LoadingWindow_Win32: public LoadingWindow { - HINSTANCE handle; + AppInstance handle; HWND hwnd; CString text;