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

Dmitry Timoshkov : advapi32: Use GetWindowsAccountDomainSid() to retrieve the domain SID.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: a3bcaca48dd694a2c9d610730df0326780ca27df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3bcaca48dd694a2c9d61073… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:44:17 2018 +0800 advapi32: Use GetWindowsAccountDomainSid() to retrieve the domain SID. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 23 ++++++++++++++++------- include/winbase.h | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 6f51f9d..f2fcc07 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -763,16 +763,24 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( break; case PolicyDnsDomainInformation: /* 12 (0xc) */ { - struct di + struct { POLICY_DNS_DOMAIN_INFO info; - SID sid; + struct + { + SID sid; + DWORD sid_subauthority[3]; + } domain_sid; WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; - }; + } *xdi; + struct + { + SID sid; + DWORD sid_subauthority[3]; + } computer_sid; DWORD dwSize; - struct di *xdi; xdi = heap_alloc_zero(sizeof(*xdi)); if (!xdi) return STATUS_NO_MEMORY; @@ -788,10 +796,11 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( /* FIXME: also set DnsDomainName and DnsForestName */ - if (ADVAPI_GetComputerSid(&xdi->sid)) + dwSize = sizeof(xdi->domain_sid); + if (ADVAPI_GetComputerSid(&computer_sid.sid) && GetWindowsAccountDomainSid(&computer_sid.sid, &xdi->domain_sid.sid, &dwSize)) { - xdi->info.Sid = &xdi->sid; - TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); + xdi->info.Sid = &xdi->domain_sid.sid; + TRACE("setting SID to %s\n", debugstr_sid(&xdi->domain_sid.sid)); } *Buffer = xdi; diff --git a/include/winbase.h b/include/winbase.h index e47c87a..9c7908a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2245,6 +2245,7 @@ WINBASEAPI BOOL WINAPI GetVolumePathNameW(LPCWSTR,LPWSTR,DWORD); WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR,LPSTR,DWORD,PDWORD); WINBASEAPI BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD); #define GetVolumePathNamesForVolumeName WINELIB_NAME_AW(GetVolumePathNamesForVolumeName) +WINADVAPI BOOL WINAPI GetWindowsAccountDomainSid(PSID,PSID,DWORD*); WINBASEAPI UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT); WINBASEAPI UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT); #define GetWindowsDirectory WINELIB_NAME_AW(GetWindowsDirectory)

1 0

Dmitry Timoshkov : advapi32: Return correct short domain name.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: eb077e9faccb736bb5aac2b13bf49f1f434e8fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb077e9faccb736bb5aac2b1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:45:00 2018 +0800 advapi32: Return correct short domain name. Also remove suffix and uppercase the returned name as Windows does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index f2fcc07..ca35768 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -786,11 +786,16 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( if (!xdi) return STATUS_NO_MEMORY; dwSize = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameW(xdi->domain_name, &dwSize)) + if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize)) { + WCHAR *dot; + + dot = strrchrW(xdi->domain_name, '.'); + if (dot) *dot = 0; + struprW(xdi->domain_name); xdi->info.Name.Buffer = xdi->domain_name; - xdi->info.Name.Length = dwSize * sizeof(WCHAR); - xdi->info.Name.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + xdi->info.Name.Length = strlenW(xdi->domain_name) * sizeof(WCHAR); + xdi->info.Name.MaximumLength = xdi->info.Name.Length + sizeof(WCHAR); TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); }

1 0

Dmitry Timoshkov : advapi32: Also initialize DnsDomainName and DnsForestName in LsaQueryInformationPolicy.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 411ccfb92158ec0813fc808d17ec3d26cedf2dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=411ccfb92158ec0813fc808d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:45:13 2018 +0800 advapi32: Also initialize DnsDomainName and DnsForestName in LsaQueryInformationPolicy. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index ca35768..95bfe09 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -799,7 +799,19 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); } - /* FIXME: also set DnsDomainName and DnsForestName */ + dwSize = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameExW(ComputerNameDnsDomain, xdi->dns_domain_name, &dwSize)) + { + xdi->info.DnsDomainName.Buffer = xdi->dns_domain_name; + xdi->info.DnsDomainName.Length = dwSize * sizeof(WCHAR); + xdi->info.DnsDomainName.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + TRACE("setting DnsDomainName to %s\n", debugstr_w(xdi->info.DnsDomainName.Buffer)); + + xdi->info.DnsForestName.Buffer = xdi->dns_domain_name; + xdi->info.DnsForestName.Length = dwSize * sizeof(WCHAR); + xdi->info.DnsForestName.MaximumLength = (dwSize + 1) * sizeof(WCHAR); + TRACE("setting DnsForestName to %s\n", debugstr_w(xdi->info.DnsForestName.Buffer)); + } dwSize = sizeof(xdi->domain_sid); if (ADVAPI_GetComputerSid(&computer_sid.sid) && GetWindowsAccountDomainSid(&computer_sid.sid, &xdi->domain_sid.sid, &dwSize))

1 0

Dmitry Timoshkov : secur32: Add support for NameFullyQualifiedDN to GetComputerObjectName.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 0197f54a8e83c28ae58760f5b849b1ae17be6e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0197f54a8e83c28ae58760f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 2 18:46:13 2018 +0800 secur32: Add support for NameFullyQualifiedDN to GetComputerObjectName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/sysinfo.c | 11 +++++----- dlls/secur32/secur32.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 09f2484..db982aa 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -165,14 +165,15 @@ static void test_sysinfo(void) if (hr != S_OK) { skip("Computer is not part of a domain, skipping the tests\n"); - IADsADSystemInfo_Release(sysinfo); - return; + goto done; } SysFreeString(bstr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); - ok(hr == S_OK, "got %#x\n", hr); - if (hr == S_OK) SysFreeString(bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr != S_OK) goto done; + SysFreeString(bstr); hr = IADsADSystemInfo_get_SiteName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); @@ -201,7 +202,7 @@ static void test_sysinfo(void) hr = IADsADSystemInfo_GetAnyDCName(sysinfo, &bstr); ok(hr == S_OK, "got %#x\n", hr); if (hr == S_OK) SysFreeString(bstr); - +done: IADsADSystemInfo_Release(sysinfo); } diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 889883c..bece2b7 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1021,6 +1021,56 @@ BOOLEAN WINAPI GetComputerObjectNameW( } break; case NameFullyQualifiedDN: + { + static const WCHAR cnW[] = { 'C','N','=',0 }; + static const WCHAR ComputersW[] = { 'C','N','=','C','o','m','p','u','t','e','r','s',0 }; + static const WCHAR dcW[] = { 'D','C','=',0 }; + static const WCHAR commaW[] = { ',',0 }; + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len, size; + WCHAR *suffix; + + size = sizeof(name) / sizeof(name[0]); + if (!GetComputerNameW(name, &size)) + { + status = FALSE; + break; + } + + len = strlenW(cnW) + size + 1 + strlenW(ComputersW) + 1 + strlenW(dcW); + suffix = strrchrW(domainInfo->DnsDomainName.Buffer, '.'); + if (suffix) + { + *suffix++ = 0; + len += 1 + strlenW(dcW) + strlenW(suffix); + } + len += strlenW(domainInfo->DnsDomainName.Buffer); + + if (lpNameBuffer && *nSize > len) + { + lstrcpyW(lpNameBuffer, cnW); + lstrcatW(lpNameBuffer, name); + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, ComputersW); + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, domainInfo->DnsDomainName.Buffer); + if (suffix) + { + lstrcatW(lpNameBuffer, commaW); + lstrcatW(lpNameBuffer, dcW); + lstrcatW(lpNameBuffer, suffix); + } + status = TRUE; + } + else /* just requesting length required */ + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + status = FALSE; + } + *nSize = len + 1; + break; + } case NameDisplay: case NameUniqueId: case NameCanonical:

1 0

Michael Müller : wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: fe6127dc679606b70ad7a6fedf9b021d61038086 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe6127dc679606b70ad7a6fe… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 2 11:54:57 2018 +0100 wbemprox: Add FreePhysicalMemory to Win32_OperatingSystem. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9dfc939..752325e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -231,6 +231,8 @@ static const WCHAR prop_flavorW[] = {'F','l','a','v','o','r',0}; static const WCHAR prop_freespaceW[] = {'F','r','e','e','S','p','a','c','e',0}; +static const WCHAR prop_freephysicalmemoryW[] = + {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_horizontalresolutionW[] = @@ -559,6 +561,7 @@ static const struct column col_os[] = { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_freephysicalmemoryW, CIM_UINT64 }, { prop_installdateW, CIM_DATETIME }, { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, @@ -972,6 +975,7 @@ struct record_operatingsystem const WCHAR *codeset; const WCHAR *countrycode; const WCHAR *csdversion; + UINT64 freephysicalmemory; const WCHAR *installdate; const WCHAR *lastbootuptime; const WCHAR *localdatetime; @@ -1362,6 +1366,15 @@ static UINT64 get_total_physical_memory(void) return status.ullTotalPhys; } +static UINT64 get_available_physical_memory(void) +{ + MEMORYSTATUSEX status; + + status.dwLength = sizeof(status); + if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024; + return status.ullAvailPhys; +} + static WCHAR *get_computername(void) { WCHAR *ret; @@ -2941,6 +2954,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); rec->csdversion = ver.szCSDVersion[0] ? heap_strdupW( ver.szCSDVersion ) : NULL; + rec->freephysicalmemory = get_available_physical_memory() / 1024; rec->installdate = os_installdateW; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime();

1 0

Hans Leidekker : wbemprox/tests: Add a test for Win32_OperatingSystem.FreePhysicalMemory.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 28bbe41138d21598aa017bd24f586f8abefc6961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bbe41138d21598aa017bd2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 2 11:54:58 2018 +0100 wbemprox/tests: Add a test for Win32_OperatingSystem.FreePhysicalMemory. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7028d7b..93d07ea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1090,7 +1090,7 @@ static void test_SystemSecurity( IWbemServices *services ) SysFreeString( class ); } -static void test_OperatingSystem( IWbemServices *services ) +static void test_Win32_OperatingSystem( IWbemServices *services ) { static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', @@ -1098,6 +1098,7 @@ static void test_OperatingSystem( IWbemServices *services ) static const WCHAR buildnumberW[] = {'B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; + static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; @@ -1154,6 +1155,15 @@ static void test_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, freephysicalmemoryW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get free physical memory size %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "freephysicalmemory %s\n", wine_dbgstr_w(V_BSTR(&val)) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get name %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); @@ -1239,7 +1249,7 @@ static void test_OperatingSystem( IWbemServices *services ) SysFreeString( wql ); } -static void test_ComputerSystemProduct( IWbemServices *services ) +static void test_Win32_ComputerSystemProduct( IWbemServices *services ) { static const WCHAR identifyingnumberW[] = {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; @@ -1333,7 +1343,7 @@ static void test_ComputerSystemProduct( IWbemServices *services ) SysFreeString( wql ); } -static void test_PhysicalMemory( IWbemServices *services ) +static void test_Win32_PhysicalMemory( IWbemServices *services ) { static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; @@ -1382,7 +1392,7 @@ static void test_PhysicalMemory( IWbemServices *services ) SysFreeString( wql ); } -static void test_IP4RouteTable( IWbemServices *services ) +static void test_Win32_IP4RouteTable( IWbemServices *services ) { static const WCHAR destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; static const WCHAR interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; @@ -1668,10 +1678,10 @@ START_TEST(query) test_query_async( services ); test_GetNames( services ); test_SystemSecurity( services ); - test_OperatingSystem( services ); - test_ComputerSystemProduct( services ); - test_PhysicalMemory( services ); - test_IP4RouteTable( services ); + test_Win32_OperatingSystem( services ); + test_Win32_ComputerSystemProduct( services ); + test_Win32_PhysicalMemory( services ); + test_Win32_IP4RouteTable( services ); test_Win32_Processor( services ); test_Win32_VideoController( services );

1 0

Michael Müller : wbemprox: Provide DeviceID, Location and PortName for printers.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: be9758f08f974ac1176ffc8098d0da771a0b1a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be9758f08f974ac1176ffc80… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Mar 2 11:54:59 2018 +0100 wbemprox: Provide DeviceID, Location and PortName for printers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 752325e..33a951b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -269,6 +269,8 @@ static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; +static const WCHAR prop_locationW[] = + {'L','o','c','a','t','i','o','n',0}; static const WCHAR prop_lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; static const WCHAR prop_macaddressW[] = @@ -315,6 +317,8 @@ static const WCHAR prop_pixelsperxlogicalinchW[] = {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0}; static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; +static const WCHAR prop_portnameW[] = + {'P','o','r','t','N','a','m','e',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_primaryW[] = @@ -604,11 +608,14 @@ static const struct column col_physicalmemory[] = static const struct column col_printer[] = { { prop_attributesW, CIM_UINT32 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_drivernameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_horizontalresolutionW, CIM_UINT32 }, { prop_localW, CIM_BOOLEAN }, + { prop_locationW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_networkW, CIM_BOOLEAN } + { prop_networkW, CIM_BOOLEAN }, + { prop_portnameW, CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_process[] = { @@ -1018,11 +1025,14 @@ struct record_physicalmemory struct record_printer { UINT32 attributes; + const WCHAR *device_id; const WCHAR *drivername; UINT32 horizontalresolution; int local; + const WCHAR *location; const WCHAR *name; int network; + const WCHAR *portname; }; struct record_process { @@ -2505,10 +2515,12 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e static enum fill_status fill_printer( struct table *table, const struct expr *cond ) { + static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0}; struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; DWORD i, offset = 0, count = 0, size = 0, num_rows = 0; + WCHAR id[20]; EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; @@ -2529,11 +2541,15 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co { rec = (struct record_printer *)(table->data + offset); rec->attributes = info[i].Attributes; + sprintfW( id, fmtW, i ); + rec->device_id = heap_strdupW( id ); rec->drivername = heap_strdupW( info[i].pDriverName ); rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; rec->local = -1; + rec->location = heap_strdupW( info[i].pLocation ); rec->name = heap_strdupW( info[i].pPrinterName ); rec->network = 0; + rec->portname = heap_strdupW( info[i].pPortName ); if (!match_row( table, i, cond, &status )) { free_row_values( table, i );

1 0

Hans Leidekker : wbemprox/tests: Add tests for Win32_Printer.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 151f3fc2f2b44999f7fbe171ab227f5da509a30f URL: https://source.winehq.org/git/wine.git/?a=commit;h=151f3fc2f2b44999f7fbe171… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 2 11:55:00 2018 +0100 wbemprox/tests: Add tests for Win32_Printer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 93d07ea..d95fdd9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1641,6 +1641,71 @@ static void test_Win32_VideoController( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Printer( IWbemServices *services ) +{ + static const WCHAR deviceidW[] = + {'D','e','v','i','c','e','I','d',0}; + static const WCHAR locationW[] = + {'L','o','c','a','t','i','o','n',0}; + static const WCHAR portnameW[] = + {'P','o','r','t','N','a','m','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','i','n','t','e','r',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_Printer not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, deviceidW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "deviceid %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, locationW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "location %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, portnameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "portname %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); + } + + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1684,6 +1749,7 @@ START_TEST(query) test_Win32_IP4RouteTable( services ); test_Win32_Processor( services ); test_Win32_VideoController( services ); + test_Win32_Printer( services ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Nikolay Sivov : kernelbase: Implement PathCchAddBackslash()/ PathCchAddBackslashEx().
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 203c5a8f7aa890656929436fa8a203797b0af5a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203c5a8f7aa890656929436f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 2 14:14:54 2018 +0300 kernelbase: Implement PathCchAddBackslash()/PathCchAddBackslashEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-path-l1-1-0.spec | 4 +- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/path.c | 67 ++++++++++ dlls/kernelbase/tests/path.c | 136 +++++++++++++++++++++ include/pathcch.h | 2 + tools/make_specfiles | 1 + 7 files changed, 212 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=203c5a8f7aa890656929…

1 0

Roderick Colenbrander : winevulkan: Load instance functions.
by Alexandre Julliard 02 Mar '18

02 Mar '18

Module: wine Branch: master Commit: 4ab041c370f342f293841b7898c01ba77858aa5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ab041c370f342f293841b78… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 1 22:13:35 2018 -0800 winevulkan: Load instance functions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 32 ++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan.c | 9 +++++++++ dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.h | 29 +++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 6 ++++-- 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6c6cf2e..5657b70 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1035,17 +1035,41 @@ class VkGenerator(object): # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): + if not vk_func.is_required() or vk_func.is_global_func() or vk_func.needs_thunk(): + continue + + f.write("{0};\n".format(vk_func.prototype("WINAPI", prefix="wine_", postfix="DECLSPEC_HIDDEN"))) + f.write("\n") + + f.write("/* For use by vkInstance and children */\n") + f.write("struct vulkan_instance_funcs\n{\n") + for vk_func in self.registry.instance_funcs: if not vk_func.is_required(): continue - if vk_func.is_global_func(): + if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + LOGGER.debug("skipping {0} in vulkan_instance_funcs".format(vk_func.name)) continue - if vk_func.needs_thunk(): + f.write(" {0};\n".format(vk_func.pfn(conv=False))) + f.write("};\n\n") + + f.write("#define ALL_VK_INSTANCE_FUNCS() \\\n") + first = True + for vk_func in self.registry.instance_funcs: + if not vk_func.is_required(): continue - f.write("{0};\n".format(vk_func.prototype("WINAPI", prefix="wine_", postfix="DECLSPEC_HIDDEN"))) - f.write("\n") + if not vk_func.needs_dispatch() or vk_func.is_driver_func(): + LOGGER.debug("skipping {0} in ALL_VK_INSTANCE_FUNCS".format(vk_func.name)) + continue + + if first: + f.write(" USE_VK_FUNC({0})".format(vk_func.name)) + first = False + else: + f.write("\\\n USE_VK_FUNC({0})".format(vk_func.name)) + f.write("\n\n") f.write("#endif /* __WINE_VULKAN_THUNKS_H */\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 85836bd..0f48d97 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -99,6 +99,15 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ goto err; } + /* Load all instance functions we are aware of. Note the loader takes care + * of any filtering for extensions which were not requested, but which the + * ICD may support. + */ +#define USE_VK_FUNC(name) \ + object->funcs.p_##name = (void*)vk_funcs->p_vkGetInstanceProcAddr(object->instance, #name); + ALL_VK_INSTANCE_FUNCS() +#undef USE_VK_FUNC + *instance = object; TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); return VK_SUCCESS; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 5688137..16aa0ce 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -51,6 +51,7 @@ struct wine_vk_base struct VkInstance_T { struct wine_vk_base base; + struct vulkan_instance_funcs funcs; VkInstance instance; /* native instance */ }; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 969bf12..087fa17 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -9,4 +9,33 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; /* Functions for which we have custom implementations outside of the thunks. */ void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +/* For use by vkInstance and children */ +struct vulkan_instance_funcs +{ + VkResult (*p_vkCreateDevice)(VkPhysicalDevice, const VkDeviceCreateInfo *, const VkAllocationCallbacks *, VkDevice *); + VkResult (*p_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice, const char *, uint32_t *, VkExtensionProperties *); + VkResult (*p_vkEnumerateDeviceLayerProperties)(VkPhysicalDevice, uint32_t *, VkLayerProperties *); + VkResult (*p_vkEnumeratePhysicalDevices)(VkInstance, uint32_t *, VkPhysicalDevice *); + void (*p_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures *); + void (*p_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevice, VkFormat, VkFormatProperties *); + VkResult (*p_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkImageTiling, VkImageUsageFlags, VkImageCreateFlags, VkImageFormatProperties *); + void (*p_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *); + void (*p_vkGetPhysicalDeviceProperties)(VkPhysicalDevice, VkPhysicalDeviceProperties *); + void (*p_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice, uint32_t *, VkQueueFamilyProperties *); + void (*p_vkGetPhysicalDeviceSparseImageFormatProperties)(VkPhysicalDevice, VkFormat, VkImageType, VkSampleCountFlagBits, VkImageUsageFlags, VkImageTiling, uint32_t *, VkSparseImageFormatProperties *); +}; + +#define ALL_VK_INSTANCE_FUNCS() \ + USE_VK_FUNC(vkCreateDevice)\ + USE_VK_FUNC(vkEnumerateDeviceExtensionProperties)\ + USE_VK_FUNC(vkEnumerateDeviceLayerProperties)\ + USE_VK_FUNC(vkEnumeratePhysicalDevices)\ + USE_VK_FUNC(vkGetPhysicalDeviceFeatures)\ + USE_VK_FUNC(vkGetPhysicalDeviceFormatProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceImageFormatProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceMemoryProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceQueueFamilyProperties)\ + USE_VK_FUNC(vkGetPhysicalDeviceSparseImageFormatProperties) + #endif /* __WINE_VULKAN_THUNKS_H */ diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index adc3da3..c3fed9e 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); +static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); static BOOL wine_vk_init(void) { @@ -50,6 +51,7 @@ static BOOL wine_vk_init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkDestroyInstance) +LOAD_FUNCPTR(vkGetInstanceProcAddr) #undef LOAD_FUNCPTR return TRUE; @@ -116,8 +118,8 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ static void * X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) { - FIXME("stub: %p, %s\n", instance, debugstr_a(name)); - return NULL; + TRACE("%p, %s\n", instance, debugstr_a(name)); + return pvkGetInstanceProcAddr(instance, name); } static const struct vulkan_funcs vulkan_funcs =

1 0