wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Alexandre Julliard : winex11: Don't disallow replacing unowned formats.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 99d5b75c7d943270e93c5362ba1ecce0d99e20ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d5b75c7d943270e93c5362b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 17:59:36 2016 +0900 winex11: Don't disallow replacing unowned formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 1 - dlls/winex11.drv/clipboard.c | 21 ++------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index ddd8d1a..549a625 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -93,7 +93,6 @@ static void set_clipboard_data_process( int arg ) todo_wine_if( arg == 1 || arg == 3 ) ok( IsClipboardFormatAvailable( CF_WAVE ), "process %u: CF_WAVE not available\n", arg ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - todo_wine_if( arg == 2 || arg == 4 ) ok( ret != 0, "process %u: SetClipboardData failed err %u\n", arg, GetLastError() ); } else diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index b7c89cb..af8fa37 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3013,26 +3013,9 @@ void CDECL X11DRV_EmptyClipboard(void) */ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) { - DWORD flags = 0; - BOOL bResult = TRUE; + if (!owner) X11DRV_CLIPBOARD_UpdateCache(); - /* If it's not owned, data can only be set if the format data is not already owned */ - if (!owner) - { - LPWINE_CLIPDATA lpRender; - - X11DRV_CLIPBOARD_UpdateCache(); - - if (((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && - !(lpRender->wFlags & CF_FLAG_UNOWNED))) - bResult = FALSE; - else - flags = CF_FLAG_UNOWNED; - } - - bResult &= X11DRV_CLIPBOARD_InsertClipboardData(wFormat, hData, flags, NULL, TRUE); - - return bResult; + return X11DRV_CLIPBOARD_InsertClipboardData(wFormat, hData, 0, NULL, TRUE); }

1 0

Alexandre Julliard : user32: Don' t disallow delayed rendering even when not the clipboard owner.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: d9df977006bceb883ccd68afb9b57a0da3ae4112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9df977006bceb883ccd68afb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 17:57:50 2016 +0900 user32: Don't disallow delayed rendering even when not the clipboard owner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 8 -------- dlls/user32/tests/clipboard.c | 2 +- dlls/winex11.drv/clipboard.c | 6 ++---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index c72a76b..251eadb 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -352,14 +352,6 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) return 0; } - /* If it's not owned, data can only be set if the format isn't - available and its rendering is not delayed */ - if (!(flags & CB_OWNER) && !hData) - { - WARN("Clipboard not owned by calling task. Operation failed.\n"); - return 0; - } - if (USER_Driver->pSetClipboardData(wFormat, hData, flags & CB_OWNER)) { hResult = hData; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 33a9c69..ddd8d1a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -65,7 +65,7 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) if (GetClipboardOwner() == hwnd) { SetClipboardData( CF_WAVE, 0 ); - todo_wine ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); } diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9b8ff65..b7c89cb 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3016,16 +3016,14 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) DWORD flags = 0; BOOL bResult = TRUE; - /* If it's not owned, data can only be set if the format data is not already owned - and its rendering is not delayed */ + /* If it's not owned, data can only be set if the format data is not already owned */ if (!owner) { LPWINE_CLIPDATA lpRender; X11DRV_CLIPBOARD_UpdateCache(); - if (!hData || - ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && + if (((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && !(lpRender->wFlags & CF_FLAG_UNOWNED))) bResult = FALSE; else

1 0

Alexandre Julliard : user32: Don' t allow SetClipboardData if the clipboard is not open.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 42c221db6c61966486344fb65231ae35d9f4ea49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c221db6c61966486344fb65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 17:35:18 2016 +0900 user32: Don't allow SetClipboardData if the clipboard is not open. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 8 +++++++- dlls/user32/tests/clipboard.c | 24 ++++++++++++------------ include/wine/server_protocol.h | 3 ++- server/clipboard.c | 1 + server/protocol.def | 1 + 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 6292076..c72a76b 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -345,9 +345,15 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) return 0; } + flags = get_clipboard_flags(); + if (!(flags & CB_OPEN_ANY)) + { + SetLastError( ERROR_CLIPBOARD_NOT_OPEN ); + return 0; + } + /* If it's not owned, data can only be set if the format isn't available and its rendering is not delayed */ - flags = get_clipboard_flags(); if (!(flags & CB_OWNER) && !hData) { WARN("Clipboard not owned by calling task. Operation failed.\n"); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f51c162..33a9c69 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -72,13 +72,13 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) else { SetClipboardData( CF_WAVE, 0 ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", - thread_from_line, GetLastError()); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); ok( !IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData succeeded\n", thread_from_line ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); - todo_wine ok( !ret, "%u: SetClipboardData succeeded\n", thread_from_line ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", - thread_from_line, GetLastError()); + ok( !ret, "%u: SetClipboardData succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); } return 0; } @@ -99,12 +99,12 @@ static void set_clipboard_data_process( int arg ) else { SetClipboardData( CF_WAVE, 0 ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", arg, GetLastError()); - todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "process %u: SetClipboardData succeeded\n", arg ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); ok( !ret, "process %u: SetClipboardData succeeded\n", arg ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "process %u: wrong error %u\n", arg, GetLastError()); } } @@ -256,10 +256,10 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); SetLastError( 0xdeadbeef ); - todo_wine ok( !SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )), - "SetClipboardData succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); - todo_wine ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); + ok( !SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )), + "SetClipboardData succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2b17ef6..a52c001 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4508,6 +4508,7 @@ struct set_clipboard_info_reply #define SET_CB_SEQNO 0x008 #define SET_CB_RELOWNER 0x010 +#define CB_OPEN_ANY 0x020 #define CB_OPEN 0x040 #define CB_OWNER 0x080 #define CB_PROCESS 0x100 @@ -6317,6 +6318,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 512 +#define SERVER_PROTOCOL_VERSION 513 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index 5c4f600..ca0067a 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -223,6 +223,7 @@ DECL_HANDLER(set_clipboard_info) reply->seqno = get_seqno( clipboard ); + if (clipboard->open_thread) reply->flags |= CB_OPEN_ANY; if (clipboard->open_thread == current) reply->flags |= CB_OPEN; if (clipboard->owner_thread == current) reply->flags |= CB_OWNER; if (clipboard->owner_thread && clipboard->owner_thread->process == current->process) diff --git a/server/protocol.def b/server/protocol.def index 5b20784..523f5bf 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3189,6 +3189,7 @@ enum caret_state #define SET_CB_SEQNO 0x008 #define SET_CB_RELOWNER 0x010 +#define CB_OPEN_ANY 0x020 #define CB_OPEN 0x040 #define CB_OWNER 0x080 #define CB_PROCESS 0x100

1 0

Alexandre Julliard : server: Add a request to return clipboard information.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 79d2e0a9be65b0219247d873690fc4439c8ba4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d2e0a9be65b0219247d8736… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 16:29:00 2016 +0900 server: Add a request to return clipboard information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 18 +++++++----------- include/wine/server_protocol.h | 21 ++++++++++++++++++++- server/clipboard.c | 14 ++++++++++++++ server/protocol.def | 10 ++++++++++ server/request.h | 8 ++++++++ server/trace.c | 15 +++++++++++++++ 6 files changed, 74 insertions(+), 12 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 454d035..6292076 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -227,10 +227,9 @@ HWND WINAPI GetClipboardOwner(void) { HWND hWndOwner = 0; - SERVER_START_REQ( set_clipboard_info ) + SERVER_START_REQ( get_clipboard_info ) { - req->flags = 0; - if (!wine_server_call_err( req )) hWndOwner = wine_server_ptr_handle( reply->old_owner ); + if (!wine_server_call_err( req )) hWndOwner = wine_server_ptr_handle( reply->owner ); } SERVER_END_REQ; @@ -247,10 +246,9 @@ HWND WINAPI GetOpenClipboardWindow(void) { HWND hWndOpen = 0; - SERVER_START_REQ( set_clipboard_info ) + SERVER_START_REQ( get_clipboard_info ) { - req->flags = 0; - if (!wine_server_call_err( req )) hWndOpen = wine_server_ptr_handle( reply->old_clipboard ); + if (!wine_server_call_err( req )) hWndOpen = wine_server_ptr_handle( reply->window ); } SERVER_END_REQ; @@ -292,10 +290,9 @@ HWND WINAPI GetClipboardViewer(void) { HWND hWndViewer = 0; - SERVER_START_REQ( set_clipboard_info ) + SERVER_START_REQ( get_clipboard_info ) { - req->flags = 0; - if (!wine_server_call_err( req )) hWndViewer = wine_server_ptr_handle( reply->old_viewer ); + if (!wine_server_call_err( req )) hWndViewer = wine_server_ptr_handle( reply->viewer ); } SERVER_END_REQ; @@ -461,9 +458,8 @@ DWORD WINAPI GetClipboardSequenceNumber(VOID) { DWORD seqno = 0; - SERVER_START_REQ( set_clipboard_info ) + SERVER_START_REQ( get_clipboard_info ) { - req->flags = 0; if (!wine_server_call_err( req )) seqno = reply->seqno; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c865bb8..2b17ef6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4526,6 +4526,22 @@ struct empty_clipboard_reply +struct get_clipboard_info_request +{ + struct request_header __header; + char __pad_12[4]; +}; +struct get_clipboard_info_reply +{ + struct reply_header __header; + user_handle_t window; + user_handle_t owner; + user_handle_t viewer; + unsigned int seqno; +}; + + + struct set_clipboard_viewer_request { struct request_header __header; @@ -5674,6 +5690,7 @@ enum request REQ_close_clipboard, REQ_set_clipboard_info, REQ_empty_clipboard, + REQ_get_clipboard_info, REQ_set_clipboard_viewer, REQ_open_token, REQ_set_global_windows, @@ -5957,6 +5974,7 @@ union generic_request struct close_clipboard_request close_clipboard_request; struct set_clipboard_info_request set_clipboard_info_request; struct empty_clipboard_request empty_clipboard_request; + struct get_clipboard_info_request get_clipboard_info_request; struct set_clipboard_viewer_request set_clipboard_viewer_request; struct open_token_request open_token_request; struct set_global_windows_request set_global_windows_request; @@ -6238,6 +6256,7 @@ union generic_reply struct close_clipboard_reply close_clipboard_reply; struct set_clipboard_info_reply set_clipboard_info_reply; struct empty_clipboard_reply empty_clipboard_reply; + struct get_clipboard_info_reply get_clipboard_info_reply; struct set_clipboard_viewer_reply set_clipboard_viewer_reply; struct open_token_reply open_token_reply; struct set_global_windows_reply set_global_windows_reply; @@ -6298,6 +6317,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 511 +#define SERVER_PROTOCOL_VERSION 512 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index c906e70..5c4f600 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -248,6 +248,20 @@ DECL_HANDLER(empty_clipboard) } +/* Get clipboard information */ +DECL_HANDLER(get_clipboard_info) +{ + struct clipboard *clipboard = get_process_clipboard(); + + if (!clipboard) return; + + reply->window = clipboard->open_win; + reply->owner = clipboard->owner_win; + reply->viewer = clipboard->viewer; + reply->seqno = get_seqno( clipboard ); +} + + /* set the clipboard viewer window */ DECL_HANDLER(set_clipboard_viewer) { diff --git a/server/protocol.def b/server/protocol.def index 5614546..5b20784 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3199,6 +3199,16 @@ enum caret_state @END +/* Get clipboard information */ +@REQ(get_clipboard_info) +@REPLY + user_handle_t window; /* clipboard window */ + user_handle_t owner; /* clipboard owner */ + user_handle_t viewer; /* clipboard viewer */ + unsigned int seqno; /* current sequence number */ +@END + + /* Set the clipboard viewer window */ @REQ(set_clipboard_viewer) user_handle_t viewer; /* clipboard viewer */ diff --git a/server/request.h b/server/request.h index b4f25a7..c5236f5 100644 --- a/server/request.h +++ b/server/request.h @@ -330,6 +330,7 @@ DECL_HANDLER(open_clipboard); DECL_HANDLER(close_clipboard); DECL_HANDLER(set_clipboard_info); DECL_HANDLER(empty_clipboard); +DECL_HANDLER(get_clipboard_info); DECL_HANDLER(set_clipboard_viewer); DECL_HANDLER(open_token); DECL_HANDLER(set_global_windows); @@ -612,6 +613,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_close_clipboard, (req_handler)req_set_clipboard_info, (req_handler)req_empty_clipboard, + (req_handler)req_get_clipboard_info, (req_handler)req_set_clipboard_viewer, (req_handler)req_open_token, (req_handler)req_set_global_windows, @@ -2035,6 +2037,12 @@ C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, old_viewer) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_info_reply, seqno) == 24 ); C_ASSERT( sizeof(struct set_clipboard_info_reply) == 32 ); C_ASSERT( sizeof(struct empty_clipboard_request) == 16 ); +C_ASSERT( sizeof(struct get_clipboard_info_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_info_reply, window) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_info_reply, owner) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_info_reply, viewer) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_info_reply, seqno) == 20 ); +C_ASSERT( sizeof(struct get_clipboard_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_viewer_request, viewer) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_viewer_request, previous) == 16 ); C_ASSERT( sizeof(struct set_clipboard_viewer_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index b3b6793..6c9518e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3774,6 +3774,18 @@ static void dump_empty_clipboard_request( const struct empty_clipboard_request * { } +static void dump_get_clipboard_info_request( const struct get_clipboard_info_request *req ) +{ +} + +static void dump_get_clipboard_info_reply( const struct get_clipboard_info_reply *req ) +{ + fprintf( stderr, " window=%08x", req->window ); + fprintf( stderr, ", owner=%08x", req->owner ); + fprintf( stderr, ", viewer=%08x", req->viewer ); + fprintf( stderr, ", seqno=%08x", req->seqno ); +} + static void dump_set_clipboard_viewer_request( const struct set_clipboard_viewer_request *req ) { fprintf( stderr, " viewer=%08x", req->viewer ); @@ -4613,6 +4625,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_close_clipboard_request, (dump_func)dump_set_clipboard_info_request, (dump_func)dump_empty_clipboard_request, + (dump_func)dump_get_clipboard_info_request, (dump_func)dump_set_clipboard_viewer_request, (dump_func)dump_open_token_request, (dump_func)dump_set_global_windows_request, @@ -4892,6 +4905,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_close_clipboard_reply, (dump_func)dump_set_clipboard_info_reply, NULL, + (dump_func)dump_get_clipboard_info_reply, (dump_func)dump_set_clipboard_viewer_reply, (dump_func)dump_open_token_reply, (dump_func)dump_set_global_windows_reply, @@ -5171,6 +5185,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "close_clipboard", "set_clipboard_info", "empty_clipboard", + "get_clipboard_info", "set_clipboard_viewer", "open_token", "set_global_windows",

1 0

Piotr Caban : ntdll: Remove no longer accessible TEB frames in RtlRestoreContext.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: b4991f20cb418a28fab56cf18898c319d70e3111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4991f20cb418a28fab56cf18… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 18 17:43:36 2016 +0200 ntdll: Remove no longer accessible TEB frames in RtlRestoreContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f5ecf80..92d7b38 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3557,6 +3557,8 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, */ void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) { + EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) { struct MSVCRT_JUMP_BUFFER *jmp = (struct MSVCRT_JUMP_BUFFER *)rec->ExceptionInformation[0]; @@ -3586,6 +3588,14 @@ void WINAPI RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); context->Rip = (ULONG64)call_consolidate_callback( context, consolidate, rec ); } + + /* hack: remove no longer accessible TEB frames */ + while ((ULONG64)teb_frame < context->Rsp) + { + TRACE( "removing TEB frame: %p\n", teb_frame ); + teb_frame = __wine_pop_frame( teb_frame ); + } + TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); set_cpu_context( context ); }

1 0

Aric Stewart : hidclass.sys: Handle IRP_MN_REMOVE_DEVICE.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: b13924a6c962dd99983d76d01a991d84904b54e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13924a6c962dd99983d76d01… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 17 10:30:52 2016 -0500 hidclass.sys: Handle IRP_MN_REMOVE_DEVICE. We no longer track PNP devices, that is the PNP manager's job. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 1 - dlls/hidclass.sys/main.c | 1 - dlls/hidclass.sys/pnp.c | 42 +++++++----------------------------------- 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 34c2a09..adc547c 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -99,7 +99,6 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDE /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; -void PNP_CleanupPNP(DRIVER_OBJECT *driver) DECLSPEC_HIDDEN; /* Parsing HID Report Descriptors into preparsed data */ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 7fdcd59..1ab25da 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -51,7 +51,6 @@ static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) { if (md->DriverUnload) md->DriverUnload(md->minidriver.DriverObject); - PNP_CleanupPNP(md->minidriver.DriverObject); list_remove(&md->entry); HeapFree( GetProcessHeap(), 0, md ); } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 8fd5c17..87cd94e 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -35,17 +35,6 @@ static const WCHAR separator_W[] = {'\\',0}; static const WCHAR device_deviceid_fmtW[] = {'%','s','\\', 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'}; -typedef struct _NATIVE_DEVICE { - struct list entry; - - DEVICE_OBJECT *PDO; - DEVICE_OBJECT *FDO; - HID_MINIDRIVER_REGISTRATION *minidriver; - -} NATIVE_DEVICE; - -static struct list tracked_devices = LIST_INIT(tracked_devices); - static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, void *context ) { @@ -91,7 +80,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) minidriver *minidriver; HID_DEVICE_ATTRIBUTES attr; BASE_DEVICE_EXTENSION *ext = NULL; - NATIVE_DEVICE *tracked_device; HID_DESCRIPTOR descriptor; BYTE *reportDescriptor; INT i; @@ -145,12 +133,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->information.VersionNumber = attr.VersionNumber; ext->information.Polled = minidriver->minidriver.DevicesArePolled; - tracked_device = HeapAlloc(GetProcessHeap(), 0, sizeof(*tracked_device)); - tracked_device->PDO = PDO; - tracked_device->FDO = device; - tracked_device->minidriver = &minidriver->minidriver; - list_add_tail(&tracked_devices, &tracked_device->entry); - status = call_minidriver(IOCTL_HID_GET_DEVICE_DESCRIPTOR, device, NULL, 0, &descriptor, sizeof(descriptor)); if (status != STATUS_SUCCESS) @@ -218,26 +200,11 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return STATUS_SUCCESS; } -void PNP_CleanupPNP(DRIVER_OBJECT *driver) -{ - NATIVE_DEVICE *tracked_device, *ptr; - - LIST_FOR_EACH_ENTRY_SAFE(tracked_device, ptr, &tracked_devices, - NATIVE_DEVICE, entry) - { - if (tracked_device->minidriver->DriverObject == driver) - { - list_remove(&tracked_device->entry); - HID_DeleteDevice(tracked_device->minidriver, tracked_device->FDO); - HeapFree(GetProcessHeap(), 0, tracked_device); - } - } -} - NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS rc = STATUS_NOT_SUPPORTED; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + minidriver *minidriver = find_minidriver(device->DriverObject); TRACE("%p, %p\n", device, irp); @@ -286,10 +253,15 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } break; } + case IRP_MN_REMOVE_DEVICE: + { + HID_DeleteDevice(&minidriver->minidriver, device); + minidriver->PNPDispatch(device, irp); + break; + } default: { /* Forward IRP to the minidriver */ - minidriver *minidriver = find_minidriver(device->DriverObject); return minidriver->PNPDispatch(device, irp); } }

1 0

Jacek Caban : wpc: Register WindowsParentalControls class.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 0cb7301aecb1309f6f295aa1bc1a87345c922942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb7301aecb1309f6f295aa1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 16:52:54 2016 +0200 wpc: Register WindowsParentalControls class. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/wpc/Makefile.in | 2 ++ dlls/wpc/tests/wpc.c | 4 ++-- dlls/wpc/wpc.c | 22 ++++++++++++++++++++++ dlls/wpc/wpc.spec | 2 ++ dlls/wpc/wpc_classes.idl | 21 +++++++++++++++++++++ include/wpcapi.idl | 6 ++++++ 8 files changed, 57 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 12879c3..0211b20 100755 --- a/configure +++ b/configure @@ -18176,7 +18176,7 @@ wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib -wine_fn_config_dll wpc enable_wpc +wine_fn_config_dll wpc enable_wpc clean wine_fn_config_test dlls/wpc/tests wpc_test wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib diff --git a/configure.ac b/configure.ac index 60fc4f8..bc95e88 100644 --- a/configure.ac +++ b/configure.ac @@ -3405,7 +3405,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) -WINE_CONFIG_DLL(wpc) +WINE_CONFIG_DLL(wpc,,[clean]) WINE_CONFIG_TEST(dlls/wpc/tests) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in index edd729f..829a769 100644 --- a/dlls/wpc/Makefile.in +++ b/dlls/wpc/Makefile.in @@ -2,3 +2,5 @@ MODULE = wpc.dll C_SRCS = \ wpc.c + +IDL_SRCS = wpc_classes.idl diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c index 4d3da36..9fcc3f2 100644 --- a/dlls/wpc/tests/wpc.c +++ b/dlls/wpc/tests/wpc.c @@ -30,9 +30,9 @@ static void test_wpc(void) hres = CoCreateInstance(&CLSID_WindowsParentalControls, NULL, CLSCTX_INPROC_SERVER, &IID_IWindowsParentalControls, (void**)&wpc); if(hres == REGDB_E_CLASSNOTREG) - todo_wine win_skip("CLSID_WindowsParentalControls not registered\n"); + win_skip("CLSID_WindowsParentalControls not registered\n"); else - ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + todo_wine ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); if(FAILED(hres)) return; diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index a3e7c03..48f8edf 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -17,11 +17,14 @@ */ #include "wpcapi.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpc); +static HINSTANCE wpc_instance; + /****************************************************************** * DllMain */ @@ -34,6 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); + wpc_instance = hInstDLL; break; } @@ -57,3 +61,21 @@ HRESULT WINAPI DllCanUnloadNow(void) TRACE("\n"); return S_FALSE; } + +/*********************************************************************** + * DllRegisterServer (wpc.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(wpc_instance); +} + +/*********************************************************************** + * DllUnregisterServer (wpc.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(wpc_instance); +} diff --git a/dlls/wpc/wpc.spec b/dlls/wpc/wpc.spec index 195cf86..fa1c086 100644 --- a/dlls/wpc/wpc.spec +++ b/dlls/wpc/wpc.spec @@ -1,3 +1,5 @@ @ stub ApplyParentalControlsW @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() # not exported by native +@ stdcall -private DllUnregisterServer() # not exported by native diff --git a/dlls/wpc/wpc_classes.idl b/dlls/wpc/wpc_classes.idl new file mode 100644 index 0000000..89406ac --- /dev/null +++ b/dlls/wpc/wpc_classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "wpcapi.idl" diff --git a/include/wpcapi.idl b/include/wpcapi.idl index 097c290..a46a310 100644 --- a/include/wpcapi.idl +++ b/include/wpcapi.idl @@ -19,6 +19,10 @@ import "oaidl.idl"; import "ocidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#endif + typedef [v1_enum] enum tagWPCFLAG_RESTRICTION { WPCFLAG_NO_RESTRICTION = 0x0000, WPCFLAG_LOGGING_REQUIRED = 0x0001, @@ -116,6 +120,8 @@ interface IWindowsParentalControls : IWindowsParentalControlsCore } [ + helpstring("WindowsParentalControls class"), + threading(both), uuid(e77cc89b-7401-4c04-8ced-149db35add04) ] coclass WindowsParentalControls

1 0

Jacek Caban : wpc: Added basic tests.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 72824494e24844e371b7a2e0178935ab3f47ef13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72824494e24844e371b7a2e01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 16:52:41 2016 +0200 wpc: Added basic tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wpc/tests/Makefile.in | 4 ++++ dlls/wpc/tests/wpc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ include/wpcapi.idl | 8 ++++++++ 5 files changed, 63 insertions(+) diff --git a/configure b/configure index f4c9f19..12879c3 100755 --- a/configure +++ b/configure @@ -18177,6 +18177,7 @@ wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll wpc enable_wpc +wine_fn_config_test dlls/wpc/tests wpc_test wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test diff --git a/configure.ac b/configure.ac index 2fcdcb1..60fc4f8 100644 --- a/configure.ac +++ b/configure.ac @@ -3406,6 +3406,7 @@ WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(wpc) +WINE_CONFIG_TEST(dlls/wpc/tests) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) diff --git a/dlls/wpc/tests/Makefile.in b/dlls/wpc/tests/Makefile.in new file mode 100644 index 0000000..72f550d --- /dev/null +++ b/dlls/wpc/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wpc.dll +IMPORTS = ole32 + +C_SRCS = wpc.c diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c new file mode 100644 index 0000000..4d3da36 --- /dev/null +++ b/dlls/wpc/tests/wpc.c @@ -0,0 +1,49 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#define COBJMACROS +#include "initguid.h" +#include "wpcapi.h" + +#include "wine/test.h" + +static void test_wpc(void) +{ + IWindowsParentalControls *wpc; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WindowsParentalControls, NULL, CLSCTX_INPROC_SERVER, &IID_IWindowsParentalControls, (void**)&wpc); + if(hres == REGDB_E_CLASSNOTREG) + todo_wine win_skip("CLSID_WindowsParentalControls not registered\n"); + else + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + if(FAILED(hres)) + return; + + IWindowsParentalControls_Release(wpc); +} + +START_TEST(wpc) +{ + CoInitialize(NULL); + + test_wpc(); + + CoUninitialize(); +} diff --git a/include/wpcapi.idl b/include/wpcapi.idl index db2d991..097c290 100644 --- a/include/wpcapi.idl +++ b/include/wpcapi.idl @@ -114,3 +114,11 @@ interface IWindowsParentalControls : IWindowsParentalControlsCore [in] LPCWSTR pcszSID, [out] IWPCGamesSettings **ppSettings) ; } + +[ + uuid(e77cc89b-7401-4c04-8ced-149db35add04) +] +coclass WindowsParentalControls +{ + [default] interface IWindowsParentalControls; +}

1 0

Jacek Caban : wpc: Added stub wpc dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 668e69a7678f5d148ef4e42d27f7e9b0cfd84b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668e69a7678f5d148ef4e42d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 16:52:27 2016 +0200 wpc: Added stub wpc dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wpc/Makefile.in | 4 ++++ dlls/wpc/wpc.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wpc/wpc.spec | 3 +++ 5 files changed, 69 insertions(+) diff --git a/configure b/configure index 3eba2d2..f4c9f19 100755 --- a/configure +++ b/configure @@ -1404,6 +1404,7 @@ enable_wmiutils enable_wmp enable_wmvcore enable_wnaspi32 +enable_wpc enable_wpcap enable_ws2_32 enable_wshom_ocx @@ -18175,6 +18176,7 @@ wine_fn_config_test dlls/wmp/tests wmp_test wine_fn_config_dll wmvcore enable_wmvcore wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib +wine_fn_config_dll wpc enable_wpc wine_fn_config_dll wpcap enable_wpcap wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test diff --git a/configure.ac b/configure.ac index 24e5190..2fcdcb1 100644 --- a/configure.ac +++ b/configure.ac @@ -3405,6 +3405,7 @@ WINE_CONFIG_TEST(dlls/wmp/tests) WINE_CONFIG_DLL(wmvcore) WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) +WINE_CONFIG_DLL(wpc) WINE_CONFIG_DLL(wpcap) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in new file mode 100644 index 0000000..edd729f --- /dev/null +++ b/dlls/wpc/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wpc.dll + +C_SRCS = \ + wpc.c diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c new file mode 100644 index 0000000..a3e7c03 --- /dev/null +++ b/dlls/wpc/wpc.c @@ -0,0 +1,59 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wpcapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wpc); + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (wpc.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("Unknown object %s (iface %s)\n", debugstr_guid(rclsid), debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (wpc.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("\n"); + return S_FALSE; +} diff --git a/dlls/wpc/wpc.spec b/dlls/wpc/wpc.spec new file mode 100644 index 0000000..195cf86 --- /dev/null +++ b/dlls/wpc/wpc.spec @@ -0,0 +1,3 @@ +@ stub ApplyParentalControlsW +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Bruno Jesus : dinput: Restore effect ID on error due to kernel < 3.14 bug.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 4d816bdbcd31ea6799e199c15804110b70309570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d816bdbcd31ea6799e199c15… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 22:06:58 2016 -0300 dinput: Restore effect ID on error due to kernel < 3.14 bug. Based on ideas by Elias Vanderstuyft Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 642dfc0..bbcadf5 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -173,14 +173,19 @@ static HRESULT WINAPI LinuxInputEffectImpl_Download( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - int ret; + int ret, old_effect_id; TRACE("(this=%p)\n", This); ff_dump_effect(&This->effect); + old_effect_id = This->effect.id; if (ioctl(*(This->fd), EVIOCSFF, &This->effect) != -1) return DI_OK; + /* Linux kernel < 3.14 has a bug that incorrectly assigns an effect ID even + * on error, restore it here if that is the case. */ + This->effect.id = old_effect_id; + switch (errno) { case EINVAL:

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016