wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Alex Henrie : iphlpapi: Implement ParseNetworkString for IPv4 addresses and services.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: faf354cd45e23f6cb8f82dee3fdf340647299b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf354cd45e23f6cb8f82dee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:15 2019 -0600 iphlpapi: Implement ParseNetworkString for IPv4 addresses and services. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45560 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index abc7152..c5857f2 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -243,7 +243,7 @@ @ stdcall NotifyUnicastIpAddressChange(long ptr ptr long ptr) #@ stub NTPTimeToNTFileTime #@ stub NTTimeToNTPTime -#@ stub ParseNetworkString +@ stdcall ParseNetworkString(wstr long ptr ptr ptr) @ stub _PfAddFiltersToInterface@24 @ stub _PfAddGlobalFilterToInterface@8 @ stdcall _PfBindInterfaceToIPAddress@12(long long ptr) PfBindInterfaceToIPAddress diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f1aa0d1..1f823b4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -46,6 +46,7 @@ #include "winsock2.h" #include "winternl.h" #include "ws2ipdef.h" +#include "windns.h" #include "iphlpapi.h" #include "ifenum.h" #include "ipstats.h" @@ -54,6 +55,7 @@ #include "ifdef.h" #include "netioapi.h" #include "tcpestats.h" +#include "ip2string.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -3333,3 +3335,62 @@ DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index, return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * ParseNetworkString (IPHLPAPI.@) + */ +DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, + NET_ADDRESS_INFO *info, USHORT *port, BYTE *prefix_len) +{ + IN_ADDR temp_addr4; + USHORT temp_port = 0; + NTSTATUS status; + + TRACE("(%s, %d, %p, %p, %p)\n", debugstr_w(str), type, info, port, prefix_len); + + if (!str) + return ERROR_INVALID_PARAMETER; + + if (type & NET_STRING_IPV4_ADDRESS) + { + status = RtlIpv4StringToAddressExW(str, TRUE, &temp_addr4, &temp_port); + if (SUCCEEDED(status) && !temp_port) + { + if (info) + { + info->Format = NET_ADDRESS_IPV4; + info->u.Ipv4Address.sin_addr = temp_addr4; + info->u.Ipv4Address.sin_port = 0; + } + if (port) *port = 0; + if (prefix_len) *prefix_len = 255; + return ERROR_SUCCESS; + } + } + if (type & NET_STRING_IPV4_SERVICE) + { + status = RtlIpv4StringToAddressExW(str, TRUE, &temp_addr4, &temp_port); + if (SUCCEEDED(status) && temp_port) + { + if (info) + { + info->Format = NET_ADDRESS_IPV4; + info->u.Ipv4Address.sin_addr = temp_addr4; + info->u.Ipv4Address.sin_port = temp_port; + } + if (port) *port = ntohs(temp_port); + if (prefix_len) *prefix_len = 255; + return ERROR_SUCCESS; + } + } + + if (info) info->Format = NET_ADDRESS_FORMAT_UNSPECIFIED; + + if (type & ~(NET_STRING_IPV4_ADDRESS|NET_STRING_IPV4_SERVICE)) + { + FIXME("Unimplemented type 0x%x\n", type); + return ERROR_NOT_SUPPORTED; + } + + return ERROR_INVALID_PARAMETER; +}

1 0

Alex Henrie : include: Add ip2string.h.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: 8599d8e52eaf912698e0ea5d96c0d9790aac659f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8599d8e52eaf912698e0ea5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 5 00:06:17 2019 -0600 include: Add ip2string.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ip2string.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 47a36ff..0f78085 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -323,6 +323,7 @@ SOURCES = \ inspectable.idl \ interactioncontext.h \ intshcut.h \ + ip2string.h \ ipexport.h \ iphlpapi.h \ ipifcons.h \ diff --git a/include/ip2string.h b/include/ip2string.h new file mode 100644 index 0000000..6c96c8d --- /dev/null +++ b/include/ip2string.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_IP2STRING_H +#define __WINE_IP2STRING_H + +#ifdef __cplusplus +extern "C" { +#endif + +NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); +NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); +#define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress) +NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +#define RtlIpv4StringToAddressEx WINELIB_NAME_AW(RtlIpv4StringToAddressEx) + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Alex Henrie : iphlpapi/tests: Add tests for ParseNetworkString.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: 0e53616fe294b388f4bf69f3f3a50cf1a6fdc1c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e53616fe294b388f4bf69f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:13 2019 -0600 iphlpapi/tests: Add tests for ParseNetworkString. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 111 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index a2be862..d4b1100 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -39,6 +39,7 @@ #include "windef.h" #include "winbase.h" #include "ws2tcpip.h" +#include "windns.h" #include "iphlpapi.h" #include "iprtrmib.h" #include "netioapi.h" @@ -98,6 +99,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); +static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -153,6 +155,7 @@ static void loadIPHlpApi(void) pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); + pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2271,6 +2274,113 @@ static void test_GetUdp6Table(void) } } +static void test_ParseNetworkString(void) +{ + struct + { + char str[32]; + IN_ADDR addr; + DWORD ret; + } + ipv4_address_tests[] = + { + {"1.2.3.4", {{{1, 2, 3, 4}}}}, + {"1.2.3.4a", {}, ERROR_INVALID_PARAMETER}, + {"1.2.3.0x4a", {}, ERROR_INVALID_PARAMETER}, + {"1.2.3", {}, ERROR_INVALID_PARAMETER}, + {"a1.2.3.4", {}, ERROR_INVALID_PARAMETER}, + {"0xdeadbeef", {}, ERROR_INVALID_PARAMETER}, + {"1.2.3.4:22", {}, ERROR_INVALID_PARAMETER}, + {"::1", {}, ERROR_INVALID_PARAMETER}, + {"winehq.org", {}, ERROR_INVALID_PARAMETER}, + }; + struct + { + char str[32]; + IN_ADDR addr; + DWORD port; + DWORD ret; + } + ipv4_service_tests[] = + { + {"1.2.3.4:22", {{{1, 2, 3, 4}}}, 22}, + {"winehq.org:22", {}, 0, ERROR_INVALID_PARAMETER}, + {"1.2.3.4", {}, 0, ERROR_INVALID_PARAMETER}, + {"1.2.3.4:0", {}, 0, ERROR_INVALID_PARAMETER}, + {"1.2.3.4:65536", {}, 0, ERROR_INVALID_PARAMETER}, + }; + WCHAR wstr[IP6_ADDRESS_STRING_BUFFER_LENGTH] = {'1','2','7','.','0','.','0','.','1',':','2','2',0}; + NET_ADDRESS_INFO info; + USHORT port; + BYTE prefix_len; + DWORD ret; + int i; + + if (!pParseNetworkString) + { + skip("ParseNetworkString not available\n"); + return; + } + + ret = pParseNetworkString(wstr, -1, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "expected success, got %d\n", ret); + + ret = pParseNetworkString(NULL, NET_STRING_IPV4_SERVICE, &info, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) + { + MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), + wstr, sizeof(wstr)); + memset(&info, 0x99, sizeof(info)); + port = 0x9999; + prefix_len = 0x99; + + ret = pParseNetworkString(wstr, NET_STRING_IPV4_ADDRESS, &info, &port, &prefix_len); + + ok(ret == ipv4_address_tests[i].ret, + "%s gave error %d\n", ipv4_address_tests[i].str, ret); + ok(info.Format == ret ? NET_ADDRESS_FORMAT_UNSPECIFIED : NET_ADDRESS_IPV4, + "%s gave format %d\n", ipv4_address_tests[i].str, info.Format); + ok(info.Ipv4Address.sin_addr.S_un.S_addr == (ret ? 0x99999999 : ipv4_address_tests[i].addr.S_un.S_addr), + "%s gave address %d.%d.%d.%d\n", ipv4_address_tests[i].str, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b1, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b2, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b3, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b4); + ok(info.Ipv4Address.sin_port == (ret ? 0x9999 : 0), + "%s gave port %d\n", ipv4_service_tests[i].str, ntohs(info.Ipv4Address.sin_port)); + ok(port == (ret ? 0x9999 : 0), + "%s gave port %d\n", ipv4_service_tests[i].str, port); + ok(prefix_len == (ret ? 0x99 : 255), + "%s gave prefix length %d\n", ipv4_service_tests[i].str, prefix_len); + } + + for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) + { + MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), + wstr, sizeof(wstr)); + memset(&info, 0x99, sizeof(info)); + port = 0x9999; + prefix_len = 0x99; + + ret = pParseNetworkString(wstr, NET_STRING_IPV4_SERVICE, &info, &port, &prefix_len); + + ok(ret == ipv4_service_tests[i].ret, + "%s gave error %d\n", ipv4_service_tests[i].str, ret); + ok(info.Format == ret ? NET_ADDRESS_FORMAT_UNSPECIFIED : NET_ADDRESS_IPV4, + "%s gave format %d\n", ipv4_address_tests[i].str, info.Format); + ok(info.Ipv4Address.sin_addr.S_un.S_addr == (ret ? 0x99999999 : ipv4_service_tests[i].addr.S_un.S_addr), + "%s gave address %d.%d.%d.%d\n", ipv4_service_tests[i].str, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b1, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b2, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b3, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b4); + ok(ntohs(info.Ipv4Address.sin_port) == (ret ? 0x9999 : ipv4_service_tests[i].port), + "%s gave port %d\n", ipv4_service_tests[i].str, ntohs(info.Ipv4Address.sin_port)); + ok(port == (ret ? 0x9999 : ipv4_service_tests[i].port), + "%s gave port %d\n", ipv4_service_tests[i].str, port); + ok(prefix_len == (ret ? 0x99 : 255), + "%s gave prefix length %d\n", ipv4_service_tests[i].str, prefix_len); + } +} + START_TEST(iphlpapi) { @@ -2300,6 +2410,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); test_GetUdp6Table(); + test_ParseNetworkString(); freeIPHlpApi(); } }

1 0

Alex Henrie : include: Add structures and constants needed for ParseNetworkString.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: c520ad0185a1069c0f2524fc2e546be5683b97d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c520ad0185a1069c0f2524fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:12 2019 -0600 include: Add structures and constants needed for ParseNetworkString. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iphlpapi.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/windns.h | 1 + 2 files changed, 48 insertions(+) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index f52387a..c618e73 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -26,6 +26,26 @@ extern "C" { #include <ipexport.h> #include <iptypes.h> +#define NET_STRING_IPV4_ADDRESS 0x00000001 +#define NET_STRING_IPV4_SERVICE 0x00000002 +#define NET_STRING_IPV4_NETWORK 0x00000004 +#define NET_STRING_IPV6_ADDRESS 0x00000008 +#define NET_STRING_IPV6_ADDRESS_NO_SCOPE 0x00000010 +#define NET_STRING_IPV6_SERVICE 0x00000020 +#define NET_STRING_IPV6_SERVICE_NO_SCOPE 0x00000040 +#define NET_STRING_IPV6_NETWORK 0x00000080 +#define NET_STRING_NAMED_ADDRESS 0x00000100 +#define NET_STRING_NAMED_SERVICE 0x00000200 +#define NET_STRING_IP_ADDRESS (NET_STRING_IPV4_ADDRESS|NET_STRING_IPV6_ADDRESS) +#define NET_STRING_IP_ADDRESS_NO_SCOPE (NET_STRING_IPV4_ADDRESS|NET_STRING_IPV6_ADDRESS_NO_SCOPE) +#define NET_STRING_IP_SERVICE (NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_SERVICE) +#define NET_STRING_IP_SERVICE_NO_SCOPE (NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_SERVICE_NO_SCOPE) +#define NET_STRING_IP_NETWORK (NET_STRING_IPV4_NETWORK|NET_STRING_IPV6_NETWORK) +#define NET_STRING_ANY_ADDRESS (NET_STRING_NAMED_ADDRESS|NET_STRING_IP_ADDRESS) +#define NET_STRING_ANY_ADDRESS_NO_SCOPE (NET_STRING_NAMED_ADDRESS|NET_STRING_IP_ADDRESS_NO_SCOPE) +#define NET_STRING_ANY_SERVICE (NET_STRING_NAMED_SERVICE|NET_STRING_IP_SERVICE) +#define NET_STRING_ANY_SERVICE_NO_SCOPE (NET_STRING_NAMED_SERVICE|NET_STRING_IP_SERVICE_NO_SCOPE) + DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved); @@ -162,6 +182,33 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, H DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); +typedef enum NET_ADDRESS_FORMAT_ { + NET_ADDRESS_FORMAT_UNSPECIFIED, + NET_ADDRESS_DNS_NAME, + NET_ADDRESS_IPV4, + NET_ADDRESS_IPV6, +} NET_ADDRESS_FORMAT; + +#ifdef __WINE_WINDNS_H + +typedef struct NET_ADDRESS_INFO_ +{ + NET_ADDRESS_FORMAT Format; + union + { + struct + { + WCHAR Address[DNS_MAX_NAME_BUFFER_LENGTH]; + WCHAR Port[6]; + } NamedAddress; + SOCKADDR_IN Ipv4Address; + SOCKADDR_IN6 Ipv6Address; + SOCKADDR IpAddress; + } DUMMYUNIONNAME; +} NET_ADDRESS_INFO, *PNET_ADDRESS_INFO; + +#endif /* __WINE_WINDNS_H */ + #ifdef __cplusplus } #endif diff --git a/include/windns.h b/include/windns.h index d9a4b9a..9a31fac 100644 --- a/include/windns.h +++ b/include/windns.h @@ -177,6 +177,7 @@ typedef struct #define DNS_ADDRESS_STRING_LENGTH IP6_ADDRESS_STRING_LENGTH #define IP4_ADDRESS_STRING_BUFFER_LENGTH IP4_ADDRESS_STRING_LENGTH #define IP6_ADDRESS_STRING_BUFFER_LENGTH IP6_ADDRESS_STRING_LENGTH +#define DNS_MAX_NAME_BUFFER_LENGTH 256 typedef struct _IP4_ARRAY {

1 0

Dmitry Timoshkov : localspl: Remove useless NULL checks from AddMonitor trace.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: c113c5b9e7f52d8568e7e474ae2a70b054ff90d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c113c5b9e7f52d8568e7e474… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 5 20:31:06 2019 +0800 localspl: Remove useless NULL checks from AddMonitor trace. AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b19..ccd1981 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName));

1 0

Alistair Leslie-Hughes : dsound: Trace each special effect as it' s processed.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: ff4ef417b707da4aacdd456fc4f405dcd9cc33db URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4ef417b707da4aacdd456f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 5 03:33:49 2019 +0000 dsound: Trace each special effect as it's processed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dacd639..f600652 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -695,6 +695,23 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency(IDirectSoundBuffer8 *i return DS_OK; } +static const char* dump_DSFX_guid(const DSEFFECTDESC *desc) +{ +#define FE(guid) if (IsEqualGUID(&guid, &desc->guidDSFXClass)) return #guid + FE(GUID_DSFX_STANDARD_GARGLE); + FE(GUID_DSFX_STANDARD_CHORUS); + FE(GUID_DSFX_STANDARD_FLANGER); + FE(GUID_DSFX_STANDARD_ECHO); + FE(GUID_DSFX_STANDARD_DISTORTION); + FE(GUID_DSFX_STANDARD_COMPRESSOR); + FE(GUID_DSFX_STANDARD_PARAMEQ); + FE(GUID_DSFX_STANDARD_I3DL2REVERB); + FE(GUID_DSFX_WAVES_REVERB); +#undef FE + + return debugstr_guid(&desc->guidDSFXClass); +} + static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, DWORD *pdwResultCodes) { @@ -767,6 +784,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D dmt.pbFormat = (BYTE*)&wfx; for (u = 0; u < dwEffectsCount; u++) { + TRACE("%d: 0x%08x, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u])); + hr2 = CoCreateInstance(&pDSFXDesc[u].guidDSFXClass, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (LPVOID*)&filters[u].obj); if (SUCCEEDED(hr2)) {

1 0

Huw Davies : wininet: Include limits.h to define UINT_MAX and ULONG_MAX.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: f5a3d43f45fdc5ab2b451e8592d4f8e1508f22a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a3d43f45fdc5ab2b451e85… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 5 08:39:56 2019 +0100 wininet: Include limits.h to define UINT_MAX and ULONG_MAX. Fixes build error on macOS introduced by commit 968201424d92a2117d91ba0253f30a9c67018e7e Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 065a8b7..fccbb02 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -43,6 +43,7 @@ #include <time.h> #include <assert.h> #include <errno.h> +#include <limits.h> #include "windef.h" #include "winbase.h"

1 0

Alistair Leslie-Hughes : wbemprox: Return NULL on error (Coverity).
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: d2590f2099779e7e79bd8f1d3125750b7900e85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2590f2099779e7e79bd8f1d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 4 23:48:51 2019 +0000 wbemprox: Return NULL on error (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 bbc96bf..299a2ed 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3886,7 +3886,7 @@ static struct array *get_systemenclosure_chassistypes( const char *buf, UINT len if (!(types = heap_alloc( sizeof(*types) ))) { heap_free( ret ); - goto done; + return NULL; } types[0] = chassis->type & ~0x80;

1 0

Zebediah Figura : winegstreamer: Use strmbase_source_init().
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: 06d72b61ced162b0c19102fe48d3f38598cd5c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d72b61ced162b0c19102fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:19 2019 -0500 winegstreamer: Use strmbase_source_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 58 +++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 06236e2..18d6eb8 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -30,6 +30,7 @@ #include "winuser.h" #include "dshow.h" #include "strmif.h" +#include "wine/heap.h" #include "wine/strmbase.h" #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9e634bc..aa27a36 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -104,7 +104,7 @@ static const IPinVtbl GST_InputPin_Vtbl; static const IBaseFilterVtbl GST_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; -static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt); +static BOOL create_pin(GSTImpl *filter, const PIN_INFO *pin_info, const AM_MEDIA_TYPE *mt); static HRESULT GST_RemoveOutputPins(GSTImpl *This); static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); @@ -825,9 +825,9 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) return; } - hr = GST_AddPin(This, &piOutput, &amt); - if (FAILED(hr)) { - ERR("%08x\n", hr); + if (!create_pin(This, &piOutput, &amt)) + { + ERR("Failed to allocate memory.\n"); return; } @@ -1771,13 +1771,12 @@ static void free_source_pin(GSTOutPin *pin) gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); DeleteMediaType(pin->pmt); - FreeMediaType(&pin->pin.pin.mtCurrent); gst_segment_free(pin->segment); if (pin->gstpool) gst_object_unref(pin->gstpool); - if (pin->pin.pAllocator) - IMemAllocator_Release(pin->pin.pAllocator); - CoTaskMemFree(pin); + + strmbase_source_cleanup(&pin->pin); + heap_free(pin); } static const IPinVtbl GST_OutputPin_Vtbl = { @@ -1811,27 +1810,30 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { GSTOutPin_DecideAllocator, }; -static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt) +static BOOL create_pin(GSTImpl *filter, const PIN_INFO *pin_info, const AM_MEDIA_TYPE *mt) { - HRESULT hr; - This->ppPins = CoTaskMemRealloc(This->ppPins, (This->cStreams + 1) * sizeof(IPin *)); - - hr = BaseOutputPin_Construct(&GST_OutputPin_Vtbl, sizeof(GSTOutPin), piOutput, &output_BaseOutputFuncTable, &This->filter.csFilter, (IPin**)(This->ppPins + This->cStreams)); - if (SUCCEEDED(hr)) { - GSTOutPin *pin = This->ppPins[This->cStreams]; - memset((char*)pin + sizeof(pin->pin), 0, sizeof(GSTOutPin) - sizeof(pin->pin)); - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = &This->filter.IBaseFilter_iface; - pin->caps_event = CreateEventW(NULL, 0, 0, NULL); - pin->segment = gst_segment_new(); - This->cStreams++; - pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; - SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); - BaseFilterImpl_IncrementPinVersion(&This->filter); - } else - ERR("Failed with error %x\n", hr); - return hr; + GSTOutPin *pin, **new_array; + + if (!(new_array = CoTaskMemRealloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + return FALSE; + filter->ppPins = new_array; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return FALSE; + + strmbase_source_init(&pin->pin, &GST_OutputPin_Vtbl, pin_info, + &output_BaseOutputFuncTable, &filter->filter.csFilter); + pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + CopyMediaType(pin->pmt, mt); + pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); + pin->segment = gst_segment_new(); + pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; + SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, + GST_ChangeCurrent, GST_ChangeRate, &filter->filter.csFilter); + BaseFilterImpl_IncrementPinVersion(&filter->filter); + + filter->ppPins[filter->cStreams++] = pin; + return TRUE; } static HRESULT GST_RemoveOutputPins(GSTImpl *This)

1 0

Zebediah Figura : amstream: Use shorter names for primary audio stream methods.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: d49417c081eef7169b145135a73f9d1d43a867c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d49417c081eef7169b145135… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 4 19:43:18 2019 -0500 amstream: Use shorter names for primary audio stream methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/audiostream.c | 127 +++++++++++++++++++-------------------- dlls/amstream/multimedia.c | 2 +- 3 files changed, 63 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d49417c081eef7169b14…

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2019