November 2016 - Wine-commits

Józef Kucia : wined3d: Add support for WINED3DFMT_R32_UINT format.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: b97fd7646202be01c65251855ad7de1d953676c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97fd7646202be01c65251855… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:47 2016 +0100 wined3d: Add support for WINED3DFMT_R32_UINT format. 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/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6ab851d..1b70e1c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1306,6 +1306,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32_UINT, GL_R32UI, GL_R32UI, 0, + GL_RED_INTEGER, GL_UNSIGNED_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, GL_RED, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R32_SINT format.
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: db4e9f7e1700795be34db083bfd5064ce04c37ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4e9f7e1700795be34db083b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:48 2016 +0100 wined3d: Add support for WINED3DFMT_R32_SINT format. 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/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b70e1c..d683203 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1310,6 +1310,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED_INTEGER, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32_SINT, GL_R32I, GL_R32I, 0, + GL_RED_INTEGER, GL_INT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, GL_RED, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING

1 0

Józef Kucia : d3d10core/tests: Fix test failures in test_render_target_views().
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: 9bb2c987fb8e78afd3d579220dc2ee65e69283d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb2c987fb8e78afd3d579220… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:49 2016 +0100 d3d10core/tests: Fix test failures in test_render_target_views(). 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/d3d10core/tests/device.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 9f98850..e617319 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2407,7 +2407,8 @@ static void test_render_target_views(void) ID3D10RenderTargetView *rtv; ID3D10Texture2D *texture; ID3D10Device *device; - unsigned int i, j; + unsigned int i, j, k; + void *data; HRESULT hr; if (!init_test_context(&test_context)) @@ -2425,6 +2426,9 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, texture_desc.Width * texture_desc.Height * 4); + ok(!!data, "Failed to allocate memory.\n"); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { const struct test *test = &tests[i]; @@ -2440,6 +2444,17 @@ static void test_render_target_views(void) hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + for (j = 0; j < texture_desc.ArraySize; ++j) + { + for (k = 0; k < texture_desc.MipLevels; ++k) + { + unsigned int sub_resource_idx = j * texture_desc.MipLevels + k; + ID3D10Device_UpdateSubresource(device, + (ID3D10Resource *)texture, sub_resource_idx, NULL, data, texture_desc.Width * 4, 0); + } + } + check_texture_color(texture, 0, 0); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); draw_color_quad(&test_context, &red); @@ -2452,6 +2467,7 @@ static void test_render_target_views(void) ID3D10Texture2D_Release(texture); } + HeapFree(GetProcessHeap(), 0, data); release_test_context(&test_context); }

1 0

Józef Kucia : d3d11/tests: Fix test failures in test_render_target_views().
by Alexandre Julliard 08 Nov '16

08 Nov '16

Module: wine Branch: master Commit: b4e334db5182cc68042c1c5e983034385dd0a329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e334db5182cc68042c1c5e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 8 12:11:50 2016 +0100 d3d11/tests: Fix test failures in test_render_target_views(). 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 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7ae4bd1..54df386 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6312,7 +6312,8 @@ static void test_render_target_views(void) ID3D11RenderTargetView *rtv; ID3D11Texture2D *texture; ID3D11Device *device; - unsigned int i, j; + unsigned int i, j, k; + void *data; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -6331,6 +6332,9 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, texture_desc.Width * texture_desc.Height * 4); + ok(!!data, "Failed to allocate memory.\n"); + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { const struct test *test = &tests[i]; @@ -6346,6 +6350,17 @@ static void test_render_target_views(void) hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + for (j = 0; j < texture_desc.ArraySize; ++j) + { + for (k = 0; k < texture_desc.MipLevels; ++k) + { + unsigned int sub_resource_idx = j * texture_desc.MipLevels + k; + ID3D11DeviceContext_UpdateSubresource(context, + (ID3D11Resource *)texture, sub_resource_idx, NULL, data, texture_desc.Width * 4, 0); + } + } + check_texture_color(texture, 0, 0); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); draw_color_quad(&test_context, &red); @@ -6358,6 +6373,7 @@ static void test_render_target_views(void) ID3D11Texture2D_Release(texture); } + HeapFree(GetProcessHeap(), 0, data); release_test_context(&test_context); }

1 0

Andrey Gusev : ext-ms-win-gdi-render-l1-1-0: Add dll.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 9d7887f0b1dafa0c8c6d079151931fc460ffff73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7887f0b1dafa0c8c6d07915… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 00:10:40 2016 +0200 ext-ms-win-gdi-render-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/ext-ms-win-gdi-render-l1-1-0/Makefile.in | 1 + dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 38a5e28..0a9d665 100755 --- a/configure +++ b/configure @@ -1167,6 +1167,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 +enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -17934,6 +17935,7 @@ wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_crea wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 +wine_fn_config_dll ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index a037569..892b9a3 100644 --- a/configure.ac +++ b/configure.ac @@ -3009,6 +3009,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-render-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-render-l1-1-0/Makefile.in new file mode 100644 index 0000000..0d11c30 --- /dev/null +++ b/dlls/ext-ms-win-gdi-render-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-render-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec b/dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec new file mode 100644 index 0000000..2a22583 --- /dev/null +++ b/dlls/ext-ms-win-gdi-render-l1-1-0/ext-ms-win-gdi-render-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub BeginGdiRendering +@ stub CreateBitmapFromDxSurface2 +@ stub EndGdiRendering diff --git a/tools/make_specfiles b/tools/make_specfiles index ac4f651..4d4acf2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -296,6 +296,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", + "ext-ms-win-gdi-render-l1-1-0", ], [ "combase",

1 0

Andrey Gusev : ext-ms-win-rtcore-gdi-object-l1-1-0: Add dll.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 0f22cc7bdabce4891e4d226325ea385bf4ff7b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f22cc7bdabce4891e4d22632… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 00:27:45 2016 +0200 ext-ms-win-rtcore-gdi-object-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/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-gdi-object-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 0a9d665..ea52feb 100755 --- a/configure +++ b/configure @@ -1174,6 +1174,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 +enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep @@ -17942,6 +17943,7 @@ wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_pri wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 +wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 892b9a3..398e8e3 100644 --- a/configure.ac +++ b/configure.ac @@ -3016,6 +3016,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in new file mode 100644 index 0000000..14d1afa --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-gdi-object-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/ext-ms-win-rtcore-gdi-object-l1-1-0.spec b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/ext-ms-win-rtcore-gdi-object-l1-1-0.spec new file mode 100644 index 0000000..97c9f6e --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-object-l1-1-0/ext-ms-win-rtcore-gdi-object-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall DeleteObject(long) gdi32.DeleteObject diff --git a/tools/make_specfiles b/tools/make_specfiles index 4d4acf2..5e5b7ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -297,6 +297,7 @@ my @dll_groups = "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", + "ext-ms-win-rtcore-gdi-object-l1-1-0", ], [ "combase",

1 0

Andrey Gusev : ext-ms-win-rtcore-gdi-rgn-l1-1-0: Add dll.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: e1ef6972aec91bae0764e9c4c1eb94a70872ed04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ef6972aec91bae0764e9c4c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 00:45:42 2016 +0200 ext-ms-win-rtcore-gdi-rgn-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/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index ea52feb..1abd0b1 100755 --- a/configure +++ b/configure @@ -1175,6 +1175,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 +enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep @@ -17944,6 +17945,7 @@ wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 +wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 398e8e3..100fa35 100644 --- a/configure.ac +++ b/configure.ac @@ -3017,6 +3017,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in new file mode 100644 index 0000000..72a632e --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-gdi-rgn-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec new file mode 100644 index 0000000..c716305 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0/ext-ms-win-rtcore-gdi-rgn-l1-1-0.spec @@ -0,0 +1,16 @@ +@ stdcall CombineRgn(long long long long) gdi32.CombineRgn +@ stdcall CreatePolygonRgn(ptr long long) gdi32.CreatePolygonRgn +@ stdcall CreateRectRgn(long long long long) gdi32.CreateRectRgn +@ stdcall CreateRectRgnIndirect(ptr) gdi32.CreateRectRgnIndirect +@ stdcall EqualRgn(long long) gdi32.EqualRgn +@ stdcall ExtCreateRegion(ptr long ptr) gdi32.ExtCreateRegion +@ stdcall FillRgn(long long long) gdi32.FillRgn +@ stdcall GetRegionData(long long ptr) gdi32.GetRegionData +@ stdcall GetRgnBox(long ptr) gdi32.GetRgnBox +@ stdcall IntersectClipRect(long long long long long) gdi32.IntersectClipRect +@ stdcall OffsetRgn(long long long) gdi32.OffsetRgn +@ stdcall RectInRegion(long ptr) gdi32.RectInRegion +@ stdcall SelectClipRgn(long long) gdi32.SelectClipRgn +@ stdcall SetMetaRgn(long) gdi32.SetMetaRgn +@ stdcall SetPolyFillMode(long long) gdi32.SetPolyFillMode +@ stdcall SetRectRgn(long long long long long) gdi32.SetRectRgn diff --git a/tools/make_specfiles b/tools/make_specfiles index 5e5b7ba..56d5a89 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -298,6 +298,7 @@ my @dll_groups = "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0", + "ext-ms-win-rtcore-gdi-rgn-l1-1-0", ], [ "combase",

1 0

Andrey Gusev : ext-ms-win-rtcore-ntuser-dc-access-l1-1-0: Add dll.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 9c2c9c71528b55e5c6641b7b0ae75953535c05ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2c9c71528b55e5c6641b7b0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Nov 6 01:32:00 2016 +0200 ext-ms-win-rtcore-ntuser-dc-access-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/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index 1abd0b1..663677e 100755 --- a/configure +++ b/configure @@ -1176,6 +1176,7 @@ enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 +enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep @@ -17946,6 +17947,7 @@ wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-gdi-object-l1-1-0 enable_ext_ms_win_rtcore_gdi_object_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-gdi-rgn-l1-1-0 enable_ext_ms_win_rtcore_gdi_rgn_l1_1_0 +wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 100fa35..6c8d671 100644 --- a/configure.ac +++ b/configure.ac @@ -3018,6 +3018,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in new file mode 100644 index 0000000..0c49ced --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec new file mode 100644 index 0000000..076c822 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetDC(long) user32.GetDC +@ stdcall ReleaseDC(long long) user32.ReleaseDC diff --git a/tools/make_specfiles b/tools/make_specfiles index 56d5a89..13e7bba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -272,6 +272,7 @@ my @dll_groups = "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", + "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", ],

1 0

Nikolay Sivov : dwrite: Update file type and face type enums.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 1e8a706bc3084636f822861cfb5903281316b0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8a706bc3084636f822861cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 00:12:37 2016 +0300 dwrite: Update file type and face type enums. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 2 +- dlls/dwrite/opentype.c | 8 ++++---- dlls/dwrite/tests/font.c | 2 +- include/dwrite.idl | 10 ++++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 641e808..9d5b1be 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -895,7 +895,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory4 *iface, if (!is_face_type_supported(req_facetype)) return E_INVALIDARG; - if (req_facetype != DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION && index) + if (req_facetype != DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION && index) return E_INVALIDARG; if (!is_simulation_valid(simulations)) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3412e66..3205b7f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -810,7 +810,7 @@ BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type) { return (type == DWRITE_FONT_FACE_TYPE_CFF) || (type == DWRITE_FONT_FACE_TYPE_TRUETYPE) || - (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) || + (type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) || (type == DWRITE_FONT_FACE_TYPE_RAW_CFF); } @@ -831,8 +831,8 @@ static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font if (!memcmp(header->TTCTag, &ttctag, sizeof(ttctag))) { *font_count = GET_BE_DWORD(header->numFonts); - *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION; - *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION; + *file_type = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION; + *face_type = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION; } IDWriteFontFileStream_ReleaseFileFragment(stream, context); @@ -1013,7 +1013,7 @@ HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag *table_data = NULL; *table_context = NULL; - if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { + if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; void * ttc_context; hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7f9be00..f5d9467 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1603,7 +1603,7 @@ static void test_CreateFontFace(void) hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); - hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION, 1, &file, 0, + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* < win10 */, "got 0x%08x\n", hr); diff --git a/include/dwrite.idl b/include/dwrite.idl index 9452e11..06ae767 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -48,23 +48,25 @@ typedef enum DWRITE_FONT_FILE_TYPE DWRITE_FONT_FILE_TYPE_UNKNOWN, DWRITE_FONT_FILE_TYPE_CFF, DWRITE_FONT_FILE_TYPE_TRUETYPE, - DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION, + DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION, DWRITE_FONT_FILE_TYPE_TYPE1_PFM, DWRITE_FONT_FILE_TYPE_TYPE1_PFB, DWRITE_FONT_FILE_TYPE_VECTOR, - DWRITE_FONT_FILE_TYPE_BITMAP + DWRITE_FONT_FILE_TYPE_BITMAP, + DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FILE_TYPE_OPENTYPE_COLLECTION } DWRITE_FONT_FILE_TYPE; typedef enum DWRITE_FONT_FACE_TYPE { DWRITE_FONT_FACE_TYPE_CFF, DWRITE_FONT_FACE_TYPE_TRUETYPE, - DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION, + DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION, DWRITE_FONT_FACE_TYPE_TYPE1, DWRITE_FONT_FACE_TYPE_VECTOR, DWRITE_FONT_FACE_TYPE_BITMAP, DWRITE_FONT_FACE_TYPE_UNKNOWN, - DWRITE_FONT_FACE_TYPE_RAW_CFF + DWRITE_FONT_FACE_TYPE_RAW_CFF, + DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION = DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION } DWRITE_FONT_FACE_TYPE; typedef enum DWRITE_FONT_WEIGHT

1 0

Nikolay Sivov : dwrite: Set fontface pointer and font size for returned color glyph run.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 9103ee4c66e644c032b83bb2be520c38cfbba9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9103ee4c66e644c032b83bb2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 00:12:38 2016 +0300 dwrite: Set fontface pointer and font size for returned color glyph run. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 18 ++++++++++-------- dlls/dwrite/tests/font.c | 8 ++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 75e2e00..7672aa6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5418,19 +5418,19 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R { struct dwrite_colorglyphenum *colorglyphenum; BOOL colorfont, has_colored_glyph; - IDWriteFontFace4 *fontface3; + IDWriteFontFace4 *fontface; HRESULT hr; UINT32 i; *ret = NULL; - hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace4, (void**)&fontface3); + hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace4, (void**)&fontface); if (FAILED(hr)) { WARN("failed to get IDWriteFontFace4, 0x%08x\n", hr); return hr; } - colorfont = IDWriteFontFace4_IsColorFont(fontface3) && IDWriteFontFace4_GetColorPaletteCount(fontface3) > palette; + colorfont = IDWriteFontFace4_IsColorFont(fontface) && IDWriteFontFace4_GetColorPaletteCount(fontface) > palette; if (!colorfont) { hr = DWRITE_E_NOCOLOR; goto failed; @@ -5446,7 +5446,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R colorglyphenum->ref = 1; colorglyphenum->origin_x = originX; colorglyphenum->origin_y = originY; - colorglyphenum->fontface = fontface3; + colorglyphenum->fontface = fontface; colorglyphenum->glyphs = NULL; colorglyphenum->run = *run; colorglyphenum->run.glyphIndices = NULL; @@ -5455,7 +5455,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R colorglyphenum->palette = palette; memset(&colorglyphenum->colr, 0, sizeof(colorglyphenum->colr)); colorglyphenum->colr.exists = TRUE; - get_fontface_table(fontface3, MS_COLR_TAG, &colorglyphenum->colr); + get_fontface_table(fontface, MS_COLR_TAG, &colorglyphenum->colr); colorglyphenum->current_layer = 0; colorglyphenum->max_layer_num = 0; @@ -5488,6 +5488,8 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R memcpy(colorglyphenum->offsets, run->glyphOffsets, run->glyphCount * sizeof(*run->glyphOffsets)); } + colorglyphenum->colorrun.glyphRun.fontFace = (IDWriteFontFace*)fontface; + colorglyphenum->colorrun.glyphRun.fontEmSize = run->fontEmSize; colorglyphenum->colorrun.glyphRun.glyphIndices = colorglyphenum->glyphindices; colorglyphenum->colorrun.glyphRun.glyphAdvances = colorglyphenum->color_advances; colorglyphenum->colorrun.glyphRun.glyphOffsets = colorglyphenum->color_offsets; @@ -5506,14 +5508,14 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R switch (measuring_mode) { case DWRITE_MEASURING_MODE_NATURAL: - hr = IDWriteFontFace4_GetDesignGlyphAdvances(fontface3, 1, run->glyphIndices + i, &a, run->isSideways); + hr = IDWriteFontFace4_GetDesignGlyphAdvances(fontface, 1, run->glyphIndices + i, &a, run->isSideways); if (FAILED(hr)) a = 0; colorglyphenum->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics); break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: - hr = IDWriteFontFace4_GetGdiCompatibleGlyphAdvances(fontface3, run->fontEmSize, 1.0f, transform, + hr = IDWriteFontFace4_GetGdiCompatibleGlyphAdvances(fontface, run->fontEmSize, 1.0f, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->isSideways, 1, run->glyphIndices + i, &a); if (FAILED(hr)) colorglyphenum->advances[i] = 0.0f; @@ -5530,7 +5532,7 @@ HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_R return S_OK; failed: - IDWriteFontFace4_Release(fontface3); + IDWriteFontFace4_Release(fontface); return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f5d9467..12327a5 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5977,6 +5977,14 @@ static void test_TranslateColorGlyphRun(void) if (!hasrun) break; + + hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(colorrun->glyphRun.fontFace != NULL, "got fontface %p\n", colorrun->glyphRun.fontFace); + ok(colorrun->glyphRun.fontEmSize == 20.0f, "got wrong font size %f\n", colorrun->glyphRun.fontEmSize); + ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); + ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); + ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); } /* iterated all way through */

1 0