[ros-diffs] [reactos] 01/01: [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152)

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a04831677eaaf62a7d7a9…

commit a04831677eaaf62a7d7a99583f6f5e788687d9d2
Author:     Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com>
AuthorDate: Sun Sep 13 23:42:09 2020 +0200
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sun Sep 13 23:42:09 2020 +0200

    [PROGMAN][CRT][USER32] Do not use LoadLibraryEx() NT6+ flags (#3152)
    
    CORE-12004
---
 base/shell/progman/dialog.c              | 4 ++--
 sdk/lib/crt/misc/dbgrpt.cpp              | 2 +-
 win32ss/user/user32/windows/cursoricon.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/shell/progman/dialog.c b/base/shell/progman/dialog.c
index 3aebd71356f..452b1bc4c7b 100644
--- a/base/shell/progman/dialog.c
+++ b/base/shell/progman/dialog.c
@@ -586,7 +586,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
             SetDlgItemTextW(hDlg, PM_ICON_FILE, pIconContext->szName);
             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)
             {
                 EnumResourceNamesW(pIconContext->hLibrary,
@@ -635,7 +635,7 @@ DIALOG_SYMBOL_DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
lParam)
 
                     SetDlgItemTextW(hDlg, PM_ICON_FILE, filename);
                     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)
                     {
                         EnumResourceNamesW(pIconContext->hLibrary,
diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp
index 9259ff8edab..a349687d475 100644
--- a/sdk/lib/crt/misc/dbgrpt.cpp
+++ b/sdk/lib/crt/misc/dbgrpt.cpp
@@ -113,7 +113,7 @@ HMODULE _CrtGetUser32()
 {
     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)
             mod = (HMODULE)INVALID_HANDLE_VALUE;
 
diff --git a/win32ss/user/user32/windows/cursoricon.c
b/win32ss/user/user32/windows/cursoricon.c
index ad0ac4d6d05..e64e0374a17 100644
--- a/win32ss/user/user32/windows/cursoricon.c
+++ b/win32ss/user/user32/windows/cursoricon.c
@@ -1866,7 +1866,7 @@ CURSORICON_CopyImage(
             ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" :
ustrRsrc.Buffer);
 
         /* 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)
         {
             DWORD err = GetLastError();