projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace GetModuleHandle("user32.dll") with User32Instance.
[reactos.git]
/
reactos
/
lib
/
user32
/
windows
/
messagebox.c
diff --git
a/reactos/lib/user32/windows/messagebox.c
b/reactos/lib/user32/windows/messagebox.c
index
a98c2de
..
54795ff
100644
(file)
--- a/
reactos/lib/user32/windows/messagebox.c
+++ b/
reactos/lib/user32/windows/messagebox.c
@@
-196,7
+196,6
@@
MessageBoxTimeoutIndirectW(
DLGITEMTEMPLATE *iico, *itxt;
NONCLIENTMETRICSW nclm;
WCHAR capbuf[32];
DLGITEMTEMPLATE *iico, *itxt;
NONCLIENTMETRICSW nclm;
WCHAR capbuf[32];
- HMODULE hUser32;
LPVOID buf;
BYTE *dest;
LPCWSTR caption, text;
LPVOID buf;
BYTE *dest;
LPCWSTR caption, text;
@@
-213,11
+212,9
@@
MessageBoxTimeoutIndirectW(
BOOL defbtn = FALSE;
DWORD units = GetDialogBaseUnits();
BOOL defbtn = FALSE;
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];
}
else
caption = &capbuf[0];
}
else
@@
-335,34
+332,34
@@
MessageBoxTimeoutIndirectW(
switch(Buttons[i])
{
case IDOK:
switch(Buttons[i])
{
case IDOK:
- LoadStringW(
hUser32
, IDS_OK, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_OK, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDCANCEL:
break;
case IDCANCEL:
- LoadStringW(
hUser32
, IDS_CANCEL, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_CANCEL, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDYES:
break;
case IDYES:
- LoadStringW(
hUser32
, IDS_YES, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_YES, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDNO:
break;
case IDNO:
- LoadStringW(
hUser32
, IDS_NO, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_NO, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDTRYAGAIN:
break;
case IDTRYAGAIN:
- LoadStringW(
hUser32
, IDS_TRYAGAIN, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_TRYAGAIN, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDCONTINUE:
break;
case IDCONTINUE:
- LoadStringW(
hUser32
, IDS_CONTINUE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_CONTINUE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDABORT:
break;
case IDABORT:
- LoadStringW(
hUser32
, IDS_ABORT, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_ABORT, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDRETRY:
break;
case IDRETRY:
- LoadStringW(
hUser32
, IDS_RETRY, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_RETRY, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDIGNORE:
break;
case IDIGNORE:
- LoadStringW(
hUser32
, IDS_IGNORE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_IGNORE, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
case IDHELP:
break;
case IDHELP:
- LoadStringW(
hUser32
, IDS_HELP, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
+ LoadStringW(
User32Instance
, IDS_HELP, ButtonText[i], MSGBOXEX_MAXBTNSTR - 1);
break;
default:
ButtonText[i][0] = (WCHAR)0;
break;
default:
ButtonText[i][0] = (WCHAR)0;