Changeset 4444 for trunk/src

Timestamp:

Oct 6, 2000, 5:15:00 PM (25 years ago)

Author:

sandervl

Message:

OemToCharBuffA + DefDlgProc/WM_ERASEBKGND fixes

Location:

trunk/src/user32

Files:

• char.cpp (modified) (2 diffs)
• win32dlg.cpp (modified) (3 diffs)

trunk/src/user32/char.cpp

@@ -1 @@
-/* $Id: char.cpp,v 1.13 2000-03-23 23:06:51 sandervl Exp $ */
+/* $Id: char.cpp,v 1.14 2000-10-06 15:15:00 sandervl Exp $ */
 
 /*
@@ -379 +379 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API OemToCharBuffA( LPCSTR arg1, LPSTR arg2, DWORD  arg3)
-{
+BOOL WIN32API OemToCharBuffA( LPCSTR src, LPSTR dest, DWORD count)
+{
+ BOOL rc;
+
     dprintf(("USER32:  OS2OemToCharBuffA\n"));
-    return O32_OemToCharBuff(arg1, arg2, arg3);
+    rc = O32_OemToCharBuff(src, dest, count);
+    if(rc) {
+        //SvL: Open32 replaces special character (i.e. /r & /n) with 0xff
+        //     -> break edit control (OEMCONVERT) (i.e. Netscape 6 install license control)
+        for(int i=0;i<count;i++) {
+                if(dest[i] == 0xFF) {
+                        dest[i] = src[i];
+                }
+        }
+    }
+    return rc;
 }
 //******************************************************************************

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.52 2000-10-05 18:37:26 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.53 2000-10-06 15:15:00 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -718 +718 @@
       int rc;
 
-        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
+//        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
+        if (!windowClass) return 0;
 
         rc = GetClipBox( (HDC)wParam, &rect );
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
         {
+#if 0
             HBRUSH hBrush = windowClass->getBackgroundBrush();
 
@@ -728 +730 @@
                 hBrush = GetSysColorBrush(hBrush-1);
 
-            FillRect( (HDC)wParam, &rect, hBrush);
+            FillRect( (HDC)wParam, &rect, hbrush);
+#else
+            //SvL: Ignore class background brush
+            FillRect((HDC)wParam, &rect, GetSysColorBrush(COLOR_BTNFACE));
+#endif
         }