mirror of
https://github.com/reactos/reactos.git
synced 2024-09-15 23:28:15 +00:00
Replace GetModuleHandle("user32.dll") with User32Instance.
svn path=/trunk/; revision=20122
This commit is contained in:
parent
fca11cd62d
commit
26846ce596
|
@ -349,7 +349,7 @@ static BOOL MDI_MenuDeleteItem( HWND client, HWND hWndChild )
|
||||||
if (clientInfo->nActiveChildren - 1 > MDI_MOREWINDOWSLIMIT)
|
if (clientInfo->nActiveChildren - 1 > MDI_MOREWINDOWSLIMIT)
|
||||||
{
|
{
|
||||||
WCHAR szTmp[50];
|
WCHAR szTmp[50];
|
||||||
LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
|
LoadStringW(User32Instance, IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
|
||||||
AppendMenuW(clientInfo->hWindowMenu, MF_STRING, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT, szTmp);
|
AppendMenuW(clientInfo->hWindowMenu, MF_STRING, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT, szTmp);
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -680,7 +680,7 @@ static HWND MDICreateChild( HWND parent, MDICLIENTINFO *ci,
|
||||||
if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1)
|
if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1)
|
||||||
{
|
{
|
||||||
WCHAR szTmp[50];
|
WCHAR szTmp[50];
|
||||||
LoadStringW(GetModuleHandleA("USER32"), IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
|
LoadStringW(User32Instance, IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
|
||||||
|
|
||||||
ModifyMenuW(ci->hWindowMenu,
|
ModifyMenuW(ci->hWindowMenu,
|
||||||
ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
|
ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
|
||||||
|
@ -2391,12 +2391,12 @@ static HWND MDI_MoreWindowsDialog(HWND hwnd)
|
||||||
HRSRC hRes;
|
HRSRC hRes;
|
||||||
HANDLE hDlgTmpl;
|
HANDLE hDlgTmpl;
|
||||||
|
|
||||||
hRes = FindResourceA(GetModuleHandleA("USER32"), "MDI_MOREWINDOWS", (LPSTR)RT_DIALOG);
|
hRes = FindResourceA(User32Instance, "MDI_MOREWINDOWS", (LPSTR)RT_DIALOG);
|
||||||
|
|
||||||
if (hRes == 0)
|
if (hRes == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
hDlgTmpl = LoadResource(GetModuleHandleA("USER32"), hRes );
|
hDlgTmpl = LoadResource(User32Instance, hRes);
|
||||||
|
|
||||||
if (hDlgTmpl == 0)
|
if (hDlgTmpl == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2406,7 +2406,7 @@ static HWND MDI_MoreWindowsDialog(HWND hwnd)
|
||||||
if (template == 0)
|
if (template == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return (HWND) DialogBoxIndirectParamA(GetModuleHandleA("USER32"),
|
return (HWND) DialogBoxIndirectParamA(User32Instance,
|
||||||
(LPDLGTEMPLATE) template,
|
(LPDLGTEMPLATE) template,
|
||||||
hwnd, MDI_MoreWindowsDlgProc, (LPARAM) hwnd);
|
hwnd, MDI_MoreWindowsDlgProc, (LPARAM) hwnd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1043,9 +1043,7 @@ NTSTATUS STDCALL
|
||||||
User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength)
|
User32LoadSysMenuTemplateForKernel(PVOID Arguments, ULONG ArgumentLength)
|
||||||
{
|
{
|
||||||
LRESULT Result;
|
LRESULT Result;
|
||||||
HMODULE hUser32;
|
Result = (LRESULT)LoadMenuW(User32Instance, L"SYSMENU");
|
||||||
hUser32 = GetModuleHandleW(L"USER32");
|
|
||||||
Result = (LRESULT)LoadMenuW(hUser32, L"SYSMENU");
|
|
||||||
return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS));
|
return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -196,7 +196,6 @@ MessageBoxTimeoutIndirectW(
|
||||||
DLGITEMTEMPLATE *iico, *itxt;
|
DLGITEMTEMPLATE *iico, *itxt;
|
||||||
NONCLIENTMETRICSW nclm;
|
NONCLIENTMETRICSW nclm;
|
||||||
WCHAR capbuf[32];
|
WCHAR capbuf[32];
|
||||||
HMODULE hUser32;
|
|
||||||
LPVOID buf;
|
LPVOID buf;
|
||||||
BYTE *dest;
|
BYTE *dest;
|
||||||
LPCWSTR caption, text;
|
LPCWSTR caption, text;
|
||||||
|
@ -213,11 +212,9 @@ MessageBoxTimeoutIndirectW(
|
||||||
BOOL defbtn = FALSE;
|
BOOL defbtn = FALSE;
|
||||||
DWORD units = GetDialogBaseUnits();
|
DWORD units = GetDialogBaseUnits();
|
||||||
|
|
||||||
hUser32 = GetModuleHandleW(L"USER32");
|
|
||||||
|
|
||||||
if(!lpMsgBoxParams->lpszCaption || !HIWORD((LPWSTR)lpMsgBoxParams->lpszCaption))
|
if(!lpMsgBoxParams->lpszCaption || !HIWORD((LPWSTR)lpMsgBoxParams->lpszCaption))
|
||||||
{
|
{
|
||||||
LoadStringW(hUser32, IDS_ERROR, &capbuf[0], 32);
|
LoadStringW(User32Instance, IDS_ERROR, &capbuf[0], 32);
|
||||||
caption = &capbuf[0];
|
caption = &capbuf[0];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -335,34 +332,34 @@ MessageBoxTimeoutIndirectW(
|
||||||
switch(Buttons[i])
|
switch(Buttons[i])
|
||||||
{
|
{
|
||||||
case IDOK:
|
case IDOK:
|
||||||
LoadStringW(hUser32, IDS_OK, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_OK, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDCANCEL:
|
case IDCANCEL:
|
||||||
LoadStringW(hUser32, IDS_CANCEL, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_CANCEL, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDYES:
|
case IDYES:
|
||||||
LoadStringW(hUser32, IDS_YES, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_YES, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDNO:
|
case IDNO:
|
||||||
LoadStringW(hUser32, IDS_NO, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_NO, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDTRYAGAIN:
|
case IDTRYAGAIN:
|
||||||
LoadStringW(hUser32, IDS_TRYAGAIN, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_TRYAGAIN, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDCONTINUE:
|
case IDCONTINUE:
|
||||||
LoadStringW(hUser32, IDS_CONTINUE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_CONTINUE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDABORT:
|
case IDABORT:
|
||||||
LoadStringW(hUser32, IDS_ABORT, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_ABORT, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDRETRY:
|
case IDRETRY:
|
||||||
LoadStringW(hUser32, IDS_RETRY, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_RETRY, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDIGNORE:
|
case IDIGNORE:
|
||||||
LoadStringW(hUser32, IDS_IGNORE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_IGNORE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
case IDHELP:
|
case IDHELP:
|
||||||
LoadStringW(hUser32, IDS_HELP, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
LoadStringW(User32Instance, IDS_HELP, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ButtonText[i][0] = (WCHAR)0;
|
ButtonText[i][0] = (WCHAR)0;
|
||||||
|
|
Loading…
Reference in a new issue