December 2016 - Wine-Commits

Józef Kucia : d3d9/tests: Add test showing that primitive restart must be disabled.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 49f6aa32ef088460f982250d344db8a0e96307e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f6aa32ef088460f982250d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:00 2016 +0100 d3d9/tests: Add test showing that primitive restart must be disabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e25e85c..b1916c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22018,13 +22018,13 @@ static void test_evict_bound_resources(void) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), &data, 0); ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); memcpy(data, green_quad, sizeof(green_quad)); hr = IDirect3DVertexBuffer9_Unlock(vb); ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); - hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); memcpy(data, indices, sizeof(indices)); hr = IDirect3DIndexBuffer9_Unlock(ib); @@ -22032,7 +22032,7 @@ static void test_evict_bound_resources(void) hr = IDirect3DDevice9_SetIndices(device, ib); ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 4 * sizeof(DWORD)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*green_quad)); ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); @@ -22068,6 +22068,157 @@ static void test_evict_bound_resources(void) DestroyWindow(window); } +/* This test shows that 0xffff is valid index in D3D9. */ +static void test_max_index16(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 0xffff}; + static const unsigned int vertex_count = 0xffff + 1; + + D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + struct vertex *vb_data; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + D3DCAPS9 caps; + HWND window; + void *data; + HRESULT hr; + BOOL warp; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_GetAdapterIdentifier(d3d9, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexIndex < 0xffff) + { + skip("Max vertex index is lower than 0xffff (%#x).\n", caps.MaxVertexIndex); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, vertex_count * sizeof(*green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&vb_data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + vb_data[0] = green_quad[0]; + vb_data[1] = green_quad[1]; + vb_data[2] = green_quad[2]; + vb_data[0xffff] = green_quad[3]; + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(struct vertex)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, vertex_count, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 20, 20); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 620, 460); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22194,4 +22345,5 @@ START_TEST(visual) test_line_antialiasing_blending(); test_dsy(); test_evict_bound_resources(); + test_max_index16(); }

1 0

Józef Kucia : d3d8/tests: Add test showing that primitive restart must be disabled.
by Alexandre Julliard Dec. 8, 2016

Dec. 8, 2016

Module: wine Branch: master Commit: 30b8fb0f76d0941fd609365c755d857d42cd9cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b8fb0f76d0941fd609365c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:59 2016 +0100 d3d8/tests: Add test showing that primitive restart must be disabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 34d34b1..bf7058c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9528,6 +9528,158 @@ static void test_edge_antialiasing_blending(void) DestroyWindow(window); } +/* This test shows that 0xffff is valid index in D3D8. */ +static void test_max_index16(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 0xffff}; + static const unsigned int vertex_count = 0xffff + 1; + + D3DADAPTER_IDENTIFIER8 identifier; + IDirect3DVertexBuffer8 *vb; + IDirect3DIndexBuffer8 *ib; + IDirect3DDevice8 *device; + struct vertex *vb_data; + IDirect3D8 *d3d8; + ULONG refcount; + D3DCOLOR color; + D3DCAPS8 caps; + HWND window; + BYTE *data; + HRESULT hr; + BOOL warp; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + + hr = IDirect3D8_GetAdapterIdentifier(d3d8, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexIndex < 0xffff) + { + skip("Max vertex index is lower than 0xffff (%#x).\n", caps.MaxVertexIndex); + IDirect3DDevice8_Release(device); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(green_quad), (BYTE **)&vb_data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + vb_data[0] = green_quad[0]; + vb_data[1] = green_quad[1]; + vb_data[2] = green_quad[2]; + vb_data[0xffff] = green_quad[3]; + hr = IDirect3DVertexBuffer8_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetIndices(device, ib, 0); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(struct vertex)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 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_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, vertex_count, 0, 2); + 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); + color = getPixelColor(device, 20, 20); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 620, 460); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9596,4 +9748,5 @@ START_TEST(visual) test_texture_blending(); test_color_clamping(); test_edge_antialiasing_blending(); + test_max_index16(); }

1 0

Julian Rüger : German translation for release 1.9.21
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: 75cfd42fdc3724e5d8656471d35e11528e77a86e URL: http://source.winehq.org/git/website.git/?a=commit;h=75cfd42fdc3724e5d86564… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:52:34 2016 +0100 German translation for release 1.9.21 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016101401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2016101401.xml b/news/de/2016101401.xml new file mode 100644 index 0000000..67d22b4 --- /dev/null +++ b/news/de/2016101401.xml @@ -0,0 +1,15 @@ +<news> +<date>14. Oktober 2016</date> +<title>Wine 1.9.21 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erste Version eines HID-Minitreibers.</li> + <li>Unterstützung von Listen im RichEdit-Steuerelement.</li> + <li>Systray-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.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

Julian Rüger : German translation for release 1.9.24
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: fe24e474cc6d60f8faf1b833fa61d54163d20c02 URL: http://source.winehq.org/git/website.git/?a=commit;h=fe24e474cc6d60f8faf1b8… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 16:06:16 2016 +0100 German translation for release 1.9.24 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016112501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2016112501.xml b/news/de/2016112501.xml new file mode 100644 index 0000000..4d73e88 --- /dev/null +++ b/news/de/2016112501.xml @@ -0,0 +1,15 @@ +<news> +<date>25. November 2016</date> +<title>Wine 1.9.24 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von ungeordneten View-Zugriffen in Direct3D.</li> + <li>Viele Fehlerkorrekturen in den Regressionstests.</li> + <li>Kleinere Verbesserungen an der HID-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.24.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

Julian Rüger : German translation for release 1.9.23
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: e4a52d13f83c2d6a791875f69e6b0ceae501bb00 URL: http://source.winehq.org/git/website.git/?a=commit;h=e4a52d13f83c2d6a791875… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:58:35 2016 +0100 German translation for release 1.9.23 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016111101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016111101.xml b/news/de/2016111101.xml new file mode 100644 index 0000000..1bb8eed --- /dev/null +++ b/news/de/2016111101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. November 2016</date> +<title>Wine 1.9.23 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.23 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.23">Neuerungen (en)</a> in dieser Version: +<ul> + <li>HID-Bus-Unterstützung für MacOS.</li> + <li>Farbschriftartenunterstützung in Direct2D.</li> + <li>Weitere Farbformate in Direct3D.</li> + <li>Deinstallations-Korrekturen in MSI.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.23.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

Julian Rüger : German translation for release 1.9.22
by Jeremy Newman Dec. 8, 2016

Dec. 8, 2016

Module: website Branch: master Commit: 3ff05e9fdcbf5ac270b46463b249c7f9a919c9d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=3ff05e9fdcbf5ac270b464… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:55:41 2016 +0100 German translation for release 1.9.22 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016102801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016102801.xml b/news/de/2016102801.xml new file mode 100644 index 0000000..e0d57c0 --- /dev/null +++ b/news/de/2016102801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. Oktober 2016</date> +<title>Wine 1.9.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Clipboard-Unterstützung unter MacOS an das neue Design angepasst.</li> + <li>Erste Implementierung von Bitmap-Rendering in Direct2D.</li> + <li>Weitere Implementierung von WebServices.</li> + <li>Weitere Fortschritte in Richtung HID-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.22.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

Aric Stewart : hid: Initialize outgoing usages in HidP_GetUsages.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 78a547a11ce0b15e8dde7b1b50900c36c2adf1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a547a11ce0b15e8dde7b1b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 7 08:32:20 2016 -0600 hid: Initialize outgoing usages in HidP_GetUsages. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index cac9d4e..56616b4 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -278,6 +278,8 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, UsageLength, PreparsedData, Report, ReportLength); + *UsageLength = 0; + if (data->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA;

1 0

Bruno Jesus : xinput1_3/tests: Explain an important test and fix remaining style issues.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 547d9491af58a8626fafb18da9e4942911bf9155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547d9491af58a8626fafb18da… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:34 2016 -0200 xinput1_3/tests: Explain an important test and fix remaining style issues. It's important to explain why the test is done like that so in the future nobody changes it without knowing the impacts. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index f08acff..eb0bab3 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -50,7 +50,7 @@ static void test_set_state(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&vibrator, sizeof(XINPUT_VIBRATION)); @@ -59,6 +59,9 @@ static void test_set_state(void) result = pXInputSetState(controllerNum, &vibrator); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputSetState failed with (%d)\n", result); + /* Disabling XInput here, queueing a vibration and then re-enabling XInput + * is used to prove that vibrations are auto enabled when resuming XInput. + * If XInputEnable is removed the vibration will never play. */ if (pXInputEnable) pXInputEnable(0); vibrator.wLeftMotorSpeed = 65535; @@ -133,7 +136,7 @@ static void test_get_keystroke(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&keystroke, sizeof(XINPUT_KEYSTROKE)); @@ -158,7 +161,7 @@ static void test_get_capabilities(void) DWORD controllerNum; DWORD result; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES)); @@ -188,7 +191,7 @@ static void test_get_dsoundaudiodevice(void) GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); @@ -221,7 +224,7 @@ static void test_get_batteryinformation(void) DWORD result; XINPUT_BATTERY_INFORMATION batteryInfo; - for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) + for(controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { ZeroMemory(&batteryInfo, sizeof(XINPUT_BATTERY_INFORMATION));

1 0

Aric Stewart : hidclass.sys: Some descriptor values should be unsigned.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: b5646efe398712e0295e85ec1173822d678521b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5646efe398712e0295e85ec1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 13:11:49 2016 -0600 hidclass.sys: Some descriptor values should be unsigned. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9805511..c20e51d 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -383,7 +383,7 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) } } -static int getValue(int bsize, int source) +static int getValue(int bsize, int source, BOOL allow_negative) { int mask = 0xff; int negative = 0x80; @@ -401,7 +401,7 @@ static int getValue(int bsize, int source) outofrange = (outofrange<<8); } value = (source&mask); - if (value&negative) + if (allow_negative && value&negative) value = -1 * (outofrange - value); return value; } @@ -566,34 +566,34 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l switch(bTag) { case TAG_GLOBAL_USAGE_PAGE: - caps->UsagePage = getValue(bSize, itemVal); + caps->UsagePage = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_LOGICAL_MINIMUM: - caps->LogicalMin = getValue(bSize, itemVal); + caps->LogicalMin = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_LOGICAL_MAXIMUM: - caps->LogicalMax = getValue(bSize, itemVal); + caps->LogicalMax = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_PHYSICAL_MINIMUM: - caps->PhysicalMin = getValue(bSize, itemVal); + caps->PhysicalMin = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_PHYSICAL_MAXIMUM: - caps->PhysicalMax = getValue(bSize, itemVal); + caps->PhysicalMax = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_UNIT_EXPONENT: - caps->UnitsExp = getValue(bSize, itemVal); + caps->UnitsExp = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_UNIT: - caps->Units = getValue(bSize, itemVal); + caps->Units = getValue(bSize, itemVal, TRUE); break; case TAG_GLOBAL_REPORT_SIZE: - caps->BitSize = getValue(bSize, itemVal); + caps->BitSize = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_REPORT_ID: - caps->ReportID = getValue(bSize, itemVal); + caps->ReportID = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_REPORT_COUNT: - caps->ReportCount = getValue(bSize, itemVal); + caps->ReportCount = getValue(bSize, itemVal, FALSE); break; case TAG_GLOBAL_PUSH: { @@ -633,46 +633,46 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l FIXME("More than %i individual usages defined\n",USAGE_MAX); else { - caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal); + caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal, FALSE); caps->IsRange = FALSE; } break; case TAG_LOCAL_USAGE_MINIMUM: caps->usage_count = 1; - caps->u.Range.UsageMin = getValue(bSize, itemVal); + caps->u.Range.UsageMin = getValue(bSize, itemVal, FALSE); caps->IsRange = TRUE; break; case TAG_LOCAL_USAGE_MAXIMUM: caps->usage_count = 1; - caps->u.Range.UsageMax = getValue(bSize, itemVal); + caps->u.Range.UsageMax = getValue(bSize, itemVal, FALSE); caps->IsRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_INDEX: - caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal); + caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = FALSE; break; case TAG_LOCAL_DESIGNATOR_MINIMUM: - caps->u.Range.DesignatorMin = getValue(bSize, itemVal); + caps->u.Range.DesignatorMin = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_MAXIMUM: - caps->u.Range.DesignatorMax = getValue(bSize, itemVal); + caps->u.Range.DesignatorMax = getValue(bSize, itemVal, FALSE); caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_STRING_INDEX: - caps->u.NotRange.StringIndex = getValue(bSize, itemVal); + caps->u.NotRange.StringIndex = getValue(bSize, itemVal, FALSE); caps->IsStringRange = FALSE; break; case TAG_LOCAL_STRING_MINIMUM: - caps->u.Range.StringMin = getValue(bSize, itemVal); + caps->u.Range.StringMin = getValue(bSize, itemVal, FALSE); caps->IsStringRange = TRUE; break; case TAG_LOCAL_STRING_MAXIMUM: - caps->u.Range.StringMax = getValue(bSize, itemVal); + caps->u.Range.StringMax = getValue(bSize, itemVal, FALSE); caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - caps->Delim = getValue(bSize, itemVal); + caps->Delim = getValue(bSize, itemVal, FALSE); break; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType);

1 0

Bruno Jesus : explorer: Ensure launchers_per_row is at least 1 as it is used in divisions.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 3eaf58614921cafd5e1413d1bec388ae57d25183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaf58614921cafd5e1413d1b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 21:32:27 2016 -0200 explorer: Ensure launchers_per_row is at least 1 as it is used in divisions. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d306bb9..7a8252f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -555,6 +555,7 @@ static void initialize_launchers( HWND hwnd ) title_offset_cy = BORDER_SIZE + icon_size + PADDING_SIZE; desktop_width = GetSystemMetrics( SM_CXSCREEN ); launchers_per_row = desktop_width / launcher_size; + if (!launchers_per_row) launchers_per_row = 1; hr = SHGetKnownFolderPath( &FOLDERID_Desktop, KF_FLAG_CREATE, NULL, &desktop_folder ); if (FAILED( hr ))

1 0

Hugh McMaster : reg/tests: Add Unicode tests for comment parsing.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 896c5205d96c7f4b62e507ebeb974cd7d5f372e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896c5205d96c7f4b62e507ebe… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:22 2016 +0000 reg/tests: Add Unicode tests for comment parsing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b9d446d..f19f6f7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1246,6 +1246,82 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " #comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " ;comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Add tests for parsing comments.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 0a827326b03c87d3542528cc3c70b1ee178c9c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a827326b03c87d3542528cc3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:10 2016 +0000 reg/tests: Add tests for parsing comments. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index cbd4149..b9d446d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -988,6 +988,82 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,69,6e,65,20,\\\n" + " #comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,69,6e,65,20,\\\n" + " ;comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Nikolay Sivov : scrrun: Added IProvideClassInfo support for filesystem objects.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: eda5d61c543522c637682a40bb461fab44c9c0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda5d61c543522c637682a40b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:59 2016 +0300 scrrun: Added IProvideClassInfo support for filesystem objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 110 ++++++++++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 36 ++++++++++++++ 2 files changed, 122 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eda5d61c543522c637682…

1 0

Nikolay Sivov : dwrite: Use system default locale when filling LOGFONT.lfFaceName.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: bf23b8a529f5081a278c7beffc92648d6b63c87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf23b8a529f5081a278c7beff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:38 2016 +0300 dwrite: Use system default locale when filling LOGFONT.lfFaceName. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- dlls/dwrite/tests/font.c | 2 +- include/winnls.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 4a6d62c..c666275 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1645,7 +1645,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * BOOL exists; exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 987eac9..ce4145e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3544,7 +3544,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) /* Fallback to en-us if there's no string for user locale. */ exists = FALSE; - if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + if (GetSystemDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); if (!exists) diff --git a/include/winnls.h b/include/winnls.h index 35521fd..96f60de 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -915,6 +915,7 @@ WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,INT,LPWORD); #define GetStringTypeEx WINELIB_NAME_AW(GetStringTypeEx) WINBASEAPI LANGID WINAPI GetSystemDefaultLangID(void); +WINBASEAPI INT WINAPI GetSystemDefaultLocaleName(LPWSTR,int); WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*);

1 0

Bruno Jesus : xinput1_3/tests: Test the GUIDs returned from XInputGetDSoundAudioDeviceGuids.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ea4edbe1799ef1a4ebb416cf2fed392e4196880d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4edbe1799ef1a4ebb416cf2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:32 2016 -0200 xinput1_3/tests: Test the GUIDs returned from XInputGetDSoundAudioDeviceGuids. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 17884e1..25126be 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -175,18 +175,31 @@ static void test_get_dsoundaudiodevice(void) { DWORD controllerNum; DWORD result; - GUID soundRender; - GUID soundCapture; + GUID soundRender, soundCapture; + GUID testGuid = {0xFFFFFFFF, 0xFFFF, 0xFFFF, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}}; + GUID emptyGuid = {0x0, 0x0, 0x0, {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}}; for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { + soundRender = soundCapture = testGuid; result = pXInputGetDSoundAudioDeviceGuids(controllerNum, &soundRender, &soundCapture); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetDSoundAudioDeviceGuids failed with (%d)\n", result); if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); + continue; } + + if (!IsEqualGUID(&soundRender, &emptyGuid)) + ok(!IsEqualGUID(&soundRender, &testGuid), "Broken GUID returned for sound render device\n"); + else + trace("Headset phone not attached\n"); + + if (!IsEqualGUID(&soundCapture, &emptyGuid)) + ok(!IsEqualGUID(&soundCapture, &testGuid), "Broken GUID returned for sound capture device\n"); + else + trace("Headset microphone not attached\n"); } result = pXInputGetDSoundAudioDeviceGuids(XUSER_MAX_COUNT+1, &soundRender, &soundCapture);

1 0

Hugh McMaster : reg/tests: Add verify_reg_nonexist helper function.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: be3a4c26137dcfe81c80de7aca834f96dea45515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3a4c26137dcfe81c80de7ac… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:47:58 2016 +0000 reg/tests: Add verify_reg_nonexist helper function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6447d45..cbd4149 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -81,6 +81,16 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); } +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) +static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +{ + LONG err; + + err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); + lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", + value, err); +} + static void test_add(void) { HKEY hkey, subkey; @@ -499,18 +509,15 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_reg_nonexist(hkey, "bar"); run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + verify_reg_nonexist(hkey, ""); run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_reg_nonexist(hkey, "foo"); err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); ok(err == ERROR_SUCCESS, "got %d\n", err); RegCloseKey(hsubkey);

1 0

Nikolay Sivov : dwrite: Improve ConvertFontFaceToLOGFONT using same logic IDWriteFont uses.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: c22b2192e5710f6a4eacf39b88ece6186c995338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22b2192e5710f6a4eacf39b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 16:46:39 2016 +0300 dwrite: Improve ConvertFontFaceToLOGFONT using same logic IDWriteFont uses. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 18 +++ dlls/dwrite/gdiinterop.c | 55 +------ dlls/dwrite/tests/font.c | 331 ++++++++++++++++++++++++------------------- 4 files changed, 208 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c22b2192e5710f6a4eacf…

1 0

Bruno Jesus : xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 67eec14ca00214481af8cfdf2bf56f0bd0ddfeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eec14ca00214481af8cfdf2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 6 12:52:33 2016 -0200 xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities. Important to show that they changed between XInput versions 1.3 and 1.4. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 25126be..f08acff 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -32,6 +32,18 @@ static DWORD (WINAPI *pXInputGetKeystroke)(DWORD, DWORD, PXINPUT_KEYSTROKE); static DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD, GUID*, GUID*); static DWORD (WINAPI *pXInputGetBatteryInformation)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); +static void dump_gamepad(XINPUT_GAMEPAD *data) +{ + trace("-- Gamepad Variables --\n"); + trace("Gamepad.wButtons: %#x\n", data->wButtons); + trace("Gamepad.bLeftTrigger: %d\n", data->bLeftTrigger); + trace("Gamepad.bRightTrigger: %d\n", data->bRightTrigger); + trace("Gamepad.sThumbLX: %d\n", data->sThumbLX); + trace("Gamepad.sThumbLY: %d\n", data->sThumbLY); + trace("Gamepad.sThumbRX: %d\n", data->sThumbRX); + trace("Gamepad.sThumbRY: %d\n\n", data->sThumbRY); +} + static void test_set_state(void) { XINPUT_VIBRATION vibrator; @@ -96,14 +108,7 @@ static void test_get_state(void) else trace("XInputGetStateEx: %d\n", result); trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - trace("Gamepad Variables --\n"); - trace("Gamepad.wButtons: %#x\n", xinput.state.Gamepad.wButtons); - trace("Gamepad.bLeftTrigger: 0x%08x\n", xinput.state.Gamepad.bLeftTrigger); - trace("Gamepad.bRightTrigger: 0x%08x\n", xinput.state.Gamepad.bRightTrigger); - trace("Gamepad.sThumbLX: %d\n", xinput.state.Gamepad.sThumbLX); - trace("Gamepad.sThumbLY: %d\n", xinput.state.Gamepad.sThumbLY); - trace("Gamepad.sThumbRX: %d\n", xinput.state.Gamepad.sThumbRX); - trace("Gamepad.sThumbRY: %d\n", xinput.state.Gamepad.sThumbRY); + dump_gamepad(&xinput.state.Gamepad); } } @@ -163,7 +168,11 @@ static void test_get_capabilities(void) if (ERROR_DEVICE_NOT_CONNECTED == result) { skip("Controller %d is not connected\n", controllerNum); + continue; } + + /* Important to show that the results changed between 1.3 and 1.4 XInput version */ + dump_gamepad(&capabilities.Gamepad); } ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES));

1 0

Aric Stewart : winebus.sys: Handle older kernel headers lacking feature ioctls.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ea9df98c692175065a80f113100f92d13d3cae12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9df98c692175065a80f1131… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 13:09:27 2016 -0600 winebus.sys: Handle older kernel headers lacking feature ioctls. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 515ae70..d6bb48a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -319,7 +319,7 @@ static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE * static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *read) { -#ifdef HAVE_LINUX_HIDRAW_H +#if defined(HAVE_LINUX_HIDRAW_H) && defined(HIDIOCGFEATURE) int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); report[0] = id; @@ -343,7 +343,7 @@ static NTSTATUS hidraw_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) { -#ifdef HAVE_LINUX_HIDRAW_H +#if defined(HAVE_LINUX_HIDRAW_H) && defined(HIDIOCSFEATURE) int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); BYTE *feature_buffer;

1 0

Hugh McMaster : reg/tests: Fix copy/paste errors in some tests.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: a4d892e244943844f7af7ca91a5f8c2a5c7349e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d892e244943844f7af7ca91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 7 08:48:33 2016 +0000 reg/tests: Fix copy/paste errors in some tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f19f6f7..e8a9d80 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -124,19 +124,19 @@ static void test_add(void) run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), - "got exit code %d\n", r); + "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -144,7 +144,7 @@ static void test_add(void) ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + ok(err == ERROR_SUCCESS, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -152,7 +152,7 @@ static void test_add(void) ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + ok(err == ERROR_SUCCESS, "got exit code %d\n", err); /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r);

1 0

Nikolay Sivov : scrrun: Added IProvideClassInfo support for dictionary.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: ba2e6fb2bec63a0ecb23c29b4f0d61ba57dc8c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2e6fb2bec63a0ecb23c29b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:58 2016 +0300 scrrun: Added IProvideClassInfo support for dictionary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 8 ++++- dlls/scrrun/scrrun.c | 77 ++++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/scrrun_private.h | 8 +++++ dlls/scrrun/tests/dictionary.c | 27 +++++++++++++++ 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 3c8fc82..7ebf4a4 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -65,6 +65,7 @@ struct keyitem_pair { typedef struct { + struct provideclassinfo classinfo; IDictionary IDictionary_iface; LONG ref; @@ -386,6 +387,10 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, { *obj = &This->IDictionary_iface; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } else if ( IsEqualGUID( riid, &IID_IDispatchEx )) { TRACE("Interface IDispatchEx not supported - returning NULL\n"); @@ -404,7 +409,7 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, return E_NOINTERFACE; } - IDictionary_AddRef(iface); + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -901,6 +906,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, list_init(&This->notifier); memset(This->buckets, 0, sizeof(This->buckets)); + init_classinfo(&CLSID_Dictionary, (IUnknown *)&This->IDictionary_iface, &This->classinfo); *obj = &This->IDictionary_iface; return S_OK; diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 5201f1f..42b62b6 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "olectl.h" #include "rpcproxy.h" #include <initguid.h> @@ -35,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static HINSTANCE scrrun_instance; +static inline struct provideclassinfo *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +{ + return CONTAINING_RECORD(iface, struct provideclassinfo, IProvideClassInfo_iface); +} + typedef HRESULT (*fnCreateInstance)(LPVOID *ppObj); static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv ) @@ -118,6 +124,9 @@ static HRESULT load_typelib(void) HRESULT hres; ITypeLib *tl; + if(typelib) + return S_OK; + hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); @@ -129,13 +138,21 @@ static HRESULT load_typelib(void) return hres; } +static HRESULT get_typeinfo_of_guid(const GUID *guid, ITypeInfo **tinfo) +{ + HRESULT hres; + + if(FAILED(hres = load_typelib())) + return hres; + + return ITypeLib_GetTypeInfoOfGuid(typelib, guid, tinfo); +} + HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; - if (!typelib) - hres = load_typelib(); - if (!typelib) + if (FAILED(hres = load_typelib())) return hres; if(!typeinfos[tid]) { @@ -170,6 +187,60 @@ static void release_typelib(void) ITypeLib_Release(typelib); } +static HRESULT WINAPI provideclassinfo_QueryInterface(IProvideClassInfo *iface, REFIID riid, void **obj) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IProvideClassInfo)) { + *obj = iface; + IProvideClassInfo_AddRef(iface); + return S_OK; + } + else + return IUnknown_QueryInterface(This->outer, riid, obj); + + *obj = NULL; + WARN("interface %s not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI provideclassinfo_AddRef(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI provideclassinfo_Release(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI provideclassinfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ti) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%p)\n", This, ti); + + return get_typeinfo_of_guid(This->guid, ti); +} + +static const IProvideClassInfoVtbl provideclassinfovtbl = { + provideclassinfo_QueryInterface, + provideclassinfo_AddRef, + provideclassinfo_Release, + provideclassinfo_GetClassInfo +}; + +void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) +{ + classinfo->IProvideClassInfo_iface.lpVtbl = &provideclassinfovtbl; + classinfo->outer = outer; + classinfo->guid = guid; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 43b20a9..e2023f9 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -38,6 +38,14 @@ typedef enum tid_t HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +struct provideclassinfo { + IProvideClassInfo IProvideClassInfo_iface; + IUnknown *outer; + const GUID *guid; +}; + +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index a94782f..78922b7 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -30,6 +30,31 @@ #include "scrrun.h" +#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) +static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) +{ + IProvideClassInfo *classinfo; + TYPEATTR *attr; + ITypeInfo *ti; + HRESULT hr; + + hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + + hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + + ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), + wine_dbgstr_guid(guid)); + + IProvideClassInfo_Release(classinfo); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); +} + static void test_interfaces(void) { static const WCHAR key_add[] = {'a', 0}; @@ -60,6 +85,8 @@ static void test_interfaces(void) hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + test_provideclassinfo(disp, &CLSID_Dictionary); + V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(key_add); V_VT(&value) = VT_BSTR;

1 0

Hans Leidekker : setupapi: Add a stub implementation of SetupDiRemoveDeviceInterface.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: cdb72f3997174afeb9bc6a8ecafc5de7b5d25afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb72f3997174afeb9bc6a8ec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 7 11:03:00 2016 +0100 setupapi: Add a stub implementation of SetupDiRemoveDeviceInterface. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 10 ++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ef1a6b7..63e578c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1561,6 +1561,16 @@ BOOL WINAPI SetupDiRemoveDevice( } /*********************************************************************** + * SetupDiRemoveDeviceInterface (SETUPAPI.@) + */ +BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO info, PSP_DEVICE_INTERFACE_DATA data) +{ + FIXME("(%p, %p): stub\n", info, data); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index da6bf5d..0eb8359 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -381,7 +381,7 @@ @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) -@ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiRemoveDeviceInterface(ptr ptr) @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv

1 0

Hans Leidekker : setupapi/tests: Clean up properly after each device test.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: c84080fb5977284bfd1429ce6ea602fdd33ecab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84080fb5977284bfd1429ce6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 7 11:03:01 2016 +0100 setupapi/tests: Clean up properly after each device test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 405 +++++++++++------------------------------- 1 file changed, 100 insertions(+), 305 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c84080fb5977284bfd142…

1 0

Nikolay Sivov : scrrun: Improved tracing of IDictionary methods.
by Alexandre Julliard Dec. 7, 2016

Dec. 7, 2016

Module: wine Branch: master Commit: 62cb1f8d6fea65259425363ea25fc332d403535f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cb1f8d6fea65259425363ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 7 13:33:57 2016 +0300 scrrun: Improved tracing of IDictionary methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 844b4d1..3c8fc82 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -240,19 +240,19 @@ static HRESULT WINAPI dict_enum_QueryInterface(IEnumVARIANT *iface, REFIID riid, static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - LONG ref; + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + if (!ref) { list_remove(&This->notify); IDictionary_Release(&This->dict->IDictionary_iface); heap_free(This); @@ -411,20 +411,21 @@ static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, static ULONG WINAPI dictionary_AddRef(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)\n", This); + ULONG ref = InterlockedIncrement(&This->ref); - return InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + + return ref; } static ULONG WINAPI dictionary_Release(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)\n", This); + TRACE("(%p)->(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + if (!ref) { IDictionary_RemoveAll(iface); heap_free(This); } @@ -436,7 +437,7 @@ static HRESULT WINAPI dictionary_GetTypeInfoCount(IDictionary *iface, UINT *pcti { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; @@ -885,7 +886,7 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, { dictionary *This; - TRACE("(%p)\n", obj); + TRACE("(%p, %p, %s, %p)\n", factory, outer, debugstr_guid(riid), obj); *obj = NULL;

1 0

Hans Leidekker : bcrypt/tests: Add BcryptEncrypt/Decrypt tests.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: fd8f32aa8e0c34b8960246c41915874ce6316f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8f32aa8e0c34b8960246c41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 2 18:36:43 2016 -0200 bcrypt/tests: Add BcryptEncrypt/Decrypt tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 173 +++++++++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 3 + 2 files changed, 176 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ae7432e..3e41335 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -916,6 +916,177 @@ static void test_BCryptGenerateSymmetricKey(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_BCryptEncrypt(void) +{ + static UCHAR secret[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR iv[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR data[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10}; + static UCHAR expected[] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; + static UCHAR expected2[] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, + 0x28,0x73,0x3d,0xef,0x84,0x8f,0xb0,0xa6,0x5d,0x1a,0x51,0xb7,0xec,0x8f,0xea,0xe9}; + BCRYPT_ALG_HANDLE aes; + BCRYPT_KEY_HANDLE key; + UCHAR *buf, ciphertext[32], ivbuf[16]; + ULONG size, len, i; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); + if (ret != STATUS_SUCCESS) /* remove whole IF when Wine is fixed */ + { + todo_wine ok(0, "AES provider not available\n"); + return; + } + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* input size is a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 16, NULL, ivbuf, 16, ciphertext, 16, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 16, "got %u\n", size); + ok(!memcmp(ciphertext, expected, sizeof(expected)), "wrong data\n"); + for (i = 0; i < 16; i++) + ok(ciphertext[i] == expected[i], "%u: %02x != %02x\n", i, ciphertext[i], expected[i]); + + /* input size is not a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17, "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, ciphertext, 32, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected2, sizeof(expected2)), "wrong data\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected2[i], "%u: %02x != %02x\n", i, ciphertext[i], expected2[i]); + + /* output size too small */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(ciphertext, 0, sizeof(ciphertext)); + ret = pBCryptEncrypt(key, data, 17, NULL, ivbuf, 16, ciphertext, 31, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + +static void test_BCryptDecrypt(void) +{ + static UCHAR secret[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR iv[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR expected[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}; + static UCHAR ciphertext[32] = + {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, + 0x28,0x73,0x3d,0xef,0x84,0x8f,0xb0,0xa6,0x5d,0x1a,0x51,0xb7,0xec,0x8f,0xea,0xe9}; + BCRYPT_ALG_HANDLE aes; + BCRYPT_KEY_HANDLE key; + UCHAR *buf, plaintext[32], ivbuf[16]; + ULONG size, len; + NTSTATUS ret; + + ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); + if (ret != STATUS_SUCCESS) /* remove whole IF when Wine is fixed */ + { + todo_wine ok(0, "AES provider not available\n"); + return; + } + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0xdeadbeef; + size = sizeof(len); + ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + /* input size is a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + memset(plaintext, 0, sizeof(plaintext)); + ret = pBCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, plaintext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected, sizeof(expected)), "wrong data\n"); + + /* output size too small */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 32, NULL, ivbuf, 16, plaintext, 31, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + + /* input size is not a multiple of block size */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 17, NULL, ivbuf, 16, NULL, 0, &size, 0); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + /* input size is not a multiple of block size, block padding set */ + size = 0; + memcpy(ivbuf, iv, sizeof(iv)); + ret = pBCryptDecrypt(key, ciphertext, 17, NULL, ivbuf, 16, NULL, 0, &size, BCRYPT_BLOCK_PADDING); + ok(ret == STATUS_INVALID_BUFFER_SIZE, "got %08x\n", ret); + ok(size == 17 || broken(size == 0 /* Win < 7 */), "got %u\n", size); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -953,6 +1124,8 @@ START_TEST(bcrypt) test_rng(); test_aes(); test_BCryptGenerateSymmetricKey(); + test_BCryptEncrypt(); + test_BCryptDecrypt(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); diff --git a/include/bcrypt.h b/include/bcrypt.h index e327a65..05d0691 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -94,6 +94,9 @@ typedef PVOID BCRYPT_HASH_HANDLE; /* Flags for BCryptOpenAlgorithmProvider */ #define BCRYPT_ALG_HANDLE_HMAC_FLAG 0x00000008 +/* Flags for BCryptEncrypt/BCryptDecrypt */ +#define BCRYPT_BLOCK_PADDING 0x00000001 + NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);

1 0