Changeset 4585 for trunk/src

Timestamp:

Nov 11, 2000, 7:39:31 PM (25 years ago)

Author:

sandervl

Message:

Added wineventhook stubs + CreateWindowExW fixes

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• user32.cpp (modified) (3 diffs)
• win32class.cpp (modified) (2 diffs)
• window.cpp (modified) (5 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.40 2000-11-05 18:49:06 sandervl Exp $
+; $Id: USER32.DEF,v 1.41 2000-11-11 18:39:29 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -614 +614 @@
     ChangeDisplaySettingsExW   = _ChangeDisplaySettingsExW@20 @605
 
+    NotifyWinEvent             = _NotifyWinEvent@16          @606
+    UnhookWinEvent             = _UnhookWinEvent@4           @607
+    SetWinEventHook            = _SetWinEventHook@28         @608
+
 ;------------
 ; Windows 98

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.87 2000-11-09 18:15:18 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.88 2000-11-11 18:39:29 sandervl Exp $ */
 
 /*
@@ -565 +565 @@
 VOID WIN32API SetLastErrorEx(DWORD dwErrCode, DWORD dwType)
 {
-  dprintf(("USER32:  SetLastErrorEx\n"));
+  dprintf(("USER32: SetLastErrorEx %x %x", dwErrCode, dwType));
   SetLastError(dwErrCode);
 }
@@ -2659 +2659 @@
 }
 
+
+DWORD WIN32API NotifyWinEvent(DWORD arg1, DWORD arg2, DWORD arg3, DWORD arg4)
+{
+  dprintf(("USER32: NotifyWinEvent %x %x %x %x - empty stub!!", arg1, arg2, arg3, arg4));
+
+  return 0;
+}
+
+DWORD WIN32API UnhookWinEvent(DWORD arg1)
+{
+  dprintf(("USER32: UnhookWinEvent %x - empty stub!!", arg1));
+
+  return 0;
+}
+
+DWORD WIN32API SetWinEventHook(DWORD arg1, DWORD arg2, DWORD arg3, DWORD arg4, DWORD arg5, DWORD arg6, DWORD arg7)
+{
+  dprintf(("USER32: SetWinEventHook %x %x %x %x %x %x %x - empty stub!!", arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+
+  return 0;
+}

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.18 2000-09-05 19:20:35 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.19 2000-11-11 18:39:30 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -95 +95 @@
        dprintf(("USER32:  wndclass->lpszClassName %s\n", classNameA));
   else dprintf(("USER32:  wndclass->lpszClassName %X\n", wndclass->lpszClassName));
+
+  dprintf(("USER32:  wndclass->classAtom %x", classAtom));
 
   if(HIWORD(wndclass->lpszMenuName)) {//convert string name identifier to numeric id

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.83 2000-11-09 18:15:22 sandervl Exp $ */
+/* $Id: window.cpp,v 1.84 2000-11-11 18:39:31 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -57 +57 @@
         return CreateMDIWindowA(className, windowName, style, x, y, width, height, parent, instance, (LPARAM)data);
 
-#if 1
     /* Find the class atom */
     if (!(classAtom = GlobalFindAtomA(className)))
@@ -75 +74 @@
       className = tmpClass;
     }
-#else
-    /* Find the class atom */
-    if (!HIWORD(className) || !(classAtom = GlobalFindAtomA(className)))
-    {
-        if (!HIWORD(className))
-        {
-          sprintf(tmpClass,"#%d", (int) className);
-          classAtom = GlobalFindAtomA(tmpClass);
-          className = tmpClass;
-        }
-        if (!classAtom)
-        {
-          if (!HIWORD(className)) {
-                  dprintf(("CreateWindowEx32A: bad class name %04x\n", LOWORD(className)));
-          }
-          else    dprintf(("CreateWindowEx32A: bad class name '%s'\n", className ));
-
-          SetLastError(ERROR_INVALID_PARAMETER);
-          return 0;
-        }
-    }
-#endif
 
     /* Create the window */
@@ -165 +142 @@
   ATOM classAtom;
   CREATESTRUCTA cs;
-  char tmpClassA[20];
   WCHAR tmpClassW[20];
 
@@ -172 +148 @@
 
     /* Find the class atom */
-    if (!HIWORD(className) || !(classAtom = GlobalFindAtomW(className)))
-    {
-        if (!HIWORD(className))
-        {
-          sprintf(tmpClassA,"#%d", (int) className);
-          AsciiToUnicode(tmpClassA, tmpClassW);
-          classAtom = GlobalFindAtomW(tmpClassW);
-          className = (LPCWSTR)tmpClassW;
-        }
-        if (!classAtom)
-        {
-          if (!HIWORD(className)) {
-                  dprintf(("CreateWindowEx32W: bad class name %04x\n", LOWORD(className)));
-          }
-          else    dprintf(("CreateWindowEx32W: bad class name "));
-
-          SetLastError(ERROR_INVALID_PARAMETER);
-          return 0;
-        }
-    }
+    if (!(classAtom = GlobalFindAtomW(className)))
+    {
+       if (!HIWORD(className))
+           dprintf(("CreateWindowEx32W: bad class name %04x",LOWORD(className)));
+       else
+           dprintf(("CreateWindowEx32W: bad class name '%x'", className));
+
+       SetLastError(ERROR_INVALID_PARAMETER);
+       return 0;
+    }
+
     if(HIWORD(className)) {
          dprintf(("CreateWindowExW: class %ls name %x parent %x (%d,%d) (%d,%d), %x %x", className, windowName, parent, x, y, width, height, style, exStyle));
     }
     else dprintf(("CreateWindowExW: class %d name %x parent %x (%d,%d) (%d,%d), %x %x", className, windowName, parent, x, y, width, height, style, exStyle));
+
+    if (!HIWORD(className))
+    {
+      wsprintfW(tmpClassW, (LPCWSTR)L"#%d", (int) className);
+      className = tmpClassW;
+    }
 
     /* Create the window */