November 2017 - Wine-Commits

Ziqing Hui : mlang: Implement IMLangFontLink_MapFont, IMLangFontLink_ReleaseFont and IMLangFontLink_ResetFont.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: a93c2aea7eec9bbb47f0aa0d7759a65a869973f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93c2aea7eec9bbb47f0aa0d7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Nov 27 19:47:00 2017 +0800 mlang: Implement IMLangFontLink_MapFont, IMLangFontLink_ReleaseFont and IMLangFontLink_ResetFont. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 7de6cc7..aa644e2 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2055,23 +2055,26 @@ static HRESULT WINAPI fnIMLangFontLink_MapFont( HFONT hSrcFont, HFONT* phDestFont) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%p)->%p %08x %p %p\n",iface, hDC, dwCodePages, hSrcFont, phDestFont); + + return map_font(hDC, dwCodePages, hSrcFont, phDestFont); } static HRESULT WINAPI fnIMLangFontLink_ReleaseFont( IMLangFontLink* iface, HFONT hFont) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%p)->%p\n",iface, hFont); + + return release_font(hFont); } static HRESULT WINAPI fnIMLangFontLink_ResetFontMapping( IMLangFontLink* iface) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%p)\n",iface); + + return clear_font_cache(); }

1 0

Alexandre Julliard : ntdll: Print thread id by default in all traces.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: ab9c5625ec9d6d2c7a75a3fd891eb501c7dbd2da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9c5625ec9d6d2c7a75a3fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:42:28 2017 +0100 ntdll: Print thread id by default in all traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index eb43224..eace13f 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -38,7 +38,6 @@ #include "winternl.h" #include "ntdll_misc.h" -WINE_DECLARE_DEBUG_CHANNEL(tid); WINE_DECLARE_DEBUG_CHANNEL(pid); WINE_DECLARE_DEBUG_CHANNEL(timestamp); @@ -173,8 +172,7 @@ static int NTDLL_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_chan } if (TRACE_ON(pid)) ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); - if (TRACE_ON(tid)) - ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); + ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); if (cls < sizeof(classes)/sizeof(classes[0])) ret += wine_dbg_printf( "%s:%s:%s ", classes[cls], channel->name, function ); }

1 0

Alexandre Julliard : libwine: Print thread id by default in all traces.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: ec14c220d2041fec1cf4aa011ec8f83e1823c28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec14c220d2041fec1cf4aa011… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:43:11 2017 +0100 libwine: Print thread id by default in all traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/debug.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 8b04ef9..4116b96 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -34,7 +34,6 @@ #include "wine/library.h" #if defined(__MINGW32__) || defined(_MSC_VER) -WINE_DECLARE_DEBUG_CHANNEL(tid); WINE_DECLARE_DEBUG_CHANNEL(pid); #endif @@ -410,8 +409,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch #if defined(__MINGW32__) || defined(_MSC_VER) if (TRACE_ON(pid)) ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); - if (TRACE_ON(tid)) - ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); + ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func );

1 0

Alexandre Julliard : ntdll: Support magic \1 prefix in debug format for relay traces.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 822e1424034422b1af2f4b32aa46faccc4978df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822e1424034422b1af2f4b32a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:45:20 2017 +0100 ntdll: Support magic \1 prefix in debug format for relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/debugtools.c | 4 ++- dlls/ntdll/loader.c | 56 +++++++++------------------------ dlls/ntdll/relay.c | 82 ++++++++++++++++--------------------------------- dlls/ntdll/thread.c | 3 +- 4 files changed, 45 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=822e1424034422b1af2f4…

1 0

Alexandre Julliard : krnl386: Use the magic format string prefix for relay traces.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 1729cc05afc10bb5b367f89c968cf9f55dfcf59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1729cc05afc10bb5b367f89c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:47:17 2017 +0100 krnl386: Use the magic format string prefix for relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosvm.c | 4 +-- dlls/krnl386.exe16/interrupts.c | 4 +-- dlls/krnl386.exe16/relay.c | 67 +++++++++++++++++++---------------------- dlls/krnl386.exe16/snoop.c | 24 +++++++-------- dlls/krnl386.exe16/wowthunk.c | 46 +++++++++++++--------------- 5 files changed, 67 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1729cc05afc10bb5b367f…

1 0

Alexandre Julliard : Wine release 2.22
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: website Branch: master Commit: 904cc11fbefbf9d968d6c4495f9ccfe43d9495f2 URL: http://source.winehq.org/git/website.git/?a=commit;h=904cc11fbefbf9d968d6c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 21:05:38 2017 +0100 Wine release 2.22 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017112401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017112401.xml b/news/en/2017112401.xml new file mode 100644 index 0000000..7b55cd6 --- /dev/null +++ b/news/en/2017112401.xml @@ -0,0 +1,17 @@ +<news> +<date>November 24, 2017</date> +<title>Wine 2.22 Released</title> +<body> + The Wine development release 2.22 is now available. + <a href="{$root}/announce/2.22">What's new</a> in this release: +<ul> + <li>Source selection dialog for scanners.</li> + <li>Improvements in ARM64 support.</li> + <li>Float audio formats with more than 2 channels in XAudio.</li> + <li>Fixes for DLL injection support.</li> + <li>Input methods improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.22 : Alexandre Julliard : Release 2.22
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: refs/tags/wine-2.22 Tag: 45875d51f5f1ee15c94eadbfacd984e3bc0b912c URL: http://source.winehq.org/git/wine.git/?a=tag;h=45875d51f5f1ee15c94eadbfacd9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 21:02:46 2017 +0100 Release 2.22

1 0

Alexandre Julliard : Release 2.22.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: c570224aa274e2b5b2bbe8562e8e3a5de73bc98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c570224aa274e2b5b2bbe8562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 21:02:46 2017 +0100 Release 2.22. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 468 +++++++++++++++++++++++++++----------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 215 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c570224aa274e2b5b2bbe…

1 0

Nikolay Sivov : msvcrt: Added _get_purecall_handler().
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: b8d294cd7b277893de98721f6b81626d12952fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d294cd7b277893de98721f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 21:17:08 2017 +0300 msvcrt: Added _get_purecall_handler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 2ce5311..5e67f92 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -55,7 +55,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a04bedf..685e11b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -883,7 +883,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a0aebc0..ae86678 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b7c3159..969451f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index cd8554c..8c3d96e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1158,7 +1158,7 @@ @ cdecl _get_output_format() msvcr120._get_output_format @ cdecl _get_pgmptr(ptr) msvcr120._get_pgmptr @ cdecl _get_printf_count_output() msvcr120._get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() msvcr120._get_purecall_handler @ cdecl _get_terminate() msvcr120._get_terminate @ cdecl _get_timezone(ptr) msvcr120._get_timezone @ cdecl _get_tzname(ptr str long long) msvcr120._get_tzname diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d9c29fd..dd80131 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -552,7 +552,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b76a353..4f67f14 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -533,7 +533,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 1d19081..44b29c1 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -475,6 +475,15 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func } /********************************************************************* + * _get_purecall_handler + */ +MSVCRT_purecall_handler CDECL _get_purecall_handler(void) +{ + TRACE("\n"); + return purecall_handler; +} + +/********************************************************************* * _purecall (MSVCRT.@) */ void CDECL _purecall(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a2c16e4..7878acb 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -372,7 +372,7 @@ @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 7dbc8ca..b2d11bc 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -57,7 +57,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof

1 0

Jacek Caban : mshtml: Hook addEventListener InvokeEx calls to allow capture default value.
by Alexandre Julliard Nov. 24, 2017

Nov. 24, 2017

Module: wine Branch: master Commit: d84f6f72ccfcab7969e3503d70f7d4d2c588d6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84f6f72ccfcab7969e3503d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 15:09:13 2017 +0100 mshtml: Hook addEventListener InvokeEx calls to allow capture default value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 33 +++++++++++++++++++++++---------- dlls/mshtml/htmlelem.c | 7 +++++-- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 10 +++++++++- dlls/mshtml/tests/events.js | 13 +++++++------ 5 files changed, 76 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d84f6f72ccfcab7969e35…

1 0