July 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Stub GdipGetMetafileHeaderFromFile.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 688eb0688b2c4d209137e5dc4365a66354b4ab98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688eb0688b2c4d209137e5dc4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:36:15 2010 -0500 gdiplus: Stub GdipGetMetafileHeaderFromFile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ad60942..5e03c53 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -316,7 +316,7 @@ @ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit @ stdcall GdipGetMetafileHeaderFromEmf(ptr ptr) -@ stub GdipGetMetafileHeaderFromFile +@ stdcall GdipGetMetafileHeaderFromFile(wstr ptr) @ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) @ stub GdipGetMetafileHeaderFromStream @ stub GdipGetMetafileHeaderFromWmf diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ca3f0b6..5f2bb96 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2228,6 +2228,24 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hEmf, return Ok; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromFile(GDIPCONST WCHAR *filename, + MetafileHeader *header) +{ + static int calls; + + TRACE("(%s,%p)\n", debugstr_w(filename), header); + + if(!filename || !header) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + memset(header, 0, sizeof(MetafileHeader)); + + return Ok; +} + GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, UINT num, PropertyItem* items) {

1 0

Greg Geldorp : msvcrt/tests: ecvt on Win9x and NT4 will corrupt memory if nrdigits < 0.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 913c91fd470f08342f2c07bbaee6cab362e55d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=913c91fd470f08342f2c07bba… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jul 19 13:24:53 2010 +0200 msvcrt/tests: ecvt on Win9x and NT4 will corrupt memory if nrdigits < 0. --- dlls/msvcrt/tests/printf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 19e21f9..4386bf1 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -713,6 +713,8 @@ static void test_fcvt(void) ok( 0 == sign, "sign wrong\n"); } +/* Don't test nrdigits < 0, msvcrt on Win9x and NT4 will corrupt memory by + * writing outside allocated memory */ static struct { double value; int nrdigits; @@ -725,7 +727,6 @@ static struct { { 45.0, 2, "45", "4500", 2, 2, 0 }, /* Numbers less than 1.0 with different precisions */ { 0.0001, 1, "1", "", -3, -3, 0 }, - { 0.0001, -10, "", "", -3, -3, 0 }, { 0.0001, 10,"1000000000", "1000000", -3, -3, 0 }, /* Basic sign test */ { -111.0001, 5, "11100", "11100010", 3, 3, 1 },

1 0

Paul Chitescu : t2embed: Forward several stdcall-decorated names to existing undecorated stubs.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: d067814127c332e3b62e7896b963f678d2fc46e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d067814127c332e3b62e7896b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Jul 19 14:53:33 2010 +0300 t2embed: Forward several stdcall-decorated names to existing undecorated stubs. --- dlls/t2embed/t2embed.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 12f8a6a..2566fa2 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -15,10 +15,10 @@ @ stub _TTEmbedFontFromFileA(a)52 @ stub _TTEnableEmbeddingForFacename(a)8 @ stub _TTGetEmbeddedFontInfo(a)28 -@ stub _TTGetEmbeddingType(a)8 -@ stub _TTIsEmbeddingEnabled(a)8 +@ stdcall _TTGetEmbeddingType(a)8(ptr ptr) TTGetEmbeddingType +@ stdcall _TTIsEmbeddingEnabled(a)8(ptr ptr) TTIsEmbeddingEnabled @ stub _TTIsEmbeddingEnabledForFacename(a)8 -@ stub _TTLoadEmbeddedFont(a)40 +@ stdcall _TTLoadEmbeddedFont(a)40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont @ stub _TTRunValidationTests(a)8 @ stub TTEmbedFontEx @ stub TTRunValidationTestsEx

1 0

Detlef Riekenberg : winhelp.exe16: Add missing separator after command name .
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 115bf743b86ec2d702161f93c38afcf3dda92b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=115bf743b86ec2d702161f93c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 18 20:24:31 2010 +0200 winhelp.exe16: Add missing separator after command name. --- programs/winhelp.exe16/winhelp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp.exe16/winhelp.c b/programs/winhelp.exe16/winhelp.c index 6bfa3f6..f255d91 100644 --- a/programs/winhelp.exe16/winhelp.c +++ b/programs/winhelp.exe16/winhelp.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhelp); */ WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD show ) { - int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\winhlp32.exe") + strlen(cmdline); + int len = GetSystemDirectoryA( NULL, 0 ) + sizeof("\\winhlp32.exe ") + strlen(cmdline); char *buffer = HeapAlloc( GetProcessHeap(), 0, len ); GetSystemDirectoryA( buffer, len ); - strcat( buffer, "\\winhlp32.exe" ); + strcat( buffer, "\\winhlp32.exe " ); strcat( buffer, cmdline ); WINE_TRACE( "starting %s\n", wine_dbgstr_a(buffer) );

1 0

Paul Vriens : atl/tests: Skip tests if function is not implemented.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 13a7ecff57a21caf402a48837c0d1fa734b9bbd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a7ecff57a21caf402a48837… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 19 13:14:51 2010 +0200 atl/tests: Skip tests if function is not implemented. --- dlls/atl/tests/atl_ax.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index 8b9966c..d17046d 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -36,7 +36,14 @@ #include <ocidl.h> #include <exdisp.h> -HRESULT WINAPI AtlAxAttachControl(IUnknown *, HWND, IUnknown **); +static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **); + +static void init_function_pointers(void) +{ + HMODULE hatl = GetModuleHandleA("atl.dll"); + + pAtlAxAttachControl = (void *)GetProcAddress(hatl, "AtlAxAttachControl"); +} static ATOM register_class(void) { @@ -64,16 +71,16 @@ static void test_AtlAxAttachControl(void) HRESULT hr; IUnknown *pObj, *pContainer; - hr = AtlAxAttachControl(NULL, NULL, NULL); + hr = pAtlAxAttachControl(NULL, NULL, NULL); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; - hr = AtlAxAttachControl(NULL, NULL, &pContainer); + hr = pAtlAxAttachControl(NULL, NULL, &pContainer); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); ok(pContainer == (IUnknown *)0xdeadbeef, "Expected the output container pointer to be untouched, got %p\n", pContainer); - hr = AtlAxAttachControl(NULL, hwnd, NULL); + hr = pAtlAxAttachControl(NULL, hwnd, NULL); ok(hr == E_INVALIDARG, "Expected AtlAxAttachControl to return E_INVALIDARG, got 0x%08x\n", hr); hr = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, @@ -86,12 +93,12 @@ static void test_AtlAxAttachControl(void) return; } - hr = AtlAxAttachControl(pObj, NULL, NULL); + hr = pAtlAxAttachControl(pObj, NULL, NULL); todo_wine ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); pContainer = (IUnknown *)0xdeadbeef; - hr = AtlAxAttachControl(pObj, NULL, &pContainer); + hr = pAtlAxAttachControl(pObj, NULL, &pContainer); todo_wine ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr); ok(pContainer != (IUnknown *)0xdeadbeef && @@ -101,7 +108,7 @@ static void test_AtlAxAttachControl(void) if (pContainer != (IUnknown *)0xdeadbeef && pContainer != NULL) IUnknown_Release(pContainer); - hr = AtlAxAttachControl(pObj, hwnd, NULL); + hr = pAtlAxAttachControl(pObj, hwnd, NULL); ok(hr == S_OK, "Expected AtlAxAttachControl to return S_OK, got 0x%08x\n", hr); IUnknown_Release(pObj); @@ -111,12 +118,17 @@ static void test_AtlAxAttachControl(void) START_TEST(atl_ax) { + init_function_pointers(); + if (!register_class()) return; CoInitialize(NULL); - test_AtlAxAttachControl(); + if (pAtlAxAttachControl) + test_AtlAxAttachControl(); + else + win_skip("AtlAxAttachControl is not available\n"); CoUninitialize(); }

1 0

Henri Verbeet : ddraw: Get rid of some dead code.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 5bf9dd902c1a040b63e6a6dfddc56cb6dbb08e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf9dd902c1a040b63e6a6dfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:58 2010 +0200 ddraw: Get rid of some dead code. --- dlls/ddraw/surface_thunks.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index d235ff9..be57c3b 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -150,16 +150,6 @@ EnumCallback(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD, { const struct callback_info* info = context; -#if 0 - /* This is an outgoing conversion so we have to do it. */ - DDSURFACEDESC ddsd; - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - DDRAW_Convert_DDSURFACEDESC_2_To_1(pDDSD, &ddsd); -#endif - - /* the LPDDSURFACEDESC2 -> LPDDSURFACEDESC coercion is safe, since - * the data format is compatible with older enum procs */ return info->callback(iface ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)iface)->IDirectDrawSurface3_vtbl : NULL, (LPDDSURFACEDESC)pDDSD, info->context);

1 0

Henri Verbeet : ddraw: Get rid of the useless "ddraw_owner" fields.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: f461b39b765712561a6b0a83bb167ec509c170e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461b39b765712561a6b0a83b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:57 2010 +0200 ddraw: Get rid of the useless "ddraw_owner" fields. --- dlls/ddraw/clipper.c | 6 ++---- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/ddraw_private.h | 3 +-- dlls/ddraw/surface.c | 10 +++------- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 4fa4c36..a8a3242 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -254,19 +254,17 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd( static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags ) { - IDirectDrawImpl* pOwner; IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p)->(%p,0x%08x)\n", This, lpDD, dwFlags); EnterCriticalSection(&ddraw_cs); - if (This->ddraw_owner != NULL) + if (This->initialized) { LeaveCriticalSection(&ddraw_cs); return DDERR_ALREADYINITIALIZED; } - pOwner = lpDD ? ddraw_from_ddraw1(lpDD) : NULL; - This->ddraw_owner = pOwner; + This->initialized = TRUE; LeaveCriticalSection(&ddraw_cs); return DD_OK; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 69c663a..05c8c62 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3041,7 +3041,6 @@ IDirectDrawImpl_CreatePalette(IDirectDraw7 *iface, object->lpVtbl = &IDirectDrawPalette_Vtbl; object->ref = 1; - object->ddraw_owner = This; hr = IWineD3DDevice_CreatePalette(This->wineD3DDevice, Flags, ColorTable, &object->wineD3DPalette, (IUnknown *)object); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1cb3070..3de8668 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -469,7 +469,7 @@ struct IDirectDrawClipperImpl LONG ref; IWineD3DClipper *wineD3DClipper; - IDirectDrawImpl *ddraw_owner; + BOOL initialized; }; extern const IDirectDrawClipperVtbl IDirectDrawClipper_Vtbl DECLSPEC_HIDDEN; @@ -489,7 +489,6 @@ struct IDirectDrawPaletteImpl IWineD3DPalette *wineD3DPalette; /* IDirectDrawPalette fields */ - IDirectDrawImpl *ddraw_owner; IUnknown *ifaceToRelease; }; extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e64ef3a..e8372ba 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1676,14 +1676,10 @@ IDirectDrawSurfaceImpl_GetSurfaceDesc(IDirectDrawSurface7 *iface, * DDERR_ALREADYINITIALIZED * *****************************************************************************/ -static HRESULT WINAPI -IDirectDrawSurfaceImpl_Initialize(IDirectDrawSurface7 *iface, - IDirectDraw *DD, - DDSURFACEDESC2 *DDSD) +static HRESULT WINAPI IDirectDrawSurfaceImpl_Initialize(IDirectDrawSurface7 *iface, + IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) { - IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; - IDirectDrawImpl *ddimpl = DD ? ddraw_from_ddraw1(DD) : NULL; - TRACE("(%p)->(%p,%p)\n",This,ddimpl,DDSD); + TRACE("iface %p, ddraw %p, surface_desc %p.\n", iface, ddraw, surface_desc); return DDERR_ALREADYINITIALIZED; }

1 0

Henri Verbeet : ddraw: The surface isn' t allowed to be NULL in EnumSurfacesCallbackThunk() and EnumCallback().
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 1edda50c03cfce6f6f1e79fbbab88e41c1441b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edda50c03cfce6f6f1e79fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:59 2010 +0200 ddraw: The surface isn't allowed to be NULL in EnumSurfacesCallbackThunk() and EnumCallback(). --- dlls/ddraw/ddraw_thunks.c | 5 ++--- dlls/ddraw/surface_thunks.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 28991d1..2c205e9 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -578,9 +578,8 @@ EnumSurfacesCallbackThunk(LPDIRECTDRAWSURFACE7 pSurf, LPDDSURFACEDESC2 pDDSD, /* This coercion is safe, since the IDirectDrawSurface3 vtable has the * IDirectDrawSurface vtable layout at the beginning */ - return cbcontext->func( - pSurf ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurf)->IDirectDrawSurface3_vtbl : NULL, - (LPDDSURFACEDESC)pDDSD, cbcontext->context); + return cbcontext->func((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)pSurf)->IDirectDrawSurface3_vtbl, + (DDSURFACEDESC *)pDDSD, cbcontext->context); } static HRESULT WINAPI diff --git a/dlls/ddraw/surface_thunks.c b/dlls/ddraw/surface_thunks.c index be57c3b..6df6dcd 100644 --- a/dlls/ddraw/surface_thunks.c +++ b/dlls/ddraw/surface_thunks.c @@ -150,9 +150,8 @@ EnumCallback(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD, { const struct callback_info* info = context; - return info->callback(iface ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)iface)->IDirectDrawSurface3_vtbl : NULL, - (LPDDSURFACEDESC)pDDSD, info->context); + return info->callback((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)iface)->IDirectDrawSurface3_vtbl, + (DDSURFACEDESC *)pDDSD, info->context); } static HRESULT WINAPI

1 0

Henri Verbeet : ddraw: Avoid some forward declarations.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 16b3f17f872d4803f5edbb479e30deba85beffe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b3f17f872d4803f5edbb479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 19 12:47:56 2010 +0200 ddraw: Avoid some forward declarations. --- dlls/ddraw/ddraw.c | 314 +++++++++++++++++++++++++--------------------------- 1 files changed, 149 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16b3f17f872d4803f5edb…

1 0

Andrew Nguyen : ddraw/tests: Test IDirect3D::FindDevice HAL enumeration.
by Alexandre Julliard July 19, 2010

July 19, 2010

Module: wine Branch: master Commit: 8b1c1edb6b29d68ec70043eb57ac74ea7b13e73a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1c1edb6b29d68ec70043eb5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Jul 18 16:27:10 2010 -0500 ddraw/tests: Test IDirect3D::FindDevice HAL enumeration. --- dlls/ddraw/tests/d3d.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index aa87ca6..53ef04b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3410,6 +3410,7 @@ static void FindDevice(void) D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; + IDirect3DDevice *d3dhal; HRESULT hr; int i; @@ -3472,6 +3473,34 @@ static void FindDevice(void) "[%d] Expected IDirect3D1::FindDevice to return DDERR_NOTFOUND, got 0x%08x\n", i, hr); } + /* The HAL device can only be enumerated if hardware acceleration is present. */ + search.dwSize = sizeof(search); + search.dwFlags = D3DFDS_GUID; + search.guid = IID_IDirect3DHALDevice; + result.dwSize = sizeof(result); + + hr = IDirect3D_FindDevice(Direct3D1, &search, &result); + trace("IDirect3D::FindDevice returned 0x%08x for the HAL device GUID\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_QueryInterface(Surface1, &IID_IDirect3DHALDevice, (void **)&d3dhal); + /* Currently Wine only supports the creation of one Direct3D device + * for a given DirectDraw instance. */ + todo_wine + ok(SUCCEEDED(hr), "Expected IDirectDrawSurface::QueryInterface to succeed, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + IDirect3DDevice_Release(d3dhal); + } + else + { + hr = IDirectDrawSurface_QueryInterface(Surface1, &IID_IDirect3DHALDevice, (void **)&d3dhal); + ok(FAILED(hr), "Expected IDirectDrawSurface::QueryInterface to fail, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + IDirect3DDevice_Release(d3dhal); + } + /* These GUIDs appear to be always present. */ for (i = 0; i < sizeof(deviceGUIDs)/sizeof(deviceGUIDs[0]); i++) {

1 0