Changeset 903 for trunk/src/user32/new/user32.cpp

Timestamp:

Sep 10, 1999, 9:00:11 PM (26 years ago)

Author:

dengert

Message:

some more DC related functions

File:

• trunk/src/user32/new/user32.cpp (modified) (6 diffs)

trunk/src/user32/new/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.19 1999-09-05 17:11:24 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.20 1999-09-10 19:00:11 dengert Exp $ */
 
 /*
@@ -325 +325 @@
         lprcDst->right  = MAX(lprcSrc1->right,lprcSrc2->right);
         lprcDst->top    = MIN(lprcSrc1->top,lprcSrc2->top);
-        lprcDst->bottom = MAX(lprcSrc1->bottom,lprcSrc2->bottom);       
+        lprcDst->bottom = MAX(lprcSrc1->bottom,lprcSrc2->bottom);
       }
     }
@@ -1038 +1038 @@
 //******************************************************************************
 //******************************************************************************
+#if 0
 int WIN32API GetUpdateRgn( HWND arg1, HRGN arg2, BOOL  arg3)
 {
@@ -1045 +1046 @@
     return O32_GetUpdateRgn(arg1, arg2, arg3);
 }
+#endif
 //******************************************************************************
 
@@ -1241 +1243 @@
     case SPI_GETICONTITLELOGFONT:
     {
-        LPLOGFONTA lpLogFont = (LPLOGFONTA)pvParam;
-
-        /* from now on we always have an alias for MS Sans Serif */
-        strcpy(lpLogFont->lfFaceName, "MS Sans Serif");
-        lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8);
-        lpLogFont->lfWidth = 0;
-        lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
-        lpLogFont->lfWeight = FW_NORMAL;
-        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;
-        break;
+        LPLOGFONTA lpLogFont = (LPLOGFONTA)pvParam;
+
+        /* from now on we always have an alias for MS Sans Serif */
+        strcpy(lpLogFont->lfFaceName, "MS Sans Serif");
+        lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8);
+        lpLogFont->lfWidth = 0;
+        lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+        lpLogFont->lfWeight = FW_NORMAL;
+        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;
+        break;
     }
     case SPI_GETBORDER:
-        *(INT *)pvParam = GetSystemMetrics( SM_CXFRAME );
-        break;
+        *(INT *)pvParam = GetSystemMetrics( SM_CXFRAME );
+        break;
 
     case SPI_GETWORKAREA:
-        SetRect( (RECT *)pvParam, 0, 0,
-                GetSystemMetrics( SM_CXSCREEN ),
-                GetSystemMetrics( SM_CYSCREEN )
-        );
-        break;
+        SetRect( (RECT *)pvParam, 0, 0,
+                GetSystemMetrics( SM_CXSCREEN ),
+                GetSystemMetrics( SM_CYSCREEN )
+        );
+        break;
 
     case 104: //TODO: Undocumented
@@ -1316 +1318 @@
     case SPI_GETICONTITLELOGFONT:
     {
-        LPLOGFONTW lpLogFont = (LPLOGFONTW)pvParam;
-
-        /* from now on we always have an alias for MS Sans Serif */
-        lstrcpyW(lpLogFont->lfFaceName, (LPCWSTR)L"MS Sans Serif");
-        lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8);
-        lpLogFont->lfWidth = 0;
-        lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
-        lpLogFont->lfWeight = FW_NORMAL;
-        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;
-        return TRUE;
+        LPLOGFONTW lpLogFont = (LPLOGFONTW)pvParam;
+
+        /* from now on we always have an alias for MS Sans Serif */
+        lstrcpyW(lpLogFont->lfFaceName, (LPCWSTR)L"MS Sans Serif");
+        lpLogFont->lfHeight = -GetProfileIntA("Desktop","IconTitleSize", 8);
+        lpLogFont->lfWidth = 0;
+        lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+        lpLogFont->lfWeight = FW_NORMAL;
+        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;
+        return TRUE;
     }
     default: