Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI][USER32] Explicitly use MAKEINTRESOURCEW() for consistency (#3192)

Browse source
This commit is contained in:
Serge Gautherie 2020-09-15 13:56:51 +02:00 committed by GitHub
parent b43e4c981e
commit 345ad55319
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/browseui/addressband.cpp
View file

@ -548,10 +548,10 @@ void CAddressBand::CreateGoButton()
HINSTANCE shellInstance; HINSTANCE shellInstance;
shellInstance = _AtlBaseModule.GetResourceInstance(); shellInstance = _AtlBaseModule.GetResourceInstance();
m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCEW(IDB_GOBUTTON_NORMAL),
20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT),
20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); 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 | fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS |
WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER |

4
dll/win32/browseui/toolsband.cpp
View file

@ -290,11 +290,11 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){
SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS);
m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), 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); 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), 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); 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal);

2
win32ss/user/user32/windows/cursoricon.c
View file

@ -2615,7 +2615,7 @@ BOOL WINAPI SetSystemCursor(
{ {
if (hcur == NULL) 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) if (hcur == NULL)
{ {
return FALSE; return FALSE;

2
win32ss/user/user32/windows/menu.c
View file

@ -669,7 +669,7 @@ User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength)
Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; 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); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS);
} }