November 2017 - Wine-Commits

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