Changeset 1606 for trunk/src/user32

Timestamp:

Nov 5, 1999, 10:17:27 AM (26 years ago)

Author:

sandervl

Message:

EBs fixes

Location:

trunk/src/user32

Files:

• loadres.cpp (modified) (2 diffs)
• oslibmsg.cpp (modified) (2 diffs)
• win32class.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (2 diffs)
• window.cpp (modified) (3 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.12 1999-11-04 13:02:49 phaller Exp $ */
+/* $Id: loadres.cpp,v 1.13 1999-11-05 09:16:21 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
     if(winres == NULL) {
         dprintf(("LoadStringA NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
+//TODO: BAD HACK!
+        if(cchBuffer > 3)
+        {
+          strcpy(lpBuffer, "XXX");
+          return 3;
+        }
+//TODO: BAD HACK!
         *lpBuffer = 0;
         return 0;

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.6 1999-10-28 22:41:00 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.7 1999-11-05 09:16:22 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -145 +145 @@
   }
 
+  if(msg >= WIN32APP_USERMSGBASE)
+    return msg - WIN32APP_USERMSGBASE;
+
   for(int i=0;i<MAX_MSGTRANSTAB;i++)
   {

trunk/src/user32/win32class.cpp

@@ -1 @@
-/* $Id: win32class.cpp,v 1.5 1999-11-01 19:11:42 sandervl Exp $ */
+/* $Id: win32class.cpp,v 1.6 1999-11-05 09:16:22 sandervl Exp $ */
 /*
  * Win32 Window Class Managment Code for OS/2
@@ -158 +158 @@
   }
   if(fUnicode) {
-    return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
-  }
-  else  return (strcmp(classNameA, classname) == 0);
+        if(classNameW)
+                return (lstrcmpW(classNameW, (LPWSTR)classname) == 0);
+        return FALSE;
+  }
+  else {
+        if(classNameA)
+                return (strcmp(classNameA, classname) == 0);
+        return FALSE;
+  }
 }
 //******************************************************************************
@@ -177 +183 @@
   if(HIWORD(id) != 0) {
 //CB: read comment below!
-        if(stricmp(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
+        if(lstrcmpiA(wndclass->classNameA, id) == 0 && wndclass->hInstance == hInstance) {
                 leaveMutex(OBJTYPE_CLASS);
                 return(wndclass);
@@ -184 +190 @@
                 wndclass = (Win32WndClass *)wndclass->GetNext();
                 while(wndclass != NULL) {
-                        if(stricmp(wndclass->classNameA, id) == 0)
+                        if(lstrcmpiA(wndclass->classNameA, id) == 0)
                         {
                                 //SvL: According to Wine, if the instance handle is the one of the main exe, everything is ok

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.75 1999-11-03 22:04:22 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.76 1999-11-05 09:16:22 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2486 +2486 @@
 BOOL Win32BaseWindow::hasWindowName(LPSTR wndname, BOOL fUnicode)
 {
+    if(wndname == NULL)
+      return FALSE;  
+
     if(fUnicode) {
             return (lstrcmpW(windowNameW, (LPWSTR)wndname) == 0);

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.32 1999-11-01 19:11:45 sandervl Exp $ */
+/* $Id: window.cpp,v 1.33 1999-11-05 09:16:22 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -1423 +1423 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API ArrangeIconicWindows( HWND arg1)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  ArrangeIconicWindows\n");
-#endif
-    return O32_ArrangeIconicWindows(arg1);
+UINT WIN32API ArrangeIconicWindows( HWND hwnd)
+{
+    dprintf(("USER32:  ArrangeIconicWindows %x", hwnd));
+    return O32_ArrangeIconicWindows(Win32BaseWindow::Win32ToOS2FrameHandle(hwnd));
 }
 //******************************************************************************
@@ -1445 +1443 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API ShowOwnedPopups( HWND arg1, BOOL  arg2)
-{
-    dprintf(("USER32:  ShowOwnedPopups\n"));
-    return O32_ShowOwnedPopups(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-
+BOOL WIN32API ShowOwnedPopups( HWND hwnd, BOOL  arg2)
+{
+    dprintf(("USER32:  ShowOwnedPopups %x", hwnd));
+    return O32_ShowOwnedPopups(Win32BaseWindow::Win32ToOS2FrameHandle(hwnd), arg2);
+}
+//******************************************************************************
+//******************************************************************************
+