March 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Implement depth/ colour fills on top of wined3d_device_clear_rendertarget_view().
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 381cd03eb3860f4b963af9b37cc3258b3f45d17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=381cd03eb3860f4b963af9b37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:28 2017 +0200 ddraw: Implement depth/colour fills on top of wined3d_device_clear_rendertarget_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/surface.c | 75 +++++++++++++++++++++++++++++----------- dlls/ddraw/utils.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=381cd03eb3860f4b963af…

1 0

Henri Verbeet : wined3d: Remove WINED3D_BLT_COLOR_FILL support from wined3d_texture_blit().
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: aec8015c3bffe05126d26968040b1676b03b5e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec8015c3bffe05126d269680… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:29 2017 +0200 wined3d: Remove WINED3D_BLT_COLOR_FILL support from wined3d_texture_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 234 ++++++++++++++++------------------------- dlls/wined3d/texture.c | 6 -- dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.h | 3 +- 4 files changed, 91 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aec8015c3bffe05126d26…

1 0

Henri Verbeet : wined3d: Remove WINED3D_BLT_DEPTH_FILL support from wined3d_texture_blit().
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: e19e15d317c4a69449767fdf9676e74d28b74bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19e15d317c4a69449767fdf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:30 2017 +0200 wined3d: Remove WINED3D_BLT_DEPTH_FILL support from wined3d_texture_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 85 +++++------------------------------------- dlls/wined3d/texture.c | 26 ++++++------- dlls/wined3d/utils.c | 59 ----------------------------- dlls/wined3d/wined3d_private.h | 2 - include/wine/wined3d.h | 4 +- 5 files changed, 21 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e19e15d317c4a69449767…

1 0

Nikolay Sivov : comctl32/tests: Fully initialize message tests data.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 1ec91f592e789248830f1eaeb4022a5dd9d2dd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec91f592e789248830f1eaeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 29 11:11:39 2017 +0300 comctl32/tests: Fully initialize message tests data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 4 ++-- dlls/comctl32/tests/datetime.c | 3 +-- dlls/comctl32/tests/listview.c | 5 ++--- dlls/comctl32/tests/monthcal.c | 3 +-- dlls/comctl32/tests/pager.c | 3 +-- dlls/comctl32/tests/propsheet.c | 2 +- dlls/comctl32/tests/syslink.c | 3 +-- dlls/comctl32/tests/tab.c | 6 ++---- dlls/comctl32/tests/trackbar.c | 3 +-- dlls/comctl32/tests/treeview.c | 3 +-- dlls/comctl32/tests/updown.c | 7 +++---- 11 files changed, 16 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ec91f592e789248830f1…

1 0

Józef Kucia : d3d11/tests: Use ARRAY_SIZE() macro.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: a49ef8360dd8faa3471b58c071e0a99628ded661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49ef8360dd8faa3471b58c07… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 29 15:11:10 2017 +0200 d3d11/tests: Use ARRAY_SIZE() macro. 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/d3d11/tests/d3d11.c | 153 ++++++++++++++++++++++++----------------------- 1 file changed, 77 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a49ef8360dd8faa3471b5…

1 0

Józef Kucia : d3d11/tests: Add test for resuming stream output.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 8cd9d14f13fd43f39b2bc9baecb58fdaff8a76a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd9d14f13fd43f39b2bc9bae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 29 15:11:11 2017 +0200 d3d11/tests: Add test for resuming stream output. 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/d3d11/tests/d3d11.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3b781df..6c63cd2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16011,6 +16011,151 @@ float4 main(struct ps_data ps_input) : SV_Target release_test_context(&test_context); } +static void test_stream_output_resume(void) +{ + struct d3d11_test_context test_context; + ID3D11Buffer *cb, *so_buffer, *buffer; + unsigned int i, j, idx, offset; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11GeometryShader *gs; + const struct vec4 *data; + ID3D11Device *device; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD gs_code[] = + { +#if 0 + float4 constant; + + struct vertex + { + float4 position : SV_POSITION; + }; + + struct element + { + float4 position : SV_POSITION; + float4 so_output : so_output; + }; + + [maxvertexcount(3)] + void main(triangle vertex input[3], inout PointStream<element> output) + { + element o; + o.so_output = constant; + o.position = input[0].position; + output.Append(o); + o.position = input[1].position; + output.Append(o); + o.position = input[2].position; + output.Append(o); + } +#endif + 0x43425844, 0x4c16e500, 0xa0dc6126, 0x261156f3, 0xf01eedc8, 0x00000001, 0x000001b8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x00000050, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x6f5f6f73, 0x75707475, 0xabab0074, 0x52444853, 0x000000f8, + 0x00020040, 0x0000003e, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x05000061, 0x002010f2, + 0x00000003, 0x00000000, 0x00000001, 0x0100185d, 0x0100085c, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, + 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00208e46, + 0x00000000, 0x00000000, 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, + 0x00000000, 0x06000036, 0x001020f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x01000013, + 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x06000036, 0x001020f2, + 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x01000013, 0x0100003e, + }; + static const D3D11_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "so_output", 0, 0, 4, 0}, + }; + static const struct vec4 constants[] = + { + {0.5f, 0.250f, 0.0f, 0.0f}, + {0.0f, 0.125f, 0.0f, 1.0f}, + {1.0f, 1.000f, 1.0f, 0.0f} + }; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreateGeometryShaderWithStreamOutput(device, gs_code, sizeof(gs_code), + so_declaration, ARRAY_SIZE(so_declaration), NULL, 0, D3D11_SO_NO_RASTERIZED_STREAM, NULL, &gs); + ok(SUCCEEDED(hr), "Failed to create geometry shader with stream output, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constants[0]), &constants[0]); + so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + ID3D11DeviceContext_GSSetConstantBuffers(context, 0, 1, &cb); + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.x); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + draw_color_quad(&test_context, &red); + todo_wine check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constants[1], 0, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + draw_color_quad(&test_context, &red); + todo_wine check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constants[2], 0, 0); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + draw_color_quad(&test_context, &white); + todo_wine check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + buffer = NULL; + ID3D11DeviceContext_SOSetTargets(context, 1, &buffer, &offset); + ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); + draw_color_quad(&test_context, &white); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + idx = 0; + get_buffer_readback(so_buffer, &rb); + for (i = 0; i < ARRAY_SIZE(constants); ++i) + { + for (j = 0; j < 6; ++j) /* 2 triangles */ + { + data = get_readback_vec4(&rb, idx++, 0); + todo_wine + ok(compare_vec4(data, &constants[i], 0), + "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u (%u, %u).\n", + data->x, data->y, data->z, data->w, idx, i, j); + } + } + release_resource_readback(&rb); + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(so_buffer); + ID3D11GeometryShader_Release(gs); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -16093,4 +16238,5 @@ START_TEST(d3d11) test_compute_shader_registers(); test_tgsm(); test_geometry_shader(); + test_stream_output_resume(); }

1 0

Andrey Gusev : api-ms-win-mm-mme-l1-1-0: Add dll.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 4bfa0d829fedb72ff9848fab14af891a4582b61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfa0d829fedb72ff9848fab1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 29 17:28:38 2017 +0300 api-ms-win-mm-mme-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-mm-mme-l1-1-0/Makefile.in | 1 + .../api-ms-win-mm-mme-l1-1-0.spec | 102 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 107 insertions(+) diff --git a/configure b/configure index c893d02..c4de73b 100755 --- a/configure +++ b/configure @@ -1019,6 +1019,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_mm_misc_l1_1_1 +enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -17758,6 +17759,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 +wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index f2d3b01..7e3f643 100644 --- a/configure.ac +++ b/configure.ac @@ -2807,6 +2807,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-mm-mme-l1-1-0/Makefile.in b/dlls/api-ms-win-mm-mme-l1-1-0/Makefile.in new file mode 100644 index 0000000..a6d09ce --- /dev/null +++ b/dlls/api-ms-win-mm-mme-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-mme-l1-1-0.dll diff --git a/dlls/api-ms-win-mm-mme-l1-1-0/api-ms-win-mm-mme-l1-1-0.spec b/dlls/api-ms-win-mm-mme-l1-1-0/api-ms-win-mm-mme-l1-1-0.spec new file mode 100644 index 0000000..8d6aa9f --- /dev/null +++ b/dlls/api-ms-win-mm-mme-l1-1-0/api-ms-win-mm-mme-l1-1-0.spec @@ -0,0 +1,102 @@ +@ stdcall auxGetDevCapsA(long ptr long) winmm.auxGetDevCapsA +@ stdcall auxGetDevCapsW(long ptr long) winmm.auxGetDevCapsW +@ stdcall auxGetNumDevs() winmm.auxGetNumDevs +@ stdcall auxGetVolume(long ptr) winmm.auxGetVolume +@ stdcall auxOutMessage(long long long long) winmm.auxOutMessage +@ stdcall auxSetVolume(long long) winmm.auxSetVolume +@ stdcall midiConnect(long long ptr) winmm.midiConnect +@ stdcall midiDisconnect(long long ptr) winmm.midiDisconnect +@ stdcall midiInAddBuffer(long ptr long) winmm.midiInAddBuffer +@ stdcall midiInClose(long) winmm.midiInClose +@ stdcall midiInGetDevCapsA(long ptr long) winmm.midiInGetDevCapsA +@ stdcall midiInGetDevCapsW(long ptr long) winmm.midiInGetDevCapsW +@ stdcall midiInGetErrorTextA(long ptr long) winmm.midiInGetErrorTextA +@ stdcall midiInGetErrorTextW(long ptr long) winmm.midiInGetErrorTextW +@ stdcall midiInGetID(long ptr) winmm.midiInGetID +@ stdcall midiInGetNumDevs() winmm.midiInGetNumDevs +@ stdcall midiInMessage(long long long long) winmm.midiInMessage +@ stdcall midiInOpen(ptr long long long long) winmm.midiInOpen +@ stdcall midiInPrepareHeader(long ptr long) winmm.midiInPrepareHeader +@ stdcall midiInReset(long) winmm.midiInReset +@ stdcall midiInStart(long) winmm.midiInStart +@ stdcall midiInStop(long) winmm.midiInStop +@ stdcall midiInUnprepareHeader(long ptr long) winmm.midiInUnprepareHeader +@ stdcall midiOutCacheDrumPatches(long long ptr long) winmm.midiOutCacheDrumPatches +@ stdcall midiOutCachePatches(long long ptr long) winmm.midiOutCachePatches +@ stdcall midiOutClose(long) winmm.midiOutClose +@ stdcall midiOutGetDevCapsA(long ptr long) winmm.midiOutGetDevCapsA +@ stdcall midiOutGetDevCapsW(long ptr long) winmm.midiOutGetDevCapsW +@ stdcall midiOutGetErrorTextA(long ptr long) winmm.midiOutGetErrorTextA +@ stdcall midiOutGetErrorTextW(long ptr long) winmm.midiOutGetErrorTextW +@ stdcall midiOutGetID(long ptr) winmm.midiOutGetID +@ stdcall midiOutGetNumDevs() winmm.midiOutGetNumDevs +@ stdcall midiOutGetVolume(long ptr) winmm.midiOutGetVolume +@ stdcall midiOutLongMsg(long ptr long) winmm.midiOutLongMsg +@ stdcall midiOutMessage(long long long long) winmm.midiOutMessage +@ stdcall midiOutOpen(ptr long long long long) winmm.midiOutOpen +@ stdcall midiOutPrepareHeader(long ptr long) winmm.midiOutPrepareHeader +@ stdcall midiOutReset(long) winmm.midiOutReset +@ stdcall midiOutSetVolume(long long) winmm.midiOutSetVolume +@ stdcall midiOutShortMsg(long long) winmm.midiOutShortMsg +@ stdcall midiOutUnprepareHeader(long ptr long) winmm.midiOutUnprepareHeader +@ stdcall midiStreamClose(long) winmm.midiStreamClose +@ stdcall midiStreamOpen(ptr ptr long long long long) winmm.midiStreamOpen +@ stdcall midiStreamOut(long ptr long) winmm.midiStreamOut +@ stdcall midiStreamPause(long) winmm.midiStreamPause +@ stdcall midiStreamPosition(long ptr long) winmm.midiStreamPosition +@ stdcall midiStreamProperty(long ptr long) winmm.midiStreamProperty +@ stdcall midiStreamRestart(long) winmm.midiStreamRestart +@ stdcall midiStreamStop(long) winmm.midiStreamStop +@ stdcall mixerClose(long) winmm.mixerClose +@ stdcall mixerGetControlDetailsA(long ptr long) winmm.mixerGetControlDetailsA +@ stdcall mixerGetControlDetailsW(long ptr long) winmm.mixerGetControlDetailsW +@ stdcall mixerGetDevCapsA(long ptr long) winmm.mixerGetDevCapsA +@ stdcall mixerGetDevCapsW(long ptr long) winmm.mixerGetDevCapsW +@ stdcall mixerGetID(long ptr long) winmm.mixerGetID +@ stdcall mixerGetLineControlsA(long ptr long) winmm.mixerGetLineControlsA +@ stdcall mixerGetLineControlsW(long ptr long) winmm.mixerGetLineControlsW +@ stdcall mixerGetLineInfoA(long ptr long) winmm.mixerGetLineInfoA +@ stdcall mixerGetLineInfoW(long ptr long) winmm.mixerGetLineInfoW +@ stdcall mixerGetNumDevs() winmm.mixerGetNumDevs +@ stdcall mixerMessage(long long long long) winmm.mixerMessage +@ stdcall mixerOpen(ptr long long long long) winmm.mixerOpen +@ stdcall mixerSetControlDetails(long ptr long) winmm.mixerSetControlDetails +@ stdcall waveInAddBuffer(long ptr long) winmm.waveInAddBuffer +@ stdcall waveInClose(long) winmm.waveInClose +@ stdcall waveInGetDevCapsA(long ptr long) winmm.waveInGetDevCapsA +@ stdcall waveInGetDevCapsW(long ptr long) winmm.waveInGetDevCapsW +@ stdcall waveInGetErrorTextA(long ptr long) winmm.waveInGetErrorTextA +@ stdcall waveInGetErrorTextW(long ptr long) winmm.waveInGetErrorTextW +@ stdcall waveInGetID(long ptr) winmm.waveInGetID +@ stdcall waveInGetNumDevs() winmm.waveInGetNumDevs +@ stdcall waveInGetPosition(long ptr long) winmm.waveInGetPosition +@ stdcall waveInMessage(long long long long) winmm.waveInMessage +@ stdcall waveInOpen(ptr long ptr long long long) winmm.waveInOpen +@ stdcall waveInPrepareHeader(long ptr long) winmm.waveInPrepareHeader +@ stdcall waveInReset(long) winmm.waveInReset +@ stdcall waveInStart(long) winmm.waveInStart +@ stdcall waveInStop(long) winmm.waveInStop +@ stdcall waveInUnprepareHeader(long ptr long) winmm.waveInUnprepareHeader +@ stdcall waveOutBreakLoop(long) winmm.waveOutBreakLoop +@ stdcall waveOutClose(long) winmm.waveOutClose +@ stdcall waveOutGetDevCapsA(long ptr long) winmm.waveOutGetDevCapsA +@ stdcall waveOutGetDevCapsW(long ptr long) winmm.waveOutGetDevCapsW +@ stdcall waveOutGetErrorTextA(long ptr long) winmm.waveOutGetErrorTextA +@ stdcall waveOutGetErrorTextW(long ptr long) winmm.waveOutGetErrorTextW +@ stdcall waveOutGetID(long ptr) winmm.waveOutGetID +@ stdcall waveOutGetNumDevs() winmm.waveOutGetNumDevs +@ stdcall waveOutGetPitch(long ptr) winmm.waveOutGetPitch +@ stdcall waveOutGetPlaybackRate(long ptr) winmm.waveOutGetPlaybackRate +@ stdcall waveOutGetPosition(long ptr long) winmm.waveOutGetPosition +@ stdcall waveOutGetVolume(long ptr) winmm.waveOutGetVolume +@ stdcall waveOutMessage(long long long long) winmm.waveOutMessage +@ stdcall waveOutOpen(ptr long ptr long long long) winmm.waveOutOpen +@ stdcall waveOutPause(long) winmm.waveOutPause +@ stdcall waveOutPrepareHeader(long ptr long) winmm.waveOutPrepareHeader +@ stdcall waveOutReset(long) winmm.waveOutReset +@ stdcall waveOutRestart(long) winmm.waveOutRestart +@ stdcall waveOutSetPitch(long long) winmm.waveOutSetPitch +@ stdcall waveOutSetPlaybackRate(long long) winmm.waveOutSetPlaybackRate +@ stdcall waveOutSetVolume(long long) winmm.waveOutSetVolume +@ stdcall waveOutUnprepareHeader(long ptr long) winmm.waveOutUnprepareHeader +@ stdcall waveOutWrite(long ptr long) winmm.waveOutWrite diff --git a/tools/make_specfiles b/tools/make_specfiles index 84c2d8d..b36664d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -313,6 +313,7 @@ my @dll_groups = [ "winmm", "api-ms-win-mm-misc-l1-1-1", + "api-ms-win-mm-mme-l1-1-0", ], [ "msvcrt",

1 0

Józef Kucia : d3d11: Replace another magic number with D3D10_SO_BUFFER_SLOT_COUNT.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: af3638af809ca97bdb513a908d51f3e769677220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3638af809ca97bdb513a908… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 29 15:11:09 2017 +0200 d3d11: Replace another magic number with D3D10_SO_BUFFER_SLOT_COUNT. I missed this occurrence in a1ef2347b16e17f4a3ac8a1fcf1e5a5de4844e43. 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/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6d230ee..5ae305d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3738,7 +3738,7 @@ static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface, buffer ? buffer->wined3d_buffer : NULL, offsets[i]); } - for (i = count; i < 4; ++i) + for (i = count; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) { wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); }

1 0

Józef Kucia : wined3d: Bind transform feedback buffers.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 96570c521662ebab4f9894bab10ec6d5cec93745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96570c521662ebab4f9894bab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 29 15:11:08 2017 +0200 wined3d: Bind transform feedback buffers. 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/wined3d/buffer.c | 2 ++ dlls/wined3d/context.c | 17 +++++++++++++++++ dlls/wined3d/cs.c | 2 ++ dlls/wined3d/state.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 ++++- 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3c6bc61..4e8569c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -176,6 +176,8 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } + if (buffer->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); } if (buffer->query) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 426d697..3c297df 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3518,6 +3518,22 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, checkGLcall("Bind unordered access views"); } +static void context_load_stream_output_buffers(struct wined3d_context *context, + const struct wined3d_state *state) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + struct wined3d_buffer *buffer; + if (!(buffer = state->stream_output[i].buffer)) + continue; + + wined3d_buffer_load(buffer, context, state); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + } +} + /* Context activation is done by the caller. */ BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) @@ -3544,6 +3560,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); + context_load_stream_output_buffers(context, state); /* TODO: Right now the dependency on the vertex shader is necessary * since wined3d_stream_info_from_declaration() depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 71099e7..423650c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -925,6 +925,8 @@ static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void InterlockedIncrement(&op->buffer->resource.bind_count); if (prev) InterlockedDecrement(&prev->resource.bind_count); + + device_invalidate_state(cs->device, STATE_STREAM_OUTPUT); } void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7ad98b8..2b846ae 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4930,7 +4930,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state buffer = state->cb[shader_type][i]; GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, buffer ? buffer->buffer_object : 0)); } - checkGLcall("glBindBufferBase"); + checkGLcall("bind constant buffers"); } static void state_cb_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4974,6 +4974,40 @@ static void state_uav_warn(struct wined3d_context *context, const struct wined3d WARN("ARB_image_load_store is not supported by OpenGL implementation.\n"); } +static void state_so(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_buffer *buffer; + unsigned int offset, size, i; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + if (!(buffer = state->stream_output[i].buffer)) + { + GL_EXTCALL(glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, i, 0)); + continue; + } + + offset = state->stream_output[i].offset; + if (offset == ~0u) + { + FIXME("Appending to stream output buffers not implemented.\n"); + offset = 0; + } + size = buffer->resource.size - offset; + GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, + buffer->buffer_object, offset, size)); + } + checkGLcall("bind transform feedback buffers"); +} + +static void state_so_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + WARN("Transform feedback not supported.\n"); +} + const struct StateEntryTemplate misc_state_template[] = { { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, @@ -4990,6 +5024,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_COMPUTE_SHADER_RESOURCE_BINDING, { STATE_COMPUTE_SHADER_RESOURCE_BINDING, state_cs_resource_binding}, WINED3D_GL_EXT_NONE }, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_cs_uav_binding}, ARB_SHADER_IMAGE_LOAD_STORE }, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, + { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, + { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SRCBLEND), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DESTBLEND), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), { STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE), state_blend }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1627752..87afcab 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4462,6 +4462,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_POINT_ENABLE"; if (STATE_IS_COLOR_KEY(state)) return "STATE_COLOR_KEY"; + if (STATE_IS_STREAM_OUTPUT(state)) + return "STATE_STREAM_OUTPUT"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d59982..3c666d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1513,7 +1513,10 @@ enum wined3d_pipeline #define STATE_COLOR_KEY (STATE_POINT_ENABLE + 1) #define STATE_IS_COLOR_KEY(a) ((a) == STATE_COLOR_KEY) -#define STATE_COMPUTE_OFFSET (STATE_COLOR_KEY + 1) +#define STATE_STREAM_OUTPUT (STATE_COLOR_KEY + 1) +#define STATE_IS_STREAM_OUTPUT(a) ((a) == STATE_STREAM_OUTPUT) + +#define STATE_COMPUTE_OFFSET (STATE_STREAM_OUTPUT + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER)

1 0

Józef Kucia : wined3d: Exit early in shader_glsl_init_transform_feedback() if stream output is disabled.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: d58e44bfeb9a7125f62646e7426292707597d770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58e44bfeb9a7125f62646e74… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 29 15:11:06 2017 +0200 wined3d: Exit early in shader_glsl_init_transform_feedback() if stream output is 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/wined3d/glsl_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0eccaaa..b3cd500 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -840,6 +840,9 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co const char **varyings; char *strings; + if (!so_desc->element_count) + return; + if (!gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { FIXME("ARB_transform_feedback3 not supported by OpenGL implementation.\n");

1 0