March 2014 - Wine-commits - list.winehq.org

Aric Stewart : imm32: Set context conversion and sentence status.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: wine Branch: master Commit: f0de67de0cab3e67364d699850d86325ddcf70f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0de67de0cab3e67364d69985… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 11 09:12:10 2014 -0500 imm32: Set context conversion and sentence status. --- dlls/imm32/imm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ccef19d..2fa31ac 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -696,6 +696,9 @@ HIMC WINAPI ImmCreateContext(void) /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); + new_context->IMC.fdwConversion = new_context->immKbd->imeInfo.fdwConversionCaps; + new_context->IMC.fdwSentence = new_context->immKbd->imeInfo.fdwSentenceCaps; + if (!new_context->immKbd->pImeSelect(new_context, TRUE)) { TRACE("Selection of IME failed\n");

1 0

Jacek Caban : crypt32/tests: Improved test failure message.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: wine Branch: master Commit: 3d09d1a9cb1db5bca846808b2e0ec94214017daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d09d1a9cb1db5bca846808b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 11:24:52 2014 +0100 crypt32/tests: Improved test failure message. --- dlls/crypt32/tests/chain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f69fbdc..bf02ca0 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3880,9 +3880,8 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); if (ret) { - ok(!(chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_VALID_FOR_USAGE), - "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + ok(!(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE), + "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE, got %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); } oids[1] = one_two_three;

1 0

Stefan Dösinger : wined3d: Correctly handle the size parameter in get_private_data.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: wine Branch: master Commit: 3754cdd7931ebd078caeba64714a3312dd66b59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3754cdd7931ebd078caeba647… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:23 2014 +0100 wined3d: Correctly handle the size parameter in get_private_data. --- dlls/wined3d/resource.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 04c3af4..8813af7 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -250,18 +250,21 @@ HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *r void *data, DWORD *data_size) { const struct private_data *d; + DWORD size_in; TRACE("resource %p, guid %s, data %p, data_size %p.\n", resource, debugstr_guid(guid), data, data_size); d = resource_find_private_data(resource, guid); - if (!d) return WINED3DERR_NOTFOUND; - - if (*data_size < d->size) - { - *data_size = d->size; + if (!d) + return WINED3DERR_NOTFOUND; + + size_in = *data_size; + *data_size = d->size; + if (!data) + return WINED3D_OK; + if (size_in < d->size) return WINED3DERR_MOREDATA; - } if (d->flags & WINED3DSPD_IUNKNOWN) {

1 0

Stefan Dösinger : d3d9/tests: Use a custom GUID for the private data tests.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: wine Branch: master Commit: 6ffbfc7c29543b6c6282cdd6a719b861b85af5ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffbfc7c29543b6c6282cdd6a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:24 2014 +0100 d3d9/tests: Use a custom GUID for the private data tests. --- dlls/d3d9/tests/device.c | 47 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 93f43fa..393c14a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5082,6 +5082,13 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; + static const GUID d3d9_private_data_test_guid = + { + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} + }; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5099,57 +5106,57 @@ static void test_private_data(void) D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, 0, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, 5, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* A failing SetPrivateData call does not clear the old data with the same tag. */ - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(device), D3DSPD_IUNKNOWN); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(device) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, &ptr, &size); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); IUnknown_Release(ptr); - hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + hr = IDirect3DSurface9_FreePrivateData(surface, &d3d9_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DSurface9); + hr = IDirect3DSurface9_FreePrivateData(surface, &d3d9_private_data_test_guid); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount - 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, surface, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DSurface9, &ptr, &size); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); @@ -5171,27 +5178,27 @@ static void test_private_data(void) hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface2); ok(SUCCEEDED(hr), "Failed to get texture level 1, hr %#x.\n", hr); - hr = IDirect3DTexture9_SetPrivateData(texture, &IID_IDirect3DVertexBuffer9, data, sizeof(data), 0); + hr = IDirect3DTexture9_SetPrivateData(texture, &d3d9_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); memset(data, 0, sizeof(data)); size = sizeof(data); - hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, data, &size); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DTexture9_GetPrivateData(texture, &IID_IDirect3DVertexBuffer9, data, &size); + hr = IDirect3DTexture9_GetPrivateData(texture, &d3d9_private_data_test_guid, data, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); ok(data[0] == 1 && data[1] == 2 && data[2] == 3 && data[3] == 4, "Got unexpected private data: %u, %u, %u, %u.\n", data[0], data[1], data[2], data[3]); - hr = IDirect3DTexture9_FreePrivateData(texture, &IID_IDirect3DVertexBuffer9); + hr = IDirect3DTexture9_FreePrivateData(texture, &d3d9_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, data, sizeof(data), 0); + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface9_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer9, data, &size); + hr = IDirect3DSurface9_GetPrivateData(surface2, &d3d9_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + hr = IDirect3DSurface9_FreePrivateData(surface, &d3d9_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); IDirect3DSurface9_Release(surface2);

1 0

Stefan Dösinger : d3d9/tests: Test GetPrivateData size behavior.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: wine Branch: master Commit: 2a95fa6831a300569c7a6b6522e21f0db7aa0a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a95fa6831a300569c7a6b652… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:25 2014 +0100 d3d9/tests: Test GetPrivateData size behavior. --- dlls/d3d9/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 393c14a..af5f4d4 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5089,6 +5089,13 @@ static void test_private_data(void) 0x4edf, {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} }; + static const GUID d3d9_private_data_test_guid2 = + { + 0x2e5afac2, + 0x87b5, + 0x4c10, + {0x9b,0x4b,0x89,0xd7,0xd1,0x12,0xe7,0x2b} + }; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5155,18 +5162,46 @@ static void test_private_data(void) hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - size = sizeof(ptr); + size = 2 * sizeof(ptr); hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ok(ptr == (IUnknown *)device, "Got unexpected ptr %p, expected %p.\n", ptr, device); IUnknown_Release(ptr); + expected_refcount--; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, NULL, &size); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, NULL, &size); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + size = 1; + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); + ok(hr == D3DERR_MOREDATA, "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 = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid2, NULL, NULL); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid2, &ptr, &size); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + ok(size == 0xdeadbabe, "Got unexpected size %u.\n", size); + /* GetPrivateData with size = NULL causes an access violation on Windows if the + * requested data exists. */ /* Destroying the surface frees the held reference. */ IDirect3DSurface9_Release(surface); - expected_refcount = refcount - 3; + expected_refcount = refcount - 2; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount);

1 0

Stefan Dösinger : d3d8/tests: Use a custom GUID for the private data tests.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: wine Branch: master Commit: 120ca8e7226ee9b6c6bbaa4e395ae9a764323e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120ca8e7226ee9b6c6bbaa4e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:26 2014 +0100 d3d8/tests: Use a custom GUID for the private data tests. --- dlls/d3d8/tests/device.c | 47 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2bac6fd..d729de0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3889,6 +3889,13 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; + static const GUID d3d8_private_data_test_guid = + { + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} + }; window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -3905,57 +3912,57 @@ static void test_private_data(void) hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_A8R8G8B8, &surface); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, 0, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, 5, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* A failing SetPrivateData call does not clear the old data with the same tag. */ - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(device), D3DSPD_IUNKNOWN); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(device) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DVertexBuffer8, &ptr, &size); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, &ptr, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); IUnknown_Release(ptr); - hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DVertexBuffer8); + hr = IDirect3DSurface8_FreePrivateData(surface, &d3d8_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DSurface8); + hr = IDirect3DSurface8_FreePrivateData(surface, &d3d8_private_data_test_guid); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount - 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, surface, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8, + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DSurface8, &ptr, &size); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); @@ -3976,26 +3983,26 @@ static void test_private_data(void) hr = IDirect3DTexture8_GetSurfaceLevel(texture, 1, &surface2); ok(SUCCEEDED(hr), "Failed to get texture level 1, hr %#x.\n", hr); - hr = IDirect3DTexture8_SetPrivateData(texture, &IID_IDirect3DVertexBuffer8, data, sizeof(data), 0); + hr = IDirect3DTexture8_SetPrivateData(texture, &d3d8_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); memset(data, 0, sizeof(data)); size = sizeof(data); - hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DVertexBuffer8, data, &size); + hr = IDirect3DSurface8_GetPrivateData(surface, &d3d8_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DTexture8_GetPrivateData(texture, &IID_IDirect3DVertexBuffer8, data, &size); + hr = IDirect3DTexture8_GetPrivateData(texture, &d3d8_private_data_test_guid, data, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); ok(data[0] == 1 && data[1] == 2 && data[2] == 3 && data[3] == 4, "Got unexpected private data: %u, %u, %u, %u.\n", data[0], data[1], data[2], data[3]); - hr = IDirect3DTexture8_FreePrivateData(texture, &IID_IDirect3DVertexBuffer8); + hr = IDirect3DTexture8_FreePrivateData(texture, &d3d8_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); - hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, data, sizeof(data), 0); + hr = IDirect3DSurface8_SetPrivateData(surface, &d3d8_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface8_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer8, data, &size); + hr = IDirect3DSurface8_GetPrivateData(surface2, &d3d8_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DVertexBuffer8); + hr = IDirect3DSurface8_FreePrivateData(surface, &d3d8_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); IDirect3DSurface8_Release(surface2);

1 0

Francois Gouget : testbot: Don' t show the TestAgent server version when failing to set the time.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: tools Branch: master Commit: b7f27a6b914689b7e05073e56ac40750ce2b04b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b7f27a6b914689b7e05073e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:22:59 2014 +0100 testbot: Don't show the TestAgent server version when failing to set the time. The connection may have failed in which case we don't have this information. --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ce1adb5..efeac8d 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -231,7 +231,7 @@ if (defined $ErrMessage) if (!$TA->SetTime()) { # Not a fatal error - LogTaskError("Unable to set the VM system time (". $TA->GetVersion() ."): ". $TA->GetLastError() ."\n", $FullErrFileName); + LogTaskError("Unable to set the VM system time: ". $TA->GetLastError() ."\n", $FullErrFileName); } my $FileType = $Step->FileType;

1 0

Francois Gouget : testbot/TestAgent: _SetError() may be called when connecting, that is outside any RPC.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: tools Branch: master Commit: 6157405f4a6dd1e45f3ca6aabc78c8750e6e75d2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6157405f4a6dd1e45f3ca6aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:25:29 2014 +0100 testbot/TestAgent: _SetError() may be called when connecting, that is outside any RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f313984..c138663 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -212,7 +212,8 @@ sub _SetError($$$) # We did not even manage to connect but record the error anyway $self->{err} = $Msg; } - debug($RpcNames{$self->{rpcid}} || $self->{rpcid}, ": $self->{err}\n"); + my $RpcName = defined $self->{rpcid} ? $RpcNames{$self->{rpcid}} || $self->{rpcid} : "Connect"; + debug("$RpcName: $self->{err}\n"); } sub GetLastError($)

1 0

Francois Gouget : testbot/TestAgent: We don' t need the server version for SetTime().
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: tools Branch: master Commit: 8fd1a3be1d792132a397144b03b7b96472afc7de URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fd1a3be1d792132a397144b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:25:58 2014 +0100 testbot/TestAgent: We don't need the server version for SetTime(). Just let the server return an error if it does not know about this RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c138663..f810f2b 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -2,7 +2,7 @@ # to run scripts. # # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -1206,9 +1206,6 @@ sub SetTime($) my ($self) = @_; debug("SetTime\n"); - # Make sure we have the server version - return undef if (!$self->{agentversion} and !$self->_Connect()); - # Send the command if (!$self->_StartRPC($RPC_SETTIME) or !$self->_SendListSize(2) or

1 0

Francois Gouget : testbot/TestAgent: Better handle connection timeouts.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: tools Branch: master Commit: a116dac155fd6a6c24684203c20174fd30f9a844 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a116dac155fd6a6c24684203… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:45:54 2014 +0100 testbot/TestAgent: Better handle connection timeouts. The timeout can and does sometimes happen when connecting or authenticating to SSH or starting netcat, not just when creating the initial socket connection. So apply the timeout and connection retries to the whole process. This means RevertVM no longer needs its own attempt loop and the other scripts should no longer fail to connect where RevertVM succeeded. Also let clients specify how many attempts to make in case they don't like the default of 3. --- testbot/bin/RevertVM.pl | 9 +- testbot/lib/WineTestBot/TestAgent.pm | 239 +++++++++++++++++++--------------- 2 files changed, 134 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=a116dac155fd6a6c2468…

1 0