[PATCH v2 0/1] MR6606: msi: Also set "MsiTrueAdminUser" property.

[Dmitry Timoshkov (＠dmitry)]

--
  v2: msi: Also set "MsiTrueAdminUser" property.

https://gitlab.winehq.org/wine/wine/-/merge_requests/6606

[PATCH v2 1/1] msi: Also set "MsiTrueAdminUser" property.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/msi/package.c       |  2 ++
 dlls/msi/tests/package.c | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 617a937af2c..89b4c09dfa4 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -736,6 +736,7 @@ static VOID set_installer_properties(MSIPACKAGE *package)
     msi_set_property( package->db, L"AdminUser", L"1", -1 );
     msi_set_property( package->db, L"Privileged", L"1", -1 );
     msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 );
+    msi_set_property( package->db, L"MsiTrueAdminUser", L"1", -1 );

/* set the os things */
     OSVersion.dwOSVersionInfoSize = sizeof(OSVersion);
@@ -965,6 +966,7 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package )
     msi_set_property( package->db, L"AdminUser", L"1", -1 );
     msi_set_property( package->db, L"Privileged", L"1", -1 );
     msi_set_property( package->db, L"MsiRunningElevated", L"1", -1 );
+    msi_set_property( package->db, L"MsiTrueAdminUser", L"1", -1 );
 }

MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index 5977a525fb6..e96907b3cf9 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -5591,6 +5591,30 @@ static void test_installprops(void)
     r = MsiGetPropertyA(hpkg, "MsiNetAssemblySupport", buf, &size);
     if (r == ERROR_SUCCESS) trace( "MsiNetAssemblySupport "%s"\n", buf );

+    buf[0] = 0;
+    size = MAX_PATH;
+    r = MsiGetPropertyA(hpkg, "AdminUser", buf, &size);
+    ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+    trace("AdminUser = %s\n", buf);
+
+    buf[0] = 0;
+    size = MAX_PATH;
+    r = MsiGetPropertyA(hpkg, "Privileged", buf, &size);
+    ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+    trace("Privileged = %s\n", buf);
+
+    buf[0] = 0;
+    size = MAX_PATH;
+    r = MsiGetPropertyA(hpkg, "MsiTrueAdminUser", buf, &size);
+    ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+    trace("MsiTrueAdminUser = %s\n", buf);
+
+    buf[0] = 0;
+    size = MAX_PATH;
+    r = MsiGetPropertyA(hpkg, "MsiRunningElevated", buf, &size);
+    ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r);
+    trace("MsiRunningElevated = %s\n", buf);
+
     GetNativeSystemInfo(&si);

sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion())));

[PATCH v2 1/1] msi: Also set "MsiTrueAdminUser" property.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=148824

Your paranoid android.

=== debian11b (64 bit WoW report) ===

dmime:
dmime.c:1950: Test failed: got mtTime 25, expected 24
dmime.c:1962: Test failed: got mtTime 50, expected 49
dmime.c:1974: Test failed: got mtTime 75, expected 74
dmime.c:1986: Test failed: got mtTime 125, expected 124
dmime.c:1998: Test failed: got mtTime 650, expected 649

[Dmitry Timoshkov (＠dmitry)]

On Wed Oct  2 11:36:59 2024 +0000, Hans Leidekker wrote:
> [msi_tests.diff](/uploads/80019985fb2b9bfde1c827fc780142fa/msi_tests.diff)
> Would you mind adding these tests?

Sure, thanks for sharing them.

[PATCH v2 0/1] MR6606: msi: Also set "MsiTrueAdminUser" property. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.