September 2012 - Wine-commits

Jacek Caban : mshtml: Don' t do anything in handle_htmlevent if document is already detached.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 481abdb304f1d8458dafd236016d9d487f22b3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481abdb304f1d8458dafd2360… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 20 15:05:07 2012 +0200 mshtml: Don't do anything in handle_htmlevent if document is already detached. --- dlls/mshtml/nsevents.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 3fd1962..4f970df 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -288,6 +288,11 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * TRACE("%p\n", This->This); + if(!doc) { + WARN("NULL doc\n"); + return NS_OK; + } + nsAString_Init(&type_str, NULL); nsIDOMEvent_GetType(event, &type_str); nsAString_GetData(&type_str, &type);

1 0

André Hentschel : iphlpapi: Implement GetIpStatisticsEx on Linux.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: f2626c31af9ab192b9fc5a6132848687c3da3fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2626c31af9ab192b9fc5a613… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 19 23:48:59 2012 +0200 iphlpapi: Implement GetIpStatisticsEx on Linux. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/ipstats.c | 92 ++++++++++++++++++++++++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 6 ++- 3 files changed, 94 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index cadb247..1bf4a71 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -112,7 +112,7 @@ @ stub GetIpNetTableFromStack #@ stub GetIpPathEntry #@ stub GetIpPathTable -#@ stub GetIpStatisticsEx +@ stdcall GetIpStatisticsEx( ptr long ) @ stdcall GetIpStatistics( ptr ) @ stub GetIpStatsFromStack #@ stub GetMulticastIpAddressEntry diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 7c64b41..65c070d 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -553,23 +553,25 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) /****************************************************************** - * GetIpStatistics (IPHLPAPI.@) + * GetIpStatisticsEx (IPHLPAPI.@) * - * Get the IP statistics for the local computer. + * Get the IPv4 and IPv6 statistics for the local computer. * * PARAMS * stats [Out] buffer for IP statistics + * family [In] specifies wether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) +DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) { DWORD ret = ERROR_NOT_SUPPORTED; MIB_IPFORWARDTABLE *fwd_table; if (!stats) return ERROR_INVALID_PARAMETER; + if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; memset( stats, 0, sizeof(*stats) ); stats->dwNumIf = stats->dwNumAddr = getNumInterfaces(); @@ -579,6 +581,72 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) HeapFree( GetProcessHeap(), 0, fwd_table ); } + if (family == WS_AF_INET6) + { +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen("/proc/net/snmp6", "r"))) + { + struct { + const char *name; + DWORD *elem; + } ipstatlist[] = { + { "Ip6InReceives", &stats->dwInReceives }, + { "Ip6InHdrErrors", &stats->dwInHdrErrors }, + { "Ip6InAddrErrors", &stats->dwInAddrErrors }, + { "Ip6OutForwDatagrams", &stats->dwForwDatagrams }, + { "Ip6InUnknownProtos", &stats->dwInUnknownProtos }, + { "Ip6InDiscards", &stats->dwInDiscards }, + { "Ip6InDelivers", &stats->dwInDelivers }, + { "Ip6OutRequests", &stats->dwOutRequests }, + { "Ip6OutDiscards", &stats->dwOutDiscards }, + { "Ip6OutNoRoutes", &stats->dwOutNoRoutes }, + { "Ip6ReasmTimeout", &stats->dwReasmTimeout }, + { "Ip6ReasmReqds", &stats->dwReasmReqds }, + { "Ip6ReasmOKs", &stats->dwReasmOks }, + { "Ip6ReasmFails", &stats->dwReasmFails }, + { "Ip6FragOKs", &stats->dwFragOks }, + { "Ip6FragFails", &stats->dwFragFails }, + { "Ip6FragCreates", &stats->dwFragCreates }, + /* hmm, no routingDiscards, defaultTTL and forwarding? */ + }; + char buf[512], *ptr, *value; + DWORD res, i; + + while ((ptr = fgets(buf, sizeof(buf), fp))) + { + if (!(value = strchr(buf, ' '))) + continue; + + /* terminate the valuename */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value==' ') value++; + if ((ptr = strchr(value, '\n'))) + *ptr='\0'; + + for (i = 0; i < sizeof(ipstatlist)/sizeof(ipstatlist[0]); i++) + if (!strcasecmp(buf, ipstatlist[i].name)) + { + if (sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; + continue; + } + } + fclose(fp); + ret = NO_ERROR; + } + } +#else + FIXME( "unimplemented for IPv6\n" ); +#endif + return ret; + } + #ifdef __linux__ { FILE *fp; @@ -712,11 +780,27 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) ret = NO_ERROR; } #else - FIXME( "unimplemented\n" ); + FIXME( "unimplemented for IPv4\n" ); #endif return ret; } +/****************************************************************** + * GetIpStatistics (IPHLPAPI.@) + * + * Get the IP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for IP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) +{ + return GetIpStatisticsEx(stats, WS_AF_INET); +} /****************************************************************** * GetTcpStatistics (IPHLPAPI.@) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 638d7e5..1c0e2cc 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -574,7 +574,7 @@ static void testGetIpStatisticsEx(void) if (!pGetIpStatisticsEx) { - skip( "GetIpStatisticsEx not available\n" ); + win_skip( "GetIpStatisticsEx not available\n" ); return; } @@ -582,6 +582,10 @@ static void testGetIpStatisticsEx(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetIpStatisticsEx(NULL, AF_INET) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetIpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER, + "GetIpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetIpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1)

1 0

André Hentschel : iphlpapi: Implement GetUdpStatisticsEx on Linux.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 5e3cc410044eab23a0368389456cc32779948506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cc410044eab23a03683894… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 19 23:52:30 2012 +0200 iphlpapi: Implement GetUdpStatisticsEx on Linux. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/ipstats.c | 78 ++++++++++++++++++++++++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 22 +++++++----- 3 files changed, 89 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1bf4a71..d1cf196 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -142,7 +142,7 @@ @ stub GetTcpTableFromStack #@ stub GetTeredoPort #@ stub GetUdp6Table -#@ stub GetUdpStatisticsEx +@ stdcall GetUdpStatisticsEx( ptr long ) @ stdcall GetUdpStatistics( ptr ) @ stub GetUdpStatsFromStack @ stdcall GetUdpTable( ptr ptr long ) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 65c070d..f314745 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -943,22 +943,78 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) /****************************************************************** * GetUdpStatistics (IPHLPAPI.@) * - * Get the UDP statistics for the local computer. + * Get the IPv4 and IPv6 UDP statistics for the local computer. * * PARAMS * stats [Out] buffer for UDP statistics + * family [In] specifies wether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) +DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) { DWORD ret = ERROR_NOT_SUPPORTED; if (!stats) return ERROR_INVALID_PARAMETER; + if (family != WS_AF_INET && family != WS_AF_INET6) return ERROR_INVALID_PARAMETER; memset( stats, 0, sizeof(*stats) ); + stats->dwNumAddrs = getNumInterfaces(); + + if (family == WS_AF_INET6) + { +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen("/proc/net/snmp6", "r"))) + { + struct { + const char *name; + DWORD *elem; + } udpstatlist[] = { + { "Udp6InDatagrams", &stats->dwInDatagrams }, + { "Udp6NoPorts", &stats->dwNoPorts }, + { "Udp6InErrors", &stats->dwInErrors }, + { "Udp6OutDatagrams", &stats->dwOutDatagrams }, + }; + char buf[512], *ptr, *value; + DWORD res, i; + + while ((ptr = fgets(buf, sizeof(buf), fp))) + { + if (!(value = strchr(buf, ' '))) + continue; + + /* terminate the valuename */ + ptr = value - 1; + *(ptr + 1) = '\0'; + + /* and strip leading spaces from value */ + value += 1; + while (*value==' ') value++; + if ((ptr = strchr(value, '\n'))) + *ptr='\0'; + + for (i = 0; i < sizeof(udpstatlist)/sizeof(udpstatlist[0]); i++) + if (!strcasecmp(buf, udpstatlist[i].name)) + { + if (sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; + continue; + } + } + fclose(fp); + ret = NO_ERROR; + } + } +#else + FIXME( "unimplemented for IPv6\n" ); +#endif + return ret; + } + #ifdef __linux__ { FILE *fp; @@ -1035,11 +1091,27 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) else ERR ("failed to get udpstat\n"); } #else - FIXME( "unimplemented\n" ); + FIXME( "unimplemented for IPv4\n" ); #endif return ret; } +/****************************************************************** + * GetUdpStatistics (IPHLPAPI.@) + * + * Get the UDP statistics for the local computer. + * + * PARAMS + * stats [Out] buffer for UDP statistics + * + * RETURNS + * Success: NO_ERROR + * Failure: error code from winerror.h + */ +DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS stats) +{ + return GetUdpStatisticsEx(stats, WS_AF_INET); +} static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_IPFORWARDTABLE *table, DWORD *count, const MIB_IPFORWARDROW *row ) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1c0e2cc..02a299f 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -546,7 +546,7 @@ static void testGetIcmpStatisticsEx(void) if (apiReturn == NO_ERROR && winetest_debug > 1) { INT i; - trace( "ICMP Ex stats: %8s %8s\n", "in", "out" ); + trace( "ICMP IPv4 Ex stats: %8s %8s\n", "in", "out" ); trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); for (i = 0; i < 256; i++) @@ -559,7 +559,7 @@ static void testGetIcmpStatisticsEx(void) if (apiReturn == NO_ERROR && winetest_debug > 1) { INT i; - trace( "ICMP Ex stats: %8s %8s\n", "in", "out" ); + trace( "ICMP IPv6 Ex stats: %8s %8s\n", "in", "out" ); trace( " dwMsgs: %8u %8u\n", stats.icmpInStats.dwMsgs, stats.icmpOutStats.dwMsgs ); trace( " dwErrors: %8u %8u\n", stats.icmpInStats.dwErrors, stats.icmpOutStats.dwErrors ); for (i = 0; i < 256; i++) @@ -590,7 +590,7 @@ static void testGetIpStatisticsEx(void) ok(apiReturn == NO_ERROR, "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { - trace( "IP Ex stats:\n" ); + trace( "IP IPv4 Ex stats:\n" ); trace( " dwForwarding: %u\n", U(stats).dwForwarding ); trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); trace( " dwInReceives: %u\n", stats.dwInReceives ); @@ -621,7 +621,7 @@ static void testGetIpStatisticsEx(void) "GetIpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { - trace( "IP Ex stats:\n" ); + trace( "IP IPv6 Ex stats:\n" ); trace( " dwForwarding: %u\n", U(stats).dwForwarding ); trace( " dwDefaultTTL: %u\n", stats.dwDefaultTTL ); trace( " dwInReceives: %u\n", stats.dwInReceives ); @@ -667,7 +667,7 @@ static void testGetTcpStatisticsEx(void) ok(apiReturn == NO_ERROR, "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { - trace( "TCP stats:\n" ); + trace( "TCP IPv4 Ex stats:\n" ); trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); trace( " dwRtoMin: %u\n", stats.dwRtoMin ); trace( " dwRtoMax: %u\n", stats.dwRtoMax ); @@ -690,7 +690,7 @@ static void testGetTcpStatisticsEx(void) "GetTcpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { - trace( "TCP stats:\n" ); + trace( "TCP IPv6 Ex stats:\n" ); trace( " dwRtoAlgorithm: %u\n", U(stats).dwRtoAlgorithm ); trace( " dwRtoMin: %u\n", stats.dwRtoMin ); trace( " dwRtoMax: %u\n", stats.dwRtoMax ); @@ -716,7 +716,7 @@ static void testGetUdpStatisticsEx(void) if (!pGetUdpStatisticsEx) { - skip( "GetUdpStatisticsEx not available\n" ); + win_skip( "GetUdpStatisticsEx not available\n" ); return; } @@ -724,11 +724,15 @@ static void testGetUdpStatisticsEx(void) ok(apiReturn == ERROR_INVALID_PARAMETER, "GetUdpStatisticsEx(NULL, AF_INET); returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetUdpStatisticsEx(&stats, AF_BAN); + ok(apiReturn == ERROR_INVALID_PARAMETER || apiReturn == ERROR_NOT_SUPPORTED, + "GetUdpStatisticsEx(&stats, AF_BAN) returned %d, expected ERROR_INVALID_PARAMETER\n", apiReturn); + apiReturn = pGetUdpStatisticsEx(&stats, AF_INET); ok(apiReturn == NO_ERROR, "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { - trace( "UDP stats:\n" ); + trace( "UDP IPv4 Ex stats:\n" ); trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); trace( " dwNoPorts: %u\n", stats.dwNoPorts ); trace( " dwInErrors: %u\n", stats.dwInErrors ); @@ -741,7 +745,7 @@ static void testGetUdpStatisticsEx(void) "GetUdpStatisticsEx returned %d, expected NO_ERROR\n", apiReturn); if (apiReturn == NO_ERROR && winetest_debug > 1) { - trace( "UDP stats:\n" ); + trace( "UDP IPv6 Ex stats:\n" ); trace( " dwInDatagrams: %u\n", stats.dwInDatagrams ); trace( " dwNoPorts: %u\n", stats.dwNoPorts ); trace( " dwInErrors: %u\n", stats.dwInErrors );

1 0

André Hentschel : iphlpapi: Implement GetIcmpStatisticsEx on Linux.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 92e24af5e8f3849ed4282afba8c468fc98aec578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e24af5e8f3849ed4282afba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 19 23:53:37 2012 +0200 iphlpapi: Implement GetIcmpStatisticsEx on Linux. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/ipstats.c | 172 ++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 6 +- include/ipmib.h | 36 ++++++++ 4 files changed, 214 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92e24af5e8f3849ed4282…

1 0

Daniel Jelinski : ieframe: cxMinChild needs to be set if RBBIM_CHILDSIZE is set.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 43950079bb3cdd4f8dec7ec97c31545498f69d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43950079bb3cdd4f8dec7ec97… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed Sep 19 20:26:34 2012 +0200 ieframe: cxMinChild needs to be set if RBBIM_CHILDSIZE is set. --- dlls/ieframe/iexplore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 6c66aef..7d6c6ed 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -475,6 +475,7 @@ static void create_rebar(HWND hwnd) bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE; bandinf.fStyle = RBBS_CHILDEDGE; bandinf.cx = 100; + bandinf.cxMinChild = 0; bandinf.cyMinChild = 52; bandinf.hwndChild = hwndToolbar;

1 0

Per Johansson : winemenubuilder: Don' t treat empty string as a valid icon file name.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: b8ee44581e4ca547c15fbe6efef00006d8154ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ee44581e4ca547c15fbe6ef… Author: Per Johansson <per(a)morth.org> Date: Wed Sep 19 21:48:16 2012 +0200 winemenubuilder: Don't treat empty string as a valid icon file name. --- programs/winemenubuilder/winemenubuilder.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3746bd0..8e2320c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2978,6 +2978,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link PROPSPEC ps[2]; PROPVARIANT pv[2]; char *start_path = NULL; + BOOL has_icon = FALSE; if ( !link ) { @@ -3041,8 +3042,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv); if (SUCCEEDED(hr)) { - if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal) + if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal && pv[0].u.pwszVal[0]) { + has_icon = TRUE; icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait ); WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name); @@ -3056,7 +3058,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link } /* fail - try once again after parent process exit */ - if( !icon_name ) + if( has_icon && !icon_name ) { if (bWait) {

1 0

Per Johansson : winemenubuilder: Correct InvokeShellLinkerForURL return value.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 113b090f5e42539e490a698def2610285ad14f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=113b090f5e42539e490a698de… Author: Per Johansson <per(a)morth.org> Date: Wed Sep 19 21:49:23 2012 +0200 winemenubuilder: Correct InvokeShellLinkerForURL return value. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8e2320c..9a0c05c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3096,7 +3096,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link } else r = !write_menu_entry(unix_link, link_name, start_path, escaped_urlPath, NULL, NULL, icon_name); - ret = (r != 0); + ret = (r == 0); ReleaseSemaphore(hSem, 1, NULL); cleanup:

1 0

Alistair Leslie-Hughes : ole32: Add CoGetDefaultContext stub.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 939b1bbe2142496147148e390bee9ff856152904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=939b1bbe2142496147148e390… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 23 14:02:21 2012 +1000 ole32: Add CoGetDefaultContext stub. --- dlls/ole32/compobj.c | 9 +++++++++ dlls/ole32/ole32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0055d15..2019b41 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4279,6 +4279,15 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) return S_OK; } +/*********************************************************************** + * CoGetDefaultContext [OLE32.@] + */ +HRESULT WINAPI CoGetDefaultContext(APTTYPE type, REFIID riid, LPVOID *ppv) +{ + FIXME("%d %s %p stub\n", type, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a27adfb..b9eb50e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -27,6 +27,7 @@ @ stdcall CoGetContextToken(ptr) @ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() +@ stdcall CoGetDefaultContext(long ptr ptr) @ stub CoGetInstanceFromFile #@ stdcall (ptr ptr ptr long wstr long ptr) return 0,ERR_NOTIMPLEMENTED @ stub CoGetInstanceFromIStorage #@ stdcall (ptr ptr ptr long ptr long ptr) return 0,ERR_NOTIMPLEMENTED @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr)

1 0

Alistair Leslie-Hughes : scrrun: Add Scripting.Dictionary interface.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 98aa713fa7d3284aa773eba0ec35d6c4d5a259ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=98aa713fa7d3284aa773eba0e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 20 14:02:16 2012 +1000 scrrun: Add Scripting.Dictionary interface. --- dlls/scrrun/Makefile.in | 1 + dlls/scrrun/dictionary.c | 345 ++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/scrrun.c | 15 ++ dlls/scrrun/scrrun_private.h | 2 + dlls/scrrun/tests/Makefile.in | 1 + dlls/scrrun/tests/dictionary.c | 102 ++++++++++++ 6 files changed, 466 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98aa713fa7d3284aa773e…

1 0

Matteo Bruni : d3dcompiler: Parse "typedef" statement.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: d9c247f2ae732c86c2e0777146c826d1080412d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c247f2ae732c86c2e077714… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:13 2012 +0200 d3dcompiler: Parse "typedef" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 + dlls/d3dcompiler_43/hlsl.y | 97 +++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index fffb6c6..b3a9586 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -734,6 +734,10 @@ struct hlsl_ir_node #define HLSL_MODIFIER_IN 0x00000800 #define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ + HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ + HLSL_MODIFIER_COLUMN_MAJOR) + #define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) struct hlsl_ir_var diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 486c9a8..e558f6f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -175,6 +175,17 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +static BOOL check_type_modifiers(DWORD modifiers, struct source_location *loc) +{ + if (modifiers & ~HLSL_TYPE_MODIFIERS_MASK) + { + hlsl_report_message(loc->file, loc->line, loc->col, HLSL_LEVEL_ERROR, + "modifier not allowed on typedefs"); + return FALSE; + } + return TRUE; +} + BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { if (get_type(scope, def->name, FALSE)) @@ -354,6 +365,51 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } +static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list, + struct source_location *loc) +{ + BOOL ret; + struct hlsl_type *type; + struct parse_variable_def *v, *v_next; + + if (!check_type_modifiers(modifiers, loc)) + { + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) + d3dcompiler_free(v); + d3dcompiler_free(list); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) + { + if (v->array_size) + type = new_array_type(orig_type, v->array_size); + else + type = clone_hlsl_type(orig_type); + if (!type) + { + ERR("Out of memory\n"); + return FALSE; + } + d3dcompiler_free((void *)type->name); + type->name = v->name; + type->modifiers |= modifiers; + + if (type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(type->modifiers, &v->loc); + + ret = add_type_to_scope(hlsl_ctx.cur_scope, type); + if (!ret) + { + hlsl_report_message(v->loc.file, v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "redefinition of custom type '%s'", v->name); + } + d3dcompiler_free(v); + } + d3dcompiler_free(list); + return TRUE; +} + %} %locations @@ -487,6 +543,8 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <type> base_type %type <type> type %type <list> declaration_statement +%type <list> type_specs +%type <variable_def> type_spec %type <list> complex_initializer %type <list> initializer_expr_list %type <instr> initializer_expr @@ -802,6 +860,45 @@ declaration_statement: declaration $$ = d3dcompiler_alloc(sizeof(*$$)); list_init($$); } + | typedef + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + if (!$$) + { + ERR("Out of memory\n"); + return -1; + } + list_init($$); + } + +typedef: KW_TYPEDEF var_modifiers type type_specs ';' + { + struct source_location loc; + + set_location(&loc, &@1); + if (!add_typedef($2, $3, $4, &loc)) + return 1; + } + +type_specs: type_spec + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &$1->entry); + } + | type_specs ',' type_spec + { + $$ = $1; + list_add_tail($$, &$3->entry); + } + +type_spec: any_identifier array + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + set_location(&$$->loc, &@1); + $$->name = $1; + $$->array_size = $2; + } declaration: var_modifiers type variables_def ';' {

1 0