October 2012 - Wine-Commits

Piotr Caban : msvcp90: Fixed io classes cleaning.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 0cb615cf80f6d8a09fc6bd19ca0b5211f55764b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb615cf80f6d8a09fc6bd19c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:13:38 2012 +0200 msvcp90: Fixed io classes cleaning. --- dlls/msvcp100/ios.c | 24 ++++++++++++------------ dlls/msvcp71/ios.c | 24 ++++++++++++------------ dlls/msvcp90/ios.c | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index fa2f76e..96e6835 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -8193,39 +8193,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 069011c..6696149 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -12637,39 +12637,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1816884..19b799c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -13142,39 +13142,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); }

1 0

Piotr Caban : msvcp90: Removed no longer needed exports.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 5998072af684fbbfc26b80685be780818a4dc877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5998072af684fbbfc26b80685… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:13:22 2012 +0200 msvcp90: Removed no longer needed exports. --- dlls/msvcp90/msvcp90.spec | 2 -- dlls/msvcp90/string.c | 14 -------------- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 576541c..d99add4 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5819,5 +5819,3 @@ @ cdecl -arch=win64 ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z(ptr) locale_facet_register @ thiscall -arch=win32 ?_Register(a)facet@locale(a)std@@QAEXXZ(ptr) locale_facet__Register @ cdecl -arch=win64 ?_Register(a)facet@locale(a)std@@QEAAXXZ(ptr) locale_facet__Register -@ stdcall basic_string_char_replace_helper(ptr long long ptr long) -@ stdcall basic_string_wchar_replace_helper(ptr long long ptr long) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 73f0d4e..0ebf757 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1991,13 +1991,6 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch return this; } -/* Not exported from msvcp90 */ -basic_string_char* __stdcall basic_string_char_replace_helper(basic_string_char *this, - MSVCP_size_t off, MSVCP_size_t len, const char *str, MSVCP_size_t str_len) -{ - return basic_string_char_replace_cstr_len(this, off, len, str, str_len); -} - /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IIPBD@Z */ /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z */ DEFINE_THISCALL_WRAPPER(basic_string_char_replace_cstr, 16) @@ -3950,13 +3943,6 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ return this; } -/* Not exported from msvcp90 */ -basic_string_wchar* __stdcall basic_string_wchar_replace_helper(basic_string_wchar *this, - MSVCP_size_t off, MSVCP_size_t len, const wchar_t *str, MSVCP_size_t str_len) -{ - return basic_string_wchar_replace_cstr_len(this, off, len ,str, str_len); -} - /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)IIPB_W@Z */ /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0PEB_W@Z */ /* ?replace@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)IIPBG@Z */

1 0

Francois Gouget : shell32/tests: Simplify shlexec's test_argify() and test_lpFile_parsed() and avoid numeric literals.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: da6b02ceb1eeef52fec2394aa92bc3ce70fcf0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6b02ceb1eeef52fec2394aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 09:54:07 2012 +0200 shell32/tests: Simplify shlexec's test_argify() and test_lpFile_parsed() and avoid numeric literals. --- dlls/shell32/tests/shlexec.c | 148 +++++++++++------------------------------- 1 files changed, 37 insertions(+), 111 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ba0e2b8..131a9e6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -903,107 +903,54 @@ static filename_tests_t noquotes_tests[]= static void test_lpFile_parsed(void) { - /* basename tmpdir */ - const char* shorttmpdir; - const char *testfile; char fileA[MAX_PATH]; INT_PTR rc; - GetTempPathA(sizeof(fileA), fileA); - shorttmpdir = tmpdir + strlen(fileA); - - /* ensure tmpdir is in %TEMP%: GetTempPath() can succeed even if TEMP is undefined */ - SetEnvironmentVariableA("TEMP", fileA); - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ - testfile = "%s\\drawback_file.noassoc foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + todo_wine ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ - testfile = "\"%s\\drawback_file.noassoc foo.shlexec\""; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - - /* error should be 2, not 31 */ - testfile = "\"%s\\drawback_file.noassoc\" foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, + "%s failed: rc=%lu\n", shell_call, rc); + + /* error should be SE_ERR_FNF, not SE_ERR_NOASSOC */ + sprintf(fileA, "\"%s\\drawback_file.noassoc\" foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc==2, - "expected failure (2), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* ""command"" not works on wine (and real win9x and w2k) */ - testfile = "\"\"%s\\simple.shlexec\"\""; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "\"\"%s\\simple.shlexec\"\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc>32 || broken(rc == 2) /* Win9x/2000 */, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + todo_wine ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, + "%s failed: rc=%lu\n", shell_call, rc); /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ - testfile = "%s\\drawback_nonexist.noassoc foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* is SEE_MASK_DOENVSUBST default flag? Should only be when XP emulates 9x (XP bug or real 95 or ME behavior ?) */ - testfile = "%%TEMP%%\\%s\\simple.shlexec"; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc==2, - "expected failure (2), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + rc=shell_execute(NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* quoted */ - testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc==2, - "expected failure (2), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + rc=shell_execute(NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* test SEE_MASK_DOENVSUBST works */ - testfile = "%%TEMP%%\\%s\\simple.shlexec"; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* quoted lpFile does not work on real win95 and nt4 */ - testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); - ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, + "%s failed: rc=%lu\n", shell_call, rc); } static void test_argify(void) @@ -1015,10 +962,7 @@ static void test_argify(void) /* %2 */ rc=shell_execute("NoQuotesParam2", fileA, "a b", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1028,10 +972,7 @@ static void test_argify(void) /* %2 */ /* '"a"""' -> 'a"' */ rc=shell_execute("NoQuotesParam2", fileA, "\"a:\"\"some string\"\"\"", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1044,10 +985,7 @@ static void test_argify(void) /* backslash isn't escape char * '"a\""' -> '"a\""' */ rc=shell_execute("NoQuotesParam2", fileA, "\"a:\\\"some string\\\"\"", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1059,10 +997,7 @@ static void test_argify(void) /* "%2" */ /* \t isn't whitespace */ rc=shell_execute("QuotedParam2", fileA, "a\tb c", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1073,10 +1008,7 @@ static void test_argify(void) /* %* */ rc=shell_execute("NoQuotesAllParams", fileA, "a b c d e f g h", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { todo_wine { @@ -1088,10 +1020,7 @@ static void test_argify(void) /* %* can sometimes contain only whitespaces and no args */ rc=shell_execute("QuotedAllParams", fileA, " ", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { todo_wine { @@ -1102,10 +1031,7 @@ static void test_argify(void) /* %~3 */ rc=shell_execute("NoQuotesParams345etc", fileA, "a b c d e f g h", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { todo_wine { @@ -1117,10 +1043,7 @@ static void test_argify(void) /* %~3 is rest of command line starting with whitespaces after 2nd arg */ rc=shell_execute("QuotedParams345etc", fileA, "a ", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1178,7 +1101,7 @@ static void test_filename(void) if ((test->todo & 0x1)==0) { ok(rc==test->rc || - broken(quotedfile && rc == 2), /* NT4 */ + broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } @@ -2184,6 +2107,9 @@ static void init_test(void) DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + /* Set %TMPDIR% for the tests */ + SetEnvironmentVariableA("TMPDIR", tmpdir); + rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); assert(rc != 0); init_event(child_file);

1 0

Francois Gouget : oledb32/tests: Make test_database() static.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 6be0dd10de874fea9958606716677db69cae71b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be0dd10de874fea995860671… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 4 09:44:43 2012 +0200 oledb32/tests: Make test_database() static. --- dlls/oledb32/tests/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c0d5237..fe92bb8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -31,7 +31,7 @@ #include "wine/test.h" -void test_database(void) +static void test_database(void) { HRESULT hr; IDBInitialize *dbinit = NULL;

1 0

André Hentschel : winedbg: Reorder disassembler functions to match instruction table order.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 523ca37f1183d09310ab82e969a2b1969b15e343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523ca37f1183d09310ab82e96… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 21:26:30 2012 +0200 winedbg: Reorder disassembler functions to match instruction table order. --- programs/winedbg/be_arm.c | 148 ++++++++++++++++++++++----------------------- 1 files changed, 72 insertions(+), 76 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2cb126d..bad74d0 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -183,6 +183,39 @@ static UINT arm_disasm_swp(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) +{ + short halfword = (inst >> 5) & 0x01; + short sign = (inst >> 6) & 0x01; + short load = (inst >> 20) & 0x01; + short writeback = (inst >> 21) & 0x01; + short immediate = (inst >> 22) & 0x01; + short direction = (inst >> 23) & 0x01; + short indexing = (inst >> 24) & 0x01; + short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); + + if (!direction) offset *= -1; + + dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", + halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); + if (indexing) + { + if (immediate) + dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + } + else + { + if (immediate) + dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + } + return 0; +} + static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -317,39 +350,6 @@ static UINT arm_disasm_singletrans(UINT inst, ADDRESS64 *addr) return 0; } -static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) -{ - short halfword = (inst >> 5) & 0x01; - short sign = (inst >> 6) & 0x01; - short load = (inst >> 20) & 0x01; - short writeback = (inst >> 21) & 0x01; - short immediate = (inst >> 22) & 0x01; - short direction = (inst >> 23) & 0x01; - short indexing = (inst >> 24) & 0x01; - short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); - - if (!direction) offset *= -1; - - dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", - halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); - if (indexing) - { - if (immediate) - dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); - else - dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); - } - else - { - if (immediate) - dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); - else - dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); - } - return 0; -} - static UINT arm_disasm_blocktrans(UINT inst, ADDRESS64 *addr) { short load = (inst >> 20) & 0x01; @@ -379,8 +379,7 @@ static UINT arm_disasm_blocktrans(UINT inst, ADDRESS64 *addr) static UINT arm_disasm_swi(UINT inst, ADDRESS64 *addr) { - UINT comment = inst & 0x00ffffff; - dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); + dbg_printf("\n\tswi%s\t#%d", get_cond(inst), inst & 0x00ffffff); return 0; } @@ -518,6 +517,12 @@ static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tswi\t#%d", inst & 0x00ff); + return 0; +} + static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) { WORD offset = inst & 0x00ff; @@ -547,19 +552,6 @@ static WORD thumb_disasm_loadadr(WORD inst, ADDRESS64 *addr) return 0; } -static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) -{ - WORD comment = inst & 0x00ff; - dbg_printf("\n\tswi\t#%d", comment); - return 0; -} - -static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) -{ - dbg_printf("\n\tnop"); - return 0; -} - static WORD thumb_disasm_ldrpcrel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; @@ -621,6 +613,12 @@ static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tnop"); + return 0; +} + static WORD thumb_disasm_addsub(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 9) & 0x01; @@ -643,33 +641,6 @@ static WORD thumb_disasm_movshift(WORD inst, ADDRESS64 *addr) return 0; } -static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) -{ - UINT S = (inst >> 26) & 0x01; - UINT L = (inst >> 14) & 0x01; - UINT I1 = !(((inst >> 13) & 0x01) ^ S); - UINT C = !((inst >> 12) & 0x01); - UINT I2 = !(((inst >> 11) & 0x01) ^ S); - UINT offset = (inst & 0x000007ff) << 1; - - if (C) - { - offset |= I1 << 19 | I2 << 18 | (inst & 0x003f0000) >> 4; - offset += 4; - if (S) offset |= 0x0fff << 20; - } - else - { - offset |= I1 << 23 | I2 << 22 | (inst & 0x03ff0000) >> 4; - offset += 4; - if (S) offset |= 0xff << 24; - } - - dbg_printf("\n\tb%s%s\t", L ? "l" : "", C ? tbl_cond[(inst >> 22) & 0x0f] : ""); - db_printsym(addr->Offset + offset); - return 0; -} - static UINT thumb2_disasm_srtrans(UINT inst, ADDRESS64 *addr) { UINT fromsr = (inst >> 21) & 0x03; @@ -737,6 +708,31 @@ static UINT thumb2_disasm_miscctrl(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) +{ + UINT S = (inst >> 26) & 0x01; + UINT L = (inst >> 14) & 0x01; + UINT I1 = !(((inst >> 13) & 0x01) ^ S); + UINT C = !((inst >> 12) & 0x01); + UINT I2 = !(((inst >> 11) & 0x01) ^ S); + UINT offset = (inst & 0x000007ff) << 1; + + if (C) + { + offset |= I1 << 19 | I2 << 18 | (inst & 0x003f0000) >> 4; + if (S) offset |= 0x0fff << 20; + } + else + { + offset |= I1 << 23 | I2 << 22 | (inst & 0x03ff0000) >> 4; + if (S) offset |= 0xff << 24; + } + + dbg_printf("\n\tb%s%s\t", L ? "l" : "", C ? tbl_cond[(inst >> 22) & 0x0f] : ""); + db_printsym(addr->Offset + offset + 4); + return 0; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -1078,6 +1074,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4000, thumb_disasm_aluop }, { 0xf600, 0xb400, thumb_disasm_pushpop }, { 0xf000, 0xc000, thumb_disasm_blocktrans }, + { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xf800, 0xe000, thumb_disasm_uncondbranch }, { 0xf000, 0xa000, thumb_disasm_loadadr }, @@ -1089,7 +1086,6 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xf200, 0x5000, thumb_disasm_ldrreg }, { 0xf200, 0x5200, thumb_disasm_ldrsreg }, { 0xe000, 0x2000, thumb_disasm_immop }, - { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xff00, 0xbf00, thumb_disasm_nop }, { 0xf800, 0x1800, thumb_disasm_addsub }, { 0xe000, 0x0000, thumb_disasm_movshift },

1 0

Piotr Caban : msvcp60: Handle differences in basic_string:: c_str function behavior on empty strings.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 458a39051dd8cd81ee23febb9c07d2669bc56e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458a39051dd8cd81ee23febb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:04 2012 +0200 msvcp60: Handle differences in basic_string::c_str function behavior on empty strings. --- dlls/msvcp60/locale.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 17c754d..0cc3807 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -5101,7 +5101,7 @@ static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; istreambuf_iterator_char_val(first); if(first->strbuf && (first->val=='-' || first->val=='+')) { @@ -5258,7 +5258,7 @@ static int num_get_char__Getifld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -6007,7 +6007,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; @@ -6090,7 +6090,7 @@ static ostreambuf_iterator_char* num_put_char__Iput(const num_put *this, ostream /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++;

1 0

Piotr Caban : msvcp60: Sync exceptions implementations.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: d844ceeae8faac9b96fa3e56a0607b2e7c1ae97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d844ceeae8faac9b96fa3e56a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:14:31 2012 +0200 msvcp60: Sync exceptions implementations. --- dlls/msvcp60/exception.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index dde066c..2b4ffcd 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -74,6 +74,7 @@ extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; /* ??_7runtime_error(a)std@@6B@ */ extern const vtable_ptr MSVCP_runtime_error_vtable; +extern const vtable_ptr MSVCP_failure_vtable; static void MSVCP_type_info_dtor(type_info * _this) { @@ -704,6 +705,76 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) return MSVCP_basic_string_char_c_str(&this->str); } +/* failure class data */ +typedef runtime_error failure; + +static failure* MSVCP_failure_ctor( + failure *this, const char *name) +{ + TRACE("%p %s\n", this, name); + MSVCP_runtime_error_ctor(this, name); + this->e.vtable = &MSVCP_failure_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_copy_ctor, 8) +failure* __thiscall MSVCP_failure_copy_ctor( + failure *this, failure *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_runtime_error_copy_ctor(this, rhs); + this->e.vtable = &MSVCP_failure_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_dtor, 4) +void __thiscall MSVCP_failure_dtor(failure *this) +{ + TRACE("%p\n", this); + MSVCP_logic_error_dtor(this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_vector_dtor, 8) +void* __thiscall MSVCP_failure_vector_dtor( + failure *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + return MSVCP_runtime_error_vector_dtor(this, flags); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_failure_what, 4) +const char* __thiscall MSVCP_failure_what(failure *this) +{ + TRACE("%p\n", this); + return MSVCP_runtime_error_what(this); +} + +DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); + +static const cxx_type_info failure_cxx_type_info = { + 0, + &failure_type_info, + { 0, -1, 0 }, + sizeof(failure), + (cxx_copy_ctor)THISCALL(MSVCP_failure_copy_ctor) +}; + +static const cxx_type_info_table failure_cxx_type_table = { + 3, + { + &failure_cxx_type_info, + &runtime_error_cxx_type_info, + &exception_cxx_type_info + } +}; + +static const cxx_exception_type failure_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_failure_dtor), + NULL, + &failure_cxx_type_table +}; + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -737,6 +808,9 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what) VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); + __ASM_VTABLE(failure, + VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_failure_what)); #ifndef __GNUC__ } #endif @@ -745,6 +819,8 @@ void __asm_dummy_vtables(void) { void throw_exception(exception_type et, const char *str) { switch(et) { + case EXCEPTION_RERAISE: + _CxxThrowException(NULL, NULL); case EXCEPTION: { exception e; MSVCP_exception_ctor(&e, str); @@ -780,6 +856,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_runtime_error_ctor(&e, str); _CxxThrowException((exception*)&e, &runtime_error_cxx_type); } + case EXCEPTION_FAILURE: { + failure e; + MSVCP_failure_ctor(&e, str); + _CxxThrowException((exception*)&e, &failure_cxx_type); + } default: ERR("exception type not handled: %d\n", et); } @@ -796,5 +877,6 @@ void init_exception(void *base) init_out_of_range_rtti(base); init_invalid_argument_rtti(base); init_runtime_error_rtti(base); + init_failure_rtti(base); #endif }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMSetBlendState().
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: e69c28a0f70bfea72efb701833b86fafda1123be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e69c28a0f70bfea72efb70183… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:25 2012 +0200 d3d10core: Implement d3d10_device_OMSetBlendState(). --- dlls/d3d10core/d3d10core_private.h | 4 ++++ dlls/d3d10core/device.c | 8 +++++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2dcd89a..4297adf 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -217,6 +217,7 @@ struct d3d10_blend_state }; HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; +struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ struct d3d10_depthstencil_state @@ -269,6 +270,9 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct d3d10_blend_state *blend_state; + float blend_factor[4]; + UINT sample_mask; struct d3d10_depthstencil_state *depth_stencil_state; UINT stencil_ref; struct d3d10_rasterizer_state *rasterizer_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ae3b865..95b337a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -318,8 +318,14 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device *iface, ID3D10BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, blend_state %p, blend_factor [%f %f %f %f], sample_mask 0x%08x.\n", iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + + device->blend_state = unsafe_impl_from_ID3D10BlendState(blend_state); + memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); + device->sample_mask = sample_mask; } static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 1d927ce..9e64ea6 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -140,6 +140,15 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) return S_OK; } +struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_blend_state_vtbl); + + return impl_from_ID3D10BlendState(iface); +} + static inline struct d3d10_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) { return CONTAINING_RECORD(iface, struct d3d10_depthstencil_state, ID3D10DepthStencilState_iface);

1 0

Francois Gouget : shell32/tests: Some more type consistency fixes for the ShellExecute() return value checks.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 0e6605ac52798b8baebe2a199a95f65b887c11b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6605ac52798b8baebe2a199… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 09:53:31 2012 +0200 shell32/tests: Some more type consistency fixes for the ShellExecute() return value checks. --- dlls/shell32/tests/shlexec.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6cfb2b0..ba0e2b8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -854,7 +854,7 @@ typedef struct const char* verb; const char* basename; int todo; - int rc; + INT_PTR rc; } filename_tests_t; static filename_tests_t filename_tests[]= @@ -1136,7 +1136,7 @@ static void test_filename(void) char filename[MAX_PATH]; const filename_tests_t* test; char* c; - int rc; + INT_PTR rc; test=filename_tests; while (test->basename) @@ -1179,12 +1179,12 @@ static void test_filename(void) { ok(rc==test->rc || broken(quotedfile && rc == 2), /* NT4 */ - "%s failed: rc=%d err=%u\n", shell_call, + "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } if (rc == 33) @@ -1228,12 +1228,12 @@ static void test_filename(void) rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } if (rc==0) @@ -1297,7 +1297,7 @@ static void test_filename(void) */ sprintf(filename, "\"%s\\test file.shlexec\"", tmpdir); rc=shell_execute(NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%d err=%u\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open");

1 0

Piotr Caban : msvcp60: Fixed ctype class vtable.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 291edc484ff25393c6bcae92e995ad355d2ca42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=291edc484ff25393c6bcae92e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:16:52 2012 +0200 msvcp60: Fixed ctype class vtable. --- dlls/msvcp60/cxx.h | 1 - dlls/msvcp60/locale.c | 92 ++++--------------------------------------------- dlls/msvcp60/main.c | 1 - 3 files changed, 7 insertions(+), 87 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index de934ce..42e9975 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -210,7 +210,6 @@ extern void *vtbl_wrapper_36; extern void *vtbl_wrapper_40; extern void *vtbl_wrapper_44; extern void *vtbl_wrapper_48; -extern void *vtbl_wrapper_52; #else diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 0cc3807..4471096 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -1087,12 +1087,6 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla return this; } -/* ?_Xran(a)ctype_base@std@@KAXXZ */ -static void ctype_base__Xran(void) -{ - throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); -} - /* ?id@?$ctype(a)D@std@@2V0locale(a)2@A */ locale_id ctype_char_id = {0}; /* ?table_size@?$ctype(a)D@std@@2IB */ @@ -1206,7 +1200,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla /* ?do_narrow@?$ctype(a)D@std@@MBEDDD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) -#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 32, \ char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { @@ -1217,7 +1211,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un /* ?do_narrow@?$ctype(a)D@std@@MBEPBDPBD0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) -#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 28, \ const char*, (const ctype_char*, const char*, const char*, char, char*), \ (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, @@ -1228,20 +1222,6 @@ const char* __thiscall ctype_char_do_narrow(const ctype_char *this, return last; } -/* ?_Do_narrow_s@?$ctype(a)D@std@@MBEPBDPBD0DPADI(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) -#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ - const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ - (this, first, last, unused, dest, size)) -const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, - const char *last, char unused, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - memcpy_s(dest, size, first, last-first); - return last; -} - /* ?narrow@?$ctype(a)D@std@@QBEDDD(a)Z */ /* ?narrow@?$ctype(a)D@std@@QEBADDD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_narrow_ch, 12) @@ -1286,20 +1266,6 @@ const char* __thiscall ctype_char_do_widen(const ctype_char *this, return last; } -/* ?_Do_widen_s@?$ctype(a)D@std@@MBEPBDPBD0PADI(a)Z */ -/* ?_Do_widen_s@?$ctype(a)D@std@@MEBAPEBDPEBD0PEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) -#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ - const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ - (this, first, last, dest, size)) -const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, - const char *first, const char *last, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - memcpy_s(dest, size, first, last-first); - return last; -} - /* ?widen@?$ctype(a)D@std@@QBEDD(a)Z */ /* ?widen@?$ctype(a)D@std@@QEBADD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_char_widen_ch, 8) @@ -1768,7 +1734,7 @@ static char ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char dflt /* ?do_narrow@?$ctype(a)G@std@@MBEDGD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBADGD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12) -#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \ +#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 48, \ char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt)) char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { @@ -1780,7 +1746,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch /* ?do_narrow@?$ctype(a)G@std@@MBEPBGPBG0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD(a)Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20) -#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \ +#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 44, \ const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \ (this, first, last, dflt, dest)) const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, @@ -1792,25 +1758,6 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, return last; } -/* ?_Do_narrow_s@?$ctype(a)_W@std@@MBEPB_WPB_W0DPADI(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)_W@std@@MEBAPEB_WPEB_W0DPEAD_K(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)G@std@@MBEPBGPBG0DPADI(a)Z */ -/* ?_Do_narrow_s@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24) -#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \ - const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \ - (this, first, last, dflt, dest, size)) -const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, - const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); - /* This function converts all multi-byte characters to dflt, - * thanks to it result size is known before converting */ - if(last-first > size) - ctype_base__Xran(); - return ctype_wchar_do_narrow(this, first, last, dflt, dest); -} - /* ?narrow@?$ctype(a)_W@std@@QBED_WD(a)Z */ /* ?narrow@?$ctype(a)_W@std@@QEBAD_WD(a)Z */ /* ?narrow@?$ctype(a)G@std@@QBEDGD(a)Z */ @@ -1944,25 +1891,6 @@ const char* __thiscall ctype_wchar_do_widen(const ctype_wchar *this, return last; } -/* ?_Do_widen_s@?$ctype(a)_W@std@@MBEPBDPBD0PA_WI(a)Z */ -/* ?_Do_widen_s@?$ctype(a)_W@std@@MEBAPEBDPEBD0PEA_W_K(a)Z */ -/* ?_Do_widen_s@?$ctype(a)G@std@@MBEPBDPBD0PAGI(a)Z */ -/* ?_Do_widen_s@?$ctype(a)G@std@@MEBAPEBDPEBD0PEAG_K(a)Z */ -DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_widen_s, 20) -#define call_ctype_wchar__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 44, \ - const char*, (const ctype_wchar*, const char*, const char*, wchar_t*, MSVCP_size_t), \ - (this, first, last, dest, size)) -const char* __thiscall ctype_wchar__Do_widen_s(const ctype_wchar *this, - const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) -{ - TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - /* This function converts all multi-byte characters to WEOF, - * thanks to it result size is known before converting */ - if(size < last-first) - ctype_base__Xran(); - return ctype_wchar_do_widen(this, first, last, dest); -} - /* ?widen@?$ctype(a)_W@std@@QBE_WD(a)Z */ /* ?widen@?$ctype(a)_W@std@@QEBA_WD(a)Z */ /* ?widen@?$ctype(a)G@std@@QBEGD(a)Z */ @@ -7991,10 +7919,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char_do_toupper_ch) VTABLE_ADD_FUNC(ctype_char_do_widen) VTABLE_ADD_FUNC(ctype_char_do_widen_ch) - VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8007,10 +7933,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8023,10 +7947,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 5b375dc..dd7a4ef 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -51,7 +51,6 @@ DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); -DEFINE_VTBL_WRAPPER(52); #endif

1 0