Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152)

Browse source 
CORE-12004
This commit is contained in:
Serge Gautherie 2020-09-13 23:42:09 +02:00 • committed by GitHub
parent aad9bb8e8a
commit a04831677e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
base/shell/progman/dialog.c
View file

@ -586,7 +586,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName); SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName);
SendMessageA(pIconContext->hDlgCtrl, LB_SETITEMHEIGHT, 0, 32); SendMessageA(pIconContext->hDlgCtrl, LB_SETITEMHEIGHT, 0, 32);
pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); pIconContext->hLibrary = LoadLibraryExW(pIconContext->szName, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE);
if (pIconContext->hLibrary) if (pIconContext->hLibrary)
{ {
EnumResourceNamesW(pIconContext->hLibrary, EnumResourceNamesW(pIconContext->hLibrary,
@ -635,7 +635,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetDlgItemTextW(hDlg, PM_ICON_FILE, filename); SetDlgItemTextW(hDlg, PM_ICON_FILE, filename);
DestroyIconList(pIconContext->hDlgCtrl); DestroyIconList(pIconContext->hDlgCtrl);
pIconContext->hLibrary = LoadLibraryExW(filename, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); pIconContext->hLibrary = LoadLibraryExW(filename, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE);
if (pIconContext->hLibrary) if (pIconContext->hLibrary)
{ {
EnumResourceNamesW(pIconContext->hLibrary, EnumResourceNamesW(pIconContext->hLibrary,

2
sdk/lib/crt/misc/dbgrpt.cpp
View file

@ -113,7 +113,7 @@ HMODULE _CrtGetUser32()
{ {
if (_CrtUser32Handle == NULL) if (_CrtUser32Handle == NULL)
{ {
HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); HMODULE mod = LoadLibraryExW(L"user32.dll", NULL, 0 /* NT6+: LOAD_LIBRARY_SEARCH_SYSTEM32 */);
if (mod == NULL) if (mod == NULL)
mod = (HMODULE)INVALID_HANDLE_VALUE; mod = (HMODULE)INVALID_HANDLE_VALUE;

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

@ -1866,7 +1866,7 @@ CURSORICON_CopyImage(
ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer);
/* Get the module handle or load the module */ /* Get the module handle or load the module */
hModule = LoadLibraryExW(ustrModule.Buffer, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); hModule = LoadLibraryExW(ustrModule.Buffer, NULL, /* NT6+: LOAD_LIBRARY_AS_IMAGE_RESOURCE | */ LOAD_LIBRARY_AS_DATAFILE);
if (!hModule) if (!hModule)
{ {
DWORD err = GetLastError(); DWORD err = GetLastError();