Module: wine Branch: master Commit: 8831a79e902d583422d8c0f35b7f0f139e9769f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8831a79e902d583422d8c0f35b...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Sat Nov 18 14:21:29 2006 +0000
user32: Cast-qual warnings fix.
---
dlls/user32/dialog.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index aa6dc40..7d64790 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -285,20 +285,24 @@ static BOOL DIALOG_CreateControls32( HWN } else { - LPSTR class = (LPSTR)info.className; - LPSTR caption = (LPSTR)info.windowName; + LPCSTR class = (LPCSTR)info.className; + LPCSTR caption = (LPCSTR)info.windowName; + LPSTR class_tmp = NULL; + LPSTR caption_tmp = NULL;
if (HIWORD(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.className, -1, NULL, 0, NULL, NULL ); - class = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, info.className, -1, class, len, NULL, NULL ); + class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, info.className, -1, class_tmp, len, NULL, NULL ); + class = class_tmp; } if (HIWORD(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, NULL, 0, NULL, NULL ); - caption = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, caption, len, NULL, NULL ); + caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, caption_tmp, len, NULL, NULL ); + caption = caption_tmp; } hwndCtrl = CreateWindowExA( info.exStyle | WS_EX_NOPARENTNOTIFY, class, caption, info.style | WS_CHILD, @@ -308,8 +312,8 @@ static BOOL DIALOG_CreateControls32( HWN MulDiv(info.cy, dlgInfo->yBaseUnit, 8), hwnd, (HMENU)info.id, hInst, (LPVOID)info.data ); - if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); - if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); + HeapFree( GetProcessHeap(), 0, class_tmp ); + HeapFree( GetProcessHeap(), 0, caption_tmp ); } if (!hwndCtrl) { @@ -595,26 +599,30 @@ static HWND DIALOG_CreateIndirect( HINST } else { - LPSTR class = (LPSTR)template.className; - LPSTR caption = (LPSTR)template.caption; + LPCSTR class = (LPCSTR)template.className; + LPCSTR caption = (LPCSTR)template.caption; + LPSTR class_tmp = NULL; + LPSTR caption_tmp = NULL;
if (HIWORD(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.className, -1, NULL, 0, NULL, NULL ); - class = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, template.className, -1, class, len, NULL, NULL ); + class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, template.className, -1, class_tmp, len, NULL, NULL ); + class = class_tmp; } if (HIWORD(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.caption, -1, NULL, 0, NULL, NULL ); - caption = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption, len, NULL, NULL ); + caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); + WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption_tmp, len, NULL, NULL ); + caption = caption_tmp; } hwnd = CreateWindowExA(template.exStyle, class, caption, template.style & ~WS_VISIBLE, pos.x, pos.y, size.cx, size.cy, owner, hMenu, hInst, NULL ); - if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); - if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); + HeapFree( GetProcessHeap(), 0, class_tmp ); + HeapFree( GetProcessHeap(), 0, caption_tmp ); }
if (!hwnd)
-
Alexandre Julliard