November 2019 - Wine-Commits

Hans Leidekker : mountmgr.sys: Add support for querying DHCP parameters on Linux.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: a1c159e060a4a3f0139012a08de5fbf9f19ad38d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c159e060a4a3f0139012a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:44:58 2019 +0100 mountmgr.sys: Add support for querying DHCP parameters on Linux. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/dbus.c | 274 +++++++++++++++++++++++++++++++++++++++++- dlls/mountmgr.sys/mountmgr.c | 40 ++++++ dlls/mountmgr.sys/mountmgr.h | 3 + include/ddk/mountmgr.h | 21 ++++ 5 files changed, 338 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c159e060a4a3f01390…

1 0

Hans Leidekker : mountmgr.sys: Add support for querying DHCP parameters on macOS.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: b7ab346cf7127755f495dd9036ebea9577cdf352 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ab346cf7127755f495dd90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:44:59 2019 +0100 mountmgr.sys: Add support for querying DHCP parameters on macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ++ configure.ac | 3 + dlls/mountmgr.sys/Makefile.in | 2 +- dlls/mountmgr.sys/diskarb.c | 167 ++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 8 ++ 5 files changed, 185 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 483efc02d3..fb29dcfae5 100755 --- a/configure +++ b/configure @@ -724,6 +724,7 @@ OPENAL_LIBS COREAUDIO_LIBS SECURITY_LIBS DISKARBITRATION_LIBS +SYSTEMCONFIGURATION_LIBS APPKIT_LIBS CORESERVICES_LIBS APPLICATIONSERVICES_LIBS @@ -7356,6 +7357,8 @@ for ac_header in \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ Security/Security.h \ + SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ + SystemConfiguration/SCNetworkConfiguration.h \ alias.h \ arpa/inet.h \ arpa/nameser.h \ @@ -8655,6 +8658,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu APPKIT_LIBS="-framework AppKit" + SYSTEMCONFIGURATION_LIBS="-framework SystemConfiguration" + WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" @@ -19841,6 +19846,7 @@ FORCEFEEDBACK_LIBS = $FORCEFEEDBACK_LIBS APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS CORESERVICES_LIBS = $CORESERVICES_LIBS APPKIT_LIBS = $APPKIT_LIBS +SYSTEMCONFIGURATION_LIBS = $SYSTEMCONFIGURATION_LIBS DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS SECURITY_LIBS = $SECURITY_LIBS COREAUDIO_LIBS = $COREAUDIO_LIBS diff --git a/configure.ac b/configure.ac index 64721e9644..22ce5f33a3 100644 --- a/configure.ac +++ b/configure.ac @@ -436,6 +436,8 @@ AC_CHECK_HEADERS(\ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ Security/Security.h \ + SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h \ + SystemConfiguration/SCNetworkConfiguration.h \ alias.h \ arpa/inet.h \ arpa/nameser.h \ @@ -759,6 +761,7 @@ case $host_os in AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices") AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") + AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 738f071390..e229164280 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -3,7 +3,7 @@ IMPORTS = uuid advapi32 ntoskrnl DELAYIMPORTS = user32 iphlpapi EXTRADLLFLAGS = -Wl,--subsystem,native EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) -EXTRALIBS = $(DISKARBITRATION_LIBS) +EXTRALIBS = $(DISKARBITRATION_LIBS) $(SYSTEMCONFIGURATION_LIBS) $(CORESERVICES_LIBS) C_SRCS = \ dbus.c \ diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 9a7616ecc6..66c121e114 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -29,8 +29,18 @@ #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif +#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) +#include <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> +#include <SystemConfiguration/SCNetworkConfiguration.h> +#endif #include "mountmgr.h" +#define USE_WS_PREFIX +#include "winsock2.h" +#include "ws2ipdef.h" +#include "nldef.h" +#include "netioapi.h" +#include "dhcpcsdk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); @@ -152,3 +162,160 @@ void initialize_diskarbitration(void) } #endif /* HAVE_DISKARBITRATION_DISKARBITRATION_H */ + +#if defined(HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H) && defined(HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H) + +static UInt8 map_option( ULONG option ) +{ + switch (option) + { + case OPTION_SUBNET_MASK: return 1; + case OPTION_ROUTER_ADDRESS: return 3; + case OPTION_HOST_NAME: return 12; + case OPTION_DOMAIN_NAME: return 15; + case OPTION_BROADCAST_ADDRESS: return 28; + case OPTION_MSFT_IE_PROXY: return 252; + default: + FIXME( "unhandled option %u\n", option ); + return 0; + } +} + +#define IF_NAMESIZE 16 +static BOOL map_adapter_name( const WCHAR *name, WCHAR *unix_name, DWORD len ) +{ + WCHAR buf[IF_NAMESIZE]; + UNICODE_STRING str; + GUID guid; + + RtlInitUnicodeString( &str, name ); + if (!RtlGUIDFromString( &str, &guid )) + { + NET_LUID luid; + if (ConvertInterfaceGuidToLuid( &guid, &luid ) || + ConvertInterfaceLuidToNameW( &luid, buf, ARRAY_SIZE(buf) )) return FALSE; + + name = buf; + } + if (lstrlenW( name ) >= len) return FALSE; + lstrcpyW( unix_name, name ); + return TRUE; +} + +static CFStringRef find_service_id( const WCHAR *adapter ) +{ + SCPreferencesRef prefs; + SCNetworkSetRef set = NULL; + CFArrayRef services = NULL; + CFStringRef id, ret = NULL; + WCHAR unix_name[IF_NAMESIZE]; + CFIndex i; + + if (!map_adapter_name( adapter, unix_name, ARRAY_SIZE(unix_name) )) return NULL; + if (!(prefs = SCPreferencesCreate( NULL, CFSTR("mountmgr.sys"), NULL ))) return NULL; + if (!(set = SCNetworkSetCopyCurrent( prefs ))) goto done; + if (!(services = SCNetworkSetCopyServices( set ))) goto done; + + for (i = 0; i < CFArrayGetCount( services ); i++) + { + SCNetworkServiceRef service; + UniChar buf[IF_NAMESIZE] = {0}; + CFStringRef name; + + service = CFArrayGetValueAtIndex( services, i ); + name = SCNetworkInterfaceGetBSDName( SCNetworkServiceGetInterface(service) ); + if (CFStringGetLength( name ) < ARRAY_SIZE( buf )) + { + CFStringGetCharacters( name, CFRangeMake(0, CFStringGetLength(name)), buf ); + if (!lstrcmpW( buf, unix_name ) && (id = SCNetworkServiceGetServiceID( service ))) + { + ret = CFStringCreateCopy( NULL, id ); + break; + } + } + } + +done: + if (services) CFRelease( services ); + if (set) CFRelease( set ); + CFRelease( prefs ); + return ret; +} + +ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, + ULONG size ) +{ + CFStringRef service_id = find_service_id( adapter ); + CFDictionaryRef dict; + CFDataRef value; + DWORD ret = 0; + CFIndex len; + + param->offset = 0; + param->size = 0; + + if (!service_id) return 0; + if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id ))) + { + CFRelease( service_id ); + return 0; + } + CFRelease( service_id ); + if (!(value = DHCPInfoGetOptionData( dict, map_option(param->id) ))) + { + CFRelease( dict ); + return 0; + } + len = CFDataGetLength( value ); + + switch (param->id) + { + case OPTION_SUBNET_MASK: + case OPTION_ROUTER_ADDRESS: + case OPTION_BROADCAST_ADDRESS: + { + DWORD *ptr = (DWORD *)(buf + offset); + if (len == sizeof(*ptr) && size >= sizeof(*ptr)) + { + CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); + param->offset = offset; + param->size = sizeof(*ptr); + TRACE( "returning %08x\n", *ptr ); + } + ret = sizeof(*ptr); + break; + } + case OPTION_HOST_NAME: + case OPTION_DOMAIN_NAME: + case OPTION_MSFT_IE_PROXY: + { + char *ptr = buf + offset; + if (size >= len) + { + CFDataGetBytes( value, CFRangeMake(0, len), (UInt8 *)ptr ); + param->offset = offset; + param->size = len; + TRACE( "returning %s\n", debugstr_an(ptr, len) ); + } + ret = len; + break; + } + default: + FIXME( "option %u not supported\n", param->id ); + break; + } + + CFRelease( dict ); + return ret; +} + +#elif !defined(SONAME_LIBDBUS_1) + +ULONG get_dhcp_request_param( const WCHAR *adapter, struct mountmgr_dhcp_request_param *param, char *buf, ULONG offset, + ULONG size ) +{ + FIXME( "support not compiled in\n" ); + return 0; +} + +#endif diff --git a/include/config.h.in b/include/config.h.in index 858ee9bfd8..41a7cde553 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1001,6 +1001,14 @@ /* Define to 1 if you have the `sysinfo' function. */ #undef HAVE_SYSINFO +/* Define to 1 if you have the + <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ +#undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H + +/* Define to 1 if you have the <SystemConfiguration/SCNetworkConfiguration.h> + header file. */ +#undef HAVE_SYSTEMCONFIGURATION_SCNETWORKCONFIGURATION_H + /* Define to 1 if you have the <sys/attr.h> header file. */ #undef HAVE_SYS_ATTR_H

1 0

Michael Stefaniuc : dmstyle: The Chord track doesn't support the BandParam type.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: f5ad835ec3bcfbce2039a994577f2dd27fc48957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5ad835ec3bcfbce2039a994… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 19 21:02:51 2019 +0100 dmstyle: The Chord track doesn't support the BandParam type. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/chordtrack.c | 25 +++++++++++-------------- dlls/dmstyle/tests/dmstyle.c | 9 ++++----- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index cb690b04dc..09d0bf3c9f 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -140,23 +140,20 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rg return S_OK; } -static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI chord_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); - if (!rguidType) - return E_POINTER; + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); - if (IsEqualGUID (rguidType, &GUID_BandParam) - || IsEqualGUID (rguidType, &GUID_ChordParam) - || IsEqualGUID (rguidType, &GUID_RhythmParam)) { - TRACE("param supported\n"); - return S_OK; - } - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + if (!type) + return E_POINTER; + + if (IsEqualGUID(type, &GUID_ChordParam) || IsEqualGUID(type, &GUID_RhythmParam)) + return S_OK; + + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI chord_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 0c17ef3b41..6419f6f810 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -291,7 +291,7 @@ static void test_track(void) unsigned int todo_params; } class[] = { { X(DirectMusicAuditionTrack), TRUE, FALSE, 0x18204200, 0x18204200 }, - { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 1 }, + { X(DirectMusicChordTrack), TRUE, TRUE, 0x100002, 0 }, { X(DirectMusicCommandTrack), TRUE, TRUE, 0x38, 0 }, { X(DirectMusicMotifTrack), FALSE, FALSE, 0x8204200, 0 }, { X(DirectMusicMuteTrack), TRUE, FALSE, 0x40000, 0 }, @@ -333,10 +333,9 @@ static void test_track(void) ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", param_types[j].name, hr); else - todo_wine_if(class[i].todo_params & (1 << j)) - ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", - param_types[j].name, hr); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + param_types[j].name, hr); } if (class[i].clsid == &CLSID_DirectMusicMuteTrack) {

1 0

Vijay Kiran Kamuju : include: Add colordlg.h header file for color dialogs.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 93effd2671f06ef8f22a1277161525649b2c5e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93effd2671f06ef8f22a1277… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 16 11:35:25 2019 +0100 include: Add colordlg.h header file for color dialogs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/colordlg.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c31fb50d74..421e3d6c59 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -60,6 +60,7 @@ SOURCES = \ cmdtxt.idl \ cmnquery.idl \ colinf.idl \ + colordlg.h \ comcat.idl \ commctrl.h \ commctrl.rh \ diff --git a/include/colordlg.h b/include/colordlg.h new file mode 100644 index 0000000000..51d2185910 --- /dev/null +++ b/include/colordlg.h @@ -0,0 +1,62 @@ +/* + * Color Dialog definitions + * + * Copyright (C) 2019 Vijay Kiran Kamuju + * + * 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 _INC_COLORDLG +#define _INC_COLORDLG + +#define DLG_COLOR + +#define COLOR_HUESCROLL 700 +#define COLOR_SATSCROLL 701 +#define COLOR_LUMSCROLL 702 +#define COLOR_HUE 703 +#define COLOR_SAT 704 +#define COLOR_LUM 705 +#define COLOR_RED 706 +#define COLOR_GREEN 707 +#define COLOR_BLUE 708 +#define COLOR_CURRENT 709 +#define COLOR_RAINBOW 710 +#define COLOR_SAVE 711 +#define COLOR_ADD 712 +#define COLOR_SOLID 713 +#define COLOR_TUNE 714 +#define COLOR_SCHEMES 715 +#define COLOR_ELEMENT 716 +#define COLOR_SAMPLES 717 +#define COLOR_PALETTE 718 +#define COLOR_MIX 719 +#define COLOR_BOX1 720 +#define COLOR_CUSTOM1 721 + +#define COLOR_HUEACCEL 723 +#define COLOR_SATACCEL 724 +#define COLOR_LUMACCEL 725 +#define COLOR_REDACCEL 726 +#define COLOR_GREENACCEL 727 +#define COLOR_BLUEACCEL 728 + +#define COLOR_SOLID_LEFT 730 +#define COLOR_SOLID_RIGHT 731 + +#define NUM_BASIC_COLORS 48 +#define NUM_CUSTOM_COLORS 16 + +#endif /* _INC_COLORDLG */

1 0

Serge Gautherie : ole32: Improve a string format.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: cd7bf449738d5090e9a08450e772d932104f4867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd7bf449738d5090e9a08450… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Nov 19 10:26:13 2019 +0100 ole32: Improve a string format. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 5518429b31..708147e51d 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1141,7 +1141,7 @@ static void PropertyStorage_PropNameDestroy(void *k, void *d, void *extra) static int PropertyStorage_PropCompare(const void *a, const void *b, void *extra) { - TRACE("(%d, %d)\n", PtrToUlong(a), PtrToUlong(b)); + TRACE("(%u, %u)\n", PtrToUlong(a), PtrToUlong(b)); return PtrToUlong(a) - PtrToUlong(b); }

1 0

Hans Leidekker : include: Add DHCP option values.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 5106885f427f425c86506fb4e32ac2daa0328135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5106885f427f425c86506fb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 19 14:44:57 2019 +0100 include: Add DHCP option values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dhcpcsdk.h | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/include/dhcpcsdk.h b/include/dhcpcsdk.h index 93c7af6e08..8f96a8212d 100644 --- a/include/dhcpcsdk.h +++ b/include/dhcpcsdk.h @@ -18,6 +18,75 @@ #ifndef _DHCPCSDK_ #define _DHCPCSDK_ +#define OPTION_PAD 0 +#define OPTION_SUBNET_MASK 1 +#define OPTION_TIME_OFFSET 2 +#define OPTION_ROUTER_ADDRESS 3 +#define OPTION_TIME_SERVERS 4 +#define OPTION_IEN116_NAME_SERVERS 5 +#define OPTION_DOMAIN_NAME_SERVERS 6 +#define OPTION_LOG_SERVERS 7 +#define OPTION_COOKIE_SERVERS 8 +#define OPTION_LPR_SERVERS 9 +#define OPTION_IMPRESS_SERVERS 10 +#define OPTION_RLP_SERVERS 11 +#define OPTION_HOST_NAME 12 +#define OPTION_BOOT_FILE_SIZE 13 +#define OPTION_MERIT_DUMP_FILE 14 +#define OPTION_DOMAIN_NAME 15 +#define OPTION_SWAP_SERVER 16 +#define OPTION_ROOT_DISK 17 +#define OPTION_EXTENSIONS_PATH 18 +#define OPTION_BE_A_ROUTER 19 +#define OPTION_NON_LOCAL_SOURCE_ROUTING 20 +#define OPTION_POLICY_FILTER_FOR_NLSR 21 +#define OPTION_MAX_REASSEMBLY_SIZE 22 +#define OPTION_DEFAULT_TTL 23 +#define OPTION_PMTU_AGING_TIMEOUT 24 +#define OPTION_PMTU_PLATEAU_TABLE 25 +#define OPTION_MTU 26 +#define OPTION_ALL_SUBNETS_MTU 27 +#define OPTION_BROADCAST_ADDRESS 28 +#define OPTION_PERFORM_MASK_DISCOVERY 29 +#define OPTION_BE_A_MASK_SUPPLIER 30 +#define OPTION_PERFORM_ROUTER_DISCOVERY 31 +#define OPTION_ROUTER_SOLICITATION_ADDR 32 +#define OPTION_STATIC_ROUTES 33 +#define OPTION_TRAILERS 34 +#define OPTION_ARP_CACHE_TIMEOUT 35 +#define OPTION_ETHERNET_ENCAPSULATION 36 +#define OPTION_TTL 37 +#define OPTION_KEEP_ALIVE_INTERVAL 38 +#define OPTION_KEEP_ALIVE_DATA_SIZE 39 +#define OPTION_NETWORK_INFO_SERVICE_DOM 40 +#define OPTION_NETWORK_INFO_SERVERS 41 +#define OPTION_NETWORK_TIME_SERVERS 42 +#define OPTION_VENDOR_SPEC_INFO 43 +#define OPTION_NETBIOS_NAME_SERVER 44 +#define OPTION_NETBIOS_DATAGRAM_SERVER 45 +#define OPTION_NETBIOS_NODE_TYPE 46 +#define OPTION_NETBIOS_SCOPE_OPTION 47 +#define OPTION_XWINDOW_FONT_SERVER 48 +#define OPTION_XWINDOW_DISPLAY_MANAGER 49 +#define OPTION_REQUESTED_ADDRESS 50 +#define OPTION_LEASE_TIME 51 +#define OPTION_OK_TO_OVERLAY 52 +#define OPTION_MESSAGE_TYPE 53 +#define OPTION_SERVER_IDENTIFIER 54 +#define OPTION_PARAMETER_REQUEST_LIST 55 +#define OPTION_MESSAGE 56 +#define OPTION_MESSAGE_LENGTH 57 +#define OPTION_RENEWAL_TIME 58 +#define OPTION_REBIND_TIME 59 +#define OPTION_CLIENT_CLASS_INFO 60 +#define OPTION_CLIENT_ID 61 + +#define OPTION_TFTP_SERVER_NAME 66 +#define OPTION_BOOTFILE_NAME 67 + +#define OPTION_MSFT_IE_PROXY 252 +#define OPTION_END 255 + typedef struct _DHCPAPI_PARAMS { ULONG Flags; @@ -42,9 +111,15 @@ typedef struct _DHCPCAPI_CLASSID ULONG nBytesData; } DHCPCAPI_CLASSID, *PDHCPCAPI_CLASSID, *LPDHCPCAPI_CLASSID; +#define DHCPCAPI_REQUEST_PERSISTENT 0x1 +#define DHCPCAPI_REQUEST_SYNCHRONOUS 0x2 +#define DHCPCAPI_REQUEST_ASYNCHRONOUS 0x4 +#define DHCPCAPI_REQUEST_CANCEL 0x8 +#define DHCPCAPI_REQUEST_MASK 0xf -DWORD WINAPI DhcpRequestParams( DWORD flags, void *reserved, WCHAR *adaptername, DHCPCAPI_CLASSID *classid, - DHCPCAPI_PARAMS_ARRAY sendparams, DHCPCAPI_PARAMS_ARRAY recdparams, - BYTE *buffer, DWORD *size, WCHAR *requestidstr ); +void WINAPI DhcpCApiCleanup(void); +DWORD WINAPI DhcpCApiInitialize(DWORD *); +DWORD WINAPI DhcpRequestParams(DWORD, void *, WCHAR *, DHCPCAPI_CLASSID *, DHCPCAPI_PARAMS_ARRAY, + DHCPCAPI_PARAMS_ARRAY, BYTE *, DWORD *, WCHAR *); #endif

1 0

Zebediah Figura : quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: bcb05ad29b7cf1bcda29f5b019cf2636b3491f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcb05ad29b7cf1bcda29f5b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:23 2019 -0600 quartz/videorenderer: Avoid calling IPin::ConnectionMediaType() on our own pin. Avoids leaking the format block. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 18e5f618b0..b71d15a5d2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -136,30 +136,23 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { - AM_MEDIA_TYPE amt; - HRESULT hr = S_OK; + const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; BITMAPINFOHEADER *bmiHeader; HDC dc; TRACE("(%p)->(%p, %d)\n", This, data, size); - hr = IPin_ConnectionMediaType(&This->renderer.sink.pin.IPin_iface, &amt); - if (FAILED(hr)) { - ERR("Unable to retrieve media type\n"); - return hr; - } - - if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo)) + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { - bmiHeader = &((VIDEOINFOHEADER *)amt.pbFormat)->bmiHeader; + bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; } - else if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo2)) + else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2)) { - bmiHeader = &((VIDEOINFOHEADER2 *)amt.pbFormat)->bmiHeader; + bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; } else { - FIXME("Unknown type %s\n", debugstr_guid(&amt.subtype)); + FIXME("Unknown subtype %s.\n", debugstr_guid(&amt->subtype)); return VFW_E_RUNTIME_ERROR; }

1 0

Zebediah Figura : wineqtdecoder: Simplify disconnecting the sink's peer in qt_splitter_destroy().
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 31bd0a6abbf2816c428c4044227d190b6ccda8d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31bd0a6abbf2816c428c4044… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 18 18:51:22 2019 -0600 wineqtdecoder: Simplify disconnecting the sink's peer in qt_splitter_destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index a7da3b37d6..2da0f691dc 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -234,12 +234,9 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) EnterCriticalSection(&filter->csReceive); /* Don't need to clean up output pins, disconnecting input pin will do that */ - IPin_ConnectedTo(&filter->pInputPin.pin.IPin_iface, &peer); - if (peer) - { - IPin_Disconnect(peer); - IPin_Release(peer); - } + + if (filter->pInputPin.pin.peer) + IPin_Disconnect(filter->pInputPin.pin.peer); FreeMediaType(&filter->pInputPin.pin.mt); if (filter->pInputPin.pAlloc)

1 0

Derek Lesho : setupapi: Add SetupGetInfDriverStoreLocationW stub.
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: f1b94dc16c35a5c477b6df8aa94c6d3537642c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1b94dc16c35a5c477b6df8a… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 18 16:20:12 2019 -0600 setupapi: Add SetupGetInfDriverStoreLocationW stub. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/query.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index ea1b969618..828d8a1145 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -717,3 +717,17 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( return TRUE; } + +/*********************************************************************** + * SetupGetInfDriverStoreLocationW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfDriverStoreLocationW( + PCWSTR FileName, PSP_ALTPLATFORM_INFO AlternativePlatformInfo, + PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize, + PDWORD RequiredSize) +{ + FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 81256a3417..8c4ebcc101 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -421,6 +421,7 @@ @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) +@ stdcall SetupGetInfDriverStoreLocationW(wstr ptr wstr ptr long ptr) @ stdcall SetupGetInfFileListA(str long ptr long ptr) @ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr)

1 0

Alexandre Julliard : ntdll: Implement RtlLocaleNameToLcid().
by Alexandre Julliard Nov. 19, 2019

Nov. 19, 2019

Module: wine Branch: master Commit: 7ac7a902c87d7d82e6b2431b8a44260eb5149ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac7a902c87d7d82e6b2431b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 10:08:27 2019 +0100 ntdll: Implement RtlLocaleNameToLcid(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 79 ++++++++++++++++++++++-- dlls/ntdll/loader.c | 2 + dlls/ntdll/locale.c | 142 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 1 + include/winternl.h | 1 + 6 files changed, 221 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ac7a902c87d7d82e6b2…

1 0