wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Henri Verbeet : d3d8/tests: Introduce a test for vertex buffer map synchronisation.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 7b4e88e077056148d7f4777351127099329f6e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4e88e077056148d7f47773… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:06:58 2018 +0100 d3d8/tests: Introduce a test for vertex buffer map synchronisation. Based on a patch by Patrick Rudolph from a while ago. Thanks to Stefan Dösinger for making this test work with AMD drivers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 588a629..b64f08c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9915,6 +9915,223 @@ static void test_drawindexedprimitiveup(void) DestroyWindow(window); } +static void test_map_synchronisation(void) +{ + LARGE_INTEGER frequency, diff, ts[3]; + unsigned int i, j, tri_count, size; + D3DADAPTER_IDENTIFIER8 identifier; + IDirect3DVertexBuffer8 *buffer; + IDirect3DDevice8 *device; + BOOL unsynchronised, ret; + IDirect3D8 *d3d; + D3DCOLOR colour; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const struct + { + unsigned int flags; + BOOL unsynchronised; + } + tests[] = + { + {0, FALSE}, + {D3DLOCK_NOOVERWRITE, TRUE}, + {D3DLOCK_DISCARD, FALSE}, + {D3DLOCK_NOOVERWRITE | D3DLOCK_DISCARD, TRUE}, + }; + + static const struct quad + { + struct + { + struct vec3 position; + DWORD diffuse; + } strip[4]; + } + quad1 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + } + }, + quad2 = + { + { + {{-1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffffff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffff00}, + } + }; + struct quad *quads; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + /* Maps are always synchronised on WARP. */ + if (adapter_is_warp(&identifier)) + { + skip("Running on WARP, skipping test.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + tri_count = 0x1000; + if (tri_count > caps.MaxPrimitiveCount) + { + skip("Device supports only %u primitives, skipping test.\n", caps.MaxPrimitiveCount); + goto done; + } + size = (tri_count + 2) * sizeof(*quad1.strip); + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "Failed to get performance counter frequency.\n"); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, size, + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, size, (BYTE **)&quads, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < size / sizeof(*quads); ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*quads->strip)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + + /* Initial draw to initialise states, compile shaders, etc. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Read the result to ensure the GPU has finished drawing. */ + colour = getPixelColor(device, 320, 240); + + /* Time drawing tri_count triangles. */ + ret = QueryPerformanceCounter(&ts[0]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + /* Time drawing a single triangle. */ + ret = QueryPerformanceCounter(&ts[1]); + ok(ret, "Failed to read performance counter.\n"); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 1); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + colour = getPixelColor(device, 320, 240); + ret = QueryPerformanceCounter(&ts[2]); + ok(ret, "Failed to read performance counter.\n"); + + IDirect3DVertexBuffer8_Release(buffer); + + /* Estimate the number of triangles we can draw in 100ms. */ + diff.QuadPart = ts[1].QuadPart - ts[0].QuadPart + ts[1].QuadPart - ts[2].QuadPart; + tri_count = (tri_count * frequency.QuadPart) / (diff.QuadPart * 10); + tri_count = ((tri_count + 2 + 3) & ~3) - 2; + if (tri_count > caps.MaxPrimitiveCount) + { + skip("Would need to draw %u triangles, but the device only supports %u primitives.\n", + tri_count, caps.MaxPrimitiveCount); + goto done; + } + size = (tri_count + 2) * sizeof(*quad1.strip); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DDevice8_CreateVertexBuffer(device, size, + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, size, (BYTE **)&quads, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (j = 0; j < size / sizeof(*quads); ++j) + { + quads[j] = quad1; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*quads->strip)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + + /* Start a draw operation. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, tri_count); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* Map the last quad while the draw is in progress. */ + hr = IDirect3DVertexBuffer8_Lock(buffer, size - sizeof(quad2), + sizeof(quad2), (BYTE **)&quads, tests[i].flags); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + *quads = quad2; + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + unsynchronised = color_match(colour, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x00), 1); + ok(tests[i].unsynchronised == unsynchronised, "Expected %s map for flags %#x.\n", + tests[i].unsynchronised ? "unsynchronised" : "synchronised", tests[i].flags); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + } + +done: + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9986,4 +10203,5 @@ START_TEST(visual) test_max_index16(); test_backbuffer_resize(); test_drawindexedprimitiveup(); + test_map_synchronisation(); }

1 0

Henri Verbeet : ddraw/tests: Introduce a test for vertex buffer map synchronisation.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 5aefc4e3c9cebb6cae38e7d2e49fc939d70baa9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aefc4e3c9cebb6cae38e7d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:06:57 2018 +0100 ddraw/tests: Introduce a test for vertex buffer map synchronisation. Based on a patch by Patrick Rudolph from a while ago. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 197 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5aefc4e3c9cebb6cae38…

1 0

Henri Verbeet : ddraw: Only respect DDLOCK_NOOVERWRITE and DDLOCK_DISCARDCONTENTS on version 7 vertex buffers.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 3037097198afcd7cae38bfb53e203b005aad53cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3037097198afcd7cae38bfb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:06:56 2018 +0100 ddraw: Only respect DDLOCK_NOOVERWRITE and DDLOCK_DISCARDCONTENTS on version 7 vertex buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 07f1257..cc676f3 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -164,6 +164,9 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, TRACE("iface %p, flags %#x, data %p, data_size %p.\n", iface, flags, data, data_size); + if (buffer->version != 7) + flags &= ~(DDLOCK_NOOVERWRITE | DDLOCK_DISCARDCONTENTS); + /* Writeonly: Pointless. Event: Unsupported by native according to the sdk * nosyslock: Not applicable */

1 0

Henri Verbeet : wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 63ed42ac39440cc914397c70ed0c43aa747ceb4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ed42ac39440cc914397c70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:06:55 2018 +0100 wined3d: Ignore WINED3D_MAP_DISCARD when used together with WINED3D_MAP_NOOVERWRITE. This fixes a performance issue exposed by commit afb2aa2512d4c5ffa7256ce5137bc2c142a5d065. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 40890cc..dcaa072 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -335,17 +335,19 @@ static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource * return 0; } } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_NOOVERWRITE used with WINED3D_MAP_DISCARD, ignoring WINED3D_MAP_DISCARD.\n"); + flags &= ~WINED3D_MAP_DISCARD; + } } return flags;

1 0

Andrey Gusev : winhttp/tests: Remove redundant comparison.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 4c8cb197087bdf5a5e28c7d4775bc30d3ab7655d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c8cb197087bdf5a5e28c7d4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 26 13:09:42 2017 +0200 winhttp/tests: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4fc9c2c..e06661c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -996,7 +996,7 @@ static void test_secure_connection(void) protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; ret = WinHttpSetOption(ses, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); err = GetLastError(); - ok(ret || (!ret && err == ERROR_INVALID_PARAMETER) /* < win7 */, "failed to set protocols %u\n", err); + ok(ret || err == ERROR_INVALID_PARAMETER /* < win7 */, "failed to set protocols %u\n", err); con = WinHttpConnect(ses, test_winehq, 443, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError());

1 0

Alexandre Julliard : wineandroid: Add permission for accessing external storage.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 3474850f59a6181659b4d30cb17e99ee3a54d3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=3474850f59a6181659b4d30c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 3 10:24:36 2018 +0100 wineandroid: Add permission for accessing external storage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/AndroidManifest.xml b/dlls/wineandroid.drv/AndroidManifest.xml index 2507861..574b98e 100644 --- a/dlls/wineandroid.drv/AndroidManifest.xml +++ b/dlls/wineandroid.drv/AndroidManifest.xml @@ -4,6 +4,7 @@ <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECORD_AUDIO"/> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <application android:icon="@drawable/wine" android:label="Wine" >

1 0

Alistair Leslie-Hughes : oledb32: Silence interfaces for IDataSourceLocator QI.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: cce5ac1dea90f5fe9270176a29d55ef73a0efbb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cce5ac1dea90f5fe9270176a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 3 04:21:53 2018 +0000 oledb32: Silence interfaces for IDataSourceLocator QI. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 15 +++++++++++++++ dlls/oledb32/tests/database.c | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 5c4bdad..f530d2e 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -78,6 +78,21 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID TRACE("IID_IRunnableObject returning NULL\n"); return E_NOINTERFACE; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + TRACE("IID_IProvideClassInfo returning NULL\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IMarshal)) + { + TRACE("IID_IMarshal returning NULL\n"); + return E_NOINTERFACE; + } + else if (IsEqualIID(riid, &IID_IRpcOptions)) + { + TRACE("IID_IRpcOptions returning NULL\n"); + return E_NOINTERFACE; + } if(*ppvoid) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index b8c0e61..8ff55b9 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -886,6 +886,9 @@ static void test_dslocator(void) { IDataInitialize *datainit, *datainit2; IRunnableObject *runable; + IProvideClassInfo *info; + IMarshal *marshal; + IRpcOptions *opts; COMPATIBLE_LONG hwnd = 0; if (0) /* Crashes under Window 7 */ @@ -928,6 +931,15 @@ static void test_dslocator(void) hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRunnableObject, (void **)&runable); ok(hr == E_NOINTERFACE, "got %08x\n", hr); + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IMarshal, (void **)&marshal); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IProvideClassInfo, (void **)&info); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRpcOptions, (void **)&opts); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit);

1 0

Alistair Leslie-Hughes : oledb32: Coerce Variant to VT_DATE when converting data.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 4ee4d4e2ad242174f0a180d285b387364c80544a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ee4d4e2ad242174f0a180d2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 2 23:49:32 2018 +0000 oledb32: Coerce Variant to VT_DATE when converting data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 8 ++++++-- dlls/oledb32/tests/convert.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 267de1b..22609ae 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -475,10 +475,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; case DBTYPE_VARIANT: - if( V_VT((VARIANT*)src) == VT_DATE) + { + VariantInit(&tmp); + + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_DATE)) == S_OK) { SYSTEMTIME st; - hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + hr = (VariantTimeToSystemTime( V_DATE(&tmp), &st) ? S_OK : E_FAIL); d->year = st.wYear; d->month = st.wMonth; d->day = st.wDay; @@ -489,6 +492,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return E_NOTIMPL; } break; + } default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 1d55e7f..6b0dd55 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3357,6 +3357,25 @@ static void test_converttodbdate(void) ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + V_VT(&var) = VT_R8; + V_R8(&var) = 41408.086250; + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n"); + VariantClear(&var); + dst_len = 0; bstr = SysAllocString(strW); hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBDATE, 0, &dst_len, &bstr, &dst, 2, 0, &dst_status, 0, 0, 0);

1 0

Fernando M C Martins : po: Portuguese translation update.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: wine Branch: master Commit: 65e42ac02a55a7a465ec642b59856649253814f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e42ac02a55a7a465ec642b… Author: Fernando M C Martins <fernando(a)cmartins.nl> Date: Wed Jan 3 10:23:03 2018 +0100 po: Portuguese translation update. Signed-off-by: Fernando M C Martins <fernando(a)cmartins.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_PT.po | 1154 +++++++++++++++++++++++------------------------------------ 1 file changed, 445 insertions(+), 709 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65e42ac02a55a7a465ec…

1 0

Francois Gouget : testbot: Clarify a TestBot error message.
by Alexandre Julliard 03 Jan '18

03 Jan '18

Module: tools Branch: master Commit: 2c9f9dd1a64faeaa6dc603f4c1b0def553fb7635 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2c9f9dd1a64faeaa6dc603f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 3 12:48:13 2018 +0100 testbot: Clarify a TestBot error message. TestBot users want to know that it's a TestBot process that crashed rather than their test executable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 1f91d26..e0b5192 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -163,7 +163,7 @@ sub UpdateStatus($$) my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>$TaskDir/err") { - print TASKLOG "Child process died unexpectedly\n"; + print TASKLOG "TestBot process died unexpectedly\n"; close TASKLOG; } umask($OldUMask);

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
64
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 January 2018