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

Fix incorrect method definition for CreatePalette, Red Alert loads up the menu!

Browse Source
This commit is contained in:
Toni Spets 2010-10-17 09:17:10 +03:00
parent 2d107d58b0
commit 487c98aa1f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.h
View File

@ -30,7 +30,7 @@ typedef struct
/* IDirectDraw */ /* IDirectDraw */
HRESULT (*Compact)(void *); HRESULT (*Compact)(void *);
HRESULT (*CreateClipper)(void *); HRESULT (*CreateClipper)(void *);
HRESULT (*CreatePalette)(void *, LPPALETTEENTRY, LPDIRECTDRAWPALETTE FAR *, IUnknown FAR *); HRESULT (*CreatePalette)(void *, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE FAR *, IUnknown FAR *);
HRESULT (*CreateSurface)(void *, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE FAR *, IUnknown FAR *); HRESULT (*CreateSurface)(void *, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE FAR *, IUnknown FAR *);
HRESULT (*DuplicateSurface)(void *); HRESULT (*DuplicateSurface)(void *);
HRESULT (*EnumDisplayModes)(void *); HRESULT (*EnumDisplayModes)(void *);

6
palette.c
View File

@ -24,15 +24,15 @@ ULONG AddRef(void *This);
ULONG Release(void *This); ULONG Release(void *This);
HRESULT null(); HRESULT null();
HRESULT ddraw_CreatePalette(void *This, LPPALETTEENTRY DDColorArray, LPDIRECTDRAWPALETTE FAR * DDPalette, IUnknown FAR * unkOuter) HRESULT ddraw_CreatePalette(void *This, DWORD dwFlags, LPPALETTEENTRY lpDDColorArray, LPDIRECTDRAWPALETTE FAR * lpDDPalette, IUnknown FAR * unkOuter)
{ {
printf("DirectDraw::CreatePalette(This=%p, DDColorArray=%p, DDPalette=%p, unkOuter=%p)\n", This, DDColorArray, DDPalette, unkOuter); printf("DirectDraw::CreatePalette(This=%p, dwFlags=%d, DDColorArray=%p, DDPalette=%p, unkOuter=%p)\n", This, (int)dwFlags, lpDDColorArray, lpDDPalette, unkOuter);
fakeDirectDrawPaletteObject *Palette = (fakeDirectDrawPaletteObject *)malloc(sizeof(fakeDirectDrawPaletteObject)); fakeDirectDrawPaletteObject *Palette = (fakeDirectDrawPaletteObject *)malloc(sizeof(fakeDirectDrawPaletteObject));
Palette->Ref = 1; Palette->Ref = 1;
Palette->Functions = &piface; Palette->Functions = &piface;
printf(" Palette = %p\n", Palette); printf(" Palette = %p\n", Palette);
*DDPalette = (LPDIRECTDRAWPALETTE)Palette; *lpDDPalette = (LPDIRECTDRAWPALETTE)Palette;
return DD_OK; return DD_OK;
} }

2
palette.h
View File

@ -44,6 +44,6 @@ typedef struct
extern fakeDirectDrawPalette piface; extern fakeDirectDrawPalette piface;
HRESULT ddraw_CreatePalette(void *This, LPPALETTEENTRY DDColorArray, LPDIRECTDRAWPALETTE FAR * DDPalette, IUnknown FAR * unkOuter); HRESULT ddraw_CreatePalette(void *This, DWORD dwFlags, LPPALETTEENTRY DDColorArray, LPDIRECTDRAWPALETTE FAR * DDPalette, IUnknown FAR * unkOuter);
#endif #endif