[ros-diffs] [reactos] 01/01: [SHELL32][SDK] Follow-up of #5840 (ad5df2d)

[Katayama Hirofumi MZ]

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

commit a52c713755dca32bd4da647a4a56c416e5ed7ad4
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sat Oct 28 21:31:11 2023 +0900
Commit:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
CommitDate: Sat Oct 28 21:31:11 2023 +0900

    [SHELL32][SDK] Follow-up of #5840 (ad5df2d)
    
    Fix the parameters of Activate_RunDLL.
---
 dll/win32/shell32/shell32.spec   |  2 +-
 dll/win32/shell32/utils.cpp      | 24 ++++++++++++------------
 sdk/include/reactos/undocshell.h |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec
index 2aabb8efb2a..dbdbfabd758 100644
--- a/dll/win32/shell32/shell32.spec
+++ b/dll/win32/shell32/shell32.spec
@@ -101,7 +101,7 @@
 102 stdcall SHCoCreateInstance(wstr ptr long ptr ptr)
 103 stdcall SignalFileOpen(ptr)
 104 stdcall OpenAs_RunDLLW(long long wstr long)
-105 stdcall Activate_RunDLL(long ptr ptr ptr)
+105 stdcall Activate_RunDLL(ptr ptr wstr long)
 106 stdcall AppCompat_RunDLLW(ptr ptr wstr long)
 107 stdcall CheckEscapesA(str long)
 108 stdcall CheckEscapesW(wstr long)
diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp
index 7007ee78ca2..94b25e49bde 100644
--- a/dll/win32/shell32/utils.cpp
+++ b/dll/win32/shell32/utils.cpp
@@ -587,20 +587,20 @@ SHOpenPropSheetA(
 EXTERN_C
 BOOL WINAPI
 Activate_RunDLL(
-    _In_ DWORD dwUnused1,
-    _In_ LPVOID lpUnused2,
-    _In_ LPVOID lpUnused3,
-    _In_ LPVOID lpUnused4)
+    _In_ HWND hwnd,
+    _In_ HINSTANCE hinst,
+    _In_ LPCWSTR cmdline,
+    _In_ INT cmdshow)
 {
-    DWORD dwPID;
+    DWORD dwProcessID;
 
-    UNREFERENCED_PARAMETER(dwUnused1);
-    UNREFERENCED_PARAMETER(lpUnused2);
-    UNREFERENCED_PARAMETER(lpUnused3);
-    UNREFERENCED_PARAMETER(lpUnused4);
+    UNREFERENCED_PARAMETER(hwnd);
+    UNREFERENCED_PARAMETER(hinst);
+    UNREFERENCED_PARAMETER(cmdline);
+    UNREFERENCED_PARAMETER(cmdshow);
 
-    TRACE("(%lu, %p, %p, %p)\n", dwUnused1, lpUnused2, lpUnused3, lpUnused4);
+    TRACE("(%p, %p, %s, %d)\n", hwnd, hinst, debugstr_w(cmdline), cmdline);
 
-    GetWindowThreadProcessId(GetShellWindow(), &dwPID);
-    return AllowSetForegroundWindow(dwPID);
+    GetWindowThreadProcessId(GetShellWindow(), &dwProcessID);
+    return AllowSetForegroundWindow(dwProcessID);
 }
diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h
index b0391380d80..95cc7b6998b 100644
--- a/sdk/include/reactos/undocshell.h
+++ b/sdk/include/reactos/undocshell.h
@@ -722,10 +722,10 @@ BOOL WINAPI IsSuspendAllowed(VOID);
 
 BOOL WINAPI
 Activate_RunDLL(
-    _In_ DWORD dwUnused1,
-    _In_ LPVOID lpUnused2,
-    _In_ LPVOID lpUnused3,
-    _In_ LPVOID lpUnused4);
+    _In_ HWND hwnd,
+    _In_ HINSTANCE hinst,
+    _In_ LPCWSTR cmdline,
+    _In_ INT cmdshow);
 
 /*****************************************************************************
  * Shell32 resources