September 2016 - Wine-Commits

Alexandre Julliard : user32: Cache clipboard data on the client side.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: f0fbf1a9d1345750c2bfce5858617b4095ce3ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fbf1a9d1345750c2bfce585… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:09:27 2016 +0900 user32: Cache clipboard data on the client side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 181 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/clipboard.c | 18 ++-- include/wine/server_protocol.h | 10 ++- server/clipboard.c | 12 ++- server/protocol.def | 7 +- server/request.h | 9 +- server/trace.c | 12 ++- 7 files changed, 224 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0fbf1a9d1345750c2bfc…

1 0

Alexandre Julliard : user32: Add synthesized clipboard formats on the server side.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: 9ed8f5e83fbd00d6c3c31167a632df0664e6b1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed8f5e83fbd00d6c3c31167a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:00:22 2016 +0900 user32: Add synthesized clipboard formats on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 139 +++-------------------------------------- include/wine/server_protocol.h | 6 +- server/clipboard.c | 63 ++++++++++++++++++- server/protocol.def | 2 + server/request.h | 10 +-- server/trace.c | 4 +- 6 files changed, 84 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed8f5e83fbd00d6c3c31…

1 0

Alexandre Julliard : user32: Retrieve clipboard data from the server.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: 3044935b0e8fb76ea2b223418e35f392422e0a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3044935b0e8fb76ea2b223418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 14:19:28 2016 +0900 user32: Retrieve clipboard data from the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 131 ++++++++++++++++++++++++++++------------- dlls/user32/tests/clipboard.c | 56 +++++++++--------- include/wine/server_protocol.h | 20 ++++++- server/clipboard.c | 25 ++++++++ server/protocol.def | 10 ++++ server/request.h | 7 +++ server/trace.c | 15 +++++ 7 files changed, 195 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3044935b0e8fb76ea2b22…

1 0

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

Sept. 26, 2016

Module: wine Branch: master Commit: f3994e6e84d0f883e1710db0ab0b797a62475304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3994e6e84d0f883e1710db0a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Sep 24 13:45:47 2016 +0300 api-ms-win-core-appinit-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-appinit-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index fc48509..41f70be 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_appinit_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 @@ -17555,6 +17556,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-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 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 diff --git a/configure.ac b/configure.ac index ac217f0..406ac9d 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-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) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/Makefile.in b/dlls/api-ms-win-core-appinit-l1-1-0/Makefile.in new file mode 100644 index 0000000..aaf5f6b --- /dev/null +++ b/dlls/api-ms-win-core-appinit-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-appinit-l1-1-0.dll diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec new file mode 100644 index 0000000..7ace09e --- /dev/null +++ b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec @@ -0,0 +1 @@ +@ stub LoadAppInitDlls diff --git a/tools/make_specfiles b/tools/make_specfiles index d17bb17..0f60b90 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -213,6 +213,7 @@ my @dll_groups = [ "kernel32", "user32", + "api-ms-win-core-appinit-l1-1-0", "api-ms-win-core-libraryloader-l1-1-0", "api-ms-win-core-libraryloader-l1-1-1", "api-ms-win-core-libraryloader-l1-2-0",

1 0

Piotr Caban : msvcp140: Add _Execute_once implementation.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: bb88947b051680cac11dbf7d9b2c3c06b143048b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb88947b051680cac11dbf7d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 12:00:36 2016 +0200 msvcp140: Add _Execute_once implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/misc.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index cc2e338..a43950f 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1145,9 +1145,9 @@ @ cdecl -arch=arm ?_Empty@?$_Yarn(a)_W@std@@QBA_NXZ(ptr) _Yarn_wchar__Empty @ thiscall -arch=i386 ?_Empty@?$_Yarn(a)_W@std@@QBE_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty -@ stub -arch=arm ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6AHPAX1PAPAX(a)Z1@Z -@ stub -arch=i386 ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z -@ stub -arch=win64 ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z +@ cdecl -arch=arm ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6AHPAX1PAPAX(a)Z1@Z(ptr ptr ptr) _Execute_once +@ cdecl -arch=i386 ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z(ptr ptr ptr) _Execute_once +@ cdecl -arch=win64 ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z(ptr ptr ptr) _Execute_once @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 4b3d506..41f2eeb 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1162,6 +1162,13 @@ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access); } +/* ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ +/* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ +BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) +{ + return InitOnceExecuteOnce(flag, func, param, NULL); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Alexandre Julliard : user32: Retrieve available clipboard formats from the server.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: c69b4995c5bed5189a0742ed795a7af778b56a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69b4995c5bed5189a0742ed7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 13:55:09 2016 +0900 user32: Retrieve available clipboard formats from the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 61 ++++++++++++++++++++++++++---------------- dlls/user32/tests/clipboard.c | 3 +-- include/wine/server_protocol.h | 37 ++++++++++++++++++++++++- server/clipboard.c | 55 +++++++++++++++++++++++++++++++++++++ server/protocol.def | 17 ++++++++++++ server/request.h | 12 +++++++++ server/trace.c | 27 +++++++++++++++++++ 7 files changed, 186 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c69b4995c5bed5189a074…

1 0

Piotr Caban : msvcp140: Add _Cnd_init_in_situ implementation.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 61e6e8baa01dd44fa46744a8bc2b226474ce487a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e6e8baa01dd44fa46744a8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 16:28:21 2016 +0200 msvcp140: Add _Cnd_init_in_situ implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5980081..cc2e338 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3626,7 +3626,7 @@ @ stub _Cnd_destroy_in_situ @ stub _Cnd_do_broadcast_at_thread_exit @ cdecl _Cnd_init(ptr) _Cnd_init -@ stub _Cnd_init_in_situ +@ cdecl _Cnd_init_in_situ(ptr) @ stub _Cnd_register_at_thread_exit @ cdecl _Cnd_signal(ptr) _Cnd_signal @ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 96339e2..4b3d506 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -584,10 +584,9 @@ typedef _Cnd_t *_Cnd_arg_t; static HANDLE keyed_event; -int __cdecl _Cnd_init(_Cnd_t *cnd) +void __cdecl _Cnd_init_in_situ(_Cnd_t cnd) { - *cnd = MSVCRT_operator_new(sizeof(**cnd)); - InitializeConditionVariable(&(*cnd)->cv); + InitializeConditionVariable(&cnd->cv); if(!keyed_event) { HANDLE event; @@ -596,7 +595,12 @@ int __cdecl _Cnd_init(_Cnd_t *cnd) if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) NtClose(event); } +} +int __cdecl _Cnd_init(_Cnd_t *cnd) +{ + *cnd = MSVCRT_operator_new(sizeof(**cnd)); + _Cnd_init_in_situ(*cnd); return 0; }

1 0

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

Sept. 23, 2016

Module: wine Branch: master Commit: f41466261d301934f3634e645338eabe22f5316a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41466261d301934f3634e645… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 16:08:34 2016 +0200 msvcp140: Add codecvt<char,char,_Mbstatet> exports. 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 | 92 ++++++++++++++++++------------------- dlls/msvcp90/locale.c | 15 +++++- 5 files changed, 68 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f41466261d301934f3634…

1 0

Akihiro Sagawa : kernel32: Refactor the codepath and a variable usage.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: 659e161d7e32eaec215622db99c7c238d8f1bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659e161d7e32eaec215622db9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 23 00:06:16 2016 +0900 kernel32: Refactor the codepath and a variable usage. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 422d63f..97a22ba 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3135,6 +3135,7 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lparam) { LPWSTR dst_ptr; + INT len; if (version) FIXME("unsupported version structure %p\n", version); if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); @@ -3205,8 +3206,6 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW if (!dst) /* return required string length */ { - INT len; - if (flags & NORM_IGNORESYMBOLS) { for (len = 0; srclen; src++, srclen--) @@ -3226,39 +3225,50 @@ INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPW return len; } + if (src == dst && (flags & ~(LCMAP_LOWERCASE | LCMAP_UPPERCASE))) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if (flags & (NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS)) + { + for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--) + { + WCHAR wch = *src; + if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) + continue; + *dst_ptr++ = wch; + len--; + } + goto done; + } + if (flags & LCMAP_UPPERCASE) { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) + for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--) { *dst_ptr++ = toupperW(*src); - dstlen--; + len--; } } else if (flags & LCMAP_LOWERCASE) { - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) + for (len = dstlen, dst_ptr = dst; srclen && len; src++, srclen--) { *dst_ptr++ = tolowerW(*src); - dstlen--; + len--; } } else { - if (src == dst) - { - SetLastError(ERROR_INVALID_FLAGS); - return 0; - } - for (dst_ptr = dst; srclen && dstlen; src++, srclen--) - { - WCHAR wch = *src; - if ((flags & NORM_IGNORESYMBOLS) && (get_char_typeW(wch) & (C1_PUNCT | C1_SPACE))) - continue; - *dst_ptr++ = wch; - dstlen--; - } + len = min(srclen, dstlen); + memcpy(dst, src, len * sizeof(WCHAR)); + dst_ptr = dst + len; + srclen -= len; } +done: if (srclen) { SetLastError(ERROR_INSUFFICIENT_BUFFER);

1 0

Matteo Bruni : wined3d: Update the Mesa d3d level detection hack.
by Alexandre Julliard Sept. 23, 2016

Sept. 23, 2016

Module: wine Branch: master Commit: ae2aa2df59966e0aeb05980064b6392a8d1f18c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2aa2df59966e0aeb0598006… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 22 20:39:38 2016 +0200 wined3d: Update the Mesa d3d level detection hack. 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 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6b019b6..a9a2922 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1737,16 +1737,13 @@ static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shad if (shader_caps->vs_version >= 5) return WINED3D_D3D_LEVEL_11; if (shader_caps->vs_version == 4) - { - /* No backed supports SM 5 at the moment */ - if (glsl_version >= MAKEDWORD_VERSION(4, 00)) - return WINED3D_D3D_LEVEL_11; return WINED3D_D3D_LEVEL_10; - } if (shader_caps->vs_version == 3) { - /* Wine cannot use SM 4 on mesa drivers as the necessary functionality - * is not exposed on compatibility contexts */ + /* wined3d with default settings at the moment doesn't expose SM4+ on + * Mesa drivers. */ + if (glsl_version >= MAKEDWORD_VERSION(4, 30)) + return WINED3D_D3D_LEVEL_11; if (glsl_version >= MAKEDWORD_VERSION(1, 30)) return WINED3D_D3D_LEVEL_10; return WINED3D_D3D_LEVEL_9_SM3;

1 0