November 2015 - Wine-Commits

Tag wine-1.8-rc2 : Alexandre Julliard : Release 1.8-rc2
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

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

Sergey Isakov : tapi32: Simplify the logic in an if condition.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 3557870302b8256bffc67d578d4c36b7cfefb349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3557870302b8256bffc67d578… Author: Sergey Isakov <isakov-sl(a)bk.ru> Date: Fri Nov 27 07:12:30 2015 +0300 tapi32: Simplify the logic in an if condition. Signed-off-by: Sergey Isakov <isakov-sl(a)bk.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/assisted.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 9e68a5c..0d707db 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -60,7 +60,7 @@ DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0}; - if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) { + if(RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) == ERROR_SUCCESS) { valsize = sizeof( DWORD); if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && type == REG_DWORD) {

1 0

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

Nov. 27, 2015

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

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

Nov. 27, 2015

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

Sergey Isakov : msi/tests: Simplify the logic in an if condition.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: 88a96478c38f3ec7acb4dfd0195d5ba1419aaaa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a96478c38f3ec7acb4dfd01… Author: Sergey Isakov <isakov-sl(a)bk.ru> Date: Fri Nov 27 07:11:59 2015 +0300 msi/tests: Simplify the logic in an if condition. Signed-off-by: Sergey Isakov <isakov-sl(a)bk.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/automation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index a1df3f1..d02e9a2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -878,7 +878,7 @@ static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARA hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); - if (!hr == S_OK) return hr; + if (hr != S_OK) return hr; memset(&excepinfo, 0, sizeof(excepinfo)); hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_NEUTRAL, wFlags, pDispParams, pVarResult, &excepinfo, NULL);

1 0

Alexandre Julliard : winex11: Flush the output of a flushed surface right away.
by Alexandre Julliard Nov. 27, 2015

Nov. 27, 2015

Module: wine Branch: master Commit: c7c1fb5eabbe12ea2e7a105845fed5308191984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c1fb5eabbe12ea2e7a10584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 27 18:47:01 2015 +0900 winex11: Flush the output of a flushed surface right away. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 2fc7c94..8d61a4b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1937,6 +1937,7 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) surface->header.rect.top + coords.visrect.top, coords.visrect.right - coords.visrect.left, coords.visrect.bottom - coords.visrect.top ); + XFlush( gdi_display ); } reset_bounds( &surface->bounds ); window_surface->funcs->unlock( window_surface );

1 0

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

Nov. 27, 2015

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

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

Nov. 27, 2015

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 Nov. 27, 2015

Nov. 27, 2015

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

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Nov. 26, 2015

Nov. 26, 2015

Module: wine Branch: master Commit: a58c4df5f53db7b354879f84106e22c3a412e383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58c4df5f53db7b354879f841… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 25 20:04:21 2015 -0700 po: Update Catalan translation. Includes suggestions from Jordi Mas of Softcatalà. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 436 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 205 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a58c4df5f53db7b354879…

1 0