September 2023 - Wine-Commits

Hans Leidekker : systeminfo: Add an implementation on top of WMI.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: c3937d954f560a37f127c8b4f758f0fe351a21e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3937d954f560a37f127c8b4f758f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 22 15:17:26 2023 +0200 systeminfo: Add an implementation on top of WMI. --- programs/systeminfo/Makefile.in | 1 + programs/systeminfo/main.c | 368 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 363 insertions(+), 6 deletions(-)

1 0

Hans Leidekker : wbemprox: Fix Win32_OperatingSystem.TotalVirtual/VisibleMemorySize.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: ef14808c932815da2b245cf79250b6eebf3600d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef14808c932815da2b245cf79250b6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 11:26:05 2023 +0200 wbemprox: Fix Win32_OperatingSystem.TotalVirtual/VisibleMemorySize. --- dlls/wbemprox/builtin.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f62eadaf0fe..ac9c1cef69a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1615,6 +1615,15 @@ static UINT64 get_available_physical_memory(void) return status.ullAvailPhys; } +static UINT64 get_total_virtual_memory(void) +{ + MEMORYSTATUSEX status; + + status.dwLength = sizeof(status); + if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024; + return status.ullTotalVirtual; +} + static UINT64 get_available_virtual_memory(void) { MEMORYSTATUSEX status; @@ -3786,8 +3795,8 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->systemdrive = get_systemdrive(); - rec->totalvirtualmemorysize = get_total_physical_memory() / 1024; - rec->totalvisiblememorysize = rec->totalvirtualmemorysize; + rec->totalvirtualmemorysize = get_total_virtual_memory() / 1024; + rec->totalvisiblememorysize = get_total_physical_memory() / 1024; rec->version = get_osversion( &ver ); rec->windowsdirectory = get_windowsdirectory(); if (!match_row( table, row, cond, &status )) free_row_values( table, row );

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.InstallDate.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 917d6afa695ba8d5124a11b02b18c6777cc9e56c URL: https://gitlab.winehq.org/wine/wine/-/commit/917d6afa695ba8d5124a11b02b18c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 21 14:07:08 2023 +0200 wbemprox: Implement Win32_OperatingSystem.InstallDate. --- dlls/wbemprox/builtin.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ac9c1cef69a..038ce99539f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -241,7 +241,7 @@ static const struct column col_operatingsystem[] = { L"CurrentTimeZone", CIM_SINT16 }, { L"FreePhysicalMemory", CIM_UINT64 }, { L"FreeVirtualMemory", CIM_UINT64 }, - { L"InstallDate", CIM_DATETIME }, + { L"InstallDate", CIM_DATETIME|COL_FLAG_DYNAMIC }, { L"LastBootUpTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, { L"LocalDateTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, { L"Locale", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -3749,6 +3749,29 @@ static WCHAR *get_windowsdirectory(void) return wcsdup( dir ); } +static WCHAR *get_osinstalldate(void) +{ + HANDLE handle = CreateFileW( L"c:\\", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL ); + if (handle != INVALID_HANDLE_VALUE) + { + FILETIME ft = { 0 }; + WCHAR *ret; + + GetFileTime( handle, &ft, NULL, NULL ); + CloseHandle( handle ); + if ((ret = malloc( 26 * sizeof(WCHAR) ))) + { + SYSTEMTIME st = { 0 }; + FileTimeToSystemTime( &ft, &st ); + swprintf( ret, 26, L"%04u%02u%02u%02u%02u%02u.%06u+000", st.wYear, st.wMonth, st.wDay, st.wHour, + st.wMinute, st.wSecond, st.wMilliseconds * 1000 ); + return ret; + } + } + return wcsdup( L"20230101000000.000000+000" ); +} + static enum fill_status fill_operatingsystem( struct table *table, const struct expr *cond ) { struct record_operatingsystem *rec; @@ -3773,7 +3796,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->currenttimezone = get_currenttimezone(); rec->freephysicalmemory = get_available_physical_memory() / 1024; rec->freevirtualmemory = get_available_virtual_memory() / 1024; - rec->installdate = L"20140101000000.000000+000"; + rec->installdate = get_osinstalldate(); rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale();

1 0

Hans Leidekker : wbemprox: Get Win32_OperatingSystem.BuildType from the registry.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 97114ac88438258127efab574360e07798dd7caa URL: https://gitlab.winehq.org/wine/wine/-/commit/97114ac88438258127efab574360e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 18 12:47:16 2023 +0200 wbemprox: Get Win32_OperatingSystem.BuildType from the registry. --- dlls/wbemprox/builtin.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5f183251752..f62eadaf0fe 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -232,7 +232,7 @@ static const struct column col_operatingsystem[] = { { L"BootDevice", CIM_STRING }, { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, - { L"BuildType", CIM_STRING }, + { L"BuildType", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CodeSet", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CountryCode", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -3643,6 +3643,11 @@ static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) return ret; } +static WCHAR *get_osbuildtype(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"CurrentType" ); +} + static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) { static const WCHAR windowsW[] = L"Microsoft Windows "; @@ -3750,7 +3755,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec = (struct record_operatingsystem *)table->data; rec->bootdevice = L"\\Device\\HarddiskVolume1"; rec->buildnumber = get_osbuildnumber( &ver ); - rec->buildtype = L"Wine build"; + rec->buildtype = get_osbuildtype(); rec->caption = get_oscaption( &ver ); rec->codeset = get_codeset(); rec->countrycode = get_countrycode();

1 0

Nikolay Sivov : d3d10/tests: Test for correct return value.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 985bb4263ee68d8a5fc8fd5e4482c2b22ed177d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/985bb4263ee68d8a5fc8fd5e4482c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 27 10:52:01 2023 +0200 d3d10/tests: Test for correct return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 908844d97d0..e5efa2d5df2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9169,11 +9169,7 @@ static void test_effect_fx_4_1_blend_state(void) } hr = create_effect(fx_4_1_test_blend_state, 0, device, NULL, &effect); - todo_wine - ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); - - if (effect) - effect->lpVtbl->Release(effect); + ok(hr == E_FAIL, "Got unexpected hr %#lx.\n", hr); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount);

1 0

Alistair Leslie-Hughes : d3dx9: Trace pointer value in D3DXValidMesh().
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: cef39a24ee779ba16f3460b2a006d54ddecd56bc URL: https://gitlab.winehq.org/wine/wine/-/commit/cef39a24ee779ba16f3460b2a006d5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 24 19:03:26 2023 +1000 d3dx9: Trace pointer value in D3DXValidMesh(). --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 47a0cadde67..7aa70783735 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6464,7 +6464,7 @@ error: HRESULT WINAPI D3DXValidMesh(ID3DXMesh *mesh, const DWORD *adjacency, ID3DXBuffer **errors_and_warnings) { - FIXME("(%p, %p, %p): stub\n", mesh, adjacency, *errors_and_warnings); + FIXME("mesh %p, adjacency %p, errors_and_warnings %p stub.\n", mesh, adjacency, errors_and_warnings); return E_NOTIMPL; }

1 0

Alex Henrie : include: Move RTL functions that belong in ntddk.h from winternl.h to ntddk.h.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 0d7cf847098e343c06a6f67f29da49aa53fb49de URL: https://gitlab.winehq.org/wine/wine/-/commit/0d7cf847098e343c06a6f67f29da49… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 26 10:25:33 2023 -0600 include: Move RTL functions that belong in ntddk.h from winternl.h to ntddk.h. --- dlls/kernel32/lzexpand.c | 3 +++ dlls/kernel32/resource.c | 1 + dlls/kernelbase/loader.c | 1 + dlls/kernelbase/security.c | 1 + dlls/krnl386.exe16/atom.c | 3 +++ dlls/krnl386.exe16/ne_module.c | 3 +++ dlls/ntdll/actctx.c | 1 + dlls/ntdll/rtlstr.c | 1 + dlls/ntdll/tests/path.c | 1 + dlls/secur32/lsa.c | 1 + dlls/winmm/mmio.c | 3 +++ include/ddk/ntddk.h | 12 ++++++++++++ include/winternl.h | 9 --------- programs/services/rpc.c | 3 +++ 14 files changed, 34 insertions(+), 9 deletions(-)

1 0

Andrey Gusev : vkd3d: Add ID3D12Device4 interface stub.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: acd3ed97dc8e1ac192b2ec6fc19596831a6b61c6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/acd3ed97dc8e1ac192b2ec6fc1959… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Sep 27 20:44:44 2023 +0300 vkd3d: Add ID3D12Device4 interface stub. --- libs/vkd3d/device.c | 270 +++++++++++++++++++++++++++++---------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +- 4 files changed, 181 insertions(+), 107 deletions(-)

1 0

Francisco Casas : vkd3d-shader/d3d-asm: Don't print offset for DEPTHOUT registers.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: 123e399b893cc9c0da47c236df7c609ead70a16e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/123e399b893cc9c0da47c236df7c6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 29 19:08:24 2023 -0400 vkd3d-shader/d3d-asm: Don't print offset for DEPTHOUT registers. This register is unique and thus is not accompanied with an offset in the native disassembler output. --- libs/vkd3d-shader/d3d_asm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 62b50876..6a3513a2 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1164,7 +1164,8 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const } else if (reg->type != VKD3DSPR_RASTOUT && reg->type != VKD3DSPR_MISCTYPE - && reg->type != VKD3DSPR_NULL) + && reg->type != VKD3DSPR_NULL + && reg->type != VKD3DSPR_DEPTHOUT) { if (offset != ~0u) {

1 0

Francisco Casas : vkd3d-shader/d3d-asm: Use vkd3d_shader_register.dimension to know when to dump writemask.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: ef1567c17b9521c0b4bd140b49f5b91fa221cf65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef1567c17b9521c0b4bd140b49f5b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 29 18:33:50 2023 -0400 vkd3d-shader/d3d-asm: Use vkd3d_shader_register.dimension to know when to dump writemask. This change ensures that we don't dump the writemask for registers that have a scalar dimension. For instance, for this shader: float r; float4 main(out float d : DEPTH) : sv_target { d = r; return 0; } we now correctly dump dcl_output oDepth instead of dcl_output oDepth.x --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 7df2f163..62b50876 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1264,7 +1264,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_register(compiler, &param->reg, is_declaration); - if (write_mask) + if (write_mask && param->reg.dimension == VSIR_DIMENSION_VEC4) { static const char write_mask_chars[] = "xyzw";

1 0