Commit def4466f authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

advapi32/service: Cater for domain in the test.

parent 02e16017
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
...@@ -139,8 +140,8 @@ static void test_open_svc(void) ...@@ -139,8 +140,8 @@ static void test_open_svc(void)
static void test_create_delete_svc(void) static void test_create_delete_svc(void)
{ {
SC_HANDLE scm_handle, svc_handle1; SC_HANDLE scm_handle, svc_handle1;
CHAR username[UNLEN + 1]; CHAR username[UNLEN + 1], *domain;
DWORD user_size = UNLEN + 1; DWORD user_size = UNLEN + 1, domain_size = 0;
CHAR account[UNLEN + 3]; CHAR account[UNLEN + 3];
static const CHAR servicename [] = "Winetest"; static const CHAR servicename [] = "Winetest";
static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR pathname [] = "we_dont_care.exe";
...@@ -153,8 +154,15 @@ static void test_create_delete_svc(void) ...@@ -153,8 +154,15 @@ static void test_create_delete_svc(void)
/* Get the username and turn it into an account to be used in some tests */ /* Get the username and turn it into an account to be used in some tests */
GetUserNameA(username, &user_size); GetUserNameA(username, &user_size);
lstrcpy(account, ".\\"); /* Get the domainname to cater for that situation */
lstrcat(account, username); GetComputerNameEx(ComputerNameDnsDomain, NULL, &domain_size);
domain = HeapAlloc(GetProcessHeap(), 0, domain_size);
GetComputerNameEx(ComputerNameDnsDomain, domain, &domain_size);
if (domain_size > 1)
sprintf(account, "%s\\%s", domain, username);
else
sprintf(account, ".\\%s", username);
HeapFree(GetProcessHeap(), 0, domain);
/* All NULL */ /* All NULL */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment