October 2010 - Wine-Commits

Andrew Nguyen : winhttp: Fix misleading OpenSSL version number check.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: ccc2f5abae6a57e62580b22dfa90739a351b6555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc2f5abae6a57e62580b22df… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 25 00:09:41 2010 -0500 winhttp: Fix misleading OpenSSL version number check. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7826fbb..d4aa31f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -92,7 +92,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *libssl_handle; static void *libcrypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *method; #else static SSL_METHOD *method;

1 0

Ričardas Barkauskas : ddraw/tests: Test if surface with DDSCAPS_ZBUFFER can be render target.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: c6bc9e01e36e6d9b468a2e7ec02000022f0d7aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bc9e01e36e6d9b468a2e7ec… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sun Oct 24 21:47:35 2010 +0300 ddraw/tests: Test if surface with DDSCAPS_ZBUFFER can be render target. --- dlls/ddraw/tests/d3d.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 5043a01..8088188 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3133,9 +3133,9 @@ static void ComputeSphereVisibility(void) static void SetRenderTargetTest(void) { HRESULT hr; - IDirectDrawSurface7 *newrt, *oldrt; + IDirectDrawSurface7 *newrt, *failrt, *oldrt; D3DVIEWPORT7 vp; - DDSURFACEDESC2 ddsd; + DDSURFACEDESC2 ddsd, ddsd2; DWORD stateblock; memset(&ddsd, 0, sizeof(ddsd)); @@ -3144,6 +3144,7 @@ static void SetRenderTargetTest(void) ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE; ddsd.dwWidth = 64; ddsd.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &newrt, NULL); ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed, hr=0x%08x\n", hr); if(FAILED(hr)) @@ -3152,6 +3153,20 @@ static void SetRenderTargetTest(void) return; } + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd2.ddsCaps.dwCaps = DDSCAPS_3DDEVICE | DDSCAPS_ZBUFFER; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + U4(ddsd2).ddpfPixelFormat.dwSize = sizeof(U4(ddsd2).ddpfPixelFormat); + U4(ddsd2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(ddsd2).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(ddsd2).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + + hr = IDirectDraw7_CreateSurface(lpDD, &ddsd2, &failrt, NULL); + ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed, hr=0x%08x\n", hr); + memset(&vp, 0, sizeof(vp)); vp.dwX = 10; vp.dwY = 10; @@ -3165,6 +3180,9 @@ static void SetRenderTargetTest(void) hr = IDirect3DDevice7_GetRenderTarget(lpD3DDevice, &oldrt); ok(hr == DD_OK, "IDirect3DDevice7_GetRenderTarget failed, hr=0x%08x\n", hr); + hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, failrt, 0); + todo_wine ok(hr != D3D_OK, "IDirect3DDevice7_SetRenderTarget succeeded\n"); + hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, newrt, 0); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr=0x%08x\n", hr); memset(&vp, 0xff, sizeof(vp)); @@ -3231,6 +3249,7 @@ static void SetRenderTargetTest(void) IDirectDrawSurface7_Release(oldrt); IDirectDrawSurface7_Release(newrt); + IDirectDrawSurface7_Release(failrt); } static UINT expect_message;

1 0

Andrew Nguyen : wininet: Fix misleading OpenSSL version number check.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 7591563885c04759f328bada274a90418d61b714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7591563885c04759f328bada2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Oct 25 00:09:48 2010 -0500 wininet: Fix misleading OpenSSL version number check. --- dlls/wininet/netconnection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a93aa11..83bab07 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -114,7 +114,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *OpenSSL_ssl_handle; static void *OpenSSL_crypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *meth; #else static SSL_METHOD *meth;

1 0

Nikolay Sivov : msxml3: Use proper naming and types for IObject* interfaces .
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 21fddfe2358eaeb8b55a008206ecb11d3d872540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21fddfe2358eaeb8b55a00820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:47:30 2010 +0400 msxml3: Use proper naming and types for IObject* interfaces. --- dlls/msxml3/domdoc.c | 80 +++++++++++++++++++++++-------------------------- 1 files changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a465e75..2da243b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2986,30 +2986,27 @@ void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) cp->container = (IConnectionPointContainer*)&doc->lpVtblConnectionPointContainer; } -/* xmldoc implementation of IObjectWithSite */ +/* domdoc implementation of IObjectWithSite */ static HRESULT WINAPI -xmldoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) +domdoc_ObjectWithSite_QueryInterface( IObjectWithSite* iface, REFIID riid, void** ppvObject ) { domdoc *This = impl_from_IObjectWithSite(iface); - return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppvObject ); + return IXMLDOMDocument3_QueryInterface( (IXMLDOMDocument3 *)This, riid, ppvObject ); } -static ULONG WINAPI -xmldoc_ObjectWithSite_AddRef( IObjectWithSite* iface ) +static ULONG WINAPI domdoc_ObjectWithSite_AddRef( IObjectWithSite* iface ) { domdoc *This = impl_from_IObjectWithSite(iface); - return IXMLDocument_AddRef((IXMLDocument *)This); + return IXMLDOMDocument3_AddRef((IXMLDOMDocument3 *)This); } -static ULONG WINAPI -xmldoc_ObjectWithSite_Release( IObjectWithSite* iface ) +static ULONG WINAPI domdoc_ObjectWithSite_Release( IObjectWithSite* iface ) { domdoc *This = impl_from_IObjectWithSite(iface); - return IXMLDocument_Release((IXMLDocument *)This); + return IXMLDOMDocument3_Release((IXMLDOMDocument3 *)This); } -static HRESULT WINAPI -xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) +static HRESULT WINAPI domdoc_ObjectWithSite_GetSite( IObjectWithSite *iface, REFIID iid, void **ppvSite ) { domdoc *This = impl_from_IObjectWithSite(iface); @@ -3021,8 +3018,7 @@ xmldoc_GetSite( IObjectWithSite *iface, REFIID iid, void ** ppvSite ) return IUnknown_QueryInterface( This->site, iid, ppvSite ); } -static HRESULT WINAPI -xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) +static HRESULT WINAPI domdoc_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { domdoc *This = impl_from_IObjectWithSite(iface); @@ -3051,71 +3047,71 @@ xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) static const IObjectWithSiteVtbl domdocObjectSite = { - xmldoc_ObjectWithSite_QueryInterface, - xmldoc_ObjectWithSite_AddRef, - xmldoc_ObjectWithSite_Release, - xmldoc_SetSite, - xmldoc_GetSite, + domdoc_ObjectWithSite_QueryInterface, + domdoc_ObjectWithSite_AddRef, + domdoc_ObjectWithSite_Release, + domdoc_ObjectWithSite_SetSite, + domdoc_ObjectWithSite_GetSite }; -static HRESULT WINAPI xmldoc_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +static HRESULT WINAPI domdoc_Safety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { domdoc *This = impl_from_IObjectSafety(iface); - return IXMLDocument_QueryInterface( (IXMLDocument *)This, riid, ppv ); + return IXMLDOMDocument3_QueryInterface( (IXMLDOMDocument3 *)This, riid, ppv ); } -static ULONG WINAPI xmldoc_Safety_AddRef(IObjectSafety *iface) +static ULONG WINAPI domdoc_Safety_AddRef(IObjectSafety *iface) { domdoc *This = impl_from_IObjectSafety(iface); - return IXMLDocument_AddRef((IXMLDocument *)This); + return IXMLDOMDocument3_AddRef((IXMLDOMDocument3 *)This); } -static ULONG WINAPI xmldoc_Safety_Release(IObjectSafety *iface) +static ULONG WINAPI domdoc_Safety_Release(IObjectSafety *iface) { domdoc *This = impl_from_IObjectSafety(iface); - return IXMLDocument_Release((IXMLDocument *)This); + return IXMLDOMDocument3_Release((IXMLDOMDocument3 *)This); } #define SAFETY_SUPPORTED_OPTIONS (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_SECURITY_MANAGER) -static HRESULT WINAPI xmldoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, - DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +static HRESULT WINAPI domdoc_Safety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *supported, DWORD *enabled) { domdoc *This = impl_from_IObjectSafety(iface); - TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions); + TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), supported, enabled); - if(!pdwSupportedOptions || !pdwEnabledOptions) - return E_POINTER; + if(!supported || !enabled) return E_POINTER; - *pdwSupportedOptions = SAFETY_SUPPORTED_OPTIONS; - *pdwEnabledOptions = This->safeopt; + *supported = SAFETY_SUPPORTED_OPTIONS; + *enabled = This->safeopt; return S_OK; } -static HRESULT WINAPI xmldoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, - DWORD dwOptionSetMask, DWORD dwEnabledOptions) +static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD mask, DWORD enabled) { domdoc *This = impl_from_IObjectSafety(iface); - TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions); + TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), mask, enabled); - if ((dwOptionSetMask & ~SAFETY_SUPPORTED_OPTIONS) != 0) + if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) return E_FAIL; - This->safeopt = dwEnabledOptions & dwOptionSetMask & SAFETY_SUPPORTED_OPTIONS; + This->safeopt = enabled & mask & SAFETY_SUPPORTED_OPTIONS; return S_OK; } +#undef SAFETY_SUPPORTED_OPTIONS + static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { - xmldoc_Safety_QueryInterface, - xmldoc_Safety_AddRef, - xmldoc_Safety_Release, - xmldoc_Safety_GetInterfaceSafetyOptions, - xmldoc_Safety_SetInterfaceSafetyOptions + domdoc_Safety_QueryInterface, + domdoc_Safety_AddRef, + domdoc_Safety_Release, + domdoc_Safety_GetInterfaceSafetyOptions, + domdoc_Safety_SetInterfaceSafetyOptions }; - static const tid_t domdoc_iface_tids[] = { IXMLDOMNode_tid, IXMLDOMDocument_tid,

1 0

Nikolay Sivov : msxml3: Add ::Unadvise().
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: b9956f75a9d1f8ed3fb985afd444951c83404423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9956f75a9d1f8ed3fb985afd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:40:06 2010 +0400 msxml3: Add ::Unadvise(). --- dlls/msxml3/domdoc.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1e09a09..a465e75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -91,6 +91,14 @@ struct ConnectionPoint ConnectionPoint *next; IConnectionPointContainer *container; domdoc *doc; + + union + { + IUnknown *unk; + IDispatch *disp; + IPropertyNotifySink *propnotif; + } *sinks; + DWORD sinks_size; }; struct domdoc @@ -2929,11 +2937,19 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * return E_NOTIMPL; } -static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%d): stub\n", This, dwCookie); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, cookie); + + if (cookie == 0 || cookie > This->sinks_size || !This->sinks[cookie-1].unk) + return CONNECT_E_NOCONNECTION; + + IUnknown_Release(This->sinks[cookie-1].unk); + This->sinks[cookie-1].unk = NULL; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, @@ -2961,7 +2977,8 @@ void ConnectionPoint_Init(ConnectionPoint *cp, struct domdoc *doc, REFIID riid) cp->lpVtblConnectionPoint = &ConnectionPointVtbl; cp->doc = doc; cp->iid = riid; - cp->next = NULL; + cp->sinks = NULL; + cp->sinks_size = 0; cp->next = doc->cp_list; doc->cp_list = cp;

1 0

Ričardas Barkauskas : wlanapi: Stub WlanOpenHandle.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 7ee3f2d2055867961fbdb1a8dac8bb22b4aab5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee3f2d2055867961fbdb1a8d… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Fri Oct 22 16:24:33 2010 +0300 wlanapi: Stub WlanOpenHandle. --- dlls/wlanapi/main.c | 7 +++++++ dlls/wlanapi/wlanapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 97ffd79..7db6fab 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -26,6 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wlanapi); +DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, + PDWORD negotiatedVersion, PHANDLE clientHandle) +{ + FIXME("(%d, %p, %p, %p) stub\n",clientVersion, reserved, negotiatedVersion, clientHandle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index 670c41f..79f9e43 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -15,7 +15,7 @@ @ stub WlanGetProfileList @ stub WlanGetSecuritySettings @ stub WlanIhvControl -@ stub WlanOpenHandle +@ stdcall WlanOpenHandle(long ptr ptr ptr) @ stub WlanQueryAutoConfigParameter @ stub WlanQueryInterface @ stub WlanReasonCodeToString

1 0

Nikolay Sivov : msxml3: Add ::GetConnectionPointContainer().
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: fe3ff2ea9f6b94965a5253b75986336932f53956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3ff2ea9f6b94965a5253b75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:33:42 2010 +0400 msxml3: Add ::GetConnectionPointContainer(). --- dlls/msxml3/domdoc.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c634938..1e09a09 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2908,11 +2908,17 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, - IConnectionPointContainer **ppCPC) + IConnectionPointContainer **container) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p): stub\n", This, ppCPC); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, container); + + if (!container) return E_POINTER; + + *container = This->container; + IConnectionPointContainer_AddRef(*container); + return S_OK; } static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink,

1 0

Nikolay Sivov : msxml3: Add ::GetConnectionInterface().
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: eb23a4df25590dabb80775cddd6b638fc6693890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb23a4df25590dabb80775cdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 23 17:31:52 2010 +0400 msxml3: Add ::GetConnectionInterface(). --- dlls/msxml3/domdoc.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index fc939a5..c634938 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2895,11 +2895,16 @@ static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) return IConnectionPointContainer_Release(This->container); } -static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid) { ConnectionPoint *This = impl_from_IConnectionPoint(iface); - FIXME("(%p)->(%p): stub\n", This, pIID); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, iid); + + if (!iid) return E_POINTER; + + *iid = *This->iid; + return S_OK; } static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface,

1 0

Henri Verbeet : dxgi: Try to create a software adapter when no regular adapters are found as well .
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 20043c0a46527e4e1b678be996f3c5629b142737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20043c0a46527e4e1b678be99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:42 2010 +0200 dxgi: Try to create a software adapter when no regular adapters are found as well. --- dlls/dxgi/tests/device.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 4d2ac14..ef86b34 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -36,18 +36,17 @@ static IDXGIDevice *create_device(HMODULE d3d10core) if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || - hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; + if (SUCCEEDED(hr)) + { + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); + } - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); if (FAILED(hr)) { HMODULE d3d10ref; trace("Failed to create a HW device, trying REF\n"); - IDXGIAdapter_Release(adapter); + if (adapter) IDXGIAdapter_Release(adapter); adapter = NULL; d3d10ref = LoadLibraryA("d3d10ref.dll");

1 0

Henri Verbeet : d3d10core: Try to create a software adapter when no regular adapters are found as well .
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: bbc7b5ac20bf60d61c43ef3264fe84f3f7a855b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc7b5ac20bf60d61c43ef326… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:41 2010 +0200 d3d10core: Try to create a software adapter when no regular adapters are found as well. --- dlls/d3d10core/tests/device.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4195bad..ce3d03c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -35,18 +35,19 @@ static ID3D10Device *create_device(void) if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || - hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ + "EnumAdapters failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); + } - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); if (FAILED(hr)) { HMODULE d3d10ref; trace("Failed to create a HW device, trying REF\n"); - IDXGIAdapter_Release(adapter); + if (adapter) IDXGIAdapter_Release(adapter); adapter = NULL; d3d10ref = LoadLibraryA("d3d10ref.dll");

1 0