April 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : ntdll/tests: Add additional tests for instruction pointer in debug service tests.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: e728081da1777895e3b23d1a41a9fb5364aaf707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e728081da1777895e3b23d1a4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 19 03:08:10 2016 +0100 ntdll/tests: Add additional tests for instruction pointer in debug service tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4e878e9114e16cef656f92aa61cb026669077751) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/exception.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2123b6b..ef67986 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -949,6 +949,8 @@ static void test_debugger(void) { ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "expected EXCEPTION_BREAKPOINT, got %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode); + ok((char *)ctx.Eip == (char *)code_mem_address + 0x1d, + "expected Eip = %p, got 0x%x\n", (char *)code_mem_address + 0x1d, ctx.Eip); if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } @@ -1844,6 +1846,8 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) rec->ExceptionCode, EXCEPTION_BREAKPOINT); #ifdef __i386__ + ok(ExceptionInfo->ContextRecord->Eip == (DWORD)code_mem + 0x1c, + "expected Eip = %x, got %x\n", (DWORD)code_mem + 0x1c, ExceptionInfo->ContextRecord->Eip); ok(rec->NumberParameters == (is_wow64 ? 1 : 3), "ExceptionParameters is %d instead of %d\n", rec->NumberParameters, is_wow64 ? 1 : 3); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Eax, @@ -1857,6 +1861,9 @@ static LONG CALLBACK debug_service_handler(EXCEPTION_POINTERS *ExceptionInfo) "got ExceptionInformation[2] = %lx\n", rec->ExceptionInformation[2]); } #else + todo_wine + ok(ExceptionInfo->ContextRecord->Rip == (DWORD_PTR)code_mem + 0x2f, + "expected Rip = %lx, got %lx\n", (DWORD_PTR)code_mem + 0x2f, ExceptionInfo->ContextRecord->Rip); ok(rec->NumberParameters == 1, "ExceptionParameters is %d instead of 1\n", rec->NumberParameters); ok(rec->ExceptionInformation[0] == ExceptionInfo->ContextRecord->Rax,

1 0

Józef Kucia : wined3d: Fix driver version check.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 53370ec5d0d560bc8e998c92616098cb8dfcd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53370ec5d0d560bc8e998c926… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:46 2016 +0100 wined3d: Fix driver version check. The previous check didn't catch older Windows versions for which dwMinorVersion > 2. Spotted by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97c70c86be26e02a398411877d6e6a26367d3ab8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 07ceed6..254102e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1511,8 +1511,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * In order to avoid this application bug we limit the amount of video memory * to LONG_MAX for older Windows versions. */ - if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 - && driver_info->vram_bytes > LONG_MAX) + if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) { TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); driver_info->vram_bytes = LONG_MAX;

1 0

Alexandre Julliard : server: Implement serial port read interval timeouts.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 32a387e9b03c776ef258a16957f02c893b13fb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a387e9b03c776ef258a1695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 23:18:31 2016 -0700 server: Implement serial port read interval timeouts. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc0bf9e505922b81df1c317d6493665bbe946554) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/serial.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/server/serial.c b/server/serial.c index 164a4b1..7beb8ff 100644 --- a/server/serial.c +++ b/server/serial.c @@ -62,12 +62,15 @@ static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial { struct object obj; struct fd *fd; + struct timeout_user *read_timer; + /* timeout values */ unsigned int readinterval; unsigned int readconst; @@ -115,7 +118,7 @@ static const struct fd_ops serial_fd_ops = no_fd_flush, /* flush */ default_fd_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ - default_fd_reselect_async, /* reselect_async */ + serial_reselect_async, /* reselect_async */ default_fd_cancel_async /* cancel_async */ }; @@ -134,6 +137,7 @@ struct object *create_serial( struct fd *fd ) if (!(serial = alloc_object( &serial_ops ))) return NULL; + serial->read_timer = NULL; serial->readinterval = 0; serial->readmult = 0; serial->readconst = 0; @@ -157,6 +161,7 @@ static struct fd *serial_get_fd( struct object *obj ) static void serial_destroy( struct object *obj) { struct serial *serial = (struct serial *)obj; + if (serial->read_timer) remove_timeout_user( serial->read_timer ); release_object( serial->fd ); } @@ -203,6 +208,34 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ } } +static void serial_read_timeout( void *arg ) +{ + struct serial *serial = arg; + + serial->read_timer = NULL; + fd_async_wake_up( serial->fd, ASYNC_TYPE_READ, STATUS_TIMEOUT ); +} + +static void serial_reselect_async( struct fd *fd, struct async_queue *queue ) +{ + struct serial *serial = get_fd_user( fd ); + + if (serial->read_timer) + { + if (!(default_fd_get_poll_events( fd ) & POLLIN)) + { + remove_timeout_user( serial->read_timer ); + serial->read_timer = NULL; + } + } + else if (serial->readinterval && (default_fd_get_poll_events( fd ) & POLLIN)) + { + serial->read_timer = add_timeout_user( (timeout_t)serial->readinterval * -10000, + serial_read_timeout, serial ); + } + default_fd_reselect_async( fd, queue ); +} + DECL_HANDLER(get_serial_info) { struct serial *serial;

1 0

Dmitry Timoshkov : kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 46a2aea3d154e086bd0f8416856c7b847010c197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a2aea3d154e086bd0f84168… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 12 08:52:50 2016 +0100 kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dfbbd55af7e625968473d233671d9aa63ec33f83) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c index 17b5537..7280501 100644 --- a/libs/wine/sortkey.c +++ b/libs/wine/sortkey.c @@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } -static inline int real_length(const WCHAR *str, int len) -{ - while (len && !str[len - 1]) len--; - return len; -} - int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2) { int ret; - len1 = real_length(str1, len1); - len2 = real_length(str2, len2); - ret = compare_unicode_weights(flags, str1, len1, str2, len2); if (!ret) {

1 0

Sebastian Lackner : vmm.vxd: Fix protection flags passed to VirtualAlloc.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 02ec0048a12bac132291fcd78aa38767aa66084b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ec0048a12bac132291fcd78… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 07:10:41 2016 +0100 vmm.vxd: Fix protection flags passed to VirtualAlloc. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7fb74ed9450d75bdb504ba81e1bc28e68ad36421) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vmm.vxd/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 7327f78..833a8d1 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -159,7 +159,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; /* FIXME: Handle flags in some way */ address = (LPVOID )(page * page_size); - ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, 0 ); + ret = VirtualAlloc ( address, npages * page_size, MEM_RESERVE, PAGE_EXECUTE_READWRITE ); TRACE("PageReserve: returning: %p\n", ret ); if ( ret == NULL ) return -1;

1 0

Andrew Eikum : mciqtz: Implement MCI_RESUME.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 7d02fd778133370e6a1b1f8a225d0f62219c6ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d02fd778133370e6a1b1f8a2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:52 2016 -0600 mciqtz: Implement MCI_RESUME. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 924c97fe9070c62652c0b19d71469a07a6dd7a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index d018a54..567792e 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -583,6 +583,29 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP } /*************************************************************************** + * MCIQTZ_mciResume [internal] + */ +static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Run(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot run filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -1078,6 +1101,9 @@ static DWORD CALLBACK MCIQTZ_taskThread(LPVOID arg) case MCI_PAUSE: task->res = MCIQTZ_mciPause(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); break; + case MCI_RESUME: + task->res = MCIQTZ_mciResume(task->devid, task->flags, (LPMCI_GENERIC_PARMS)task->parms); + break; case MCI_GETDEVCAPS: task->res = MCIQTZ_mciGetDevCaps(task->devid, task->flags, (LPMCI_GETDEVCAPS_PARMS)task->parms); break; @@ -1158,6 +1184,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: case MCI_STOP: case MCI_PAUSE: + case MCI_RESUME: return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: @@ -1167,7 +1194,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return MCIQTZ_relayTaskMessage(dwDevID, wMsg, dwParam1, dwParam2); case MCI_PUT: case MCI_RECORD: - case MCI_RESUME: case MCI_INFO: case MCI_LOAD: case MCI_SAVE:

1 0

Christopher Thielen : user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture () is called twice.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: a73afbcb10b32fcdb9733b552c6cc1f334ba96ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73afbcb10b32fcdb9733b552… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:32:51 2016 -0800 user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture() is called twice. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9bb87cc71c95f45cd6111b28b687bd753380a4c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 2 +- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 40e35a9..63fae67 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -108,7 +108,7 @@ BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) { USER_Driver->pSetCapture( hwnd, gui_flags ); - if (previous && previous != hwnd) + if (previous) SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); if (prev_ret) *prev_ret = previous; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b90f8d0..969b1af 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14906,6 +14906,33 @@ else flush_sequence(); } +static const struct message DoubleSetCaptureSeq[] = +{ + { WM_CAPTURECHANGED, sent }, + { 0 } +}; + +static void test_DoubleSetCapture(void) +{ + HWND hwnd; + + hwnd = CreateWindowExA(0, "TestWindowClass", "Test DoubleSetCapture", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + ShowWindow( hwnd, SW_SHOW ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + SetCapture( hwnd ); + SetCapture( hwnd ); + ok_sequence(DoubleSetCaptureSeq, "SetCapture( hwnd ) twice", FALSE); + + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -15045,6 +15072,7 @@ START_TEST(msg) test_layered_window(); test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); + test_DoubleSetCapture(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Christopher Thielen : comctl32: Ensure that trackbar respond only to changes in WM_CAPTURECHANGED handler.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: 12ed4de8c9032ab9246ccd8884c08d79067f1a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ed4de8c9032ab9246ccd888… Author: Christopher Thielen <cthielen(a)gmail.com> Date: Sun Jan 31 20:26:47 2016 -0800 comctl32: Ensure that trackbar respond only to changes in WM_CAPTURECHANGED handler. Signed-off-by: Christopher Thielen <cthielen(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0bea2f73d37481546d19bd9f380d9390c3eb9ddb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/trackbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 87d955c..12c3e9d 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1979,6 +1979,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CAPTURECHANGED: + if (hwnd == (HWND)lParam) return 0; return TRACKBAR_CaptureChanged (infoPtr); case WM_CREATE:

1 0

Kira Backes : user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: cfa2c8702677435798fc67638235f10359a69479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa2c8702677435798fc67638… Author: Kira Backes <kira.backes(a)nrwsoft.de> Date: Wed Feb 3 23:58:17 2016 -0700 user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support. Signed-off-by: Kira Backes <kira.backes(a)nrwsoft.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 94aee7a738751194969b5cf7f055c4f3727fbf1e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/message.c | 20 +++++++++++--------- include/winuser.h | 11 +++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 96e7f2e..3e419ee 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2488,7 +2488,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H INT hittest; EVENTMSG event; GUITHREADINFO info; - MOUSEHOOKSTRUCT hook; + MOUSEHOOKSTRUCTEX hook; BOOL eatMsg; /* find the window to dispatch this mouse message to */ @@ -2584,17 +2584,19 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H /* message is accepted now (but may still get dropped) */ - hook.pt = msg->pt; - hook.hwnd = msg->hwnd; - hook.wHitTestCode = hittest; - hook.dwExtraInfo = extra_info; + hook.s.pt = msg->pt; + hook.s.hwnd = msg->hwnd; + hook.s.wHitTestCode = hittest; + hook.s.dwExtraInfo = extra_info; + hook.mouseData = msg->wParam; if (HOOK_CallHooks( WH_MOUSE, remove ? HC_ACTION : HC_NOREMOVE, message, (LPARAM)&hook, TRUE )) { - hook.pt = msg->pt; - hook.hwnd = msg->hwnd; - hook.wHitTestCode = hittest; - hook.dwExtraInfo = extra_info; + hook.s.pt = msg->pt; + hook.s.hwnd = msg->hwnd; + hook.s.wHitTestCode = hittest; + hook.s.dwExtraInfo = extra_info; + hook.mouseData = msg->wParam; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); accept_hardware_message( hw_id, TRUE ); return FALSE; diff --git a/include/winuser.h b/include/winuser.h index 50821f4..cbd592c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -385,6 +385,17 @@ typedef struct ULONG_PTR dwExtraInfo; } MOUSEHOOKSTRUCT, *PMOUSEHOOKSTRUCT, *LPMOUSEHOOKSTRUCT; +typedef struct +{ + struct { /* MOUSEHOOKSTRUCT */ + POINT pt; + HWND hwnd; + UINT wHitTestCode; + ULONG_PTR dwExtraInfo; + } DUMMYSTRUCTNAME; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX; + /* Hardware hook structure */

1 0

Jacek Caban : ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll.
by Alexandre Julliard April 12, 2016

April 12, 2016

Module: wine Branch: stable Commit: cc21cc3042ad037beed948ed89bd23884dfbf122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc21cc3042ad037beed948ed8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 19:35:01 2016 +0100 ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2d40b1da3b1b50be216a996af42abe24a27929e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/eventlog.c | 64 --------------------------------------------- dlls/ntdll/misc.c | 58 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ 4 files changed, 62 insertions(+), 66 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ff2b0de..0343e13 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -661,8 +661,8 @@ @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW # @ stub RemoveTraceCallback # @ stub RemoveUsersFromEncryptedFile @ stdcall ReportEventA(long long long long ptr long long ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 7839fc4..93c164d 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -742,70 +742,6 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw } /****************************************************************************** - * RegisterTraceGuidsW [ADVAPI32.@] - * - * Register an event trace provider and the event trace classes that it uses - * to generate events. - * - * PARAMS - * RequestAddress [I] ControlCallback function - * RequestContext [I] Optional provider-defined context - * ControlGuid [I] GUID of the registering provider - * GuidCount [I] Number of elements in the TraceGuidReg array - * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures - * MofImagePath [I] not supported, set to NULL - * MofResourceName [I] not supported, set to NULL - * RegistrationHandle [O] Provider's registration handle - * - * RETURNS - * Success: ERROR_SUCCESS - * Failure: System error code - * - * FIXME - * Stub. - */ -ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, - PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, - LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -{ - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, - debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), - debugstr_w(MofResourceName), RegistrationHandle); - - if (TraceGuidReg) - { - ULONG i; - for (i = 0; i < GuidCount; i++) - { - FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); - TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; - } - } - *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * RegisterTraceGuidsA [ADVAPI32.@] - * - * See RegisterTraceGuidsW. - * - * FIXME - * Stub. - */ -ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, - PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, - PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, - LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -{ - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, - debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), - debugstr_a(MofResourceName), RegistrationHandle); - return ERROR_SUCCESS; -} - -/****************************************************************************** * StartTraceW [ADVAPI32.@] * * Register and start an event trace session diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2cfa900..0f6c5df 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "wmistr.h" +#include "evntrace.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -335,3 +337,59 @@ BOOL WINAPI WinSqmIsOptedIn(void) FIXME("() stub\n"); return FALSE; } + +/****************************************************************************** + * EtwRegisterTraceGuidsW (NTDLL.@) + * + * Register an event trace provider and the event trace classes that it uses + * to generate events. + * + * PARAMS + * RequestAddress [I] ControlCallback function + * RequestContext [I] Optional provider-defined context + * ControlGuid [I] GUID of the registering provider + * GuidCount [I] Number of elements in the TraceGuidReg array + * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures + * MofImagePath [I] not supported, set to NULL + * MofResourceName [I] not supported, set to NULL + * RegistrationHandle [O] Provider's registration handle + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: System error code + */ +ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, + void *RequestContext, const GUID *ControlGuid, ULONG GuidCount, + TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath, + const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle ) +{ + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), + debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EtwRegisterTraceGuidsA (NTDLL.@) + */ +ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, + void *RequestContext, const GUID *ControlGuid, ULONG GuidCount, + TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath, + const char *MofResourceName, TRACEHANDLE *RegistrationHandle ) +{ + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), + debugstr_a(MofResourceName), RegistrationHandle); + return ERROR_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5db37d4..524b5d0 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -41,6 +41,8 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() +@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) +@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall

1 0