Piotr Caban : hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified.

Alexandre Julliard julliard at winehq.org
Fri Nov 3 18:05:39 CDT 2017


Module: wine
Branch: master
Commit: ace66d3540d7d3d93344545a91143e02fcbda91a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ace66d3540d7d3d93344545a91143e02fcbda91a

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu Nov  2 19:39:05 2017 +0100

hhctrl.ocx: Set window owner in HtmlHelp function if WS_CHILD flag is not specified.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/hhctrl.ocx/help.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 5fd7634..c7a2a7a 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -1603,7 +1603,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 
 static BOOL HH_CreateHelpWindow(HHInfo *info)
 {
-    HWND hWnd, parent = 0;
+    HWND hWnd;
     RECT winPos = info->WinType.rcWindowPos;
     WNDCLASSEXW wcex;
     DWORD dwStyles, dwExStyles;
@@ -1677,11 +1677,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
     caption = info->WinType.pszCaption;
     if (!*caption) caption = info->pCHMInfo->defTitle;
 
-    if (info->WinType.dwStyles & WS_CHILD)
-        parent = info->WinType.hwndCaller;
-
-    hWnd = CreateWindowExW(dwExStyles, windowClassW, caption,
-                           dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL);
+    hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, dwStyles, x, y, width, height,
+                           info->WinType.hwndCaller, NULL, hhctrl_hinstance, NULL);
     if (!hWnd)
         return FALSE;
 




More information about the wine-cvs mailing list