Changeset 1306 for trunk/src

Timestamp:

Oct 15, 1999, 11:26:23 AM (26 years ago)

Author:

sandervl

Message:

hook + scrollbar bugfixes

Location:

trunk/src/user32

Files:

• hooks.cpp (modified) (6 diffs)
• pmwindow.cpp (modified) (2 diffs)
• scroll.cpp (modified) (2 diffs)

trunk/src/user32/hooks.cpp

@@ -1 @@
-/* $Id: hooks.cpp,v 1.5 1999-09-15 23:18:50 sandervl Exp $ */
+/* $Id: hooks.cpp,v 1.6 1999-10-15 09:26:21 sandervl Exp $ */
 
 /*
@@ -239 +239 @@
 
   switch(message) {
-        case WM_CREATE:
+//      case WM_CREATE:
         case WM_NCCREATE:
 #ifdef DEBUG
@@ -247 +247 @@
                 createwnd.hwndInsertAfter = createwnd.lpcs->hwndParent; //TODO: not correct
                 return(pCallback(HCBT_CREATEWND, hwnd, (LPARAM)&createwnd));
+//SvL: Only send it once during WM_NCCREATE
+#if 0
         case WM_INITDIALOG:
 #ifdef DEBUG
@@ -261 +263 @@
                 createwnd.hwndInsertAfter = GetParent(hwnd); //TODO: not correct
                 return(pCallback(HCBT_CREATEWND, hwnd, (LPARAM)&createwnd));
-        case WM_DESTROY:
+#endif
+
+//      case WM_DESTROY:
         case WM_NCDESTROY:
 #ifdef DEBUG
@@ -267 +271 @@
 #endif
                 return(pCallback(HCBT_DESTROYWND, hwnd, 0));
-        case WM_ACTIVATE:
+//      case WM_ACTIVATE:
         case WM_NCACTIVATE:
 #ifdef DEBUG
@@ -823 +827 @@
  LRESULT   rc;
 
-#ifdef DEBUG
-  WriteLog("MsgFilterProc\n");
-#endif
+//  dprintf(("MsgFilterProc\n"));
   while(hook != NULL) {
         if(hook->fRecursive == FALSE) {

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.28 1999-10-14 19:31:31 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.29 1999-10-15 09:26:22 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -202 +202 @@
         if(win32wnd->MsgCreate(WinQueryWindow(hwnd, QW_PARENT), hwnd) == FALSE)
         {
-            delete win32wnd;
             RestoreOS2TIB();
             return (MRESULT)TRUE; //discontinue window creation

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.7 1999-10-08 21:25:47 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.8 1999-10-15 09:26:23 sandervl Exp $ */
 /*
  * Scrollbar control
@@ -1114 +1114 @@
 
     default:
-        if (message >= WM_USER)
+//SvL: BUGFIX: Send WM_NCCREATE to defwndproc, return value 0 cancels window creation!
+//        if (message >= WM_USER)
             //WARN("unknown msg %04x wp=%04x lp=%08lx\n",
             //             message, wParam, lParam );