February 2016 - Wine-Commits

YongHao Hu : msvcp110: Add tr2_sys__Unlink implementation and test.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: dabadc8eaf42d94b0ceb3fa22caa06fba891c364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabadc8eaf42d94b0ceb3fa22… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Feb 20 00:40:34 2016 +0800 msvcp110: Add tr2_sys__Unlink implementation and test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/ios.c | 11 +++++++ 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3d89924..1d9525c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1805,8 +1805,8 @@ @ cdecl -arch=win32 ?_Tidy(a)ios_base@std@@AAAXXZ(ptr) ios_base_Tidy @ stub -arch=i386 ?_Tidy(a)ios_base@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink @ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 1bb487e..e5daa62 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1766,8 +1766,8 @@ @ cdecl -arch=win32 ?_Tidy(a)ios_base@std@@AAAXXZ(ptr) ios_base_Tidy @ stub -arch=i386 ?_Tidy(a)ios_base@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink @ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f884d0c..17a41d1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -134,6 +134,7 @@ static char* (__cdecl *p_tr2_sys__Read_dir)(char*, void*, enum file_type*); static void (__cdecl *p_tr2_sys__Close_dir)(void*); static int (__cdecl *p_tr2_sys__Link)(char const*, char const*); static int (__cdecl *p_tr2_sys__Symlink)(char const*, char const*); +static int (__cdecl *p_tr2_sys__Unlink)(char const*); /* thrd */ typedef struct @@ -271,6 +272,8 @@ static BOOL init(void) "?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p_tr2_sys__Symlink, "?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Unlink, + "?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -328,6 +331,8 @@ static BOOL init(void) "?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z"); SET(p_tr2_sys__Symlink, "?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Unlink, + "?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1460,6 +1465,60 @@ static void test_tr2_sys__Symlink(void) ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_tr2_sys__Unlink(void) +{ + int ret, i; + HANDLE file; + LARGE_INTEGER file_size; + struct { + char const *path; + int last_error; + MSVCP_bool is_todo; + } tests[] = { + { "tr2_test_dir\\f1_symlink", ERROR_SUCCESS, TRUE }, + { "tr2_test_dir\\f1_link", ERROR_SUCCESS, FALSE }, + { "tr2_test_dir\\f1", ERROR_SUCCESS, FALSE }, + { "tr2_test_dir", ERROR_ACCESS_DENIED, FALSE }, + { "not_exist", ERROR_FILE_NOT_FOUND, FALSE }, + { "not_exist_dir\\not_exist_file", ERROR_PATH_NOT_FOUND, FALSE }, + { NULL, ERROR_PATH_NOT_FOUND, FALSE } + }; + + ret = p_tr2_sys__Make_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Make_dir(): expect 1 got %d\n", ret); + file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + + ret = p_tr2_sys__Symlink("tr2_test_dir/f1", "tr2_test_dir/f1_symlink"); + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) { + tests[0].last_error = ERROR_FILE_NOT_FOUND; + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); + }else { + ok(ret == ERROR_SUCCESS, "tr2_sys__Symlink(): expect: ERROR_SUCCESS, got %d\n", ret); + } + ret = p_tr2_sys__Link("tr2_test_dir/f1", "tr2_test_dir/f1_link"); + ok(ret == ERROR_SUCCESS, "tr2_sys__Link(): expect: ERROR_SUCCESS, got %d\n", ret); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_tr2_sys__Unlink(tests[i].path); + todo_wine_if(tests[i].is_todo) + ok(ret == tests[i].last_error, "tr2_sys__Unlink(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); + ok(errno == 0xdeadbeef, "tr2_sys__Unlink(): test %d errno expect: 0xdeadbeef, got %d\n", i+1, ret); + } + + ok(!DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 not to exist\n"); + ok(!DeleteFileA("tr2_test_dir/f1_link"), "expect tr2_test_dir/f1_link not to exist\n"); + ok(!DeleteFileA("tr2_test_dir/f1_symlink"), "expect tr2_test_dir/f1_symlink not to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); +} + static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; @@ -1751,6 +1810,7 @@ START_TEST(msvcp120) test_tr2_sys__dir_operation(); test_tr2_sys__Link(); test_tr2_sys__Symlink(); + test_tr2_sys__Unlink(); test_thrd(); test_cnd(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2d0a95b..5da4e05 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1766,8 +1766,8 @@ @ cdecl -arch=win32 ?_Tidy(a)ios_base@std@@AAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)ios_base@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AEAAXXZ -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z @ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d9ff610..1613402 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14782,6 +14782,17 @@ int __cdecl tr2_sys__Symlink(char const* existing_file_name, char const* file_na return GetLastError(); } +/* ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z */ +/* ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z */ +int __cdecl tr2_sys__Unlink(char const* path) +{ + TRACE("(%s)\n", debugstr_a(path)); + + if(DeleteFileA(path)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

André Hentschel : ndis.sys: Implement NdisSystemProcessorCount.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: 113f43250a2de4e4ff73226cb0006a7833d2fb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=113f43250a2de4e4ff73226cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:43:28 2016 +0100 ndis.sys: Implement NdisSystemProcessorCount. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 10 ++++++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 499f167..6e1bb9b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -48,3 +48,13 @@ void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) { FIXME("(%p): stub\n", lock); } + +CCHAR WINAPI NdisSystemProcessorCount(void) +{ + SYSTEM_INFO si; + + TRACE("()\n"); + GetSystemInfo(&si); + + return si.dwNumberOfProcessors; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 31b421a..8957d8f 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -257,7 +257,7 @@ @ stub NdisSetTimer @ stub NdisSetTimerEx @ stub NdisSetupDmaTransfer -@ stub NdisSystemProcessorCount +@ stdcall NdisSystemProcessorCount() @ stub NdisTerminateWrapper @ stub NdisTransferData @ stub NdisUnchainBufferAtBack diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index aa77d9a..ffa1396 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -33,5 +33,6 @@ typedef struct _NDIS_SPIN_LOCK NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); +CCHAR WINAPI NdisSystemProcessorCount(void); #endif /* _NDIS_ */

1 0

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

Feb. 22, 2016

Module: wine Branch: master Commit: 0da6cca13ca6aa91772dbfcfec81987db2e68069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da6cca13ca6aa91772dbfcfe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:49:52 2016 +0100 msvcrt/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 6 ++---- dlls/msvcrt/tests/misc.c | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e3f7f99..490ddee 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1109,10 +1109,8 @@ static void test_demangle_datatype(void) for (i = 0; i < num_test; i++) { name = p__unDName(0, demangle[i].mangled, 0, pmalloc, pfree, 0x2800); - if (demangle[i].test_in_wine) - ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); - else - todo_wine ok(name != NULL && !strcmp(name,demangle[i].result), "Got name %s for %d\n", name, i); + todo_wine_if (!demangle[i].test_in_wine) + ok(name != NULL && !strcmp(name,demangle[i].result), "Got name \"%s\" for %d\n", name, i); if(name) pfree(name); } diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 4968cbb..77f2873 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -181,14 +181,10 @@ static void test_I10_OUTPUT(void) ok(!strcmp(out.str, I10_OUTPUT_tests[i].out.str), "%d: out.str = %s\n", i, out.str); j = strlen(I10_OUTPUT_tests[i].remain); - if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') - todo_wine ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), - "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); - else + todo_wine_if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); - for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++) if(out.str[j] != '#') ok(0, "%d: out.str[%d] = %c (expected \'#\')\n", i, j, out.str[j]);

1 0

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

Feb. 22, 2016

Module: wine Branch: master Commit: c3171f9c0c190920d7f260d39d56f08c07644cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3171f9c0c190920d7f260d39… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 15:23:31 2016 +0100 msvcr120/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 341aec4..54c86c6 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -253,13 +253,9 @@ static void test____lc_locale_name_func(void) lc_names = p____lc_locale_name_func(); ok(lc_names[0] == NULL, "%d - lc_names[0] = %s\n", i, wine_dbgstr_w(lc_names[0])); - if(tests[i].todo) { - todo_wine ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), - "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); - } else { + todo_wine_if(tests[i].todo) ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); - } for(j=LC_MIN+2; j<=LC_MAX; j++) { ok(!lstrcmpW(lc_names[1], lc_names[j]), "%d - lc_names[%d] = %s, expected %s\n",

1 0

Francois Gouget : mscoree/tests: Add a trailing '\n' to a win_skip() call.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: fb863bc8aca01f2c2015e294019e9637f394cd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb863bc8aca01f2c2015e2940… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 21 01:16:37 2016 +0100 mscoree/tests: Add a trailing '\n' to a win_skip() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 1cd9e5f..106577e 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -445,7 +445,7 @@ static void test_createdomain(void) if (!pCLRCreateInstance) { - win_skip("Function CLRCreateInstance not found."); + win_skip("Function CLRCreateInstance not found.\n"); return; }

1 0

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

Feb. 22, 2016

Module: wine Branch: master Commit: 61e70dfbc73e61f83253f3331b382ad33acd20c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e70dfbc73e61f83253f3331… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 14:04:30 2016 +0100 shell32/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/shell32/tests/progman_dde.c | 11 +---------- dlls/shell32/tests/shelllink.c | 18 +++--------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 4c9116e..6e1378f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -486,19 +486,10 @@ static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); /* todo_wine... Is expected to fail, wine stubbed functions DO fail */ /* TODO REMOVE THIS CODE!!! */ - if (expected_result == DMLERR_NOTPROCESSED) - { + todo_wine_if (expected_result != DMLERR_NOTPROCESSED) ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n", groupName, GetStringFromError(expected_result), GetStringFromError(error), GetStringFromTestParams(testParams)); - } else { - todo_wine - { - ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - } if (error == DMLERR_NO_ERROR) { diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 41fac48..f22cb36 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -351,12 +351,8 @@ static void test_get_set(void) */ #define lok ok_(__FILE__, line) -#define lok_todo_4(todo_flag,a,b,c,d) \ - if ((todo & todo_flag) == 0) lok((a), (b), (c), (d)); \ - else todo_wine lok((a), (b), (c), (d)); -#define lok_todo_2(todo_flag,a,b) \ - if ((todo & todo_flag) == 0) lok((a), (b)); \ - else todo_wine lok((a), (b)); +#define lok_todo_4(todo_flag,a,b,c,d) todo_wine_if ((todo & todo_flag) != 0) lok((a), (b), (c), (d)); +#define lok_todo_2(todo_flag,a,b) todo_wine_if ((todo & todo_flag) != 0) lok((a), (b)); #define check_lnk(a,b,c) check_lnk_(__LINE__, (a), (b), (c)) void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) @@ -433,16 +429,8 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) lok(str == NULL, "got %p\n", str); r = IPersistFile_Save(pf, path, TRUE); - if (save_fails) - { - todo_wine { - lok(r == S_OK, "save failed (0x%08x)\n", r); - } - } - else - { + todo_wine_if (save_fails) lok(r == S_OK, "save failed (0x%08x)\n", r); - } /* test GetCurFile after ::Save */ r = IPersistFile_GetCurFile(pf, &str);

1 0

Alexandre Julliard : quartz: Remove forward declaration of removed variable.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: f9b91b5a6b21856d6b8937bc33b19476d7001b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b91b5a6b21856d6b8937bc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 16:31:56 2016 +0900 quartz: Remove forward declaration of removed variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 7212807..a2651fd 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const IPinVtbl PullPin_Vtbl; - #define ALIGNDOWN(value,boundary) ((value)/(boundary)*(boundary)) #define ALIGNUP(value,boundary) (ALIGNDOWN((value)+(boundary)-1, (boundary)))

1 0

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

Feb. 22, 2016

Module: wine Branch: master Commit: dbc043c3d8eff2be3e1509b72cbb5089f7a47c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc043c3d8eff2be3e1509b72… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:12:24 2016 +0100 shlwapi/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/shlwapi/tests/path.c | 12 +++--------- dlls/shlwapi/tests/url.c | 5 +---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 03079a3..f780a78 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -286,9 +286,7 @@ static void test_PathCreateFromUrl(void) for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) { len = INTERNET_MAX_URL_LENGTH; ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -305,9 +303,7 @@ static void test_PathCreateFromUrl(void) urlW = GetWideString(TEST_PATHFROMURL[i].url); ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0); WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path, sizeof(ret_path),NULL,NULL); - if (!(TEST_PATHFROMURL[i].todo & 0x1)) - ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1) ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url L\"%s\"\n", ret, TEST_PATHFROMURL[i].url); if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) { if(!(TEST_PATHFROMURL[i].todo & 0x2)) { @@ -326,9 +322,7 @@ static void test_PathCreateFromUrl(void) len2 = 2; ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0); ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url %s\n", ret, TEST_PATHFROMURL[i].url); - if(!(TEST_PATHFROMURL[i].todo & 0x4)) - ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); - else todo_wine + todo_wine_if (TEST_PATHFROMURL[i].todo & 0x4) ok(len2 == len + 1, "got len = %d expected %d from url %s\n", len2, len + 1, TEST_PATHFROMURL[i].url); } diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 85da922..c89b044 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -838,10 +838,7 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H ok(ret == dwExpectReturn || ret == dwExpectReturnAlt, "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index %d\n", dwExpectReturn, dwExpectReturnAlt, ret, index); - if (todo) - todo_wine - ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); - else + todo_wine_if (todo) ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); if (pUrlCanonicalizeW) {

1 0

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

Feb. 22, 2016

Module: wine Branch: master Commit: 6936bbb1980f19fbdb61fefc41eb1cdac210f822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6936bbb1980f19fbdb61fefc4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 20 00:43:01 2016 +0100 ole32/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/ole32/tests/ole2.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 3845ec2..2167f66 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -156,12 +156,7 @@ typedef struct PresentationDataHeader while (expected_method_list->flags & TEST_OPTIONAL && \ strcmp(expected_method_list->method, method_name) != 0) \ expected_method_list++; \ - if (expected_method_list->flags & TEST_TODO) \ - todo_wine \ - ok(!strcmp(expected_method_list->method, method_name), \ - "Expected %s to be called instead of %s\n", \ - expected_method_list->method, method_name); \ - else \ + todo_wine_if (expected_method_list->flags & TEST_TODO) \ ok(!strcmp(expected_method_list->method, method_name), \ "Expected %s to be called instead of %s\n", \ expected_method_list->method, method_name); \

1 0

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

Feb. 22, 2016

Module: wine Branch: master Commit: 8f4ee97092e7be6cc95313c259c5eac807ff18b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4ee97092e7be6cc95313c25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:40 2016 +0900 wmc: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/Makefile.in | 2 +- tools/wmc/lang.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 41b7236..a97da85 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -11,6 +11,6 @@ C_SRCS = \ BISON_SRCS = mcy.y -EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWINE_STATIC) +EXTRALIBS = $(GETTEXTPO_LIBS) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 337d661..5a11c5b 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,7 +21,6 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" typedef struct language {

1 0