This is my first real look at these conversions, so if they are wrong please let me know why. This may well be somewhere i can actually do work on until i can become familiar with the internals of wine. Then i can do some real work. Changelog Fix some unicode->ascii calls -- Matthew Davison <m.davison@virgin.net>
? diff.txt Index: mdi.c =================================================================== RCS file: /home/wine/wine/windows/mdi.c,v retrieving revision 1.106 diff -u -r1.106 mdi.c --- mdi.c 22 Nov 2002 21:22:15 -0000 1.106 +++ mdi.c 23 Nov 2002 21:54:39 -0000 @@ -1705,8 +1705,8 @@ break; case SC_RESTORE: case SC_MINIMIZE: - SetWindowLongA( hwnd, GWL_STYLE, - GetWindowLongA( hwnd, GWL_STYLE ) | WS_SYSMENU ); + SetWindowLongW( hwnd, GWL_STYLE, + GetWindowLongW( hwnd, GWL_STYLE ) | WS_SYSMENU ); break; case SC_MAXIMIZE: if (ci->hwndChildMaximized == hwnd) Index: msgbox.c =================================================================== RCS file: /home/wine/wine/windows/msgbox.c,v retrieving revision 1.40 diff -u -r1.40 msgbox.c --- msgbox.c 11 Nov 2002 19:52:33 -0000 1.40 +++ msgbox.c 23 Nov 2002 21:54:44 -0000 @@ -441,7 +441,9 @@ { LPVOID tmplate; HRSRC hRes; - HMODULE hUser32 = GetModuleHandleA("user32.dll"); + HMODULE hUser32; + static const WCHAR user32_res_nameW[] = { 'u','s','e','r','3','2','.','d','l','l',0 }; + hUser32 = GetModuleHandleW(user32_res_nameW); static const WCHAR msg_box_res_nameW[] = { 'M','S','G','B','O','X',0 }; if (!(hRes = FindResourceExW(hUser32, RT_DIALOGW, msg_box_res_nameW, msgbox->dwLanguageId))) return 0; Index: nonclient.c =================================================================== RCS file: /home/wine/wine/windows/nonclient.c,v retrieving revision 1.105 diff -u -r1.105 nonclient.c --- nonclient.c 22 Nov 2002 21:22:15 -0000 1.105 +++ nonclient.c 23 Nov 2002 21:54:50 -0000 @@ -345,11 +345,11 @@ if (hFont) hOldFont = SelectObject (hdc, hFont); else { - NONCLIENTMETRICSA nclm; + NONCLIENTMETRICSW nclm; HFONT hNewFont; nclm.cbSize = sizeof(NONCLIENTMETRICSA); - SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0); - hNewFont = CreateFontIndirectA ((uFlags & DC_SMALLCAP) ? + SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0); + hNewFont = CreateFontIndirectW ((uFlags & DC_SMALLCAP) ? &nclm.lfSmCaptionFont : &nclm.lfCaptionFont); hOldFont = SelectObject (hdc, hNewFont); } Index: win.c =================================================================== RCS file: /home/wine/wine/windows/win.c,v retrieving revision 1.210 diff -u -r1.210 win.c --- win.c 22 Nov 2002 21:22:14 -0000 1.210 +++ win.c 23 Nov 2002 21:55:02 -0000 @@ -1335,7 +1335,7 @@ WCHAR buffer[256]; if(!instance) - instance=GetModuleHandleA(NULL); + instance=GetModuleHandleW(NULL); if(exStyle & WS_EX_MDICHILD) return CreateMDIWindowW(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);