Changeset 3798 for trunk/src

Timestamp:

Jul 4, 2000, 10:40:14 AM (25 years ago)

Author:

sandervl

Message:

Rewrote Set/GetViewportExtEx, Set/GetMapMode & moved them from gdi32 to user32

File:

• trunk/src/gdi32/gdi32.cpp (modified) (5 diffs)

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.51 2000-06-14 13:17:50 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.52 2000-07-04 08:40:14 sandervl Exp $ */
 
 /*
@@ -756 +756 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetMapMode( HDC hdc)
-{
-    dprintf(("GDI32: GetMapMode %x", hdc));
-    return O32_GetMapMode(hdc);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API GetMiterLimit( HDC arg1, float * arg2)
 {
@@ -949 +942 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API GetViewportExtEx( HDC arg1, PSIZE  arg2)
-{
-    dprintf(("GDI32: GetViewportExtEx"));
-    return O32_GetViewportExtEx(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetViewportOrgEx( HDC arg1, PPOINT  arg2)
-{
-    dprintf(("GDI32: GetViewportOrgEx"));
-    return O32_GetViewportOrgEx(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetWindowOrgEx( HDC arg1, PPOINT  arg2)
-{
-    dprintf(("GDI32: GetWindowOrgEx"));
-    return O32_GetWindowOrgEx(arg1, arg2);
+BOOL WIN32API GetViewportOrgEx( HDC hdc, PPOINT pPoint)
+{
+ BOOL rc;
+
+    rc = O32_GetViewportOrgEx(hdc, pPoint);
+    if(pPoint) {
+         dprintf(("GDI32: GetViewportOrgEx %x returned %d (%d,%d)", hdc, rc, pPoint->x, pPoint->y));
+    }
+    else dprintf(("GDI32: GetViewportOrgEx %x NULL returned %d (%d,%d)", hdc, rc));
+    return rc;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetWindowOrgEx(HDC hdc, PPOINT pPoint)
+{
+ BOOL rc;
+
+    rc = O32_GetWindowOrgEx(hdc, pPoint);
+    if(pPoint) {
+         dprintf(("GDI32: GetWindowOrgEx %x returned %d (%d,%d)", hdc, rc, pPoint->x, pPoint->y));
+    }
+    else dprintf(("GDI32: GetWindowOrgEx %x NULL returned %d", hdc, rc));
+    return rc;
 }
 //******************************************************************************
@@ -1155 +1153 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(int, SetMapMode, HDC, hdc, int, fnMapMode)
-{
-    return O32_SetMapMode(hdc, fnMapMode);
-}
-//******************************************************************************
-//******************************************************************************
 ODINFUNCTION2(DWORD, SetMapperFlags, HDC, hdc, DWORD, dwFlag)
 {
@@ -1197 +1189 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API SetViewportExtEx( HDC arg1, int arg2, int arg3, PSIZE  arg4)
-{
-    dprintf(("GDI32: SetViewportExtEx"));
-    return O32_SetViewportExtEx(arg1, arg2, arg3, arg4);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetViewportOrgEx( HDC arg1, int arg2, int arg3, PPOINT  arg4)
-{
-    dprintf(("GDI32: SetViewportOrgEx"));
-    return O32_SetViewportOrgEx(arg1, arg2, arg3, arg4);
+BOOL WIN32API SetViewportOrgEx( HDC hdc, int x, int y, PPOINT lpPoint)
+{
+    if(lpPoint) {
+         dprintf(("GDI32: SetViewportOrgEx %x %d %d (%d,%d)", hdc, x, y, lpPoint->x, lpPoint->y));
+    }
+    else dprintf(("GDI32: SetViewportOrgEx %x %d %d NULL", hdc, x, y));
+    return O32_SetViewportOrgEx(hdc, x, y, lpPoint);
 }
 //******************************************************************************