commit 0f2f2b34fa0cb1ca710951fdda710903524a6dcf
author Rein Klazes <rklazes@xs4all.nl> Wed Jan 09 19:09:06 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 09 19:09:06 2002 +0000
tree 02f1e7c94da335929cb46c907ee714ab023ba168
parent 19d66cc1f6f72a9fe0a0065119a0fee095be7a1f

Move calling of CBT hooks from WIN_CreateWindowEx() to the driver.

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index 6348963..59b3725 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -961,7 +961,7 @@
     INT sw = SW_SHOW;
     struct tagCLASS *classPtr;
     WND *wndPtr;
-    HWND hwnd, hwndLinkAfter, parent, owner;
+    HWND hwnd, parent, owner;
     INT wndExtra;
     DWORD clsStyle;
     WNDPROC winproc;
@@ -1067,32 +1067,6 @@
 
     if (wndExtra) memset( wndPtr->wExtra, 0, wndExtra);
 
-    /* Call the WH_CBT hook */
-
-    hwndLinkAfter = ((cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD)
- ? HWND_BOTTOM : HWND_TOP;
-
-    if (HOOK_IsHooked( WH_CBT ))
-    {
-	CBT_CREATEWNDA cbtc;
-        LRESULT ret;
-
-	cbtc.lpcs = cs;
-	cbtc.hwndInsertAfter = hwndLinkAfter;
-        ret = (type == WIN_PROC_32W) ? HOOK_CallHooksW(WH_CBT, HCBT_CREATEWND,
-                                                       (WPARAM)hwnd, (LPARAM)&cbtc)
-                                     : HOOK_CallHooksA(WH_CBT, HCBT_CREATEWND,
-                                                       (WPARAM)hwnd, (LPARAM)&cbtc);
-        if (ret)
-	{
-	    TRACE("CBT-hook returned 0\n");
-            free_window_handle( hwnd );
-            CLASS_RemoveWindow( classPtr );
-            WIN_ReleaseWndPtr(wndPtr);
-            return 0;
-	}
-    }
-
     /* Correct the window style - stage 2 */
 
     if (!(cs->style & WS_CHILD))