From 2c2a83d93c6e5c7fed335a889811561161db53a7 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Fri, 11 Jun 2021 23:04:15 +0200 Subject: [PATCH] fix logs --- src/IDirectDraw/IDirectDraw.c | 12 ++++++------ src/IDirectDraw/IDirectDrawClipper.c | 2 +- src/IDirectDraw/IDirectDrawGammaControl.c | 2 +- src/IDirectDraw/IDirectDrawPalette.c | 4 ++-- src/IDirectDraw/IDirectDrawSurface.c | 21 ++++++++++++++------- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/IDirectDraw/IDirectDraw.c b/src/IDirectDraw/IDirectDraw.c index af416a3..c7037be 100644 --- a/src/IDirectDraw/IDirectDraw.c +++ b/src/IDirectDraw/IDirectDraw.c @@ -11,7 +11,7 @@ HRESULT __stdcall IDirectDraw__QueryInterface(IDirectDrawImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("-> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); + TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = DDERR_UNSUPPORTED; @@ -191,7 +191,7 @@ HRESULT __stdcall IDirectDraw__CreateClipper( IUnknown FAR* pUnkOuter) { TRACE( - "-> %s(This=%p, dwFlags=%08X, DDClipper=%p, unkOuter=%p)\n", + "-> %s(This=%p, dwFlags=%08X, lplpDDClipper=%p, unkOuter=%p)\n", __FUNCTION__, This, dwFlags, @@ -212,7 +212,7 @@ HRESULT __stdcall IDirectDraw__CreatePalette( IUnknown FAR* unkOuter) { TRACE( - "-> %s(This=%p, dwFlags=%08X, DDColorArray=%p, DDPalette=%p, unkOuter=%p)\n", + "-> %s(This=%p, dwFlags=%08X, lpDDColorArray=%p, lpDDPalette=%p, unkOuter=%p)\n", __FUNCTION__, This, dwFlags, @@ -382,7 +382,7 @@ HRESULT __stdcall IDirectDraw__SetCooperativeLevel(IDirectDrawImpl* This, HWND h HRESULT __stdcall IDirectDraw__SetDisplayMode(IDirectDrawImpl* This, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) { - TRACE("-> %s(This=%p, width=%d, height=%d, bpp=%d)\n", __FUNCTION__, This, dwWidth, dwHeight, dwBPP); + TRACE("-> %s(This=%p, dwWidth=%d, dwHeight=%d, dwBPP=%d)\n", __FUNCTION__, This, dwWidth, dwHeight, dwBPP); HRESULT ret = dd_SetDisplayMode(dwWidth, dwHeight, dwBPP, TRUE); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -397,7 +397,7 @@ HRESULT __stdcall IDirectDraw__SetDisplayModeX( DWORD dwFlags) { TRACE( - "-> %s(This=%p, width=%d, height=%d, bpp=%d, refreshRate=%d, flags=%d)\n", + "-> %s(This=%p, dwWidth=%d, dwHeight=%d, dwBPP=%d, refreshRate=%d, dwFlags=%d)\n", __FUNCTION__, This, dwWidth, @@ -414,7 +414,7 @@ HRESULT __stdcall IDirectDraw__SetDisplayModeX( HRESULT __stdcall IDirectDraw__WaitForVerticalBlank(IDirectDrawImpl* This, DWORD dwFlags, HANDLE hEvent) { - TRACE_EXT("-> %s(This=%p, flags=%08X, handle=%p)\n", __FUNCTION__, This, dwFlags, hEvent); + TRACE_EXT("-> %s(This=%p, dwFlags=%08X, hEvent=%p)\n", __FUNCTION__, This, dwFlags, hEvent); HRESULT ret = dd_WaitForVerticalBlank(dwFlags, hEvent); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawClipper.c b/src/IDirectDraw/IDirectDrawClipper.c index d997e57..304cf69 100644 --- a/src/IDirectDraw/IDirectDrawClipper.c +++ b/src/IDirectDraw/IDirectDrawClipper.c @@ -4,7 +4,7 @@ HRESULT __stdcall IDirectDrawClipper__QueryInterface(IDirectDrawClipperImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawGammaControl.c b/src/IDirectDraw/IDirectDrawGammaControl.c index c512600..7676bc2 100644 --- a/src/IDirectDraw/IDirectDrawGammaControl.c +++ b/src/IDirectDraw/IDirectDrawGammaControl.c @@ -3,7 +3,7 @@ HRESULT __stdcall IDirectDrawGammaControl__QueryInterface(IDirectDrawGammaControlImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawPalette.c b/src/IDirectDraw/IDirectDrawPalette.c index b53537e..2f7ffc3 100644 --- a/src/IDirectDraw/IDirectDrawPalette.c +++ b/src/IDirectDraw/IDirectDrawPalette.c @@ -6,7 +6,7 @@ HRESULT __stdcall IDirectDrawPalette__QueryInterface(IDirectDrawPaletteImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = E_NOINTERFACE; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; @@ -42,7 +42,7 @@ ULONG __stdcall IDirectDrawPalette__Release(IDirectDrawPaletteImpl* This) HRESULT __stdcall IDirectDrawPalette__GetCaps(IDirectDrawPaletteImpl* This, LPDWORD lpdwCaps) { - TRACE("NOT_IMPLEMENTED -> %s(This=%p, caps=%p)\n", __FUNCTION__, This, lpdwCaps); + TRACE("NOT_IMPLEMENTED -> %s(This=%p, lpdwCaps=%p)\n", __FUNCTION__, This, lpdwCaps); HRESULT ret = DDERR_INVALIDOBJECT; TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); return ret; diff --git a/src/IDirectDraw/IDirectDrawSurface.c b/src/IDirectDraw/IDirectDrawSurface.c index ca740a4..98afbf6 100644 --- a/src/IDirectDraw/IDirectDrawSurface.c +++ b/src/IDirectDraw/IDirectDrawSurface.c @@ -8,7 +8,7 @@ HRESULT __stdcall IDirectDrawSurface__QueryInterface(IDirectDrawSurfaceImpl* This, REFIID riid, LPVOID FAR* ppvObj) { - TRACE("-> %s(This=%p, riid=%08X, obj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); + TRACE("-> %s(This=%p, riid=%08X, ppvObj=%p)\n", __FUNCTION__, This, (unsigned int)riid, ppvObj); HRESULT ret = S_OK; if (riid) @@ -175,7 +175,7 @@ HRESULT __stdcall IDirectDrawSurface__BltFast( DWORD dwFlags) { TRACE_EXT( - "-> %s(This=%p, x=%d, y=%d, lpDDSrcSurface=%p, lpSrcRect=%p, flags=%08X)\n", + "-> %s(This=%p, dwX=%d, dwY=%d, lpDDSrcSurface=%p, lpSrcRect=%p, dwFlags=%08X)\n", __FUNCTION__, This, dwX, @@ -236,8 +236,15 @@ HRESULT __stdcall IDirectDrawSurface__Flip( LPDIRECTDRAWSURFACE7 lpDDSurfaceTargetOverride, DWORD dwFlags) { - TRACE_EXT("-> %s(This=%p, surface=%p, flags=%08X)\n", __FUNCTION__, This, lpDDSurfaceTargetOverride, dwFlags); + TRACE_EXT( + "-> %s(This=%p, lpDDSurfaceTargetOverride=%p, dwFlags=%08X)\n", + __FUNCTION__, + This, + lpDDSurfaceTargetOverride, + dwFlags); + HRESULT ret = dds_Flip(This, (IDirectDrawSurfaceImpl*)lpDDSurfaceTargetOverride, dwFlags); + TRACE_EXT("<- %s\n", __FUNCTION__); return ret; } @@ -247,7 +254,7 @@ HRESULT __stdcall IDirectDrawSurface__GetAttachedSurface( LPDDSCAPS2 lpDdsCaps, LPDIRECTDRAWSURFACE7 FAR* lpDDsurface) { - TRACE("-> %s(This=%p, dwCaps=%08X, surface=%p)\n", __FUNCTION__, This, lpDdsCaps->dwCaps, lpDDsurface); + TRACE("-> %s(This=%p, dwCaps=%08X, lpDDsurface=%p)\n", __FUNCTION__, This, lpDdsCaps->dwCaps, lpDDsurface); HRESULT ret = dds_GetAttachedSurface(This, lpDdsCaps, (IDirectDrawSurfaceImpl**)lpDDsurface); TRACE("<- %s\n", __FUNCTION__); return ret; @@ -279,7 +286,7 @@ HRESULT __stdcall IDirectDrawSurface__GetClipper(IDirectDrawSurfaceImpl* This, L HRESULT __stdcall IDirectDrawSurface__GetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey) { - TRACE_EXT("-> %s(This=%p, flags=0x%08X, color_key=%p)\n", __FUNCTION__, This, dwFlags, lpColorKey); + TRACE_EXT("-> %s(This=%p, dwFlags=0x%08X, lpColorKey=%p)\n", __FUNCTION__, This, dwFlags, lpColorKey); HRESULT ret = dds_GetColorKey(This, dwFlags, lpColorKey); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -287,7 +294,7 @@ HRESULT __stdcall IDirectDrawSurface__GetColorKey(IDirectDrawSurfaceImpl* This, HRESULT __stdcall IDirectDrawSurface__GetDC(IDirectDrawSurfaceImpl* This, HDC FAR* lpHDC) { - TRACE_EXT("-> %s(This=%p, lpHDC=%p)\n", __FUNCTION__, This); + TRACE_EXT("-> %s(This=%p, lpHDC=%p)\n", __FUNCTION__, This, lpHDC); HRESULT ret = dds_GetDC(This, lpHDC); TRACE_EXT("<- %s\n", __FUNCTION__); return ret; @@ -400,7 +407,7 @@ HRESULT __stdcall IDirectDrawSurface__SetClipper(IDirectDrawSurfaceImpl* This, L HRESULT __stdcall IDirectDrawSurface__SetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKEY lpColorKey) { - TRACE_EXT("-> %s(This=%p, flags=0x%08X, color_key=%p)\n", __FUNCTION__, This, dwFlags, lpColorKey); + TRACE_EXT("-> %s(This=%p, dwFlags=0x%08X, lpColorKey=%p)\n", __FUNCTION__, This, dwFlags, lpColorKey); HRESULT ret = dds_SetColorKey(This, dwFlags, lpColorKey); TRACE_EXT("<- %s\n", __FUNCTION__); return ret;