Changeset 3250 for trunk/src/user32

Timestamp:

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

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (3 diffs)
• oslibwin.h (modified) (2 diffs)
• user32.cpp (modified) (9 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.49 2000-02-24 19:19:07 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.50 2000-03-27 15:06:29 cbratschi Exp $ */
 
 /*
@@ -501 +501 @@
    {
       long height  = wnd->getClientHeight();
+
       rect.yTop    = height - rect.yTop;
       rect.yBottom = height - rect.yBottom;

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.71 2000-03-17 17:12:08 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.72 2000-03-27 15:06:29 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -199 +199 @@
 //******************************************************************************
 //******************************************************************************
-LONG OSLibWinQuerySysValue(HWND hwndDeskTop,LONG iSysValue)
-{
-  return WinQuerySysValue(hwndDeskTop,iSysValue);
+LONG OSLibWinQuerySysValue(LONG iSysValue)
+{
+  return WinQuerySysValue(HWND_DESKTOP,iSysValue);
 }
 //******************************************************************************
@@ -217 +217 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinQueryPointerPos(HWND hwndDeskTop,PPOINT pptlPoint)
-{
-  return WinQueryPointerPos(hwndDeskTop,(PPOINTL)pptlPoint);
+BOOL OSLibWinQueryPointerPos(PPOINT pptlPoint)
+{
+  return WinQueryPointerPos(HWND_DESKTOP,(PPOINTL)pptlPoint);
 }
 //******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.39 2000-02-07 14:30:18 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.40 2000-03-27 15:06:30 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -177 +177 @@
 #define SVOS_CSYSVALUES              108
 
-LONG OSLibWinQuerySysValue(HWND hwndDeskTop,LONG iSysValue);
+LONG OSLibWinQuerySysValue(LONG iSysValue);
 ULONG OSLibWinQueryDlgItemText(HWND hwndDlg,ULONG idItem,LONG cchBufferMax,char* pchBuffer);
 BOOL OSLibWinSetDlgItemText(HWND hwndDlg,ULONG idItem,char* pszText);
-BOOL OSLibWinQueryPointerPos(HWND hwndDeskTop,PPOINT pptlPoint); //pptlPoint == POINTL pointer!
+BOOL OSLibWinQueryPointerPos(PPOINT pptlPoint); //pptlPoint == POINTL pointer!
 
 #define SWPOS_SIZE                   0x0001

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: