Fix windows?

2013-01-01 18:14:14 +01:00
parent 5fa1e3d2a0
commit d7cdc02db3
1 changed files with 13 additions and 1 deletions
@@ -20,7 +20,7 @@
 static HBITMAP g_hBitmap = NULL;

 /* Load a RageSurface into a GDI surface. */
-static HBITMAP LoadWin32Surface( const RageSurface *pSplash, HWND hwnd )
+static HBITMAP LoadWin32Surface( const RageSurface *pSplash, HWND hWnd )
 {
 	RageSurface *s;
 	if( !RageSurfaceUtils::ConvertSurface( pSplash, s,
@@ -73,6 +73,18 @@ static HBITMAP LoadWin32Surface( const RageSurface *pSplash, HWND hwnd )
 	return bitmap;
 }

+static HBITMAP LoadWin32Surface( RString sFile, HWND hWnd )
+{
+        RString error;
+        RageSurface *pSurface = RageSurfaceUtils::LoadFile( sFile, error );
+        if( pSurface == NULL )
+                return NULL;
+
+        HBITMAP ret = LoadWin32Surface( pSurface, hWnd );
+        delete pSurface;
+        return ret;
+}
+
 BOOL CALLBACK LoadingWindow_Win32::WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	switch( msg )