Changeset 2860 for trunk/src

Timestamp:

Feb 22, 2000, 8:15:20 PM (26 years ago)

Author:

sandervl

Message:

window class ctor bugfix

Location:

trunk/src/user32

Files:

• dbglocal.cpp (modified) (3 diffs)
• dbglocal.h (modified) (2 diffs)
• win32class.cpp (modified) (4 diffs)

trunk/src/user32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.1 2000-02-16 14:34:09 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.2 2000-02-22 19:15:20 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include <string.h>
 #include "dbglocal.h"
+
+#ifdef DEBUG
 
 USHORT DbgEnabled[DBG_MAXFILES];
@@ -124 +126 @@
 //******************************************************************************
 
+#endif

trunk/src/user32/dbglocal.h

@@ -1 @@
-/* $Id: dbglocal.h,v 1.1 2000-02-16 14:34:13 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.2 2000-02-22 19:15:20 sandervl Exp $ */
 
 /*
@@ -99 +99 @@
 
 #define ParseLogStatus()
-#define DBG_LOCALLOG(a)
 
 #endif //DEBUG

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.14 2000-02-16 14:28:22 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.15 2000-02-22 19:15:20 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -63 +63 @@
                 AsciiToUnicode(classNameA, classNameW);
         }
-    classAtom = 0;
-    //SvL: If a system control has already be registered, use that atom instead
+        classAtom = 0;
+        //SvL: If a system control has already be registered, use that atom instead
         //     of creating a new one
-    if(wndclass->style & CS_GLOBALCLASS) {
-        classAtom = GlobalFindAtomA(classNameA);
-    }
-    if(!classAtom) classAtom = GlobalAddAtomA(classNameA);
+        if(wndclass->style & CS_GLOBALCLASS) {
+                classAtom = GlobalFindAtomA(classNameA);
+        }
+        if(!classAtom) classAtom = GlobalAddAtomA(classNameA);
   }
   else {
@@ -77 +77 @@
   }
   if(!(wndclass->style & CS_GLOBALCLASS)) {
-    processId = GetCurrentProcess();
+        processId = GetCurrentProcess();
   }
   menuNameA = 0;
@@ -114 +114 @@
 
   windowStyle           = wndclass->style;
+
+  windowProc = 0;
   WINPROC_SetProc((HWINDOWPROC *)&windowProc, wndclass->lpfnWndProc, (isUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_CLASS);
   dprintf2(("Window class ptr %x", windowProc));