[HHCTRL.OCX] Sync with Wine 3.0. CORE-14225
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 18 Jan 2018 23:21:29 +0000 (00:21 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 18 Jan 2018 23:21:29 +0000 (00:21 +0100)
dll/win32/hhctrl.ocx/help.c
media/doc/README.WINE

index 3f3d2ff..add3b74 100644 (file)
@@ -1596,7 +1596,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;
@@ -1670,11 +1670,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;
 
index 4cc97bd..d6031a5 100644 (file)
@@ -69,7 +69,7 @@ reactos/dll/win32/faultrep            # Synced to WineStaging-2.9
 reactos/dll/win32/fontsub             # Synced to WineStaging-2.9
 reactos/dll/win32/fusion              # Synced to Wine-3.0
 reactos/dll/win32/gdiplus             # Synced to Wine-3.0
-reactos/dll/win32/hhctrl.ocx          # Synced to WineStaging-2.9
+reactos/dll/win32/hhctrl.ocx          # Synced to Wine-3.0
 reactos/dll/win32/hlink               # Synced to WineStaging-2.9
 reactos/dll/win32/hnetcfg             # Synced to WineStaging-2.9
 reactos/dll/win32/httpapi             # Synced to WineStaging-2.9