Changeset 645 for trunk/src

Timestamp:

Aug 23, 1999, 3:07:56 PM (26 years ago)

Author:

phaller

Message:

Fix: GetClassInfoA fails on querying system classes. Win32Proc constructor crashed.

File:

• trunk/src/user32/wndproc.cpp (modified) (8 diffs)

trunk/src/user32/wndproc.cpp

@@ -1 @@
-/* $Id: wndproc.cpp,v 1.14 1999-07-22 13:18:14 sandervl Exp $ */
+/* $Id: wndproc.cpp,v 1.15 1999-08-23 13:07:10 phaller Exp $ */
 
 /*
@@ -116 +116 @@
                         : hwnd(0), next(NULL), os2dlg(NULL), pOS2Callback(NULL)
 {
- WNDCLASSA wc;
- BOOL rc;
+  WNDCLASSA wc;
+  BOOL rc;
 
   rc = GetClassInfoA(hinst, lpszClassName, &wc);
-  assert(rc == TRUE);
-
-//  pCallback = Win32WindowClass::GetClassCallback(hinst, (LPSTR)wc.lpszClassName);
-  pCallback = Win32WindowClass::GetClassCallback((LPSTR)wc.lpszClassName);
-//test (8nov)
-  if(pCallback == NULL) {//system class
+  if (rc == FALSE)
+  {
+    dprintf (("USER32:WNDPROC: GetClassInfoA(%s) failed.",
+              lpszClassName));
+  }
+  else
+  {
+    //  pCallback = Win32WindowClass::GetClassCallback(hinst, (LPSTR)wc.lpszClassName);
+    pCallback = Win32WindowClass::GetClassCallback((LPSTR)wc.lpszClassName);
+    if(pCallback == NULL) //system class
         pCallback = (WNDPROC)wc.lpfnWndProc;
   }
-//  assert(pCallback != NULL);
 
   //Insert it in front of the rest
@@ -145 +148 @@
 {
   Win32WindowProc *window = Win32WindowProc::windows;
-  
+
   /* @@@PH 98/07/13 what's this whole code good for ? */
-  if(window == this) 
+  if(window == this)
   {
     windows = next;
   }
-  else 
+  else
   {
     /* @@@PH 98/07/13 window can be NULL */
     if (window != NULL)
-      while(window->next != NULL) 
+      while(window->next != NULL)
       {
-        if(window->next == this) 
+        if(window->next == this)
         {
           window->next = next;
@@ -165 +168 @@
       }
   }
-  
-  if(os2dlg) 
+
+  if(os2dlg)
   {
     DeleteWin32DlgTemplate(os2dlg);
@@ -251 +254 @@
 {
   PostSpyMessage(hwnd, Msg, wParam, lParam);
-  return pCallback(hwnd, Msg, wParam, lParam);  
+  return pCallback(hwnd, Msg, wParam, lParam);
 }
 //******************************************************************************
@@ -313 +316 @@
   SetWin32TIB();
 
-  if(Msg == WM_MOUSEACTIVATE) 
+  if(Msg == WM_MOUSEACTIVATE)
   {
         //Open32 sends an OS/2 window message for a button click
@@ -329 +332 @@
         return(0);
   }
- 
+
   curwnd = Win32WindowProc::FindProc(hwnd);
   if(!curwnd) {
@@ -336 +339 @@
   }
   if(curwnd != NULL) {
-        switch(Msg) 
+        switch(Msg)
         {
         case WM_KEYDOWN: