ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qga-win: fix installation on localized windows 

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1357789
Replace hardcoded user and group names ("Administrators", "SYSTEM") with the ones acquired from system. Windows uses localized strings for these names and it may cause the installation to fail.
Windows has Well-known SIDs for "Administrators" group and "SYSTEM" user so they were used to identify required users and groups.
Well-known SIDs: https://support.microsoft.com/en-us/help/243330/well-known-security-identifiers-in-windows-operating-systems

Signed-off-by: Daniel Rempel <daniel@daynix.com>
Signed-off-by: Sameeh Jubran <sjubran@redhat.com>
Reviewed-by: Sameeh Jubran <sameeh@daynix.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Daniel Rempel 2017-07-05 12:01:13 +03:00 committed by Michael Roth
parent ca4e667dbf
commit 009f38d985
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qga/vss-win32/install.cpp
View File

@ -18,6 +18,9 @@
#include <wbemidl.h> #include <wbemidl.h>
#include <comdef.h> #include <comdef.h>
#include <comutil.h> #include <comutil.h>
#include <sddl.h>
#define BUFFER_SIZE 1024
extern HINSTANCE g_hinstDll; extern HINSTANCE g_hinstDll;
@ -135,6 +138,27 @@ out:
return hr; return hr;
} }
/* Acquire group or user name by SID */
static HRESULT getNameByStringSID(
const wchar_t *sid, LPWSTR buffer, LPDWORD bufferLen)
{
HRESULT hr = S_OK;
PSID psid = NULL;
SID_NAME_USE groupType;
DWORD domainNameLen = BUFFER_SIZE;
wchar_t domainName[BUFFER_SIZE];
chk(ConvertStringSidToSidW(sid, &psid));
LookupAccountSidW(NULL, psid, buffer, bufferLen,
domainName, &domainNameLen, &groupType);
hr = HRESULT_FROM_WIN32(GetLastError());
LocalFree(psid);
out:
return hr;
}
/* Find and iterate QGA VSS provider in COM+ Application Catalog */ /* Find and iterate QGA VSS provider in COM+ Application Catalog */
static HRESULT QGAProviderFind( static HRESULT QGAProviderFind(
HRESULT (*found)(ICatalogCollection *, int, void *), void *arg) HRESULT (*found)(ICatalogCollection *, int, void *), void *arg)
@ -216,6 +240,10 @@ STDAPI COMRegister(void)
CHAR dllPath[MAX_PATH], tlbPath[MAX_PATH]; CHAR dllPath[MAX_PATH], tlbPath[MAX_PATH];
bool unregisterOnFailure = false; bool unregisterOnFailure = false;
int count = 0; int count = 0;
DWORD bufferLen = BUFFER_SIZE;
wchar_t buffer[BUFFER_SIZE];
const wchar_t *administratorsGroupSID = L"S-1-5-32-544";
const wchar_t *systemUserSID = L"S-1-5-18";
if (!g_hinstDll) { if (!g_hinstDll) {
errmsg(E_FAIL, "Failed to initialize DLL"); errmsg(E_FAIL, "Failed to initialize DLL");
@ -284,11 +312,12 @@ STDAPI COMRegister(void)
/* Setup roles of the applicaion */ /* Setup roles of the applicaion */
chk(getNameByStringSID(administratorsGroupSID, buffer, &bufferLen));
chk(pApps->GetCollection(_bstr_t(L"Roles"), key, chk(pApps->GetCollection(_bstr_t(L"Roles"), key,
(IDispatch **)pRoles.replace())); (IDispatch **)pRoles.replace()));
chk(pRoles->Populate()); chk(pRoles->Populate());
chk(pRoles->Add((IDispatch **)pObj.replace())); chk(pRoles->Add((IDispatch **)pObj.replace()));
chk(put_Value(pObj, L"Name", L"Administrators")); chk(put_Value(pObj, L"Name", buffer));
chk(put_Value(pObj, L"Description", L"Administrators group")); chk(put_Value(pObj, L"Description", L"Administrators group"));
chk(pRoles->SaveChanges(&n)); chk(pRoles->SaveChanges(&n));
chk(pObj->get_Key(&key)); chk(pObj->get_Key(&key));
@ -303,8 +332,10 @@ STDAPI COMRegister(void)
chk(GetAdminName(&name)); chk(GetAdminName(&name));
chk(put_Value(pObj, L"User", _bstr_t(".\\") + name)); chk(put_Value(pObj, L"User", _bstr_t(".\\") + name));
bufferLen = BUFFER_SIZE;
chk(getNameByStringSID(systemUserSID, buffer, &bufferLen));
chk(pUsersInRole->Add((IDispatch **)pObj.replace())); chk(pUsersInRole->Add((IDispatch **)pObj.replace()));
chk(put_Value(pObj, L"User", L"SYSTEM")); chk(put_Value(pObj, L"User", buffer));
chk(pUsersInRole->SaveChanges(&n)); chk(pUsersInRole->SaveChanges(&n));
out: out: