February 2014 - Wine-Commits

Jacek Caban : wmp: Added SetClientSite tests.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 9a1f13cf0d906bfedcc6625565964fe39d201f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1f13cf0d906bfedcc662556… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 11:50:58 2014 +0100 wmp: Added SetClientSite tests. --- dlls/wmp/tests/oleobj.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 605 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a1f13cf0d906bfedcc66…

1 0

Jacek Caban : wmp: Added GetClientSite implementation.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 83c45eaa3ce8e9ac69c7b160445dab54267997cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c45eaa3ce8e9ac69c7b1604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 10 11:51:12 2014 +0100 wmp: Added GetClientSite implementation. --- dlls/wmp/oleobj.c | 7 +++++-- dlls/wmp/tests/oleobj.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index d5c2f85..6506824 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -137,8 +137,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppClientSite); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppClientSite); + + *ppClientSite = This->client_site; + return This->client_site ? S_OK : E_FAIL; } static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szContainerApp, LPCOLESTR szContainerObj) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 8578780..c8fb5a3 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -627,6 +627,7 @@ static void test_QI(IUnknown *unk) static void test_wmp(void) { IProvideClassInfo2 *class_info; + IOleClientSite *client_site; IPersistStreamInit *psi; IOleObject *oleobj; GUID guid; @@ -667,9 +668,19 @@ static void test_wmp(void) todo_wine CHECK_CALLED(GetWindow); todo_wine CHECK_CALLED(Invoke_USERMODE); + client_site = NULL; + hres = IOleObject_GetClientSite(oleobj, &client_site); + ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); + ok(client_site == &ClientSite, "client_site != ClientSite\n"); + hres = IOleObject_SetClientSite(oleobj, NULL); ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + client_site = (void*)0xdeadbeef; + hres = IOleObject_GetClientSite(oleobj, &client_site); + ok(hres == E_FAIL, "GetClientSite failed: %08x\n", hres); + ok(!client_site, "client_site = %p\n", client_site); + ref = IOleObject_Release(oleobj); ok(!ref, "ref = %d\n", ref); }

1 0

Henri Verbeet : dxgi: Properly check if the output array is large enough in dxgi_output_GetDisplayModeList ().
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 852c61c5959e4d92dc9a45166cb4b3a78df678d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852c61c5959e4d92dc9a45166… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:57 2014 +0100 dxgi: Properly check if the output array is large enough in dxgi_output_GetDisplayModeList(). --- dlls/dxgi/output.c | 9 ++++++++- dlls/dxgi/tests/device.c | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index ec9d01b..580a8b4 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -155,7 +155,14 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa return S_OK; } - *mode_count = min(*mode_count,max_count); + if (max_count > *mode_count) + { + wined3d_decref(wined3d); + LeaveCriticalSection(&dxgi_cs); + return DXGI_ERROR_MORE_DATA; + } + + *mode_count = max_count; for (i = 0; i < *mode_count; ++i) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d648dc7..f44e831 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -315,7 +315,7 @@ static void test_output(void) mode_count = 0; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(!modes[0].Height, "No output was expected.\n"); mode_count = mode_count_comp; @@ -340,7 +340,7 @@ static void test_output(void) mode_count = mode_count_comp - 1; hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, &mode_count, modes); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(mode_count == mode_count_comp - 1, "Got unexpected mode_count %u, expected %u.\n", mode_count, mode_count_comp - 1); }

1 0

Henri Verbeet : dxgi: Return DXGI_ERROR_INVALID_CALL when given a NULL mode_count in dxgi_output_GetDisplayModeList ().
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: d9570c3935f66d91583b75fb5865707c066ef6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9570c3935f66d91583b75fb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:56 2014 +0100 dxgi: Return DXGI_ERROR_INVALID_CALL when given a NULL mode_count in dxgi_output_GetDisplayModeList(). --- dlls/dxgi/output.c | 4 +--- dlls/dxgi/tests/device.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4cdd06b..ec9d01b 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -132,9 +132,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa iface, debug_dxgi_format(format), flags, mode_count, desc); if (!mode_count) - { - return S_OK; - } + return DXGI_ERROR_INVALID_CALL; if (format == DXGI_FORMAT_UNKNOWN) { diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b907a23..d648dc7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -279,7 +279,7 @@ static void test_output(void) ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); ok(SUCCEEDED(hr) @@ -309,7 +309,7 @@ static void test_output(void) hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_ENUM_MODES_SCALING, NULL, modes); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ok(!modes[0].Height, "No output was expected.\n"); mode_count = 0;

1 0

Henri Verbeet : dxgi/tests: Use D3D10CreateDevice() to create a device.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: f97d599eb212c76b345a7d308e066287e19b1daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97d599eb212c76b345a7d308… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:54 2014 +0100 dxgi/tests: Use D3D10CreateDevice() to create a device. At some point DXGID3D10CreateDevice() started always returning E_NOTIMPL. My guess would be that that was with the introduction of d3d11. --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/device.c | 82 +++++++++++++------------------------------ 2 files changed, 25 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index c624fec..d706f16 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = dxgi user32 +IMPORTS = d3d10 dxgi user32 C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ba1a29f..e8d2827 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,58 +21,25 @@ #include "d3d10.h" #include "wine/test.h" -HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, - IDXGIAdapter *adapter, UINT flags, void *unknown0, void **device); - -static IDXGIDevice *create_device(HMODULE d3d10core) +static IDXGIDevice *create_device(void) { - IDXGIDevice *dxgi_device = NULL; - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; - IUnknown *device = NULL; + IDXGIDevice *dxgi_device; + ID3D10Device *device; HRESULT hr; - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - if (FAILED(hr)) goto cleanup; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + goto success; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + goto success; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + goto success; - hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - if (SUCCEEDED(hr)) - { - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); - } + return NULL; - if (FAILED(hr)) - { - HMODULE d3d10ref; - - trace("Failed to create a HW device, trying REF\n"); - if (adapter) IDXGIAdapter_Release(adapter); - adapter = NULL; - - d3d10ref = LoadLibraryA("d3d10ref.dll"); - if (!d3d10ref) - { - trace("d3d10ref.dll not available, unable to create a REF device\n"); - goto cleanup; - } - - hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); - FreeLibrary(d3d10ref); - ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); - ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - } - - hr = IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); +success: + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); - IUnknown_Release(device); - -cleanup: - if (adapter) IDXGIAdapter_Release(adapter); - if (factory) IDXGIFactory_Release(factory); + ID3D10Device_Release(device); return dxgi_device; } @@ -265,7 +232,16 @@ static void test_output(IDXGIDevice *device) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_GetDisplayModeList(output, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &mode_count, NULL); - ok(SUCCEEDED(hr), "Failed to list modes, hr %#x.\n", hr); + ok(SUCCEEDED(hr) + || broken(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE), /* Remote Desktop Services / Win 7 testbot */ + "Failed to list modes, hr %#x.\n", hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("GetDisplayModeList() not supported, skipping tests.\n"); + IDXGIOutput_Release(output); + IDXGIAdapter_Release(adapter); + return; + } mode_count_comp = mode_count; hr = IDXGIOutput_GetDisplayModeList(output, 0, 0, &mode_count, NULL); @@ -463,21 +439,12 @@ static void test_createswapchain(IDXGIDevice *device) START_TEST(device) { - HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); IDXGIDevice *device; ULONG refcount; - if (!d3d10core) - { - win_skip("d3d10core.dll not available, skipping tests\n"); - return; - } - - device = create_device(d3d10core); - if (!device) + if (!(device = create_device())) { skip("Failed to create device, skipping tests\n"); - FreeLibrary(d3d10core); return; } @@ -490,5 +457,4 @@ START_TEST(device) refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount); - FreeLibrary(d3d10core); }

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

1 0

Alexandre Julliard : makefiles: Generate the testlist.c files at make depend time.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 3bae3c6514475b17ac884508c26363c6bfd28d0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bae3c6514475b17ac884508c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 10 10:55:18 2014 +0100 makefiles: Generate the testlist.c files at make depend time. --- aclocal.m4 | 4 +- configure | 4 +- tools/Makefile.in | 5 -- tools/make_ctests.c | 160 --------------------------------------------------- tools/makedep.c | 108 ++++++++++++++++++++++++++++------ 5 files changed, 97 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bae3c6514475b17ac884…

1 0

Henri Verbeet : dxgi/tests: Don't reuse the device.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: 4d7bd4ce4a02d59bf79f3b9af3f37edecfb95bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7bd4ce4a02d59bf79f3b9af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 10 10:37:55 2014 +0100 dxgi/tests: Don't reuse the device. --- dlls/dxgi/tests/device.c | 98 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index e8d2827..b907a23 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -44,11 +44,19 @@ success: return dxgi_device; } -static void test_device_interfaces(IDXGIDevice *device) +static void test_device_interfaces(void) { + IDXGIDevice *device; + ULONG refcount; IUnknown *obj; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown\n"); @@ -64,16 +72,27 @@ static void test_device_interfaces(IDXGIDevice *device) if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) IUnknown_Release(obj); ok(SUCCEEDED(hr), "IDXGIDevice does not implement ID3D10Device\n"); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_adapter_desc(IDXGIDevice *device) +static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; IDXGIAdapter1 *adapter1; DXGI_ADAPTER_DESC desc; IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); @@ -123,15 +142,25 @@ static void test_adapter_desc(IDXGIDevice *device) done: IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_create_surface(IDXGIDevice *device) +static void test_create_surface(void) { ID3D10Texture2D *texture; IDXGISurface *surface; DXGI_SURFACE_DESC desc; + IDXGIDevice *device; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + desc.Width = 512; desc.Height = 512; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -146,18 +175,28 @@ static void test_create_surface(IDXGIDevice *device) if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); IDXGISurface_Release(surface); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_parents(IDXGIDevice *device) +static void test_parents(void) { DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface; IDXGIFactory *factory; IDXGIAdapter *adapter; + IDXGIDevice *device; IDXGIOutput *output; IUnknown *parent; + ULONG refcount; HRESULT hr; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + surface_desc.Width = 512; surface_desc.Height = 512; surface_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -206,16 +245,26 @@ static void test_parents(IDXGIDevice *device) IUnknown_Release(parent); IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_output(IDXGIDevice *device) +static void test_output(void) { IDXGIAdapter *adapter; + IDXGIDevice *device; HRESULT hr; IDXGIOutput *output; + ULONG refcount; UINT mode_count, mode_count_comp, i; DXGI_MODE_DESC *modes; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); @@ -224,6 +273,7 @@ static void test_output(IDXGIDevice *device) { skip("Adapter doesn't have any outputs, skipping tests.\n"); IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); return; } ok(SUCCEEDED(hr), "EnumOutputs failed, hr %#x.\n", hr); @@ -240,6 +290,7 @@ static void test_output(IDXGIDevice *device) skip("GetDisplayModeList() not supported, skipping tests.\n"); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); return; } mode_count_comp = mode_count; @@ -301,6 +352,8 @@ static void test_output(IDXGIDevice *device) HeapFree(GetProcessHeap(), 0, modes); IDXGIOutput_Release(output); IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } struct refresh_rates @@ -311,11 +364,13 @@ struct refresh_rates BOOL denominator_should_pass; }; -static void test_createswapchain(IDXGIDevice *device) +static void test_createswapchain(void) { IUnknown *obj; IDXGIAdapter *adapter; IDXGIFactory *factory; + IDXGIDevice *device; + ULONG refcount; IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; @@ -331,6 +386,11 @@ static void test_createswapchain(IDXGIDevice *device) { 0, 0, TRUE, FALSE}, }; + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "dxgi_test_wc"; @@ -435,26 +495,16 @@ static void test_createswapchain(IDXGIDevice *device) IDXGIFactory_Release(factory); IDXGIAdapter_Release(adapter); IUnknown_Release(obj); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } START_TEST(device) { - IDXGIDevice *device; - ULONG refcount; - - if (!(device = create_device())) - { - skip("Failed to create device, skipping tests\n"); - return; - } - - test_adapter_desc(device); - test_device_interfaces(device); - test_create_surface(device); - test_parents(device); - test_output(device); - test_createswapchain(device); - - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left\n", refcount); + test_adapter_desc(); + test_device_interfaces(); + test_create_surface(); + test_parents(); + test_output(); + test_createswapchain(); }

1 0

Dmitry Timoshkov : xmllite/tests: Add a test for short variant of xml declaration.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: b02ea57e043c4ddac7a396ae5eaa52caeb6eaa9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02ea57e043c4ddac7a396ae5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 12:44:52 2014 +0900 xmllite/tests: Add a test for short variant of xml declaration. --- dlls/xmllite/tests/reader.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index b7ef862..f4ad466 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -55,6 +55,7 @@ static void free_str(WCHAR *str) } static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_short[] = "<?xml version=\"1.0\"?>\n"; static IStream *create_stream_on_data(const char *data, int size) { @@ -750,6 +751,42 @@ todo_wine { ok(type == XmlNodeType_None, "got %d\n", type); } IStream_Release(stream); + + /* test short variant */ + stream = create_stream_on_data(xmldecl_short, sizeof(xmldecl_short)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + + type = -1; + hr = IXmlReader_Read(reader, &type); +todo_wine + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); + ok_pos(reader, 1, 3, 1, 21, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, TRUE); + + hr = IXmlReader_GetValue(reader, &val, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); +todo_wine + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + + /* check attributes */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + + type = -1; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + ok_pos(reader, 1, 7, 1, 21, TRUE); + + /* try to move from last attribute */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); + + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Nikolay Sivov : ole32: Use CoTaskMemAlloc() instead of IMalloc directly.
by Alexandre Julliard Feb. 10, 2014

Feb. 10, 2014

Module: wine Branch: master Commit: d1c4871012d537f1a1568261c6e661c9c646b358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c4871012d537f1a1568261c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:56:38 2014 +0400 ole32: Use CoTaskMemAlloc() instead of IMalloc directly. --- dlls/ole32/compobj.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3e99097..2160cba 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2215,11 +2215,7 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) */ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) { - HRESULT ret; - LPMALLOC mllc; - - if ((ret = CoGetMalloc(0,&mllc))) return ret; - if (!(*idstr = IMalloc_Alloc( mllc, CHARS_IN_GUID * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(*idstr = CoTaskMemAlloc(CHARS_IN_GUID * sizeof(WCHAR)))) return E_OUTOFMEMORY; StringFromGUID2( id, *idstr, CHARS_IN_GUID ); return S_OK; }

1 0