Commit 95bcd517 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Fixed some warnings.

parent c77ff5ef
...@@ -1465,7 +1465,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol ) ...@@ -1465,7 +1465,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
if (ret) if (ret)
lpChCol->rgbResult = lpcc->rgbResult; lpChCol->rgbResult = lpcc->rgbResult;
if (lpcc->lpTemplateName) HeapFree(GetProcessHeap(), 0, lpcc->lpTemplateName); if (lpcc->lpTemplateName) HeapFree(GetProcessHeap(), 0, (LPSTR)lpcc->lpTemplateName);
HeapFree(GetProcessHeap(), 0, lpcc); HeapFree(GetProcessHeap(), 0, lpcc);
return ret; return ret;
} }
...@@ -277,7 +277,6 @@ int WINAPIV ShellMessageBoxW( ...@@ -277,7 +277,6 @@ int WINAPIV ShellMessageBoxW(
va_list args; va_list args;
va_start(args, uType); va_start(args, uType);
/* wvsprintfA(buf,fmt, args); */ /* wvsprintfA(buf,fmt, args); */
va_end(args);
TRACE("(%08lx,%08lx,%p,%p,%08x)\n", TRACE("(%08lx,%08lx,%p,%p,%08x)\n",
(DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType);
...@@ -292,7 +291,11 @@ int WINAPIV ShellMessageBoxW( ...@@ -292,7 +291,11 @@ int WINAPIV ShellMessageBoxW(
else else
pszText = lpText; pszText = lpText;
FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,szText,0,0,szTemp,256,args); FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
szText, 0, 0, szTemp, 256, (LPDWORD) args);
va_end(args);
return MessageBoxW(hWnd,szTemp,szTitle,uType); return MessageBoxW(hWnd,szTemp,szTitle,uType);
} }
...@@ -312,7 +315,6 @@ int WINAPIV ShellMessageBoxA( ...@@ -312,7 +315,6 @@ int WINAPIV ShellMessageBoxA(
va_list args; va_list args;
va_start(args, uType); va_start(args, uType);
/* wvsprintfA(buf,fmt, args); */ /* wvsprintfA(buf,fmt, args); */
va_end(args);
TRACE("(%08lx,%08lx,%p,%p,%08x)\n", TRACE("(%08lx,%08lx,%p,%p,%08x)\n",
(DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType); (DWORD)hInstance,(DWORD)hWnd,lpText,lpCaption,uType);
...@@ -327,7 +329,11 @@ int WINAPIV ShellMessageBoxA( ...@@ -327,7 +329,11 @@ int WINAPIV ShellMessageBoxA(
else else
pszText = lpText; pszText = lpText;
FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,szText,0,0,szTemp,256,args); FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
szText, 0, 0, szTemp, 256, (LPDWORD) args);
va_end(args);
return MessageBoxA(hWnd,szTemp,szTitle,uType); return MessageBoxA(hWnd,szTemp,szTitle,uType);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment