November 2015 - Wine-commits

Nikolay Sivov : d3dx9: Use proper enum member (Clang).
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 236d97fed913d2e59d5438b569a8555209d908ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=236d97fed913d2e59d5438b56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 27 11:53:59 2015 +0300 d3dx9: Use proper enum member (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e9d893b..e25480d 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -372,7 +372,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); @@ -507,7 +507,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex); @@ -630,7 +630,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); EnterCriticalSection(&from_file_mutex); - hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); + hr = ID3DXInclude_Open(include, D3DXINC_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { LeaveCriticalSection(&from_file_mutex);

1 0

Nikolay Sivov : ntdll: Remove unused helper (Clang).
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 1ea99a8f298a45f91923654e18a19a2caa75b68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea99a8f298a45f91923654e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 27 11:57:49 2015 +0300 ntdll: Remove unused helper (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5c3aa819..5582299 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1011,25 +1011,6 @@ static inline void save_fpu( CONTEXT *context ) /*********************************************************************** - * save_fpux - * - * Save the thread FPU extended context. - */ -static inline void save_fpux( CONTEXT *context ) -{ -#ifdef __GNUC__ - /* we have to enforce alignment by hand */ - char buffer[sizeof(XMM_SAVE_AREA32) + 16]; - XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); - - __asm__ __volatile__( "fxsave %0" : "=m" (*state) ); - context->ContextFlags |= CONTEXT_EXTENDED_REGISTERS; - memcpy( context->ExtendedRegisters, state, sizeof(*state) ); -#endif -} - - -/*********************************************************************** * restore_fpu * * Restore the FPU context to a sigcontext.

1 0

Joachim Priesner : kernel32/tests: Add tests for GetDriveType with invalid drive spec.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: ceb57b781748807900d88ac06832fe750b7c44d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb57b781748807900d88ac06… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Nov 26 23:49:39 2015 +0100 kernel32/tests: Add tests for GetDriveType with invalid drive spec. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/drive.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 4acd3e8..98dc454 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -30,6 +30,7 @@ static DWORD (WINAPI *pGetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INT static void test_GetDriveTypeA(void) { char drive[] = "?:\\"; + char existing_drive_letter = 0; DWORD logical_drives; UINT type; @@ -46,14 +47,43 @@ static void test_GetDriveTypeA(void) ok(type == DRIVE_NO_ROOT_DIR, "GetDriveTypeA should return DRIVE_NO_ROOT_DIR for inexistent drive %c: but not %u\n", drive[0], type); + else if (type != DRIVE_NO_ROOT_DIR) + existing_drive_letter = drive[0]; logical_drives >>= 1; } + + if (!existing_drive_letter) { + skip("No drives found, skipping drive spec format tests.\n"); + return; + } + + drive[0] = existing_drive_letter; + drive[2] = 0; /* C: */ + type = GetDriveTypeA(drive); + ok(type > DRIVE_NO_ROOT_DIR && type <= DRIVE_RAMDISK, "got %u for drive spec '%s'\n", type, drive); + + drive[1] = '?'; /* C? */ + type = GetDriveTypeA(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, drive); + + drive[1] = 0; /* C */ + type = GetDriveTypeA(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, drive); + + drive[0] = '?'; /* the string "?" */ + type = GetDriveTypeA(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, drive); + + drive[0] = 0; /* the empty string */ + type = GetDriveTypeA(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, drive); } static void test_GetDriveTypeW(void) { WCHAR drive[] = {'?',':','\\',0}; + WCHAR existing_drive_letter = 0; DWORD logical_drives; UINT type; @@ -70,9 +100,38 @@ static void test_GetDriveTypeW(void) ok(type == DRIVE_NO_ROOT_DIR, "GetDriveTypeW should return DRIVE_NO_ROOT_DIR for inexistent drive %c: but not %u\n", drive[0], type); + else if (type != DRIVE_NO_ROOT_DIR) + existing_drive_letter = drive[0]; logical_drives >>= 1; } + + if (!existing_drive_letter) { + skip("No drives found, skipping drive spec format tests.\n"); + return; + } + + drive[0] = existing_drive_letter; + drive[2] = 0; /* C: */ + type = GetDriveTypeW(drive); + ok(type > DRIVE_NO_ROOT_DIR && type <= DRIVE_RAMDISK, "got %u for drive spec '%s'\n", + type, wine_dbgstr_w(drive)); + + drive[1] = '?'; /* C? */ + type = GetDriveTypeW(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, wine_dbgstr_w(drive)); + + drive[1] = 0; /* C */ + type = GetDriveTypeW(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, wine_dbgstr_w(drive)); + + drive[0] = '?'; /* the string "?" */ + type = GetDriveTypeW(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, wine_dbgstr_w(drive)); + + drive[0] = 0; /* the empty string */ + type = GetDriveTypeW(drive); + ok(type == DRIVE_NO_ROOT_DIR, "got %u for drive spec '%s'\n", type, wine_dbgstr_w(drive)); } static void test_GetDiskFreeSpaceA(void)

1 0

Jacek Caban : ieframe: Silence some noisy FIXMEs.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 8900609ded78de15d0ee874318043a365accdffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8900609ded78de15d0ee87431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 27 11:50:12 2015 +0100 ieframe: Silence some noisy FIXMEs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 2d4261a..424868d 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -655,13 +655,13 @@ static HRESULT WINAPI ClOleCommandTarget_QueryStatus(IOleCommandTarget *iface, const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText) { DocHost *This = impl_from_IOleCommandTarget(iface); - ULONG i= 0; - FIXME("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, + ULONG i; + + TRACE("(%p)->(%s %u %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); - while (prgCmds && (cCmds > i)) { - FIXME("command_%u: %u, 0x%x\n", i, prgCmds[i].cmdID, prgCmds[i].cmdf); - i++; - } + for(i=0; prgCmds && i < cCmds; i++) + TRACE("unsupported command %u (%x)\n", prgCmds[i].cmdID, prgCmds[i].cmdf); + return E_NOTIMPL; } @@ -690,7 +690,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, notify_download_state(This, V_I4(pvaIn)); return S_OK; default: - FIXME("Unimplemented cmdid %d\n", nCmdID); + TRACE("Unimplemented cmdid %d\n", nCmdID); return E_NOTIMPL; } } @@ -742,7 +742,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } default: - FIXME("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); + TRACE("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); return E_NOTIMPL; } } @@ -755,7 +755,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, return S_OK; default: - FIXME("Unimplemented cmdid %d of CGID_Explorer\n", nCmdID); + TRACE("Unimplemented cmdid %d of CGID_Explorer\n", nCmdID); return E_NOTIMPL; } } @@ -763,7 +763,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(IsEqualGUID(pguidCmdGroup, &CGID_ShellDocView)) { switch(nCmdID) { default: - FIXME("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID); + TRACE("Unimplemented cmdid %d of CGID_ShellDocView\n", nCmdID); return E_NOTIMPL; } } @@ -774,7 +774,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, return IOleCommandTarget_Exec(This->olecmd, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); } - FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); + TRACE("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; }

1 0

Alexandre Julliard : Release 1.8-rc2.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: e6c67c52757508ce92c3819bb14e87c2ab21fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c67c52757508ce92c3819bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 23:18:47 2015 +0900 Release 1.8-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 410 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 227 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6c67c52757508ce92c38…

1 0

Tag wine-1.8-rc2 : Alexandre Julliard : Release 1.8-rc2
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: refs/tags/wine-1.8-rc2 Tag: 3e51b50ece94bf616365d502b488335df4f90b22 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3e51b50ece94bf616365d502b488… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 23:18:47 2015 +0900 Release 1.8-rc2

1 0

Thomas Faber : ntdll/tests: Fix build with PSDK headers.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 429fcf3a9de63b3e88632b66aa33e672ad80ff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=429fcf3a9de63b3e88632b66a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Nov 24 17:52:28 2015 +0100 ntdll/tests: Fix build with PSDK headers. CRITICAL_SECTION is distinct from RTL_CRITICAL_SECTION in PSDK. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 0f79f7d..94a22ac 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -96,8 +96,8 @@ static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULON static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); -static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(RTL_CRITICAL_SECTION *); -static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(RTL_CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); +static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);

1 0

Thomas Faber : gdiplus/tests: Fix build with MSVC.
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 9b82368c3659e360f12b3dd557abaa65d45486ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b82368c3659e360f12b3dd55… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Nov 26 17:34:49 2015 +0100 gdiplus/tests: Fix build with MSVC. VC 2010 can't initialize a structure with a structure. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d3e7202..6be4a5b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4699,10 +4699,10 @@ static void test_createeffect(void) CGpEffect *effect; HMODULE mod = GetModuleHandleA("gdiplus.dll"); int i; - const GUID effectlist[] = - {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid, - BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid, - TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid}; + const GUID * const effectlist[] = + {&BlurEffectGuid, &SharpenEffectGuid, &ColorMatrixEffectGuid, &ColorLUTEffectGuid, + &BrightnessContrastEffectGuid, &HueSaturationLightnessEffectGuid, &LevelsEffectGuid, + &TintEffectGuid, &ColorBalanceEffectGuid, &RedEyeCorrectionEffectGuid, &ColorCurveEffectGuid}; pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); @@ -4719,9 +4719,9 @@ static void test_createeffect(void) stat = pGdipCreateEffect(noneffect, &effect); todo_wine expect(Win32Error, stat); - for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++) + for(i=0; i < sizeof(effectlist) / sizeof(effectlist[0]); i++) { - stat = pGdipCreateEffect(effectlist[i], &effect); + stat = pGdipCreateEffect(*effectlist[i], &effect); todo_wine expect(Ok, stat); if(stat == Ok) {

1 0

André Hentschel : ws2_32/tests: Don' t test function directly when reporting WSAGetLastError().
by Alexandre Julliard 27 Nov '15

27 Nov '15

Module: wine Branch: master Commit: 3701d7714eddc81013b98822a97eb65aa355effd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3701d7714eddc81013b98822a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 26 23:04:53 2015 +0100 ws2_32/tests: Don't test function directly when reporting WSAGetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f483197..00fac77 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6575,8 +6575,8 @@ static void test_WSAPoll(void) ok(POLL_ISSET(fdRead, POLLWRNORM), "fdRead socket events incorrect\n"); len = sizeof(id); id = 0xdeadbeef; - ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), - "getsockopt failed with %d\n",WSAGetLastError()); + err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(id == 0, "expected 0, got %d\n", id); /* Test data receiving notifications */ @@ -6655,8 +6655,8 @@ static void test_WSAPoll(void) ok(ret == 0, "expected 0, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; - ok(!getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len), - "getsockopt failed with %d\n", WSAGetLastError()); + err = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); closesocket(fdWrite);

1 0

Nikolay Sivov : winex11: Simplify XGetWindowProperty return code checks ( Clang).
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: a6a20ccc3c9ae7d9a8cef84639cb98a5c9b0410f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a20ccc3c9ae7d9a8cef8463… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 26 00:28:53 2015 +0300 winex11: Simplify XGetWindowProperty return code checks (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 842ebfe..5dc5e3c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2448,7 +2448,7 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) /* Read the TARGETS property contents */ if (!XGetWindowProperty(display, xe.xselection.requestor, xe.xselection.property, 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets, - &remain, (unsigned char**)&targetList) != Success) + &remain, (unsigned char**)&targetList)) { TRACE("Type %lx,Format %d,nItems %ld, Remain %ld\n", atype, aformat, cSelectionTargets, remain); @@ -2583,7 +2583,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, for (;;) { if (XGetWindowProperty(display, w, prop, pos, INT_MAX / 4, False, - AnyPropertyType, atype, &aformat, &nitems, &remain, &buffer) != Success) + AnyPropertyType, atype, &aformat, &nitems, &remain, &buffer)) { WARN("Failed to read property\n"); HeapFree( GetProcessHeap(), 0, val ); @@ -3354,7 +3354,7 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent if (!XGetWindowProperty(display, pevent->requestor, rprop, 0, 0x3FFF, False, AnyPropertyType, &atype,&aformat, &cTargetPropList, &remain, - (unsigned char**)&targetPropList) != Success) + (unsigned char**)&targetPropList)) { if (TRACE_ON(clipboard)) {

1 0