Changeset 3864 for trunk/src/gdi32

Timestamp:

Jul 19, 2000, 9:05:27 PM (25 years ago)

Author:

sandervl

Message:

Changed makefiles for debug & retail odincrt, gdi32-region api wrapper change

Location:

trunk/src/gdi32

Files:

• gdi32.DEF (modified) (2 diffs)
• makefile (modified) (3 diffs)
• region.cpp (modified) (33 diffs)

trunk/src/gdi32/gdi32.DEF

@@ -1 @@
-; $Id: gdi32.DEF,v 1.8 2000-06-14 13:17:49 sandervl Exp $
+; $Id: gdi32.DEF,v 1.9 2000-07-19 19:05:06 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -359 +359 @@
     InternalGetTabbedTextExtentW @1005
 
-    setWinDeviceRegionFromPMDeviceRegion__FUlT1P7_DCDataT1     @1006
+    _setWinDeviceRegionFromPMDeviceRegion@16                   @1006
 
     ObjAllocateHandle__FPUlUl10ObjectType                      @1007

trunk/src/gdi32/makefile

@@ -1 @@
-# $Id: makefile,v 1.26 2000-06-14 13:17:50 sandervl Exp $
+# $Id: makefile,v 1.27 2000-07-19 19:05:06 sandervl Exp $
 
 #
@@ -20 +20 @@
 # Flag overloads and local macros.
 CLEANEXTRAS = gdi32rsrc.asm
-
 
 # Object files. All objects should be prefixed with $(OBJDIR)!
@@ -75 +74 @@
 $(PDWIN32_LIB)/kernel32.lib
 $(PDWIN32_LIB)/user32.lib
-$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/$(ODINCRT).lib
 OS2386.LIB
 $(RTLLIB_O)

trunk/src/gdi32/region.cpp

@@ -1 @@
-/* $Id: region.cpp,v 1.9 2000-06-16 11:05:22 sandervl Exp $ */
+/* $Id: region.cpp,v 1.10 2000-07-19 19:05:06 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #define  INCL_GPI
 #define  INCL_WIN
-#include <os2wrap.h>
+#include <os2.h> //no wrappers required here!
 
 #include <win32type.h>
@@ -24 +24 @@
 #include <string.h>
 #include <misc.h>
+#include <odinwrap.h>
 #include <objhandle.h>
 #include <dcdata.h>
@@ -294 +295 @@
 }
 //******************************************************************************
-//******************************************************************************
-BOOL setWinDeviceRegionFromPMDeviceRegion(HRGN winHrgn, HRGN pmHrgn, pDCData pHpsPmHrgn, HWND hwndPmHrgn)
+//exported (used by user32)
+//******************************************************************************
+BOOL WIN32API setWinDeviceRegionFromPMDeviceRegion(HRGN winHrgn, HRGN pmHrgn, pDCData pHpsPmHrgn, HWND hwndPmHrgn)
 {
     BOOL    success;
@@ -358 +360 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API SelectClipRgn(HDC hdc, HRGN hrgn)
+ODINFUNCTIONNODBG2(int, SelectClipRgn, HDC, hdc, HRGN, hrgn)
 {
  LONG lComplexity = RGN_NULL;
@@ -421 +423 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API ExtSelectClipRgn(HDC hdc, HRGN hrgn, int mode)
+ODINFUNCTIONNODBG3(int, ExtSelectClipRgn, HDC, hdc, HRGN, hrgn, int, mode)
 {
    pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -524 +526 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetClipBox(HDC hdc, PRECT lpRect)
+ODINFUNCTIONNODBG2(int, GetClipBox, HDC, hdc, PRECT, lpRect)
 {
  pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -585 +587 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetClipRgn(HDC hdc, HRGN hrgn)
+ODINFUNCTIONNODBG2(int, GetClipRgn, HDC, hdc, HRGN, hrgn)
 {
    pDCData    pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -628 +630 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API ExcludeClipRect(HDC hdc, int left, int top, int right, int bottom)
+ODINFUNCTIONNODBG5(int, ExcludeClipRect, HDC, hdc, int, left, int, top, int, right, int, bottom)
 {
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -662 +664 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API IntersectClipRect(HDC hdc, int left, int top, int right, int bottom)
+ODINFUNCTIONNODBG5(int, IntersectClipRect, HDC, hdc, int, left, int, top, int, right, int, bottom)
 {
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -692 +694 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API OffsetClipRgn(HDC hdc, int nXOffset, int nYOffset )
+ODINFUNCTIONNODBG3(int, OffsetClipRgn, HDC, hdc, int, nXOffset, int, nYOffset )
 {
    BOOL      success;
@@ -715 +717 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreatePolyPolygonRgn(const POINT * lppt, const int *pPolyCount, int nCount, int fnPolyFillMode)
+ODINFUNCTIONNODBG4(HRGN, CreatePolyPolygonRgn, const POINT * , lppt, const int *, pPolyCount, int,  nCount, int, fnPolyFillMode)
 {
  LONG  flMode;
@@ -773 +775 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreateRectRgn( int left, int top, int right, int bottom)
+ODINFUNCTIONNODBG4(HRGN, CreateRectRgn, int, left, int, top, int, right, int, bottom)
 {
  HRGN   hrgn;
@@ -795 +797 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreateRectRgnIndirect(const RECT *lprc)
+ODINFUNCTIONNODBG1(HRGN, CreateRectRgnIndirect, const RECT *, lprc)
 {
    return CreateRectRgn(lprc->left, lprc->top, lprc->right, lprc->bottom);
@@ -801 +803 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreateRoundRectRgn(int left, int top, int right, int bottom, int nWidthEllipse, int nHeightEllipse)
+ODINFUNCTIONNODBG6(HRGN, CreateRoundRectRgn, int, left, int, top, int, right, int, bottom, int, nWidthEllipse, int, nHeightEllipse)
 {
  HRGN   hrgn;
@@ -827 +829 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API ExtCreateRegion(const XFORM_W *pXform, DWORD count, const RGNDATA *pData)
+ODINFUNCTIONNODBG3(HRGN, ExtCreateRegion, const XFORM_W *, pXform, DWORD, count, const RGNDATA *, pData)
 {
    HRGN hrgn;
@@ -936 +938 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreateEllipticRgn(int left, int top, int right, int bottom)
+ODINFUNCTIONNODBG4(HRGN, CreateEllipticRgn, int, left, int, top, int, right, int, bottom)
 {
  HRGN hrgn;
@@ -957 +959 @@
 //******************************************************************************
 //******************************************************************************
-HRGN WIN32API CreateEllipticRgnIndirect(const RECT *pRect)
-{
-   return CreateEllipticRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);
-}
-//******************************************************************************
-//******************************************************************************
-HRGN WIN32API CreatePolygonRgn(const POINT *lppt, int cPoints, int fnPolyFillMode)
+ODINFUNCTIONNODBG1(HRGN, CreateEllipticRgnIndirect, const RECT *, pRect)
+{
+   return ODIN_CreateEllipticRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTIONNODBG3(HRGN, CreatePolygonRgn, const POINT *, lppt, int, cPoints, int, fnPolyFillMode)
 {
     HRGN hrgn;
@@ -1007 +1009 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API CombineRgn(HRGN hrgnDest, HRGN hrgnSrc1, HRGN hrgnSrc2, int combineMode)
+ODINFUNCTIONNODBG4(int, CombineRgn, HRGN, hrgnDest, HRGN, hrgnSrc1, HRGN, hrgnSrc2, int, combineMode)
 {
     ULONG lComplexity;
@@ -1054 +1056 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API EqualRgn(HRGN hrgn1, HRGN hrgn2)
+ODINFUNCTIONNODBG2(BOOL, EqualRgn, HRGN, hrgn1, HRGN, hrgn2)
 {
    LONG lEquality;
@@ -1081 +1083 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API SetRectRgn(HRGN hrgn, int left, int top, int right, int bottom)
+ODINFUNCTIONNODBG5(BOOL, SetRectRgn, HRGN, hrgn, int, left, int, top, int, right, int, bottom)
 {
    BOOL    result = FALSE;
@@ -1101 +1103 @@
 //******************************************************************************
 //******************************************************************************
-ULONG WIN32API GetRegionData(HRGN hrgn, ULONG count, PRGNDATA pData)
+ODINFUNCTIONNODBG3(ULONG, GetRegionData, HRGN, hrgn, ULONG, count, PRGNDATA, pData)
 {
     if(!count && pData)
@@ -1162 +1164 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetRgnBox(HRGN hrgn, PRECT pRect)
+ODINFUNCTIONNODBG2(int, GetRgnBox, HRGN, hrgn, PRECT, pRect)
 {
    BOOL      success;
@@ -1197 +1199 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API InvertRgn(HDC hdc, HRGN hrgn)
+ODINFUNCTIONNODBG2(BOOL, InvertRgn, HDC, hdc, HRGN, hrgn)
 {
     pDCData pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -1245 +1247 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API OffsetRgn(HRGN hrgn, int xOffset, int yOffset)
+ODINFUNCTIONNODBG3(int, OffsetRgn, HRGN, hrgn, int, xOffset, int, yOffset)
 {
    LONG   lComplexity;
@@ -1289 +1291 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API FrameRgn(HDC hdc, HRGN hrgn, HBRUSH hBrush, int width, int height)
+ODINFUNCTIONNODBG5(BOOL, FrameRgn, HDC, hdc, HRGN, hrgn, HBRUSH, hBrush, int, width, int, height)
 {
     HBRUSH hbrushRestore = 0;
@@ -1331 +1333 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API FillRgn(HDC hdc, HRGN hrgn, HBRUSH hBrush)
+ODINFUNCTIONNODBG3(BOOL, FillRgn, HDC, hdc, HRGN, hrgn, HBRUSH, hBrush)
 {
  BOOL   success;
@@ -1371 +1373 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API PaintRgn(HDC hdc, HRGN hrgn)
+ODINFUNCTIONNODBG2(BOOL, PaintRgn, HDC, hdc, HRGN, hrgn)
 {
    pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -1384 +1386 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API PtInRegion( HRGN hrgn, int x, int y)
+ODINFUNCTIONNODBG3(BOOL, PtInRegion, HRGN, hrgn, int, x, int, y)
 {
    BOOL      success;
@@ -1414 +1416 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API RectInRegion(HRGN hrgn, const RECT *pRect)
+ODINFUNCTIONNODBG2(BOOL, RectInRegion, HRGN, hrgn, const RECT *, pRect)
 {
    BOOL      success;
@@ -1456 +1458 @@
 //Returned region in device coordinates (undocumented behaviour)
 //******************************************************************************
-HRGN WIN32API PathToRegion(HDC hdc)
+ODINFUNCTIONNODBG1(HRGN, PathToRegion, HDC, hdc)
 {
     pDCData  pHps = (pDCData)OSLibGpiQueryDCData((HPS)hdc);
@@ -1518 +1520 @@
  *****************************************************************************/
 
-int WIN32API GetMetaRgn(HDC  hdc,
-                        HRGN hrgn)
+ODINFUNCTIONNODBG2(int, GetMetaRgn, HDC,  hdc, HRGN, hrgn)
 {
   dprintf(("GDI32: GetMetaRgn(%08xh, %08xh) not implemented.\n",
@@ -1543 +1544 @@
  *****************************************************************************/
 
-BOOL WIN32API SetMetaRgn(HDC hdc)
+ODINFUNCTIONNODBG1(BOOL, SetMetaRgn, HDC, hdc)
 {
   dprintf(("GDI32: SetMetaRgn(%08xh) not implemented.\n",