December 2013 - Wine-Commits

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 Dec. 26, 2013

Dec. 26, 2013

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

Frédéric Delanoy : inetcomm/tests: Constify some character strings.
by Alexandre Julliard Dec. 26, 2013

Dec. 26, 2013

Module: wine Branch: master Commit: ff304fb5c75a7bc5f17dcdd1acb2203872923810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff304fb5c75a7bc5f17dcdd1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:35 2013 +0100 inetcomm/tests: Constify some character strings. --- dlls/inetcomm/tests/mimeole.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 389e267..7e98563 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -32,7 +32,7 @@ #include "wine/test.h" -static char msg1[] = +static const char msg1[] = "MIME-Version: 1.0\r\n" "Content-Type: multipart/mixed;\r\n" " boundary=\"------------1.5.0.6\";\r\n" @@ -224,7 +224,7 @@ static void test_CreateMessage(void) char text[] = "text"; HBODY *body_list; PROPVARIANT prop; - static char att_pritype[] = "att:pri-content-type"; + static const char att_pritype[] = "att:pri-content-type"; hr = MimeOleCreateMessage(NULL, &msg); ok(hr == S_OK, "ret %08x\n", hr);

1 0

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

Dec. 26, 2013

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

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

Dec. 26, 2013

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: Use array of filenames in more places.
by Alexandre Julliard Dec. 26, 2013

Dec. 26, 2013

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

Frédéric Delanoy : infosoft/tests: Constify a character string.
by Alexandre Julliard Dec. 26, 2013

Dec. 26, 2013

Module: wine Branch: master Commit: ab159ead212de3f657fe7f9b437129d54b31e5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab159ead212de3f657fe7f9b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:36 2013 +0100 infosoft/tests: Constify a character string. --- dlls/infosoft/tests/infosoft.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index efebedc..1e2792f 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -32,7 +32,7 @@ DEFINE_GUID(CLSID_wb_neutral, 0x369647e0,0x17b0,0x11ce,0x99,0x50,0x00,0xaa,0x00,0x4b,0xbb,0x1f); DEFINE_GUID(_IID_IWordBreaker, 0xD53552C8,0x77E3,0x101A,0xB5,0x52,0x08,0x00,0x2B,0x33,0xB0,0xE6); -static WCHAR teststring[] = { +static const WCHAR teststring[] = { 's','q','u','a','r','e',' ', 'c','i','r','c','l','e',' ', 't','r','i','a','n','g','l','e',' ',

1 0

Frédéric Delanoy : imagehlp/tests: Constify some character strings.
by Alexandre Julliard Dec. 26, 2013

Dec. 26, 2013

Module: wine Branch: master Commit: 3ad692d483d3e18b85caa54e4b2d44e746e2e22d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad692d483d3e18b85caa54e4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 24 09:25:34 2013 +0100 imagehlp/tests: Constify some character strings. --- dlls/imagehlp/tests/integrity.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 025e20f..eb1eb58 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -36,7 +36,7 @@ static BOOL (WINAPI *pImageGetCertificateData)(HANDLE, DWORD, LPWIN_CERTIFICATE, static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICATE); static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD); -static char test_cert_data[] = +static const char test_cert_data[] = {0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02 ,0xA0,0x82,0x02,0xD2,0x30,0x82,0x02,0xCE,0x02,0x01,0x01,0x31,0x00,0x30,0x0B ,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x01,0xA0,0x82,0x02,0xB4 @@ -88,7 +88,7 @@ static char test_cert_data[] = ,0x46,0xCA,0xEB,0xEA,0x67,0x89,0x49,0x7C,0x43,0xA2,0x52,0xD9,0x41,0xCC,0x65 ,0xED,0x2D,0xA1,0x00,0x31,0x00}; -static char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; +static const char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; static BOOL copy_dll_file(void) { @@ -135,7 +135,7 @@ static DWORD get_file_size(void) return filesize; } -static void test_add_certificate(char *cert_data, int len) +static void test_add_certificate(const char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -173,7 +173,7 @@ static void test_add_certificate(char *cert_data, int len) CloseHandle(hFile); } -static void test_get_certificate(char *cert_data, int index) +static void test_get_certificate(const char *cert_data, int index) { HANDLE hFile; LPWIN_CERTIFICATE cert;

1 0

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

Dec. 26, 2013

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

Nikolay Sivov : oleacc: Added DllGetClassObject() stub.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

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

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

Dec. 23, 2013

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