- correct DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1 confusion
- fix GetAvailableVidMem ddraw iface copy&paste bug (doh !)
This commit is contained in:
parent
6e7ded456b
commit
5b7e1810a1
|
@ -836,7 +836,7 @@ IDirectDraw4Impl_GetAvailableVidMem(LPDIRECTDRAW4 This, LPDDSCAPS2 pCaps,
|
|||
LPDWORD pdwTotal, LPDWORD pdwFree)
|
||||
{
|
||||
return IDirectDraw7_GetAvailableVidMem(COM_INTERFACE_CAST(IDirectDrawImpl,
|
||||
IDirectDraw2,
|
||||
IDirectDraw4,
|
||||
IDirectDraw7,
|
||||
This),
|
||||
pCaps, pdwTotal, pdwFree);
|
||||
|
@ -884,7 +884,7 @@ IDirectDraw4Impl_GetDeviceIdentifier(LPDIRECTDRAW4 This,
|
|||
This),
|
||||
&DDDI2, dwFlags);
|
||||
|
||||
DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(pDDDI, &DDDI2);
|
||||
DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(&DDDI2, pDDDI);
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
|
|
@ -305,8 +305,8 @@ extern HRESULT create_direct3d7(LPVOID *obj,IDirectDrawImpl*);
|
|||
* Structure conversion (for thunks)
|
||||
*/
|
||||
void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, DDSCAPS2* pOut);
|
||||
void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER* pIn,
|
||||
DDDEVICEIDENTIFIER2* pOut);
|
||||
void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2* pIn,
|
||||
DDDEVICEIDENTIFIER* pOut);
|
||||
|
||||
/******************************************************************************
|
||||
* Debugging / Flags output functions
|
||||
|
|
|
@ -19,8 +19,8 @@ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, DDSCAPS2* pOut)
|
|||
pOut->dwCaps4 = 0;
|
||||
}
|
||||
|
||||
void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER* pIn,
|
||||
DDDEVICEIDENTIFIER2* pOut)
|
||||
void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2* pIn,
|
||||
DDDEVICEIDENTIFIER* pOut)
|
||||
{
|
||||
/* 2 adds a dwWHQLLevel field to the end. Both structures are
|
||||
* unversioned. */
|
||||
|
|
Loading…
Reference in New Issue