Changeset 7635 for trunk/src/gdi32/gdi32.cpp

Timestamp:

Dec 15, 2001, 7:51:16 PM (24 years ago)

Author:

sandervl

Message:

Added statistics for font, bitmap, pen, brush & region objects.

File:

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

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.76 2001-11-13 15:42:05 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.77 2001-12-15 18:50:26 sandervl Exp $ */
 
 /*
@@ -25 +25 @@
 #include <winuser32.h>
 #include "font.h"
+#include <stats.h>
 
 #define DBG_LOCALLOG    DBG_gdi32
@@ -77 +78 @@
 //******************************************************************************
 //******************************************************************************
-HBRUSH WIN32API CreatePatternBrush(HBITMAP arg1)
-{
- HBRUSH brush;
-
-    brush = O32_CreatePatternBrush(arg1);
-    dprintf(("GDI32: CreatePatternBrush from bitmap %X returned %X\n", arg1, brush));
-    return(brush);
-}
-//******************************************************************************
-//******************************************************************************
 ODINFUNCTION3(HPEN, CreatePen, int, fnPenStyle, int, nWidth, COLORREF, crColor)
 {
+ HPEN hPen;
+
     //CB: todo: PS_DOT is different in Win32 (. . . . and not - - - -)
     //    Open32 looks like LINETYPE_SHORTDASH instead of LINETYPE_DOT!!!
     //    -> difficult to fix without performance decrease!
 
-    return O32_CreatePen(fnPenStyle,nWidth,crColor);
+    hPen = O32_CreatePen(fnPenStyle,nWidth,crColor);
+    if(hPen) STATS_CreatePen(hPen, fnPenStyle,nWidth,crColor);
+    return hPen;
 }
 //******************************************************************************
@@ -99 +94 @@
 HPEN WIN32API CreatePenIndirect(const LOGPEN * lplgpn)
 {
+ HPEN hPen;
+
     dprintf(("GDI32: CreatePenIndirect %x", lplgpn));
-    return O32_CreatePenIndirect(lplgpn);
+    hPen = O32_CreatePenIndirect(lplgpn);
+    if(hPen) STATS_CreatePenIndirect(hPen, lplgpn);
+    return hPen;
+}
+//******************************************************************************
+//******************************************************************************
+HPEN WIN32API ExtCreatePen(DWORD dwPenStyle, DWORD dwWidth, const LOGBRUSH *lplb, 
+                           DWORD dwStyleCount, const DWORD *lpStyle)
+{
+ HPEN hPen;
+
+    hPen = O32_ExtCreatePen(dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle);
+    dprintf(("GDI32: ExtCreatePen %x %x %x %x %x returned %x", dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle, hPen));
+    if(hPen) STATS_ExtCreatePen(hPen, dwPenStyle, dwWidth, lplb, dwStyleCount, lpStyle);
+    return hPen;
+}
+//******************************************************************************
+//******************************************************************************
+HBRUSH WIN32API CreatePatternBrush(HBITMAP hBitmap)
+{
+ HBRUSH hBrush;
+
+    hBrush = O32_CreatePatternBrush(hBitmap);
+    if(hBrush) STATS_CreatePatternBrush(hBrush, hBitmap);
+
+    dprintf(("GDI32: CreatePatternBrush from bitmap %X returned %X\n", hBitmap, hBrush));
+    return(hBrush);
+}
+//******************************************************************************
+//******************************************************************************
+ODINFUNCTION1(HBRUSH, CreateSolidBrush, COLORREF, color)
+{
+    HBRUSH hBrush;
+
+    hBrush = O32_CreateSolidBrush(color);
+    if(hBrush) STATS_CreateSolidBrush(hBrush, color);
+    return(hBrush);
+}
+//******************************************************************************
+//******************************************************************************
+HBRUSH WIN32API CreateBrushIndirect( const LOGBRUSH *pLogBrush)
+{
+ HBRUSH hBrush;
+
+    hBrush = O32_CreateBrushIndirect((LPLOGBRUSH)pLogBrush);
+    dprintf(("GDI32: CreateBrushIndirect %x %x %x returned %x", pLogBrush->lbStyle, pLogBrush->lbColor, pLogBrush->lbHatch, hBrush));
+    if(hBrush) STATS_CreateBrushIndirect(hBrush, (LPLOGBRUSH)pLogBrush);
+    return hBrush;
+}
+//******************************************************************************
+//******************************************************************************
+HBRUSH WIN32API CreateHatchBrush(int fnStyle, COLORREF clrref)
+{
+ HBRUSH hBrush;
+ 
+    dprintf(("GDI32: CreateHatchBrush %x %x", fnStyle, clrref));
+    hBrush = O32_CreateHatchBrush(fnStyle, clrref);
+    if(hBrush) STATS_CreateHatchBrush(hBrush, fnStyle, clrref);
+    return hBrush;
 }
 //******************************************************************************
@@ -106 +161 @@
 HBRUSH WIN32API CreateDIBPatternBrushPt( const VOID * buffer, UINT usage)
 {
+ HBRUSH hBrush;
+
     dprintf(("GDI32: CreateDIBPatternBrushPt %x %x", buffer, usage));
-    return O32_CreateDIBPatternBrushPt(buffer, usage);
+    hBrush = O32_CreateDIBPatternBrushPt(buffer, usage);
+    if(hBrush) STATS_CreateDIBPatternBrushPt(hBrush, buffer, usage);
+    return hBrush;
 }
 /*****************************************************************************
@@ -151 +210 @@
   }
   else {
-      dprintf(("ERROR: CreateDIBPatternBrush (%08xh, %08xh) -> INVALID memory handle!!",
+      dprintf(("!ERROR!: CreateDIBPatternBrush (%08xh, %08xh) -> INVALID memory handle!!",
                 hglbDIBPacked, fuColorSpec));
   }
@@ -166 +225 @@
     if (!oldcp) /* If new DC is to be created */
         oldcp = GetDisplayCodepage();
+
+    if(newHdc) STATS_CreateCompatibleDC(hdc, newHdc);
 
     OSLibGpiSetCp(newHdc, oldcp);
@@ -197 +258 @@
   }
 
+  STATS_DeleteDC(hdc);
   return O32_DeleteDC(hdc);
 }
@@ -310 +372 @@
     dprintf(("GDI32: CloseFigure %x", hdc));
     return O32_CloseFigure(hdc);
-}
-//******************************************************************************
-//******************************************************************************
-HBRUSH WIN32API CreateBrushIndirect( const LOGBRUSH *pLogBrush)
-{
- HBRUSH hBrush;
-
-    hBrush = O32_CreateBrushIndirect((LPLOGBRUSH)pLogBrush);
-    dprintf(("GDI32: CreateBrushIndirect %x %x %x returned %x", pLogBrush->lbStyle, pLogBrush->lbColor, pLogBrush->lbHatch, hBrush));
-    return hBrush;
 }
 //******************************************************************************
@@ -342 +394 @@
     if(hdc) {
         OSLibGpiSetCp(hdc, GetDisplayCodepage());
+        STATS_CreateDCA(hdc, lpszDriver, lpszDevice, lpszOutput, lpInitData);
     }
 
@@ -422 +475 @@
 //******************************************************************************
 //******************************************************************************
-HBRUSH WIN32API CreateHatchBrush( int arg1, COLORREF  arg2)
-{
-    dprintf(("GDI32: CreateHatchBrush"));
-    return O32_CreateHatchBrush(arg1, arg2);
-}
-//******************************************************************************
-//******************************************************************************
 HDC WIN32API CreateICA(LPCSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszOutput,
                        const DEVMODEA *lpdvmInit)
 {
  static char *szDisplay = "DISPLAY";
+ HDC          hdc;
 
     dprintf(("GDI32: CreateICA"));
@@ -443 +490 @@
         lpszDriver = lpszDevice;
     }
-    return O32_CreateIC(lpszDriver, lpszDevice, lpszOutput, lpdvmInit);
+    hdc = O32_CreateIC(lpszDriver, lpszDevice, lpszOutput, lpdvmInit);
+    if(hdc) STATS_CreateICA(hdc, lpszDriver, lpszDevice, lpszOutput, lpdvmInit);
+    return hdc;
 }
 //******************************************************************************
@@ -519 +568 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION1(HBRUSH, CreateSolidBrush, COLORREF, color)
-{
-    return O32_CreateSolidBrush(color);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API Ellipse(HDC hdc, int nLeftRect, int nTopRect, int nRightRect,
                       int nBottomRect)
@@ -631 +674 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API EnumObjects( HDC hdc, int objType, GOBJENUMPROC objFunc, LPARAM lParam)
-{
-    //calling convention differences
-    dprintf(("ERROR: GDI32: EnumObjects STUB"));
-//    return O32_EnumObjects(arg1, arg2, arg3, arg4);
-    return 0;
-}
-//******************************************************************************
-//******************************************************************************
 int WIN32API Escape( HDC hdc, int nEscape, int cbInput, LPCSTR lpvInData, PVOID lpvOutData)
 {
@@ -651 +685 @@
 
     return rc;
-}
-//******************************************************************************
-//******************************************************************************
-HPEN WIN32API ExtCreatePen( DWORD arg1, DWORD arg2, const LOGBRUSH * arg3, DWORD arg4, const DWORD *  arg5)
-{
-    dprintf(("GDI32: ExtCreatePen"));
-    return O32_ExtCreatePen(arg1, arg2, arg3, arg4, arg5);
 }
 //******************************************************************************
@@ -778 +805 @@
     dprintf(("GDI32: GetCharWidth32W might not work properly %x %x %x %x", hdc, iFirstChar, iLastChar, pWidthArray));
     return O32_GetCharWidth(hdc, iFirstChar, iLastChar, pWidthArray);
-}
-//******************************************************************************
-//******************************************************************************
-HANDLE WIN32API GetCurrentObject( HDC hdc, UINT arg2)
-{
-    dprintf(("GDI32: GetCurrentObject %x %x", hdc, arg2));
-    return (HANDLE)O32_GetCurrentObject(hdc, arg2);
 }
 //******************************************************************************
@@ -1157 +1177 @@
 //******************************************************************************
 //******************************************************************************
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API UnrealizeObject( HGDIOBJ hObject)
-{
-    dprintf(("GDI32: UnrealizeObject %x", hObject));
-    return O32_UnrealizeObject(hObject);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL WIN32API WidenPath( HDC hdc)
 {