December 2017 - Wine-devel - list.winehq.org

[PATCH 1/5] user32/tests: Explicitly test minimized window size.
by Zebediah Figura 22 Dec '17

22 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fc35542..c0d83ef 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6532,6 +6532,8 @@ static void test_ShowWindow(void) LPARAM ret; SetRect(&rcMain, 120, 120, 210, 210); + SetRect(&rcMinimized, -32000, -32000, -32000 + GetSystemMetrics(SM_CXMINIMIZED), + -32000 + GetSystemMetrics(SM_CYMINIMIZED)); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -6568,8 +6570,10 @@ static void test_ShowWindow(void) ok(style & WS_VISIBLE, "window should be visible\n"); ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); - GetWindowRect(hwnd, &rcMinimized); - ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n"); + GetWindowRect(hwnd, &rc); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); /* shouldn't be able to resize minimized windows */ ret = SetWindowPos(hwnd, 0, 0, 0, (rcMinimized.right - rcMinimized.left) * 2, @@ -6577,7 +6581,9 @@ static void test_ShowWindow(void) SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); ok(ret, "not expected ret: %lu\n", ret); GetWindowRect(hwnd, &rc); - ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6625,7 +6631,9 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ret = DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); ok(!ret, "not expected ret: %lu\n", ret); @@ -6635,7 +6643,9 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); @@ -6670,9 +6680,8 @@ static void test_ShowWindow(void) ok(style & WS_MINIMIZE, "window should be minimized\n"); GetWindowRect(hwnd, &rc); todo_wine - ok((rc.left == -32000 || rc.left == 3000) && - (rc.top == -32000 || rc.top == 3000), - "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); hwnd = CreateWindowExA(0, "MainWindowClass", NULL, @@ -6685,9 +6694,9 @@ static void test_ShowWindow(void) style = GetWindowLongA(hwnd, GWL_STYLE); ok(style & WS_MINIMIZE, "window should be minimized\n"); GetWindowRect(hwnd, &rc); - ok((rc.left == -32000 || rc.left == 3000) && - (rc.top == -32000 || rc.top == 3000), - "expected (-32000,-32000), got (%d,%d)\n", rc.left, rc.top); + todo_wine + ok(EqualRect(&rcMinimized, &rc), "expected %s, got %s\n", + wine_dbgstr_rect(&rcMinimized), wine_dbgstr_rect(&rc)); DestroyWindow(hwnd); } -- 2.7.4

3 10

[PATCH] msvcrt: Don't include MSVC 10.0+ math functions in SOs for older DLLs
by Alex Henrie 22 Dec '17

22 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This decreases the compile time and the size of the compiled binaries, though admittedly not as much as I had hoped. It will make more of a difference when we implement more of the new functions. dlls/msvcrt/math.c | 408 ++++++++++++++++++++++++++++------------------------- 1 file changed, 212 insertions(+), 196 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fb4666bef..12600e6712 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -130,17 +130,6 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef _WIN64 -/********************************************************************* - * _set_FMA3_enable (MSVCR120.@) - */ -int CDECL MSVCRT__set_FMA3_enable(int flag) -{ - FIXME("(%x) stub\n", flag); - return 0; -} -#endif - #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || _MSVCR_VER>=120 /********************************************************************* @@ -813,14 +802,6 @@ MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) return n >= 0 ? n : -n; } -/********************************************************************* - * llabs (MSVCRT.@) - */ -MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) -{ - return n >= 0 ? n : -n; -} - /********************************************************************* * _abs64 (MSVCRT.@) */ @@ -1227,58 +1208,6 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask return 0; } -/********************************************************************* - * fegetenv (MSVCR120.@) - */ -int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) -{ - env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | - MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); - env->status = _statusfp(); - return 0; -} - -/********************************************************************* - * __fpe_flt_rounds (UCRTBASE.@) - */ -int CDECL __fpe_flt_rounds(void) -{ - unsigned int fpc = _controlfp(0, 0) & MSVCRT__RC_CHOP; - - TRACE("()\n"); - - switch(fpc) { - case MSVCRT__RC_CHOP: return 0; - case MSVCRT__RC_NEAR: return 1; -#ifdef _WIN64 - case MSVCRT__RC_UP: return 3; - default: return 2; -#else - case MSVCRT__RC_UP: return 2; - default: return 3; -#endif - } -} - -/********************************************************************* - * fegetround (MSVCR120.@) - */ -int CDECL MSVCRT_fegetround(void) -{ - return _controlfp(0, 0) & MSVCRT__RC_CHOP; -} - -/********************************************************************* - * fesetround (MSVCR120.@) - */ -int CDECL MSVCRT_fesetround(int round_mode) -{ - if (round_mode & (~MSVCRT__RC_CHOP)) - return 1; - _controlfp(round_mode, MSVCRT__RC_CHOP); - return 0; -} - /********************************************************************* * _copysign (MSVCRT.@) */ @@ -1315,74 +1244,6 @@ void CDECL _fpreset(void) #endif } -/********************************************************************* - * fesetenv (MSVCR120.@) - */ -int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - struct { - WORD control_word; - WORD unused1; - WORD status_word; - WORD unused2; - WORD tag_word; - WORD unused3; - DWORD instruction_pointer; - WORD code_segment; - WORD unused4; - DWORD operand_addr; - WORD data_segment; - WORD unused5; - } fenv; - - TRACE( "(%p)\n", env ); - - if (!env->control && !env->status) { - _fpreset(); - return 0; - } - - __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); - - fenv.control_word &= ~0x3d; - if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; - if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; - if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; - if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; - if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; - - fenv.status_word &= ~0x3d; - if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; - if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; - if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; - if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; - if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; - - __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", - "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); - - if (sse2_supported) - { - DWORD fpword; - - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - fpword &= ~0x1e80; - if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; - if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; - if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; - if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; - if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; - __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); - } - - return 0; -#else - FIXME( "not implemented\n" ); -#endif - return 1; -} - /********************************************************************* * _isnan (MSVCRT.@) */ @@ -1469,30 +1330,6 @@ double CDECL MSVCRT__yn(int order, double num) return retval; } -/********************************************************************* - * _nearbyint (MSVCRT.@) - */ -double CDECL MSVCRT_nearbyint(double num) -{ -#ifdef HAVE_NEARBYINT - return nearbyint(num); -#else - return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); -#endif -} - -/********************************************************************* - * _nearbyintf (MSVCRT.@) - */ -float CDECL MSVCRT_nearbyintf(float num) -{ -#ifdef HAVE_NEARBYINTF - return nearbyintf(num); -#else - return MSVCRT_nearbyint(num); -#endif -} - /********************************************************************* * _nextafter (MSVCRT.@) */ @@ -1888,19 +1725,6 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ -/********************************************************************* - * lldiv (MSVCRT.@) - */ -MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) -{ - MSVCRT_lldiv_t ret; - - ret.quot = num / denom; - ret.rem = num % denom; - - return ret; -} - #ifdef __i386__ /********************************************************************* @@ -2376,6 +2200,179 @@ void __cdecl MSVCRT___libm_sse2_sqrt_precise(void) #endif /* __i386__ */ +/********************************************************************* + * _scalb (MSVCRT.@) + * scalbn (MSVCR120.@) + * scalbln (MSVCR120.@) + */ +double CDECL MSVCRT__scalb(double num, MSVCRT_long power) +{ + return MSVCRT_ldexp(num, power); +} + +/********************************************************************* + * _scalbf (MSVCRT.@) + * scalbnf (MSVCR120.@) + * scalblnf (MSVCR120.@) + */ +float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) +{ + return MSVCRT_ldexp(num, power); +} + +#if _MSVCR_VER>=100 + +/********************************************************************* + * llabs (MSVCR100.@) + * llabs (MSVCR110.@) + * llabs (MSVCR120.@) + */ +MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * lldiv (MSVCR100.@) + * lldiv (MSVCR110.@) + * lldiv (MSVCR120.@) + */ +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +{ + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; + + return ret; +} + +#endif /* _MSVCR_VER>=100 */ + +#if _MSVCR_VER>=120 + +/********************************************************************* + * fegetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) +{ + env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | + MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); + env->status = _statusfp(); + return 0; +} + +/********************************************************************* + * fegetround (MSVCR120.@) + */ +int CDECL MSVCRT_fegetround(void) +{ + return _controlfp(0, 0) & MSVCRT__RC_CHOP; +} + +/********************************************************************* + * fesetround (MSVCR120.@) + */ +int CDECL MSVCRT_fesetround(int round_mode) +{ + if (round_mode & (~MSVCRT__RC_CHOP)) + return 1; + _controlfp(round_mode, MSVCRT__RC_CHOP); + return 0; +} + +/********************************************************************* + * fesetenv (MSVCR120.@) + */ +int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) +{ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + struct { + WORD control_word; + WORD unused1; + WORD status_word; + WORD unused2; + WORD tag_word; + WORD unused3; + DWORD instruction_pointer; + WORD code_segment; + WORD unused4; + DWORD operand_addr; + WORD data_segment; + WORD unused5; + } fenv; + + TRACE( "(%p)\n", env ); + + if (!env->control && !env->status) { + _fpreset(); + return 0; + } + + __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); + + fenv.control_word &= ~0x3d; + if (env->control & MSVCRT__EM_INVALID) fenv.control_word |= 0x1; + if (env->control & MSVCRT__EM_ZERODIVIDE) fenv.control_word |= 0x4; + if (env->control & MSVCRT__EM_OVERFLOW) fenv.control_word |= 0x8; + if (env->control & MSVCRT__EM_UNDERFLOW) fenv.control_word |= 0x10; + if (env->control & MSVCRT__EM_INEXACT) fenv.control_word |= 0x20; + + fenv.status_word &= ~0x3d; + if (env->status & MSVCRT__SW_INVALID) fenv.status_word |= 0x1; + if (env->status & MSVCRT__SW_ZERODIVIDE) fenv.status_word |= 0x4; + if (env->status & MSVCRT__SW_OVERFLOW) fenv.status_word |= 0x8; + if (env->status & MSVCRT__SW_UNDERFLOW) fenv.status_word |= 0x10; + if (env->status & MSVCRT__SW_INEXACT) fenv.status_word |= 0x20; + + __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", + "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); + + if (sse2_supported) + { + DWORD fpword; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + fpword &= ~0x1e80; + if (env->control & MSVCRT__EM_INVALID) fpword |= 0x80; + if (env->control & MSVCRT__EM_ZERODIVIDE) fpword |= 0x200; + if (env->control & MSVCRT__EM_OVERFLOW) fpword |= 0x400; + if (env->control & MSVCRT__EM_UNDERFLOW) fpword |= 0x800; + if (env->control & MSVCRT__EM_INEXACT) fpword |= 0x1000; + __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + } + + return 0; +#else + FIXME( "not implemented\n" ); +#endif + return 1; +} + +/********************************************************************* + * _nearbyint (MSVCR120.@) + */ +double CDECL MSVCRT_nearbyint(double num) +{ +#ifdef HAVE_NEARBYINT + return nearbyint(num); +#else + return num >= 0 ? floor(num + 0.5) : ceil(num - 0.5); +#endif +} + +/********************************************************************* + * _nearbyintf (MSVCR120.@) + */ +float CDECL MSVCRT_nearbyintf(float num) +{ +#ifdef HAVE_NEARBYINTF + return nearbyintf(num); +#else + return MSVCRT_nearbyint(num); +#endif +} + /********************************************************************* * cbrt (MSVCR120.@) */ @@ -3126,26 +3123,6 @@ LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) return MSVCR120_atanh(x); } -/********************************************************************* - * _scalb (MSVCRT.@) - * scalbn (MSVCR120.@) - * scalbln (MSVCR120.@) - */ -double CDECL MSVCRT__scalb(double num, MSVCRT_long power) -{ - return MSVCRT_ldexp(num, power); -} - -/********************************************************************* - * _scalbf (MSVCRT.@) - * scalbnf (MSVCR120.@) - * scalblnf (MSVCR120.@) - */ -float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) -{ - return MSVCRT_ldexp(num, power); -} - /********************************************************************* * scalbnl (MSVCR120.@) * scalblnl (MSVCR120.@) @@ -3337,3 +3314,42 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } + +#ifdef _WIN64 +/********************************************************************* + * _set_FMA3_enable (MSVCR120.@) + */ +int CDECL MSVCRT__set_FMA3_enable(int flag) +{ + FIXME("(%x) stub\n", flag); + return 0; +} +#endif + +#endif /* _MSVCR_VER>=120 */ + +#if _MSVCR_VER>=140 + +/********************************************************************* + * __fpe_flt_rounds (UCRTBASE.@) + */ +int CDECL __fpe_flt_rounds(void) +{ + unsigned int fpc = _controlfp(0, 0) & MSVCRT__RC_CHOP; + + TRACE("()\n"); + + switch(fpc) { + case MSVCRT__RC_CHOP: return 0; + case MSVCRT__RC_NEAR: return 1; +#ifdef _WIN64 + case MSVCRT__RC_UP: return 3; + default: return 2; +#else + case MSVCRT__RC_UP: return 2; + default: return 3; +#endif + } +} + +#endif /* _MSVCR_VER>=140 */ -- 2.15.1

2 1

[PATCH] winhttp/tests: Fix typos in ok() messages.
by Andrey Gusev 22 Dec '17

22 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 702c6a1bcc..da8f8e9bd9 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -944,7 +944,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons WaitForSingleObject( info->wait, INFINITE ); len = strlen(expected_data); - ok(!memcmp(buffer, expected_data, len), "unexpeceted data\n"); + ok(!memcmp(buffer, expected_data, len), "unexpected data\n"); } static void test_persistent_connection(int port) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 469b882bec..ec33b56d1f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -568,7 +568,7 @@ static void test_WinHttpAddHeaders(void) SetLastError(0xdeadbeef); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); err = GetLastError(); - ok(ret, "WinHttpAddRequestHeader failed to add new header, got %d with error %u.\n", ret, err); + ok(ret, "WinHttpAddRequestHeaders failed to add new header, got %d with error %u.\n", ret, err); ok(err == ERROR_SUCCESS || broken(err == 0xdeadbeef) /* < win7 */, "got %u\n", err); index = 0; -- 2.13.6

2 1

[PATCH] msi/tests: Fix typos in ok() messages.
by Andrey Gusev 22 Dec '17

22 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/record.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6713bc0b2d..3cbb9b3e28 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4777,7 +4777,7 @@ static void test_update(void) MsiCloseHandle(rec); r = MsiViewFetch(view, &rec); - ok(r == ERROR_NO_MORE_ITEMS, "Expectd ERROR_NO_MORE_ITEMS, got %d\n", r); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(view); MsiCloseHandle(view); diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 5caaefc72d..777f1f78ed 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -510,7 +510,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -529,7 +529,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -548,7 +548,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - ok(sz == 0, "Expectd 0, got %d\n", sz); + ok(sz == 0, "Expected 0, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == TRUE, "Expected TRUE, got %d\n", r); @@ -558,7 +558,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 1, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf); - ok(sz == 7, "Expectd 7, got %d\n", sz); + ok(sz == 7, "Expected 7, got %d\n", sz); MsiCloseHandle(rec); @@ -599,7 +599,7 @@ static void test_fieldzero(void) r = MsiRecordGetStringA(rec, 0, buf, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf); - ok(sz == 5, "Expectd 5, got %d\n", sz); + ok(sz == 5, "Expected 5, got %d\n", sz); r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); -- 2.13.6

2 1

[PATCH] winhttp/tests: Fix an intermittent test failure on Windows XP/Vista.
by Hans Leidekker 22 Dec '17

22 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/winhttp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 469b882bec..1529227ed3 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -319,7 +319,7 @@ static void test_SendRequest (void) static CHAR post_data[] = "mode=Test"; static const char test_post[] = "mode => Test\0\n"; HINTERNET session, request, connection; - DWORD header_len, optional_len, total_len, bytes_rw, size, err; + DWORD header_len, optional_len, total_len, bytes_rw, size, err, disable; DWORD_PTR context; BOOL ret; CHAR buffer[256]; @@ -350,6 +350,12 @@ static void test_SendRequest (void) ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + /* writing more data than promised by the content-length header causes an error when the connection + is resued, so disable keep-alive */ + disable = WINHTTP_DISABLE_KEEP_ALIVE; + ret = WinHttpSetOption(request, WINHTTP_OPTION_DISABLE_FEATURE, &disable, sizeof(disable)); + ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); err = GetLastError(); -- 2.11.0

1 0

[PATCH] [cmd] - remove trailing spaces in WCMD_addCommand
by Vijay Kiran Kamuju 22 Dec '17

22 Dec '17

Fixes https://bugs.winehq.org/show_bug.cgi?id=44133 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 0609bb7f3fb..3b0a4b5f0c3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1470,7 +1470,7 @@ BOOL WCMD_delete (WCHAR *args) { * Pre: s non NULL * */ -static WCHAR *WCMD_strtrim(const WCHAR *s) +WCHAR *WCMD_strtrim(const WCHAR *s) { DWORD len = strlenW(s); const WCHAR *start = s; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d97a0067e..321b9263a06 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -112,6 +112,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdli WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline, const WCHAR *delims); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); +WCHAR *WCMD_strtrim(const WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 827ddd21219..f4729448b27 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1680,15 +1680,17 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, CMD_LIST **lastEntry, CMD_LIST **output) { CMD_LIST *thisEntry = NULL; + WCHAR *trimcmd = WCMD_strtrim(command); + int trimlen = strlenW(trimcmd); /* Allocate storage for command */ thisEntry = heap_alloc(sizeof(CMD_LIST)); /* Copy in the command */ if (command) { - thisEntry->command = heap_alloc((*commandLen+1) * sizeof(WCHAR)); - memcpy(thisEntry->command, command, *commandLen * sizeof(WCHAR)); - thisEntry->command[*commandLen] = 0x00; + thisEntry->command = heap_alloc((trimlen+1) * sizeof(WCHAR)); + memcpy(thisEntry->command, trimcmd, trimlen * sizeof(WCHAR)); + thisEntry->command[trimlen] = 0x00; /* Copy in the redirects */ thisEntry->redirects = heap_alloc((*redirLen+1) * sizeof(WCHAR)); -- 2.15.1

2 1

[PATCH v2] regedit/tests: Skip tests if running as non-elevated admin.
by Zebediah Figura 22 Dec '17

22 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/tests/regedit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d558f2b..c8f3434 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3635,6 +3635,12 @@ START_TEST(regedit) return; } + if (!run_regedit_exe("regedit.exe /s test.reg") && GetLastError() == ERROR_ELEVATION_REQUIRED) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + test_basic_import(); test_basic_import_unicode(); test_basic_import_31(); -- 2.7.4

1 0

[PATCH] regedit/tests: Skip tests if running as non-elevated admin.
by Zebediah Figura 22 Dec '17

22 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/regedit/tests/regedit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d558f2b..c8f3434 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3635,6 +3635,12 @@ START_TEST(regedit) return; } + if (!run_regedit_exe("regedit.exe") && GetLastError() == ERROR_ELEVATION_REQUIRED) + { + win_skip("User is a non-elevated admin; skipping regedit tests.\n"); + return; + } + test_basic_import(); test_basic_import_unicode(); test_basic_import_31(); -- 2.7.4

2 2

[PATCH] kernel32/tests: Fix a typo in ok() message.
by Andrey Gusev 22 Dec '17

22 Dec '17

For bug 44161. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 91eb162ebd..365e38c444 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -260,7 +260,7 @@ static void test_GetVolumeNameForVolumeMountPointW(void) } ret = pGetVolumeNameForVolumeMountPointW(path, volume, 0); - ok(ret == FALSE, "GetVolumeNameForVolumeMountPointA succeeded\n"); + ok(ret == FALSE, "GetVolumeNameForVolumeMountPointW succeeded\n"); ok(GetLastError() == ERROR_FILENAME_EXCED_RANGE || GetLastError() == ERROR_INVALID_PARAMETER, /* Vista */ "wrong error, last=%d\n", GetLastError()); -- 2.13.6

1 0

[PATCH] comctl32/tests: Fix a typo in ok() message.
by Andrey Gusev 22 Dec '17

22 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index a6939bdb71..46bb431037 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -194,7 +194,7 @@ static void test_Alloc(void) /* reallocate a NULL ptr */ p = pReAlloc(NULL, 2); - ok(p != NULL, "Expectd non-NULL ptr\n"); + ok(p != NULL, "Expected non-NULL ptr\n"); res = pFree(p); ok(res == TRUE, "Expected TRUE, got %d\n", res); -- 2.13.6

1 0