Changeset 3488 for trunk/src/user32/user32.cpp

Timestamp:

May 3, 2000, 8:35:56 PM (25 years ago)

Author:

sandervl

Message:

capture changes/fixes, SetWindowPos fix

File:

• trunk/src/user32/user32.cpp (modified) (7 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.78 2000-05-02 20:50:50 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.79 2000-05-03 18:35:52 sandervl Exp $ */
 
 /*
@@ -547 +547 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API ReleaseCapture(void)
-{
-    dprintf(("USER32:  ReleaseCapture"));
-    return O32_ReleaseCapture();
-}
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API GetCapture(void)
-{
- HWND hwnd;
-
-    hwnd = Win32Window::OS2ToWin32Handle(O32_GetCapture());
-    dprintf(("USER32: GetCapture returned %x", hwnd));
-    return hwnd;
-}
-//******************************************************************************
-//******************************************************************************
-HWND WIN32API SetCapture( HWND hwnd)
-{
-    dprintf(("USER32: SetCapture %x", hwnd));
-    hwnd = Win32Window::Win32ToOS2Handle(hwnd);
-    return Win32Window::OS2ToWin32Handle(O32_SetCapture(hwnd));
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API SetDoubleClickTime( UINT uInterval)
 {
@@ -888 +863 @@
         break;
     case SPI_GETNONCLIENTMETRICS:
+    {
         memset(cmetric, 0, sizeof(NONCLIENTMETRICSA));
         cmetric->cbSize = sizeof(NONCLIENTMETRICSA);
 
+#if 0
         //CB: fonts not handled by Open32, set to WarpSans
         lstrcpyA(cmetric->lfSmCaptionFont.lfFaceName,"WarpSans");
@@ -916 +893 @@
         cmetric->iMenuWidth       = 32; //TODO
         cmetric->iMenuHeight      = GetSystemMetrics(SM_CYMENU);
-        break;
+#else
+        SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfSmCaptionFont),0);
+
+        SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfCaptionFont),0);
+        cmetric->lfCaptionFont.lfWeight = FW_BOLD;
+
+        LPLOGFONTA lpLogFont = &(cmetric->lfMenuFont);
+        GetProfileStringA("Desktop", "MenuFont", "MS Sans Serif",
+                          lpLogFont->lfFaceName, LF_FACESIZE);
+
+        lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 12);
+        lpLogFont->lfWidth = 0;
+        lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+        lpLogFont->lfWeight = FW_BOLD;
+        lpLogFont->lfItalic = FALSE;
+        lpLogFont->lfStrikeOut = FALSE;
+        lpLogFont->lfUnderline = FALSE;
+        lpLogFont->lfCharSet = ANSI_CHARSET;
+        lpLogFont->lfOutPrecision = OUT_DEFAULT_PRECIS;
+        lpLogFont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
+        lpLogFont->lfPitchAndFamily = DEFAULT_PITCH | FF_SWISS;
+
+        SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
+                              (LPVOID)&(cmetric->lfStatusFont),0);
+        SystemParametersInfoA(SPI_GETICONTITLELOGFONT, 0,
+                              (LPVOID)&(cmetric->lfMessageFont),0);
+
+        cmetric->iBorderWidth     = GetSystemMetrics(SM_CXBORDER);
+        cmetric->iScrollWidth     = GetSystemMetrics(SM_CXHSCROLL);
+        cmetric->iScrollHeight    = GetSystemMetrics(SM_CYHSCROLL);
+        cmetric->iCaptionWidth    = 32; //TODO
+        cmetric->iCaptionHeight   = 32; //TODO
+        cmetric->iSmCaptionWidth  = GetSystemMetrics(SM_CXSMSIZE);
+        cmetric->iSmCaptionHeight = GetSystemMetrics(SM_CYSMSIZE);
+        cmetric->iMenuHeight      = GetSystemMetrics(SM_CYMENU);
+        cmetric->iMenuWidth       = cmetric->iMenuHeight; //TODO
+#endif
+        break;
+    }
+
     case SPI_GETICONTITLELOGFONT:
     {
@@ -1569 +1585 @@
 WORD WIN32API VkKeyScanA( char ch)
 {
-    dprintf(("USER32:  VkKeyScanA\n"));
+    dprintf(("USER32: VkKeyScanA %x", ch));
     return O32_VkKeyScan(ch);
 }
@@ -1576 +1592 @@
 WORD WIN32API VkKeyScanW( WCHAR wch)
 {
-    dprintf(("USER32:  VkKeyScanW\n"));
+    dprintf(("USER32:  VkKeyScanW %x", wch));
     // NOTE: This will not work as is (needs UNICODE support)
     return O32_VkKeyScan((char)wch);
@@ -1689 +1705 @@
 int WIN32API FrameRect( HDC hDC, const RECT * lprc, HBRUSH  hbr)
 {
-    dprintf(("USER32:  FrameRect"));
+    dprintf(("USER32: FrameRect %x (%d,%d)(%d,%d) brush %x", hDC, lprc->top, lprc->left, lprc->bottom, lprc->right, hbr));
     return O32_FrameRect(hDC,lprc,hbr);
 }