[PATCH] gdi32: Seperate the traces in CreateDC/CreateIC

Detlef Riekenberg wine.dev at web.de
Wed Oct 14 17:06:58 CDT 2009


---
 dlls/gdi32/dc.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index f7b295a..5269db1 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -636,6 +636,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
 
     GDI_CheckNotLock();
 
+    TRACE("(%s, %s, %s, %p)\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), initData);
     if (!device || !DRIVER_GetDriverName( device, buf, 300 ))
     {
         if (!driver)
@@ -657,9 +658,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
     dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP ));
     if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error;
 
-    TRACE("(driver=%s, device=%s, output=%s): returning %p\n",
-          debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf );
-
     if (dc->funcs->pCreateDC &&
         !dc->funcs->pCreateDC( hdc, &dc->physDev, buf, device, output, initData ))
     {
@@ -672,6 +670,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
 
     DC_InitDC( dc );
     release_dc_ptr( dc );
+    TRACE("==> %p\n", hdc);
     return hdc;
 
 error:
@@ -691,6 +690,7 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
     DEVMODEW *initDataW;
     HDC ret;
 
+    TRACE("(%s, %s, %s, %p)\n", debugstr_a(driver), debugstr_a(device), debugstr_a(output), initData);
     if (driver) RtlCreateUnicodeStringFromAsciiz(&driverW, driver);
     else driverW.Buffer = NULL;
 
@@ -714,6 +714,7 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
     RtlFreeUnicodeString(&deviceW);
     RtlFreeUnicodeString(&outputW);
     HeapFree(GetProcessHeap(), 0, initDataW);
+    TRACE("==> %p\n", ret);
     return ret;
 }
 
@@ -724,7 +725,9 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
 HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output,
                           const DEVMODEA* initData )
 {
-      /* Nothing special yet for ICs */
+
+    TRACE("(%s, %s, %s, %p)\n", debugstr_a(driver), debugstr_a(device), debugstr_a(output), initData);
+    /* Nothing special yet for ICs */
     return CreateDCA( driver, device, output, initData );
 }
 
@@ -735,7 +738,8 @@ HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output,
 HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output,
                           const DEVMODEW* initData )
 {
-      /* Nothing special yet for ICs */
+    TRACE("(%s, %s, %s, %p)\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), initData);
+    /* Nothing special yet for ICs */
     return CreateDCW( driver, device, output, initData );
 }
 
-- 
1.5.4.3


--=-Qb0faWjI/ScbeBlAOZ1W--




More information about the wine-patches mailing list