backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

add a few more missing functions for logging

Browse Source
This commit is contained in:
FunkyFr3sh 2020-10-16 01:03:01 +02:00
parent f86f0b3736
commit 583d927da6
5 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ddraw.def
View File

@ -5,6 +5,9 @@ EXPORTS
DirectDrawCreateClipper @9 DirectDrawCreateClipper @9
DirectDrawCreateEx @10 DirectDrawCreateEx @10
DirectDrawEnumerateA @11 DirectDrawEnumerateA @11
DirectDrawEnumerateExA @12
DirectDrawEnumerateExW @13
DirectDrawEnumerateW @14
GameHandlesClose DATA GameHandlesClose DATA
NvOptimusEnablement DATA NvOptimusEnablement DATA
AmdPowerXpressRequestHighPerformance DATA AmdPowerXpressRequestHighPerformance DATA

3
inc/IDirectDraw.h
View File

@ -9,6 +9,9 @@
DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00, 0xc0, 0x4f, 0xd9, 0x30, 0xc5); DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00, 0xc0, 0x4f, 0xd9, 0x30, 0xc5);
DEFINE_GUID(IID_IDirectDraw7, 0x15e65ec0, 0x3b9c, 0x11d2, 0xb9, 0x2f, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b); DEFINE_GUID(IID_IDirectDraw7, 0x15e65ec0, 0x3b9c, 0x11d2, 0xb9, 0x2f, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b);
typedef BOOL(FAR PASCAL* LPDDENUMCALLBACKEXA)(GUID FAR*, LPSTR, LPSTR, LPVOID, HMONITOR);
typedef BOOL(FAR PASCAL* LPDDENUMCALLBACKEXW)(GUID FAR*, LPWSTR, LPWSTR, LPVOID, HMONITOR);
extern struct IDirectDrawImplVtbl g_dd_vtbl1; extern struct IDirectDrawImplVtbl g_dd_vtbl1;
extern struct IDirectDrawImplVtbl g_dd_vtblx; extern struct IDirectDrawImplVtbl g_dd_vtblx;

8
src/IDirectDraw/IDirectDraw.c
View File

@ -291,16 +291,16 @@ HRESULT __stdcall IDirectDraw__GetSurfaceFromDC(IDirectDrawImpl* This, HDC hdc,
HRESULT __stdcall IDirectDraw__RestoreAllSurfaces(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__RestoreAllSurfaces(IDirectDrawImpl* This)
{ {
dprintf("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); dprintf("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This);
HRESULT ret = DDERR_INVALIDOBJECT; HRESULT ret = DD_OK;
dprintf("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); dprintf("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
return ret; return ret;
} }
HRESULT __stdcall IDirectDraw__TestCooperativeLevel(IDirectDrawImpl* This) HRESULT __stdcall IDirectDraw__TestCooperativeLevel(IDirectDrawImpl* This)
{ {
dprintf("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); dprintfex("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This);
HRESULT ret = DDERR_INVALIDOBJECT; HRESULT ret = DD_OK;
dprintf("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); dprintfex("NOT_IMPLEMENTED <- %s\n", __FUNCTION__);
return ret; return ret;
} }

4
src/IDirectDraw/IDirectDrawSurface.c
View File

@ -260,9 +260,9 @@ HRESULT __stdcall IDirectDrawSurface__Lock(IDirectDrawSurfaceImpl *This, LPRECT
HRESULT __stdcall IDirectDrawSurface__ReleaseDC(IDirectDrawSurfaceImpl *This, HDC a) HRESULT __stdcall IDirectDrawSurface__ReleaseDC(IDirectDrawSurfaceImpl *This, HDC a)
{ {
dprintfex("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); dprintfex("-> %s(This=%p)\n", __FUNCTION__, This);
HRESULT ret = DD_OK; HRESULT ret = DD_OK;
dprintfex("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); dprintfex("<- %s\n", __FUNCTION__);
return ret; return ret;
} }

64
src/dllmain.c
View File

@ -2,6 +2,7 @@
#include <ddraw.h> #include <ddraw.h>
#include <stdio.h> #include <stdio.h>
#include "dllmain.h" #include "dllmain.h"
#include "IDirectDraw.h"
#include "dd.h" #include "dd.h"
#include "ddclipper.h" #include "ddclipper.h"
#include "debug.h" #include "debug.h"
@ -115,15 +116,12 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
return TRUE; return TRUE;
} }
HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACK lpCallback, LPVOID lpContext) HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnknown FAR* pUnkOuter)
{ {
dprintf("-> %s(lpCallback=%p, lpContext=%p)\n", __FUNCTION__, lpCallback, lpContext); dprintf("-> %s(lpGUID=%p, lplpDD=%p, pUnkOuter=%p)\n", __FUNCTION__, lpGUID, lplpDD, pUnkOuter);
HRESULT ret = dd_CreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw, pUnkOuter);
if (lpCallback)
lpCallback(NULL, "display", "(null)", lpContext);
dprintf("<- %s\n", __FUNCTION__); dprintf("<- %s\n", __FUNCTION__);
return DD_OK; return ret;
} }
HRESULT WINAPI DirectDrawCreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER FAR* lplpDDClipper, IUnknown FAR* pUnkOuter) HRESULT WINAPI DirectDrawCreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER FAR* lplpDDClipper, IUnknown FAR* pUnkOuter)
@ -134,14 +132,6 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER FAR* l
return ret; return ret;
} }
HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnknown FAR* pUnkOuter)
{
dprintf("-> %s(lpGUID=%p, lplpDD=%p, pUnkOuter=%p)\n", __FUNCTION__, lpGUID, lplpDD, pUnkOuter);
HRESULT ret = dd_CreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw, pUnkOuter);
dprintf("<- %s\n", __FUNCTION__);
return ret;
}
HRESULT WINAPI DirectDrawCreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOuter) HRESULT WINAPI DirectDrawCreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnknown* pUnkOuter)
{ {
dprintf("-> %s(lpGUID=%p, lplpDD=%p, riid=%08X, pUnkOuter=%p)\n", __FUNCTION__, lpGuid, lplpDD, iid, pUnkOuter); dprintf("-> %s(lpGUID=%p, lplpDD=%p, riid=%08X, pUnkOuter=%p)\n", __FUNCTION__, lpGuid, lplpDD, iid, pUnkOuter);
@ -149,3 +139,47 @@ HRESULT WINAPI DirectDrawCreateEx(GUID* lpGuid, LPVOID* lplpDD, REFIID iid, IUnk
dprintf("<- %s\n", __FUNCTION__); dprintf("<- %s\n", __FUNCTION__);
return ret; return ret;
} }
HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACK lpCallback, LPVOID lpContext)
{
dprintf("-> %s(lpCallback=%p, lpContext=%p)\n", __FUNCTION__, lpCallback, lpContext);
if (lpCallback)
lpCallback(NULL, "display", "(null)", lpContext);
dprintf("<- %s\n", __FUNCTION__);
return DD_OK;
}
HRESULT DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags)
{
dprintf("-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d)\n", __FUNCTION__, lpCallback, lpContext, dwFlags);
if (lpCallback)
lpCallback(NULL, "display", "(null)", lpContext, NULL);
dprintf("<- %s\n", __FUNCTION__);
return DD_OK;
}
HRESULT WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags)
{
dprintf("-> %s(lpCallback=%p, lpContext=%p, dwFlags=%d)\n", __FUNCTION__, lpCallback, lpContext, dwFlags);
if (lpCallback)
lpCallback(NULL, L"display", L"(null)", lpContext, NULL);
dprintf("<- %s\n", __FUNCTION__);
return DD_OK;
}
HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, LPVOID lpContext)
{
dprintf("-> %s(lpCallback=%p, lpContext=%p)\n", __FUNCTION__, lpCallback, lpContext);
if (lpCallback)
lpCallback(NULL, L"display", L"(null)", lpContext);
dprintf("<- %s\n", __FUNCTION__);
return DD_OK;
}