September 2020 - Wine-Commits

Isabella Bosia : ndis.sys: Create network card registry keys.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: de6db1154330a0a6b58c703c9c504c1058ef4faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=de6db1154330a0a6b58c703c… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 1 12:41:17 2020 +0100 ndis.sys: Create network card registry keys. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/Makefile.in | 1 + dlls/ndis.sys/main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index fa69910f16..0d58cb0d38 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,5 @@ MODULE = ndis.sys +IMPORTS = advapi32 ntoskrnl iphlpapi EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin C_SRCS = \ diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 90c8c3cc88..3004f6e76f 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -21,21 +21,70 @@ #include <stdarg.h> +#define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winioctl.h" +#include "winsock2.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" +#include "netioapi.h" +#include "ntddndis.h" #include "ddk/wdm.h" #include "ddk/ndis.h" +#include "winreg.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ndis); +static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev) +{ + HKEY card_key; + WCHAR keynameW[100]; + + swprintf( keynameW, ARRAY_SIZE(keynameW), L"Software\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards\\%d", netdev->InterfaceIndex ); + if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, keynameW, 0, NULL, + REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &card_key, NULL ) == ERROR_SUCCESS) + { + RegSetValueExW( card_key, L"Description", 0, REG_SZ, (BYTE *)netdev->Description, (lstrlenW(netdev->Description) + 1) * sizeof(WCHAR) ); + RegSetValueExW( card_key, L"ServiceName", 0, REG_SZ, (BYTE *)guidstrW, (lstrlenW(guidstrW) + 1) * sizeof(WCHAR) ); + RegCloseKey( card_key ); + } +} + +static void create_network_devices(DRIVER_OBJECT *driver) +{ + MIB_IF_TABLE2 *table; + ULONG i; + + if (GetIfTable2( &table ) != NO_ERROR) + return; + + for (i = 0; i < table->NumEntries; i++) + { + GUID *guid = &table->Table[i].InterfaceGuid; + WCHAR guidstrW[39]; + + swprintf( guidstrW, ARRAY_SIZE(guidstrW), L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7] ); + + add_key( guidstrW, &table->Table[i] ); + } + + FreeMibTable( table ); +} + NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + create_network_devices( driver ); + return STATUS_SUCCESS; }

1 0

Isabella Bosia : wine.inf: Create NDIS service.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 7c1dd57b4f07a483f03a7eb4175015300911bb9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c1dd57b4f07a483f03a7eb4… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 1 12:41:16 2020 +0100 wine.inf: Create NDIS service. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 8777377002..cd0e7bd16f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -163,6 +163,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService +AddService=NDIS,0x800,NDISService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -180,6 +181,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService +AddService=NDIS,0x800,NDISService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -197,6 +199,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService +AddService=NDIS,0x800,NDISService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService @@ -214,6 +217,7 @@ AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService +AddService=NDIS,0x800,NDISService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -3628,6 +3632,16 @@ ServiceBinary="%12%\mountmgr.sys" ServiceType=1 StartType=2 ErrorControl=1 +LoadOrderGroup="System Bus Extender" + +[NDISService] +Description="NDIS service" +DisplayName="NDIS" +ServiceBinary="%12%\ndis.sys" +ServiceType=1 +StartType=2 +ErrorControl=1 +LoadOrderGroup="System Bus Extender" [RpcSsService] Description="RPC service"

1 0

Isabella Bosia : iphlpapi: Make the interface guids more unique.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 44ef8eaf582ad3515d7f56ec76532549577c9da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44ef8eaf582ad3515d7f56ec… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 1 12:41:15 2020 +0100 iphlpapi: Make the interface guids more unique. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ddde081950..81c4992ac7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3207,6 +3207,7 @@ DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) memset( guid, 0, sizeof(*guid) ); guid->Data1 = luid->Info.NetLuidIndex; + memcpy( guid->Data4+2, "NetDev", 6 ); return NO_ERROR; }

1 0

Alexandre Julliard : ntdll: Add a helper function for fixed anonymous mmaps.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 74deee7df0abd7e05b433f875e86e26d7e2f447f URL: https://source.winehq.org/git/wine.git/?a=commit;h=74deee7df0abd7e05b433f87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:51:09 2020 +0200 ntdll: Add a helper function for fixed anonymous mmaps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 30 +++++++++++++++++------------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dcbe4eff0f..5f8fcd82be 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -610,7 +610,7 @@ static NTSTATUS map_so_dll( const IMAGE_NT_HEADERS *nt_descr, HMODULE module ) + sizeof(IMAGE_NT_HEADERS) + nb_sections * sizeof(IMAGE_SECTION_HEADER)); - if (wine_anon_mmap( addr, size, PROT_READ | PROT_WRITE, MAP_FIXED ) != addr) return STATUS_NO_MEMORY; + if (anon_mmap_fixed( addr, size, PROT_READ | PROT_WRITE, 0 ) != addr) return STATUS_NO_MEMORY; dos = (IMAGE_DOS_HEADER *)addr; nt = (IMAGE_NT_HEADERS *)((BYTE *)(dos + 1) + sizeof(builtin_signature)); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f71963f4a9..f77cb7b214 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -176,6 +176,7 @@ extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; +extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3468f771b9..23731fb33a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -211,6 +211,11 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +/* mmap() anonymous memory at a fixed address */ +void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) +{ + return mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | MAP_FIXED | flags, -1, 0 ); +} static void mmap_add_reserved_area( void *addr, SIZE_T size ) { @@ -1163,7 +1168,7 @@ static void add_reserved_area( void *addr, size_t size ) addr = user_space_limit; } /* blow away existing mappings */ - wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); mmap_add_reserved_area( addr, size ); } @@ -1266,7 +1271,7 @@ static inline void unmap_area( void *addr, size_t size ) break; } case 1: /* in a reserved area */ - wine_anon_mmap( addr, size, PROT_NONE, MAP_NORESERVE | MAP_FIXED ); + anon_mmap_fixed( addr, size, PROT_NONE, MAP_NORESERVE ); break; default: case 0: /* not in a reserved area */ @@ -1684,7 +1689,7 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) case 1: /* in a reserved area, make sure the address is available */ if (find_view_range( base, size )) return STATUS_CONFLICTING_ADDRESSES; /* replace the reserved area by our mapping */ - if ((ptr = wine_anon_mmap( base, size, get_unix_prot(vprot), MAP_FIXED )) != base) + if ((ptr = anon_mmap_fixed( base, size, get_unix_prot(vprot), 0 )) != base) return STATUS_INVALID_PARAMETER; break; } @@ -1725,7 +1730,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (wine_anon_mmap( ptr, size, get_unix_prot(vprot), MAP_FIXED ) != ptr) + if (anon_mmap_fixed( ptr, size, get_unix_prot(vprot), 0 ) != ptr) return STATUS_INVALID_PARAMETER; goto done; } @@ -1817,8 +1822,8 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start } /* Reserve the memory with an anonymous mmap */ - ptr = wine_anon_mmap( (char *)view->base + start, size, PROT_READ | PROT_WRITE, MAP_FIXED ); - if (ptr == (void *)-1) return STATUS_NO_MEMORY; + ptr = anon_mmap_fixed( (char *)view->base + start, size, PROT_READ | PROT_WRITE, 0 ); + if (ptr == MAP_FAILED) return STATUS_NO_MEMORY; /* Now read in the file */ pread( fd, ptr, size, offset ); if (prot != (PROT_READ|PROT_WRITE)) mprotect( ptr, size, prot ); /* Set the right protection */ @@ -1875,7 +1880,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro */ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t size ) { - if (wine_anon_mmap( (char *)view->base + start, size, PROT_NONE, MAP_FIXED ) != (void *)-1) + if (anon_mmap_fixed( (char *)view->base + start, size, PROT_NONE, 0 ) != MAP_FAILED) { set_page_vprot_bits( (char *)view->base + start, size, 0, VPROT_COMMITTED ); return STATUS_SUCCESS; @@ -1920,7 +1925,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot addr = wine_anon_mmap( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); if (addr == (void *)page_size) { - if (!wine_anon_mmap( NULL, page_size, unix_prot, MAP_FIXED )) + if (!anon_mmap_fixed( NULL, page_size, unix_prot, 0 )) { addr = NULL; TRACE( "successfully mapped low 64K range\n" ); @@ -1938,7 +1943,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /* now reserve the whole range */ size = (char *)dosmem_size - (char *)addr; - wine_anon_mmap( addr, size, unix_prot, MAP_FIXED ); + anon_mmap_fixed( addr, size, unix_prot, 0 ); return create_view( view, addr, size, vprot ); } @@ -2350,9 +2355,8 @@ static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; if (size < alloc->size) return 0; if (is_win64 && base < (void *)0x80000000) return 0; - alloc->base = wine_anon_mmap( (char *)base + size - alloc->size, alloc->size, - PROT_READ|PROT_WRITE, MAP_FIXED ); - return (alloc->base != (void *)-1); + alloc->base = anon_mmap_fixed( (char *)base + size - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); + return (alloc->base != MAP_FAILED); } /*********************************************************************** @@ -2417,7 +2421,7 @@ void virtual_init(void) /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */ size = (char *)address_space_start - (char *)0x10000; if (size && mmap_is_in_reserved_area( (void*)0x10000, size ) == 1) - wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED ); + anon_mmap_fixed( (void *)0x10000, size, PROT_READ | PROT_WRITE, 0 ); }

1 0

Arkadiusz Hiler : msvcirt: Implement most of ifstream.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: a0faee89e01fe4daf7a25ebc4240cda4fe34da59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0faee89e01fe4daf7a25ebc… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Sep 2 19:56:33 2020 +0300 msvcirt: Implement most of ifstream. Based on semi-stubs by Gijs Vermeulen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 185 +++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 68 ++++++------ dlls/msvcirt/tests/msvcirt.c | 251 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 68 ++++++------ dlls/msvcrt40/msvcrt40.spec | 68 ++++++------ 5 files changed, 538 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0faee89e01fe4daf7a2…

1 0

Nikolay Sivov : combase: Use typed list iteration macros.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 3255b4b86c6b75a394b857dd36301c455c45ea70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3255b4b86c6b75a394b857dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 11:11:04 2020 +0300 combase: Use typed list iteration macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 12 ++++-------- dlls/combase/marshal.c | 20 ++++++++------------ dlls/combase/stubmanager.c | 28 ++++++++-------------------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 125eaff142..5fbec944eb 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -629,13 +629,11 @@ struct apartment * apartment_get_current_or_mta(void) /* The given OXID must be local to this process */ struct apartment * apartment_findfromoxid(OXID oxid) { - struct apartment *result = NULL; - struct list *cursor; + struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); - LIST_FOR_EACH( cursor, &apts ) + LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); if (apt->oxid == oxid) { result = apt; @@ -653,13 +651,11 @@ struct apartment * apartment_findfromoxid(OXID oxid) * is no longer required. */ struct apartment * apartment_findfromtid(DWORD tid) { - struct apartment *result = NULL; - struct list *cursor; + struct apartment *result = NULL, *apt; EnterCriticalSection(&apt_cs); - LIST_FOR_EACH( cursor, &apts ) + LIST_FOR_EACH_ENTRY(apt, &apts, struct apartment, entry) { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); if (apt->tid == tid) { result = apt; diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index bcc7813265..bdfb44bffa 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -1803,12 +1803,11 @@ static HRESULT proxy_manager_create_ifproxy( static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID riid, struct ifproxy ** ifproxy_found) { HRESULT hr = E_NOINTERFACE; /* assume not found */ - struct list * cursor; + struct ifproxy *ifproxy; EnterCriticalSection(&This->cs); - LIST_FOR_EACH(cursor, &This->interfaces) + LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry) { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); if (IsEqualIID(riid, &ifproxy->iid)) { *ifproxy_found = ifproxy; @@ -1823,7 +1822,7 @@ static HRESULT proxy_manager_find_ifproxy(struct proxy_manager * This, REFIID ri static void proxy_manager_disconnect(struct proxy_manager * This) { - struct list * cursor; + struct ifproxy *ifproxy; TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), wine_dbgstr_longlong(This->oid)); @@ -1836,9 +1835,8 @@ static void proxy_manager_disconnect(struct proxy_manager * This) * working */ if (!(This->sorflags & SORFP_NOLIFETIMEMGMT)) { - LIST_FOR_EACH(cursor, &This->interfaces) + LIST_FOR_EACH_ENTRY(ifproxy, &This->interfaces, struct ifproxy, entry) { - struct ifproxy * ifproxy = LIST_ENTRY(cursor, struct ifproxy, entry); ifproxy_disconnect(ifproxy); } } @@ -1963,13 +1961,12 @@ static void proxy_manager_destroy(struct proxy_manager * This) * reference to the proxy_manager when the object is no longer used. */ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struct proxy_manager ** proxy_found) { + struct proxy_manager *proxy; BOOL found = FALSE; - struct list * cursor; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->proxies) + LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry) { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); if ((oxid == proxy->oxid) && (oid == proxy->oid)) { /* be careful of a race with ClientIdentity_Release, which would @@ -1989,11 +1986,10 @@ static BOOL find_proxy_manager(struct apartment * apt, OXID oxid, OID oid, struc HRESULT apartment_disconnectproxies(struct apartment *apt) { - struct list * cursor; + struct proxy_manager *proxy; - LIST_FOR_EACH(cursor, &apt->proxies) + LIST_FOR_EACH_ENTRY(proxy, &apt->proxies, struct proxy_manager, entry) { - struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); proxy_manager_disconnect(proxy); } diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index 16b8bb35d0..e9f20962e3 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -137,14 +137,11 @@ static void stub_manager_delete_ifstub(struct stub_manager *m, struct ifstub *if static struct ifstub *stub_manager_ipid_to_ifstub(struct stub_manager *m, const IPID *ipid) { - struct list *cursor; - struct ifstub *result = NULL; + struct ifstub *result = NULL, *ifstub; EnterCriticalSection(&m->lock); - LIST_FOR_EACH( cursor, &m->ifstubs ) + LIST_FOR_EACH_ENTRY(ifstub, &m->ifstubs, struct ifstub, entry) { - struct ifstub *ifstub = LIST_ENTRY( cursor, struct ifstub, entry ); - if (IsEqualGUID(ipid, &ifstub->ipid)) { result = ifstub; @@ -337,8 +334,7 @@ ULONG stub_manager_int_release(struct stub_manager *m) * it must also call release on the stub manager when it is no longer needed */ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnknown *obj, BOOL alloc) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; IUnknown *object; HRESULT hres; @@ -350,10 +346,8 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno } EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); - if (m->object == object) { result = m; @@ -386,14 +380,11 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno * it must also call release on the stub manager when it is no longer needed */ struct stub_manager * get_stub_manager(struct apartment *apt, OID oid) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); - if (m->oid == oid) { result = m; @@ -480,14 +471,11 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea * it must also call release on the stub manager when it is no longer needed */ static struct stub_manager *get_stub_manager_from_ipid(struct apartment *apt, const IPID *ipid, struct ifstub **ifstub) { - struct stub_manager *result = NULL; - struct list *cursor; + struct stub_manager *result = NULL, *m; EnterCriticalSection(&apt->cs); - LIST_FOR_EACH(cursor, &apt->stubmgrs) + LIST_FOR_EACH_ENTRY(m, &apt->stubmgrs, struct stub_manager, entry) { - struct stub_manager *m = LIST_ENTRY(cursor, struct stub_manager, entry); - if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { result = m;

1 0

Alexandre Julliard : ntdll: Load libwine dynamically.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 2d91f7def15cb0df65fdb87c19e24a5a6c99839e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d91f7def15cb0df65fdb87c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 12:16:52 2020 +0200 ntdll: Load libwine dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/env.c | 15 +++++--------- dlls/ntdll/unix/loader.c | 45 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 50 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index bf1755c879..52f63892af 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = -lwine $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) +EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \ diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 43920135a0..e1a3d33957 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -60,18 +60,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); -extern int __wine_main_argc; -extern char **__wine_main_argv; -extern char **__wine_main_environ; -extern WCHAR **__wine_main_wargv; - USHORT *uctable = NULL, *lctable = NULL; SIZE_T startup_info_size = 0; int main_argc = 0; char **main_argv = NULL; char **main_envp = NULL; -static WCHAR **main_wargv; +WCHAR **main_wargv = NULL; static LCID user_lcid, system_lcid; static LANGID user_ui_language, system_ui_language; @@ -966,10 +961,10 @@ void init_environment( int argc, char *argv[], char *envp[] ) uctable = case_table + 2; lctable = case_table + case_table[1] + 2; } - __wine_main_argc = main_argc = argc; - __wine_main_argv = main_argv = argv; - __wine_main_wargv = main_wargv = build_wargv( argv ); - __wine_main_environ = main_envp = envp; + main_argc = argc; + main_argv = argv; + main_wargv = build_wargv( argv ); + main_envp = envp; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5f8fcd82be..bc5b627cbc 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -87,7 +87,6 @@ #include "winternl.h" #include "unix_private.h" #include "wine/list.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -815,6 +814,48 @@ static void load_builtin_callback( void *module, const char *filename ) callback_module = module; } + +/*********************************************************************** + * load_libwine + */ +static void load_libwine(void) +{ +#ifdef __APPLE__ +#define LIBWINE "libwine.1.dylib" +#elif defined(__ANDROID__) +#define LIBWINE "libwine.so" +#else +#define LIBWINE "libwine.so.1" +#endif + typedef void (*load_dll_callback_t)( void *, const char * ); + static void (*p_wine_dll_set_callback)( load_dll_callback_t load ); + static int *p___wine_main_argc; + static char ***p___wine_main_argv; + static char ***p___wine_main_environ; + static WCHAR ***p___wine_main_wargv; + + char *path; + void *handle; + + if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); + else path = build_path( dll_dir, "../" LIBWINE ); + + if (!(handle = dlopen( path, RTLD_NOW )) && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; + + p_wine_dll_set_callback = dlsym( handle, "wine_dll_set_callback" ); + p___wine_main_argc = dlsym( handle, "__wine_main_argc" ); + p___wine_main_argv = dlsym( handle, "__wine_main_argv" ); + p___wine_main_wargv = dlsym( handle, "__wine_main_wargv" ); + p___wine_main_environ = dlsym( handle, "__wine_main_environ" ); + + if (p_wine_dll_set_callback) p_wine_dll_set_callback( load_builtin_callback ); + if (p___wine_main_argc) *p___wine_main_argc = main_argc; + if (p___wine_main_argv) *p___wine_main_argv = main_argv; + if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; + if (p___wine_main_environ) *p___wine_main_environ = main_envp; +} + + /*********************************************************************** * dlopen_dll */ @@ -1610,7 +1651,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) load_ntdll(); init_environment( argc, argv, envp ); - wine_dll_set_callback( load_builtin_callback ); + load_libwine(); #ifdef __APPLE__ apple_main_thread(); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3185f3a8ac..39edee09a0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -129,6 +129,7 @@ extern SIZE_T startup_info_size DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN; +extern WCHAR **main_wargv DECLSPEC_HIDDEN; extern unsigned int server_cpus DECLSPEC_HIDDEN; extern BOOL is_wow64 DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Add a helper function to try an mmap at a fixed address.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 4e80f2ea5e350168933599ab7ad633254717e93c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e80f2ea5e350168933599ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:54:17 2020 +0200 ntdll: Add a helper function to try an mmap at a fixed address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 112 ++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 907524ecc5..22d328b1ce 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -59,7 +59,6 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" -#include "wine/library.h" #include "wine/exception.h" #include "wine/list.h" #include "wine/rbtree.h" @@ -173,12 +172,6 @@ static struct list teb_list = LIST_INIT( teb_list ); #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif -#ifndef MAP_TRYFIXED -#define MAP_TRYFIXED 0 -#endif -#ifndef MAP_FIXED_NOREPLACE -#define MAP_FIXED_NOREPLACE 0 -#endif #ifdef _WIN64 /* on 64-bit the page protection bytes use a 2-level table */ static const size_t pages_vprot_shift = 20; @@ -211,6 +204,11 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +static inline BOOL is_beyond_limit( const void *addr, size_t size, const void *limit ) +{ + return (addr >= limit || (const char *)addr + size > (const char *)limit); +} + /* mmap() anonymous memory at a fixed address */ void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) { @@ -375,6 +373,48 @@ static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T s return ret; } +static void *anon_mmap_tryfixed( void *start, size_t size, int prot, int flags ) +{ + void *ptr; + +#ifdef MAP_FIXED_NOREPLACE + ptr = mmap( start, size, prot, MAP_FIXED_NOREPLACE | MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); +#elif defined(MAP_TRYFIXED) + ptr = mmap( start, size, prot, MAP_TRYFIXED | MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ptr = mmap( start, size, prot, MAP_FIXED | MAP_EXCL | MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); + if (ptr == MAP_FAILED && errno == EINVAL) errno = EEXIST; +#elif defined(__APPLE__) + mach_vm_address_t result = (mach_vm_address_t)start; + kern_return_t ret = mach_vm_map( mach_task_self(), &result, size, 0, VM_FLAGS_FIXED, + MEMORY_OBJECT_NULL, 0, 0, prot, VM_PROT_ALL, VM_INHERIT_COPY ); + + if (!ret) + { + if ((ptr = anon_mmap_fixed( start, size, prot, flags )) == MAP_FAILED) + mach_vm_deallocate( mach_task_self(), result, size ); + } + else + { + errno = (ret == KERN_NO_SPACE ? EEXIST : ENOMEM); + ptr = MAP_FAILED; + } +#else + ptr = mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | flags, -1, 0 ); +#endif + if (ptr != MAP_FAILED && ptr != start) + { + if (is_beyond_limit( ptr, size, user_space_limit )) + { + anon_mmap_fixed( ptr, size, PROT_NONE, MAP_NORESERVE ); + mmap_add_reserved_area( ptr, size ); + } + else munmap( ptr, size ); + ptr = MAP_FAILED; + errno = EEXIST; + } + return ptr; +} static void reserve_area( void *addr, void *end ) { @@ -432,23 +472,15 @@ static void reserve_area( void *addr, void *end ) } #else void *ptr; - int flags = MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_TRYFIXED; size_t size = (char *)end - (char *)addr; if (!size) return; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - ptr = mmap( addr, size, PROT_NONE, flags | MAP_FIXED | MAP_EXCL, -1, 0 ); -#else - ptr = mmap( addr, size, PROT_NONE, flags, -1, 0 ); -#endif - if (ptr == addr) + if ((ptr = anon_mmap_tryfixed( addr, size, PROT_NONE, MAP_NORESERVE )) != MAP_FAILED) { mmap_add_reserved_area( addr, size ); return; } - if (ptr != (void *)-1) munmap( ptr, size ); - size = (size / 2) & ~granularity_mask; if (size) { @@ -1028,20 +1060,14 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step, while (start && base <= start && (char*)start + size <= (char*)end) { - if ((ptr = wine_anon_mmap( start, size, unix_prot, MAP_FIXED_NOREPLACE )) == start) - return start; + if ((ptr = anon_mmap_tryfixed( start, size, unix_prot, 0 )) != MAP_FAILED) return start; TRACE( "Found free area is already mapped, start %p.\n", start ); - - if (ptr == (void *)-1 && errno != EEXIST) + if (errno != EEXIST) { - ERR( "wine_anon_mmap() error %s, range %p-%p, unix_prot %#x.\n", - strerror(errno), start, (char *)start + size, unix_prot ); + ERR( "mmap() error %s, range %p-%p, unix_prot %#x.\n", + strerror(errno), start, (char *)start + size, unix_prot ); return NULL; } - - if (ptr != (void *)-1) - munmap( ptr, size ); - if ((step > 0 && (char *)end - (char *)start < step) || (step < 0 && (char *)start - (char *)base < -step) || step == 0) @@ -1243,17 +1269,6 @@ static int CDECL get_area_boundary_callback( void *start, SIZE_T size, void *arg } -/*********************************************************************** - * is_beyond_limit - * - * Check if an address range goes beyond a given limit. - */ -static inline BOOL is_beyond_limit( const void *addr, size_t size, const void *limit ) -{ - return (addr >= limit || (const char *)addr + size > (const char *)limit); -} - - /*********************************************************************** * unmap_area * @@ -1678,18 +1693,12 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) return status; } case 0: /* not in a reserved area, do a normal allocation */ - if ((ptr = wine_anon_mmap( base, size, get_unix_prot(vprot), 0 )) == (void *)-1) + if ((ptr = anon_mmap_tryfixed( base, size, get_unix_prot(vprot), 0 )) == MAP_FAILED) { if (errno == ENOMEM) return STATUS_NO_MEMORY; + if (errno == EEXIST) return STATUS_CONFLICTING_ADDRESSES; return STATUS_INVALID_PARAMETER; } - if (ptr != base) - { - /* We couldn't get the address we wanted */ - if (is_beyond_limit( ptr, size, user_space_limit )) add_reserved_area( ptr, size ); - else munmap( ptr, size ); - return STATUS_CONFLICTING_ADDRESSES; - } break; default: @@ -1917,20 +1926,16 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot if (mmap_is_in_reserved_area( low_64k, dosmem_size - 0x10000 ) != 1) { - addr = wine_anon_mmap( low_64k, dosmem_size - 0x10000, unix_prot, 0 ); - if (addr != low_64k) - { - if (addr != (void *)-1) munmap( addr, dosmem_size - 0x10000 ); - return map_view( view, NULL, dosmem_size, FALSE, vprot, 0 ); - } + addr = anon_mmap_tryfixed( low_64k, dosmem_size - 0x10000, unix_prot, 0 ); + if (addr == MAP_FAILED) return map_view( view, NULL, dosmem_size, FALSE, vprot, 0 ); } /* now try to allocate the low 64K too */ if (mmap_is_in_reserved_area( NULL, 0x10000 ) != 1) { - addr = wine_anon_mmap( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); - if (addr == (void *)page_size) + addr = anon_mmap_tryfixed( (void *)page_size, 0x10000 - page_size, unix_prot, 0 ); + if (addr != MAP_FAILED) { if (!anon_mmap_fixed( NULL, page_size, unix_prot, 0 )) { @@ -1941,7 +1946,6 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot } else { - if (addr != (void *)-1) munmap( addr, 0x10000 - page_size ); addr = low_64k; TRACE( "failed to map low 64K range\n" ); }

1 0

Alexandre Julliard : ntdll: Add a helper function for memory allocations through mmap().
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 72b97eeba0d934ed2c8607f45429664130dd8f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=72b97eeba0d934ed2c8607f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 3 10:52:11 2020 +0200 ntdll: Add a helper function for memory allocations through mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 5 ++--- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 19 +++++++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index cc8b519b98..f162572264 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -85,7 +85,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winnt.h" -#include "wine/library.h" #include "wine/server.h" #include "wine/debug.h" #include "unix_private.h" @@ -914,8 +913,8 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, if (!entry) fd_cache[0] = fd_cache_initial_block; else { - void *ptr = wine_anon_mmap( NULL, FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), - PROT_READ | PROT_WRITE, 0 ); + void *ptr = anon_mmap_alloc( FD_CACHE_BLOCK_SIZE * sizeof(union fd_cache_entry), + PROT_READ | PROT_WRITE ); if (ptr == MAP_FAILED) return FALSE; fd_cache[entry] = ptr; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f77cb7b214..3185f3a8ac 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -177,6 +177,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) DECLSPEC_HIDDEN; +extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_map_ntdll( int fd, void **module ) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 23731fb33a..907524ecc5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -217,6 +217,13 @@ void *anon_mmap_fixed( void *start, size_t size, int prot, int flags ) return mmap( start, size, prot, MAP_PRIVATE | MAP_ANON | MAP_FIXED | flags, -1, 0 ); } +/* allocate anonymous mmap() memory at any address */ +void *anon_mmap_alloc( size_t size, int prot ) +{ + return mmap( NULL, size, prot, MAP_PRIVATE | MAP_ANON, -1, 0 ); +} + + static void mmap_add_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; @@ -756,7 +763,7 @@ static BOOL alloc_pages_vprot( const void *addr, size_t size ) for (i = idx >> pages_vprot_shift; i < (end + pages_vprot_mask) >> pages_vprot_shift; i++) { if (pages_vprot[i]) continue; - if ((ptr = wine_anon_mmap( NULL, pages_vprot_mask + 1, PROT_READ | PROT_WRITE, 0 )) == (void *)-1) + if ((ptr = anon_mmap_alloc( pages_vprot_mask + 1, PROT_READ | PROT_WRITE )) == MAP_FAILED) return FALSE; pages_vprot[i] = ptr; } @@ -1299,8 +1306,8 @@ static struct file_view *alloc_view(void) } if (view_block_start == view_block_end) { - void *ptr = wine_anon_mmap( NULL, view_block_size, PROT_READ | PROT_WRITE, 0 ); - if (ptr == (void *)-1) return NULL; + void *ptr = anon_mmap_alloc( view_block_size, PROT_READ | PROT_WRITE ); + if (ptr == MAP_FAILED) return NULL; view_block_start = ptr; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); } @@ -1746,7 +1753,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, for (;;) { - if ((ptr = wine_anon_mmap( NULL, view_size, get_unix_prot(vprot), 0 )) == (void *)-1) + if ((ptr = anon_mmap_alloc( view_size, get_unix_prot(vprot) )) == MAP_FAILED) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; @@ -2405,9 +2412,9 @@ void virtual_init(void) if (mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); else - alloc_views.base = wine_anon_mmap( NULL, alloc_views.size, PROT_READ | PROT_WRITE, 0 ); + alloc_views.base = anon_mmap_alloc( alloc_views.size, PROT_READ | PROT_WRITE ); - assert( alloc_views.base != (void *)-1 ); + assert( alloc_views.base != MAP_FAILED ); view_block_start = alloc_views.base; view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); free_ranges = (void *)((char *)alloc_views.base + view_block_size);

1 0

Hans Leidekker : advapi32: Write host credentials through mountmgr.
by Alexandre Julliard Sept. 3, 2020

Sept. 3, 2020

Module: wine Branch: master Commit: 98a3986c7d613af8f5c782c7890e2f2ca17926f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a3986c7d613af8f5c782c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 3 14:59:05 2020 +0200 advapi32: Write host credentials through mountmgr. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/cred.c | 126 +++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 70 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 07f4b9b03a..c17023959f 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -497,85 +497,73 @@ static DWORD registry_write_credential(HKEY hkey, const CREDENTIALW *credential, return ret; } -#ifdef __APPLE__ -static DWORD mac_write_credential(const CREDENTIALW *credential, BOOL preserve_blob) +static DWORD host_write_credential( const CREDENTIALW *credential, BOOL preserve_blob ) { - int status; - SecKeychainItemRef keychain_item; - char *username, *password, *servername; - UInt32 userlen, pwlen, serverlen; - SecKeychainAttribute attrs[1]; - SecKeychainAttributeList attr_list; + struct mountmgr_credential *cred; + HANDLE mgr; + DWORD size; + WCHAR *ptr; + BOOL ret; if (credential->Flags) - FIXME("Flags 0x%x not written\n", credential->Flags); + FIXME( "flags 0x%x not written\n", credential->Flags ); if (credential->Type != CRED_TYPE_DOMAIN_PASSWORD) - FIXME("credential type of %d not supported\n", credential->Type); + FIXME( "credential type of %d not supported\n", credential->Type ); if (credential->Persist != CRED_PERSIST_LOCAL_MACHINE) - FIXME("persist value of %d not supported\n", credential->Persist); + FIXME( "persist value of %d not supported\n", credential->Persist ); if (credential->AttributeCount) - FIXME("custom attributes not supported\n"); - - userlen = WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, NULL, 0, NULL, NULL); - username = heap_alloc(userlen * sizeof(*username)); - WideCharToMultiByte(CP_UTF8, 0, credential->UserName, -1, username, userlen, NULL, NULL); - - serverlen = WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, NULL, 0, NULL, NULL); - servername = heap_alloc(serverlen * sizeof(*servername)); - WideCharToMultiByte(CP_UTF8, 0, credential->TargetName, -1, servername, serverlen, NULL, NULL); - pwlen = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, - credential->CredentialBlobSize / sizeof(WCHAR), NULL, 0, NULL, NULL); - password = heap_alloc(pwlen * sizeof(*password)); - WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR)credential->CredentialBlob, - credential->CredentialBlobSize / sizeof(WCHAR), password, pwlen, NULL, NULL); - - TRACE("adding server %s, username %s using Keychain\n", servername, username); - status = SecKeychainAddGenericPassword(NULL, strlen(servername), servername, strlen(username), - username, strlen(password), password, &keychain_item); - if (status != noErr) - ERR("SecKeychainAddGenericPassword returned %d\n", status); - if (status == errSecDuplicateItem) + FIXME( "custom attributes not supported\n" ); + + if (credential->CredentialBlobSize % sizeof(WCHAR)) return ERROR_NOT_SUPPORTED; + + mgr = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (mgr == INVALID_HANDLE_VALUE) return GetLastError(); + + size = sizeof(*cred) + (strlenW( credential->TargetName ) + strlenW( credential->UserName ) + 2) * sizeof(WCHAR); + size += credential->CredentialBlobSize; + if (credential->Comment) size += (strlenW( credential->Comment ) + 1) * sizeof(WCHAR); + if (!(cred = heap_alloc( size ))) { - status = SecKeychainFindGenericPassword(NULL, strlen(servername), servername, strlen(username), - username, NULL, NULL, &keychain_item); - if (status != noErr) - ERR("SecKeychainFindGenericPassword returned %d\n", status); + CloseHandle( mgr ); + return ERROR_OUTOFMEMORY; } - heap_free(username); - heap_free(servername); - if (status != noErr) + ptr = (WCHAR *)(cred + 1); + + cred->targetname_offset = sizeof(*cred); + cred->targetname_size = (strlenW( credential->TargetName ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->TargetName ); + ptr += cred->targetname_size / sizeof(WCHAR); + + cred->username_offset = cred->targetname_offset + cred->targetname_size; + cred->username_size = (strlenW( credential->UserName ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->UserName ); + ptr += cred->username_size / sizeof(WCHAR); + + cred->blob_offset = cred->username_offset + cred->username_size; + if (credential->CredentialBlob) { - heap_free(password); - return ERROR_GEN_FAILURE; + cred->blob_size = credential->CredentialBlobSize; + memcpy( ptr, credential->CredentialBlob, credential->CredentialBlobSize ); + ptr += cred->blob_size / sizeof(WCHAR); } + else cred->blob_size = 0; + cred->blob_preserve = preserve_blob; + + cred->comment_offset = cred->blob_offset + cred->blob_size; if (credential->Comment) { - attr_list.count = 1; - attr_list.attr = attrs; - attrs[0].tag = kSecCommentItemAttr; - attrs[0].length = WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, NULL, 0, NULL, NULL); - if (attrs[0].length) attrs[0].length--; - attrs[0].data = heap_alloc(attrs[0].length); - WideCharToMultiByte(CP_UTF8, 0, credential->Comment, -1, attrs[0].data, attrs[0].length, NULL, NULL); - } - else - { - attr_list.count = 0; - attr_list.attr = NULL; + cred->comment_size = (strlenW( credential->Comment ) + 1) * sizeof(WCHAR); + strcpyW( ptr, credential->Comment ); } - status = SecKeychainItemModifyAttributesAndData(keychain_item, &attr_list, - preserve_blob ? 0 : strlen(password), - preserve_blob ? NULL : password); - if (credential->Comment) - heap_free(attrs[0].data); - heap_free(password); - /* FIXME: set TargetAlias attribute */ - CFRelease(keychain_item); - if (status != noErr) - return ERROR_GEN_FAILURE; - return ERROR_SUCCESS; + else cred->comment_size = 0; + + ret = DeviceIoControl( mgr, IOCTL_MOUNTMGR_WRITE_CREDENTIAL, cred, size, NULL, 0, NULL, NULL ); + heap_free( cred ); + CloseHandle( mgr ); + + return ret ? ERROR_SUCCESS : GetLastError(); } -#endif static DWORD open_cred_mgr_key(HKEY *hkey, BOOL open_for_write) { @@ -1823,20 +1811,18 @@ BOOL WINAPI CredWriteW(PCREDENTIALW Credential, DWORD Flags) } } -#ifdef __APPLE__ if (!Credential->AttributeCount && Credential->Type == CRED_TYPE_DOMAIN_PASSWORD && (Credential->Persist == CRED_PERSIST_LOCAL_MACHINE || Credential->Persist == CRED_PERSIST_ENTERPRISE)) { - ret = mac_write_credential(Credential, Flags & CRED_PRESERVE_CREDENTIAL_BLOB); - if (ret != ERROR_SUCCESS) + ret = host_write_credential(Credential, Flags & CRED_PRESERVE_CREDENTIAL_BLOB); + if (ret != ERROR_SUCCESS && ret != ERROR_NOT_SUPPORTED) { SetLastError(ret); return FALSE; } - return TRUE; + if (ret == ERROR_SUCCESS) return TRUE; } -#endif ret = open_cred_mgr_key(&hkeyMgr, FALSE); if (ret != ERROR_SUCCESS)

1 0