[PATCH 1/2] shlwapi: Refactor the SHCreateWorkerWindowW() prototype to match its ANSI SHCreateWorkerWindowA() counterpart.

Hermès BÉLUSCA-MAÏTO <[email protected]> Mon, 12 Feb 2018 23:49:16 +0100
Newsgroups gmane.comp.emulators.wine.patches
Message-ID <[email protected]>
This is a multipart message in MIME format.

------=_NextPart_000_0001_01D3A45C.17F9F500
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

[PATCH 1/2] shlwapi: Refactor the SHCreateWorkerWindowW() prototype to =
match
its ANSI SHCreateWorkerWindowA() counterpart.

The last parameter is really to be understood as an extra window data, =
and
not a "message result" (as it would be the case for dialog window
procedure).
That is why I also remove the mention of "DWLP_MSGRESULT" in the
SetWindowLongPtrW() call.
SHCreateWorkerWindowA() had it OK but SHCreateWorkerWindowW() did not.


Best,
Herm=E8s B=E9lusca-Ma=EFto

------=_NextPart_000_0001_01D3A45C.17F9F500
Content-Type: application/octet-stream;
	name="0001-shlwapi-Refactor-the-SHCreateWorkerWindowW-prototype.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="0001-shlwapi-Refactor-the-SHCreateWorkerWindowW-prototype.patch"

From 74b6195792415b65f8dc991017010b92e02d9f18 Mon Sep 17 00:00:00 2001=0A=
From: Hermes Belusca-Maito <[email protected]>=0A=
Date: Mon, 12 Feb 2018 23:33:58 +0100=0A=
Subject: [PATCH 1/2] shlwapi: Refactor the SHCreateWorkerWindowW() =
prototype=0A=
 to match its ANSI SHCreateWorkerWindowA() counterpart.=0A=
=0A=
The last parameter is really to be understood as an extra window data, =
and not a "message result" (as it would be the case for dialog window =
procedure).=0A=
That is why I also remove the mention of "DWLP_MSGRESULT" in the =
SetWindowLongPtrW() call.=0A=
SHCreateWorkerWindowA() had it OK but SHCreateWorkerWindowW() did not.=0A=
=0A=
Signed-off-by: Hermes Belusca-Maito <[email protected]>=0A=
---=0A=
 dlls/shlwapi/ordinal.c | 8 ++++----=0A=
 1 file changed, 4 insertions(+), 4 deletions(-)=0A=
=0A=
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c=0A=
index 334607eda9..3d9c4f71a5 100644=0A=
--- a/dlls/shlwapi/ordinal.c=0A=
+++ b/dlls/shlwapi/ordinal.c=0A=
@@ -2865,20 +2865,20 @@ DWORD WINAPI WhichPlatform(void)=0A=
  * Unicode version of SHCreateWorkerWindowA.=0A=
  */=0A=
 HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD =
dwExStyle,=0A=
-                        DWORD dwStyle, HMENU hMenu, LONG msg_result)=0A=
+                                  DWORD dwStyle, HMENU hMenu, LONG =
wnd_extra)=0A=
 {=0A=
   static const WCHAR szClass[] =3D { 'W', 'o', 'r', 'k', 'e', 'r', 'W', =
0 };=0A=
   WNDCLASSW wc;=0A=
   HWND hWnd;=0A=
 =0A=
   TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n",=0A=
-         wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result);=0A=
+         wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra);=0A=
 =0A=
   /* If our OS is natively ANSI, use the ANSI version */=0A=
   if (GetVersion() & 0x80000000)  /* not NT */=0A=
   {=0A=
     TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion());=0A=
-    return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, =
dwStyle, hMenu, msg_result);=0A=
+    return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, =
dwStyle, hMenu, wnd_extra);=0A=
   }=0A=
 =0A=
   /* Create Window class */=0A=
@@ -2899,7 +2899,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, =
HWND hWndParent, DWORD dwExStyle=0A=
                          hWndParent, hMenu, shlwapi_hInstance, 0);=0A=
   if (hWnd)=0A=
   {=0A=
-    SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result);=0A=
+    SetWindowLongPtrW(hWnd, 0, wnd_extra);=0A=
 =0A=
     if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc);=0A=
   }=0A=
-- =0A=
2.15.1.windows.2=0A=
=0A=

------=_NextPart_000_0001_01D3A45C.17F9F500
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

Cg==

------=_NextPart_000_0001_01D3A45C.17F9F500--