mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 00:03:00 +00:00
adding allot of fix and partly implement
1. Adding table lockup for directdraw 1-6 but they are not complete 2. remove out GetDevicreIdentifer to own file it is a large functions 3. Fixed DirectDrawCreate works now 4. found out bit more how DirectDraw_QueryInterface works and comment the new found 5. add the new table to QueryInterface they are partly support now, the new IID is IID_IDirectDraw4, IID_IDirectDraw2 and IID_IDirectDraw it partly support now. svn path=/trunk/; revision=27205
This commit is contained in:
Magnus Olsen
parent
9fea2af376
commit
e0e7446ed1
6 changed files with 352 additions and 175 deletions
190
reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
Normal file
190
reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c
Normal file
|
|
@ -0,0 +1,190 @@
|
||||||
|
/* $Id$
|
||||||
|
*
|
||||||
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
|
* PROJECT: ReactOS DirectX
|
||||||
|
* FILE: ddraw/ddraw/GetDeviceIdentifier.c
|
||||||
|
* PURPOSE: IDirectDraw7 Implementation
|
||||||
|
* PROGRAMMER: Magnus Olsen
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* TODO
|
||||||
|
* We need adding digtial signarture detections for the drivers
|
||||||
|
* and count out which level the signtature driver got, the value
|
||||||
|
* shall be save to pDDDI->dwWHQLLevel, But I do not known how todo
|
||||||
|
* this part yet, That is only missing feature in this functions
|
||||||
|
*
|
||||||
|
* Write a UML digram for this api
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "rosdraw.h"
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
/* PSEH for SEH Support */
|
||||||
|
#include <pseh/pseh.h>
|
||||||
|
/* For DirectDraw 4 - 6 */
|
||||||
|
HRESULT WINAPI
|
||||||
|
Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface,
|
||||||
|
LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags)
|
||||||
|
{
|
||||||
|
HRESULT retVal = DD_OK;
|
||||||
|
DDDEVICEIDENTIFIER2 pDDDI2;
|
||||||
|
|
||||||
|
ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2));
|
||||||
|
|
||||||
|
_SEH_TRY
|
||||||
|
{
|
||||||
|
memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER));
|
||||||
|
|
||||||
|
retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags);
|
||||||
|
|
||||||
|
if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER)))
|
||||||
|
{
|
||||||
|
retVal = DDERR_INVALIDPARAMS;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_SEH_HANDLE
|
||||||
|
{
|
||||||
|
retVal = DD_FALSE;
|
||||||
|
}
|
||||||
|
_SEH_END;
|
||||||
|
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
|
|
||||||
|
HRESULT WINAPI
|
||||||
|
Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface,
|
||||||
|
LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags)
|
||||||
|
{
|
||||||
|
HRESULT retVal = DDERR_INVALIDPARAMS;
|
||||||
|
|
||||||
|
BOOL found = FALSE;
|
||||||
|
DWORD iDevNum = 0;
|
||||||
|
DISPLAY_DEVICEA DisplayDeviceA;
|
||||||
|
HKEY hKey;
|
||||||
|
DWORD lpType = 0;
|
||||||
|
DWORD strSize = MAX_DDDEVICEID_STRING;
|
||||||
|
char *pdest;
|
||||||
|
char* pcCnvEnd;
|
||||||
|
long *lpdata;
|
||||||
|
|
||||||
|
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface;
|
||||||
|
|
||||||
|
DX_WINDBG_trace();
|
||||||
|
|
||||||
|
_SEH_TRY
|
||||||
|
{
|
||||||
|
if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) ||
|
||||||
|
(dwFlags & ~DDGDI_GETHOSTIDENTIFIER))
|
||||||
|
{
|
||||||
|
retVal = DDERR_INVALIDPARAMS;
|
||||||
|
_SEH_LEAVE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* now we can start getting the driver data */
|
||||||
|
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA));
|
||||||
|
|
||||||
|
DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA);
|
||||||
|
|
||||||
|
if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0)
|
||||||
|
{
|
||||||
|
retVal = DDERR_INVALIDPARAMS;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName))
|
||||||
|
{
|
||||||
|
/* if we got another device like hardware mpeg decoder or video card or another drv */
|
||||||
|
found = TRUE;
|
||||||
|
}
|
||||||
|
else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
|
||||||
|
{
|
||||||
|
/* double check if it primary driver we just found */
|
||||||
|
if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY"))
|
||||||
|
{
|
||||||
|
/* yeah we found it */
|
||||||
|
found = TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (found == TRUE)
|
||||||
|
{
|
||||||
|
/* we found our driver now we start setup it */
|
||||||
|
if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18))
|
||||||
|
{
|
||||||
|
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS )
|
||||||
|
{
|
||||||
|
|
||||||
|
if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS)
|
||||||
|
{
|
||||||
|
ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
strcat(pDDDI->szDriver,".dll");
|
||||||
|
}
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString);
|
||||||
|
pDDDI->liDriverVersion.HighPart = 0;
|
||||||
|
pDDDI->liDriverVersion.LowPart = 0;
|
||||||
|
|
||||||
|
pdest = strstr(DisplayDeviceA.DeviceID,"REV_");
|
||||||
|
pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16);
|
||||||
|
|
||||||
|
pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_");
|
||||||
|
pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16);
|
||||||
|
|
||||||
|
pdest = strstr(DisplayDeviceA.DeviceID,"DEV_");
|
||||||
|
pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16);
|
||||||
|
|
||||||
|
pdest = strstr(DisplayDeviceA.DeviceID,"VEN_");
|
||||||
|
pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16);
|
||||||
|
|
||||||
|
/* Count out the guidDeviceIdentifier */
|
||||||
|
memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID));
|
||||||
|
|
||||||
|
pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId;
|
||||||
|
|
||||||
|
lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2;
|
||||||
|
*lpdata ^= pDDDI->dwDeviceId;
|
||||||
|
|
||||||
|
lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4;
|
||||||
|
*lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart;
|
||||||
|
|
||||||
|
lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4];
|
||||||
|
*lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart;
|
||||||
|
|
||||||
|
/* FIXME pDDDI->dwWHQLLevel
|
||||||
|
* we leave this with no informations, I do not known
|
||||||
|
* if program care for it, I mark this api done, and
|
||||||
|
* tested, no bugs was found in it
|
||||||
|
*/
|
||||||
|
pDDDI->dwWHQLLevel = 0;
|
||||||
|
retVal = DD_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
iDevNum++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
_SEH_HANDLE
|
||||||
|
{
|
||||||
|
retVal = DD_FALSE;
|
||||||
|
}
|
||||||
|
_SEH_END;
|
||||||
|
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
|
|
@ -8,6 +8,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* TODO
|
||||||
|
* add warper functions for dx 1 - 6
|
||||||
|
* map the DirectDraw4_Vtable, DirectDraw2_Vtable, DirectDraw_Vtable
|
||||||
|
* table to right version of the functions
|
||||||
|
*/
|
||||||
|
|
||||||
#include "rosdraw.h"
|
#include "rosdraw.h"
|
||||||
|
|
||||||
|
|
@ -34,12 +39,45 @@ Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
|
||||||
*/
|
*/
|
||||||
if (IsEqualGUID(&IID_IDirectDraw7, id))
|
if (IsEqualGUID(&IID_IDirectDraw7, id))
|
||||||
{
|
{
|
||||||
|
/* FIXME linking */
|
||||||
|
|
||||||
/* DirectDraw7 Vtable */
|
/* DirectDraw7 Vtable */
|
||||||
This->lpVtbl = &DirectDraw7_Vtable;
|
This->lpVtbl = &DirectDraw7_Vtable;
|
||||||
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7;
|
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7;
|
||||||
*obj = &This->lpVtbl;
|
*obj = &This->lpVtbl;
|
||||||
Main_DirectDraw_AddRef(iface);
|
Main_DirectDraw_AddRef(iface);
|
||||||
}
|
}
|
||||||
|
else if (IsEqualGUID(&IID_IDirectDraw4, id))
|
||||||
|
{
|
||||||
|
/* FIXME linking */
|
||||||
|
|
||||||
|
/* DirectDraw4 Vtable */
|
||||||
|
This->lpVtbl = &DirectDraw4_Vtable;
|
||||||
|
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags;
|
||||||
|
*obj = &This->lpVtbl;
|
||||||
|
Main_DirectDraw_AddRef(iface);
|
||||||
|
}
|
||||||
|
else if (IsEqualGUID(&IID_IDirectDraw2, id))
|
||||||
|
{
|
||||||
|
/* FIXME linking */
|
||||||
|
|
||||||
|
|
||||||
|
/* DirectDraw4 Vtable */
|
||||||
|
This->lpVtbl = &DirectDraw2_Vtable;
|
||||||
|
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags;
|
||||||
|
*obj = &This->lpVtbl;
|
||||||
|
Main_DirectDraw_AddRef(iface);
|
||||||
|
}
|
||||||
|
else if (IsEqualGUID(&IID_IDirectDraw, id))
|
||||||
|
{
|
||||||
|
/* FIXME linking */
|
||||||
|
|
||||||
|
/* DirectDraw4 Vtable */
|
||||||
|
This->lpVtbl = &DirectDraw_Vtable;
|
||||||
|
This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags;
|
||||||
|
*obj = &This->lpVtbl;
|
||||||
|
Main_DirectDraw_AddRef(iface);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
*obj = NULL;
|
*obj = NULL;
|
||||||
|
|
@ -415,171 +453,7 @@ Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* For DirectDraw 4 - 6 */
|
|
||||||
HRESULT WINAPI
|
|
||||||
Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface,
|
|
||||||
LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags)
|
|
||||||
{
|
|
||||||
HRESULT retVal = DD_OK;
|
|
||||||
DDDEVICEIDENTIFIER2 pDDDI2;
|
|
||||||
|
|
||||||
ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2));
|
|
||||||
|
|
||||||
_SEH_TRY
|
|
||||||
{
|
|
||||||
memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER));
|
|
||||||
|
|
||||||
retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags);
|
|
||||||
|
|
||||||
if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER)))
|
|
||||||
{
|
|
||||||
retVal = DDERR_INVALIDPARAMS;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_SEH_HANDLE
|
|
||||||
{
|
|
||||||
retVal = DD_FALSE;
|
|
||||||
}
|
|
||||||
_SEH_END;
|
|
||||||
|
|
||||||
return retVal;
|
|
||||||
}
|
|
||||||
|
|
||||||
HRESULT WINAPI
|
|
||||||
Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface,
|
|
||||||
LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags)
|
|
||||||
{
|
|
||||||
HRESULT retVal = DDERR_INVALIDPARAMS;
|
|
||||||
|
|
||||||
BOOL found = FALSE;
|
|
||||||
DWORD iDevNum = 0;
|
|
||||||
DISPLAY_DEVICEA DisplayDeviceA;
|
|
||||||
HKEY hKey;
|
|
||||||
DWORD lpType = 0;
|
|
||||||
DWORD strSize = MAX_DDDEVICEID_STRING;
|
|
||||||
char *pdest;
|
|
||||||
char* pcCnvEnd;
|
|
||||||
long *lpdata;
|
|
||||||
|
|
||||||
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface;
|
|
||||||
|
|
||||||
DX_WINDBG_trace();
|
|
||||||
|
|
||||||
_SEH_TRY
|
|
||||||
{
|
|
||||||
if ( (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) ||
|
|
||||||
(dwFlags & ~DDGDI_GETHOSTIDENTIFIER))
|
|
||||||
{
|
|
||||||
retVal = DDERR_INVALIDPARAMS;
|
|
||||||
_SEH_LEAVE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* now we can start getting the driver data */
|
|
||||||
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
ZeroMemory(&DisplayDeviceA,sizeof(DISPLAY_DEVICEA));
|
|
||||||
|
|
||||||
DisplayDeviceA.cb = sizeof(DISPLAY_DEVICEA);
|
|
||||||
|
|
||||||
if ( EnumDisplayDevicesA( NULL, iDevNum, &DisplayDeviceA, 0) == 0)
|
|
||||||
{
|
|
||||||
retVal = DDERR_INVALIDPARAMS;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName))
|
|
||||||
{
|
|
||||||
/* if we got another device like hardware mpeg decoder or video card or another drv */
|
|
||||||
found = TRUE;
|
|
||||||
}
|
|
||||||
else if (DisplayDeviceA.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
|
|
||||||
{
|
|
||||||
/* double check if it primary driver we just found */
|
|
||||||
if (!_stricmp( This->lpLcl->lpGbl->cDriverName, "DISPLAY"))
|
|
||||||
{
|
|
||||||
/* yeah we found it */
|
|
||||||
found = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (found == TRUE)
|
|
||||||
{
|
|
||||||
/* we found our driver now we start setup it */
|
|
||||||
if (!_strnicmp(DisplayDeviceA.DeviceKey,"\\REGISTRY\\Machine\\",18))
|
|
||||||
{
|
|
||||||
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, &DisplayDeviceA.DeviceKey[18], 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS )
|
|
||||||
{
|
|
||||||
|
|
||||||
if (RegQueryValueExA(hKey, "InstalledDisplayDrivers",0, &lpType, (LPBYTE)pDDDI->szDriver, &strSize) != ERROR_SUCCESS)
|
|
||||||
{
|
|
||||||
ZeroMemory(pDDDI->szDriver,MAX_DDDEVICEID_STRING);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
strcat(pDDDI->szDriver,".dll");
|
|
||||||
}
|
|
||||||
RegCloseKey(hKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
strcpy( pDDDI->szDescription, DisplayDeviceA.DeviceString);
|
|
||||||
pDDDI->liDriverVersion.HighPart = 0;
|
|
||||||
pDDDI->liDriverVersion.LowPart = 0;
|
|
||||||
|
|
||||||
pdest = strstr(DisplayDeviceA.DeviceID,"REV_");
|
|
||||||
pDDDI->dwRevision = strtol ( &pdest[4], &pcCnvEnd, 16);
|
|
||||||
|
|
||||||
pdest = strstr(DisplayDeviceA.DeviceID,"SUBSYS_");
|
|
||||||
pDDDI->dwSubSysId = strtol ( &pdest[7], &pcCnvEnd, 16);
|
|
||||||
|
|
||||||
pdest = strstr(DisplayDeviceA.DeviceID,"DEV_");
|
|
||||||
pDDDI->dwDeviceId = strtol ( &pdest[4], &pcCnvEnd, 16);
|
|
||||||
|
|
||||||
pdest = strstr(DisplayDeviceA.DeviceID,"VEN_");
|
|
||||||
pDDDI->dwVendorId =strtol ( &pdest[4], &pcCnvEnd, 16);
|
|
||||||
|
|
||||||
/* Count out the guidDeviceIdentifier */
|
|
||||||
memcpy(&pDDDI->guidDeviceIdentifier, &CLSID_DirectDraw,sizeof(GUID));
|
|
||||||
|
|
||||||
pDDDI->guidDeviceIdentifier.Data1 ^= pDDDI->dwVendorId;
|
|
||||||
|
|
||||||
lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data2;
|
|
||||||
*lpdata ^= pDDDI->dwDeviceId;
|
|
||||||
|
|
||||||
lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4;
|
|
||||||
*lpdata = (*lpdata ^ pDDDI->dwSubSysId) ^ pDDDI->liDriverVersion.LowPart;
|
|
||||||
|
|
||||||
lpdata = (long *)&pDDDI->guidDeviceIdentifier.Data4[4];
|
|
||||||
*lpdata = (*lpdata ^ pDDDI->dwRevision) ^ pDDDI->liDriverVersion.HighPart;
|
|
||||||
|
|
||||||
/* FIXME pDDDI->dwWHQLLevel
|
|
||||||
* we leave this with no informations, I do not known
|
|
||||||
* if program care for it, I mark this api done, and
|
|
||||||
* tested, no bugs was found in it
|
|
||||||
*/
|
|
||||||
pDDDI->dwWHQLLevel = 0;
|
|
||||||
retVal = DD_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
iDevNum++;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
_SEH_HANDLE
|
|
||||||
{
|
|
||||||
retVal = DD_FALSE;
|
|
||||||
}
|
|
||||||
_SEH_END;
|
|
||||||
|
|
||||||
return retVal;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */
|
/* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */
|
||||||
/* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */
|
/* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */
|
||||||
|
|
@ -617,3 +491,94 @@ IDirectDraw7Vtbl DirectDraw7_Vtable =
|
||||||
Main_DirectDraw_StartModeTest,
|
Main_DirectDraw_StartModeTest,
|
||||||
Main_DirectDraw_EvaluateMode
|
Main_DirectDraw_EvaluateMode
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
IDirectDraw4Vtbl DirectDraw4_Vtable =
|
||||||
|
{
|
||||||
|
Main_DirectDraw_QueryInterface,
|
||||||
|
Main_DirectDraw_AddRef,
|
||||||
|
Main_DirectDraw_Release,
|
||||||
|
Main_DirectDraw_Compact,
|
||||||
|
Main_DirectDraw_CreateClipper,
|
||||||
|
Main_DirectDraw_CreatePalette,
|
||||||
|
Main_DirectDraw_CreateSurface4,
|
||||||
|
Main_DirectDraw_DuplicateSurface,
|
||||||
|
Main_DirectDraw_EnumDisplayModes,
|
||||||
|
Main_DirectDraw_EnumSurfaces,
|
||||||
|
Main_DirectDraw_FlipToGDISurface,
|
||||||
|
Main_DirectDraw_GetCaps,
|
||||||
|
Main_DirectDraw_GetDisplayMode,
|
||||||
|
Main_DirectDraw_GetFourCCCodes,
|
||||||
|
Main_DirectDraw_GetGDISurface,
|
||||||
|
Main_DirectDraw_GetMonitorFrequency,
|
||||||
|
Main_DirectDraw_GetScanLine,
|
||||||
|
Main_DirectDraw_GetVerticalBlankStatus,
|
||||||
|
Main_DirectDraw_Initialize,
|
||||||
|
Main_DirectDraw_RestoreDisplayMode,
|
||||||
|
Main_DirectDraw_SetCooperativeLevel,
|
||||||
|
Main_DirectDraw_SetDisplayMode,
|
||||||
|
Main_DirectDraw_WaitForVerticalBlank,
|
||||||
|
Main_DirectDraw_GetAvailableVidMem4,
|
||||||
|
Main_DirectDraw_GetSurfaceFromDC,
|
||||||
|
Main_DirectDraw_RestoreAllSurfaces,
|
||||||
|
Main_DirectDraw_TestCooperativeLevel,
|
||||||
|
Main_DirectDraw_GetDeviceIdentifier
|
||||||
|
};
|
||||||
|
|
||||||
|
IDirectDraw2Vtbl DirectDraw2_Vtable =
|
||||||
|
{
|
||||||
|
Main_DirectDraw_QueryInterface,
|
||||||
|
Main_DirectDraw_AddRef,
|
||||||
|
Main_DirectDraw_Release,
|
||||||
|
Main_DirectDraw_Compact,
|
||||||
|
Main_DirectDraw_CreateClipper,
|
||||||
|
Main_DirectDraw_CreatePalette,
|
||||||
|
Main_DirectDraw_CreateSurface,
|
||||||
|
Main_DirectDraw_DuplicateSurface,
|
||||||
|
Main_DirectDraw_EnumDisplayModes,
|
||||||
|
Main_DirectDraw_EnumSurfaces,
|
||||||
|
Main_DirectDraw_FlipToGDISurface,
|
||||||
|
Main_DirectDraw_GetCaps,
|
||||||
|
Main_DirectDraw_GetDisplayMode,
|
||||||
|
Main_DirectDraw_GetFourCCCodes,
|
||||||
|
Main_DirectDraw_GetGDISurface,
|
||||||
|
Main_DirectDraw_GetMonitorFrequency,
|
||||||
|
Main_DirectDraw_GetScanLine,
|
||||||
|
Main_DirectDraw_GetVerticalBlankStatus,
|
||||||
|
Main_DirectDraw_Initialize,
|
||||||
|
Main_DirectDraw_RestoreDisplayMode,
|
||||||
|
Main_DirectDraw_SetCooperativeLevel,
|
||||||
|
Main_DirectDraw_SetDisplayMode,
|
||||||
|
Main_DirectDraw_WaitForVerticalBlank,
|
||||||
|
Main_DirectDraw_GetAvailableVidMem
|
||||||
|
};
|
||||||
|
|
||||||
|
IDirectDrawVtbl DirectDraw_Vtable =
|
||||||
|
{
|
||||||
|
Main_DirectDraw_QueryInterface,
|
||||||
|
Main_DirectDraw_AddRef,
|
||||||
|
Main_DirectDraw_Release,
|
||||||
|
Main_DirectDraw_Compact,
|
||||||
|
Main_DirectDraw_CreateClipper,
|
||||||
|
Main_DirectDraw_CreatePalette,
|
||||||
|
Main_DirectDraw_CreateSurface,
|
||||||
|
Main_DirectDraw_DuplicateSurface,
|
||||||
|
Main_DirectDraw_EnumDisplayModes,
|
||||||
|
Main_DirectDraw_EnumSurfaces,
|
||||||
|
Main_DirectDraw_FlipToGDISurface,
|
||||||
|
Main_DirectDraw_GetCaps,
|
||||||
|
Main_DirectDraw_GetDisplayMode,
|
||||||
|
Main_DirectDraw_GetFourCCCodes,
|
||||||
|
Main_DirectDraw_GetGDISurface,
|
||||||
|
Main_DirectDraw_GetMonitorFrequency,
|
||||||
|
Main_DirectDraw_GetScanLine,
|
||||||
|
Main_DirectDraw_GetVerticalBlankStatus,
|
||||||
|
Main_DirectDraw_Initialize,
|
||||||
|
Main_DirectDraw_RestoreDisplayMode,
|
||||||
|
Main_DirectDraw_SetCooperativeLevel,
|
||||||
|
Main_DirectDraw_SetDisplayMode,
|
||||||
|
Main_DirectDraw_WaitForVerticalBlank
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,18 @@ ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HRESULT WINAPI
|
||||||
|
Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid,
|
||||||
|
LPVOID* ppObj)
|
||||||
|
{
|
||||||
|
DX_WINDBG_trace();
|
||||||
|
|
||||||
|
DX_STUB_str("Unimplement\n");
|
||||||
|
|
||||||
|
return E_NOINTERFACE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface)
|
ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface)
|
||||||
{
|
{
|
||||||
|
|
@ -670,7 +682,7 @@ IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable =
|
||||||
{
|
{
|
||||||
/*** IUnknown ***/
|
/*** IUnknown ***/
|
||||||
Main_DDrawSurface_QueryInterface,
|
Main_DDrawSurface_QueryInterface,
|
||||||
Main_DDrawSurface_AddRef,
|
Main_DDrawSurface_AddRef, /* (Compact done) */
|
||||||
Main_DDrawSurface_Release,
|
Main_DDrawSurface_Release,
|
||||||
/*** IDirectDrawSurface ***/
|
/*** IDirectDrawSurface ***/
|
||||||
Main_DDrawSurface_AddAttachedSurface,
|
Main_DDrawSurface_AddAttachedSurface,
|
||||||
|
|
|
||||||
|
|
@ -10,16 +10,7 @@
|
||||||
|
|
||||||
#include "rosdraw.h"
|
#include "rosdraw.h"
|
||||||
|
|
||||||
HRESULT WINAPI
|
|
||||||
Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid,
|
|
||||||
LPVOID* ppObj)
|
|
||||||
{
|
|
||||||
DX_WINDBG_trace();
|
|
||||||
|
|
||||||
DX_STUB_str("Unimplement\n");
|
|
||||||
|
|
||||||
return E_NOINTERFACE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* MSDN: "not currently implemented." */
|
/* MSDN: "not currently implemented." */
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@
|
||||||
<file>ddraw_main.c</file>
|
<file>ddraw_main.c</file>
|
||||||
<file>ddraw_displaymode.c</file>
|
<file>ddraw_displaymode.c</file>
|
||||||
<file>ddraw_setcooperativelevel.c</file>
|
<file>ddraw_setcooperativelevel.c</file>
|
||||||
|
<file>GetDeviceIdentifier.c</file>
|
||||||
<file>ddraw_stubs.c</file>
|
<file>ddraw_stubs.c</file>
|
||||||
<file>callbacks_dd_hel.c</file>
|
<file>callbacks_dd_hel.c</file>
|
||||||
</directory>
|
</directory>
|
||||||
|
|
|
||||||
|
|
@ -37,13 +37,31 @@ DirectDrawCreate (LPGUID lpGUID,
|
||||||
LPDIRECTDRAW* lplpDD,
|
LPDIRECTDRAW* lplpDD,
|
||||||
LPUNKNOWN pUnkOuter)
|
LPUNKNOWN pUnkOuter)
|
||||||
{
|
{
|
||||||
|
HRESULT retVal = DDERR_GENERIC;
|
||||||
/*
|
/*
|
||||||
remove this when UML digram are in place
|
remove this when UML digram are in place
|
||||||
this api is finish and is working as it should
|
this api is finish and is working as it should
|
||||||
*/
|
*/
|
||||||
|
|
||||||
DX_WINDBG_trace();
|
DX_WINDBG_trace();
|
||||||
return DirectDrawCreateEx(lpGUID, (LPVOID*)lplpDD, &IID_IDirectDraw2, pUnkOuter);
|
_SEH_TRY
|
||||||
|
{
|
||||||
|
/* check see if pUnkOuter is null or not */
|
||||||
|
if (pUnkOuter)
|
||||||
|
{
|
||||||
|
retVal = CLASS_E_NOAGGREGATION;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
retVal = Create_DirectDraw (lpGUID, (LPDIRECTDRAW*)lplpDD, &IID_IDirectDraw, TRUE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_SEH_HANDLE
|
||||||
|
{
|
||||||
|
}
|
||||||
|
_SEH_END;
|
||||||
|
|
||||||
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue