[NETAPI32_WINETEST] Sync with Wine Staging 1.7.43.

svn path=/trunk/; revision=67924
This commit is contained in:
Amine Khaldi 2015-05-26 17:17:50 +00:00
parent a03392cf34
commit 94346f3670
3 changed files with 9 additions and 7 deletions

View file

@ -66,7 +66,7 @@ static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL;
static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL;
static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL;
static int init_access_tests(void)
static BOOL init_access_tests(void)
{
DWORD dwSize;
BOOL rc;
@ -77,14 +77,14 @@ static int init_access_tests(void)
if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
{
win_skip("GetUserNameW is not available.\n");
return 0;
return FALSE;
}
ok(rc, "User Name Retrieved\n");
computer_name[0] = 0;
dwSize = sizeof(computer_name)/sizeof(WCHAR);
ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n");
return 1;
return TRUE;
}
static NET_API_STATUS create_test_user(void)
@ -348,6 +348,8 @@ static void run_localgroupgetinfo_tests(void)
for(i=0;i<entries_read;i++)
trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname));
pNetApiBufferFree(buffer);
}
START_TEST(access)

View file

@ -76,7 +76,7 @@ static void test_get(void)
START_TEST(ds)
{
HMODULE hnetapi32 = LoadLibrary("netapi32.dll");
HMODULE hnetapi32 = LoadLibraryA("netapi32.dll");
pDsRoleGetPrimaryDomainInformation=(void*)GetProcAddress(hnetapi32,"DsRoleGetPrimaryDomainInformation");
if (pDsRoleGetPrimaryDomainInformation)

View file

@ -44,7 +44,7 @@ static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP
static WCHAR user_name[UNLEN + 1];
static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1];
static int init_wksta_tests(void)
static BOOL init_wksta_tests(void)
{
DWORD dwSize;
BOOL rc;
@ -54,14 +54,14 @@ static int init_wksta_tests(void)
rc=GetUserNameW(user_name, &dwSize);
if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) {
win_skip("GetUserNameW is not implemented\n");
return 0;
return FALSE;
}
ok(rc, "User Name Retrieved\n");
computer_name[0] = 0;
dwSize = sizeof(computer_name)/sizeof(computer_name[0]);
ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n");
return 1;
return TRUE;
}
static void run_get_comp_name_tests(void)