November 2017 - Wine-Commits

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

Nov. 27, 2017

Module: wine Branch: master Commit: 7ca2a1ade5acbe36854049cc713abf5821d8bffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca2a1ade5acbe36854049cc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:48:19 2017 +0100 winedevice: Use the magic format string prefix for relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 44aa1a0..397676d 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -263,15 +263,13 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); - if (WINE_TRACE_ON(relay)) - WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), - driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer) ); + TRACE_(relay)( "\1Call driver init %p (obj=%p,str=%s)\n", + driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer) ); status = driver_object->DriverInit( driver_object, keyname ); - if (WINE_TRACE_ON(relay)) - WINE_DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), - driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); + TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n", + driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); @@ -303,15 +301,11 @@ static void WINAPI async_unload_driver( PTP_CALLBACK_INSTANCE instance, void *co DRIVER_OBJECT *driver_obj = driver->driver_obj; LDR_MODULE *ldr; - if (WINE_TRACE_ON(relay)) - WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), - driver_obj->DriverUnload, driver_obj ); + TRACE_(relay)( "\1Call driver unload %p (obj=%p)\n", driver_obj->DriverUnload, driver_obj ); driver_obj->DriverUnload( driver_obj ); - if (WINE_TRACE_ON(relay)) - WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), - driver_obj->DriverUnload, driver_obj ); + TRACE_(relay)( "\1Ret driver unload %p (obj=%p)\n", driver_obj->DriverUnload, driver_obj ); ldr = driver_obj->DriverSection; FreeLibrary( ldr->BaseAddress );

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_StopIfGoingOnBatteries.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: fdb2eedd9e5674ee38743b169352eeffecc073d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb2eedd9e5674ee38743b169… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 27 10:41:22 2017 +0100 taskschd: Implement ITaskSettings_put_StopIfGoingOnBatteries. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 12b2cb5..e417c05 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -999,8 +999,13 @@ static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *ifa static HRESULT WINAPI TaskSettings_put_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL stop) { - FIXME("%p,%d: stub\n", iface, stop); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, stop); + + taskset->stop_if_going_on_batteries = stop ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL *disallow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 906d033..e2f85b1 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1111,6 +1111,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1120,9 +1123,6 @@ todo_wine return; } - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Ziqing Hui : mlang: Implement IMLangFontLink2_MapFont, IMLangFontLink2_ReleaseFont and IMLangFontLink2_ResetFont.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 98d35d97c7ed00474a54e2a5c264d7d3f2032520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d35d97c7ed00474a54e2a5c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Nov 27 19:46:36 2017 +0800 mlang: Implement IMLangFontLink2_MapFont, IMLangFontLink2_ReleaseFont and IMLangFontLink2_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 | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 7 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 47f9d98..7de6cc7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -40,6 +40,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mlang); @@ -525,6 +526,24 @@ static const struct mlang_data "Courier","Arial" } /* FIXME */ }; +struct font_list +{ + struct list list_entry; + HFONT base_font; + HFONT font; + UINT charset; +}; + +static struct list font_cache = LIST_INIT(font_cache); +static CRITICAL_SECTION font_cache_critical; +static CRITICAL_SECTION_DEBUG font_cache_critical_debug = +{ + 0, 0, &font_cache_critical, + { &font_cache_critical_debug.ProcessLocksList, &font_cache_critical_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": font_cache_critical") } +}; +static CRITICAL_SECTION font_cache_critical = { &font_cache_critical_debug, -1, 0, 0, 0, 0 }; + static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINFO *mime_cp_info); static LONG dll_count; @@ -1312,6 +1331,119 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) return Rfc1766ToLcidW(lcid, rfc1766W); } +static HRESULT map_font(HDC hdc, DWORD codepages, HFONT src_font, HFONT *dst_font) +{ + struct font_list *font_list_entry; + CHARSETINFO charset_info; + HFONT new_font, old_font; + LOGFONTW font_attr; + DWORD mask, Csb[2]; + BOOL found_cached; + UINT charset; + BOOL ret; + UINT i; + + if (hdc == NULL || src_font == NULL) return E_FAIL; + + for (i = 0; i < 32; i++) + { + mask = (DWORD)(1 << i); + if (codepages & mask) + { + Csb[0] = mask; + Csb[1] = 0x0; + ret = TranslateCharsetInfo(Csb, &charset_info, TCI_SRCFONTSIG); + if (!ret) continue; + + /* use cached font if possible */ + found_cached = FALSE; + EnterCriticalSection(&font_cache_critical); + LIST_FOR_EACH_ENTRY(font_list_entry, &font_cache, struct font_list, list_entry) + { + if (font_list_entry->charset == charset_info.ciCharset && + font_list_entry->base_font == src_font) + { + if (dst_font != NULL) + *dst_font = font_list_entry->font; + found_cached = TRUE; + } + } + LeaveCriticalSection(&font_cache_critical); + if (found_cached) return S_OK; + + GetObjectW(src_font, sizeof(font_attr), &font_attr); + font_attr.lfCharSet = (BYTE)charset_info.ciCharset; + font_attr.lfWidth = 0; + font_attr.lfFaceName[0] = 0; + new_font = CreateFontIndirectW(&font_attr); + if (new_font == NULL) continue; + + old_font = SelectObject(hdc, new_font); + charset = GetTextCharset(hdc); + SelectObject(hdc, old_font); + if (charset == charset_info.ciCharset) + { + font_list_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_list_entry)); + if (font_list_entry == NULL) return E_OUTOFMEMORY; + + font_list_entry->base_font = src_font; + font_list_entry->font = new_font; + font_list_entry->charset = charset; + + EnterCriticalSection(&font_cache_critical); + list_add_tail(&font_cache, &font_list_entry->list_entry); + LeaveCriticalSection(&font_cache_critical); + + if (dst_font != NULL) + *dst_font = new_font; + return S_OK; + } + } + } + + return E_FAIL; +} + +static HRESULT release_font(HFONT font) +{ + struct font_list *font_list_entry; + HRESULT hr; + + hr = E_FAIL; + EnterCriticalSection(&font_cache_critical); + LIST_FOR_EACH_ENTRY(font_list_entry, &font_cache, struct font_list, list_entry) + { + if (font_list_entry->font == font) + { + list_remove(&font_list_entry->list_entry); + DeleteObject(font); + HeapFree(GetProcessHeap(), 0, font_list_entry); + hr = S_OK; + break; + } + } + LeaveCriticalSection(&font_cache_critical); + + return hr; +} + +static HRESULT clear_font_cache(void) +{ + struct font_list *font_list_entry; + struct font_list *font_list_entry2; + + EnterCriticalSection(&font_cache_critical); + LIST_FOR_EACH_ENTRY_SAFE(font_list_entry, font_list_entry2, &font_cache, struct font_list, list_entry) + { + list_remove(&font_list_entry->list_entry); + DeleteObject(font_list_entry->font); + HeapFree(GetProcessHeap(), 0, font_list_entry); + } + LeaveCriticalSection(&font_cache_critical); + + return S_OK; +} + /****************************************************************************** * MLANG ClassFactory */ @@ -2499,7 +2631,7 @@ static ULONG WINAPI fnIMultiLanguage3_Release( IMultiLanguage3* iface ) TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, This); UnlockModule(); } @@ -3351,21 +3483,38 @@ static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface, static HRESULT WINAPI fnIMLangFontLink2_ReleaseFont(IMLangFontLink2* This, HFONT hFont) { - FIXME("(%p)->%p\n",This, hFont); - return E_NOTIMPL; + TRACE("(%p)->%p\n",This, hFont); + + return release_font(hFont); } static HRESULT WINAPI fnIMLangFontLink2_ResetFontMapping(IMLangFontLink2* This) { - FIXME("(%p)->\n",This); - return E_NOTIMPL; + TRACE("(%p)\n",This); + + return clear_font_cache(); } static HRESULT WINAPI fnIMLangFontLink2_MapFont(IMLangFontLink2* This, HDC hDC, DWORD dwCodePages, WCHAR chSrc, HFONT *pFont) { - FIXME("(%p)->%p %i %s %p\n",This, hDC, dwCodePages, debugstr_wn(&chSrc,1), pFont); - return E_NOTIMPL; + HFONT old_font; + + TRACE("(%p)->%p %08x %04x %p\n",This, hDC, dwCodePages, chSrc, pFont); + + if (!hDC) return E_FAIL; + + if (dwCodePages != 0) + { + old_font = GetCurrentObject(hDC, OBJ_FONT); + return map_font(hDC, dwCodePages, old_font, pFont); + } + else + { + if (pFont == NULL) return E_INVALIDARG; + FIXME("the situation where dwCodepages is set to zero is not implemented\n"); + return E_FAIL; + } } static HRESULT WINAPI fnIMLangFontLink2_GetFontUnicodeRanges(IMLangFontLink2* This,

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_RestartCount.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 01f6313659b44f08d3dbd62b454d625092edc9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=01f6313659b44f08d3dbd62b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 27 10:41:20 2017 +0100 taskschd: Implement ITaskSettings_put_RestartCount. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e184ca8..683a20c 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -951,8 +951,13 @@ static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *c static HRESULT WINAPI TaskSettings_put_RestartCount(ITaskSettings *iface, INT count) { - FIXME("%p,%d: stub\n", iface, count); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, count); + + taskset->restart_count = count; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY *policy) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 0e1c2eb..eac1734 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1105,6 +1105,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RestartCount(set, test->restart_count); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_MultipleInstances(set, test->policy); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1114,9 +1117,6 @@ todo_wine return; } - hr = ITaskSettings_put_MultipleInstances(set, test->policy); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_RestartInterval.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 059382a3d3b32d449aa7559088e73cd6855bc2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059382a3d3b32d449aa755908… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 27 10:41:19 2017 +0100 taskschd: Implement ITaskSettings_put_RestartInterval. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index cca5414..e184ca8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -924,8 +924,16 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BSTR interval) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + BSTR str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(interval)); - return E_NOTIMPL; + + if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; + SysFreeString(taskset->restart_interval); + taskset->restart_interval = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_RestartCount(ITaskSettings *iface, INT *count) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 65287b3..0e1c2eb 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1102,6 +1102,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_RestartInterval(set, NULL); else hr = ITaskSettings_put_RestartInterval(set, test->restart_interval); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RestartCount(set, test->restart_count); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1111,9 +1114,6 @@ todo_wine return; } - hr = ITaskSettings_put_RestartCount(set, test->restart_count); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_MultipleInstances(set, test->policy); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Gerald Pfeifer : advapi32: Include <stdarg.h> since winbase.h expects va_list.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 8b8b6d545dd4b8665d3d66661f7631472a827a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8b6d545dd4b8665d3d66661… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 25 15:43:13 2017 +0100 advapi32: Include <stdarg.h> since winbase.h expects va_list. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/perf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c index 754af2a..6712eae 100644 --- a/dlls/advapi32/perf.c +++ b/dlls/advapi32/perf.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> #include <stdio.h> #include "windef.h"

1 0

Fabian Maurer : ucrtbase/tests: Properly use quotes.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: a004e31ff0b55d60f2acdb05177a12ccb99ade88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a004e31ff0b55d60f2acdb051… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 12:49:36 2017 +0100 ucrtbase/tests: Properly use quotes. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 96de238..ab86f46 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -36,7 +36,7 @@ #define CHECK_EXPECT2(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ called_ ## func = TRUE; \ }while(0) @@ -48,7 +48,7 @@ #define CHECK_CALLED(func) \ do { \ - ok(called_ ## func, "expected " #func "\n"); \ + ok(called_ ## func, "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE; \ }while(0)

1 0

Alexandre Julliard : user.exe: Don' t use the relay channel for normal traces.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 55fd7667d3d7341512026424ab9454fd603ee64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fd7667d3d7341512026424a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:51:30 2017 +0100 user.exe: Don't use the relay channel for normal traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/bidi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c index 2b4f114..d9a320f 100644 --- a/dlls/user.exe16/bidi.c +++ b/dlls/user.exe16/bidi.c @@ -28,7 +28,7 @@ #include "winerror.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(relay); +WINE_DEFAULT_DEBUG_CHANNEL(user); /*********************************************************************** * ChangeDialogTemplate (USER.905)

1 0

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

Nov. 27, 2017

Module: wine Branch: master Commit: 5f0a669185790799908b5f1302aa82bec8fe2e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0a669185790799908b5f130… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:47:36 2017 +0100 kernel32: Use the magic format string prefix for relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f9e3f7e..26d2dd9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1112,9 +1112,8 @@ static DWORD WINAPI start_process( LPTHREAD_START_ROUTINE entry ) ExitThread( 1 ); } - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); + TRACE_(relay)( "\1Starting process %s (entryproc=%p)\n", + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); if (!CheckRemoteDebuggerPresent( GetCurrentProcess(), &being_debugged )) being_debugged = FALSE;

1 0

Ziqing Hui : mlang/tests: Add MapFont tests.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: a7ba4565878913b4497c5082b730c3ae34a9947c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ba4565878913b4497c5082b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Nov 27 19:47:43 2017 +0800 mlang/tests: Add MapFont tests. 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/tests/Makefile.in | 2 +- dlls/mlang/tests/mlang.c | 99 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/Makefile.in b/dlls/mlang/tests/Makefile.in index be7dbd3..21ec4b2 100644 --- a/dlls/mlang/tests/Makefile.in +++ b/dlls/mlang/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mlang.dll -IMPORTS = mlang oleaut32 ole32 gdi32 +IMPORTS = mlang oleaut32 ole32 user32 gdi32 C_SRCS = \ mlang.c diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 141af39..30c127b 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -2411,6 +2411,101 @@ static void test_GetCodePageInfo(IMultiLanguage2 *iML2) } } +static void test_MapFont(IMLangFontLink *font_link, IMLangFontLink2 *font_link2) +{ + HFONT old_font = NULL; + HFONT new_font = NULL; + HFONT last_font = NULL; + HFONT font1 = NULL; + HFONT font2 = NULL; + DWORD codepages; + DWORD font_codepages; + HRESULT ret; + HDC hdc; + WCHAR ch; + + hdc = GetDC(NULL); + codepages = FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC | FS_GREEK | FS_TURKISH | + FS_HEBREW | FS_ARABIC | FS_BALTIC | FS_VIETNAMESE | FS_THAI | + FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD; + old_font = GetCurrentObject(hdc, OBJ_FONT); + ch = 0xfeed; + + /* Tests for IMLangFontLink */ + + ret = IMLangFontLink_ResetFontMapping(font_link); + ok(ret == S_OK, "IMLangFontLink_ResetFontMapping: expected S_OK, got %08x\n", ret); + + ret = IMLangFontLink_MapFont(font_link, NULL, 0, NULL, NULL); + ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08x\n", ret); + ret = IMLangFontLink_MapFont(font_link, NULL, codepages, old_font, &new_font); + ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08x\n", ret); + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, NULL, &new_font); + ok(ret == E_FAIL, "IMLangFontLink_MapFont: expected E_FAIL, got %08x\n", ret); + + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, NULL); + ok(ret == S_OK, "IMLangFontLink_MapFont: expected S_OK, got %08x\n", ret); + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &new_font); + ok(ret == S_OK && new_font != NULL, "IMLangFontLink_MapFont: expected S_OK/!NULL, got %08x/%p\n", ret, new_font); + last_font = new_font; + ret = IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &new_font); + ok(ret == S_OK && new_font == last_font, "IMLangFontLink_MapFont: expected S_OK/%p, got %08x/%p\n", last_font, ret, new_font); + + ret = IMLangFontLink_ReleaseFont(font_link, NULL); + ok(ret == E_FAIL, "IMLangFontLink_ReleaseFont: expected E_FAIL, got %08x\n", ret); + ret = IMLangFontLink_ReleaseFont(font_link, new_font); + ok(ret == S_OK, "IMLangFontLink_ReleaseFont: expected S_OK, got %08x\n", ret); + ret = IMLangFontLink_ResetFontMapping(font_link); + ok(ret == S_OK, "IMLangFontLink_ResetFontMapping: expected S_OK, got %08x\n", ret); + + /* Tests for IMLangFontLink2 */ + + ret = IMLangFontLink2_ResetFontMapping(font_link2); + ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); + + ret = IMLangFontLink2_MapFont(font_link2, NULL, 0, 0, NULL); + ok(ret == E_FAIL, "IMLangFontLink2_MapFont: expected E_FAIL, got %08x\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, NULL, codepages, ch, &new_font); + ok(ret == E_FAIL, "IMLangFontLink2_MapFont: expected E_FAIL, got %08x\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, 0, 0, NULL); + ok(ret == E_INVALIDARG, "IMLangFontLink2_MapFont: expected E_INVALIDARG, got %08x\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, 0, ch, NULL); + ok(ret == E_INVALIDARG, "IMLangFontLink2_MapFont: expected E_INVALIDARG, got %08x\n", ret); + + ret = IMLangFontLink2_MapFont(font_link2, hdc, 0, ch, &new_font); + todo_wine + ok(ret == S_OK || broken(ret == E_FAIL), /* got E_FAIL on winxp and win2k */ + "IMLangFontLink2_MapFont: expected S_OK || E_FAIL, got %08x\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, NULL); + ok(ret == S_OK, "IMLangFontLink2_MapFont: expected S_OK, got %08x\n", ret); + ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &new_font); + ok(ret == S_OK && new_font != NULL, "IMLangFontLink2_MapFont: expected S_OK/!NULL, got %08x/%p\n", ret, new_font); + last_font = new_font; + ret = IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &new_font); + ok(ret == S_OK && new_font == last_font, "IMLangFontLink2_MapFont: expected S_OK/%p, got %08x/%p\n", last_font, ret, new_font); + + ret = IMLangFontLink2_ReleaseFont(font_link2, NULL); + ok(ret == E_FAIL, "IMLangFontLink2_ReleaseFont: expected E_FAIL, got %08x\n", ret); + ret = IMLangFontLink2_ReleaseFont(font_link2, new_font); + ok(ret == S_OK, "IMLangFontLink2_ReleaseFont: expected S_OK, got %08x\n", ret); + ret = IMLangFontLink2_ResetFontMapping(font_link2); + ok(ret == S_OK, "IMLangFontLink2_ResetFontMapping: expected S_OK, got %08x\n", ret); + + /* Show that the font cache is global */ + IMLangFontLink_MapFont(font_link, hdc, codepages, old_font, &font1); + IMLangFontLink2_MapFont(font_link2, hdc, codepages, 0, &font2); + ok(font1 != NULL && font2 != NULL, "expected !NULL/!NULL, got %p/%p", font1, font2); + ok(font1 == font2, "expected equal, got not equal"); + + IMLangFontLink_GetFontCodePages(font_link, hdc, font1, &font_codepages); + ok((codepages & (~font_codepages)) != 0 && (codepages & font_codepages) != 0, + "code pages of font is incorrect"); + + IMLangFontLink_ResetFontMapping(font_link); + IMLangFontLink2_ResetFontMapping(font_link2); + ReleaseDC(NULL, hdc); +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -2487,7 +2582,6 @@ START_TEST(mlang) if (ret != S_OK || !iMLFL) return; IMLangFontLink_Test(iMLFL); - IMLangFontLink_Release(iMLFL); /* IMLangFontLink2 */ ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, @@ -2497,6 +2591,9 @@ START_TEST(mlang) test_GetScriptFontInfo(iMLFL2); test_GetFontUnicodeRanges(iMLFL2); test_CodePageToScriptID(iMLFL2); + test_MapFont(iMLFL, iMLFL2); + + IMLangFontLink_Release(iMLFL); IMLangFontLink2_Release(iMLFL2); trace("IMultiLanguage3\n");

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_MultipleInstances.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 0ae50c22d64b180ea3b7d2487b63902cdfdd10a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae50c22d64b180ea3b7d2487… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 27 10:41:21 2017 +0100 taskschd: Implement ITaskSettings_put_MultipleInstances. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 683a20c..12b2cb5 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -975,8 +975,13 @@ static HRESULT WINAPI TaskSettings_get_MultipleInstances(ITaskSettings *iface, T static HRESULT WINAPI TaskSettings_put_MultipleInstances(ITaskSettings *iface, TASK_INSTANCES_POLICY policy) { - FIXME("%p,%d: stub\n", iface, policy); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, policy); + + taskset->policy = policy; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StopIfGoingOnBatteries(ITaskSettings *iface, VARIANT_BOOL *stop) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index eac1734..906d033 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1108,6 +1108,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_MultipleInstances(set, test->policy); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1117,9 +1120,6 @@ todo_wine return; } - hr = ITaskSettings_put_StopIfGoingOnBatteries(set, test->stop_if_going_on_batteries); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Ken Thomases : winemac: Fix test for simple non-restrictive window region optimization.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: b019c918ebcd986056963ce07549b28f45b1aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b019c918ebcd986056963ce07… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Nov 26 17:48:55 2017 -0600 winemac: Fix test for simple non-restrictive window region optimization. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 2e24405..e49a445 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -402,7 +402,8 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) window, it's the same as there being no region. It's potentially hard/slow to test this for arbitrary regions, so we just check for very simple regions. */ - if (count == 1 && CGRectContainsRect(rects[0], cgrect_from_rect(data->whole_rect))) + if (count == 1 && CGRectContainsRect(rects[0], + CGRectOffset(cgrect_from_rect(data->whole_rect), -data->whole_rect.left, -data->whole_rect.top))) { TRACE("optimizing for simple region that contains Cocoa content rect\n"); rects = NULL;

1 0

Alexandre Julliard : ntdll: Fix stack alignment in relay calls on ARM.
by Alexandre Julliard Nov. 27, 2017

Nov. 27, 2017

Module: wine Branch: master Commit: 74b50e27e184d8b08998ae2c565ca642a2bfe5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b50e27e184d8b08998ae2c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 27 16:15:05 2017 +0100 ntdll: Fix stack alignment in relay calls on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index c50d23d..b4dc884 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -469,30 +469,21 @@ __ASM_GLOBAL_FUNC( call_entry_point, "mov r4, r0\n\t" "mov r5, SP\n\t" "lsl r3, r1, #2\n\t" - "cmp r3, #0\n\t" - "beq 5f\n\t" "sub SP, SP, r3\n\t" - "tst r1, #1\n\t" - "subeq SP, SP, #4\n\t" + "and SP, SP, #~7\n" "1:\tsub r3, r3, #4\n\t" "ldr r0, [r2, r3]\n\t" "str r0, [SP, r3]\n\t" "cmp r3, #0\n\t" "bgt 1b\n\t" - "cmp r1, #1\n\t" + "cmp r1, #0\n\t" + "beq 3f\n\t" + "cmp r1, #2\n\t" "bgt 2f\n\t" - "pop {r0}\n\t" - "b 5f\n\t" - "2:\tcmp r1, #2\n\t" - "bgt 3f\n\t" "pop {r0-r1}\n\t" - "b 5f\n\t" - "3:\tcmp r1, #3\n\t" - "bgt 4f\n\t" - "pop {r0-r2}\n\t" - "b 5f\n\t" - "4:\tpop {r0-r3}\n\t" - "5:\tblx r4\n\t" + "b 3f\n" + "2:\tpop {r0-r3}\n" + "3:\tblx r4\n\t" "mov SP, r5\n\t" "pop {r4, r5, PC}" )

1 0

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

Nov. 27, 2017

Module: wine Branch: master Commit: cd1f412d3a62d5c529ddb46865de702a948cdaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd1f412d3a62d5c529ddb4686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:48:11 2017 +0100 ntoskrnl: Use the magic format string prefix for relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6347eb0..4342902 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1295,15 +1295,12 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) irpsp = --irp->Tail.Overlay.s.u2.CurrentStackLocation; dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction]; - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call driver dispatch %p (device=%p,irp=%p)\n", - GetCurrentThreadId(), dispatch, device, irp ); + TRACE_(relay)( "\1Call driver dispatch %p (device=%p,irp=%p)\n", dispatch, device, irp ); status = dispatch( device, irp ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n", - GetCurrentThreadId(), dispatch, device, irp, status ); + TRACE_(relay)( "\1Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n", + dispatch, device, irp, status ); return status; }

1 0

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

Nov. 27, 2017

Module: wine Branch: master Commit: 01676c5dd6f9fb61b9c4e52595f6e75e21050009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01676c5dd6f9fb61b9c4e5259… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:48:02 2017 +0100 user32: Use the magic format string prefix for relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 6 ++++-- dlls/user32/hook.c | 22 +++++++++------------- dlls/user32/message.c | 28 ++++++++++------------------ dlls/user32/winproc.c | 20 ++++++++------------ 4 files changed, 31 insertions(+), 45 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c93d3c3..c8903e2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -342,9 +342,10 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count { EDITWORDBREAKPROCW wbpW = (EDITWORDBREAKPROCW)es->word_break_proc; - TRACE_(relay)("(UNICODE wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", + TRACE_(relay)("\1Call wordbreakW %p (str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_wn(es->text + start, count), index, count, action); ret = wbpW(es->text + start, index, count, action); + TRACE_(relay)("\1Ret wordbreakW %p retval=%d\n", es->word_break_proc, ret ); } else { @@ -355,10 +356,11 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); textA = HeapAlloc(GetProcessHeap(), 0, countA); WideCharToMultiByte(CP_ACP, 0, es->text + start, count, textA, countA, NULL, NULL); - TRACE_(relay)("(ANSI wordbrk=%p,str=%s,idx=%d,cnt=%d,act=%d)\n", + TRACE_(relay)("\1Call wordbreakA %p(str=%s,idx=%d,cnt=%d,act=%d)\n", es->word_break_proc, debugstr_an(textA, countA), index, countA, action); ret = wbpA(textA, index, countA, action); HeapFree(GetProcessHeap(), 0, textA); + TRACE_(relay)("\1Ret wordbreakA %p retval=%d\n", es->word_break_proc, ret ); } } else diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f674b2c..3aa7b33 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -338,17 +338,15 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n", - GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam ); + TRACE_(relay)( "\1Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n", + proc, hook_names[id-WH_MINHOOK], code, wparam, lparam ); if (!prev_unicode == !next_unicode) ret = proc( code, wparam, lparam ); else if (prev_unicode) ret = call_hook_WtoA( proc, id, code, wparam, lparam ); else ret = call_hook_AtoW( proc, id, code, wparam, lparam ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx) retval=%08lx\n", - GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret ); + TRACE_(relay)( "\1Ret hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx) retval=%08lx\n", + proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret ); return ret; } @@ -921,17 +919,15 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id if (!info.module[0] || (proc = get_hook_proc( proc, info.module, &free_module )) != NULL) { - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", - GetCurrentThreadId(), proc, info.handle, event, hwnd, object_id, - child_id, GetCurrentThreadId(), GetCurrentTime()); + TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", + proc, info.handle, event, hwnd, object_id, + child_id, GetCurrentThreadId(), GetCurrentTime()); proc( info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", - GetCurrentThreadId(), proc, info.handle, event, hwnd, object_id, + TRACE_(relay)( "\1Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", + proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); if (free_module) FreeLibrary(free_module); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 406eff3..172d659 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2708,15 +2708,11 @@ static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UIN { if (!callback) return; - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", - GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ), - data, result ); + TRACE_(relay)( "\1Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", + callback, hwnd, SPY_GetMsgName( msg, hwnd ), data, result ); callback( hwnd, msg, data, result ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", - GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ), - data, result ); + TRACE_(relay)( "\1Ret message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", + callback, hwnd, SPY_GetMsgName( msg, hwnd ), data, result ); } @@ -2832,21 +2828,17 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags } } - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", - GetCurrentThreadId(), hook_proc, - msg_data->winevent.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, - info.msg.lParam, msg_data->winevent.tid, info.msg.time); + TRACE_(relay)( "\1Call winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", + hook_proc, msg_data->winevent.hook, info.msg.message, info.msg.hwnd, + info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time); hook_proc( wine_server_ptr_handle( msg_data->winevent.hook ), info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", - GetCurrentThreadId(), hook_proc, - msg_data->winevent.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, - info.msg.lParam, msg_data->winevent.tid, info.msg.time); + TRACE_(relay)( "\1Ret winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", + hook_proc, msg_data->winevent.hook, info.msg.message, info.msg.hwnd, + info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time); if (free_module) FreeLibrary(free_module); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 904a350..73bbe95 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -238,15 +238,13 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES USER_CheckNotLock(); hwnd = WIN_GetFullHandle( hwnd ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", - GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); + TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", - GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); + TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", + proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); return *result; } @@ -259,16 +257,14 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES USER_CheckNotLock(); hwnd = WIN_GetFullHandle( hwnd ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", - GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); + TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); ret = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); *result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); - if (TRACE_ON(relay)) - DPRINTF( "%04x:Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n", - GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result ); + TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n", + proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result ); return ret; }

1 0

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