wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Isabella Bosia : ndis.sys: Create network card devices.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: 1f9d83f849a84eef1f6a8b114375136ff1fd3c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f9d83f849a84eef1f6a8b11… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 1 12:41:18 2020 +0100 ndis.sys: Create network card devices. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 3004f6e76f..73eeb8d584 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -55,6 +55,32 @@ static void add_key(const WCHAR *guidstrW, const MIB_IF_ROW2 *netdev) } } +static int add_device(DRIVER_OBJECT *driver, const WCHAR *guidstrW, MIB_IF_ROW2 *netdev) +{ + WCHAR nameW[47], linkW[51]; + UNICODE_STRING name, link; + DEVICE_OBJECT *device; + NTSTATUS status; + + swprintf( nameW, ARRAY_SIZE(nameW), L"\\Device\\%s", guidstrW ); + RtlInitUnicodeString( &name, nameW ); + + swprintf( linkW, ARRAY_SIZE(linkW), L"\\DosDevices\\%s", guidstrW ); + RtlInitUnicodeString( &link, linkW ); + + if (!(status = IoCreateDevice( driver, sizeof(*netdev), &name, 0, 0, FALSE, &device ))) + status = IoCreateSymbolicLink( &link, &name ); + if (status) + { + FIXME( "failed to create device error %x\n", status ); + return 0; + } + + memcpy( device->DeviceExtension, netdev, sizeof(*netdev) ); + return 1; +} + + static void create_network_devices(DRIVER_OBJECT *driver) { MIB_IF_TABLE2 *table; @@ -73,7 +99,8 @@ static void create_network_devices(DRIVER_OBJECT *driver) guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - add_key( guidstrW, &table->Table[i] ); + if (add_device( driver, guidstrW, &table->Table[i] )) + add_key( guidstrW, &table->Table[i] ); } FreeMibTable( table );

1 0

Isabella Bosia : ndis.sys: Create network card registry keys.
by Alexandre Julliard 03 Sep '20

03 Sep '20

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 03 Sep '20

03 Sep '20

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 03 Sep '20

03 Sep '20

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

Isabella Bosia : iphlpapi: Unify conversions to interface guid.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: dea32fa0040ff81a0a9ffa78867276342d566ec2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea32fa0040ff81a0a9ffa78… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Tue Sep 1 12:41:14 2020 +0100 iphlpapi: Unify conversions to interface guid. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c039086229..ddde081950 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1008,12 +1008,19 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index WCHAR *dst; DWORD buflen, type; INTERNAL_IF_OPER_STATUS status; + NET_LUID luid; + GUID guid; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); aa->u.s.IfIndex = index; - sprintf(ptr, "{%08x-0000-0000-0000-000000000000}", index); + ConvertInterfaceIndexToLuid(index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr, "{%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]); aa->AdapterName = ptr; ptr += 39; @@ -1786,7 +1793,7 @@ DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) row2->InterfaceLuid.Info.NetLuidIndex = row.dwIndex; row2->InterfaceLuid.Info.IfType = row.dwType; row2->InterfaceIndex = row.dwIndex; - row2->InterfaceGuid.Data1 = row.dwIndex; + ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); row2->Type = row.dwType; row2->Mtu = row.dwMtu; MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, len );

1 0

Rémi Bernon : gdi32: Only trace new faces when they are added.
by Alexandre Julliard 03 Sep '20

03 Sep '20

Module: wine Branch: master Commit: e07eb13ae84c3a044b3a3c5cff7c7de852da4fab URL: https://source.winehq.org/git/wine.git/?a=commit;h=e07eb13ae84c3a044b3a3c5c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 31 15:26:26 2020 +0200 gdi32: Only trace new faces when they are added. Instead of every time they don't match another face. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f82a8c1641..38d59e3fd9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1574,12 +1574,11 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) return TRUE; } } - else - TRACE("Adding new %s\n", debugstr_w(face->file)); if (style_order( face ) < style_order( cursor )) break; } + TRACE("Adding new %s\n", debugstr_w(face->file)); list_add_before( &cursor->entry, &face->entry ); face->family = family; family->refcount++;

1 0

Arkadiusz Hiler : msvcirt: Implement most of ifstream.
by Alexandre Julliard 03 Sep '20

03 Sep '20

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 03 Sep '20

03 Sep '20

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 03 Sep '20

03 Sep '20

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 03 Sep '20

03 Sep '20

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

← Newer
1
...
61
62
63
64
65
66
67
...
71
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 2020