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

Timestamp:

Mar 27, 2000, 5:09:22 PM (25 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.75 2000-03-23 23:06:52 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.76 2000-03-27 15:06:30 cbratschi Exp $ */
 
 /*
@@ -34 +34 @@
 #include "syscolor.h"
 #include "pmwindow.h"
+#include "oslibgdi.h"
 
 #include <wchar.h>
@@ -87 +88 @@
 /* Coordinate Transformation */
 
-inline void OS2ToWin32ScreenPos(POINT *dest,POINT *source)
-{
-  dest->x = source->x;
-  dest->y = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYSCREEN)-1-source->y;
-}
-
-inline void Win32ToOS2ScreenPos(POINT *dest,POINT *source)
-{
-  OS2ToWin32ScreenPos(dest,source); //transform back
-}
-
 /* Rectangle Functions - parts from wine/windows/rect.c */
 
@@ -368 +358 @@
 BOOL WIN32API GetCursorPos( PPOINT lpPoint)
 {
-    BOOL rc;
-    POINT point;
-
     dprintf2(("USER32:  GetCursorPos\n"));
 
     if (!lpPoint) return FALSE;
-    if (OSLibWinQueryPointerPos(OSLIB_HWND_DESKTOP,&point)) //POINT == POINTL
+    if (OSLibWinQueryPointerPos(lpPoint)) //POINT == POINTL
     {
-      OS2ToWin32ScreenPos(lpPoint,&point);
+      mapScreenPoint((OSLIBPOINT*)lpPoint);
       return TRUE;
     } else return FALSE;
@@ -687 +674 @@
 
     case SM_CXVSCROLL:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CXVSCROLL);
+        rc = OSLibWinQuerySysValue(SVOS_CXVSCROLL);
         break;
 
     case SM_CYHSCROLL:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYHSCROLL);
+        rc = OSLibWinQuerySysValue(SVOS_CYHSCROLL);
         break;
 
     case SM_CYCAPTION:
         rc = 19;
-        //rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYTITLEBAR);
+        //rc = OSLibWinQuerySysValue(SVOS_CYTITLEBAR);
         break;
 
@@ -755 +742 @@
 
     case SM_CXICONSPACING: //TODO: size of grid cell for large icons
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CXICON);
+        rc = OSLibWinQuerySysValue(SVOS_CXICON);
         //CB: return standard windows icon size?
         //rc = 32;
         break;
     case SM_CYICONSPACING:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYICON);
+        rc = OSLibWinQuerySysValue(SVOS_CYICON);
         //read SM_CXICONSPACING comment
         //rc = 32;
@@ -795 +782 @@
     case SM_CXMAXTRACK: //max window size
     case SM_CXMAXIMIZED:    //max toplevel window size
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CXSCREEN);
+        rc = OSLibWinQuerySysValue(SVOS_CXSCREEN);
         break;
 
     case SM_CYMAXTRACK:
     case SM_CYMAXIMIZED:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYSCREEN);
+        rc = OSLibWinQuerySysValue(SVOS_CYSCREEN);
         break;
 
@@ -822 +809 @@
         break;
     case SM_CYMENUCHECK:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYMENU);
+        rc = OSLibWinQuerySysValue(SVOS_CYMENU);
         break;
     case SM_SLOWMACHINE:
@@ -841 +828 @@
 
     case SM_CXVIRTUALSCREEN:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CXSCREEN);
+        rc = OSLibWinQuerySysValue(SVOS_CXSCREEN);
         break;
     case SM_CYVIRTUALSCREEN:
-        rc = OSLibWinQuerySysValue(OSLIB_HWND_DESKTOP,SVOS_CYSCREEN);
+        rc = OSLibWinQuerySysValue(SVOS_CYSCREEN);
         break;
     case SM_CMONITORS: