September 2014 - Wine-commits

Austin English : wbemprox: Include winsock.h earlier for NetBSD.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 6e64ccace805cdffdc8df6d5e965ea02ba33a64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e64ccace805cdffdc8df6d5e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 11 17:14:04 2014 -0500 wbemprox: Include winsock.h earlier for NetBSD. --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index abc0b3e..48ed20a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -27,10 +27,10 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winsock2.h" #include "initguid.h" #include "wbemcli.h" #include "wbemprov.h" -#include "winsock2.h" #include "iphlpapi.h" #include "tlhelp32.h" #include "d3d10.h"

1 0

Austin English : wineconsole: Only use getmouse when HAVE_MOUSEMASK is defined.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 70d497943759599d980ea7d22d9ecbd2eec80b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d497943759599d980ea7d22… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 11 18:02:21 2014 -0500 wineconsole: Only use getmouse when HAVE_MOUSEMASK is defined. --- programs/wineconsole/curses.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 77d7718..24aab88 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -99,7 +99,6 @@ MAKE_FUNCPTR(getmaxx) #ifndef getmaxy MAKE_FUNCPTR(getmaxy) #endif -MAKE_FUNCPTR(getmouse) MAKE_FUNCPTR(has_colors) MAKE_FUNCPTR(init_pair) MAKE_FUNCPTR(initscr) @@ -122,6 +121,7 @@ MAKE_FUNCPTR(waddchnstr) MAKE_FUNCPTR(wmove) MAKE_FUNCPTR(wgetch) #ifdef HAVE_MOUSEMASK +MAKE_FUNCPTR(getmouse) MAKE_FUNCPTR(mouseinterval) MAKE_FUNCPTR(mousemask) #endif @@ -163,7 +163,6 @@ static BOOL WCCURSES_bind_libcurses(void) #ifndef getmaxy LOAD_FUNCPTR(getmaxy) #endif - LOAD_FUNCPTR(getmouse) LOAD_FUNCPTR(has_colors) LOAD_FUNCPTR(init_pair) LOAD_FUNCPTR(initscr) @@ -186,6 +185,7 @@ static BOOL WCCURSES_bind_libcurses(void) LOAD_FUNCPTR(wmove) LOAD_FUNCPTR(wgetch) #ifdef HAVE_MOUSEMASK + LOAD_FUNCPTR(getmouse) LOAD_FUNCPTR(mouseinterval) LOAD_FUNCPTR(mousemask) #endif @@ -214,7 +214,6 @@ sym_not_found: #ifndef getmaxy #define getmaxy p_getmaxy #endif -#define getmouse p_getmouse #define has_colors p_has_colors #define init_pair p_init_pair #define initscr p_initscr @@ -222,8 +221,11 @@ sym_not_found: #define intrflush p_intrflush #endif #define keypad p_keypad +#ifdef HAVE_MOUSEMASK +#define getmouse p_getmouse #define mouseinterval p_mouseinterval #define mousemask p_mousemask +#endif #define newpad p_newpad #ifndef nodelay #define nodelay p_nodelay

1 0

Marko Hauptvogel : winsock: Add icmpv6 protocol.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 3186e72f2978b59cb0785f897c5f48709420c109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3186e72f2978b59cb0785f897… Author: Marko Hauptvogel <marko.hauptvogel(a)googlemail.com> Date: Sun Sep 7 19:01:51 2014 +0200 winsock: Add icmpv6 protocol. --- include/winsock.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winsock.h b/include/winsock.h index 06e6309..d5c1e0b 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -261,6 +261,7 @@ extern "C" { #define IPPROTO_UDP 17 #define IPPROTO_IDP 22 #define IPPROTO_IPV6 41 +#define IPPROTO_ICMPV6 58 #define IPPROTO_ND 77 #define IPPROTO_RAW 255 #define IPPROTO_MAX 256 @@ -273,6 +274,7 @@ extern "C" { #define WS_IPPROTO_UDP 17 #define WS_IPPROTO_IDP 22 #define WS_IPPROTO_IPV6 41 +#define WS_IPPROTO_ICMPV6 58 #define WS_IPPROTO_ND 77 #define WS_IPPROTO_RAW 255 #define WS_IPPROTO_MAX 256

1 0

Marko Hauptvogel : iphlpapi: Implement icmpv6 create function.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: f3fa809e50fbe5e38be03923f30e8e982f42dbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3fa809e50fbe5e38be03923f… Author: Marko Hauptvogel <marko.hauptvogel(a)googlemail.com> Date: Sun Sep 7 19:03:20 2014 +0200 iphlpapi: Implement icmpv6 create function. --- dlls/iphlpapi/icmp.c | 31 +++++++++++++++++++++++++++++++ dlls/iphlpapi/iphlpapi.spec | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index abd8ddc..5ce758b 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -148,6 +148,37 @@ static int in_cksum(u_short *addr, int len) */ /*********************************************************************** + * Icmp6CreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI Icmp6CreateFile(VOID) +{ + icmp_t* icp; + + int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); + if (sid < 0) + { + /* Mac OS X supports non-privileged ICMP via SOCK_DGRAM type. */ + sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); + } + if (sid < 0) { + ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_HANDLE_VALUE; + } + + icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); + if (icp==NULL) { + close(sid); + SetLastError(IP_NO_RESOURCES); + return INVALID_HANDLE_VALUE; + } + icp->sid=sid; + icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; + return (HANDLE)icp; +} + + +/*********************************************************************** * IcmpCreateFile (IPHLPAPI.@) */ HANDLE WINAPI IcmpCreateFile(VOID) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 9e66d67..9fb8ada 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -150,7 +150,7 @@ #@ stub GetUnicastIpAddressEntry #@ stub GetUnicastIpAddressTable @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) -#@ stub Icmp6CreateFile +@ stdcall Icmp6CreateFile() #@ stub Icmp6ParseReplies #@ stub Icmp6SendEcho2 @ stdcall IcmpCloseHandle(ptr)

1 0

Marko Hauptvogel : iphlpapi/tests: Fix typo.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 4d0ac5c5ac55b1e7f4f781fe6fdfe4d562228bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0ac5c5ac55b1e7f4f781fe6… Author: Marko Hauptvogel <marko.hauptvogel(a)googlemail.com> Date: Sun Sep 7 19:04:14 2014 +0200 iphlpapi/tests: Fix typo. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index ce68a7b..b2d81c0 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -880,7 +880,7 @@ static void testIcmpSendEcho(void) if (!pIcmpSendEcho || !pIcmpCreateFile) { - win_skip( "ImcpSendEcho or IcmpCreateFile not available\n" ); + win_skip( "IcmpSendEcho or IcmpCreateFile not available\n" ); return; } memset(senddata, 0, sizeof(senddata));

1 0

Marko Hauptvogel : iphlpapi: Add icmpv6 send stub.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 869f8fd238073d2c19b08a35d94af00c468a3d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=869f8fd238073d2c19b08a35d… Author: Marko Hauptvogel <marko.hauptvogel(a)googlemail.com> Date: Sun Sep 7 19:05:04 2014 +0200 iphlpapi: Add icmpv6 send stub. --- dlls/iphlpapi/icmp.c | 26 ++++++++++++++++++++++++++ dlls/iphlpapi/iphlpapi.spec | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 5ce758b..ebc2f2b 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -179,6 +179,32 @@ HANDLE WINAPI Icmp6CreateFile(VOID) /*********************************************************************** + * Icmp6SendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI Icmp6SendEcho2( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + struct sockaddr_in6* SourceAddress, + struct sockaddr_in6* DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + FIXME("(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, + ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/*********************************************************************** * IcmpCreateFile (IPHLPAPI.@) */ HANDLE WINAPI IcmpCreateFile(VOID) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 9fb8ada..9eb5a32 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -152,7 +152,7 @@ @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) @ stdcall Icmp6CreateFile() #@ stub Icmp6ParseReplies -#@ stub Icmp6SendEcho2 +@ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() @ stub IcmpParseReplies

1 0

Piotr Caban : msvcp90: Fix FMTFLAG_showpoint handling in num_put_char__Ffmt.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 2b2a3338eea8fc9356fe48938eed2aca358b6fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2a3338eea8fc9356fe48938… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 12 11:28:39 2014 +0200 msvcp90: Fix FMTFLAG_showpoint handling in num_put_char__Ffmt. --- dlls/msvcp60/locale.c | 2 +- dlls/msvcp90/locale.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 2320886..326a51a 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -5843,7 +5843,7 @@ static char* num_put_char__Ffmt(const num_put *this, char *fmt, char spec, int f *p++ = '%'; if(fmtfl & FMTFLAG_showpos) *p++ = '+'; - if(fmtfl & FMTFLAG_showbase) + if(fmtfl & FMTFLAG_showpoint) *p++ = '#'; *p++ = '.'; *p++ = '*'; diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b15f1b8..587aca6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7088,7 +7088,7 @@ char* __cdecl num_put_char__Ffmt(const num_put *this, char *fmt, char spec, int *p++ = '%'; if(fmtfl & FMTFLAG_showpos) *p++ = '+'; - if(fmtfl & FMTFLAG_showbase) + if(fmtfl & FMTFLAG_showpoint) *p++ = '#'; *p++ = '.'; *p++ = '*';

1 0

Hans Leidekker : msi: Improve support for advertized shortcuts.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: 29baed1bc20de794c6e221fbf67cc8840bb6a283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29baed1bc20de794c6e221fbf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 12 12:07:43 2014 +0200 msi: Improve support for advertized shortcuts. --- dlls/msi/action.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1fe6226..e310ba3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3925,7 +3925,9 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) else { FIXME("poorly handled shortcut format, advertised shortcut\n"); - IShellLinkW_SetPath(sl,comp->FullKeypath); + path = resolve_keypath( package, comp ); + IShellLinkW_SetPath( sl, path ); + msi_free( path ); } if (!MSI_RecordIsNull(row,6))

1 0

Jactry Zeng : riched20: Stub for ITextRange interface and implement ITextDocument::Range.
by Alexandre Julliard 13 Sep '14

13 Sep '14

Module: wine Branch: master Commit: b10b39185dd91d53bae47ab63c852abd7ab73327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b10b39185dd91d53bae47ab63… Author: Jactry Zeng <wine(a)jactry.com> Date: Fri Sep 12 20:33:29 2014 +0800 riched20: Stub for ITextRange interface and implement ITextDocument::Range. --- dlls/riched20/richole.c | 730 +++++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/richole.c | 35 +- 2 files changed, 762 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b10b39185dd91d53bae47…

1 0

André Hentschel : Add WWN 375
by Jeremy Newman 12 Sep '14

12 Sep '14

Module: website Branch: master Commit: fa7709ae0bb8116474aba6c19a14776beef60705 URL: http://source.winehq.org/git/website.git/?a=commit;h=fa7709ae0bb8116474aba6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 12 19:13:26 2014 +0200 Add WWN 375 --- news/de/2014091201.xml | 11 ++ news/en/2014091201.xml | 11 ++ wwn/en/wn20140912_375.xml | 449 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 471 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fa7709ae0bb8116474…

1 0