March 2020 - Wine-commits - list.winehq.org

Dmitry Timoshkov : netapi32: Implement DsGetDcNameW.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 510bea7692971aa31a0b2cca6b6aa9550610b3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=510bea7692971aa31a0b2cca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:42:42 2020 +0800 netapi32: Implement DsGetDcNameW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 2 +- dlls/netapi32/nbt.c | 3 + dlls/netapi32/netapi32.c | 149 +++++++++++++++++++++++++++++++++++++++++++--- include/dsgetdc.h | 7 +++ 4 files changed, 153 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 23da4838f9..13065578ef 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll IMPORTLIB = netapi32 -IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 +IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi C_SRCS = \ nbcmdqueue.c \ diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 4816630334..9c2a731a94 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1437,12 +1437,15 @@ static const WCHAR Config_NetworkW[] = { 'S','o','f','t','w','a','r','e','\\', /* Initializes global variables and registers the NetBT transport */ void NetBTInit(void) { + WSADATA wsa_data; HKEY hKey; NetBIOSTransport transport; LONG ret; TRACE("\n"); + WSAStartup(MAKEWORD(2, 2), &wsa_data); + gEnableDNS = TRUE; gBCastQueries = BCAST_QUERIES; gBCastQueryTimeout = BCAST_QUERY_TIMEOUT; diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d6554aa676..f86e033c21 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -4,6 +4,7 @@ * Copyright 2005,2006 Paul Vriens * Copyright 2006 Robert Reif * Copyright 2013 Hans Leidekker for CodeWeavers + * Copyright 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,9 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winsock2.h" +#include "ws2ipdef.h" +#include "windns.h" #include "lm.h" #include "lmaccess.h" #include "atsvc.h" @@ -56,9 +60,12 @@ #include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static char *strdup_unixcp( const WCHAR *str ) { char *ret; @@ -3033,14 +3040,142 @@ NET_API_STATUS WINAPI I_BrowserQueryEmulatedDomains( return ERROR_NOT_SUPPORTED; } -DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName, - GUID* DomainGuid, LPCWSTR SiteName, ULONG Flags, - PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo) +#define NS_MAXDNAME 1025 + +static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) { - FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_w(ComputerName), - debugstr_w(AvoidDCName), debugstr_guid(DomainGuid), - debugstr_w(SiteName), Flags, DomainControllerInfo); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR pfx[] = {'_','l','d','a','p','.','_','t','c','p','.','d','c','.','_','m','s','d','c','s','.',0}; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + + lstrcpyW(name, pfx); + lstrcatW(name, domain); + + ret = DnsQuery_W(name, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), ret); + if (ret == ERROR_SUCCESS) + { + TRACE("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + lstrcpynW(dc, rec->Data.Srv.pNameTarget, NS_MAXDNAME); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + ret = DnsQuery_W(dc, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + if (ret == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = IP6_ADDRESS_STRING_LENGTH; + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); + if (!ret) + TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + + DnsRecordListFree(rec, DnsFreeRecordList); + + return ret; + } + + /* IPv6 */ + ret = DnsQuery_W(dc, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + if (ret == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = IP6_ADDRESS_STRING_LENGTH; + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); + if (!ret) + TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + } + + return ret; +} + +DWORD WINAPI DsGetDcNameW(LPCWSTR computer, LPCWSTR domain, GUID *domain_guid, + LPCWSTR site, ULONG flags, PDOMAIN_CONTROLLER_INFOW *dc_info) +{ + static const WCHAR pfxW[] = {'\\','\\'}; + static const WCHAR default_site_nameW[] = {'D','e','f','a','u','l','t','-','F','i','r','s','t','-','S','i','t','e','-','N','a','m','e',0}; + NTSTATUS status; + POLICY_DNS_DOMAIN_INFO *dns_domain_info = NULL; + DOMAIN_CONTROLLER_INFOW *info; + WCHAR dc[NS_MAXDNAME], ip[IP6_ADDRESS_STRING_LENGTH]; + DWORD size; + + FIXME("(%s, %s, %s, %s, %08x, %p): semi-stub\n", debugstr_w(computer), + debugstr_w(domain), debugstr_guid(domain_guid), debugstr_w(site), flags, dc_info); + + if (!dc_info) return ERROR_INVALID_PARAMETER; + + if (!domain) + { + LSA_OBJECT_ATTRIBUTES attrs; + LSA_HANDLE lsa; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + status = LsaOpenPolicy(NULL, &attrs, POLICY_VIEW_LOCAL_INFORMATION, &lsa); + if (status) + return LsaNtStatusToWinError(status); + + status = LsaQueryInformationPolicy(lsa, PolicyDnsDomainInformation, (void **)&dns_domain_info); + LsaClose(lsa); + if (status) + return LsaNtStatusToWinError(status); + + domain = dns_domain_info->DnsDomainName.Buffer; + } + + status = get_dc_info(domain, dc, ip); + if (status) return status; + + size = sizeof(DOMAIN_CONTROLLER_INFOW) + lstrlenW(domain) * sizeof(WCHAR) + + sizeof(pfxW) * 2 + (lstrlenW(dc) + 1 + lstrlenW(ip) + 1) * sizeof(WCHAR) + + lstrlenW(domain) * sizeof(WCHAR) /* assume forest == domain */ + + sizeof(default_site_nameW) * 2; + status = NetApiBufferAllocate(size, (void **)&info); + if (status != NERR_Success) + { + LsaFreeMemory(dns_domain_info); + return ERROR_NOT_ENOUGH_MEMORY; + } + + info->DomainControllerName = (WCHAR *)(info + 1); + memcpy(info->DomainControllerName, pfxW, sizeof(pfxW)); + lstrcpyW(info->DomainControllerName + 2, dc); + info->DomainControllerAddress = (WCHAR *)((char *)info->DomainControllerName + (strlenW(info->DomainControllerName) + 1) * sizeof(WCHAR)); + memcpy(info->DomainControllerAddress, pfxW, sizeof(pfxW)); + lstrcpyW(info->DomainControllerAddress + 2, ip); + info->DomainControllerAddressType = DS_INET_ADDRESS; + info->DomainGuid = dns_domain_info ? dns_domain_info->DomainGuid : GUID_NULL /* FIXME */; + info->DomainName = (WCHAR *)((char *)info->DomainControllerAddress + (strlenW(info->DomainControllerAddress) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DomainName, domain); + info->DnsForestName = (WCHAR *)((char *)info->DomainName + (lstrlenW(info->DomainName) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DnsForestName, domain); + info->DcSiteName = (WCHAR *)((char *)info->DnsForestName + (lstrlenW(info->DnsForestName) + 1) * sizeof(WCHAR)); + lstrcpyW(info->DcSiteName, default_site_nameW); + info->ClientSiteName = (WCHAR *)((char *)info->DcSiteName + sizeof(default_site_nameW)); + lstrcpyW(info->ClientSiteName, default_site_nameW); + info->Flags = DS_DNS_DOMAIN_FLAG | DS_DNS_FOREST_FLAG; + + LsaFreeMemory(dns_domain_info); + + *dc_info = info; + + return ERROR_SUCCESS; } DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, diff --git a/include/dsgetdc.h b/include/dsgetdc.h index c53fcc299a..856912212f 100644 --- a/include/dsgetdc.h +++ b/include/dsgetdc.h @@ -23,6 +23,13 @@ extern "C" { #endif +#define DS_INET_ADDRESS 1 +#define DS_NETBIOS_ADDRESS 2 + +#define DS_DNS_CONTROLLER_FLAG 0x20000000 +#define DS_DNS_DOMAIN_FLAG 0x40000000 +#define DS_DNS_FOREST_FLAG 0x80000000 + #define DS_FORCE_REDISCOVERY 0x00000001 #define DS_DIRECTORY_SERVICE_REQUIRED 0x00000010 #define DS_DIRECTORY_SERVICE_PREFERRED 0x00000020

1 0

Dmitry Timoshkov : adsldp: Implement IADsOpenDSObject::OpenDSObject.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: af92668b23b41652ae5d62ff152f0a1301c09363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af92668b23b41652ae5d62ff… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:42:48 2020 +0800 adsldp: Implement IADsOpenDSObject::OpenDSObject. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/adsldp/tests/ldap.c | 2 - 3 files changed, 171 insertions(+), 6 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index cfa84c3fd0..e9c87e68f1 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,5 +1,6 @@ MODULE = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 +IMPORTS = ole32 oleaut32 secur32 uuid +DELAYIMPORTS = netapi32 wldap32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 5432a0abe2..536932c966 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,8 +28,13 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#include "adserr.h" #define SECURITY_WIN32 #include "security.h" +#include "dsgetdc.h" +#include "lmcons.h" +#include "lmapibuf.h" +#include "winldap.h" #include "wine/heap.h" #include "wine/debug.h" @@ -346,6 +351,10 @@ typedef struct IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; LONG ref; + LDAP *ld; + BSTR host; + BSTR object; + ULONG port; } LDAP_namespace; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -395,6 +404,9 @@ static ULONG WINAPI ldapns_Release(IADs *iface) if (!ref) { TRACE("destroying %p\n", iface); + if (ldap->ld) ldap_unbind(ldap->ld); + SysFreeString(ldap->host); + SysFreeString(ldap->object); heap_free(ldap); } @@ -601,12 +613,163 @@ static HRESULT WINAPI openobj_Invoke(IADsOpenDSObject *iface, DISPID dispid, REF return E_NOTIMPL; } +static HRESULT parse_path(WCHAR *path, BSTR *host, ULONG *port, BSTR *object) +{ + WCHAR *p, *p_host; + int host_len; + + if (host) *host = NULL; + if (port) *port = 0; + if (object) *object = NULL; + + if (wcsnicmp(path, L"LDAP:", 5) != 0) + return E_ADS_BAD_PATHNAME; + + p = path + 5; + if (!*p) return S_OK; + + if (*p++ != '/' || *p++ != '/' || !*p) + return E_ADS_BAD_PATHNAME; + + p_host = p; + host_len = 0; + while (*p && *p != '/') + { + if (*p == ':') + { + ULONG dummy; + if (!port) port = &dummy; + *port = wcstol(p + 1, &p, 10); + if (*p && *p != '/') return E_ADS_BAD_PATHNAME; + } + else + { + p++; + host_len++; + } + } + if (host_len == 0) return E_ADS_BAD_PATHNAME; + + if (host) + { + *host = SysAllocStringLen(p_host, host_len); + if (!*host) return E_OUTOFMEMORY; + } + + if (!*p) return S_OK; + + if (*p++ != '/' || !*p) + { + SysFreeString(*host); + return E_ADS_BAD_PATHNAME; + } + + if (object) + { + *object = SysAllocString(p); + if (!*object) + { + SysFreeString(*host); + return E_OUTOFMEMORY; + } + } + + return S_OK; +} + static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, BSTR user, BSTR password, LONG reserved, IDispatch **obj) { - FIXME("%p,%s,%s,%s,%d,%p: stub\n", iface, debugstr_w(path), debugstr_w(user), debugstr_w(password), - reserved, obj); - return E_NOTIMPL; + BSTR host, object; + ULONG port; + IADs *ads; + LDAP *ld = NULL; + HRESULT hr; + ULONG err; + + FIXME("%p,%s,%s,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), reserved, obj); + + hr = parse_path(path, &host, &port, &object); + if (hr != S_OK) return hr; + + TRACE("host %s, port %u, object %s\n", debugstr_w(host), port, debugstr_w(object)); + + if (host) + { + int version; + + if (!wcsicmp(host, L"rootDSE")) + { + DOMAIN_CONTROLLER_INFOW *dcinfo; + + if (object) + { + hr = E_ADS_BAD_PATHNAME; + goto fail; + } + + object = host; + + err = DsGetDcNameW(NULL, NULL, NULL, NULL, DS_RETURN_DNS_NAME, &dcinfo); + if (err != ERROR_SUCCESS) + { + hr = HRESULT_FROM_WIN32(LdapGetLastError()); + goto fail; + } + + host = SysAllocString(dcinfo->DomainName); + NetApiBufferFree(dcinfo); + + if (!host) + { + hr = E_OUTOFMEMORY; + goto fail; + } + } + + ld = ldap_initW(host, port); + if (!ld) + { + hr = HRESULT_FROM_WIN32(LdapGetLastError()); + goto fail; + } + + version = LDAP_VERSION3; + err = ldap_set_optionW(ld, LDAP_OPT_PROTOCOL_VERSION, &version); + if (err != LDAP_SUCCESS) + { + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + + err = ldap_connect(ld, NULL); + if (err != LDAP_SUCCESS) + { + hr = HRESULT_FROM_WIN32(err); + ldap_unbind(ld); + goto fail; + } + } + + hr = LDAPNamespace_create(&IID_IADs, (void **)&ads); + if (hr == S_OK) + { + LDAP_namespace *ldap = impl_from_IADs(ads); + ldap->ld = ld; + ldap->host = host; + ldap->port = port; + ldap->object = object; + hr = IADs_QueryInterface(ads, &IID_IDispatch, (void **)obj); + IADs_Release(ads); + return hr; + } + +fail: + SysFreeString(host); + SysFreeString(object); + + return hr; } static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = @@ -632,6 +795,9 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->ref = 1; + ldap->ld = NULL; + ldap->host = NULL; + ldap->object = NULL; hr = IADs_QueryInterface(&ldap->IADs_iface, riid, obj); IADs_Release(&ldap->IADs_iface); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index cc0b42c1c5..c5d97b55df 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -85,9 +85,7 @@ static void test_LDAP(void) path = SysAllocString(L"LDAP:"); hr = IADsOpenDSObject_OpenDSObject(ads_open, path, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); SysFreeString(path); -todo_wine ok(hr == S_OK, "got %#x\n", hr); -if (hr == S_OK) IDispatch_Release(disp); IUnknown_Release(unk);

1 0

Dmitry Timoshkov : adsldp: Implement IParseDisplayName::ParseDisplayName.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 631813bf1a8bf431c3f00c4e8363896631f1ce1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=631813bf1a8bf431c3f00c4e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 10 15:42:55 2020 +0800 adsldp: Implement IParseDisplayName::ParseDisplayName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 24 ++++++++++++++++++++++-- dlls/adsldp/tests/ldap.c | 3 +-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 536932c966..acebf717aa 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -101,8 +101,28 @@ static ULONG WINAPI ldap_Release(IParseDisplayName *iface) static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx *bc, LPOLESTR name, ULONG *eaten, IMoniker **mk) { - FIXME("%p,%p,%s,%p,%p: stub\n", iface, bc, debugstr_w(name), eaten, mk); - return E_NOTIMPL; + HRESULT hr; + IADsOpenDSObject *ads_open; + IDispatch *disp; + + TRACE("%p,%p,%s,%p,%p\n", iface, bc, debugstr_w(name), eaten, mk); + + hr = LDAPNamespace_create(&IID_IADsOpenDSObject, (void **)&ads_open); + if (hr != S_OK) return hr; + + hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + if (hr == S_OK) + { + hr = CreatePointerMoniker((IUnknown *)disp, mk); + if (hr == S_OK) + *eaten = wcslen(name); + + IDispatch_Release(disp); + } + + IADsOpenDSObject_Release(ads_open); + + return hr; } static const IParseDisplayNameVtbl LDAP_PARSE_vtbl = diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index c5d97b55df..0ecba26817 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -122,7 +122,6 @@ static void test_ParseDisplayName(void) count = 0xdeadbeef; hr = IParseDisplayName_ParseDisplayName(parse, bc, path, &count, &mk); -todo_wine ok(hr == test[i].hr || hr == test[i].hr_ads_open, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) { @@ -139,7 +138,7 @@ todo_wine count = 0xdeadbeef; hr = MkParseDisplayName(bc, test[i].path, &count, &mk); -todo_wine +todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) ok(hr == test[i].hr, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) {

1 0

Paul Gofman : ntdll: Add semi-stub for RtlGetNativeSystemInformation().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: c6b501acdcabe7d3ebcf5ce13729fd9f4d9176e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b501acdcabe7d3ebcf5ce1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 9 14:59:20 2020 +0300 ntdll: Add semi-stub for RtlGetNativeSystemInformation(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40334 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 20 ++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/info.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f88ded34c1..660d5faf54 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3076,6 +3076,26 @@ NTSTATUS WINAPI NtQuerySystemInformation( return ret; } + +/****************************************************************************** + * RtlGetNativeSystemInformation [NTDLL.@] + */ +NTSTATUS WINAPI /* DECLSPEC_HOTPATCH */ RtlGetNativeSystemInformation( + IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + OUT PVOID SystemInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + FIXME( "semi-stub, SystemInformationClass %#x, SystemInformation %p, Length %#x, ResultLength %p.\n", + SystemInformationClass, SystemInformation, Length, ResultLength ); + + /* RtlGetNativeSystemInformation function is the same as NtQuerySystemInformation on some Win7 + * versions but there are differences for earlier and newer versions, at least: + * - HighestUserAddress field for SystemBasicInformation; + * - Some information classes are not supported by RtlGetNativeSystemInformation. */ + return NtQuerySystemInformation( SystemInformationClass, SystemInformation, Length, ResultLength ); +} + /****************************************************************************** * NtQuerySystemInformationEx [NTDLL.@] * ZwQuerySystemInformationEx [NTDLL.@] diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f1f495837d..0ea72e3aef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -700,7 +700,7 @@ # Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators @ stdcall RtlGetLongestNtPathLength() -# @ stub RtlGetNativeSystemInformation +@ stdcall RtlGetNativeSystemInformation(long ptr long ptr) # @ stub RtlGetNextRange @ stdcall RtlGetNtGlobalFlags() @ stdcall RtlGetNtProductType(ptr) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 76de56810c..8dc8bad645 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -75,6 +76,7 @@ static BOOL InitFunctionPtrs(void) } NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(RtlGetNativeSystemInformation); NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); @@ -111,7 +113,7 @@ static void test_query_basic(void) { NTSTATUS status; ULONG ReturnLength; - SYSTEM_BASIC_INFORMATION sbi; + SYSTEM_BASIC_INFORMATION sbi, sbi2; /* This test also covers some basic parameter testing that should be the same for * every information class @@ -153,6 +155,38 @@ static void test_query_basic(void) /* Check if we have some return values */ trace("Number of Processors : %d\n", sbi.NumberOfProcessors); ok( sbi.NumberOfProcessors > 0, "Expected more than 0 processors, got %d\n", sbi.NumberOfProcessors); + + memset(&sbi2, 0, sizeof(sbi2)); + status = pRtlGetNativeSystemInformation(SystemBasicInformation, &sbi2, sizeof(sbi2), &ReturnLength); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x.\n", status); + ok( sizeof(sbi2) == ReturnLength, "Unexpected length %u.\n", ReturnLength); + + ok( sbi.unknown == sbi2.unknown, "Expected unknown %#x, got %#x.\n", sbi.unknown, sbi2.unknown); + ok( sbi.KeMaximumIncrement == sbi2.KeMaximumIncrement, "Expected KeMaximumIncrement %u, got %u.\n", + sbi.KeMaximumIncrement, sbi2.KeMaximumIncrement); + ok( sbi.PageSize == sbi2.PageSize, "Expected PageSize field %u, %u.\n", sbi.PageSize, sbi2.PageSize); + ok( sbi.MmNumberOfPhysicalPages == sbi2.MmNumberOfPhysicalPages, + "Expected MmNumberOfPhysicalPages %u, got %u.\n", + sbi.MmNumberOfPhysicalPages, sbi2.MmNumberOfPhysicalPages); + ok( sbi.MmLowestPhysicalPage == sbi2.MmLowestPhysicalPage, "Expected MmLowestPhysicalPage %u, got %u.\n", + sbi.MmLowestPhysicalPage, sbi2.MmLowestPhysicalPage); + ok( sbi.MmHighestPhysicalPage == sbi2.MmHighestPhysicalPage, "Expected MmHighestPhysicalPage %u, got %u.\n", + sbi.MmHighestPhysicalPage, sbi2.MmHighestPhysicalPage); + /* Higher 32 bits of AllocationGranularity is sometimes garbage on Windows. */ + ok( (ULONG)sbi.AllocationGranularity == (ULONG)sbi2.AllocationGranularity, + "Expected AllocationGranularity %#lx, got %#lx.\n", + sbi.AllocationGranularity, sbi2.AllocationGranularity); + ok( sbi.LowestUserAddress == sbi2.LowestUserAddress, "Expected LowestUserAddress %p, got %p.\n", + (void *)sbi.LowestUserAddress, (void *)sbi2.LowestUserAddress); + /* Not testing HighestUserAddress. The field is different from NtQuerySystemInformation result + * on 32 bit Windows (some of Win8 versions are the exception). Whenever it is different, + * NtQuerySystemInformation returns user space limit (0x0x7ffeffff) and RtlGetNativeSystemInformation + * returns address space limit (0xfffeffff). */ + ok( sbi.ActiveProcessorsAffinityMask == sbi2.ActiveProcessorsAffinityMask, + "Expected ActiveProcessorsAffinityMask %#lx, got %#lx.\n", + sbi.ActiveProcessorsAffinityMask, sbi2.ActiveProcessorsAffinityMask); + ok( sbi.NumberOfProcessors == sbi2.NumberOfProcessors, "Expected NumberOfProcessors %u, got %u.\n", + sbi.NumberOfProcessors, sbi2.NumberOfProcessors); } static void test_query_cpu(void)

1 0

Piotr Caban : winemac: Handle dummy_surface in get_mac_surface.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: da1e666f57c61f68c77debd6b9ba9aebe0545b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da1e666f57c61f68c77debd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 11 14:45:54 2020 -0500 winemac: Handle dummy_surface in get_mac_surface. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/surface.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 9850c92aaa..85ff56c957 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -70,10 +70,7 @@ struct macdrv_window_surface BITMAPINFO info; /* variable size, must be last */ }; -static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface) -{ - return (struct macdrv_window_surface *)surface; -} +static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface); /*********************************************************************** * update_blit_data @@ -227,6 +224,12 @@ static const struct window_surface_funcs macdrv_surface_funcs = macdrv_surface_destroy, }; +static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface) +{ + if (!surface || surface->funcs != &macdrv_surface_funcs) return NULL; + return (struct macdrv_window_surface *)surface; +} + /*********************************************************************** * create_surface */ @@ -311,7 +314,7 @@ failed: void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) { struct macdrv_window_surface *surface = get_mac_surface(window_surface); - surface->use_alpha = use_alpha; + if (surface) surface->use_alpha = use_alpha; } /*********************************************************************** @@ -424,6 +427,7 @@ void surface_clip_to_visible_rect(struct window_surface *window_surface, const R { struct macdrv_window_surface *surface = get_mac_surface(window_surface); + if (!surface) return; window_surface->funcs->lock(window_surface); if (surface->drawn)

1 0

Ken Thomases : winemac: Only call -[NSOpenGLContext update] from the main thread.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 3deae92a6fe1c2634410fb34a552b7f39fd1adb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3deae92a6fe1c2634410fb34… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 11 14:55:53 2020 -0500 winemac: Only call -[NSOpenGLContext update] from the main thread. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_opengl.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index e60b0b388b..80a766cbda 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -359,8 +359,9 @@ void macdrv_update_opengl_context(macdrv_opengl_context c) [context clearDrawableLeavingSurfaceOnScreen]; context.view = view; } - else + else OnMainThread(^{ [context update]; + }); [context resetSurfaceIfBackingSizeChanged]; } }

1 0

Jefferson Carpenter : services: Initialize OVERLAPPED Offset and OffsetHigh.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 4dfd5f22f4032efdc283adf861d82e43c3b08d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dfd5f22f4032efdc283adf8… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Wed Mar 11 21:06:56 2020 +0000 services: Initialize OVERLAPPED Offset and OffsetHigh. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48735 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index a657492a5f..0f2c1440c2 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -19,6 +19,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define NONAMELESSSTRUCT #define NONAMELESSUNION #include <stdarg.h> @@ -1133,6 +1134,8 @@ static BOOL process_send_command(struct process_entry *process, const void *data DWORD count, ret; BOOL r; + overlapped.u.s.Offset = 0; + overlapped.u.s.OffsetHigh = 0; overlapped.hEvent = process->overlapped_event; r = WriteFile(process->control_pipe, data, size, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING)

1 0

Gabriel Ivăncescu : jscript: Don't lookup global members for bytecodes with a named item.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5b28c43dd4c0a21fd65752b7bbf39f55e10be8dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b28c43dd4c0a21fd65752b7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 10 18:48:42 2020 +0100 jscript: Don't lookup global members for bytecodes with a named item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 4 +++- dlls/jscript/tests/jscript.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5b9689505c..5a627ea2be 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3019,6 +3019,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + BOOL lookup_globals = (flags & EXEC_GLOBAL) && !bytecode->named_item; + for(i=0; i < function->var_cnt; i++) { TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); if(function->variables[i].func_id != -1) { @@ -3030,7 +3032,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); - }else if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { + }else if(!lookup_globals || !lookup_global_members(ctx, function->variables[i].name, NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 5de933e935..ed56f8ce11 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1301,7 +1301,6 @@ static void test_named_items(void) SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); - SET_EXPECT(GetIDsOfNames); hr = IActiveScriptParse_ParseScriptText(parse, L"" "var testVar = 42;\n" "testVar_global = 5;\n" @@ -1310,7 +1309,6 @@ static void test_named_items(void) ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); - todo_wine CHECK_NOT_CALLED(GetIDsOfNames); SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript);

1 0

Akihiro Sagawa : dsound/tests: Add a test whether the buffer is a valid global memory.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: e28638afccdfda3ee44121405d9097d201b61445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e28638afccdfda3ee4412140… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:44 2020 +0900 dsound/tests: Add a test whether the buffer is a valid global memory. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7fdac9144e..0e779618a2 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1157,6 +1157,13 @@ static HRESULT test_duplicate(LPGUID lpGuid) ok(rc==DS_OK && buf!=NULL, "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); if (rc==DS_OK && buf!=NULL) { + if (sizeof(void*)==4) { /* crashes on 64-bit */ + /* broken apps like Asuka 120% Return BURNING Fest, + pass the pointer to GlobalHandle. */ + HGLOBAL hmem = GlobalHandle(buf); + todo_wine ok(!hmem,"GlobalHandle should return NULL " + "for buffer %p, got %p\n",buf,hmem); + } ZeroMemory(buf,bufsize); rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, NULL,0);

1 0

Akihiro Sagawa : dsound: Make GlobalHandle() for the sound buffer failed.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 70aeb7e4b0eb8efefd24c26d1c1442ea6c25d082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70aeb7e4b0eb8efefd24c26d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:46 2020 +0900 dsound: Make GlobalHandle() for the sound buffer failed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 15 +++++---------- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 8d4a3b92fa..ea428c0816 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -999,6 +999,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + size_t bufsize; TRACE("(%p,%p,%p)\n", device, dsbd, buffer); @@ -1054,19 +1055,15 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); /* Allocate an empty buffer */ - dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); + bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + dsb->buffer = HeapAlloc(GetProcessHeap(),0,bufsize + dsb->buflen); if (!dsb->buffer) { IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (!dsb->buffer->memory) { - WARN("out of memory\n"); - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - return DSERR_OUTOFMEMORY; - } + dsb->buffer->memory = (BYTE *)dsb->buffer + bufsize; dsb->buffer->ref = 1; dsb->buffer->lockedbytes = 0; @@ -1136,10 +1133,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->buffer->ref--; list_remove(&This->entry); - if (This->buffer->ref == 0) { - HeapFree(GetProcessHeap(), 0, This->buffer->memory); + if (This->buffer->ref == 0) HeapFree(GetProcessHeap(), 0, This->buffer); - } HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0e779618a2..2bf87eb857 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1161,7 +1161,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* broken apps like Asuka 120% Return BURNING Fest, pass the pointer to GlobalHandle. */ HGLOBAL hmem = GlobalHandle(buf); - todo_wine ok(!hmem,"GlobalHandle should return NULL " + ok(!hmem,"GlobalHandle should return NULL " "for buffer %p, got %p\n",buf,hmem); } ZeroMemory(buf,bufsize);

1 0