wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Henri Verbeet : d3d10core: Implement d3d10_device_GetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 34f4c407b26416404e7a5bf07ecdef40f885d2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f4c407b26416404e7a5bf07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:41 2015 +0100 d3d10core: Implement d3d10_device_GetPrivateData(). --- dlls/d3d10core/device.c | 12 ++++++++++-- dlls/d3d10core/tests/device.c | 35 +++++++++++++++++------------------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index fe7e054..ed59ee6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1275,10 +1275,18 @@ static UINT STDMETHODCALLTYPE d3d10_device_GetExceptionMode(ID3D10Device1 *iface static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + IDXGIDevice *dxgi_device; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6524e32..1f3ffe7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2562,9 +2562,9 @@ static void test_private_data(void) size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); - todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); @@ -2615,41 +2615,40 @@ static void test_private_data(void) size = 2 * sizeof(ptr); ptr = NULL; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); ++expected_refcount; refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - if (ptr) - IUnknown_Release(ptr); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + IUnknown_Release(ptr); --expected_refcount; ptr = (IUnknown *)0xdeadbeef; size = 1; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); size = 2 * sizeof(ptr); hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); - todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); size = 0xdeadbabe; hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); - todo_wine ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - todo_wine ok(size == 0, "Got unexpected size %u.\n", size); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); refcount = ID3D10Device_Release(device);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SetPrivateDataInterface( ).
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 7f7844a79dd68d48dd6a50ba12e3164cba68ee43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7844a79dd68d48dd6a50ba1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:40 2015 +0100 d3d10core: Implement d3d10_device_SetPrivateDataInterface(). --- dlls/d3d10core/device.c | 12 ++++++++++-- dlls/d3d10core/tests/device.c | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 21f3c30..fe7e054 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1301,9 +1301,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 24bddda..6524e32 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2551,14 +2551,14 @@ static void test_private_data(void) hr = ID3D10Device_SetPrivateData(device, &test_guid, 0, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_SetPrivateData(device, &test_guid, ~0u, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_SetPrivateData(device, &test_guid, ~0u, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); @@ -2571,33 +2571,33 @@ static void test_private_data(void) size = sizeof(ptr) * 2; ptr = (IUnknown *)0xdeadbeef; hr = IDXGIDevice_GetPrivateData(dxgi_device, &test_guid, &size, &ptr); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); - todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); IDXGIDevice_Release(dxgi_device); refcount = get_refcount((IUnknown *)test_object); hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); --expected_refcount; refcount = get_refcount((IUnknown *)test_object); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(data); hr = ID3D10Device_SetPrivateData(device, &test_guid, size, data); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -2610,7 +2610,7 @@ static void test_private_data(void) hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ++expected_refcount; size = 2 * sizeof(ptr); ptr = NULL; @@ -2634,7 +2634,7 @@ static void test_private_data(void) todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); refcount = get_refcount((IUnknown *)test_object); - todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); size = 1; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_SetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: c9fd72d80cc9225488cab70edb72ec1bea8e2e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fd72d80cc9225488cab70ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:39 2015 +0100 d3d10core: Implement d3d10_device_SetPrivateData(). --- dlls/d3d10core/device.c | 12 +++- dlls/d3d10core/tests/device.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7f41360..21f3c30 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1284,10 +1284,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + IDXGIDevice *dxgi_device; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8b51cda..24bddda 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2519,6 +2519,145 @@ static void test_texture(void) DestroyWindow(window); } +static void test_private_data(void) +{ + ULONG refcount, expected_refcount; + ID3D10Device *test_object; + IDXGIDevice *dxgi_device; + ID3D10Device *device; + IUnknown *ptr; + HRESULT hr; + UINT size; + + static const GUID test_guid = + {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + static const GUID test_guid2 = + {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; + static const DWORD data[] = {1, 2, 3, 4}; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + test_object = create_device(); + + /* SetPrivateData() with a pointer of NULL has the purpose of + * FreePrivateData() in previous D3D versions. A successful clear returns + * S_OK. A redundant clear S_FALSE. Setting a NULL interface is not + * considered a clear but as setting an interface pointer that happens to + * be NULL. */ + hr = ID3D10Device_SetPrivateData(device, &test_guid, 0, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateData(device, &test_guid, ~0u, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateData(device, &test_guid, ~0u, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); + todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = IDXGIDevice_GetPrivateData(dxgi_device, &test_guid, &size, &ptr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!ptr, "Got unexpected pointer %p.\n", ptr); + todo_wine ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + IDXGIDevice_Release(dxgi_device); + + refcount = get_refcount((IUnknown *)test_object); + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected_refcount = refcount + 1; + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + --expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(data); + hr = ID3D10Device_SetPrivateData(device, &test_guid, size, data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D10Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D10Device_SetPrivateDataInterface(device, &test_guid, + (IUnknown *)test_object); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ++expected_refcount; + size = 2 * sizeof(ptr); + ptr = NULL; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ++expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + if (ptr) + IUnknown_Release(ptr); + --expected_refcount; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)test_object); + todo_wine ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + size = 1; + hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, &ptr); + todo_wine ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); + todo_wine ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + todo_wine ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = ID3D10Device_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", refcount); +} + START_TEST(device) { test_create_texture2d(); @@ -2537,4 +2676,5 @@ START_TEST(device) test_clear_state(); test_blend(); test_texture(); + test_private_data(); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 7b620af230ee82632bd97951a0532821900620df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b620af230ee82632bd97951a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Feb 23 22:55:04 2015 +0200 po: Update Lithuanian translation. --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index a0e0d03..24ff72b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-20 19:22+0300\n" +"PO-Revision-Date: 2015-02-23 22:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -11507,10 +11507,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Klaida: Netinkami komandos eilutės parametrai\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Klaida: Negalima pridėti raktų nuotoliniame kompiuteryje\n" +msgstr "Klaida: Nepavyko prieiti prie nuotolinio kompiuterio\n" #: reg.rc:38 msgid "" @@ -11518,10 +11516,8 @@ msgid "" msgstr "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikšmės\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Nepalaikomas tipas.\n" +msgstr "Klaida: Nepalaikomas tipas\n" #: regedit.rc:34 msgid "&Registry"

1 0

Andrey Gusev : po: Fix a mistake in Dutch translation.
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 3bd8800021b34d38aa5851b8227d7d5aab40d4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd8800021b34d38aa5851b82… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 23 16:57:03 2015 +0200 po: Fix a mistake in Dutch translation. --- po/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index b652d6b..1a18f8c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13946,7 +13946,7 @@ msgid "" "and attach that file to the report." msgstr "" "Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteed, dan kunt U gedetailleerde informatie in een bestand " +"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " "opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=\"http://" "wiki.winehq.org/Bugs\">file a bug report</a> versturen."

1 0

Julian Rüger : German translation for release 1.7.37
by Jeremy Newman 24 Feb '15

24 Feb '15

Module: website Branch: master Commit: e216935bed1cec33ee3970233baaad6aad0dc534 URL: http://source.winehq.org/git/website.git/?a=commit;h=e216935bed1cec33ee3970… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Feb 24 10:29:07 2015 +0100 German translation for release 1.7.37 --- news/de/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015022001.xml b/news/de/2015022001.xml new file mode 100644 index 0000000..c4d3850 --- /dev/null +++ b/news/de/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>20. Februar 2015</date> +<title>Wine 1.7.37 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.37 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.37">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Benachrichtigungen über Schnittstellen-Änderungen (Netzwerk).</li> + <li>Unterstützung der UTF-7 Kodierung.</li> + <li>Korrekturen von Grafikfehlern bei Kontrollelementen mit Themen.</li> + <li>Wininet ist jetzt auf Basis von Win32-Sockets implementiert.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.37
by Jeremy Newman 23 Feb '15

23 Feb '15

Module: website Branch: master Commit: 707a69016c1c9a284a99a51cd4de5f1488a123f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=707a69016c1c9a284a99a5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 21 06:53:08 2015 +0100 Polish translation for release 1.7.37 --- news/pl/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015022001.xml b/news/pl/2015022001.xml new file mode 100644 index 0000000..8cfbc6b --- /dev/null +++ b/news/pl/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>Luty 20, 2015</date> +<title>Wydano Wine 1.7.37</title> +<body> + Wydanie rozwojowe Wine 1.7.37 jest już dostępne. + <a href="{$root}/announce/1.7.37">Co nowego</a> w tym wydaniu: +<ul> + <li>Powiadomienia o zmianie interfejsu.</li> + <li>Wsparcie dla kodowania UTF-7.</li> + <li>Kilka graficznych poprawek dla ozdobionych elementów sterowania.</li> + <li>Wininet jest od teraz zaimplementowany na gniazdach Win32.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.37
by Jeremy Newman 23 Feb '15

23 Feb '15

Module: website Branch: master Commit: 4435848723a5f1c2c1dae7a893e84dd3991b2351 URL: http://source.winehq.org/git/website.git/?a=commit;h=4435848723a5f1c2c1dae7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Feb 21 11:33:34 2015 +0200 Ukrainian translation for release 1.7.37 --- news/uk/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015022001.xml b/news/uk/2015022001.xml new file mode 100644 index 0000000..68de295 --- /dev/null +++ b/news/uk/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>20 лютого 2015</date> +<title>Випущено Wine 1.7.37</title> +<body> + Розробницький реліз Wine 1.7.37 наразі доступний. + <a href="{$root}/announce/1.7.37">Що нового</a> в цьому релізі: +<ul> + <li>Інтерфейс повідомлень про зміни.</li> + <li>Підтримка кодування UTF-7.</li> + <li>Ряд графічних виправлень для елементів управління.</li> + <li>Реалізація Wininet поверх Win32 сокетів.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Jacek Caban : mshtml: Added support for CONTEXT_MENU_TEXTSELECT context menu type.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 31d51d4865d0f361ea739ee097902444e604d035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d51d4865d0f361ea739ee09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 14:08:12 2015 +0100 mshtml: Added support for CONTEXT_MENU_TEXTSELECT context menu type. --- dlls/mshtml/nsembed.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8f3fceb..f4d14bc 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1490,9 +1490,21 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList switch(aContextFlags) { case CONTEXT_NONE: case CONTEXT_DOCUMENT: - case CONTEXT_TEXT: - dwID = CONTEXT_MENU_DEFAULT; + case CONTEXT_TEXT: { + nsISelection *selection; + + nsres = nsIDOMHTMLDocument_GetSelection(This->doc->basedoc.doc_node->nsdoc, &selection); + if(NS_SUCCEEDED(nsres) && selection) { + cpp_bool is_collapsed; + + /* FIXME: Check if the click was inside selection. */ + nsres = nsISelection_GetIsCollapsed(selection, &is_collapsed); + nsISelection_Release(selection); + if(NS_SUCCEEDED(nsres) && !is_collapsed) + dwID = CONTEXT_MENU_TEXTSELECT; + } break; + } case CONTEXT_IMAGE: case CONTEXT_IMAGE|CONTEXT_LINK: dwID = CONTEXT_MENU_IMAGE;

1 0

André Hentschel : msxml3: Declare debug channels only when needed (Clang).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 10148677266c7fdd7f6f6a36bf1781ce6735760a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10148677266c7fdd7f6f6a36b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:41 2015 +0100 msxml3: Declare debug channels only when needed (Clang). --- dlls/msxml3/attribute.c | 4 ++-- dlls/msxml3/cdata.c | 4 ++-- dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/docfrag.c | 4 ++-- dlls/msxml3/doctype.c | 4 ++-- dlls/msxml3/domdoc.c | 4 ++-- dlls/msxml3/domimpl.c | 4 ++-- dlls/msxml3/element.c | 4 ++-- dlls/msxml3/entityref.c | 4 ++-- dlls/msxml3/httprequest.c | 4 ++-- dlls/msxml3/main.c | 4 ++-- dlls/msxml3/node.c | 4 ++-- dlls/msxml3/nodelist.c | 4 ++-- dlls/msxml3/nodemap.c | 4 ++-- dlls/msxml3/pi.c | 4 ++-- dlls/msxml3/saxreader.c | 4 ++-- dlls/msxml3/schema.c | 4 ++-- dlls/msxml3/selection.c | 4 ++-- dlls/msxml3/text.c | 4 ++-- dlls/msxml3/xdr.c | 4 ++-- dlls/msxml3/xmldoc.c | 4 ++-- dlls/msxml3/xmlelem.c | 4 ++-- dlls/msxml3/xmlview.c | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index bb0655c..637615b 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -39,10 +39,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const xmlChar xmlns[] = "xmlns"; typedef struct _domattr diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 2fcacff..c255b1b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { xmlnode node; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 12a584d..0317c4f 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domcomment { xmlnode node; diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 1b56885..b2dd3e5 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domfrag { xmlnode node; diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 322b6c2..79d74d9 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -39,10 +39,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domdoctype { xmlnode node; diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2244172..71cf077 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -52,10 +52,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + /* not defined in older versions */ #define XML_SAVE_FORMAT 1 #define XML_SAVE_NO_DECL 2 diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index e286e57..74223d5 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domimpl { DispatchEx dispex; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0de9c34..38d3b47 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -39,10 +39,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const xmlChar DT_prefix[] = "dt"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 1c0309a..5d5d424 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _entityref { xmlnode node; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index cf53db4..aab41f7 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -48,10 +48,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; static const DWORD safety_supported_options = diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 81ce1f4..1905f57 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -56,12 +56,12 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - HINSTANCE MSXML_hInstance = NULL; #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) { enum __wine_debug_class dbcl; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 92063be..1178e60 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -53,10 +53,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + #ifdef SONAME_LIBXSLT extern void* libxslt_handle; # define MAKE_FUNCPTR(f) extern typeof(f) * p##f diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index c68eefc..2c1d10e 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -48,10 +48,10 @@ * thus the child is inaccessible by an XPath query */ -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { DispatchEx dispex; diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 1eed3d5..2ad6f12 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -40,10 +40,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { DispatchEx dispex; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 96fb118..cea9570 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _dom_pi { xmlnode node; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a926fed..5061413 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -45,10 +45,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef enum { FeatureUnknown = 0, diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index d694cb3..7a1f8b3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -48,6 +48,8 @@ #include "msxml_private.h" +#ifdef HAVE_LIBXML2 + WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* We use a chained hashtable, which can hold any number of schemas @@ -58,8 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* This is just the number of buckets, should be prime */ #define DEFAULT_HASHTABLE_SIZE 17 -#ifdef HAVE_LIBXML2 - xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI); static const xmlChar XSD_schema[] = "schema"; diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 6a72550..b7c560a 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -52,10 +52,10 @@ * */ -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + int registerNamespaces(xmlXPathContextPtr ctxt); xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 411f6eb..3a12d4b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -40,10 +40,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domtext { xmlnode node; diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index fd7a9b7..b5e91bc 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -28,14 +28,14 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - /* Both XDR and XSD are valid XML * We just convert the doc tree, no need for a parser. */ #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const xmlChar DT_prefix[] = "dt"; static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes"; static const xmlChar XDR_href[] = "urn:schemas-microsoft-com:xml-data"; diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 730ff6e..6f4c73e 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -42,10 +42,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + /* FIXME: IXMLDocument needs to implement * - IXMLError * - IPersistMoniker diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index e1ef0eb..96b2007 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -39,10 +39,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static HRESULT XMLElementCollection_create( xmlNodePtr node, LPVOID *ppObj ); /********************************************************************** diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index 4c7a142..2bf58f8 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -40,10 +40,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { IPersistMoniker IPersistMoniker_iface;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015