Changeset 3747 for trunk/src

Timestamp:

Jun 23, 2000, 9:04:13 PM (25 years ago)

Author:

sandervl

Message:

wsprintf fix, menu accelerator fix

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (5 diffs)
• oslibmsgtranslate.cpp (modified) (4 diffs)
• oslibwin.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (5 diffs)
• wsprintf.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.62 2000-06-17 09:45:00 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.63 2000-06-23 19:04:10 sandervl Exp $ */
 
 /*
@@ -984 +984 @@
 }
 //******************************************************************************
+//Helper for RedrawWindow (RDW_ALLCHILDREN_W)
+//******************************************************************************
+LRESULT WIN32API RedrawChildEnumProc(HWND hwnd, LPARAM lParam)
+{
+  RedrawWindow(hwnd, NULL, 0, lParam);
+  return TRUE;
+}
+//******************************************************************************
 // This implementation of RedrawWindow supports
 // RDW_ERASE
@@ -1145 +1153 @@
         if(redraw & RDW_ERASENOW_W && wnd->needsEraseBkgnd())
                 wnd->setEraseBkgnd(sendEraseBkgnd(wnd) == 0);
+        if(redraw & RDW_ALLCHILDREN_W) {
+                EnumChildWindows(wnd->getWindowHandle(), RedrawChildEnumProc, redraw);
+        }
    }
    else if((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))
@@ -1180 +1191 @@
 
    dprintf (("User32: UpdateWindow hwnd %x", hwnd));
-////SvL: This doesn't work right (Wine uses RDW_NOCHILDREN_W -> doesn't work here)
-////     Breaks vpbuddy
-////   return RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW_W | RDW_ALLCHILDREN_W);
+//SvL: This doesn't work right (Wine uses RDW_NOCHILDREN_W -> doesn't work here)
+//     Breaks vpbuddy
+//   return RedrawWindow(hwnd, NULL, 0, RDW_UPDATENOW_W | RDW_ALLCHILDREN_W);
+//   -> RDW_UPDATENOW causes WM_PAINT messages to be directy posted to window
+//   handler; possibly bypassing queued WM_PAINT messages for parent window(s)
+//   -> out of sync painting (i.e. parent paints over child)
    WinUpdateWindow(wnd->getOS2WindowHandle());
    return TRUE;
@@ -1196 +1210 @@
    }
    else dprintf(("InvalidateRect %x NULL erase=%d", hwnd, erase));
+   if(hwnd == 0x6800000f) {
+        result = 0;
+   }
    result = RedrawWindow (hwnd, pRect, NULLHANDLE,
                           RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.34 2000-06-07 14:51:26 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.35 2000-06-23 19:04:11 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -609 +609 @@
                     winMsg->lParam |= 1 << 30;                          // bit 30, previous state, 1 means key was pressed
             }
+            if(winMsg->wParam == VK_MENU_W) {
+                winMsg->message = 0; //WM_SYS* already implies Alt
+            }
         }
         if(ISKDB_CAPTURED())
@@ -737 +740 @@
             extramsg.lParam = 0;
 
-            if(!(fl & KC_CHAR)) {
+            if(!(fl & KC_CHAR) && msg->message < WINWM_SYSKEYDOWN) {
                 return FALSE;
             }
@@ -746 +749 @@
                 else    extramsg.wParam = SHORT2FROMMP(thdb->os2msg.mp2);
             }
+
 
             if(msg->message >= WINWM_SYSKEYDOWN) {

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.80 2000-06-14 13:15:24 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.81 2000-06-23 19:04:11 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -87 +87 @@
   dprintf(("WinCreateWindow %x %s %x task %d shell %d classstyle %x winstyle %x", hwndParent, pszName, id, fTaskList, fShellPosition, classStyle, dwWinStyle));
 
-#if 1
+#if 0
   return WinCreateWindow (hwndParent,
 //                          TopLevel ? WIN32_STDFRAMECLASS : WIN32_STDCLASS,
@@ -96 +96 @@
 #else
   return WinCreateWindow (hwndParent,
-                          WIN32_STDCLASS,
+                          WIN32_STDFRAMECLASS,
                           pszName, dwWinStyle, 0, 0, 0, 0,
                           Owner, HWND_TOP,

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.201 2000-06-14 13:15:25 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.202 2000-06-23 19:04:12 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -379 +379 @@
   {
         SetParent(cs->hwndParent);
-        owner = GetWindowFromHandle(cs->hwndParent);
-        if(owner == NULL)
+//        owner = GetWindowFromHandle(cs->hwndParent);
+        owner = 0;
+/*        if(owner == NULL)
         {
             dprintf(("HwGetWindowHandleData couldn't find owner window %x!!!", cs->hwndParent));
             SetLastError(ERROR_INVALID_WINDOW_HANDLE);
             return FALSE;
-        }
+        }*/
         //SvL: Shell positioning shouldn't be done for child windows! (breaks Notes)
         fXDefault = fCXDefault = FALSE;
@@ -516 +517 @@
   OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
                                  dwOSWinStyle,(char *)windowNameA,
-                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
+                                 (owner) ? owner->getOS2WindowHandle() : ((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP),
                                  (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
                                  0, fTaskList,fXDefault | fCXDefault,windowClass->getStyle());
@@ -1655 +1656 @@
                 else    SendMessageA(WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (LPARAM)(DWORD)wParam );
         }
+#if 0
         else /* check for Ctrl-Esc */
                 if (wParam != VK_ESCAPE) MessageBeep(0);
                         break;
+#endif
     }
 
@@ -2550 +2553 @@
     for (child = (Win32BaseWindow *)getFirstChild(); child; child = (Win32BaseWindow *)child->getNextChild())
     {
-        dprintf(("EnumChildWindows: enumerating child %x", child->getWindowHandle()));
+        dprintf(("EnumChildWindows: enumerating child %x (owner %x; parent %x)", child->getWindowHandle(), (child->getOwner()) ? child->getOwner()->getWindowHandle() : 0, getWindowHandle()));
         hwnd = child->getWindowHandle();
         if(child->getOwner()) {

trunk/src/user32/wsprintf.cpp

@@ -1 @@
-/* $Id: wsprintf.cpp,v 1.7 2000-03-23 23:06:54 sandervl Exp $ */
+/* $Id: wsprintf.cpp,v 1.8 2000-06-23 19:04:13 sandervl Exp $ */
 
 /*
@@ -268 +268 @@
                         (format->flags & WPRINTF_UPPER_HEX) ? "%X" : "%x",
                         (UINT)arg->int_view);
-        if (format->flags & WPRINTF_PREFIX_HEX) len += 2;
+        if (format->flags & WPRINTF_PREFIX_HEX) {
+            len += 2;
+            format->width += 2;
+        }
         break;
     default: