Skip to content

W
wine-cw
Commit dfee49e3 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Also check for empty GUID in DirectDrawCreate.

parent 84eb8334
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
dlls/ddraw/main.c
View file @ dfee49e3
...@@ -254,6 +254,7 @@ HRESULT WINAPI DirectDrawCreate( ...@@ -254,6 +254,7 @@ HRESULT WINAPI DirectDrawCreate(
WNDCLASSA wc; WNDCLASSA wc;
HRESULT ret = 0; HRESULT ret = 0;
int i,drvindex=0; int i,drvindex=0;
GUID zeroGUID;
struct ddraw_driver *ddd = NULL; struct ddraw_driver *ddd = NULL;
...@@ -261,9 +262,11 @@ HRESULT WINAPI DirectDrawCreate( ...@@ -261,9 +262,11 @@ HRESULT WINAPI DirectDrawCreate(
TRACE("(%s,%p,%p)\n",debugstr_guid(lpGUID),ilplpDD,pUnkOuter); TRACE("(%s,%p,%p)\n",debugstr_guid(lpGUID),ilplpDD,pUnkOuter);
memset(&zeroGUID,0,sizeof(zeroGUID));
while (1) { while (1) {
ddd = NULL; ddd = NULL;
if ( ( !lpGUID ) || if ( ( !lpGUID ) ||
( IsEqualGUID( &zeroGUID, lpGUID ) ) ||
( IsEqualGUID( &IID_IDirectDraw, lpGUID ) ) || ( IsEqualGUID( &IID_IDirectDraw, lpGUID ) ) ||
( IsEqualGUID( &IID_IDirectDraw2, lpGUID ) ) || ( IsEqualGUID( &IID_IDirectDraw2, lpGUID ) ) ||
( IsEqualGUID( &IID_IDirectDraw4, lpGUID ) ) ( IsEqualGUID( &IID_IDirectDraw4, lpGUID ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment