From bf79aa0db8d3b8fc34e9d487b0c6cb787407d088 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Sun, 14 Apr 2019 08:22:00 +0200 Subject: [PATCH] adjust logging --- src/clipper.c | 14 +++++++------- src/main.c | 40 +++++++++++++--------------------------- src/palette.c | 6 +++--- src/surface.c | 40 ++++++++++++++++++++-------------------- 4 files changed, 43 insertions(+), 57 deletions(-) diff --git a/src/clipper.c b/src/clipper.c index 6660950..fd70511 100644 --- a/src/clipper.c +++ b/src/clipper.c @@ -20,7 +20,7 @@ HRESULT __stdcall ddraw_clipper_QueryInterface(IDirectDrawClipperImpl *This, REFIID riid, void **obj) { - printf("DirectDrawClipper::QueryInterface(This=%p, riid=%08X, obj=%p) ???\n", This, (unsigned int)riid, obj); + printf("??? DirectDrawClipper::QueryInterface(This=%p, riid=%08X, obj=%p)\n", This, (unsigned int)riid, obj); return S_OK; } @@ -52,37 +52,37 @@ ULONG __stdcall ddraw_clipper_Release(IDirectDrawClipperImpl *This) HRESULT __stdcall ddraw_clipper_GetClipList(IDirectDrawClipperImpl *This, LPRECT a, LPRGNDATA b, LPDWORD c) { - printf("IDirectDrawClipper::GetClipList(This=%p, ...) ???\n", This); + printf("??? IDirectDrawClipper::GetClipList(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_clipper_GetHWnd(IDirectDrawClipperImpl *This, HWND FAR *a) { - printf("IDirectDrawClipper::GetHWnd(This=%p, ...) ???\n", This); + printf("??? IDirectDrawClipper::GetHWnd(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_clipper_Initialize(IDirectDrawClipperImpl *This, LPDIRECTDRAW a, DWORD b) { - printf("IDirectDrawClipper::Initialize(This=%p, ...) ???\n", This); + printf("??? IDirectDrawClipper::Initialize(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_clipper_IsClipListChanged(IDirectDrawClipperImpl *This, BOOL FAR *a) { - printf("IDirectDrawClipper::IsClipListChanged(This=%p, ...) ???\n", This); + printf("??? IDirectDrawClipper::IsClipListChanged(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_clipper_SetClipList(IDirectDrawClipperImpl *This, LPRGNDATA a, DWORD b) { - printf("IDirectDrawClipper::SetClipList(This=%p, ...) ???\n", This); + printf("??? IDirectDrawClipper::SetClipList(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_clipper_SetHWnd(IDirectDrawClipperImpl *This, DWORD a, HWND b) { - printf("IDirectDrawClipper::SetHWnd(This=%p, ...) ???\n", This); + printf("??? IDirectDrawClipper::SetHWnd(This=%p, ...)\n", This); return DD_OK; } diff --git a/src/main.c b/src/main.c index 810cb78..4c9bd1f 100644 --- a/src/main.c +++ b/src/main.c @@ -225,14 +225,14 @@ void LimitGameTicks() HRESULT __stdcall ddraw_Compact(IDirectDrawImpl *This) { - printf("DirectDraw::Compact(This=%p) ???\n", This); + printf("??? DirectDraw::Compact(This=%p)\n", This); return DD_OK; } HRESULT __stdcall ddraw_DuplicateSurface(IDirectDrawImpl *This, LPDIRECTDRAWSURFACE src, LPDIRECTDRAWSURFACE *dest) { - printf("DirectDraw::DuplicateSurface(This=%p, ...) ???\n", This); + printf("??? DirectDraw::DuplicateSurface(This=%p, ...)\n", This); return DD_OK; } @@ -377,13 +377,13 @@ HRESULT __stdcall ddraw_EnumDisplayModes(IDirectDrawImpl *This, DWORD dwFlags, L HRESULT __stdcall ddraw_EnumSurfaces(IDirectDrawImpl *This, DWORD a, LPDDSURFACEDESC b, LPVOID c, LPDDENUMSURFACESCALLBACK d) { - printf("DirectDraw::EnumSurfaces(This=%p, ...) ???\n", This); + printf("??? DirectDraw::EnumSurfaces(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_FlipToGDISurface(IDirectDrawImpl *This) { - printf("DirectDraw::FlipToGDISurface(This=%p) ???\n", This); + printf("??? DirectDraw::FlipToGDISurface(This=%p)\n", This); return DD_OK; } @@ -420,44 +420,44 @@ HRESULT __stdcall ddraw_GetCaps(IDirectDrawImpl *This, LPDDCAPS lpDDDriverCaps, HRESULT __stdcall ddraw_GetDisplayMode(IDirectDrawImpl *This, LPDDSURFACEDESC a) { - printf("DirectDraw::GetDisplayMode(This=%p, ...) ???\n", This); + printf("??? DirectDraw::GetDisplayMode(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_GetFourCCCodes(IDirectDrawImpl *This, LPDWORD a, LPDWORD b) { - printf("DirectDraw::GetFourCCCodes(This=%p, ...) ???\n", This); + printf("??? DirectDraw::GetFourCCCodes(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_GetGDISurface(IDirectDrawImpl *This, LPDIRECTDRAWSURFACE *a) { - printf("DirectDraw::GetGDISurface(This=%p, ...) ???\n", This); + printf("??? DirectDraw::GetGDISurface(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_GetMonitorFrequency(IDirectDrawImpl *This, LPDWORD a) { - printf("DirectDraw::GetMonitorFrequency(This=%p, ...) ???\n", This); + printf("??? DirectDraw::GetMonitorFrequency(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_GetScanLine(IDirectDrawImpl *This, LPDWORD a) { - printf("DirectDraw::GetScanLine(This=%p, ...) ???\n", This); + printf("??? DirectDraw::GetScanLine(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_GetVerticalBlankStatus(IDirectDrawImpl *This, LPBOOL lpbIsInVB) { - printf("DirectDraw::GetVerticalBlankStatus(This=%p, ...) ???\n", This); + printf("??? DirectDraw::GetVerticalBlankStatus(This=%p, ...)\n", This); *lpbIsInVB = TRUE; return DD_OK; } HRESULT __stdcall ddraw_Initialize(IDirectDrawImpl *This, GUID *a) { - printf("DirectDraw::Initialize(This=%p, ...) ???\n", This); + printf("??? DirectDraw::Initialize(This=%p, ...)\n", This); return DD_OK; } @@ -1476,7 +1476,7 @@ HRESULT __stdcall ddraw_SetCooperativeLevel(IDirectDrawImpl *This, HWND hWnd, DW HRESULT __stdcall ddraw_WaitForVerticalBlank(IDirectDrawImpl *This, DWORD a, HANDLE b) { #if _DEBUG_X - printf("DirectDraw::WaitForVerticalBlank(This=%p, ...) ???\n", This); + printf("??? DirectDraw::WaitForVerticalBlank(This=%p, ...)\n", This); #endif return DD_OK; } @@ -1618,21 +1618,7 @@ struct IDirectDrawImplVtbl iface = HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACK lpCallback, LPVOID lpContext) { - printf("DirectDrawEnumerateA(lpCallback=%p, lpContext=%p) ???\n", lpCallback, lpContext); - /* - HMODULE hddraw = LoadLibrary("system32\\ddraw.dll"); - - if (hddraw) - { - HRESULT(WINAPI *DDrawEnumerateA)(LPDDENUMCALLBACK, LPVOID) = - (HRESULT(WINAPI *)(LPDDENUMCALLBACK, LPVOID))GetProcAddress(hddraw, "DirectDrawEnumerateA"); - - if (DDrawEnumerateA) - return DDrawEnumerateA(lpCallback, lpContext); - - FreeLibrary(hddraw); - } - */ + printf("??? DirectDrawEnumerateA(lpCallback=%p, lpContext=%p)\n", lpCallback, lpContext); if (lpCallback) lpCallback(NULL, "display", "(null)", lpContext); diff --git a/src/palette.c b/src/palette.c index d2828be..be87311 100644 --- a/src/palette.c +++ b/src/palette.c @@ -72,7 +72,7 @@ HRESULT __stdcall ddraw_palette_SetEntries(IDirectDrawPaletteImpl *This, DWORD d HRESULT __stdcall ddraw_palette_QueryInterface(IDirectDrawPaletteImpl *This, REFIID riid, void **obj) { - printf("DirectDrawPalette::QueryInterface(This=%p, riid=%08X, obj=%p) ???\n", This, (unsigned int)riid, obj); + printf("??? DirectDrawPalette::QueryInterface(This=%p, riid=%08X, obj=%p)\n", This, (unsigned int)riid, obj); return S_OK; } @@ -105,13 +105,13 @@ ULONG __stdcall ddraw_palette_Release(IDirectDrawPaletteImpl *This) HRESULT __stdcall ddraw_palette_GetCaps(IDirectDrawPaletteImpl *This, LPDWORD caps) { - printf("DirectDrawPalette::GetCaps(This=%p, caps=%p) ???\n", This, caps); + printf("??? DirectDrawPalette::GetCaps(This=%p, caps=%p)\n", This, caps); return DD_OK; } HRESULT __stdcall ddraw_palette_Initialize(IDirectDrawPaletteImpl *This, LPDIRECTDRAW lpDD, DWORD dw, LPPALETTEENTRY paent) { - printf("DirectDrawPalette::Initialize(This=%p, ...) ???\n", This); + printf("??? DirectDrawPalette::Initialize(This=%p, ...)\n", This); return DD_OK; } diff --git a/src/surface.c b/src/surface.c index bbc8a89..4d5ad44 100644 --- a/src/surface.c +++ b/src/surface.c @@ -32,7 +32,7 @@ DWORD WINAPI render_soft_main(void); HRESULT __stdcall ddraw_surface_QueryInterface(IDirectDrawSurfaceImpl *This, REFIID riid, void **obj) { - printf("DirectDrawSurface::QueryInterface(This=%p, riid=%08X, obj=%p) ???\n", This, (unsigned int)riid, obj); + printf("??? DirectDrawSurface::QueryInterface(This=%p, riid=%08X, obj=%p)\n", This, (unsigned int)riid, obj); if (riid && !IsEqualGUID(&IID_IDirectDrawSurface, riid)) { @@ -93,14 +93,14 @@ ULONG __stdcall ddraw_surface_Release(IDirectDrawSurfaceImpl *This) HRESULT __stdcall ddraw_surface_AddAttachedSurface(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWSURFACE lpDDSurface) { - printf("DirectDrawSurface::AddAttachedSurface(This=%p, lpDDSurface=%p) ???\n", This, lpDDSurface); + printf("??? DirectDrawSurface::AddAttachedSurface(This=%p, lpDDSurface=%p)\n", This, lpDDSurface); IDirectDrawSurface_AddRef(lpDDSurface); return DD_OK; } HRESULT __stdcall ddraw_surface_AddOverlayDirtyRect(IDirectDrawSurfaceImpl *This, LPRECT a) { - printf("DirectDrawSurface::AddOverlayDirtyRect(This=%p, ...) ???\n", This); + printf("??? DirectDrawSurface::AddOverlayDirtyRect(This=%p, ...)\n", This); return DD_OK; } @@ -476,7 +476,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR HRESULT __stdcall ddraw_surface_BltBatch(IDirectDrawSurfaceImpl *This, LPDDBLTBATCH a, DWORD b, DWORD c) { - printf("IDirectDrawSurface::BltBatch(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::BltBatch(This=%p, ...)\n", This); return DD_OK; } @@ -665,7 +665,7 @@ HRESULT __stdcall ddraw_surface_EnumAttachedSurfaces(IDirectDrawSurfaceImpl *Thi HRESULT __stdcall ddraw_surface_EnumOverlayZOrders(IDirectDrawSurfaceImpl *This, DWORD a, LPVOID b, LPDDENUMSURFACESCALLBACK c) { - printf("IDirectDrawSurface::EnumOverlayZOrders(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::EnumOverlayZOrders(This=%p, ...)\n", This); return DD_OK; } @@ -741,7 +741,7 @@ HRESULT __stdcall ddraw_surface_Flip(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWS HRESULT __stdcall ddraw_surface_GetAttachedSurface(IDirectDrawSurfaceImpl *This, LPDDSCAPS lpDdsCaps, LPDIRECTDRAWSURFACE FAR *surface) { - printf("IDirectDrawSurface::GetAttachedSurface(This=%p, dwCaps=%08X, surface=%p) ???\n", This, lpDdsCaps->dwCaps, surface); + printf("??? IDirectDrawSurface::GetAttachedSurface(This=%p, dwCaps=%08X, surface=%p)\n", This, lpDdsCaps->dwCaps, surface); if ((This->caps & DDSCAPS_PRIMARYSURFACE) && (This->caps & DDSCAPS_FLIP) && (lpDdsCaps->dwCaps & DDSCAPS_BACKBUFFER)) { @@ -755,7 +755,7 @@ HRESULT __stdcall ddraw_surface_GetAttachedSurface(IDirectDrawSurfaceImpl *This, HRESULT __stdcall ddraw_surface_GetBltStatus(IDirectDrawSurfaceImpl *This, DWORD a) { #if _DEBUG_X - printf("IDirectDrawSurface::GetBltStatus(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::GetBltStatus(This=%p, ...)\n", This); #endif return DD_OK; } @@ -770,7 +770,7 @@ HRESULT __stdcall ddraw_surface_GetCaps(IDirectDrawSurfaceImpl *This, LPDDSCAPS HRESULT __stdcall ddraw_surface_GetClipper(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWCLIPPER FAR *a) { #if _DEBUG_X - printf("IDirectDrawSurface::GetClipper(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::GetClipper(This=%p, ...)\n", This); #endif return DD_OK; } @@ -778,7 +778,7 @@ HRESULT __stdcall ddraw_surface_GetClipper(IDirectDrawSurfaceImpl *This, LPDIREC HRESULT __stdcall ddraw_surface_GetColorKey(IDirectDrawSurfaceImpl *This, DWORD flags, LPDDCOLORKEY colorKey) { #if _DEBUG_X - printf("DirectDrawSurface::GetColorKey(This=%p, flags=0x%08X, colorKey=%p) ???\n", This, flags, colorKey); + printf("??? DirectDrawSurface::GetColorKey(This=%p, flags=0x%08X, colorKey=%p)\n", This, flags, colorKey); #endif if (colorKey) @@ -797,7 +797,7 @@ HRESULT __stdcall ddraw_surface_GetDC(IDirectDrawSurfaceImpl *This, HDC FAR *a) #endif if (This->width % 4) { - printf(" GetDC: width=%d height=%d ???\n", This->width, This->height); + printf(" GetDC: width=%d height=%d\n", This->width, This->height); } RGBQUAD *data = @@ -815,14 +815,14 @@ HRESULT __stdcall ddraw_surface_GetDC(IDirectDrawSurfaceImpl *This, HDC FAR *a) HRESULT __stdcall ddraw_surface_GetFlipStatus(IDirectDrawSurfaceImpl *This, DWORD a) { #if _DEBUG_X - printf("IDirectDrawSurface::GetFlipStatus(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::GetFlipStatus(This=%p, ...)\n", This); #endif return DD_OK; } HRESULT __stdcall ddraw_surface_GetOverlayPosition(IDirectDrawSurfaceImpl *This, LPLONG a, LPLONG b) { - printf("IDirectDrawSurface::GetOverlayPosition(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::GetOverlayPosition(This=%p, ...)\n", This); return DD_OK; } @@ -866,7 +866,7 @@ HRESULT __stdcall ddraw_surface_GetPixelFormat(IDirectDrawSurfaceImpl *This, LPD HRESULT __stdcall ddraw_surface_Initialize(IDirectDrawSurfaceImpl *This, LPDIRECTDRAW a, LPDDSURFACEDESC b) { - printf("IDirectDrawSurface::Initialize(This=%p, ...) ???\n", This); + printf("??? IDirectDrawSurface::Initialize(This=%p, ...)\n", This); return DD_OK; } @@ -919,21 +919,21 @@ HRESULT __stdcall ddraw_surface_ReleaseDC(IDirectDrawSurfaceImpl *This, HDC a) HRESULT __stdcall ddraw_surface_Restore(IDirectDrawSurfaceImpl *This) { #if _DEBUG_X - printf("DirectDrawSurface::Restore(This=%p) ???\n", This); + printf("??? DirectDrawSurface::Restore(This=%p)\n", This); #endif return DD_OK; } HRESULT __stdcall ddraw_surface_SetClipper(IDirectDrawSurfaceImpl *This, LPDIRECTDRAWCLIPPER a) { - printf("DirectDrawSurface::SetClipper(This=%p, ...) ???\n", This); + printf("??? DirectDrawSurface::SetClipper(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_surface_SetColorKey(IDirectDrawSurfaceImpl *This, DWORD flags, LPDDCOLORKEY colorKey) { #if _DEBUG_X - printf("DirectDrawSurface::SetColorKey(This=%p, flags=0x%08X, colorKey=%p) ???\n", This, flags, colorKey); + printf("??? DirectDrawSurface::SetColorKey(This=%p, flags=0x%08X, colorKey=%p)\n", This, flags, colorKey); if (colorKey) { @@ -953,7 +953,7 @@ HRESULT __stdcall ddraw_surface_SetColorKey(IDirectDrawSurfaceImpl *This, DWORD HRESULT __stdcall ddraw_surface_SetOverlayPosition(IDirectDrawSurfaceImpl *This, LONG a, LONG b) { - printf("DirectDrawSurface::SetOverlayPosition(This=%p, ...) ???\n", This); + printf("??? DirectDrawSurface::SetOverlayPosition(This=%p, ...)\n", This); return DD_OK; } @@ -1009,19 +1009,19 @@ HRESULT __stdcall ddraw_surface_Unlock(IDirectDrawSurfaceImpl *This, LPVOID lpRe HRESULT __stdcall ddraw_surface_UpdateOverlay(IDirectDrawSurfaceImpl *This, LPRECT a, LPDIRECTDRAWSURFACE b, LPRECT c, DWORD d, LPDDOVERLAYFX e) { - printf("DirectDrawSurface::UpdateOverlay(This=%p, ...) ???\n", This); + printf("??? DirectDrawSurface::UpdateOverlay(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_surface_UpdateOverlayDisplay(IDirectDrawSurfaceImpl *This, DWORD a) { - printf("DirectDrawSurface::UpdateOverlayDisplay(This=%p, ...) ???\n", This); + printf("??? DirectDrawSurface::UpdateOverlayDisplay(This=%p, ...)\n", This); return DD_OK; } HRESULT __stdcall ddraw_surface_UpdateOverlayZOrder(IDirectDrawSurfaceImpl *This, DWORD a, LPDIRECTDRAWSURFACE b) { - printf("DirectDrawSurface::UpdateOverlayZOrder(This=%p, ...) ???\n", This); + printf("??? DirectDrawSurface::UpdateOverlayZOrder(This=%p, ...)\n", This); return DD_OK; }