Large-scale renaming of all Win32 functions and types to use the
standard Windows names.
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index d4b7f5f..b1c6076 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -18,7 +18,7 @@
}
#define DC_GET_VAL_32( func_type, func_name, dc_field ) \
-func_type WINAPI func_name( HDC32 hdc ) \
+func_type WINAPI func_name( HDC hdc ) \
{ \
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); \
if (!dc) return 0; \
@@ -47,12 +47,12 @@
return TRUE; \
} \
\
-BOOL32 WINAPI func_name##32( HDC32 hdc, LP##type##32 pt ) \
+BOOL WINAPI func_name( HDC hdc, LP##type pt ) \
{ \
DC * dc = (DC *) GDI_GetObjPtr( (HDC16)hdc, DC_MAGIC ); \
if (!dc) return FALSE; \
- ((LPPOINT32)pt)->x = dc->ret_x; \
- ((LPPOINT32)pt)->y = dc->ret_y; \
+ ((LPPOINT)pt)->x = dc->ret_x; \
+ ((LPPOINT)pt)->y = dc->ret_y; \
return TRUE; \
}
@@ -74,9 +74,9 @@
}
#define DC_SET_MODE_32( func_name, dc_field, min_val, max_val, meta_func ) \
-INT32 WINAPI func_name( HDC32 hdc, INT32 mode ) \
+INT WINAPI func_name( HDC hdc, INT mode ) \
{ \
- INT32 prevMode; \
+ INT prevMode; \
DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC ); \
if ((mode < min_val) || (mode > max_val)) return 0; \
if (!dc) { \
@@ -93,51 +93,51 @@
DC_SET_MODE_16( SetBkMode16, w.backgroundMode, TRANSPARENT, /* GDI.2 */
OPAQUE, META_SETBKMODE )
-DC_SET_MODE_32( SetBkMode32, w.backgroundMode, TRANSPARENT, /* GDI32.306 */
+DC_SET_MODE_32( SetBkMode, w.backgroundMode, TRANSPARENT, /* GDI32.306 */
OPAQUE, META_SETBKMODE )
DC_SET_MODE_16( SetROP216, w.ROPmode, R2_BLACK, R2_WHITE, /* GDI.4 */
META_SETROP2 )
-DC_SET_MODE_32( SetROP232, w.ROPmode, R2_BLACK, R2_WHITE, /* GDI32.331 */
+DC_SET_MODE_32( SetROP2, w.ROPmode, R2_BLACK, R2_WHITE, /* GDI32.331 */
META_SETROP2 )
DC_SET_MODE_16( SetRelAbs16, w.relAbsMode, ABSOLUTE, RELATIVE, /* GDI.5 */
META_SETRELABS )
-DC_SET_MODE_32( SetRelAbs32, w.relAbsMode, ABSOLUTE, RELATIVE, /* GDI32.333 */
+DC_SET_MODE_32( SetRelAbs, w.relAbsMode, ABSOLUTE, RELATIVE, /* GDI32.333 */
META_SETRELABS )
DC_SET_MODE_16( SetPolyFillMode16, w.polyFillMode, /* GDI.6 */
ALTERNATE, WINDING, META_SETPOLYFILLMODE )
-DC_SET_MODE_32( SetPolyFillMode32, w.polyFillMode, /* GDI32.330 */
+DC_SET_MODE_32( SetPolyFillMode, w.polyFillMode, /* GDI32.330 */
ALTERNATE, WINDING, META_SETPOLYFILLMODE )
DC_SET_MODE_16( SetStretchBltMode16, w.stretchBltMode, /* GDI.7 */
BLACKONWHITE, COLORONCOLOR, META_SETSTRETCHBLTMODE )
-DC_SET_MODE_32( SetStretchBltMode32, w.stretchBltMode, /* GDI32.334 */
+DC_SET_MODE_32( SetStretchBltMode, w.stretchBltMode, /* GDI32.334 */
BLACKONWHITE, COLORONCOLOR, META_SETSTRETCHBLTMODE )
DC_GET_VAL_16( COLORREF, GetBkColor16, w.backgroundColor ) /* GDI.75 */
-DC_GET_VAL_32( COLORREF, GetBkColor32, w.backgroundColor ) /* GDI32.145 */
+DC_GET_VAL_32( COLORREF, GetBkColor, w.backgroundColor ) /* GDI32.145 */
DC_GET_VAL_16( INT16, GetBkMode16, w.backgroundMode ) /* GDI.76 */
-DC_GET_VAL_32( INT32, GetBkMode32, w.backgroundMode ) /* GDI32.146 */
-DC_GET_X_Y( DWORD, GetCurrentPosition, w.CursPosX, w.CursPosY ) /* GDI.78 */
+DC_GET_VAL_32( INT, GetBkMode, w.backgroundMode ) /* GDI32.146 */
+DC_GET_X_Y( DWORD, GetCurrentPosition16, w.CursPosX, w.CursPosY ) /* GDI.78 */
DC_GET_VAL_16( INT16, GetMapMode16, w.MapMode ) /* GDI.81 */
-DC_GET_VAL_32( INT32, GetMapMode32, w.MapMode ) /* GDI32.196 */
+DC_GET_VAL_32( INT, GetMapMode, w.MapMode ) /* GDI32.196 */
DC_GET_VAL_16( INT16, GetPolyFillMode16, w.polyFillMode ) /* GDI.84 */
-DC_GET_VAL_32( INT32, GetPolyFillMode32, w.polyFillMode ) /* GDI32.213 */
+DC_GET_VAL_32( INT, GetPolyFillMode, w.polyFillMode ) /* GDI32.213 */
DC_GET_VAL_16( INT16, GetROP216, w.ROPmode ) /* GDI.85 */
-DC_GET_VAL_32( INT32, GetROP232, w.ROPmode ) /* GDI32.214 */
+DC_GET_VAL_32( INT, GetROP2, w.ROPmode ) /* GDI32.214 */
DC_GET_VAL_16( INT16, GetRelAbs16, w.relAbsMode ) /* GDI.86 */
-DC_GET_VAL_32( INT32, GetRelAbs32, w.relAbsMode ) /* GDI32.218 */
+DC_GET_VAL_32( INT, GetRelAbs, w.relAbsMode ) /* GDI32.218 */
DC_GET_VAL_16( INT16, GetStretchBltMode16, w.stretchBltMode ) /* GDI.88 */
-DC_GET_VAL_32( INT32, GetStretchBltMode32, w.stretchBltMode ) /* GDI32.221 */
+DC_GET_VAL_32( INT, GetStretchBltMode, w.stretchBltMode ) /* GDI32.221 */
DC_GET_VAL_16( COLORREF, GetTextColor16, w.textColor ) /* GDI.90 */
-DC_GET_VAL_32( COLORREF, GetTextColor32, w.textColor ) /* GDI32.227 */
-DC_GET_X_Y( DWORD, GetViewportExt, vportExtX, vportExtY ) /* GDI.94 */
-DC_GET_X_Y( DWORD, GetViewportOrg, vportOrgX, vportOrgY ) /* GDI.95 */
-DC_GET_X_Y( DWORD, GetWindowExt, wndExtX, wndExtY ) /* GDI.96 */
-DC_GET_X_Y( DWORD, GetWindowOrg, wndOrgX, wndOrgY ) /* GDI.97 */
-DC_GET_VAL_16( HRGN16, InquireVisRgn, w.hVisRgn ) /* GDI.131 */
+DC_GET_VAL_32( COLORREF, GetTextColor, w.textColor ) /* GDI32.227 */
+DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY ) /* GDI.94 */
+DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY ) /* GDI.95 */
+DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY ) /* GDI.96 */
+DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY ) /* GDI.97 */
+DC_GET_VAL_16( HRGN16, InquireVisRgn16, w.hVisRgn ) /* GDI.131 */
DC_GET_VAL_16( HRGN16, GetClipRgn16, w.hClipRgn ) /* GDI.173 */
-DC_GET_X_Y( DWORD, GetBrushOrg, w.brushOrgX, w.brushOrgY ) /* GDI.149 */
+DC_GET_X_Y( DWORD, GetBrushOrg16, w.brushOrgX, w.brushOrgY ) /* GDI.149 */
DC_GET_VAL_16( UINT16, GetTextAlign16, w.textAlign ) /* GDI.345 */
-DC_GET_VAL_32( UINT32, GetTextAlign32, w.textAlign ) /* GDI32.224 */
-DC_GET_VAL_16( HFONT16, GetCurLogFont, w.hFont ) /* GDI.411 */
+DC_GET_VAL_32( UINT, GetTextAlign, w.textAlign ) /* GDI32.224 */
+DC_GET_VAL_16( HFONT16, GetCurLogFont16, w.hFont ) /* GDI.411 */
DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT ) /* GDI.469 GDI32.148 */
DC_GET_VAL_EX( GetCurrentPositionEx, w.CursPosX, w.CursPosY, /* GDI.470 GDI32.167 */
POINT )
