February 2016 - Wine-Commits

Alexandre Julliard : wrc: Only allow control key characters ^A to ^Z.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: e8076eeced9b49b2e1211dd3f009105b39ed75bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8076eeced9b49b2e1211dd3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:29:45 2016 +0900 wrc: Only allow control key characters ^A to ^Z. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e23c789..336e64e 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -297,8 +297,11 @@ static int parse_accel_string( const string_t *key, int flags ) } else if(key->str.cstr[0] == '^') { - keycode = toupper((unsigned char)key->str.cstr[1]) - '@'; - if(keycode >= ' ') + if (key->str.cstr[1] >= 'a' && key->str.cstr[1] <= 'z') + keycode = key->str.cstr[1] - 'a' + 1; + else if (key->str.cstr[1] >= 'A' && key->str.cstr[1] <= 'Z') + keycode = key->str.cstr[1] - 'A' + 1; + else { print_location( &key->loc ); error("Control-code out of range\n"); @@ -324,8 +327,11 @@ static int parse_accel_string( const string_t *key, int flags ) } else if(key->str.wstr[0] == '^') { - keycode = toupperW(key->str.wstr[1]) - '@'; - if(keycode >= ' ') + if (key->str.wstr[1] >= 'a' && key->str.wstr[1] <= 'z') + keycode = key->str.wstr[1] - 'a' + 1; + else if (key->str.wstr[1] >= 'A' && key->str.wstr[1] <= 'Z') + keycode = key->str.wstr[1] - 'A' + 1; + else { print_location( &key->loc ); error("Control-code out of range\n");

1 0

Alexandre Julliard : wrc: Don' t convert class and menu names to uppercase in resource data.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 22cb2beb1cefb43928f194e4428bc30858cb34a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cb2beb1cefb43928f194e44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:28:32 2016 +0900 wrc: Don't convert class and menu names to uppercase in resource data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 8993a87..e23c789 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -657,11 +657,11 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) put_word(res, dlg->width); put_word(res, dlg->height); if(dlg->menu) - put_name_id(res, dlg->menu, TRUE, dlg->lvc.language); + put_name_id(res, dlg->menu, FALSE, dlg->lvc.language); else put_word(res, 0); if(dlg->dlgclass) - put_name_id(res, dlg->dlgclass, TRUE, dlg->lvc.language); + put_name_id(res, dlg->dlgclass, FALSE, dlg->lvc.language); else put_word(res, 0); if(dlg->title) @@ -709,7 +709,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) else put_word(res, ctrl->id); if(ctrl->ctlclass) - put_name_id(res, ctrl->ctlclass, TRUE, dlg->lvc.language); + put_name_id(res, ctrl->ctlclass, FALSE, dlg->lvc.language); else internal_error(__FILE__, __LINE__, "Control has no control-class\n"); if(ctrl->title)

1 0

Piotr Caban : msvcrt/tests: Add close tests on file descriptors that use the same HANDLE.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 96d476584e771bb352c8b8a84ff51f67a63f0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d476584e771bb352c8b8a84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 19 18:43:31 2016 +0100 msvcrt/tests: Add close tests on file descriptors that use the same HANDLE. Based on Qian Hong patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ba8c3e3..dbb6cef 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2327,6 +2327,64 @@ static void test_write_flush(void) free(tempf); } +static void test_close(void) +{ + ioinfo *stdout_info, stdout_copy, *stderr_info, stderr_copy; + int fd1, fd2, ret1, ret2, ret3, ret4; + DWORD flags; + HANDLE h; + + /* test close on fds that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + fd1 = _open_osfhandle((intptr_t)h, 0); + ok(fd1 != -1, "_open_osfhandle failed (%d)\n", errno); + fd2 = _open_osfhandle((intptr_t)h, 0); + ok(fd2 != -1, "_open_osfhandle failed (%d)\n", errno); + ok(fd1 != fd2, "fd1 == fd2\n"); + + ok((HANDLE)_get_osfhandle(fd1) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd1), h); + ok((HANDLE)_get_osfhandle(fd2) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd2), h); + ok(!close(fd1), "close(fd1) failed (%d)\n", errno); + ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); + ok(close(fd2), "close(fd2) succeeded\n"); + + /* test close on stdout and stderr that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + /* tests output will not be visible from now on */ + stdout_info = &__pioinfo[STDOUT_FILENO/MSVCRT_FD_BLOCK_SIZE][STDOUT_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stderr_info = &__pioinfo[STDERR_FILENO/MSVCRT_FD_BLOCK_SIZE][STDERR_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stdout_copy = *stdout_info; + stderr_copy = *stderr_info; + stdout_info->handle = h; + stderr_info->handle = h; + + ret1 = close(STDOUT_FILENO); + ret2 = GetHandleInformation(h, &flags); + ret3 = close(STDERR_FILENO); + ret4 = GetHandleInformation(h, &flags); + + *stdout_info = stdout_copy; + *stderr_info = stderr_copy; + SetStdHandle(STD_OUTPUT_HANDLE, stdout_info->handle); + SetStdHandle(STD_ERROR_HANDLE, stderr_info->handle); + /* stdout and stderr restored */ + + ok(!ret1, "close(STDOUT_FILENO) failed\n"); + ok(ret2, "GetHandleInformation failed\n"); + ok(!ret3, "close(STDERR_FILENO) failed\n"); + ok(!ret4, "GetHandleInformation succeeded\n"); + + DeleteFileA( "fdopen.tst" ); +} + START_TEST(file) { int arg_c; @@ -2393,6 +2451,7 @@ START_TEST(file) test_mktemp(); test__open_osfhandle(); test_write_flush(); + test_close(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Frédéric Delanoy : user32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: fa56de2cd67c661b358e38883aba48144c28e759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa56de2cd67c661b358e38883… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 16:20:58 2016 +0100 user32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 3 +-- dlls/user32/tests/msg.c | 7 +------ dlls/user32/tests/win.c | 20 +++++++------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 9380457..ba400f9 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -125,8 +125,7 @@ keypress (HWND handle, WPARAM keycode, BYTE scancode, BOOL extended) t.s.f, got.f) #define listbox_todo_field_ok(t, s, f, got) \ - if (t.s##_todo.f) todo_wine { listbox_field_ok(t, s, f, got); } \ - else listbox_field_ok(t, s, f, got) + todo_wine_if (t.s##_todo.f) { listbox_field_ok(t, s, f, got); } #define listbox_ok(t, s, got) \ listbox_todo_field_ok(t, s, selected, got); \ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3d4bea5..94fe4cb 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13985,12 +13985,7 @@ static void test_WaitForInputIdle( char *argv0 ) broken(ret == wait_idle_expect[i].broken), "%u: WaitForInputIdle error %08x expected %08x\n", i, ret, wait_idle_expect[i].exp ); - else if (wait_idle_expect[i].todo) - todo_wine - ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), - "%u: WaitForInputIdle error %08x expected %08x\n", - i, ret, wait_idle_expect[i].exp ); - else + else todo_wine_if (wait_idle_expect[i].todo) ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), "%u: WaitForInputIdle error %08x expected %08x\n", i, ret, wait_idle_expect[i].exp ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 70c07e0..71459e1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4179,10 +4179,8 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); /* FIXME: Remove the condition below once Wine is fixed */ - if (dwActualExStyle != dwExStyleOut) - todo_wine ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); - else - ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + todo_wine_if (dwActualExStyle != dwExStyleOut) + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -4309,10 +4307,8 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou else ex_style_out = ex_style_in & ~WS_EX_WINDOWEDGE; /* FIXME: Remove the condition below once Wine is fixed */ - if (ex_style != ex_style_out) - todo_wine ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); - else - ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + todo_wine_if (ex_style != ex_style_out) + ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); DestroyWindow(hwnd); DestroyWindow(parent); @@ -5001,8 +4997,8 @@ static void zero_parentdc_test(struct parentdc_test *t) t.w.r.f, got.w.r.f) #define parentdc_todo_field_ok(t, w, r, f, got) \ - if (t.w##_todo.r.f) todo_wine { parentdc_field_ok(t, w, r, f, got); } \ - else parentdc_field_ok(t, w, r, f, got) + todo_wine_if (t.w##_todo.r.f) \ + parentdc_field_ok(t, w, r, f, got); #define parentdc_rect_ok(t, w, r, got) \ parentdc_todo_field_ok(t, w, r, left, got); \ @@ -6423,9 +6419,7 @@ static void run_NCRedrawLoop(UINT flags) DispatchMessageA(&msg); MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT); } - if (flags == (RDW_INVALIDATE | RDW_FRAME)) - todo_wine ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); - else + todo_wine_if (flags == (RDW_INVALIDATE | RDW_FRAME)) ok(loopcount < 100, "Detected infinite WM_PAINT loop (%x).\n", flags); DestroyWindow(hwnd); }

1 0

Frédéric Delanoy : setupapi/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 5c2cff30aa1bb448f8bdd77ff3b2795be386fac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c2cff30aa1bb448f8bdd77ff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 10:40:45 2016 +0100 setupapi/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/parser.c | 9 +-------- dlls/setupapi/tests/setupcab.c | 22 ++-------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index c2d554a..f929f01 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -152,14 +152,7 @@ static void test_invalid_files(void) if (invalid_files[i].error) /* should fail */ { ok( hinf == INVALID_HANDLE_VALUE, "file %u: Open succeeded\n", i ); - if (invalid_files[i].todo) todo_wine - { - ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n", - i, err, invalid_files[i].error ); - ok( err_line == invalid_files[i].err_line, "file %u: Bad error line %d/%d\n", - i, err_line, invalid_files[i].err_line ); - } - else + todo_wine_if (invalid_files[i].todo) { ok( err == invalid_files[i].error, "file %u: Bad error %u/%u\n", i, err, invalid_files[i].error ); diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 6c76321..33daae9 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -115,19 +115,10 @@ static void test_invalid_parametersA(void) ret = SetupIterateCabinetA(invalid_parameters[i].CabinetFile, 0, invalid_parameters[i].MsgHandler, NULL); ok(!ret, "[%d] Expected SetupIterateCabinetA to return 0, got %d\n", i, ret); - if (invalid_parameters[i].todo_lasterror) - { - todo_wine - ok(GetLastError() == invalid_parameters[i].expected_lasterror, - "[%d] Expected GetLastError() to return %u, got %u\n", - i, invalid_parameters[i].expected_lasterror, GetLastError()); - } - else - { + todo_wine_if (invalid_parameters[i].todo_lasterror) ok(GetLastError() == invalid_parameters[i].expected_lasterror, "[%d] Expected GetLastError() to return %u, got %u\n", i, invalid_parameters[i].expected_lasterror, GetLastError()); - } } SetLastError(0xdeadbeef); @@ -190,19 +181,10 @@ static void test_invalid_parametersW(void) ret = SetupIterateCabinetW(invalid_parameters[i].CabinetFile, 0, invalid_parameters[i].MsgHandler, NULL); ok(!ret, "[%d] Expected SetupIterateCabinetW to return 0, got %d\n", i, ret); - if (invalid_parameters[i].todo_lasterror) - { - todo_wine - ok(GetLastError() == invalid_parameters[i].expected_lasterror, - "[%d] Expected GetLastError() to return %u, got %u\n", - i, invalid_parameters[i].expected_lasterror, GetLastError()); - } - else - { + todo_wine_if (invalid_parameters[i].todo_lasterror) ok(GetLastError() == invalid_parameters[i].expected_lasterror, "[%d] Expected GetLastError() to return %u, got %u\n", i, invalid_parameters[i].expected_lasterror, GetLastError()); - } } SetLastError(0xdeadbeef);

1 0

André Hentschel : kernel32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 82debc093f0852f44d02b27abe9850cabadb9164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82debc093f0852f44d02b27ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:29 2016 +0100 kernel32/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 77249fa..63c5b47 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3754,17 +3754,13 @@ static void test_CreateFile(void) if (i == 0 || i == 5) { /* FIXME: remove once Wine is fixed */ -if (i == 5) todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); -else +todo_wine_if (i == 5) ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); } else { /* FIXME: remove once Wine is fixed */ -if (i == 1) todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); -else +todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } @@ -3776,9 +3772,7 @@ else else { /* FIXME: remove once Wine is fixed */ -if (i == 1) todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); -else +todo_wine_if (i == 1) ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } }

1 0

André Hentschel : urlmon/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 8b064d69e13a191f181abb51cde4262682f1ab41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b064d69e13a191f181abb51c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:23 2016 +0100 urlmon/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 22 ++++------------- dlls/urlmon/tests/sec_mgr.c | 57 ++++++--------------------------------------- 2 files changed, 11 insertions(+), 68 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d63f1fe..dcf0970 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1724,14 +1724,9 @@ static void test_internet_feature_defaults(void) { for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); - if(default_feature_tests[i].todo) { - todo_wine + todo_wine_if (default_feature_tests[i].todo) ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, default_feature_tests[i].expected, i); - } else { - ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, default_feature_tests[i].expected, i); - } } } @@ -1877,24 +1872,15 @@ static void test_CoInternetSetFeatureEnabled(void) { for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, internet_feature_tests[i].enable); - if(internet_feature_tests[i].set_todo) { - todo_wine - ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].set_expected, i); - } else { + todo_wine_if (internet_feature_tests[i].set_todo) ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].set_expected, i); - } hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); - if(internet_feature_tests[i].get_todo) { - todo_wine - ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", - hres, internet_feature_tests[i].get_expected, i); - } else { + todo_wine_if (internet_feature_tests[i].get_todo) ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", hres, internet_feature_tests[i].get_expected, i); - } + } } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 4092842..ad0fcf6 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -940,11 +940,7 @@ static void test_zone_domain_mappings(void) hres = IInternetSecurityManager_MapUrlToZone(secmgr, urlW, &zone, 0); ok(hres == S_OK, "MapUrlToZone failed: %08x\n", hres); - if(test->todo) - todo_wine - ok(zone == test->zone || broken(test->broken_zone == zone), - "Expected %d, but got %d on test %d\n", test->zone, zone, i); - else + todo_wine_if (test->todo) ok(zone == test->zone || broken(test->broken_zone == zone), "Expected %d, but got %d on test %d\n", test->zone, zone, i); @@ -1636,12 +1632,7 @@ static void test_InternetGetSecurityUrlEx(void) result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1652,12 +1643,7 @@ static void test_InternetGetSecurityUrlEx(void) hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1669,12 +1655,7 @@ static void test_InternetGetSecurityUrlEx(void) result = NULL; hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY, 0); - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(hr == sec_url_ex_tests[i].default_hres, - "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", - hr, sec_url_ex_tests[i].default_hres, i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(hr == sec_url_ex_tests[i].default_hres, "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", hr, sec_url_ex_tests[i].default_hres, i); @@ -1685,12 +1666,7 @@ static void test_InternetGetSecurityUrlEx(void) hr = IUri_GetDisplayUri(result, &received); ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { - if(sec_url_ex_tests[i].todo) { - todo_wine - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); - } else { + todo_wine_if (sec_url_ex_tests[i].todo) { ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, wine_dbgstr_w(received), i); @@ -1858,14 +1834,7 @@ static void test_SecurityManagerEx2(void) ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); - if(sec_mgr_ex2_tests[i].map_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n", - hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); - todo_wine - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, - zone, sec_mgr_ex2_tests[i].uri); - } else { + todo_wine_if (sec_mgr_ex2_tests[i].map_todo) { ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, @@ -1876,19 +1845,7 @@ static void test_SecurityManagerEx2(void) memset(buf, 0xf0, buf_size); hres = IInternetSecurityManagerEx2_GetSecurityIdEx2(sec_mgr2, uri, buf, &buf_size, 0); - if(sec_mgr_ex2_tests[i].secid_todo) { - todo_wine - ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", - hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); - if(sec_mgr_ex2_tests[i].secid) { - todo_wine { - ok(buf_size == sec_mgr_ex2_tests[i].secid_size, "Got wrong security id size=%d, expected %d on test '%s'\n", - buf_size, sec_mgr_ex2_tests[i].secid_size, sec_mgr_ex2_tests[i].uri); - ok(!memcmp(buf, sec_mgr_ex2_tests[i].secid, sec_mgr_ex2_tests[i].secid_size), "Got wrong security id on test '%s'\n", - sec_mgr_ex2_tests[i].uri); - } - } - } else { + todo_wine_if (sec_mgr_ex2_tests[i].secid_todo) { ok(hres == sec_mgr_ex2_tests[i].secid_hres, "GetSecurityIdEx2 returned %08x, expected %08x on test '%s'\n", hres, sec_mgr_ex2_tests[i].secid_hres, sec_mgr_ex2_tests[i].uri); if(sec_mgr_ex2_tests[i].secid) {

1 0

Alexandre Julliard : sfnt2fon: Remove no longer needed use of libwine_static.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 3712d9fdff1a56b1707df0ebfe72cdde35f38433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3712d9fdff1a56b1707df0ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:50 2016 +0900 sfnt2fon: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/Makefile.in | 2 +- tools/sfnt2fon/sfnt2fon.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/sfnt2fon/Makefile.in b/tools/sfnt2fon/Makefile.in index 5a92d85..c6d289f 100644 --- a/tools/sfnt2fon/Makefile.in +++ b/tools/sfnt2fon/Makefile.in @@ -3,4 +3,4 @@ PROGRAMS = sfnt2fon C_SRCS = sfnt2fon.c EXTRAINCL = $(FREETYPE_CFLAGS) -EXTRALIBS = $(FREETYPE_LIBS) $(LIBWINE_STATIC) +EXTRALIBS = $(FREETYPE_LIBS) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 7612bc2..ea915da 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -41,7 +41,6 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" #include "wingdi.h" #include "basetsd.h"

1 0

Alexandre Julliard : wrc: Avoid locale- or Unicode-dependent case conversions.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 865f23b5032171cdcd7221fce381c98f5ce6dd36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=865f23b5032171cdcd7221fce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:32:33 2016 +0900 wrc: Avoid locale- or Unicode-dependent case conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 6 ++++-- tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 38 ++++++++++++-------------------------- tools/wrc/utils.c | 29 +++++++++++++++++++++++++++-- tools/wrc/utils.h | 2 ++ 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 336e64e..5b7e24c 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -263,11 +263,13 @@ static void string_to_upper(string_t *str) if(str->type == str_char) { - for (i = 0; i < str->size; i++) str->str.cstr[i] = toupper((unsigned char)str->str.cstr[i]); + for (i = 0; i < str->size; i++) + if (str->str.cstr[i] >= 'a' && str->str.cstr[i] <= 'z') str->str.cstr[i] -= 32; } else if(str->type == str_unicode) { - for (i = 0; i < str->size; i++) str->str.wstr[i] = toupperW(str->str.wstr[i]); + for (i = 0; i < str->size; i++) + if (str->str.wstr[i] >= 'a' && str->str.wstr[i] <= 'z') str->str.wstr[i] -= 32; } else { diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 80072b2..32a231b 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -250,7 +250,7 @@ static struct keyword keywords[] = { static int kw_cmp_func(const void *s1, const void *s2) { int ret; - ret = strcasecmp(KWP(s1)->keyword, KWP(s2)->keyword); + ret = compare_striA(KWP(s1)->keyword, KWP(s2)->keyword); if(!ret && (KWP(s1)->needcase || KWP(s2)->needcase)) return strcmp(KWP(s1)->keyword, KWP(s2)->keyword); else diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index b41e7d7..0f73f90 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2072,37 +2072,23 @@ static int get_class_idW(const WCHAR *cc) static const WCHAR szSTATIC[] = {'S','T','A','T','I','C',0}; static const WCHAR szSCROLLBAR[] = {'S','C','R','O','L','L','B','A','R',0}; - if(!strcmpiW(szBUTTON, cc)) - return CT_BUTTON; - if(!strcmpiW(szCOMBOBOX, cc)) - return CT_COMBOBOX; - if(!strcmpiW(szLISTBOX, cc)) - return CT_LISTBOX; - if(!strcmpiW(szEDIT, cc)) - return CT_EDIT; - if(!strcmpiW(szSTATIC, cc)) - return CT_STATIC; - if(!strcmpiW(szSCROLLBAR, cc)) - return CT_SCROLLBAR; - + if(!compare_striW(szBUTTON, cc)) return CT_BUTTON; + if(!compare_striW(szCOMBOBOX, cc)) return CT_COMBOBOX; + if(!compare_striW(szLISTBOX, cc)) return CT_LISTBOX; + if(!compare_striW(szEDIT, cc)) return CT_EDIT; + if(!compare_striW(szSTATIC, cc)) return CT_STATIC; + if(!compare_striW(szSCROLLBAR, cc)) return CT_SCROLLBAR; return -1; } static int get_class_idA(const char *cc) { - if(!strcasecmp("BUTTON", cc)) - return CT_BUTTON; - if(!strcasecmp("COMBOBOX", cc)) - return CT_COMBOBOX; - if(!strcasecmp("LISTBOX", cc)) - return CT_LISTBOX; - if(!strcasecmp("EDIT", cc)) - return CT_EDIT; - if(!strcasecmp("STATIC", cc)) - return CT_STATIC; - if(!strcasecmp("SCROLLBAR", cc)) - return CT_SCROLLBAR; - + if(!compare_striA("BUTTON", cc)) return CT_BUTTON; + if(!compare_striA("COMBOBOX", cc)) return CT_COMBOBOX; + if(!compare_striA("LISTBOX", cc)) return CT_LISTBOX; + if(!compare_striA("EDIT", cc)) return CT_EDIT; + if(!compare_striA("STATIC", cc)) return CT_STATIC; + if(!compare_striA("SCROLLBAR", cc)) return CT_SCROLLBAR; return -1; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5360b95..800692a 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -219,6 +219,31 @@ char *xstrdup(const char *str) return strcpy(s, str); } +int compare_striA( const char *str1, const char *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + char ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : *str1; + char ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} + +int compare_striW( const WCHAR *str1, const WCHAR *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + WCHAR ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : *str1; + WCHAR ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} /* ***************************************************************************** @@ -241,12 +266,12 @@ int compare_name_id(const name_id_t *n1, const name_id_t *n2) if(n1->name.s_name->type == str_char && n2->name.s_name->type == str_char) { - return strcasecmp(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); + return compare_striA(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); } else if(n1->name.s_name->type == str_unicode && n2->name.s_name->type == str_unicode) { - return strcmpiW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); + return compare_striW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); } else { diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index 19daa09..f0e8cd6 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -33,6 +33,8 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif +int compare_striA( const char *str1, const char *str2 ); +int compare_striW( const WCHAR *str1, const WCHAR *str2 ); char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Francois Gouget : shell32/tests: Test ShellExecute()'s URL handling.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 6e9c7adceee85b89823ba33c734c64358bc14532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9c7adceee85b89823ba33c7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 21 11:53:03 2016 +0100 shell32/tests: Test ShellExecute()'s URL handling. Also tweak the class creation functions and add create_test_class() so one can create a class without associating it with an extension. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 200 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 162 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e9c7adceee85b89823ba…

1 0