January 2014 - Wine-commits

Alexandre Julliard : makefiles: Automatically add the necessary msvcrt flags to the generated rules.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 3e40fea9d61e7a0c5fe562c0f2d42fa5d971837c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e40fea9d61e7a0c5fe562c0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 12:38:55 2014 +0100 makefiles: Automatically add the necessary msvcrt flags to the generated rules. --- Make.rules.in | 2 +- Make.vars.in | 1 + configure | 2 ++ configure.ac | 2 ++ dlls/crtdll/Makefile.in | 2 -- dlls/msvcirt/msvcirt.c | 1 - dlls/msvcp100/Makefile.in | 2 -- dlls/msvcp100/tests/Makefile.in | 2 -- dlls/msvcp110/Makefile.in | 2 -- dlls/msvcp60/Makefile.in | 2 -- dlls/msvcp60/tests/Makefile.in | 2 -- dlls/msvcp71/Makefile.in | 2 -- dlls/msvcp80/Makefile.in | 2 -- dlls/msvcp90/Makefile.in | 2 -- dlls/msvcp90/tests/Makefile.in | 2 -- dlls/msvcr100/Makefile.in | 2 -- dlls/msvcr100/tests/Makefile.in | 2 -- dlls/msvcr110/Makefile.in | 2 -- dlls/msvcr80/Makefile.in | 2 -- dlls/msvcr90/Makefile.in | 2 -- dlls/msvcr90/tests/Makefile.in | 2 -- dlls/msvcrt/tests/Makefile.in | 3 +-- dlls/msvcrtd/Makefile.in | 2 -- dlls/msvcrtd/tests/Makefile.in | 2 -- loader/Makefile.in | 1 - programs/notepad/Makefile.in | 3 --- programs/regedit/Makefile.in | 3 --- programs/taskmgr/Makefile.in | 3 --- programs/wordpad/Makefile.in | 3 --- programs/xcopy/Makefile.in | 2 -- tools/makedep.c | 31 ++++++++++++++++++++++++------- 31 files changed, 31 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e40fea9d61e7a0c5fe56…

1 0

Alexandre Julliard : makefiles: Generate explicit commands to create object subdirectories.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: ec8e5c610b82369e8111c1c7fa724d29ab03c37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8e5c610b82369e8111c1c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 16:04:33 2014 +0100 makefiles: Generate explicit commands to create object subdirectories. --- tools/makedep.c | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3295359..e8a1161 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1394,7 +1394,6 @@ static struct strarray output_sources(void) struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; - struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray targetflags = get_expanded_make_var_array( "TARGETFLAGS" ); @@ -1423,7 +1422,7 @@ static struct strarray output_sources(void) LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { struct strarray extradefs; - char *sourcedep; + char *subdir = NULL; char *obj = xstrdup( source->name ); char *ext = get_extension( obj ); @@ -1432,12 +1431,9 @@ static struct strarray output_sources(void) if (src_dir && strchr( obj, '/' )) { - char *dir = xstrdup( obj ); - *strrchr( dir, '/' ) = 0; - strarray_add_uniq( &subdirs, dir ); - sourcedep = strmake( "%s %s", dir, source->filename ); + subdir = xstrdup( obj ); + *strrchr( subdir, '/' ) = 0; } - else sourcedep = xstrdup( source->filename ); extradefs = get_expanded_make_var_array( strmake( "%s_EXTRADEFS", obj )); @@ -1448,28 +1444,32 @@ static struct strarray output_sources(void) if (find_include_file( header )) { - output( "%s.tab.h: %s\n", obj, sourcedep ); + output( "%s.tab.h: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", obj, obj, source->filename ); output( "%s.tab.c: %s %s\n", obj, source->filename, header ); strarray_add( &clean_files, strmake( "%s.tab.h", obj )); } - else output( "%s.tab.c: %s\n", obj, sourcedep ); + else output( "%s.tab.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); free( header ); continue; /* no dependencies */ } else if (!strcmp( ext, "x" )) /* template file */ { - output( "%s.h: $(MAKEXFTMPL) %s\n", obj, sourcedep ); + output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename ); strarray_add( &clean_files, strmake( "%s.h", obj )); continue; /* no dependencies */ } else if (!strcmp( ext, "l" )) /* lex file */ { - output( "%s.yy.c: %s\n", obj, sourcedep ); + output( "%s.yy.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); continue; /* no dependencies */ } @@ -1477,7 +1477,8 @@ static struct strarray output_sources(void) { if (source->flags & FLAG_RC_PO) { - output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1491,7 +1492,8 @@ static struct strarray output_sources(void) } else { - output( "%s.res: $(WRC) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1506,7 +1508,8 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "mc" )) /* message file */ { - output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); strarray_add( &res_files, strmake( "%s.res", obj )); strarray_add( &mc_files, source->filename ); @@ -1531,6 +1534,7 @@ static struct strarray output_sources(void) if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); output_filenames( targets ); output( ": $(WIDL)\n" ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WIDL) -o $@ %s", source->filename ); output_filenames( targetflags ); output_filenames( includes ); @@ -1539,7 +1543,7 @@ static struct strarray output_sources(void) output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); - output( ": %s", sourcedep ); + output( ": %s", source->filename ); } else if (!strcmp( ext, "in" )) /* .in file or man page */ { @@ -1565,7 +1569,8 @@ static struct strarray output_sources(void) strarray_add_uniq( &phony_targets, "install-man-pages" ); } else strarray_add( &clean_files, xstrdup(obj) ); - output( "%s: %s\n", obj, sourcedep ); + output( "%s: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj ); } @@ -1609,7 +1614,8 @@ static struct strarray output_sources(void) if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); strarray_add( &object_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj, sourcedep ); + output( "%s.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1620,7 +1626,8 @@ static struct strarray output_sources(void) if (crosstarget && need_cross) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); - output( "%s.cross.o: %s\n", obj, sourcedep ); + output( "%s.cross.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1643,7 +1650,6 @@ static struct strarray output_sources(void) output( ":" ); } free( obj ); - free( sourcedep ); for (i = 0; i < source->files_count; i++) output_include( source->files[i], source ); output( "\n" ); @@ -1947,13 +1953,6 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "clean" ); } - if (subdirs.count) - { - output_filenames( subdirs ); - output( ":\n" ); - output( "\t$(MKDIR_P) -m 755 $@\n" ); - } - if (top_obj_dir) { output( "depend:\n" );

1 0

Piotr Caban : msvcrt: Handle null mbstr parameter in mbstowcs.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 544d179434f728fa649648aaad74d93e5abd099f URL: http://source.winehq.org/git/wine.git/?a=commit;h=544d179434f728fa649648aaa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:22 2014 +0100 msvcrt: Handle null mbstr parameter in mbstowcs. --- dlls/msvcrt/mbcs.c | 5 +++++ dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b25649b6..e7eaf5e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2127,6 +2127,11 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, MSVCRT_pthreadlocinfo locinfo; MSVCRT_size_t i, size; + if(!mbstr) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + if(!locale) locinfo = get_locinfo(); else diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c11c364..800a06b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1635,6 +1635,11 @@ static void test_mbstowcs(void) wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; + errno = 0xdeadbeef; + ret = mbstowcs(wOut, NULL, 4); + ok(ret == -1, "mbstowcs did not return -1\n"); + ok(errno == EINVAL, "errno = %d\n", errno); + ret = mbstowcs(NULL, mSimple, 0); ok(ret == 4, "mbstowcs did not return 4\n");

1 0

Piotr Caban : msvcp110: Fix streamsize parameter size in spec file.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: f1105d3f81054ab7b3d181ceafdc3c1efd7a3b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1105d3f81054ab7b3d181cea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:36 2014 +0100 msvcp110: Fix streamsize parameter size in spec file. --- dlls/msvcp110/msvcp110.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index e822130..f00cb3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3342,7 +3342,7 @@ @ cdecl -arch=arm ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXPA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ thiscall -arch=i386 ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXPA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win64 ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXPEA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp -@ cdecl ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setprecision +@ cdecl ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr int64) setprecision @ cdecl -arch=arm ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ thiscall -arch=i386 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @@ -3370,7 +3370,7 @@ @ cdecl -arch=arm ?setstate(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_setstate_unsigned @ thiscall -arch=i386 ?setstate(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_setstate_unsigned @ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_setstate_unsigned -@ cdecl ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setw +@ cdecl ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr int64) setw @ cdecl -arch=arm ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAAHXZ(ptr) basic_streambuf_char_sgetc @ thiscall -arch=i386 ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sgetc @ cdecl -arch=win64 ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sgetc

1 0

Bruno Jesus : iphlpapi/tests: Add IcmpSendEcho tests.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 98e1560d498deb5aad34054d41b49e094d148ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e1560d498deb5aad34054d4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 7 04:00:19 2014 -0200 iphlpapi/tests: Add IcmpSendEcho tests. --- dlls/iphlpapi/tests/iphlpapi.c | 133 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0d99e3c..dbf97b2 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -73,6 +73,8 @@ static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pSetTcpEntry)(PMIB_TCPROW); +static HANDLE(WINAPI *pIcmpCreateFile)(VOID); +static DWORD (WINAPI *pIcmpSendEcho)(HANDLE,IPAddr,LPVOID,WORD,PIP_OPTION_INFORMATION,LPVOID,DWORD,DWORD); static void loadIPHlpApi(void) { @@ -105,6 +107,8 @@ static void loadIPHlpApi(void) pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); pSetTcpEntry = (void *)GetProcAddress(hLibrary, "SetTcpEntry"); + pIcmpCreateFile = (void *)GetProcAddress(hLibrary, "IcmpCreateFile"); + pIcmpSendEcho = (void *)GetProcAddress(hLibrary, "IcmpSendEcho"); } } @@ -860,6 +864,134 @@ static void testSetTcpEntry(void) "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); } +static void testIcmpSendEcho(void) +{ + HANDLE icmp; + char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; + DWORD ret, error, replysz = sizeof(replydata); + IPAddr address; + + if (!pIcmpSendEcho || !pIcmpCreateFile) + { + win_skip( "ImcpSendEcho or IcmpCreateFile not available\n" ); + return; + } + memset(senddata, 0, sizeof(senddata)); + + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, + "expected 87, got %d\n", error); + + icmp = pIcmpCreateFile(); + if (icmp == INVALID_HANDLE_VALUE) + { + error = GetLastError(); + if (error == ERROR_ACCESS_DENIED) + { + skip ("ICMP is not available.\n"); + return; + } + } + ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); + + address = 0; + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_NETNAME + || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, + "expected 1214, got %d\n", error); + } + + address = htonl(INADDR_LOOPBACK); + if (0) /* crashes in XP */ + { + ret = pIcmpSendEcho(icmp, address, NULL, sizeof(senddata), NULL, replydata, replysz, 1000); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, NULL, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + if (0) /* crashes in wine, remove IF when fixed */ + { + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, sizeof(replydata) - 1, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + } + + /* in windows >= vista the timeout can't be invalid */ + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, -1); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + /* real ping test */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + if (ret) + { + PICMP_ECHO_REPLY pong = (PICMP_ECHO_REPLY) replydata; + trace ("ping roundtrip: %u ms\n", pong->RoundTripTime); + } + else + { + skip ("Failed to ping with error %d, is lo interface down?.\n", error); + } +} + /* still-to-be-tested NT4-onward functions: CreateIpForwardEntry @@ -892,6 +1024,7 @@ static void testWinNT4Functions(void) testGetTcpTable(); testGetUdpTable(); testSetTcpEntry(); + testIcmpSendEcho(); } static void testGetInterfaceInfo(void)

1 0

Sergey Guralnik : winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 4d13f84903eb227acabeaa90beac3d59dd6f8f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d13f84903eb227acabeaa90b… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 8 12:56:26 2014 +0200 winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template. --- tools/winedump/output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index c7804d0..aff7f66 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -457,8 +457,7 @@ void output_makefile (void) if (globals.forward_dll) fprintf (makefile, "IMPORTS = %s", globals.forward_dll); - fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n", - OUTPUT_DLL_NAME); + fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n", OUTPUT_DLL_NAME); if (globals.forward_dll) fprintf (specfile,"#import %s.dll\n", globals.forward_dll);

1 0

Jacek Caban : htaccess: Set content type for file.winetest.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: tools Branch: master Commit: c36851419c5ae593d994ae2fda3f1e60bc2f38ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=c36851419c5ae593d994ae2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 15:20:27 2014 +0100 htaccess: Set content type for file.winetest. --- winetest/tests/.htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index 3189dbd..df1bd34 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -2,6 +2,7 @@ Order Allow,Deny Allow From All SetEnv no-gzip dont-vary +AddType application/winetest .winetest <Files chunked> Allow from All

1 0

Jeremy Newman : missing p tag, bug 35231
by Jeremy Newman 08 Jan '14

08 Jan '14

Module: website Branch: master Commit: b97730a3eda9bb438510d465d3f596c3369cc995 URL: http://source.winehq.org/git/website.git/?a=commit;h=b97730a3eda9bb438510d4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jan 8 09:06:49 2014 -0600 missing p tag, bug 35231 --- templates/de/download/ubuntu.template | 2 +- templates/en/download/ubuntu.template | 2 +- templates/fr/download/ubuntu.template | 2 +- templates/pl/download/ubuntu.template | 2 +- templates/pt/download/ubuntu.template | 4 ++-- templates/tr/download/ubuntu.template | 2 +- templates/uk/download/ubuntu.template | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template index e77befd..aacaa6c 100644 --- a/templates/de/download/ubuntu.template +++ b/templates/de/download/ubuntu.template @@ -22,7 +22,7 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz Dann, kopiere die untere Zeile dort hinein. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Warnung: Betapakete</h2> diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index caee2fd..740c923 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -21,7 +21,7 @@ Software tab and click Add. Then, copy and paste the line below. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Warning: Beta packages</h2> diff --git a/templates/fr/download/ubuntu.template b/templates/fr/download/ubuntu.template index 09b52de..2a43a3d 100644 --- a/templates/fr/download/ubuntu.template +++ b/templates/fr/download/ubuntu.template @@ -23,7 +23,7 @@ alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0 Ensuite, entrez la ligne suivante : -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Avertissement : paquets bêta</h2> diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template index 2ebe476..09912c5 100644 --- a/templates/pl/download/ubuntu.template +++ b/templates/pl/download/ubuntu.template @@ -21,7 +21,7 @@ osób trzecich i kliknij Dodaj.... Następnie, wklej poniższą linijkę. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Uwaga: paczki beta</h2> diff --git a/templates/pt/download/ubuntu.template b/templates/pt/download/ubuntu.template index 405f9f8..d11506e 100644 --- a/templates/pt/download/ubuntu.template +++ b/templates/pt/download/ubuntu.template @@ -19,9 +19,9 @@ e selecionando Editar->Fontes de Aplicativos. Escolha a aba <img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> -<ppa>Depois, copie e cole a linha abaixo. +Depois, copie e cole a linha abaixo. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Aviso: Pacotes Beta</h2> diff --git a/templates/tr/download/ubuntu.template b/templates/tr/download/ubuntu.template index 5c177ab..296c866 100644 --- a/templates/tr/download/ubuntu.template +++ b/templates/tr/download/ubuntu.template @@ -16,7 +16,7 @@ Ubuntu ve Ubuntu türevleri için Wine Ardından, aşağıdaki satırı kopyalayın ve yapıştırın. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Uyarı: Beta paketleri</h2> diff --git a/templates/uk/download/ubuntu.template b/templates/uk/download/ubuntu.template index f346996..e646226 100644 --- a/templates/uk/download/ubuntu.template +++ b/templates/uk/download/ubuntu.template @@ -20,7 +20,7 @@ Software tab and click Add. Потім, скопіюйте та вставте рядок який вказано нижче. -ppa:ubuntu-wine/ppa +ppa:ubuntu-wine/ppa <h2>Попередження: Розробницькі пакунки</h2>

1 0

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DirectMusicSegment8.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 996b3c87f110f5520dd097c81ec73dbaab6a425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=996b3c87f110f5520dd097c81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:56:25 2014 +0100 dmime: Remove the extraneous IUnknown from DirectMusicSegment8. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/dmime_private.h | 2 - dlls/dmime/segment.c | 126 ++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 78 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 2a441db..7060598 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -126,8 +126,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { * IDirectMusicSegment8Impl implementation structure */ struct IDirectMusicSegment8Impl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicSegment8 IDirectMusicSegment8_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index deec9c8..fa6a6a9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -31,83 +31,53 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface); } -/* IDirectMusicSegment IUnknown part: */ -static HRESULT WINAPI IDirectMusicSegment8Impl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicSegment) - || IsEqualIID (riid, &IID_IDirectMusicSegment2) - || IsEqualIID (riid, &IID_IDirectMusicSegment8)) { - *ppobj = &This->IDirectMusicSegment8_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicSegment8Impl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSegment8Impl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMIME_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl = { - IDirectMusicSegment8Impl_IUnknown_QueryInterface, - IDirectMusicSegment8Impl_IUnknown_AddRef, - IDirectMusicSegment8Impl_IUnknown_Release -}; - static HRESULT WINAPI IDirectMusicSegment8Impl_QueryInterface(IDirectMusicSegment8 *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + + *ret_iface = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicSegment) || + IsEqualIID(riid, &IID_IDirectMusicSegment2) || + IsEqualIID (riid, &IID_IDirectMusicSegment8)) + *ret_iface = iface; + else if (IsEqualIID (riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID (riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicSegment8Impl_AddRef(IDirectMusicSegment8 *iface) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMIME_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetLength(IDirectMusicSegment8 *iface, @@ -596,17 +566,17 @@ static const IDirectMusicSegment8Vtbl dmsegment8_vtbl = { /* IDirectMusicSegment8Impl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicSegment8_QueryInterface(&This->IDirectMusicSegment8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_AddRef(&This->IDirectMusicSegment8_iface); } static ULONG WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_Release(&This->IDirectMusicSegment8_iface); } static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -834,17 +804,17 @@ static const IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl = { /* IDirectMusicSegment8Impl IPersistStream part: */ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicSegment8_QueryInterface(&This->IDirectMusicSegment8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_AddRef(&This->IDirectMusicSegment8_iface); } static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_Release(&This->IDirectMusicSegment8_iface); } static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -1366,6 +1336,7 @@ static const IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicSegment8Impl* obj; + HRESULT hr; if (pUnkOuter) { *ppobj = NULL; @@ -1377,7 +1348,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicSegment8_Unknown_Vtbl; obj->IDirectMusicSegment8_iface.lpVtbl = &dmsegment8_vtbl; obj->ObjectVtbl = &DirectMusicSegment8_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicSegment8_PersistStream_Vtbl; @@ -1385,8 +1355,12 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicSegment; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Tracks); - return IDirectMusicSegment8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DMIME_LockModule(); + hr = IDirectMusicSegment8_QueryInterface(&obj->IDirectMusicSegment8_iface, lpcGUID, ppobj); + IDirectMusicSegment8_Release(&obj->IDirectMusicSegment8_iface); + + return hr; }

1 0

Huw Davies : riched20: Simplify the code by accessing paragraphs directly from runs.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 7e7a8f1a4e14193b50607f2dbe2571385ec04f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7a8f1a4e14193b50607f2db… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 7 12:44:20 2014 +0000 riched20: Simplify the code by accessing paragraphs directly from runs. --- dlls/riched20/run.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 263fee4..245a031 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -658,9 +658,7 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) */ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) { - ME_DisplayItem *para; - ME_DisplayItem *run; - ME_DisplayItem *end_run = NULL; + ME_DisplayItem *run, *end_run = NULL; if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) return; @@ -682,27 +680,15 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_SplitRunSimple(editor, end); end_run = end ? end->pRun : NULL; - run = start->pRun; - para = start->pPara; - para->member.para.nFlags |= MEPF_REWRAP; - - while(run != end_run) + for (run = start->pRun; run != end_run; run = ME_FindItemFwd( run, diRun )) { ME_Style *new_style = ME_ApplyStyle(run->member.run.style, pFmt); - /* ME_DumpStyle(new_style); */ - add_undo_set_char_fmt( editor, para->member.para.nCharOfs + run->member.run.nCharOfs, + add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, run->member.run.len, &run->member.run.style->fmt ); ME_ReleaseStyle(run->member.run.style); run->member.run.style = new_style; - run = ME_FindItemFwd(run, diRunOrParagraph); - if (run && run->type == diParagraph) - { - para = run; - run = ME_FindItemFwd(run, diRun); - if (run != end_run) - para->member.para.nFlags |= MEPF_REWRAP; - } + run->member.run.para->nFlags |= MEPF_REWRAP; } }

1 0