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

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

Aug. 23, 2016

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

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

Aug. 23, 2016

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

Bruno Jesus : dinput: Do not read/ write past the struct for old DX versions.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 327897992b83e77abe30d47eecf6d6b6d78d9cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=327897992b83e77abe30d47ee… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 22:06:57 2016 -0300 dinput: Do not read/write past the struct for old DX versions. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 2f3399d..642dfc0 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -329,9 +329,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( peff->dwSamplePeriod = 0; } - if (dwFlags & DIEP_STARTDELAY) { - peff->dwStartDelay = This->effect.replay.delay * 1000; - } + if ((dwFlags & DIEP_STARTDELAY) && peff->dwSize > sizeof(DIEFFECT_DX5)) + peff->dwStartDelay = This->effect.replay.delay * 1000; if (dwFlags & DIEP_TRIGGERBUTTON) { FIXME("LinuxInput button mapping needs redoing; for now, assuming we're using an actual joystick.\n"); @@ -570,7 +569,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("Sample period requested but no sample period functionality present.\n"); if (dwFlags & DIEP_STARTDELAY) - This->effect.replay.delay = peff->dwStartDelay / 1000; + if ((dwFlags & DIEP_STARTDELAY) && peff->dwSize > sizeof(DIEFFECT_DX5)) + This->effect.replay.delay = peff->dwStartDelay / 1000; if (dwFlags & DIEP_TRIGGERBUTTON) { if (peff->dwTriggerButton != -1) {

1 0

Bruno Jesus : ntdll: Use a helper to allocate threadpool workers.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 3b3c0d9e09c609e9fada24a451f7cb878b2d3f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3c0d9e09c609e9fada24a45… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 17:39:10 2016 -0300 ntdll: Use a helper to allocate threadpool workers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 68 +++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 173e865..6063d51 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1282,6 +1282,28 @@ static void CALLBACK timerqueue_thread_proc( void *param ) } /*********************************************************************** + * tp_new_worker_thread (internal) + * + * Create and account a new worker thread for the desired pool. + */ +static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) +{ + HANDLE thread; + NTSTATUS status; + + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, + threadpool_worker_proc, pool, &thread, NULL ); + if (status == STATUS_SUCCESS) + { + interlocked_inc( &pool->refcount ); + pool->num_workers++; + pool->num_busy_workers++; + NtClose( thread ); + } + return status; +} + +/*********************************************************************** * tp_timerqueue_lock (internal) * * Acquires a lock on the global timerqueue. When the lock is acquired @@ -1713,18 +1735,7 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON /* Make sure that the threadpool has at least one thread. */ if (!pool->num_workers) - { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } - } + status = tp_new_worker_thread( pool ); /* Keep a reference, and increment objcount to ensure that the * last thread doesn't terminate. */ @@ -1910,18 +1921,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) /* Start new worker threads if required. */ if (pool->num_busy_workers >= pool->num_workers && pool->num_workers < pool->max_workers) - { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } - } + status = tp_new_worker_thread( pool ); /* Queue work item and increment refcount. */ interlocked_inc( &object->refcount ); @@ -2406,16 +2406,7 @@ NTSTATUS WINAPI TpCallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) { if (pool->num_workers < pool->max_workers) { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } + status = tp_new_worker_thread( pool ); } else { @@ -2708,16 +2699,9 @@ BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum ) while (this->num_workers < minimum) { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, this, &thread, NULL ); + status = tp_new_worker_thread( this ); if (status != STATUS_SUCCESS) break; - - interlocked_inc( &this->refcount ); - this->num_workers++; - this->num_busy_workers++; - NtClose( thread ); } if (status == STATUS_SUCCESS)

1 0

Alexandre Julliard : user32/tests: Add a few more clipboard tests.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 43e38153eed81d4c3aac41472192a0674afbcc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e38153eed81d4c3aac41472… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 18:00:02 2016 +0900 user32/tests: Add a few more clipboard tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 63 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 549a625..9893e8a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -68,6 +68,11 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) 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() ); + SetLastError( 0xdeadbeef ); + ret = GetClipboardData( CF_WAVE ); + ok( !ret, "%u: GetClipboardData succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); } else { @@ -147,6 +152,24 @@ static void run_process( const char *args ) CloseHandle( info.hThread ); } +static WNDPROC old_proc; +static LRESULT CALLBACK winproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + static int destroyed; + + if (msg == WM_DESTROY) destroyed = TRUE; + + trace( "%p msg %04x\n", hwnd, msg ); + if (!destroyed) + ok( GetClipboardOwner() == hwnd, "%04x: wrong owner %p/%p\n", msg, GetClipboardOwner(), hwnd ); + else todo_wine_if (msg == WM_DESTROY) + ok( !GetClipboardOwner(), "%04x: wrong owner %p\n", msg, GetClipboardOwner() ); + ok( GetClipboardViewer() == hwnd, "%04x: wrong viewer %p/%p\n", msg, GetClipboardViewer(), hwnd ); + ok( GetOpenClipboardWindow() == hwnd, "%04x: wrong open win %p/%p\n", + msg, GetOpenClipboardWindow(), hwnd ); + return old_proc( hwnd, msg, wp, lp ); +} + static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -182,6 +205,8 @@ static void test_ClipboardOwner(void) run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE available\n" ); + ok( !GetClipboardData( CF_WAVE ), "CF_WAVE data available\n" ); run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -198,6 +223,8 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 1" ); SetLastError(0xdeadbeef); @@ -217,6 +244,8 @@ static void test_ClipboardOwner(void) ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 2" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -225,20 +254,31 @@ static void test_ClipboardOwner(void) ok( ret, "OpenClipboard error %d\n", GetLastError()); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); + SetClipboardViewer( hWnd1 ); ok( GetClipboardOwner() == hWnd1, "wrong owner %p/%p\n", GetClipboardOwner(), hWnd1 ); - ret = CloseClipboard(); - ok( ret, "CloseClipboard error %d\n", GetLastError()); + ok( GetClipboardViewer() == hWnd1, "wrong viewer %p/%p\n", GetClipboardViewer(), hWnd1 ); + ok( GetOpenClipboardWindow() == hWnd1, "wrong open win %p/%p\n", GetOpenClipboardWindow(), hWnd1 ); + old_proc = (WNDPROC)SetWindowLongPtrA( hWnd1, GWLP_WNDPROC, (LONG_PTR)winproc_wrapper ); ret = DestroyWindow(hWnd1); ok( ret, "DestroyWindow error %d\n", GetLastError()); ret = DestroyWindow(hWnd2); ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + todo_wine ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); + todo_wine ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + + SetLastError( 0xdeadbeef ); + ret = CloseClipboard(); + todo_wine ok( !ret, "CloseClipboard succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 3" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -248,6 +288,8 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 4" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); @@ -459,6 +501,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA static UINT wm_drawclipboard; static UINT wm_clipboardupdate; static UINT wm_destroyclipboard; + static UINT nb_formats; LRESULT ret; switch(msg) { @@ -476,6 +519,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA case WM_DESTROYCLIPBOARD: wm_destroyclipboard++; ok( GetClipboardOwner() == hwnd, "WM_DESTROYCLIPBOARD owner %p\n", GetClipboardOwner() ); + nb_formats = CountClipboardFormats(); break; case WM_CLIPBOARDUPDATE: wm_clipboardupdate++; @@ -496,6 +540,8 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ret = wm_destroyclipboard; wm_destroyclipboard = 0; return ret; + case WM_USER+4: + return nb_formats; } return DefWindowProcA(hwnd, msg, wp, lp); @@ -506,7 +552,7 @@ static DWORD WINAPI clipboard_thread(void *param) HWND win = param; BOOL r; HANDLE handle; - UINT count, old_seq = 0, seq; + UINT count, formats, old_seq = 0, seq; if (pGetClipboardSequenceNumber) old_seq = pGetClipboardSequenceNumber(); @@ -575,6 +621,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_CLIPBOARDUPDATE received\n" ); count = SendMessageA( win, WM_USER+3, 0, 0 ); ok( count, "WM_DESTROYCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_text() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); @@ -686,6 +734,10 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + formats = CountClipboardFormats(); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( !count, "WM_DESTROYCLIPBOARD received\n" ); + r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = EmptyClipboard(); @@ -693,6 +745,11 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( count, "WM_DESTROYCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0;

1 0

Alexandre Julliard : winex11: Don't try to free custom GDI formats at all.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

Module: wine Branch: master Commit: 13fbbfac1c06132575640ede90863c4860f933d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fbbfac1c06132575640ede9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 24 00:16:07 2016 +0900 winex11: Don't try to free custom GDI formats at all. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index af8fa37..5424c53 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -597,6 +597,7 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) DeleteEnhMetaFile(lpData->hData); break; default: + if (lpData->wFormatID >= CF_GDIOBJFIRST && lpData->wFormatID <= CF_GDIOBJLAST) break; if (lpData->wFormatID >= CF_PRIVATEFIRST && lpData->wFormatID <= CF_PRIVATELAST) break; GlobalFree(lpData->hData); break;

1 0

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

Aug. 23, 2016

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 Aug. 23, 2016

Aug. 23, 2016

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 */ +(a)REQ(get_clipboard_info) +(a)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 */ +(a)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

Aric Stewart : hidclass.sys: Handle IRP_MN_REMOVE_DEVICE.
by Alexandre Julliard Aug. 23, 2016

Aug. 23, 2016

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 Aug. 23, 2016

Aug. 23, 2016

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