https://git.reactos.org/?p=reactos.git;a=commitdiff;h=345ad55319f410b50942994a0ccef6174d61f351
commit 345ad55319f410b50942994a0ccef6174d61f351 Author: Serge Gautherie <[email protected]> AuthorDate: Tue Sep 15 13:56:51 2020 +0200 Commit: GitHub <[email protected]> CommitDate: Tue Sep 15 14:56:51 2020 +0300 [BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192) --- dll/win32/browseui/addressband.cpp | 6 +++--- dll/win32/browseui/toolsband.cpp | 4 ++-- win32ss/user/user32/windows/cursoricon.c | 2 +- win32ss/user/user32/windows/menu.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/browseui/addressband.cpp b/dll/win32/browseui/addressband.cpp index 820773495fe..2f0dfe36619 100644 --- a/dll/win32/browseui/addressband.cpp +++ b/dll/win32/browseui/addressband.cpp @@ -548,10 +548,10 @@ void CAddressBand::CreateGoButton() HINSTANCE shellInstance; shellInstance = _AtlBaseModule.GetResourceInstance(); - m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | diff --git a/dll/win32/browseui/toolsband.cpp b/dll/win32/browseui/toolsband.cpp index 5e98f7b2f1a..d0eb76a0dc7 100644 --- a/dll/win32/browseui/toolsband.cpp +++ b/dll/win32/browseui/toolsband.cpp @@ -290,11 +290,11 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){ SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), + MAKEINTRESOURCEW(IDB_SHELL_EXPLORER_LG), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), - MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), + MAKEINTRESOURCEW(IDB_SHELL_EXPLORER_LG_HOT), 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c index e64e0374a17..6299c839006 100644 --- a/win32ss/user/user32/windows/cursoricon.c +++ b/win32ss/user/user32/windows/cursoricon.c @@ -2615,7 +2615,7 @@ BOOL WINAPI SetSystemCursor( { if (hcur == NULL) { - hcur = LoadImageW( 0, MAKEINTRESOURCE(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE ); + hcur = LoadImageW(NULL, MAKEINTRESOURCEW(id), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE); if (hcur == NULL) { return FALSE; diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index 231c2f78ae7..59c687f4c3a 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -669,7 +669,7 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength) Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - Result = (LRESULT)LoadMenuW( Common->hModule, Common->InterSource ? MAKEINTRESOURCE(Common->InterSource) : (LPCWSTR)&Common->MenuName); + Result = (LRESULT)LoadMenuW(Common->hModule, Common->InterSource ? MAKEINTRESOURCEW(Common->InterSource) : (LPCWSTR)&Common->MenuName); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); }
