September 2016 - Wine-Commits

Matteo Bruni : wined3d: Enable lod and grad texture lookups on core profile.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 791b0b9f5e64b843d71230e8632e09a7ba169686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b0b9f5e64b843d71230e86… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:12 2016 +0200 wined3d: Enable lod and grad texture lookups on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e2d624a..b0f3224 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2881,6 +2881,12 @@ static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) } } +static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + return shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]; +} + static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { @@ -2942,7 +2948,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (!type_part[0]) FIXME("Unhandled resource type %#x.\n", resource_type); - if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) + if (!lod && grad && !shader_glsl_has_core_grad(gl_info, &ctx->shader->reg_maps.shader_version)) { if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) suffix = "ARB"; @@ -4558,7 +4564,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4]) + if (!shader_glsl_has_core_grad(gl_info, &ins->ctx->shader->reg_maps.shader_version) + && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { FIXME("texldd used, but not supported by hardware. Falling back to regular tex\n"); shader_glsl_tex(ins); @@ -4579,11 +4586,12 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { + const struct wined3d_shader_version *shader_version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; + DWORD sampler_idx; sampler_idx = ins->src[1].reg.idx[0].offset; @@ -4592,8 +4600,8 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4] - && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + if (shader_version->type == WINED3D_SHADER_TYPE_PIXEL && !shader_glsl_has_core_grad(gl_info, shader_version) + && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { /* Plain GLSL only supports Lod sampling functions in vertex shaders. * However, the NVIDIA drivers allow them in fragment shaders as well, @@ -8581,9 +8589,9 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] && gl_info->supported[ARB_TEXTURE_SWIZZLE]) shader_model = 4; - /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 - * texldd and texldl instructions. */ - else if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) + /* Support for texldd and texldl instructions in pixel shaders is required + * for SM3. */ + else if (shader_glsl_has_core_grad(gl_info, NULL) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_model = 3; else shader_model = 2;

1 0

Andrey Gusev : api-ms-win-core-bem-l1-1-0: Add dll.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 784098229fc0e297ac0fe8dcb8425045a26facb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784098229fc0e297ac0fe8dcb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 27 00:12:07 2016 +0300 api-ms-win-core-bem-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-core-bem-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 0959921..d5be2ce 100755 --- a/configure +++ b/configure @@ -878,6 +878,7 @@ enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 +enable_api_ms_win_core_bem_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_console_l1_1_0 @@ -17561,6 +17562,7 @@ wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apique wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 +wine_fn_config_dll api-ms-win-core-bem-l1-1-0 enable_api_ms_win_core_bem_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 diff --git a/configure.ac b/configure.ac index 67bde0e..62aa1d5 100644 --- a/configure.ac +++ b/configure.ac @@ -2654,6 +2654,7 @@ WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-bem-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) diff --git a/dlls/api-ms-win-core-bem-l1-1-0/Makefile.in b/dlls/api-ms-win-core-bem-l1-1-0/Makefile.in new file mode 100644 index 0000000..91e1116 --- /dev/null +++ b/dlls/api-ms-win-core-bem-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-bem-l1-1-0.dll diff --git a/dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec b/dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec new file mode 100644 index 0000000..2d8b123 --- /dev/null +++ b/dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub BemCopyReference +@ stub BemCreateContractFrom +@ stub BemCreateReference +@ stub BemFreeContract +@ stub BemFreeReference diff --git a/tools/make_specfiles b/tools/make_specfiles index 29fb83b..1d1c0ed 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -231,6 +231,7 @@ my @dll_groups = "advapi32", "user32", "kernelbase", + "api-ms-win-core-bem-l1-1-0", ], [ "ole32",

1 0

Andrey Gusev : api-ms-win-core-appcompat-l1-1-1: Add dll.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 80829582e15079c53d149da585bed7efeefe8d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80829582e15079c53d149da58… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 27 00:02:26 2016 +0300 api-ms-win-core-appcompat-l1-1-1: 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-core-appcompat-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-appcompat-l1-1-1.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 7ef7019..0959921 100755 --- a/configure +++ b/configure @@ -875,6 +875,7 @@ enable_advapi32 enable_advpack enable_amstream enable_api_ms_win_core_apiquery_l1_1_0 +enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 @@ -17557,6 +17558,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 +wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 diff --git a/configure.ac b/configure.ac index 950489b..67bde0e 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in b/dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in new file mode 100644 index 0000000..2107094 --- /dev/null +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-appcompat-l1-1-1.dll diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec new file mode 100644 index 0000000..92a96af --- /dev/null +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec @@ -0,0 +1,10 @@ +@ stub BaseCheckAppcompatCache +@ stub BaseCheckAppcompatCacheEx +@ stub BaseCleanupAppcompatCacheSupport +@ stub BaseDumpAppcompatCache +@ stub BaseFlushAppcompatCache +@ stub BaseFreeAppCompatDataForProcess +@ stub BaseInitAppcompatCacheSupport +@ stub BaseIsAppcompatInfrastructureDisabled +@ stub BaseReadAppCompatDataForProcess +@ stub BaseUpdateAppcompatCache diff --git a/tools/make_specfiles b/tools/make_specfiles index 86dfeb6..29fb83b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -138,6 +138,7 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", + "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1",

1 0

Piotr Caban : msvcp140: Add codecvt<short,char,_Mbstatet> exports.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: f2267802d0e723695e7e6f8421197bb292a5b3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2267802d0e723695e7e6f842… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 27 09:33:21 2016 +0200 msvcp140: Add codecvt<short,char,_Mbstatet> exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 104 ++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2267802d0e723695e7e6…

1 0

Piotr Caban : msvcp140: Add codecvt<wchar_t,char,_Mbstatet> exports.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: dd6b7239c997bd56a8b64c0b4400e60fdbbc0bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6b7239c997bd56a8b64c0b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 27 09:33:12 2016 +0200 msvcp140: Add codecvt<wchar_t,char,_Mbstatet> exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 104 ++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd6b7239c997bd56a8b64…

1 0

Alexandre Julliard : winex11: Remove support for owner-displayed clipboard formats.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 82dfbba5c6f79b3668cfe846ba5744635ac8caa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dfbba5c6f79b3668cfe846b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 27 21:40:15 2016 +0900 winex11: Remove support for owner-displayed clipboard formats. It cannot work across prefixes, and it didn't work previously either. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 5 ----- dlls/winex11.drv/x11drv.h | 5 ----- dlls/winex11.drv/x11drv_main.c | 5 ----- 3 files changed, 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 611ecee..63d11dd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -171,11 +171,6 @@ static const struct { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, { 0, CF_DIBV5, XATOM_WCF_DIBV5, import_data, export_data }, - { 0, CF_OWNERDISPLAY, XATOM_WCF_OWNERDISPLAY, import_data, export_data }, - { 0, CF_DSPTEXT, XATOM_WCF_DSPTEXT, import_data, export_data }, - { 0, CF_DSPBITMAP, XATOM_WCF_DSPBITMAP, import_data, export_data }, - { 0, CF_DSPMETAFILEPICT, XATOM_WCF_DSPMETAFILEPICT, import_data, export_data }, - { 0, CF_DSPENHMETAFILE, XATOM_WCF_DSPENHMETAFILE, import_data, export_data }, { 0, CF_DIB, XATOM_image_bmp, import_image_bmp, export_image_bmp }, { RichTextFormatW, 0, XATOM_text_rtf, import_data, export_data }, { RichTextFormatW, 0, XATOM_text_richtext, import_data, export_data }, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d622468..ae0bc9c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -462,16 +462,11 @@ enum x11drv_atoms XATOM_WCF_DIB, XATOM_WCF_DIBV5, XATOM_WCF_DIF, - XATOM_WCF_DSPBITMAP, - XATOM_WCF_DSPENHMETAFILE, - XATOM_WCF_DSPMETAFILEPICT, - XATOM_WCF_DSPTEXT, XATOM_WCF_ENHMETAFILE, XATOM_WCF_HDROP, XATOM_WCF_LOCALE, XATOM_WCF_METAFILEPICT, XATOM_WCF_OEMTEXT, - XATOM_WCF_OWNERDISPLAY, XATOM_WCF_PALETTE, XATOM_WCF_PENDATA, XATOM_WCF_RIFF, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 41097f4..4391360 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -173,16 +173,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "WCF_DIB", "WCF_DIBV5", "WCF_DIF", - "WCF_DSPBITMAP", - "WCF_DSPENHMETAFILE", - "WCF_DSPMETAFILEPICT", - "WCF_DSPTEXT", "WCF_ENHMETAFILE", "WCF_HDROP", "WCF_LOCALE", "WCF_METAFILEPICT", "WCF_OEMTEXT", - "WCF_OWNERDISPLAY", "WCF_PALETTE", "WCF_PENDATA", "WCF_RIFF",

1 0

Matteo Bruni : wined3d: Call glGetIntegerv() through the gl_info function pointer.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: bbab63cfcf8834820be631fe2d599bf4550331a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbab63cfcf8834820be631fe2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:15 2016 +0200 wined3d: Call glGetIntegerv() through the gl_info function pointer. Fixes a1e718ccabc7c330dd16c7face78022965b03e20. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ab68aa..05e04e8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3629,7 +3629,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD if (gl_version >= MAKEDWORD_VERSION(3, 2)) { - glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); checkGLcall("Querying context profile"); } if (context_profile & GL_CONTEXT_CORE_PROFILE_BIT)

1 0

Matteo Bruni : wined3d: Fix ps_3_0 packed inputs limit.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 630998123a2bf241eab3d5dd704d7d4ba588d973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630998123a2bf241eab3d5dd7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:13 2016 +0200 wined3d: Fix ps_3_0 packed inputs limit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 28d5972..1c48589 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -598,7 +598,7 @@ static void shader_set_limits(struct wined3d_shader *shader) {WINED3D_SHADER_VERSION(1, 4), WINED3D_SHADER_VERSION(1, 4), { 6, 0, 8, 0, 0, 0}}, {WINED3D_SHADER_VERSION(2, 0), WINED3D_SHADER_VERSION(2, 0), {16, 0, 32, 0, 0, 0}}, {WINED3D_SHADER_VERSION(2, 1), WINED3D_SHADER_VERSION(2, 1), {16, 16, 32, 16, 0, 0}}, - {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 12}}, + {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 10}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 0, 32}}, {0} },

1 0

Andrey Gusev : api-ms-win-service-private-l1-1-1: Add dll.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: c1ec8a6769e2ff8c61c02815a4c3b6ed2060d6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ec8a6769e2ff8c61c02815a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 27 00:26:08 2016 +0300 api-ms-win-service-private-l1-1-1: 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-service-private-l1-1-1/Makefile.in | 1 + .../api-ms-win-service-private-l1-1-1.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index d5be2ce..151704a 100755 --- a/configure +++ b/configure @@ -1019,6 +1019,7 @@ enable_api_ms_win_service_core_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 enable_api_ms_win_service_management_l2_1_0 +enable_api_ms_win_service_private_l1_1_1 enable_api_ms_win_service_winsvc_l1_1_0 enable_api_ms_win_service_winsvc_l1_2_0 enable_api_ms_win_shell_shellcom_l1_1_0 @@ -17703,6 +17704,7 @@ wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 wine_fn_config_dll api-ms-win-service-management-l2-1-0 enable_api_ms_win_service_management_l2_1_0 +wine_fn_config_dll api-ms-win-service-private-l1-1-1 enable_api_ms_win_service_private_l1_1_1 wine_fn_config_dll api-ms-win-service-winsvc-l1-1-0 enable_api_ms_win_service_winsvc_l1_1_0 wine_fn_config_dll api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_service_winsvc_l1_2_0 wine_fn_config_dll api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 diff --git a/configure.ac b/configure.ac index 62aa1d5..e97cd17 100644 --- a/configure.ac +++ b/configure.ac @@ -2795,6 +2795,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) +WINE_CONFIG_DLL(api-ms-win-service-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) diff --git a/dlls/api-ms-win-service-private-l1-1-1/Makefile.in b/dlls/api-ms-win-service-private-l1-1-1/Makefile.in new file mode 100644 index 0000000..4289f50 --- /dev/null +++ b/dlls/api-ms-win-service-private-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-service-private-l1-1-1.dll diff --git a/dlls/api-ms-win-service-private-l1-1-1/api-ms-win-service-private-l1-1-1.spec b/dlls/api-ms-win-service-private-l1-1-1/api-ms-win-service-private-l1-1-1.spec new file mode 100644 index 0000000..6c72be5 --- /dev/null +++ b/dlls/api-ms-win-service-private-l1-1-1/api-ms-win-service-private-l1-1-1.spec @@ -0,0 +1,16 @@ +@ stub I_QueryTagInformation +@ stub I_ScBroadcastServiceControlMessage +@ stub I_ScIsSecurityProcess +@ stub I_ScPnPGetServiceName +@ stub I_ScQueryServiceConfig +@ stub I_ScRegisterDeviceNotification +@ stub I_ScRegisterPreshutdownRestart +@ stub I_ScRpcBind +@ stub I_ScSendPnPMessage +@ stub I_ScSendTSMessage +@ stub I_ScSetServiceBits +@ stub I_ScUnregisterDeviceNotification +@ stub I_ScValidatePnPService +@ stub SubscribeServiceChangeNotifications +@ stub UnsubscribeServiceChangeNotifications +@ stub WaitServiceState diff --git a/tools/make_specfiles b/tools/make_specfiles index 1d1c0ed..f3b5c5e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -127,6 +127,7 @@ my @dll_groups = "api-ms-win-service-core-l1-1-1", "api-ms-win-service-management-l1-1-0", "api-ms-win-service-management-l2-1-0", + "api-ms-win-service-private-l1-1-1", "api-ms-win-service-winsvc-l1-1-0", "api-ms-win-service-winsvc-l1-2-0", ],

1 0

Piotr Caban : msvcp110: Add _Cnd_{do_broadcast, register, unregister}_at_thread_exit implementation.
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Module: wine Branch: master Commit: 4dc7f609e7d70ba2e28163ab5656b45339d95f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc7f609e7d70ba2e28163ab5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 27 13:29:00 2016 +0200 msvcp110: Add _Cnd_{do_broadcast,register,unregister}_at_thread_exit implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 6 +-- dlls/msvcp120/msvcp120.spec | 6 +-- dlls/msvcp120_app/msvcp120_app.spec | 6 +-- dlls/msvcp140/msvcp140.spec | 6 +-- dlls/msvcp90/misc.c | 100 ++++++++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 8affc67..02ffa9b 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3731,12 +3731,12 @@ @ cdecl _Call_onceEx(ptr ptr ptr) @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) -@ stub _Cnd_do_broadcast_at_thread_exit +@ cdecl _Cnd_do_broadcast_at_thread_exit() @ cdecl _Cnd_init(ptr) -@ stub _Cnd_register_at_thread_exit +@ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) @ cdecl _Cnd_signal(ptr) @ cdecl _Cnd_timedwait(ptr ptr ptr) -@ stub _Cnd_unregister_at_thread_exit +@ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) @ stub _Cosh @ extern _Denorm diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 3cb81fe..7b8a243 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3672,12 +3672,12 @@ @ cdecl _Call_onceEx(ptr ptr ptr) @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) -@ stub _Cnd_do_broadcast_at_thread_exit +@ cdecl _Cnd_do_broadcast_at_thread_exit() @ cdecl _Cnd_init(ptr) -@ stub _Cnd_register_at_thread_exit +@ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) @ cdecl _Cnd_signal(ptr) @ cdecl _Cnd_timedwait(ptr ptr ptr) -@ stub _Cnd_unregister_at_thread_exit +@ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) @ stub _Cosh @ extern _Denorm diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b799564..9ce5fea 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3672,12 +3672,12 @@ @ cdecl _Call_onceEx(ptr ptr ptr) msvcp120._Call_onceEx @ cdecl _Cnd_broadcast(ptr) msvcp120._Cnd_broadcast @ cdecl _Cnd_destroy(ptr) msvcp120._Cnd_destroy -@ stub _Cnd_do_broadcast_at_thread_exit +@ cdecl _Cnd_do_broadcast_at_thread_exit() msvcp120._Cnd_do_broadcast_at_thread_exit @ cdecl _Cnd_init(ptr) msvcp120._Cnd_init -@ stub _Cnd_register_at_thread_exit +@ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) msvcp120._Cnd_register_at_thread_exit @ cdecl _Cnd_signal(ptr) msvcp120._Cnd_signal @ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp120._Cnd_timedwait -@ stub _Cnd_unregister_at_thread_exit +@ cdecl _Cnd_unregister_at_thread_exit(ptr) msvcp120._Cnd_unregister_at_thread_exit @ cdecl _Cnd_wait(ptr ptr) msvcp120._Cnd_wait @ stub _Cosh @ extern _Denorm msvcp120._Denorm diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index cad39e9..c8e16fa 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3624,13 +3624,13 @@ @ cdecl _Cnd_broadcast(ptr) _Cnd_broadcast @ cdecl _Cnd_destroy(ptr) _Cnd_destroy @ stub _Cnd_destroy_in_situ -@ stub _Cnd_do_broadcast_at_thread_exit +@ cdecl _Cnd_do_broadcast_at_thread_exit() @ cdecl _Cnd_init(ptr) _Cnd_init @ cdecl _Cnd_init_in_situ(ptr) -@ stub _Cnd_register_at_thread_exit +@ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) @ cdecl _Cnd_signal(ptr) _Cnd_signal @ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait -@ stub _Cnd_unregister_at_thread_exit +@ cdecl _Cnd_unregister_at_thread_exit(ptr) @ cdecl _Cnd_wait(ptr ptr) _Cnd_wait @ stub _Copy_file @ stub _Cosh diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 41f2eeb..885ec6f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -662,6 +662,105 @@ void __cdecl _Cnd_destroy(_Cnd_arg_t cnd) MSVCRT_operator_delete(CND_T_FROM_ARG(cnd)); } } + +static struct { + int used; + int size; + + struct _to_broadcast { + DWORD thread_id; + _Cnd_arg_t cnd; + _Mtx_arg_t mtx; + int *p; + } *to_broadcast; +} broadcast_at_thread_exit; + +static CRITICAL_SECTION broadcast_at_thread_exit_cs; +static CRITICAL_SECTION_DEBUG broadcast_at_thread_exit_cs_debug = +{ + 0, 0, &broadcast_at_thread_exit_cs, + { &broadcast_at_thread_exit_cs_debug.ProcessLocksList, &broadcast_at_thread_exit_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": broadcast_at_thread_exit_cs") } +}; +static CRITICAL_SECTION broadcast_at_thread_exit_cs = { &broadcast_at_thread_exit_cs_debug, -1, 0, 0, 0, 0 }; + +void __cdecl _Cnd_register_at_thread_exit(_Cnd_arg_t cnd, _Mtx_arg_t mtx, int *p) +{ + struct _to_broadcast *add; + + TRACE("(%p %p %p)\n", cnd, mtx, p); + + EnterCriticalSection(&broadcast_at_thread_exit_cs); + if(!broadcast_at_thread_exit.size) { + broadcast_at_thread_exit.to_broadcast = HeapAlloc(GetProcessHeap(), + 0, 8*sizeof(broadcast_at_thread_exit.to_broadcast[0])); + if(!broadcast_at_thread_exit.to_broadcast) { + LeaveCriticalSection(&broadcast_at_thread_exit_cs); + return; + } + broadcast_at_thread_exit.size = 8; + } else if(broadcast_at_thread_exit.size == broadcast_at_thread_exit.used) { + add = HeapReAlloc(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast, + broadcast_at_thread_exit.size*2*sizeof(broadcast_at_thread_exit.to_broadcast[0])); + if(!add) { + LeaveCriticalSection(&broadcast_at_thread_exit_cs); + return; + } + broadcast_at_thread_exit.to_broadcast = add; + broadcast_at_thread_exit.size *= 2; + } + + add = broadcast_at_thread_exit.to_broadcast + broadcast_at_thread_exit.used++; + add->thread_id = GetCurrentThreadId(); + add->cnd = cnd; + add->mtx = mtx; + add->p = p; + LeaveCriticalSection(&broadcast_at_thread_exit_cs); +} + +void __cdecl _Cnd_unregister_at_thread_exit(_Mtx_arg_t mtx) +{ + int i; + + TRACE("(%p)\n", mtx); + + EnterCriticalSection(&broadcast_at_thread_exit_cs); + for(i=0; i<broadcast_at_thread_exit.used; i++) { + if(broadcast_at_thread_exit.to_broadcast[i].mtx != mtx) + continue; + + memmove(broadcast_at_thread_exit.to_broadcast+i, broadcast_at_thread_exit.to_broadcast+i+1, + (broadcast_at_thread_exit.used-i-1)*sizeof(broadcast_at_thread_exit.to_broadcast[0])); + broadcast_at_thread_exit.used--; + i--; + } + LeaveCriticalSection(&broadcast_at_thread_exit_cs); +} + +void __cdecl _Cnd_do_broadcast_at_thread_exit(void) +{ + int i, id = GetCurrentThreadId(); + + TRACE("()\n"); + + EnterCriticalSection(&broadcast_at_thread_exit_cs); + for(i=0; i<broadcast_at_thread_exit.used; i++) { + if(broadcast_at_thread_exit.to_broadcast[i].thread_id != id) + continue; + + _Mtx_unlock(broadcast_at_thread_exit.to_broadcast[i].mtx); + _Cnd_broadcast(broadcast_at_thread_exit.to_broadcast[i].cnd); + if(broadcast_at_thread_exit.to_broadcast[i].p) + *broadcast_at_thread_exit.to_broadcast[i].p = 1; + + memmove(broadcast_at_thread_exit.to_broadcast+i, broadcast_at_thread_exit.to_broadcast+i+1, + (broadcast_at_thread_exit.used-i-1)*sizeof(broadcast_at_thread_exit.to_broadcast[0])); + broadcast_at_thread_exit.used--; + i--; + } + LeaveCriticalSection(&broadcast_at_thread_exit_cs); +} + #endif #if _MSVCP_VER == 100 @@ -1195,6 +1294,7 @@ void free_misc(void) #if _MSVCP_VER >= 110 if(keyed_event) NtClose(keyed_event); + HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast); #endif }

1 0