wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Aaryaman Vasishta : d3drm/tests: Remove TODO' s from test_qi and TODO field from test tables.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 33160f5221ad7796bbb0612b3341d6498afcd7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33160f5221ad7796bbb0612b3… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 30 14:29:40 2015 +0530 d3drm/tests: Remove TODO's from test_qi and TODO field from test tables. --- dlls/d3drm/tests/d3drm.c | 287 +++++++++++++++++++++++------------------------ 1 file changed, 139 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33160f5221ad7796bbb06…

1 0

Aaryaman Vasishta : d3drm: Fix refcounting for IDirect3DRM{1-3}.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 844ce497171c9e82174a1e0da53809ca1833324e URL: http://source.winehq.org/git/wine.git/?a=commit;h=844ce497171c9e82174a1e0da… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 30 14:29:39 2015 +0530 d3drm: Fix refcounting for IDirect3DRM{1-3}. --- dlls/d3drm/d3drm.c | 54 +++++++++++++++++++++++++++++++++++++++--------- dlls/d3drm/tests/d3drm.c | 4 ++-- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7b74cfb..9be9607 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -55,7 +55,7 @@ struct d3drm IDirect3DRM IDirect3DRM_iface; IDirect3DRM2 IDirect3DRM2_iface; IDirect3DRM3 IDirect3DRM3_iface; - LONG ref; + LONG ref1, ref2, ref3, iface_count; }; static inline struct d3drm *impl_from_IDirect3DRM(IDirect3DRM *iface) @@ -73,6 +73,12 @@ static inline struct d3drm *impl_from_IDirect3DRM3(IDirect3DRM3 *iface) return CONTAINING_RECORD(iface, struct d3drm, IDirect3DRM3_iface); } +static void d3drm_destroy(struct d3drm *d3drm) +{ + HeapFree(GetProcessHeap(), 0, d3drm); + TRACE("d3drm object %p is being destroyed.\n", d3drm); +} + static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, void **out) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); @@ -106,22 +112,25 @@ static HRESULT WINAPI d3drm1_QueryInterface(IDirect3DRM *iface, REFIID riid, voi static ULONG WINAPI d3drm1_AddRef(IDirect3DRM *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - ULONG refcount = InterlockedIncrement(&d3drm->ref); + ULONG refcount = InterlockedIncrement(&d3drm->ref1); TRACE("%p increasing refcount to %u.\n", iface, refcount); + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); + return refcount; } static ULONG WINAPI d3drm1_Release(IDirect3DRM *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM(iface); - ULONG refcount = InterlockedDecrement(&d3drm->ref); + ULONG refcount = InterlockedDecrement(&d3drm->ref1); TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - HeapFree(GetProcessHeap(), 0, d3drm); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); return refcount; } @@ -455,15 +464,27 @@ static HRESULT WINAPI d3drm2_QueryInterface(IDirect3DRM2 *iface, REFIID riid, vo static ULONG WINAPI d3drm2_AddRef(IDirect3DRM2 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + ULONG refcount = InterlockedIncrement(&d3drm->ref2); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); - return d3drm1_AddRef(&d3drm->IDirect3DRM_iface); + return refcount; } static ULONG WINAPI d3drm2_Release(IDirect3DRM2 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); + ULONG refcount = InterlockedDecrement(&d3drm->ref2); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm1_Release(&d3drm->IDirect3DRM_iface); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); + + return refcount; } static HRESULT WINAPI d3drm2_CreateObject(IDirect3DRM2 *iface, @@ -804,15 +825,27 @@ static HRESULT WINAPI d3drm3_QueryInterface(IDirect3DRM3 *iface, REFIID riid, vo static ULONG WINAPI d3drm3_AddRef(IDirect3DRM3 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + ULONG refcount = InterlockedIncrement(&d3drm->ref3); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (refcount == 1) + InterlockedIncrement(&d3drm->iface_count); - return d3drm1_AddRef(&d3drm->IDirect3DRM_iface); + return refcount; } static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) { struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + ULONG refcount = InterlockedDecrement(&d3drm->ref3); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm1_Release(&d3drm->IDirect3DRM_iface); + if (!refcount && !InterlockedDecrement(&d3drm->iface_count)) + d3drm_destroy(d3drm); + + return refcount; } static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, @@ -1488,7 +1521,8 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm) object->IDirect3DRM_iface.lpVtbl = &d3drm1_vtbl; object->IDirect3DRM2_iface.lpVtbl = &d3drm2_vtbl; object->IDirect3DRM3_iface.lpVtbl = &d3drm3_vtbl; - object->ref = 1; + object->ref1 = 1; + object->iface_count = 1; *d3drm = &object->IDirect3DRM_iface; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 977c9c0..61f2cab 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1761,8 +1761,8 @@ static void test_d3drm_qi(void) { static const struct qi_test tests[] = { - { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, - { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, FALSE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, FALSE }, { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE }, { &IID_IDirect3DRMObject, NULL, CLASS_E_CLASSNOTAVAILABLE, FALSE },

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMDevice declaration.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: ffbfd031a68b77beb17fd9d377f407ab1312fd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbfd031a68b77beb17fd9d37… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon May 4 15:22:27 2015 +0530 d3drm: Fix IDirect3DRMDevice declaration. --- include/d3drmobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index f0ab369..942c69a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -360,7 +360,7 @@ DECLARE_INTERFACE_(IDirect3DRMVisual,IDirect3DRMObject) #undef GetClassName #endif #define INTERFACE IDirect3DRMDevice -DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) +DECLARE_INTERFACE_(IDirect3DRMDevice,IDirect3DRMObject) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;

1 0

Sebastian Lackner : winedevice: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: c16f0644beab693f77a589053e1a92b4e0f7adb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16f0644beab693f77a589053… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:34 2015 +0200 winedevice: Do not omit mandatory argument for VirtualProtect. --- programs/winedevice/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 9677a82..ef1e1ef 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -98,14 +98,14 @@ static HMODULE load_driver_module( const WCHAR *name ) VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, NULL ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); if (!rel) goto error; } /* make sure we don't try again */ size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; VirtualProtect( nt, size, PAGE_READWRITE, &old ); nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, NULL ); + VirtualProtect( nt, size, old, &old ); } }

1 0

Sebastian Lackner : ntdll: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 64ee8a4a53ef2ad542fc981eae35a98a2e30cd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ee8a4a53ef2ad542fc981ea… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:24 2015 +0200 ntdll: Do not omit mandatory argument for VirtualProtect. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9810f07..921bf57 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -685,7 +685,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d done: /* restore old protection of the import address table */ - NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, NULL ); + NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, &protect_old ); return wmImp; }

1 0

Sebastian Lackner : krnl386.exe16: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 5f069c160102adbab3dbffe04ff19e4dfce8636d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f069c160102adbab3dbffe04… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:05 2015 +0200 krnl386.exe16: Do not omit mandatory argument for VirtualProtect. --- dlls/krnl386.exe16/dosmem.c | 6 ++++-- dlls/krnl386.exe16/dosvm.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c index f0feba9..b899f7b 100644 --- a/dlls/krnl386.exe16/dosmem.c +++ b/dlls/krnl386.exe16/dosmem.c @@ -302,6 +302,7 @@ BOOL DOSMEM_InitDosMemory(void) { static BOOL done; static HANDLE hRunOnce; + DWORD old_prot; if (done) return TRUE; @@ -317,7 +318,7 @@ BOOL DOSMEM_InitDosMemory(void) /* ok, we're the winning thread */ if (!(ret = VirtualProtect( DOSMEM_dosmem + DOSMEM_protect, DOSMEM_SIZE - DOSMEM_protect, - PAGE_READWRITE, NULL ))) + PAGE_READWRITE, &old_prot ))) ERR("Cannot load access low 1Mb, DOS subsystem unavailable\n"); RemoveVectoredExceptionHandler( vectored_handler ); @@ -650,10 +651,11 @@ UINT DOSMEM_Available(void) BOOL DOSMEM_MapDosLayout(void) { static BOOL already_mapped; + DWORD old_prot; if (!already_mapped) { - if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, NULL )) + if (DOSMEM_dosmem || !VirtualProtect( NULL, DOSMEM_SIZE, PAGE_EXECUTE_READWRITE, &old_prot )) { ERR( "Need full access to the first megabyte for DOS mode\n" ); ExitProcess(1); diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c index 87adf33..4e76215 100644 --- a/dlls/krnl386.exe16/dosvm.c +++ b/dlls/krnl386.exe16/dosvm.c @@ -827,6 +827,7 @@ LPVOID DOSVM_AllocDataUMB( DWORD size, WORD *segment, WORD *selector ) */ void DOSVM_InitSegments(void) { + DWORD old_prot; LPSTR ptr; int i; @@ -966,7 +967,7 @@ void DOSVM_InitSegments(void) /* * As we store code in UMB we should make sure it is executable */ - VirtualProtect((void *)DOSVM_UMB_BOTTOM, DOSVM_UMB_TOP - DOSVM_UMB_BOTTOM, PAGE_EXECUTE_READWRITE, NULL); + VirtualProtect((void *)DOSVM_UMB_BOTTOM, DOSVM_UMB_TOP - DOSVM_UMB_BOTTOM, PAGE_EXECUTE_READWRITE, &old_prot); event_notifier = CreateEventW(NULL, FALSE, FALSE, NULL); }

1 0

Sebastian Lackner : kernel32: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 1119da47ee1c7f530da7d69609ebadbe4bf6450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1119da47ee1c7f530da7d6960… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:42:09 2015 +0200 kernel32: Do not omit mandatory argument for VirtualProtect. --- dlls/kernel32/except.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bd50e88..2a7dbaa 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -401,6 +401,7 @@ static BOOL start_debugger_atomic(PEXCEPTION_POINTERS epointers) */ static inline BOOL check_resource_write( void *addr ) { + DWORD old_prot; void *rsrc; DWORD size; MEMORY_BASIC_INFORMATION info; @@ -412,7 +413,7 @@ static inline BOOL check_resource_write( void *addr ) return FALSE; if (addr < rsrc || (char *)addr >= (char *)rsrc + size) return FALSE; TRACE( "Broken app is writing to the resource data, enabling work-around\n" ); - VirtualProtect( rsrc, size, PAGE_READWRITE, NULL ); + VirtualProtect( rsrc, size, PAGE_READWRITE, &old_prot ); return TRUE; }

1 0

Sebastian Lackner : kernel32/tests: Add tests for calling VirtualProtect with NULL as last argument.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 152b575eed7566cba9575891dad9c07706a3f353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b575eed7566cba9575891d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:37:26 2015 +0200 kernel32/tests: Add tests for calling VirtualProtect with NULL as last argument. --- dlls/kernel32/tests/virtual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 75e91d5..2dea156 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -47,6 +47,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); +static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); /* ############################### */ @@ -2478,6 +2479,9 @@ static void test_VirtualProtect(void) DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; + void *addr; + SIZE_T size; + NTSTATUS status; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -2486,6 +2490,31 @@ static void test_VirtualProtect(void) base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); ok(base != NULL, "VirtualAlloc failed %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, PAGE_READONLY, NULL); + todo_wine + ok(!ret, "VirtualProtect should fail\n"); + todo_wine + ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %d\n", GetLastError()); + old_prot = 0xdeadbeef; + ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect failed %d\n", GetLastError()); + todo_wine + ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); + + addr = base; + size = si.dwPageSize; + status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_READONLY, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "NtProtectVirtualMemory should fail, got %08x\n", status); + addr = base; + size = si.dwPageSize; + old_prot = 0xdeadbeef; + status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_NOACCESS, &old_prot); + ok(status == STATUS_SUCCESS, "NtProtectVirtualMemory should succeed, got %08x\n", status); + todo_wine + ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); @@ -3477,6 +3506,7 @@ START_TEST(virtual) pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); + pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); test_shared_memory(FALSE); test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE);

1 0

Alexandre Julliard : winex11: Remove unnecessary CLIPBOARDINFO structure.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 6fec7d658b8b448926bd2fa5086b0eda7022cf4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fec7d658b8b448926bd2fa50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 4 18:30:39 2015 +0900 winex11: Remove unnecessary CLIPBOARDINFO structure. --- dlls/winex11.drv/clipboard.c | 111 +++++++++++++------------------------------ 1 file changed, 33 insertions(+), 78 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 96b7878..a460e0a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -99,15 +99,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipboard); #define S_PRIMARY 1 #define S_CLIPBOARD 2 -typedef struct -{ - HWND hWndOpen; - HWND hWndOwner; - HWND hWndViewer; - UINT seqno; - UINT flags; -} CLIPBOARDINFO, *LPCLIPBOARDINFO; - struct tagWINE_CLIPDATA; /* Forward */ typedef HANDLE (*DRVEXPORTFUNC)(Display *display, Window requestor, Atom aTarget, Atom rprop, @@ -168,8 +159,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, A static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat(UINT id, Atom prop); static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wFormatID); static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData); -static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void); -static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display, LPCLIPBOARDINFO lpcbinfo); +static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display); static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData); static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, unsigned char** data, unsigned long* datasize); @@ -483,34 +473,24 @@ static WINE_CLIPFORMAT *X11DRV_CLIPBOARD_InsertClipboardFormat( UINT id, Atom pr /************************************************************************** - * X11DRV_CLIPBOARD_GetClipboardInfo + * X11DRV_CLIPBOARD_IsProcessOwner */ -static BOOL X11DRV_CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) +static BOOL X11DRV_CLIPBOARD_IsProcessOwner( HWND *owner ) { - BOOL bRet = FALSE; + BOOL ret = FALSE; SERVER_START_REQ( set_clipboard_info ) { req->flags = 0; - - if (wine_server_call_err( req )) + if (!wine_server_call_err( req )) { - ERR("Failed to get clipboard owner.\n"); - } - else - { - cbInfo->hWndOpen = wine_server_ptr_handle( reply->old_clipboard ); - cbInfo->hWndOwner = wine_server_ptr_handle( reply->old_owner ); - cbInfo->hWndViewer = wine_server_ptr_handle( reply->old_viewer ); - cbInfo->seqno = reply->seqno; - cbInfo->flags = reply->flags; - - bRet = TRUE; + *owner = wine_server_ptr_handle( reply->old_owner ); + ret = (reply->flags & CB_PROCESS); } } SERVER_END_REQ; - return bRet; + return ret; } @@ -519,24 +499,16 @@ static BOOL X11DRV_CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo) */ static BOOL X11DRV_CLIPBOARD_ReleaseOwnership(void) { - BOOL bRet = FALSE; + BOOL ret; SERVER_START_REQ( set_clipboard_info ) { req->flags = SET_CB_RELOWNER | SET_CB_SEQNO; - - if (wine_server_call_err( req )) - { - ERR("Failed to set clipboard.\n"); - } - else - { - bRet = TRUE; - } + ret = !wine_server_call_err( req ); } SERVER_END_REQ; - return bRet; + return ret; } @@ -634,22 +606,24 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) /************************************************************************** * X11DRV_CLIPBOARD_UpdateCache */ -static BOOL X11DRV_CLIPBOARD_UpdateCache(LPCLIPBOARDINFO lpcbinfo) +static BOOL X11DRV_CLIPBOARD_UpdateCache(void) { BOOL bret = TRUE; - if (!X11DRV_CLIPBOARD_IsSelectionOwner()) + if (!selectionAcquired) { - if (!X11DRV_CLIPBOARD_GetClipboardInfo(lpcbinfo)) + DWORD seqno = GetClipboardSequenceNumber(); + + if (!seqno) { ERR("Failed to retrieve clipboard information.\n"); bret = FALSE; } - else if (wSeqNo < lpcbinfo->seqno) + else if (wSeqNo < seqno) { X11DRV_EmptyClipboard(TRUE); - if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display(), lpcbinfo) < 0) + if (X11DRV_CLIPBOARD_QueryAvailableData(thread_init_display()) < 0) { ERR("Failed to cache clipboard data owned by another process.\n"); bret = FALSE; @@ -659,7 +633,7 @@ static BOOL X11DRV_CLIPBOARD_UpdateCache(LPCLIPBOARDINFO lpcbinfo) X11DRV_EndClipboardUpdate(); } - wSeqNo = lpcbinfo->seqno; + wSeqNo = seqno; } } @@ -680,7 +654,7 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa if (lpData->wFlags & CF_FLAG_SYNTHESIZED) bret = X11DRV_CLIPBOARD_RenderSynthesizedFormat(display, lpData); - else if (!X11DRV_CLIPBOARD_IsSelectionOwner()) + else if (!selectionAcquired) { if (!X11DRV_CLIPBOARD_ReadSelectionData(display, lpData)) { @@ -691,15 +665,15 @@ static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpDa } else { - CLIPBOARDINFO cbInfo; + HWND owner = GetClipboardOwner(); - if (X11DRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner) + if (owner) { /* Send a WM_RENDERFORMAT message to notify the owner to render the * data requested into the clipboard. */ - TRACE("Sending WM_RENDERFORMAT message to hwnd(%p)\n", cbInfo.hWndOwner); - SendMessageW(cbInfo.hWndOwner, WM_RENDERFORMAT, lpData->wFormatID, 0); + TRACE("Sending WM_RENDERFORMAT message to hwnd(%p)\n", owner); + SendMessageW(owner, WM_RENDERFORMAT, lpData->wFormatID, 0); if (!lpData->hData) bret = FALSE; } @@ -2400,7 +2374,7 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p * This queries the selection owner for the TARGETS property and saves all * reported property types. */ -static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display, LPCLIPBOARDINFO lpcbinfo) +static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) { XEvent xe; Atom atype=AnyPropertyType; @@ -2841,21 +2815,19 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi if (selectionAcquired && (w == selectionWindow)) { - CLIPBOARDINFO cbinfo; + HWND owner; /* completely give up the selection */ TRACE("Lost CLIPBOARD (+PRIMARY) selection\n"); - X11DRV_CLIPBOARD_GetClipboardInfo(&cbinfo); - - if (cbinfo.flags & CB_PROCESS) + if (X11DRV_CLIPBOARD_IsProcessOwner( &owner )) { /* Since we're still the owner, this wasn't initiated by another Wine process */ if (OpenClipboard(hwnd)) { /* Destroy private objects */ - SendMessageW(cbinfo.hWndOwner, WM_DESTROYCLIPBOARD, 0, 0); + SendMessageW(owner, WM_DESTROYCLIPBOARD, 0, 0); /* Give up ownership of the windows clipboard */ X11DRV_CLIPBOARD_ReleaseOwnership(); @@ -2899,17 +2871,6 @@ static void X11DRV_CLIPBOARD_ReleaseSelection(Display *display, Atom selType, Wi /************************************************************************** - * IsSelectionOwner (X11DRV.@) - * - * Returns: TRUE if the selection is owned by this process, FALSE otherwise - */ -static BOOL X11DRV_CLIPBOARD_IsSelectionOwner(void) -{ - return selectionAcquired; -} - - -/************************************************************************** * X11DRV Clipboard Exports **************************************************************************/ @@ -3056,10 +3017,9 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) and its rendering is not delayed */ if (!owner) { - CLIPBOARDINFO cbinfo; LPWINE_CLIPDATA lpRender; - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if (!hData || ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat)) && @@ -3080,9 +3040,7 @@ BOOL CDECL X11DRV_SetClipboardData(UINT wFormat, HANDLE hData, BOOL owner) */ INT CDECL X11DRV_CountClipboardFormats(void) { - CLIPBOARDINFO cbinfo; - - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); TRACE(" count=%d\n", ClipDataCount); @@ -3095,12 +3053,11 @@ INT CDECL X11DRV_CountClipboardFormats(void) */ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) { - CLIPBOARDINFO cbinfo; struct list *ptr = NULL; TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if (!wFormat) { @@ -3123,11 +3080,10 @@ UINT CDECL X11DRV_EnumClipboardFormats(UINT wFormat) BOOL CDECL X11DRV_IsClipboardFormatAvailable(UINT wFormat) { BOOL bRet = FALSE; - CLIPBOARDINFO cbinfo; TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if (wFormat != 0 && X11DRV_CLIPBOARD_LookupData(wFormat)) bRet = TRUE; @@ -3143,12 +3099,11 @@ BOOL CDECL X11DRV_IsClipboardFormatAvailable(UINT wFormat) */ HANDLE CDECL X11DRV_GetClipboardData(UINT wFormat) { - CLIPBOARDINFO cbinfo; LPWINE_CLIPDATA lpRender; TRACE("(%04X)\n", wFormat); - X11DRV_CLIPBOARD_UpdateCache(&cbinfo); + X11DRV_CLIPBOARD_UpdateCache(); if ((lpRender = X11DRV_CLIPBOARD_LookupData(wFormat))) {

1 0

Vincent Povirk : winex11.drv: Report failure when we can' t convert a selection.
by Alexandre Julliard 04 May '15

04 May '15

Module: wine Branch: master Commit: 14eff7b92aef9442229a727212001fcb68a00f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eff7b92aef9442229a72721… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 1 15:05:11 2015 -0500 winex11.drv: Report failure when we can't convert a selection. --- dlls/winex11.drv/clipboard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index dad4a7a..96b7878 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3506,6 +3506,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev else { LPWINE_CLIPFORMAT lpFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, event->target); + BOOL success = FALSE; if (lpFormat && lpFormat->lpDrvExportFunc) { @@ -3536,9 +3537,13 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev GlobalUnlock(hClipData); GlobalFree(hClipData); + success = TRUE; } } } + + if (!success) + rprop = None; /* report failure to client */ } END:

1 0

← Newer
1
...
36
37
38
39
40
41
42
43
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 May 2015