December 2013 - Wine-commits

Alexandre Julliard : makedep: Use array of filenames in more places.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 7779af1df9fc3ec6de1f2b54576db76bc8461a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7779af1df9fc3ec6de1f2b545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 24 11:37:52 2013 +0100 makedep: Use array of filenames in more places. --- tools/makedep.c | 146 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7779af1df9fc3ec6de1f2…

1 0

Alexandre Julliard : makedep: Add a separate pragma flag for typelibs that need registration.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 566d3418af646f5a8321413a28c079e170038899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566d3418af646f5a8321413a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 24 20:01:53 2013 +0100 makedep: Add a separate pragma flag for typelibs that need registration. --- dlls/gameux/gameux_tlb.idl | 2 +- dlls/hhctrl.ocx/hhctrl_tlb.idl | 2 +- dlls/hnetcfg/hnetcfg_tlb.idl | 2 +- dlls/ieframe/ieframe_v1.idl | 2 +- dlls/jscript/jsglobal.idl | 2 +- dlls/mmcndmgr/mmcndmgr.idl | 2 +- dlls/mshtml.tlb/mshtml_tlb.idl | 2 +- dlls/msi/msiserver.idl | 2 +- dlls/msxml/msxml_tlb.idl | 2 +- dlls/msxml2/msxml2_tlb.idl | 2 +- dlls/msxml3/msxml3_v1.idl | 2 +- dlls/msxml4/msxml4_tlb.idl | 2 +- dlls/msxml6/msxml6_tlb.idl | 2 +- dlls/oleacc/oleacc_classes.idl | 2 +- dlls/oledb32/oledb32_typelib.idl | 2 +- dlls/pstorec/pstorec_tlb.idl | 2 +- dlls/quartz/control_tlb.idl | 2 +- dlls/scrrun/scrrun.idl | 2 +- dlls/shdocvw/shdocvw_v1.idl | 2 +- dlls/shell32/shell32_tlb.idl | 2 +- dlls/stdole2.tlb/std_ole_v2.idl | 2 +- dlls/stdole32.tlb/std_ole_v1.idl | 2 +- dlls/vbscript/vbsglobal.idl | 2 +- dlls/vbscript/vbsregexp10.idl | 2 +- dlls/vbscript/vbsregexp55.idl | 2 +- dlls/wbemdisp/wbemdisp_tlb.idl | 2 +- dlls/winhttp/winhttp_tlb.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- dlls/wuapi/wuapi_tlb.idl | 2 +- tools/makedep.c | 38 ++++++++++++++++++++------------------ 30 files changed, 49 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=566d3418af646f5a83214…

1 0

Alexandre Julliard : widl: Determine the output type from the file name if not specified explicitly.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 9e307f268ec3ae9328ca80a542941d9b5b492106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e307f268ec3ae9328ca80a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 24 21:11:44 2013 +0100 widl: Determine the output type from the file name if not specified explicitly. --- tools/widl/widl.c | 20 ++++++++++++++++++-- tools/widl/widl.man.in | 3 ++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b9e1412..902bc92 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -669,14 +669,30 @@ int main(int argc,char *argv[]) wpp_add_include_path(DEFAULT_INCLUDE_DIR); #endif + /* if nothing specified, try to guess output type from the output file name */ + if (output_name && do_everything && !do_header && !do_typelib && !do_proxies && + !do_client && !do_server && !do_regscript && !do_idfile && !do_dlldata) + { + do_everything = 0; + if (strendswith( output_name, ".h" )) do_header = 1; + else if (strendswith( output_name, ".tlb" )) do_typelib = 1; + else if (strendswith( output_name, "_p.c" )) do_proxies = 1; + else if (strendswith( output_name, "_c.c" )) do_client = 1; + else if (strendswith( output_name, "_s.c" )) do_server = 1; + else if (strendswith( output_name, "_i.c" )) do_idfile = 1; + else if (strendswith( output_name, "_r.res" )) do_regscript = 1; + else if (strendswith( output_name, "_t.res" )) do_typelib = 1; + else if (strendswith( output_name, "dlldata.c" )) do_dlldata = 1; + else do_everything = 1; + } + if(do_everything) { set_everything(TRUE); } if (!output_name) output_name = dup_basename(input_name, ".idl"); - if (!do_everything && - do_header + do_typelib + do_proxies + do_client + + if (do_header + do_typelib + do_proxies + do_client + do_server + do_regscript + do_idfile + do_dlldata == 1) { if (do_header) header_name = output_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index c5f0205..3ee5403 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -33,7 +33,8 @@ Print version number and exit. .IP "\fB-o, --output=\fIname" Set the name of the output file. When generating multiple output files, this sets only the base name of the file; the respective output -files are then named \fIname\fR.h, \fIname\fR_p.c, etc. +files are then named \fIname\fR.h, \fIname\fR_p.c, etc. If a full +file name with extension is specified, only that file is generated. .IP "\fB-b \fIcpu-manufacturer\fR[\fB-\fIkernel\fR]\fB-\fIos\fR" Set the target architecture when cross-compiling. The target specification is in the standard autoconf format as returned by

1 0

Alexandre Julliard : makedep: Generate a common rule for all objects of a given idl source.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: d7afa57597d245bef7b7ff3bd2ad8706406a8931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7afa57597d245bef7b7ff3bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 24 21:12:08 2013 +0100 makedep: Generate a common rule for all objects of a given idl source. --- tools/makedep.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c53b6c9..d580c6a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -66,17 +66,16 @@ static const struct { unsigned int flag; const char *ext; - const char *widl_arg; } idl_outputs[] = { - { FLAG_IDL_TYPELIB, ".tlb", "$(TARGETFLAGS) $(IDLFLAGS) -t" }, - { FLAG_IDL_REGTYPELIB, "_t.res", "$(TARGETFLAGS) $(IDLFLAGS) -t" }, - { FLAG_IDL_CLIENT, "_c.c", "$(IDLFLAGS) -c" }, - { FLAG_IDL_IDENT, "_i.c", "$(IDLFLAGS) -u" }, - { FLAG_IDL_PROXY, "_p.c", "$(IDLFLAGS) -p" }, - { FLAG_IDL_SERVER, "_s.c", "$(IDLFLAGS) -s" }, - { FLAG_IDL_REGISTER, "_r.res", "$(IDLFLAGS) -r" }, - { FLAG_IDL_HEADER, ".h", "$(IDLFLAGS) -h" }, + { FLAG_IDL_TYPELIB, ".tlb" }, + { FLAG_IDL_REGTYPELIB, "_t.res" }, + { FLAG_IDL_CLIENT, "_c.c" }, + { FLAG_IDL_IDENT, "_i.c" }, + { FLAG_IDL_PROXY, "_p.c" }, + { FLAG_IDL_SERVER, "_s.c" }, + { FLAG_IDL_REGISTER, "_r.res" }, + { FLAG_IDL_HEADER, ".h" } }; static struct list sources = LIST_INIT(sources); @@ -1468,14 +1467,16 @@ static struct strarray output_sources(void) for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++) { if (!(source->flags & idl_outputs[i].flag)) continue; - output( "%s%s: $(WIDL)\n", obj, idl_outputs[i].ext ); - output( "\t$(WIDL) $(includes) %s -o $@ %s\n", idl_outputs[i].widl_arg, source->filename ); dest = strmake( "%s%s", obj, idl_outputs[i].ext ); strarray_add( &clean_files, dest ); strarray_add( &targets, dest ); } column = 0; output_filenames( &targets, &column ); + output( ": $(WIDL)\n" ); + output( "\t$(WIDL) $(includes) $(TARGETFLAGS) $(IDLFLAGS) -o $@ %s\n", source->filename ); + column = 0; + output_filenames( &targets, &column ); column += output( ": %s", sourcedep ); } else if (!strcmp( ext, "in" )) /* .in file or man page */

1 0

André Hentschel : kernel32: Adapt input checking in OpenConsoleW to match win8 behaviour.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 5a6d38c2bd6032c10f00754d456b7b975e4c4b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6d38c2bd6032c10f00754d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 21 20:33:47 2013 +0100 kernel32: Adapt input checking in OpenConsoleW to match win8 behaviour. --- dlls/kernel32/console.c | 10 +----- dlls/kernel32/tests/console.c | 70 +++++++++++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4f0ed09..67c353b 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -382,19 +382,11 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat output = (HANDLE) TRUE; } - if (output == INVALID_HANDLE_VALUE) + if (output == INVALID_HANDLE_VALUE || creation != OPEN_EXISTING) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - else if (creation != OPEN_EXISTING) - { - if (!creation || creation == CREATE_NEW || creation == CREATE_ALWAYS) - SetLastError(ERROR_SHARING_VIOLATION); - else - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } SERVER_START_REQ( open_console ) { diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d38315f..547e1c0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1062,39 +1062,60 @@ static void test_OpenConsoleW(void) DWORD gle, gle2; } invalid_table[] = { {NULL, 0, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, - {NULL, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, + {NULL, 0, FALSE, 0xdeadbeef, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, + {NULL, 0xdeadbeef, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, + {NULL, 0xdeadbeef, TRUE, 0xdeadbeef, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {NULL, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {NULL, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {NULL, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {NULL, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {emptyW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, - {emptyW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, + {emptyW, 0, FALSE, 0xdeadbeef, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, + {emptyW, 0xdeadbeef, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, + {emptyW, 0xdeadbeef, TRUE, 0xdeadbeef, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {emptyW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {emptyW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {emptyW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {emptyW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING, ERROR_INVALID_PARAMETER, ERROR_PATH_NOT_FOUND}, {invalidW, 0, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_FILE_NOT_FOUND}, - {invalidW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, + {invalidW, 0, FALSE, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, + {invalidW, 0xdeadbeef, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_FILE_NOT_FOUND}, + {invalidW, 0xdeadbeef, TRUE, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, {invalidW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, ERROR_FILE_NOT_FOUND}, {invalidW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_FILE_NOT_FOUND}, {invalidW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, ERROR_FILE_NOT_FOUND}, {invalidW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING, ERROR_INVALID_PARAMETER, ERROR_FILE_NOT_FOUND}, - {coninW, 0, FALSE, 0, ERROR_SHARING_VIOLATION, 0}, - {coninW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, - {coninW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, 0}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_SHARING_VIOLATION, 0}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, ERROR_SHARING_VIOLATION, 0}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, ERROR_SHARING_VIOLATION, 0}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, 0}, - {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, ERROR_INVALID_PARAMETER, 0}, - {conoutW, 0, FALSE, 0, ERROR_SHARING_VIOLATION, 0}, - {conoutW, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, - {conoutW, 0, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, 0}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0, ERROR_SHARING_VIOLATION, 0}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, ERROR_SHARING_VIOLATION, 0}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS, ERROR_SHARING_VIOLATION, 0}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS, ERROR_INVALID_PARAMETER, 0}, - {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING, ERROR_INVALID_PARAMETER, 0}, + {coninW, 0, FALSE, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, + {coninW, 0xdeadbeef, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_ACCESS_DENIED}, + {coninW, 0xdeadbeef, TRUE, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, + {conoutW, 0, FALSE, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, + {conoutW, 0xceadbeef, FALSE, 0, ERROR_INVALID_PARAMETER, ERROR_ACCESS_DENIED}, + {conoutW, 0xdeadbeef, TRUE, 0xdeadbeef, ERROR_INVALID_PARAMETER, 0}, + }; + static const struct + { + LPCWSTR name; + DWORD access; + BOOL inherit; + DWORD creation; + } valid_table[] = { + {coninW, 0, FALSE, 0 }, + {coninW, 0, TRUE, 0 }, + {coninW, GENERIC_EXECUTE, TRUE, 0 }, + {coninW, GENERIC_ALL, TRUE, 0 }, + {coninW, 0, FALSE, OPEN_ALWAYS }, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, 0 }, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW }, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS }, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS }, + {coninW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING}, + {conoutW, 0, FALSE, 0 }, + {conoutW, 0, FALSE, OPEN_ALWAYS }, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, 0 }, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_NEW, }, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, CREATE_ALWAYS }, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_ALWAYS }, + {conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, TRUNCATE_EXISTING}, }; int index; @@ -1120,6 +1141,17 @@ static void test_OpenConsoleW(void) invalid_table[index].gle, invalid_table[index].gle2, index, gle); } + for (index = 0; index < sizeof(valid_table)/sizeof(valid_table[0]); index++) + { + ret = pOpenConsoleW(valid_table[index].name, valid_table[index].access, + valid_table[index].inherit, valid_table[index].creation); + todo_wine + ok(ret != INVALID_HANDLE_VALUE || broken(ret == INVALID_HANDLE_VALUE /* until Win7 */), + "Expected OpenConsoleW to succeed for index %d, got %p\n", index, ret); + if (ret != INVALID_HANDLE_VALUE) + CloseHandle(ret); + } + /* OpenConsoleW should not touch the last error on success. */ SetLastError(0xdeadbeef); ret = pOpenConsoleW(coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING);

1 0

André Hentschel : kernel32/tests: Accept more win8 return values.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: a803c496b2392940c2c5a1e33d1792e38481d889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a803c496b2392940c2c5a1e33… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 21 20:36:35 2013 +0100 kernel32/tests: Accept more win8 return values. --- dlls/kernel32/tests/console.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 547e1c0..cd7ac23 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1025,7 +1025,8 @@ static void test_OpenCON(void) for (i = 0; i < sizeof(accesses) / sizeof(accesses[0]); i++) { h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); + ok(h != INVALID_HANDLE_VALUE || broken(accesses[i] == TRUNCATE_EXISTING /* Win8 */), + "Expected to open the CON device on write (%x)\n", accesses[i]); CloseHandle(h); h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); @@ -1034,14 +1035,13 @@ static void test_OpenCON(void) * NT, XP, Vista comply, but Win7 doesn't and allows opening CON with TRUNCATE_EXISTING * So don't test when disposition is TRUNCATE_EXISTING */ - if (accesses[i] != TRUNCATE_EXISTING) - { - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); - } + ok(h != INVALID_HANDLE_VALUE || broken(accesses[i] == TRUNCATE_EXISTING /* Win7+ */), + "Expected to open the CON device on read (%x)\n", accesses[i]); CloseHandle(h); h = CreateFileW(conW, GENERIC_READ|GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h == INVALID_HANDLE_VALUE, "Expected not to open the CON device on read-write (%x)\n", accesses[i]); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %x\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, + "Unexpected error %x\n", GetLastError()); } }

1 0

Dmitry Timoshkov : ws2_32: Add a workaround for broken versions of glibc which return EAI_SYSTEM and set errno to 0 instead returning of EAI_NONAME .
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: 83a1789c559166ceb59255ed0f2c116cb5b13c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a1789c559166ceb59255ed0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:01:02 2013 +0900 ws2_32: Add a workaround for broken versions of glibc which return EAI_SYSTEM and set errno to 0 instead returning of EAI_NONAME. --- dlls/ws2_32/socket.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 304b0eb..79feb2b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5370,6 +5370,14 @@ static int convert_eai_u2w(int unixret) { for (i=0;ws_eai_map[i][0];i++) if (ws_eai_map[i][1] == unixret) return ws_eai_map[i][0]; + + if (unixret == EAI_SYSTEM) + /* There are broken versions of glibc which return EAI_SYSTEM + * and set errno to 0 instead of returning EAI_NONAME. + */ + return errno ? sock_get_error( errno ) : WS_EAI_NONAME; + + FIXME("Unhandled unix EAI_xxx ret %d\n", unixret); return unixret; }

1 0

Dmitry Timoshkov : ws2_32: Add translation for AI_V4MAPPED.
by Alexandre Julliard 26 Dec '13

26 Dec '13

Module: wine Branch: master Commit: e25853c5433927fc229d15ede04eac38b88d7585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25853c5433927fc229d15ede… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:01:52 2013 +0900 ws2_32: Add translation for AI_V4MAPPED. --- dlls/ws2_32/socket.c | 1 + include/ws2tcpip.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 79feb2b..9fd85c5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -510,6 +510,7 @@ static const int ws_aiflag_map[][2] = MAP_OPTION( AI_PASSIVE ), MAP_OPTION( AI_CANONNAME ), MAP_OPTION( AI_NUMERICHOST ), + MAP_OPTION( AI_V4MAPPED ), MAP_OPTION( AI_ADDRCONFIG ), }; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index b1c296c..705c5ed 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -64,6 +64,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define AI_CANONNAME 0x00000002 # define AI_NUMERICHOST 0x00000004 # define AI_ADDRCONFIG 0x00000400 +# define AI_V4MAPPED 0x00000800 # define AI_NON_AUTHORITATIVE 0x00004000 # define AI_SECURE 0x00008000 # define AI_RETURN_PREFERRED_NAMES 0x00010000 @@ -82,6 +83,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_AI_CANONNAME 0x00000002 # define WS_AI_NUMERICHOST 0x00000004 # define WS_AI_ADDRCONFIG 0x00000400 +# define WS_AI_V4MAPPED 0x00000800 # define WS_AI_NON_AUTHORITATIVE 0x00004000 # define WS_AI_SECURE 0x00008000 # define WS_AI_RETURN_PREFERRED_NAMES 0x00010000

1 0

Sebastian Lackner : ntdll/tests: Add test for _snprintf.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 09bb38d12bbbe5fbeede2e29c8893877d853d792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09bb38d12bbbe5fbeede2e29c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 16 04:12:18 2013 +0100 ntdll/tests: Add test for _snprintf. --- dlls/ntdll/tests/string.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 9349f5d..7b56691 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -59,6 +59,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); +static int (__cdecl *p__snprintf)(char *, size_t, const char *, ...); static void InitFunctionPtrs(void) @@ -96,6 +97,8 @@ static void InitFunctionPtrs(void) p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); p_qsort= (void *)GetProcAddress(hntdll, "qsort"); p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); + + p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); } /* if */ } @@ -1270,6 +1273,34 @@ static void test_bsearch(void) } } +static void test__snprintf(void) +{ + const char *origstring = "XXXXXXXXXXXX"; + const char *teststring = "hello world"; + char buffer[32]; + int res; + + res = p__snprintf(NULL, 0, teststring); + ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + + res = p__snprintf(NULL, 1, teststring); + ok(res == lstrlenA(teststring) /* WinXP */ || res < 0 /* Vista and greater */, + "_snprintf returned %d, expected %d or < 0.\n", res, lstrlenA(teststring)); + + res = p__snprintf(buffer, strlen(teststring) - 1, teststring); + ok(res < 0, "_snprintf returned %d, expected < 0.\n", res); + + strcpy(buffer, origstring); + res = p__snprintf(buffer, strlen(teststring), teststring); + ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + ok(!strcmp(buffer, "hello worldX"), "_snprintf returned buffer '%s', expected 'hello worldX'.\n", buffer); + + strcpy(buffer, origstring); + res = p__snprintf(buffer, strlen(teststring) + 1, teststring); + ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); + ok(!strcmp(buffer, teststring), "_snprintf returned buffer '%s', expected '%s'.\n", buffer, teststring); +} + START_TEST(string) { InitFunctionPtrs(); @@ -1304,4 +1335,6 @@ START_TEST(string) test_qsort(); if (p_bsearch) test_bsearch(); + if (p__snprintf) + test__snprintf(); }

1 0

Nikolay Sivov : oleacc: Added DllGetClassObject() stub.
by Alexandre Julliard 23 Dec '13

23 Dec '13

Module: wine Branch: master Commit: 3740b2bbcfd0a433309dbc464b846489f91f59a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3740b2bbcfd0a433309dbc464… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 22 13:10:54 2013 +0400 oleacc: Added DllGetClassObject() stub. --- dlls/oleacc/main.c | 6 ++++++ dlls/oleacc/oleacc.spec | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index c554c8a..4a3e920 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -81,6 +81,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, return TRUE; } +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; +} + HRESULT WINAPI DllRegisterServer(void) { FIXME("\n"); diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 3909a79..6851454 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -5,6 +5,7 @@ @ stdcall CreateStdAccessibleObject(ptr long ptr ptr) @ stub CreateStdAccessibleProxyA @ stub CreateStdAccessibleProxyW +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetOleaccVersionInfo(ptr ptr)

1 0