From d7cdc02db3b80ecbf77a6d03e16bf887b24961e8 Mon Sep 17 00:00:00 2001 From: phantom Date: Tue, 1 Jan 2013 18:14:14 +0100 Subject: [PATCH] Fix windows? --- src/arch/LoadingWindow/LoadingWindow_Win32.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp index 82de0c98f6..034f60d4a1 100644 --- a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp +++ b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp @@ -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 )