From 215fd0b81311438720d9a53bfd7ae6b890ba1ed3 Mon Sep 17 00:00:00 2001 From: Ge van Geldorp Date: Tue, 7 Apr 2009 10:54:22 +0200 Subject: [PATCH] msi/tests: Handle running the tests as a domain user. --- dlls/msi/tests/source.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 192f01070cb..2e9e3ff3e5d 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -27,10 +27,12 @@ #include #include #include +#include #include "wine/test.h" static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); +static BOOLEAN (WINAPI *pGetUserNameExA)(EXTENDED_NAME_FORMAT, LPSTR, PULONG); static UINT (WINAPI *pMsiSourceListAddMediaDiskA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPCSTR, LPCSTR); static UINT (WINAPI *pMsiSourceListAddSourceExA) @@ -51,6 +53,7 @@ static void init_functionpointers(void) { HMODULE hmsi = GetModuleHandleA("msi.dll"); HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + HMODULE hsecur32 = LoadLibraryA("secur32.dll"); #define GET_PROC(dll, func) \ p ## func = (void *)GetProcAddress(dll, #func); \ @@ -67,6 +70,8 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, ConvertSidToStringSidA) + GET_PROC(hsecur32, GetUserNameExA) + #undef GET_PROC } @@ -3139,12 +3144,16 @@ static void test_MsiSourceListAddSource(void) /* MACHINENAME\username */ size = MAX_PATH; - GetComputerNameA(username, &size); - lstrcatA(username, "\\"); - ptr = username + lstrlenA(username); - size = MAX_PATH; - GetUserNameA(ptr, &size); - + if (pGetUserNameExA != NULL) + pGetUserNameExA(NameSamCompatible, username, &size); + else + { + GetComputerNameA(username, &size); + lstrcatA(username, "\\"); + ptr = username + lstrlenA(username); + size = MAX_PATH - (ptr - username); + GetUserNameA(ptr, &size); + } trace("username: %s\n", username); /* GetLastError is not set by the function */ -- 2.11.4.GIT