mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 10:41:12 +00:00
Fix some unicode->ascii calls.
This commit is contained in:
parent
af53e11fa0
commit
3f17416ad2
4 changed files with 10 additions and 7 deletions
|
@ -1705,8 +1705,8 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
|
|||
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)
|
||||
|
|
|
@ -441,8 +441,11 @@ INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox )
|
|||
{
|
||||
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 };
|
||||
static const WCHAR msg_box_res_nameW[] = { 'M','S','G','B','O','X',0 };
|
||||
|
||||
hUser32 = GetModuleHandleW(user32_res_nameW);
|
||||
if (!(hRes = FindResourceExW(hUser32, RT_DIALOGW, msg_box_res_nameW, msgbox->dwLanguageId)))
|
||||
return 0;
|
||||
if (!(tmplate = (LPVOID)LoadResource(hUser32, hRes)))
|
||||
|
|
|
@ -345,11 +345,11 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
|
|||
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);
|
||||
}
|
||||
|
|
|
@ -1335,7 +1335,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className,
|
|||
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);
|
||||
|
|
Loading…
Reference in a new issue