mirror of
https://github.com/reactos/reactos.git
synced 2024-07-03 11:14:33 +00:00
3b5586f635
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51143 Signed-off-by: Zebediah Figura <z.figura12@gmail.com> wine-staging patch by Zebediah Figura <z.figura12@gmail.com>
62 lines
2 KiB
Diff
62 lines
2 KiB
Diff
diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c
|
|
index 143de262971..f29699bd54b 100644
|
|
--- a/dll/win32/msi/custom.c
|
|
+++ b/dll/win32/msi/custom.c
|
|
@@ -593,12 +593,35 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid)
|
|
return r;
|
|
}
|
|
|
|
+static HANDLE get_admin_token(void)
|
|
+{
|
|
+ TOKEN_ELEVATION_TYPE type;
|
|
+ TOKEN_LINKED_TOKEN linked;
|
|
+ DWORD size;
|
|
+
|
|
+#ifdef __REACTOS__
|
|
+#ifndef GetCurrentThreadEffectiveToken
|
|
+#define GetCurrentProcessToken() ((HANDLE)~(ULONG_PTR)3)
|
|
+#define GetCurrentThreadEffectiveToken() GetCurrentProcessToken()
|
|
+#endif
|
|
+#endif
|
|
+
|
|
+ if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenElevationType, &type, sizeof(type), &size)
|
|
+ || type == TokenElevationTypeFull)
|
|
+ return NULL;
|
|
+
|
|
+ if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenLinkedToken, &linked, sizeof(linked), &size))
|
|
+ return NULL;
|
|
+ return linked.LinkedToken;
|
|
+}
|
|
+
|
|
static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch)
|
|
{
|
|
WCHAR path[MAX_PATH], cmdline[MAX_PATH + 23];
|
|
PROCESS_INFORMATION pi = {0};
|
|
STARTUPINFOW si = {0};
|
|
WCHAR buffer[24];
|
|
+ HANDLE token;
|
|
void *cookie;
|
|
HANDLE pipe;
|
|
|
|
@@ -620,14 +643,18 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch)
|
|
lstrcatW(path, L"\\msiexec.exe");
|
|
swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId());
|
|
|
|
+ token = get_admin_token();
|
|
+
|
|
if (is_wow64 && arch == SCS_64BIT_BINARY)
|
|
{
|
|
Wow64DisableWow64FsRedirection(&cookie);
|
|
- CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
|
|
+ CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
|
|
Wow64RevertWow64FsRedirection(cookie);
|
|
}
|
|
else
|
|
- CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
|
|
+ CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
|
|
+
|
|
+ if (token) CloseHandle(token);
|
|
|
|
CloseHandle(pi.hThread);
|
|
|