December 2009 - Wine-Commits

Jacek Caban : wininet: Directly return error from HTTP_HttpSendRequest.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: c952e81a898006a4c0789f523859827d2620c146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c952e81a898006a4c0789f523… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 14:48:54 2009 +0100 wininet: Directly return error from HTTP_HttpSendRequest. --- dlls/wininet/http.c | 73 ++++++++++++++++++++------------------------ dlls/wininet/tests/http.c | 3 +- 2 files changed, 34 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c952e81a898006a4c0789…

1 0

Henri Verbeet : dxgi/tests: Add some tests for IDXGIObject::GetParent().
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 09dd10e7f5c0b0133a1d7dede4a1809aa5690a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dd10e7f5c0b0133a1d7dede… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:22 2009 +0100 dxgi/tests: Add some tests for IDXGIObject::GetParent(). --- dlls/dxgi/tests/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 12893b1..491616c 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -121,6 +121,49 @@ static void test_create_surface(IDXGIDevice *device) IDXGISurface_Release(surface); } +static void test_parents(IDXGIDevice *device) +{ + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIOutput *output; + IUnknown *parent; + HRESULT hr; + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter has not outputs, skipping output tests.\n"); + } + else + { + ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); + + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&parent); + IDXGIOutput_Release(output); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter); + IUnknown_Release(parent); + } + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + hr = IDXGIFactory_GetParent(factory, &IID_IUnknown, (void **)&parent); + ok(hr == E_NOINTERFACE, "GetParent returned %#x, expected %#x.\n", hr, E_NOINTERFACE); + ok(parent == NULL, "Got parent %p, expected %p.\n", parent, NULL); + IDXGIFactory_Release(factory); + + hr = IDXGIDevice_GetParent(device, &IID_IDXGIAdapter, (void **)&parent); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(parent == (IUnknown *)adapter, "Got parent %p, expected %p.\n", parent, adapter); + IUnknown_Release(parent); + + IDXGIAdapter_Release(adapter); +} + START_TEST(device) { HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); @@ -143,6 +186,7 @@ START_TEST(device) test_device_interfaces(device); test_create_surface(device); + test_parents(device); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : d3d8: Directly store a wined3d stateblock in the stateblock handle.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 8151963f4e39e07682bb29fa76b5abe2aa654f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8151963f4e39e07682bb29fa7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:23 2009 +0100 d3d8: Directly store a wined3d stateblock in the stateblock handle. IDirect3DStateBlock8Impl doesn't actually do anything useful. --- dlls/d3d8/Makefile.in | 1 - dlls/d3d8/d3d8_private.h | 61 ---------------------- dlls/d3d8/device.c | 72 ++++++++++--------------- dlls/d3d8/stateblock.c | 128 ---------------------------------------------- 4 files changed, 29 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8151963f4e39e07682bb2…

1 0

Stefan Dösinger : wined3d: Remove needless NULL checks (coverity).
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 6a1933920767c953445b97216f7a27af4ea07924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1933920767c953445b97216… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 2 10:44:55 2009 +0100 wined3d: Remove needless NULL checks (coverity). --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 221f16e..d75c5e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4053,7 +4053,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; TRACE("(%p)->(%d, %d, %p, %p, %08x\n", iface, dstx, dsty, Source, rsrc, trans); - if ( (This->Flags & SFLAG_LOCKED) || ((srcImpl != NULL) && (srcImpl->Flags & SFLAG_LOCKED))) + if ( (This->Flags & SFLAG_LOCKED) || (srcImpl->Flags & SFLAG_LOCKED)) { WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); return WINEDDERR_SURFACEBUSY; @@ -4061,14 +4061,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD if(myDevice->inScene && (iface == myDevice->stencilBufferTarget || - (Source && Source == myDevice->stencilBufferTarget))) { + (Source == myDevice->stencilBufferTarget))) { TRACE("Attempt to access the depth stencil surface in a BeginScene / EndScene pair, returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; } /* Special cases for RenderTargets */ if( (This->resource.usage & WINED3DUSAGE_RENDERTARGET) || - ( srcImpl && (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) )) { + (srcImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { RECT SrcRect, DstRect; DWORD Flags=0;

1 0

Henri Verbeet : dxgi: Implement IDXGIOutput::GetParent().
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: aa85b4c61d9b4021c99378c2746b2743da76a753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa85b4c61d9b4021c99378c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:19 2009 +0100 dxgi: Implement IDXGIOutput::GetParent(). --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/output.c | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 1efbec9..d13e3e1 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -189,7 +189,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IDXGIFactory *parent, UI { return E_OUTOFMEMORY; } - dxgi_output_init(output); + dxgi_output_init(output, adapter); adapter->output = (IDXGIOutput *)output; return S_OK; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 46b6f43..2929534 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,9 +102,10 @@ struct dxgi_output { const struct IDXGIOutputVtbl *vtbl; LONG refcount; + struct dxgi_adapter *adapter; }; -void dxgi_output_init(struct dxgi_output *output) DECLSPEC_HIDDEN; +void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index c3f8289..5b83427 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -98,9 +98,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_output *This = (struct dxgi_output *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + return IDXGIAdapter_QueryInterface((IDXGIAdapter *)This->adapter, riid, parent); } /* IDXGIOutput methods */ @@ -217,8 +219,9 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl = dxgi_output_GetFrameStatistics, }; -void dxgi_output_init(struct dxgi_output *output) +void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->vtbl = &dxgi_output_vtbl; output->refcount = 1; + output->adapter = adapter; }

1 0

Henri Verbeet : dxgi: Implement IDXGIDevice::GetParent().
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: bfdd5df7f0038796ffa37f23fa617cf4c4cafed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfdd5df7f0038796ffa37f23f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:20 2009 +0100 dxgi: Implement IDXGIDevice::GetParent(). --- dlls/dxgi/device.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 9741d0e..8562d67 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -112,9 +112,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetPrivateData(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + IDXGIAdapter *adapter; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + hr = IDXGIDevice_GetAdapter(iface, &adapter); + if (FAILED(hr)) + { + ERR("Failed to get adapter, hr %#x.\n", hr); + return hr; + } + + hr = IDXGIAdapter_QueryInterface(adapter, riid, parent); + IDXGIAdapter_Release(adapter); + + return hr; } /* IDXGIDevice methods */

1 0

Andrew Nguyen : shlwapi: The third parameter of UrlCombineA/ W is an output parameter.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 77933a925b2bb652d38db0a57710f48e73901089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77933a925b2bb652d38db0a57… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Dec 3 03:20:08 2009 -0600 shlwapi: The third parameter of UrlCombineA/W is an output parameter. --- dlls/shlwapi/shlwapi.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 1a79174..a8e7428 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -810,8 +810,8 @@ @ stdcall UrlApplySchemeW(wstr ptr ptr long) @ stdcall UrlCanonicalizeA(str ptr ptr long) @ stdcall UrlCanonicalizeW(wstr ptr ptr long) -@ stdcall UrlCombineA(str str str ptr long) -@ stdcall UrlCombineW(wstr wstr wstr ptr long) +@ stdcall UrlCombineA(str str ptr ptr long) +@ stdcall UrlCombineW(wstr wstr ptr ptr long) @ stdcall UrlCompareA(str str long) @ stdcall UrlCompareW(wstr wstr long) @ stdcall UrlCreateFromPathA(str ptr ptr long)

1 0

Marcus Meissner : winspool.drv: Check ptr for being NULL (Coverity).
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: faf1485e4e0744af0bc6119f0d680a8ab025b08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf1485e4e0744af0bc6119f0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 3 10:18:19 2009 +0100 winspool.drv: Check ptr for being NULL (Coverity). --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ad99988..8e4d714 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3337,7 +3337,7 @@ static BOOL WINSPOOL_GetDevModeFromReg(HKEY hkey, LPCWSTR ValueName, if (ptr && ((DEVMODEA*)ptr)->dmSize < sizeof(DEVMODEA)) ((DEVMODEA*)ptr)->dmSize = sizeof(DEVMODEA); sz += (CCHDEVICENAME + CCHFORMNAME); - if(buflen >= sz) { + if (ptr && (buflen >= sz)) { DEVMODEW *dmW = GdiConvertToDevmodeW((DEVMODEA*)ptr); memcpy(ptr, dmW, sz); HeapFree(GetProcessHeap(),0,dmW);

1 0

Henri Verbeet : dxgi: Implement IDXGIFactory::GetParent().
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 3543e3d8cc047b4f462680d74d025c49db6fb3bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3543e3d8cc047b4f462680d74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 3 11:38:21 2009 +0100 dxgi: Implement IDXGIFactory::GetParent(). --- dlls/dxgi/factory.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 33c1576..150e40c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -110,9 +110,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetPrivateData(IWineDXGIFactory *i static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + WARN("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - return E_NOTIMPL; + *parent = NULL; + + return E_NOINTERFACE; } /* IDXGIFactory methods */

1 0

Paul Vriens : mshtml/tests: Run tests again on boxes with older IE.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 5bc0dd711a6e4d9e6cfe8bc367ed8fbb769a4955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc0dd711a6e4d9e6cfe8bc36… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 3 08:05:16 2009 +0100 mshtml/tests: Run tests again on boxes with older IE. --- dlls/mshtml/tests/htmldoc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0be3021..ab1a0e0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4152,8 +4152,8 @@ static void test_cookies(IUnknown *unk) ok(hres == S_OK, "get_cookie failed: %08x\n", hres); if(str) { size = sizeof(buf)/sizeof(WCHAR); - b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); - ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + b = InternetGetCookieW(http_urlW, NULL, buf, &size); + ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str), "cookie = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buf)); SysFreeString(str); } @@ -4167,8 +4167,8 @@ static void test_cookies(IUnknown *unk) ok(hres == S_OK, "get_cookie failed: %08x\n", hres); ok(str2 != NULL, "cookie = NULL\n"); size = sizeof(buf)/sizeof(WCHAR); - b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); - ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + b = InternetGetCookieW(http_urlW, NULL, buf, &size); + ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); @@ -4183,8 +4183,8 @@ static void test_cookies(IUnknown *unk) ok(hres == S_OK, "get_cookie failed: %08x\n", hres); ok(str2 != NULL, "cookie = NULL\n"); size = sizeof(buf)/sizeof(WCHAR); - b = InternetGetCookieExW(http_urlW, NULL, buf, &size, 0, NULL); - ok(b, "InternetGetCookieEx failed: %08x\n", GetLastError()); + b = InternetGetCookieW(http_urlW, NULL, buf, &size); + ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str);

1 0