Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56809: [ADVAPI32_APITEST] - Add test for QueryServiceConfig2 with SERVICE_CONFIG_DESCRIPTION and SERVICE_CONFIG_FAILURE_ACTIONS. Patch by Hermes Belusca. - Remove ok_lasterr in favor of ok...
by tfaber＠svn.reactos.org 27 Jun '12

27 Jun '12

Author: tfaber Date: Wed Jun 27 14:55:22 2012 New Revision: 56809 URL: http://svn.reactos.org/svn/reactos?rev=56809&view=rev Log: [ADVAPI32_APITEST] - Add test for QueryServiceConfig2 with SERVICE_CONFIG_DESCRIPTION and SERVICE_CONFIG_FAILURE_ACTIONS. Patch by Hermes Belusca. - Remove ok_lasterr in favor of ok_err. See issue #7144 for more details. Added: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c (with props) Modified: trunk/rostests/apitests/advapi32/ (props changed) trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/advapi32/CreateService.c trunk/rostests/apitests/advapi32/testlist.c Propchange: trunk/rostests/apitests/advapi32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jun 27 14:55:22 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/advapi32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/advapi32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/advapi32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Wed Jun 27 14:55:22 2012 @@ -1,8 +1,7 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE CreateService.c + QueryServiceConfig2.c testlist.c) add_executable(advapi32_apitest ${SOURCE}) Modified: trunk/rostests/apitests/advapi32/CreateService.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CreateS… ============================================================================== --- trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] Wed Jun 27 14:55:22 2012 @@ -8,8 +8,6 @@ #include <wine/test.h> #include <windows.h> #include <strsafe.h> - -#define ok_lasterr(err, s) ok(GetLastError() == (err), "%s GetLastError()=0x%08lx, expected 0x%08lx\n", s, GetLastError(), (DWORD)(err)) static int MakeService(SC_HANDLE hScm, const wchar_t *serviceName, SC_HANDLE *hService, DWORD *tag) { @@ -41,7 +39,7 @@ return 1; } - ok_lasterr(ERROR_SUCCESS, "CreateServiceW"); + ok_err(ERROR_SUCCESS); ok(*tag != 0, "tag is zero, expected nonzero\n"); @@ -98,7 +96,7 @@ goto cleanup; } - ok_lasterr(ERROR_SUCCESS, "OpenSCManagerW"); + ok_err(ERROR_SUCCESS); if (MakeService(hScm, L"advapi32_apitest_CreateService_Test_Service1", &hService1, &tag1)) goto cleanup; Added: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/QuerySe… ============================================================================== --- trunk/rostests/apitests/advapi32/QueryServiceConfig2.c (added) +++ trunk/rostests/apitests/advapi32/QueryServiceConfig2.c [iso-8859-1] Wed Jun 27 14:55:22 2012 @@ -1,0 +1,568 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for QueryServiceConfig2A/W + * PROGRAMMER: Hermès BÉLUSCA - MAÏTO + */ + +#include <wine/test.h> +#include <windows.h> +#include <strsafe.h> + +/* + * Taken from base/system/services/config.c and adapted. + */ +static DWORD +RegReadStringW(HKEY hKey, + LPWSTR lpValueName, + LPWSTR *lpValue) +{ + DWORD dwError; + DWORD dwSize; + DWORD dwType; + + *lpValue = NULL; + + dwSize = 0; + dwError = RegQueryValueExW(hKey, + lpValueName, + 0, + &dwType, + NULL, + &dwSize); + if (dwError != ERROR_SUCCESS) + return dwError; + + *lpValue = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (*lpValue == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + dwError = RegQueryValueExW(hKey, + lpValueName, + 0, + &dwType, + (LPBYTE)*lpValue, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, *lpValue); + *lpValue = NULL; + } + + return dwError; +} + +static DWORD +RegReadStringA(HKEY hKey, + LPSTR lpValueName, + LPSTR *lpValue) +{ + DWORD dwError; + DWORD dwSize; + DWORD dwType; + + *lpValue = NULL; + + dwSize = 0; + dwError = RegQueryValueExA(hKey, + lpValueName, + 0, + &dwType, + NULL, + &dwSize); + if (dwError != ERROR_SUCCESS) + return dwError; + + *lpValue = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (*lpValue == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + dwError = RegQueryValueExA(hKey, + lpValueName, + 0, + &dwType, + (LPBYTE)*lpValue, + &dwSize); + if (dwError != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, *lpValue); + *lpValue = NULL; + } + + return dwError; +} + + +static int QueryConfig2W(SC_HANDLE hService, LPCWSTR serviceName, DWORD dwInfoLevel) +{ + int iRet = 0; + LONG lRet = 0; + DWORD dwRet = 0; + BOOL bError = FALSE; + DWORD dwRequiredSize = 0; + LPBYTE lpBuffer = NULL; + + WCHAR keyName[256]; + HKEY hKey = NULL; + DWORD dwType = 0; + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceConfig2W(hService, + dwInfoLevel, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryConfig2W --> %lu test\n", dwInfoLevel); + return 1; + } + + /* Allocate memory */ + lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpBuffer == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + return 2; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceConfig2W(hService, + dwInfoLevel, + lpBuffer, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + if (bError == FALSE) + { + skip("QueryServiceConfig2W returned an error; cannot proceed with QueryConfig2W --> %lu test\n", dwInfoLevel); + HeapFree(GetProcessHeap(), 0, lpBuffer); + return 3; + } + + /* Now we can compare the retrieved value with what it's actually stored in the registry */ + StringCbPrintfW(keyName, sizeof(keyName), L"System\\CurrentControlSet\\Services\\%s", serviceName); + SetLastError(0xdeadbeef); + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName, 0, KEY_QUERY_VALUE, &hKey); + ok(lRet == ERROR_SUCCESS, "RegOpenKeyExW failed with 0x%08lx\n", lRet); + if (lRet != ERROR_SUCCESS) + { + skip("No regkey; cannot proceed with QueryConfig2W --> %lu test\n", dwInfoLevel); + HeapFree(GetProcessHeap(), 0, lpBuffer); + return 4; + } + + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + { + LPSERVICE_DESCRIPTIONW lpDescription = (LPSERVICE_DESCRIPTIONW)lpBuffer; + LPWSTR lpszDescription = NULL; + + /* Retrieve the description via the registry */ + dwRet = RegReadStringW(hKey, L"Description", &lpszDescription); + ok(dwRet == ERROR_SUCCESS, "RegReadStringW returned 0x%08lx\n", dwRet); + ok(lpszDescription != NULL, "lpszDescription is null, expected non-null\n"); + + /* Compare it with the description retrieved via QueryServiceConfig2 */ + if (lpszDescription) + iRet = wcscmp(lpDescription->lpDescription, lpszDescription); + else + iRet = 0; + + ok(iRet == 0, "Retrieved descriptions are different !\n"); + + + /* Memory cleanup */ + HeapFree(GetProcessHeap(), 0, lpszDescription); + + break; + } + + case SERVICE_CONFIG_FAILURE_ACTIONS: + { + LPSERVICE_FAILURE_ACTIONSW lpFailureActions1 = (LPSERVICE_FAILURE_ACTIONSW)lpBuffer; + LPSERVICE_FAILURE_ACTIONSW lpFailureActions2 = NULL; + LPWSTR lpRebootMessage = NULL; + LPWSTR lpFailureCommand = NULL; + DWORD i = 0; + + /* Retrieve the failure actions via the registry */ + lRet = RegQueryValueExW(hKey, + L"FailureActions", + NULL, + &dwType, + NULL, + &dwRequiredSize); + ok(lRet == ERROR_SUCCESS, "RegQueryValueExW returned 0x%08lx\n", lRet); + ok(dwType == REG_BINARY, "dwType = %lu, expected REG_BINARY\n", dwType); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + + lpFailureActions2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpFailureActions2 == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + break; + } + + lRet = RegQueryValueExW(hKey, + L"FailureActions", + NULL, + NULL, + (LPBYTE)lpFailureActions2, + &dwRequiredSize); + ok(lRet == ERROR_SUCCESS, "RegQueryValueExW returned 0x%08lx\n", lRet); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + + /* Get the strings */ + RegReadStringW(hKey, L"FailureCommand", &lpFailureCommand); + RegReadStringW(hKey, L"RebootMessage" , &lpRebootMessage ); + + /* Check the values */ + ok(lpFailureActions1->dwResetPeriod == lpFailureActions2->dwResetPeriod, "lpFailureActions1->dwResetPeriod != lpFailureActions2->dwResetPeriod\n"); + ok(lpFailureActions1->cActions == lpFailureActions2->cActions, "lpFailureActions1->cActions != lpFailureActions2->cActions\n"); + + /* Compare the actions */ + if (lpFailureActions1->cActions == lpFailureActions2->cActions) + { + lpFailureActions2->lpsaActions = (lpFailureActions2->cActions > 0 ? (LPSC_ACTION)(lpFailureActions2 + 1) : NULL); + + if (lpFailureActions1->cActions > 0 && + lpFailureActions1->lpsaActions != NULL) + { + for (i = 0; i < lpFailureActions1->cActions; ++i) + { + ok(lpFailureActions1->lpsaActions[i].Type == lpFailureActions2->lpsaActions[i].Type , "lpFailureActions1->lpsaActions[%lu].Type != lpFailureActions2->lpsaActions[%lu].Type\n" , i, i); + ok(lpFailureActions1->lpsaActions[i].Delay == lpFailureActions2->lpsaActions[i].Delay, "lpFailureActions1->lpsaActions[%lu].Delay != lpFailureActions2->lpsaActions[%lu].Delay\n", i, i); + } + } + } + + /* TODO: retrieve the strings if they are in MUI format */ + + /* Compare RebootMsg */ + if (lpFailureActions1->lpRebootMsg && lpRebootMessage) + iRet = wcscmp(lpFailureActions1->lpRebootMsg, lpRebootMessage); + else + iRet = 0; + + ok(iRet == 0, "Retrieved reboot messages are different !\n"); + + /* Compare Command */ + if (lpFailureActions1->lpCommand && lpFailureCommand) + iRet = wcscmp(lpFailureActions1->lpCommand, lpFailureCommand); + else + iRet = 0; + + ok(iRet == 0, "Retrieved commands are different !\n"); + + + /* Memory cleanup */ + if (lpRebootMessage) + HeapFree(GetProcessHeap(), 0, lpRebootMessage); + + if (lpFailureCommand) + HeapFree(GetProcessHeap(), 0, lpFailureCommand); + + HeapFree(GetProcessHeap(), 0, lpFailureActions2); + + break; + } + + default: + skip("Unknown dwInfoLevel %lu, cannot proceed with QueryConfig2W --> %lu test\n", dwInfoLevel, dwInfoLevel); + break; + } + + RegCloseKey(hKey); + + HeapFree(GetProcessHeap(), 0, lpBuffer); + + return 0; +} + +static int QueryConfig2A(SC_HANDLE hService, LPCSTR serviceName, DWORD dwInfoLevel) +{ + int iRet = 0; + LONG lRet = 0; + DWORD dwRet = 0; + BOOL bError = FALSE; + DWORD dwRequiredSize = 0; + LPBYTE lpBuffer = NULL; + + CHAR keyName[256]; + HKEY hKey = NULL; + DWORD dwType = 0; + + /* Get the needed size */ + SetLastError(0xdeadbeef); + bError = QueryServiceConfig2A(hService, + dwInfoLevel, + NULL, + 0, + &dwRequiredSize); + ok(bError == FALSE && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "(bError, GetLastError()) = (%u, 0x%08lx), expected (FALSE, 0x%08lx)\n", bError, GetLastError(), (DWORD)ERROR_INSUFFICIENT_BUFFER); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + if (dwRequiredSize == 0) + { + skip("Required size is null; cannot proceed with QueryConfig2A --> %lu test\n", dwInfoLevel); + return 1; + } + + /* Allocate memory */ + lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpBuffer == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + return 2; + } + + /* Get the actual value */ + SetLastError(0xdeadbeef); + bError = QueryServiceConfig2A(hService, + dwInfoLevel, + lpBuffer, + dwRequiredSize, + &dwRequiredSize); + ok(bError, "bError = %u, expected TRUE\n", bError); + if (bError == FALSE) + { + skip("QueryServiceConfig2A returned an error; cannot proceed with QueryConfig2A --> %lu test\n", dwInfoLevel); + HeapFree(GetProcessHeap(), 0, lpBuffer); + return 3; + } + + /* Now we can compare the retrieved value with what it's actually stored in the registry */ + StringCbPrintfA(keyName, sizeof(keyName), "System\\CurrentControlSet\\Services\\%s", serviceName); + SetLastError(0xdeadbeef); + lRet = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_QUERY_VALUE, &hKey); + ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with 0x%08lx\n", lRet); + if (lRet != ERROR_SUCCESS) + { + skip("No regkey; cannot proceed with QueryConfig2A --> %lu test\n", dwInfoLevel); + HeapFree(GetProcessHeap(), 0, lpBuffer); + return 4; + } + + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + { + LPSERVICE_DESCRIPTIONA lpDescription = (LPSERVICE_DESCRIPTIONA)lpBuffer; + LPSTR lpszDescription = NULL; + + /* Retrieve the description via the registry */ + dwRet = RegReadStringA(hKey, "Description", &lpszDescription); + ok(dwRet == ERROR_SUCCESS, "RegReadStringA returned 0x%08lx\n", dwRet); + ok(lpszDescription != NULL, "lpszDescription is null, expected non-null\n"); + + /* Compare it with the description retrieved via QueryServiceConfig2 */ + if (lpszDescription) + iRet = strcmp(lpDescription->lpDescription, lpszDescription); + else + iRet = 0; + + ok(iRet == 0, "Retrieved descriptions are different !\n"); + + + /* Memory cleanup */ + HeapFree(GetProcessHeap(), 0, lpszDescription); + + break; + } + + case SERVICE_CONFIG_FAILURE_ACTIONS: + { + LPSERVICE_FAILURE_ACTIONSA lpFailureActions1 = (LPSERVICE_FAILURE_ACTIONSA)lpBuffer; + LPSERVICE_FAILURE_ACTIONSA lpFailureActions2 = NULL; + LPSTR lpRebootMessage = NULL; + LPSTR lpFailureCommand = NULL; + DWORD i = 0; + + /* Retrieve the failure actions via the registry */ + lRet = RegQueryValueExA(hKey, + "FailureActions", + NULL, + &dwType, + NULL, + &dwRequiredSize); + ok(lRet == ERROR_SUCCESS, "RegQueryValueExA returned 0x%08lx\n", lRet); + ok(dwType == REG_BINARY, "dwType = %lu, expected REG_BINARY\n", dwType); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + + lpFailureActions2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwRequiredSize); + if (lpFailureActions2 == NULL) + { + skip("Cannot allocate %lu bytes of memory\n", dwRequiredSize); + break; + } + + lRet = RegQueryValueExA(hKey, + "FailureActions", + NULL, + NULL, + (LPBYTE)lpFailureActions2, + &dwRequiredSize); + ok(lRet == ERROR_SUCCESS, "RegQueryValueExA returned 0x%08lx\n", lRet); + ok(dwRequiredSize != 0, "dwRequiredSize is zero, expected non-zero\n"); + + /* Get the strings */ + RegReadStringA(hKey, "FailureCommand", &lpFailureCommand); + RegReadStringA(hKey, "RebootMessage" , &lpRebootMessage ); + + /* Check the values */ + ok(lpFailureActions1->dwResetPeriod == lpFailureActions2->dwResetPeriod, "lpFailureActions1->dwResetPeriod != lpFailureActions2->dwResetPeriod\n"); + ok(lpFailureActions1->cActions == lpFailureActions2->cActions, "lpFailureActions1->cActions != lpFailureActions2->cActions\n"); + + /* Compare the actions */ + if (lpFailureActions1->cActions == lpFailureActions2->cActions) + { + lpFailureActions2->lpsaActions = (lpFailureActions2->cActions > 0 ? (LPSC_ACTION)(lpFailureActions2 + 1) : NULL); + + if (lpFailureActions1->cActions > 0 && + lpFailureActions1->lpsaActions != NULL) + { + for (i = 0; i < lpFailureActions1->cActions; ++i) + { + ok(lpFailureActions1->lpsaActions[i].Type == lpFailureActions2->lpsaActions[i].Type , "lpFailureActions1->lpsaActions[%lu].Type != lpFailureActions2->lpsaActions[%lu].Type\n" , i, i); + ok(lpFailureActions1->lpsaActions[i].Delay == lpFailureActions2->lpsaActions[i].Delay, "lpFailureActions1->lpsaActions[%lu].Delay != lpFailureActions2->lpsaActions[%lu].Delay\n", i, i); + } + } + } + + /* TODO: retrieve the strings if they are in MUI format */ + + /* Compare RebootMsg */ + if (lpFailureActions1->lpRebootMsg && lpRebootMessage) + iRet = strcmp(lpFailureActions1->lpRebootMsg, lpRebootMessage); + else + iRet = 0; + + ok(iRet == 0, "Retrieved reboot messages are different !\n"); + + /* Compare Command */ + if (lpFailureActions1->lpCommand && lpFailureCommand) + iRet = strcmp(lpFailureActions1->lpCommand, lpFailureCommand); + else + iRet = 0; + + ok(iRet == 0, "Retrieved commands are different !\n"); + + + /* Memory cleanup */ + if (lpRebootMessage) + HeapFree(GetProcessHeap(), 0, lpRebootMessage); + + if (lpFailureCommand) + HeapFree(GetProcessHeap(), 0, lpFailureCommand); + + HeapFree(GetProcessHeap(), 0, lpFailureActions2); + + break; + } + + default: + skip("Unknown dwInfoLevel %lu, cannot proceed with QueryConfig2A --> %lu test\n", dwInfoLevel, dwInfoLevel); + break; + } + + RegCloseKey(hKey); + + HeapFree(GetProcessHeap(), 0, lpBuffer); + + return 0; +} + + +static void Test_QueryServiceConfig2W(void) +{ + SC_HANDLE hScm = NULL; + SC_HANDLE hService = NULL; + + SetLastError(0xdeadbeef); + hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryServiceConfig2W test\n"); + goto cleanup; + } + + ok_err(ERROR_SUCCESS); + + SetLastError(0xdeadbeef); + hService = OpenServiceW(hScm, L"Spooler", SERVICE_QUERY_CONFIG); + ok(hService != NULL, "Failed to open service handle, error=0x%08lx\n", GetLastError()); + if (!hService) + { + skip("Service not found; cannot proceed with QueryServiceConfig2W test\n"); + goto cleanup; + } + + ok_err(ERROR_SUCCESS); + + if (QueryConfig2W(hService, L"Spooler", SERVICE_CONFIG_DESCRIPTION) != 0) + goto cleanup; + + if (QueryConfig2W(hService, L"Spooler", SERVICE_CONFIG_FAILURE_ACTIONS) != 0) + goto cleanup; + +cleanup: + if (hService) + CloseServiceHandle(hService); + + if (hScm) + CloseServiceHandle(hScm); +} + +static void Test_QueryServiceConfig2A(void) +{ + SC_HANDLE hScm = NULL; + SC_HANDLE hService = NULL; + + SetLastError(0xdeadbeef); + hScm = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + ok(hScm != NULL, "Failed to open service manager, error=0x%08lx\n", GetLastError()); + if (!hScm) + { + skip("No service control manager; cannot proceed with QueryServiceConfig2A test\n"); + goto cleanup; + } + + ok_err(ERROR_SUCCESS); + + SetLastError(0xdeadbeef); + hService = OpenServiceA(hScm, "Spooler", SERVICE_QUERY_CONFIG); + ok(hService != NULL, "Failed to open service handle, error=0x%08lx\n", GetLastError()); + if (!hService) + { + skip("Service not found; cannot proceed with QueryServiceConfig2A test\n"); + goto cleanup; + } + + ok_err(ERROR_SUCCESS); + + if (QueryConfig2A(hService, "Spooler", SERVICE_CONFIG_DESCRIPTION) != 0) + goto cleanup; + + if (QueryConfig2A(hService, "Spooler", SERVICE_CONFIG_FAILURE_ACTIONS) != 0) + goto cleanup; + +cleanup: + if (hService) + CloseServiceHandle(hService); + + if (hScm) + CloseServiceHandle(hScm); +} + + +START_TEST(QueryServiceConfig2) +{ + Test_QueryServiceConfig2W(); + Test_QueryServiceConfig2A(); +} Propchange: trunk/rostests/apitests/advapi32/QueryServiceConfig2.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Wed Jun 27 14:55:22 2012 @@ -6,10 +6,12 @@ #include "wine/test.h" extern void func_CreateService(void); +extern void func_QueryServiceConfig2(void); const struct test winetest_testlist[] = { { "CreateService", func_CreateService }, + { "QueryServiceConfig2", func_QueryServiceConfig2 }, { 0, 0 } };

1 0

[spetreolle] 56808: [FORMAT] Handle read only devices and report them unsupported. Forbid the formatting of the system drive. Patch by Mikael Lyngvig. See bug 2081 for more details.
by spetreolle＠svn.reactos.org 26 Jun '12

26 Jun '12

Author: spetreolle Date: Tue Jun 26 21:31:10 2012 New Revision: 56808 URL: http://svn.reactos.org/svn/reactos?rev=56808&view=rev Log: [FORMAT] Handle read only devices and report them unsupported. Forbid the formatting of the system drive. Patch by Mikael Lyngvig. See bug 2081 for more details. Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Tue Jun 26 21:31:10 2012 @@ -370,25 +370,52 @@ // See if the drive is removable or not // driveType = GetDriveType( RootDirectory ); - - if( driveType == 0 ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - else if ( driveType == 1 ) + switch (driveType) { - LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - PrintWin32Error( szMsg, GetLastError()); - return -1; - } - - if( driveType != DRIVE_FIXED ) { - LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - _fgetts( input, sizeof(input)/2, stdin ); - - media = FMIFS_FLOPPY; + case DRIVE_UNKNOWN : + LoadStringAndOem( GetModuleHandle(NULL), STRING_ERROR_DRIVE_TYPE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); + return -1; + + case DRIVE_REMOTE: + case DRIVE_CDROM: + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + _tprintf(szMsg); + return -1; + + case DRIVE_NO_ROOT_DIR: + LoadString( GetModuleHandle(NULL), STRING_NO_VOLUME, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + PrintWin32Error( szMsg, GetLastError()); + return -1; + + case DRIVE_REMOVABLE: + LoadStringAndOem( GetModuleHandle(NULL), STRING_INSERT_DISK, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, RootDirectory[0] ); + _fgetts( input, sizeof(input)/2, stdin ); + media = FMIFS_FLOPPY; + break; + + case DRIVE_FIXED: + case DRIVE_RAMDISK: + media = FMIFS_HARDDISK; + break; + } + + // Reject attempts to format the system drive + { + TCHAR path[MAX_PATH + 1]; + UINT rc; + rc = GetWindowsDirectory(path, MAX_PATH); + if (rc == 0 || rc > MAX_PATH) + // todo: Report "Unable to query system directory" + return -1; + if (_totlower(path[0]) == _totlower(Drive[0])) + { + // todo: report "Cannot format system drive" + LoadStringAndOem( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); + _tprintf(szMsg); + return -1; + } } // @@ -452,7 +479,6 @@ return 0; } } - media = FMIFS_HARDDISK; } //

1 0

[tfaber] 56807: [NTOSKRNL:SE] - Do not dereference pointer before checking against NULL in SeSetSecurityDescriptorInfo
by tfaber＠svn.reactos.org 26 Jun '12

26 Jun '12

Author: tfaber Date: Tue Jun 26 08:36:58 2012 New Revision: 56807 URL: http://svn.reactos.org/svn/reactos?rev=56807&view=rev Log: [NTOSKRNL:SE] - Do not dereference pointer before checking against NULL in SeSetSecurityDescriptorInfo Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=56807… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Tue Jun 26 08:36:58 2012 @@ -882,11 +882,12 @@ SECURITY_INFORMATION SecurityInformation; ObjectSd = *ObjectsSecurityDescriptor; - ASSERT(ObjectSd->Control & SE_SELF_RELATIVE); /* The object does not have a security descriptor. */ if (!ObjectSd) return STATUS_NO_SECURITY_ON_OBJECT; + + ASSERT(ObjectSd->Control & SE_SELF_RELATIVE); SecurityInformation = *_SecurityInformation;

1 0

[tfaber] 56806: [NTOSKRNL:SE] - Use the correct pool tags for allocations in SepCaptureAcl/SepCaptureSid See issue #7138 for more details.
by tfaber＠svn.reactos.org 26 Jun '12

26 Jun '12

Author: tfaber Date: Tue Jun 26 07:21:45 2012 New Revision: 56806 URL: http://svn.reactos.org/svn/reactos?rev=56806&view=rev Log: [NTOSKRNL:SE] - Use the correct pool tags for allocations in SepCaptureAcl/SepCaptureSid See issue #7138 for more details. Modified: trunk/reactos/ntoskrnl/se/acl.c trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=5680… ============================================================================== --- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Tue Jun 26 07:21:45 2012 @@ -296,8 +296,9 @@ } _SEH2_END; - NewAcl = ExAllocatePool(PoolType, - AclSize); + NewAcl = ExAllocatePoolWithTag(PoolType, + AclSize, + TAG_ACL); if (NewAcl != NULL) { _SEH2_TRY @@ -329,8 +330,9 @@ { AclSize = InputAcl->AclSize; - NewAcl = ExAllocatePool(PoolType, - AclSize); + NewAcl = ExAllocatePoolWithTag(PoolType, + AclSize, + TAG_ACL); if (NewAcl != NULL) { Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=5680… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sid.c [iso-8859-1] Tue Jun 26 07:21:45 2012 @@ -285,7 +285,7 @@ _SEH2_END; /* allocate a SID and copy it */ - NewSid = ExAllocatePool(PoolType, SidSize); + NewSid = ExAllocatePoolWithTag(PoolType, SidSize, TAG_SID); if (!NewSid) return STATUS_INSUFFICIENT_RESOURCES; @@ -312,7 +312,7 @@ SidSize = RtlLengthRequiredSid(Sid->SubAuthorityCount); /* allocate a SID and copy it */ - NewSid = ExAllocatePool(PoolType, SidSize); + NewSid = ExAllocatePoolWithTag(PoolType, SidSize, TAG_SID); if (NewSid == NULL) return STATUS_INSUFFICIENT_RESOURCES;

1 0

[tfaber] 56805: [WS2_32_APITEST] - Fix GCC build
by tfaber＠svn.reactos.org 26 Jun '12

26 Jun '12

Author: tfaber Date: Tue Jun 26 06:28:06 2012 New Revision: 56805 URL: http://svn.reactos.org/svn/reactos?rev=56805&view=rev Log: [WS2_32_APITEST] - Fix GCC build Modified: trunk/rostests/apitests/ws2_32/WSAStartup.c Modified: trunk/rostests/apitests/ws2_32/WSAStartup.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAStartu… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] Tue Jun 26 06:28:06 2012 @@ -78,7 +78,7 @@ EqualLength = RtlCompareMemory(Buffer, Expected, Length); if (EqualLength != Length) { - ok(0, "String is '%S', expected '%S'\n", Buffer, Expected); + ok(0, "String is '%s', expected '%s'\n", Buffer, Expected); Result = FALSE; }

1 0

[tfaber] 56804: [APITESTS] - Add wininet and winhttp tests for Winsock loading and initialization behavior [WS2_32_APITEST] - Make WSAStartup test more robust and stricter
by tfaber＠svn.reactos.org 26 Jun '12

26 Jun '12

Author: tfaber Date: Tue Jun 26 06:08:38 2012 New Revision: 56804 URL: http://svn.reactos.org/svn/reactos?rev=56804&view=rev Log: [APITESTS] - Add wininet and winhttp tests for Winsock loading and initialization behavior [WS2_32_APITEST] - Make WSAStartup test more robust and stricter Added: trunk/rostests/apitests/winhttp/ trunk/rostests/apitests/winhttp/CMakeLists.txt (with props) trunk/rostests/apitests/winhttp/WinHttpOpen.c (with props) trunk/rostests/apitests/winhttp/testlist.c (with props) trunk/rostests/apitests/wininet/ trunk/rostests/apitests/wininet/CMakeLists.txt (with props) trunk/rostests/apitests/wininet/InternetOpen.c (with props) trunk/rostests/apitests/wininet/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/ws2_32/WSAStartup.c Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -14,4 +14,6 @@ add_subdirectory(w32kdll) add_subdirectory(w32knapi) endif() +add_subdirectory(winhttp) +add_subdirectory(wininet) add_subdirectory(ws2_32) Added: trunk/rostests/apitests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/CMakeLis… ============================================================================== --- trunk/rostests/apitests/winhttp/CMakeLists.txt (added) +++ trunk/rostests/apitests/winhttp/CMakeLists.txt [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -1,0 +1,12 @@ + +list(APPEND SOURCE + WinHttpOpen.c + testlist.c) + +add_executable(winhttp_apitest ${SOURCE}) +target_link_libraries(winhttp_apitest wine) +set_module_type(winhttp_apitest win32cui) +add_importlibs(winhttp_apitest msvcrt kernel32 ntdll) +#add_delay_importlibs(winhttp_apitest winhttp) + +add_cd_file(TARGET winhttp_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/winhttp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/winhttp/WinHttpOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/WinHttpO… ============================================================================== --- trunk/rostests/apitests/winhttp/WinHttpOpen.c (added) +++ trunk/rostests/apitests/winhttp/WinHttpOpen.c [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -1,0 +1,124 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for WinHttpOpen + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#include <winsock2.h> +#include <wine/test.h> +#include <winhttp.h> + +struct hostent *(WINAPI *pgethostbyname)(const char *); +int (WINAPI *pWSACancelBlockingCall)(void); +int (WINAPI *pWSAGetLastError)(void); + +HINTERNET (WINAPI *pWinHttpOpen)(LPCWSTR, DWORD, LPCWSTR, LPCWSTR, DWORD); +BOOL (WINAPI *pWinHttpCloseHandle)(HINTERNET); + +static +PVOID +GetProc( + PCSTR FunctionName) +{ + HMODULE ModuleHandle; + + ModuleHandle = GetModuleHandle(L"ws2_32"); + if (!ModuleHandle) + return NULL; + return GetProcAddress(ModuleHandle, FunctionName); +} + +#define PROC(name) (p##name = GetProc(#name)) + +static +BOOLEAN +IsWinsockLoaded(VOID) +{ + return GetModuleHandle(L"ws2_32") != NULL; +} + +static +BOOLEAN +IsWininetLoaded(VOID) +{ + return GetModuleHandle(L"wininet") != NULL; +} + +static +BOOLEAN +IsWinsockInitialized(VOID) +{ + struct hostent *Hostent; + + if (!PROC(gethostbyname) || !PROC(WSAGetLastError)) + return FALSE; + + Hostent = pgethostbyname("localhost"); + if (!Hostent) + ok_dec(pWSAGetLastError(), WSANOTINITIALISED); + return Hostent != NULL; +} + +static +BOOLEAN +AreLegacyFunctionsSupported(VOID) +{ + int Error; + + if (!PROC(WSACancelBlockingCall) || !PROC(WSAGetLastError)) + return FALSE; + + Error = pWSACancelBlockingCall(); + ok(Error == SOCKET_ERROR, "Error = %d\n", Error); + ok(pWSAGetLastError() == WSAEOPNOTSUPP || + pWSAGetLastError() == WSAEINVAL, "WSAGetLastError = %d\n", pWSAGetLastError()); + + return pWSAGetLastError() != WSAEOPNOTSUPP; +} + +START_TEST(WinHttpOpen) +{ + HMODULE ModuleHandle; + HINTERNET InternetHandle; + BOOL Success; + + ok(!IsWinsockLoaded(), "Winsock loaded on startup\n"); + ok(!IsWinsockInitialized(), "Winsock initialized on startup\n"); + ok(!IsWininetLoaded(), "Wininet loaded on startup\n"); + + ModuleHandle = GetModuleHandle(L"winhttp"); + ok_ptr(ModuleHandle, NULL); + ModuleHandle = LoadLibrary(L"winhttp"); + ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError()); + + pWinHttpOpen = (PVOID)GetProcAddress(ModuleHandle, "WinHttpOpen"); + pWinHttpCloseHandle = (PVOID)GetProcAddress(ModuleHandle, "WinHttpCloseHandle"); + + ok(!IsWinsockLoaded(), "Winsock loaded after winhttp load\n"); + ok(!IsWinsockInitialized(), "Winsock initialized after winhttp load\n"); + ok(!IsWininetLoaded(), "Wininet loaded after winhttp load\n"); + + InternetHandle = pWinHttpOpen(NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(InternetHandle != NULL, "InternetHandle = NULL\n"); + + if (InternetHandle != NULL) + { + ok(IsWinsockLoaded(), "Winsock not loaded after WinHttpOpen\n"); + ok(IsWinsockInitialized(), "Winsock not initialized after WinHttpOpen\n"); + ok(!IsWininetLoaded(), "Wininet loaded after WinHttpOpen\n"); + ok(AreLegacyFunctionsSupported(), "Winsock initialized with version 2\n"); + Success = pWinHttpCloseHandle(InternetHandle); + ok(Success, "WinHttpCloseHandle failed, error %lu\n", GetLastError()); + } + + ok(IsWinsockLoaded(), "Winsock unloaded after handle close\n"); + ok(IsWinsockInitialized(), "Winsock uninitialized after handle close\n"); + + FreeLibrary(ModuleHandle); + + ok(IsWinsockLoaded(), "Winsock unloaded after winhttp unload\n"); + trace("Winsock %sinitialized after winhttp unload (should be uninitialized in 2003, still initialized in 7)\n", + IsWinsockInitialized() ? "" : "un"); +} Propchange: trunk/rostests/apitests/winhttp/WinHttpOpen.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/winhttp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winhttp/testlist… ============================================================================== --- trunk/rostests/apitests/winhttp/testlist.c (added) +++ trunk/rostests/apitests/winhttp/testlist.c [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -1,0 +1,15 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_WinHttpOpen(void); + +const struct test winetest_testlist[] = +{ + { "WinHttpOpen", func_WinHttpOpen }, + + { 0, 0 } +}; Propchange: trunk/rostests/apitests/winhttp/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/CMakeLis… ============================================================================== --- trunk/rostests/apitests/wininet/CMakeLists.txt (added) +++ trunk/rostests/apitests/wininet/CMakeLists.txt [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -1,0 +1,12 @@ + +list(APPEND SOURCE + InternetOpen.c + testlist.c) + +add_executable(wininet_apitest ${SOURCE}) +target_link_libraries(wininet_apitest wine) +set_module_type(wininet_apitest win32cui) +add_importlibs(wininet_apitest msvcrt kernel32 ntdll) +#add_delay_importlibs(wininet_apitest wininet) + +add_cd_file(TARGET wininet_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/wininet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/wininet/InternetOpen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/Internet… ============================================================================== --- trunk/rostests/apitests/wininet/InternetOpen.c (added) +++ trunk/rostests/apitests/wininet/InternetOpen.c [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -1,0 +1,114 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for InternetOpen + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#include <winsock2.h> +#include <wine/test.h> +#include <wininet.h> + +struct hostent *(WINAPI *pgethostbyname)(const char *); +int (WINAPI *pWSACancelBlockingCall)(void); +int (WINAPI *pWSAGetLastError)(void); + +HINTERNET (WINAPI *pInternetOpen)(LPCTSTR, DWORD, LPCTSTR, LPCTSTR, DWORD); +BOOL (WINAPI *pInternetCloseHandle)(HINTERNET); + +static +PVOID +GetProc( + PCSTR FunctionName) +{ + HMODULE ModuleHandle; + + ModuleHandle = GetModuleHandle(L"ws2_32"); + if (!ModuleHandle) + return NULL; + return GetProcAddress(ModuleHandle, FunctionName); +} + +#define PROC(name) (p##name = GetProc(#name)) + +static +BOOLEAN +IsWinsockLoaded(VOID) +{ + return GetModuleHandle(L"ws2_32") != NULL; +} + +static +BOOLEAN +IsWinsockInitialized(VOID) +{ + struct hostent *Hostent; + + if (!PROC(gethostbyname) || !PROC(WSAGetLastError)) + return FALSE; + + Hostent = pgethostbyname("localhost"); + if (!Hostent) + ok_dec(pWSAGetLastError(), WSANOTINITIALISED); + return Hostent != NULL; +} + +static +BOOLEAN +AreLegacyFunctionsSupported(VOID) +{ + int Error; + + if (!PROC(WSACancelBlockingCall) || !PROC(WSAGetLastError)) + return FALSE; + + Error = pWSACancelBlockingCall(); + ok(Error == SOCKET_ERROR, "Error = %d\n", Error); + ok(pWSAGetLastError() == WSAEOPNOTSUPP || + pWSAGetLastError() == WSAEINVAL, "WSAGetLastError = %d\n", pWSAGetLastError()); + + return pWSAGetLastError() != WSAEOPNOTSUPP; +} + +START_TEST(InternetOpen) +{ + HMODULE ModuleHandle; + HINTERNET InternetHandle; + BOOL Success; + + ok(!IsWinsockLoaded(), "Winsock loaded on startup\n"); + ok(!IsWinsockInitialized(), "Winsock initialized on startup\n"); + + ModuleHandle = GetModuleHandle(L"wininet"); + ok_ptr(ModuleHandle, NULL); + ModuleHandle = LoadLibrary(L"wininet"); + ok(ModuleHandle != NULL, "LoadLibrary failed, error %lu\n", GetLastError()); + + pInternetOpen = (PVOID)GetProcAddress(ModuleHandle, "InternetOpenW"); + pInternetCloseHandle = (PVOID)GetProcAddress(ModuleHandle, "InternetCloseHandle"); + + ok(!IsWinsockLoaded(), "Winsock loaded after wininet load\n"); + ok(!IsWinsockInitialized(), "Winsock initialized after wininet load\n"); + + InternetHandle = pInternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(InternetHandle != NULL, "InternetHandle = NULL\n"); + + if (InternetHandle != NULL) + { + ok(IsWinsockLoaded(), "Winsock not loaded after InternetOpen\n"); + ok(IsWinsockInitialized(), "Winsock not initialized after InternetOpen\n"); + ok(!AreLegacyFunctionsSupported(), "Winsock initialized with version 1\n"); + Success = pInternetCloseHandle(InternetHandle); + ok(Success, "InternetCloseHandle failed, error %lu\n", GetLastError()); + } + + ok(IsWinsockLoaded(), "Winsock unloaded after handle close\n"); + ok(IsWinsockInitialized(), "Winsock uninitialized after handle close\n"); + + FreeLibrary(ModuleHandle); + + ok(IsWinsockLoaded(), "Winsock unloaded after wininet unload\n"); + trace("Winsock %sinitialized after wininet unload (should be uninitialized in 2003, still initialized in 7)\n", + IsWinsockInitialized() ? "" : "un"); +} Propchange: trunk/rostests/apitests/wininet/InternetOpen.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/wininet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/wininet/testlist… ============================================================================== --- trunk/rostests/apitests/wininet/testlist.c (added) +++ trunk/rostests/apitests/wininet/testlist.c [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -1,0 +1,15 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_InternetOpen(void); + +const struct test winetest_testlist[] = +{ + { "InternetOpen", func_InternetOpen }, + + { 0, 0 } +}; Propchange: trunk/rostests/apitests/wininet/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/WSAStartup.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAStartu… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] Tue Jun 26 06:08:38 2012 @@ -64,7 +64,50 @@ static BOOLEAN -IsInitialized(VOID) +CheckStringBuffer( + PCSTR Buffer, + SIZE_T MaximumLength, + PCSTR Expected, + UCHAR Fill) +{ + SIZE_T Length = strlen(Expected); + SIZE_T EqualLength; + BOOLEAN Result = TRUE; + SIZE_T i; + + EqualLength = RtlCompareMemory(Buffer, Expected, Length); + if (EqualLength != Length) + { + ok(0, "String is '%S', expected '%S'\n", Buffer, Expected); + Result = FALSE; + } + + if (Buffer[Length] != ANSI_NULL) + { + ok(0, "Not null terminated\n"); + Result = FALSE; + } + + /* The function nulls the rest of the buffer! */ + for (i = Length + 1; i < MaximumLength; i++) + { + UCHAR Char = ((PUCHAR)Buffer)[i]; + if (Char != Fill) + { + ok(0, "Found 0x%x at offset %lu, expected 0x%x\n", Char, (ULONG)i, Fill); + /* Don't count this as a failure unless the string was actually wrong */ + //Result = FALSE; + /* Don't flood the log */ + break; + } + } + + return Result; +} + +static +BOOLEAN +IsWinsockInitialized(VOID) { struct hostent *Hostent; @@ -91,6 +134,7 @@ START_TEST(WSAStartup) { NTSTATUS ExceptionStatus; + BOOLEAN Okay; LPWSADATA WsaData; int Error; struct @@ -125,7 +169,7 @@ const INT TestCount = sizeof(Tests) / sizeof(Tests[0]); INT i; - ok(!IsInitialized(), "Winsock unexpectedly initialized\n"); + ok(!IsWinsockInitialized(), "Winsock unexpectedly initialized\n"); /* parameter checks */ StartSeh() @@ -138,7 +182,7 @@ ok_dec(Error, WSAEFAULT); ok_dec(WSAGetLastError(), WSANOTINITIALISED); EndSeh(STATUS_SUCCESS); - ok(!IsInitialized(), "Winsock unexpectedly initialized\n"); + ok(!IsWinsockInitialized(), "Winsock unexpectedly initialized\n"); WsaData = AllocateGuarded(sizeof(*WsaData)); if (!WsaData) @@ -162,27 +206,35 @@ ok(!Tests[i].ExpectedSuccess, "WSAStartup failed unexpectedly\n"); ok_dec(Error, WSAVERNOTSUPPORTED); ok_dec(WSAGetLastError(), WSANOTINITIALISED); - ok(!IsInitialized(), "Winsock unexpectedly initialized\n"); + ok(!IsWinsockInitialized(), "Winsock unexpectedly initialized\n"); } else { ok(Tests[i].ExpectedSuccess, "WSAStartup succeeded unexpectedly\n"); ok_dec(WSAGetLastError(), 0); - ok(IsInitialized(), "Winsock not initialized despite success\n"); + ok(IsWinsockInitialized(), "Winsock not initialized despite success\n"); if (LOBYTE(Tests[i].Version) < 2) ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); else ok(!AreLegacyFunctionsSupported(), "Legacy function succeeded\n"); WSACleanup(); - ok(!IsInitialized(), "Winsock still initialized after cleanup\n"); + ok(!IsWinsockInitialized(), "Winsock still initialized after cleanup\n"); } if (Tests[i].ExpectedVersion) ok_hex(WsaData->wVersion, Tests[i].ExpectedVersion); else ok_hex(WsaData->wVersion, Tests[i].Version); ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); - ok_str(WsaData->szDescription, "WinSock 2.0"); - ok_str(WsaData->szSystemStatus, "Running"); + Okay = CheckStringBuffer(WsaData->szDescription, + sizeof(WsaData->szDescription), + "WinSock 2.0", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); + Okay = CheckStringBuffer(WsaData->szSystemStatus, + sizeof(WsaData->szSystemStatus), + "Running", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); if (LOBYTE(WsaData->wVersion) >= 2) { ok_dec(WsaData->iMaxSockets, 0); @@ -203,12 +255,20 @@ ok_dec(WSAGetLastError(), 0); ok_hex(WsaData->wVersion, MAKEWORD(1, 1)); ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); - ok_str(WsaData->szDescription, "WinSock 2.0"); - ok_str(WsaData->szSystemStatus, "Running"); + Okay = CheckStringBuffer(WsaData->szDescription, + sizeof(WsaData->szDescription), + "WinSock 2.0", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); + Okay = CheckStringBuffer(WsaData->szSystemStatus, + sizeof(WsaData->szSystemStatus), + "Running", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); ok_dec(WsaData->iMaxSockets, 32767); ok_dec(WsaData->iMaxUdpDg, 65467); ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); - ok(IsInitialized(), "Winsock not initialized\n"); + ok(IsWinsockInitialized(), "Winsock not initialized\n"); if (!Error) { ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); @@ -217,8 +277,16 @@ ok_dec(Error, 0); ok_hex(WsaData->wVersion, MAKEWORD(2, 2)); ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); - ok_str(WsaData->szDescription, "WinSock 2.0"); - ok_str(WsaData->szSystemStatus, "Running"); + Okay = CheckStringBuffer(WsaData->szDescription, + sizeof(WsaData->szDescription), + "WinSock 2.0", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); + Okay = CheckStringBuffer(WsaData->szSystemStatus, + sizeof(WsaData->szSystemStatus), + "Running", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); ok_dec(WsaData->iMaxSockets, 0); ok_dec(WsaData->iMaxUdpDg, 0); ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); @@ -226,10 +294,10 @@ { ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); WSACleanup(); - ok(IsInitialized(), "Winsock prematurely uninitialized\n"); + ok(IsWinsockInitialized(), "Winsock prematurely uninitialized\n"); } WSACleanup(); - ok(!IsInitialized(), "Winsock still initialized after cleanup\n"); + ok(!IsWinsockInitialized(), "Winsock still initialized after cleanup\n"); } /* downgrade the version */ @@ -239,12 +307,20 @@ ok_dec(WSAGetLastError(), 0); ok_hex(WsaData->wVersion, MAKEWORD(2, 2)); ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); - ok_str(WsaData->szDescription, "WinSock 2.0"); - ok_str(WsaData->szSystemStatus, "Running"); + Okay = CheckStringBuffer(WsaData->szDescription, + sizeof(WsaData->szDescription), + "WinSock 2.0", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); + Okay = CheckStringBuffer(WsaData->szSystemStatus, + sizeof(WsaData->szSystemStatus), + "Running", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); ok_dec(WsaData->iMaxSockets, 0); ok_dec(WsaData->iMaxUdpDg, 0); ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); - ok(IsInitialized(), "Winsock not initialized\n"); + ok(IsWinsockInitialized(), "Winsock not initialized\n"); if (!Error) { ok(!AreLegacyFunctionsSupported(), "Legacy function succeeded\n"); @@ -253,8 +329,16 @@ ok_dec(Error, 0); ok_hex(WsaData->wVersion, MAKEWORD(1, 1)); ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); - ok_str(WsaData->szDescription, "WinSock 2.0"); - ok_str(WsaData->szSystemStatus, "Running"); + Okay = CheckStringBuffer(WsaData->szDescription, + sizeof(WsaData->szDescription), + "WinSock 2.0", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); + Okay = CheckStringBuffer(WsaData->szSystemStatus, + sizeof(WsaData->szSystemStatus), + "Running", + 0x55); + ok(Okay, "CheckStringBuffer failed\n"); ok_dec(WsaData->iMaxSockets, 32767); ok_dec(WsaData->iMaxUdpDg, 65467); ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); @@ -262,10 +346,10 @@ { ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); WSACleanup(); - ok(IsInitialized(), "Winsock prematurely uninitialized\n"); + ok(IsWinsockInitialized(), "Winsock prematurely uninitialized\n"); } WSACleanup(); - ok(!IsInitialized(), "Winsock still initialized after cleanup\n"); + ok(!IsWinsockInitialized(), "Winsock still initialized after cleanup\n"); } FreeGuarded(WsaData);

1 0

[tfaber] 56803: [WINETESTS] - Make function-style macros in test.h actually behave function-like (aka fix build)
by tfaber＠svn.reactos.org 25 Jun '12

25 Jun '12

Author: tfaber Date: Mon Jun 25 10:09:33 2012 New Revision: 56803 URL: http://svn.reactos.org/svn/reactos?rev=56803&view=rev Log: [WINETESTS] - Make function-style macros in test.h actually behave function-like (aka fix build) Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Mon Jun 25 10:09:33 2012 @@ -626,31 +626,31 @@ // Some helpful definitions #define ok_hex(expression, result) \ - { \ + do { \ int _value = (expression); \ ok(_value == (result), "Wrong value for '%s', expected: " #result " (0x%x), got: 0x%x\n", \ #expression, (int)(result), _value); \ - } + } while (0) #define ok_dec(expression, result) \ - { \ + do { \ int _value = (expression); \ ok(_value == (result), "Wrong value for '%s', expected: " #result " (%d), got: %d\n", \ #expression, (int)(result), _value); \ - } + } while (0) #define ok_ptr(expression, result) \ - { \ + do { \ void *_value = (expression); \ ok(_value == (result), "Wrong value for '%s', expected: " #result " (%p), got: %p\n", \ #expression, (void*)(result), _value); \ - } + } while (0) #define ok_err(error) \ ok(GetLastError() == (error), "Wrong last error. Expected " #error ", got %d\n", (int)GetLastError()) #define ok_str(x, y) \ - ok(strcmp(x, y) == 0, "Wrong string. Expected '%s', got '%s'\n", y, x); + ok(strcmp(x, y) == 0, "Wrong string. Expected '%s', got '%s'\n", y, x) #define ok_long(expression, result) ok_hex(expression, result) #define ok_int(expression, result) ok_dec(expression, result)

1 0

[tfaber] 56802: [WS2_32_APITEST] - Add a few more getaddrinfo tests - Add a test for WSAStartup
by tfaber＠svn.reactos.org 25 Jun '12

25 Jun '12

Author: tfaber Date: Mon Jun 25 08:21:11 2012 New Revision: 56802 URL: http://svn.reactos.org/svn/reactos?rev=56802&view=rev Log: [WS2_32_APITEST] - Add a few more getaddrinfo tests - Add a test for WSAStartup Added: trunk/rostests/apitests/ws2_32/WSAStartup.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/getaddrinfo.c trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Mon Jun 25 08:21:11 2012 @@ -4,6 +4,7 @@ helpers.c ioctlsocket.c recv.c + WSAStartup.c testlist.c) add_executable(ws2_32_apitest ${SOURCE}) Added: trunk/rostests/apitests/ws2_32/WSAStartup.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAStartu… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAStartup.c (added) +++ trunk/rostests/apitests/ws2_32/WSAStartup.c [iso-8859-1] Mon Jun 25 08:21:11 2012 @@ -1,0 +1,272 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for WSAStartup + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <winsock2.h> +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/rtlfuncs.h> +#include <ndk/mmfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +static +PVOID +AllocateGuarded( + SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); + PVOID VirtualMemory = NULL; + PCHAR StartOfBuffer; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); + + if (!NT_SUCCESS(Status)) + return NULL; + + Size -= PAGE_SIZE; + if (Size) + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + return NULL; + } + } + + StartOfBuffer = VirtualMemory; + StartOfBuffer += Size - SizeRequested; + + return StartOfBuffer; +} + +static +VOID +FreeGuarded( + PVOID Pointer) +{ + NTSTATUS Status; + PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +static +BOOLEAN +IsInitialized(VOID) +{ + struct hostent *Hostent; + + Hostent = gethostbyname("localhost"); + if (!Hostent) + ok_dec(WSAGetLastError(), WSANOTINITIALISED); + return Hostent != NULL; +} + +static +BOOLEAN +AreLegacyFunctionsSupported(VOID) +{ + int Error; + + Error = WSACancelBlockingCall(); + ok(Error == SOCKET_ERROR, "Error = %d\n", Error); + ok(WSAGetLastError() == WSAEOPNOTSUPP || + WSAGetLastError() == WSAEINVAL, "WSAGetLastError = %d\n", WSAGetLastError()); + + return WSAGetLastError() != WSAEOPNOTSUPP; +} + +START_TEST(WSAStartup) +{ + NTSTATUS ExceptionStatus; + LPWSADATA WsaData; + int Error; + struct + { + WORD Version; + BOOLEAN ExpectedSuccess; + WORD ExpectedVersion; + } Tests[] = + { + { MAKEWORD(0, 0), FALSE, MAKEWORD(2, 2) }, + { MAKEWORD(0, 9), FALSE, MAKEWORD(2, 2) }, + { MAKEWORD(1, 0), TRUE }, + { MAKEWORD(1, 1), TRUE }, + { MAKEWORD(1, 2), TRUE, MAKEWORD(1, 1) }, + { MAKEWORD(1, 15), TRUE, MAKEWORD(1, 1) }, + { MAKEWORD(1, 255), TRUE, MAKEWORD(1, 1) }, + { MAKEWORD(2, 0), TRUE }, + { MAKEWORD(2, 1), TRUE }, + { MAKEWORD(2, 2), TRUE }, + { MAKEWORD(2, 3), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(2, 15), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(2, 255), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(3, 0), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(3, 1), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(3, 2), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(3, 3), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(3, 15), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(3, 255), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(15, 255), TRUE, MAKEWORD(2, 2) }, + { MAKEWORD(255, 255), TRUE, MAKEWORD(2, 2) }, + }; + const INT TestCount = sizeof(Tests) / sizeof(Tests[0]); + INT i; + + ok(!IsInitialized(), "Winsock unexpectedly initialized\n"); + + /* parameter checks */ + StartSeh() + Error = WSAStartup(0, NULL); + ok_dec(Error, WSAVERNOTSUPPORTED); + ok_dec(WSAGetLastError(), WSANOTINITIALISED); + EndSeh(STATUS_SUCCESS); + StartSeh() + Error = WSAStartup(MAKEWORD(2, 2), NULL); + ok_dec(Error, WSAEFAULT); + ok_dec(WSAGetLastError(), WSANOTINITIALISED); + EndSeh(STATUS_SUCCESS); + ok(!IsInitialized(), "Winsock unexpectedly initialized\n"); + + WsaData = AllocateGuarded(sizeof(*WsaData)); + if (!WsaData) + { + skip("Out of memory\n"); + return; + } + + /* test different version */ + for (i = 0; i < TestCount; i++) + { + trace("%d: version %d.%d\n", + i, LOBYTE(Tests[i].Version), HIBYTE(Tests[i].Version)); + FillMemory(WsaData, sizeof(*WsaData), 0x55); + Error = WSANO_RECOVERY; + StartSeh() + Error = WSAStartup(Tests[i].Version, WsaData); + EndSeh(STATUS_SUCCESS); + if (Error) + { + ok(!Tests[i].ExpectedSuccess, "WSAStartup failed unexpectedly\n"); + ok_dec(Error, WSAVERNOTSUPPORTED); + ok_dec(WSAGetLastError(), WSANOTINITIALISED); + ok(!IsInitialized(), "Winsock unexpectedly initialized\n"); + } + else + { + ok(Tests[i].ExpectedSuccess, "WSAStartup succeeded unexpectedly\n"); + ok_dec(WSAGetLastError(), 0); + ok(IsInitialized(), "Winsock not initialized despite success\n"); + if (LOBYTE(Tests[i].Version) < 2) + ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); + else + ok(!AreLegacyFunctionsSupported(), "Legacy function succeeded\n"); + WSACleanup(); + ok(!IsInitialized(), "Winsock still initialized after cleanup\n"); + } + if (Tests[i].ExpectedVersion) + ok_hex(WsaData->wVersion, Tests[i].ExpectedVersion); + else + ok_hex(WsaData->wVersion, Tests[i].Version); + ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); + ok_str(WsaData->szDescription, "WinSock 2.0"); + ok_str(WsaData->szSystemStatus, "Running"); + if (LOBYTE(WsaData->wVersion) >= 2) + { + ok_dec(WsaData->iMaxSockets, 0); + ok_dec(WsaData->iMaxUdpDg, 0); + } + else + { + ok_dec(WsaData->iMaxSockets, 32767); + ok_dec(WsaData->iMaxUdpDg, 65467); + } + ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); + } + + /* upgrade the version */ + FillMemory(WsaData, sizeof(*WsaData), 0x55); + Error = WSAStartup(MAKEWORD(1, 1), WsaData); + ok_dec(Error, 0); + ok_dec(WSAGetLastError(), 0); + ok_hex(WsaData->wVersion, MAKEWORD(1, 1)); + ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); + ok_str(WsaData->szDescription, "WinSock 2.0"); + ok_str(WsaData->szSystemStatus, "Running"); + ok_dec(WsaData->iMaxSockets, 32767); + ok_dec(WsaData->iMaxUdpDg, 65467); + ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); + ok(IsInitialized(), "Winsock not initialized\n"); + if (!Error) + { + ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); + FillMemory(WsaData, sizeof(*WsaData), 0x55); + Error = WSAStartup(MAKEWORD(2, 2), WsaData); + ok_dec(Error, 0); + ok_hex(WsaData->wVersion, MAKEWORD(2, 2)); + ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); + ok_str(WsaData->szDescription, "WinSock 2.0"); + ok_str(WsaData->szSystemStatus, "Running"); + ok_dec(WsaData->iMaxSockets, 0); + ok_dec(WsaData->iMaxUdpDg, 0); + ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); + if (!Error) + { + ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); + WSACleanup(); + ok(IsInitialized(), "Winsock prematurely uninitialized\n"); + } + WSACleanup(); + ok(!IsInitialized(), "Winsock still initialized after cleanup\n"); + } + + /* downgrade the version */ + FillMemory(WsaData, sizeof(*WsaData), 0x55); + Error = WSAStartup(MAKEWORD(2, 2), WsaData); + ok_dec(Error, 0); + ok_dec(WSAGetLastError(), 0); + ok_hex(WsaData->wVersion, MAKEWORD(2, 2)); + ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); + ok_str(WsaData->szDescription, "WinSock 2.0"); + ok_str(WsaData->szSystemStatus, "Running"); + ok_dec(WsaData->iMaxSockets, 0); + ok_dec(WsaData->iMaxUdpDg, 0); + ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); + ok(IsInitialized(), "Winsock not initialized\n"); + if (!Error) + { + ok(!AreLegacyFunctionsSupported(), "Legacy function succeeded\n"); + FillMemory(WsaData, sizeof(*WsaData), 0x55); + Error = WSAStartup(MAKEWORD(1, 1), WsaData); + ok_dec(Error, 0); + ok_hex(WsaData->wVersion, MAKEWORD(1, 1)); + ok_hex(WsaData->wHighVersion, MAKEWORD(2, 2)); + ok_str(WsaData->szDescription, "WinSock 2.0"); + ok_str(WsaData->szSystemStatus, "Running"); + ok_dec(WsaData->iMaxSockets, 32767); + ok_dec(WsaData->iMaxUdpDg, 65467); + ok_ptr(WsaData->lpVendorInfo, (PVOID)0x5555555555555555ULL); + if (!Error) + { + ok(AreLegacyFunctionsSupported(), "Legacy function failed\n"); + WSACleanup(); + ok(IsInitialized(), "Winsock prematurely uninitialized\n"); + } + WSACleanup(); + ok(!IsInitialized(), "Winsock still initialized after cleanup\n"); + } + + FreeGuarded(WsaData); +} Propchange: trunk/rostests/apitests/ws2_32/WSAStartup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getaddrin… ============================================================================== --- trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] Mon Jun 25 08:21:11 2012 @@ -66,6 +66,9 @@ { "0.0.0.0:80", NULL }, { "0.0.0.0.0", NULL }, { "1.1.1.256", NULL }, + { "1.2.3", NULL }, + { "1.2.3.0x4", "1.2.3.4", AI_NUMERICHOST }, + { "1.2.3.010", "1.2.3.8", AI_NUMERICHOST }, /* let's just assume this one doesn't change any time soon ;) */ { "google-public-dns-a.google.com", "8.8.8.8" }, }; @@ -80,7 +83,7 @@ for (i = 0; i < TestCount; i++) { trace("%d: '%s'\n", i, Tests[i].NodeName); - StartSeh(); + StartSeh() AddrInfo = InvalidPointer; Error = getaddrinfo(Tests[i].NodeName, NULL, &Hints, &AddrInfo); if (Tests[i].ExpectedAddress) @@ -214,6 +217,17 @@ struct hostent *Hostent; /* not yet initialized */ + StartSeh() + Error = getaddrinfo(NULL, NULL, NULL, NULL); + ok_dec(Error, WSANOTINITIALISED); + EndSeh(STATUS_SUCCESS); + StartSeh() + AddrInfo = InvalidPointer; + Error = getaddrinfo(NULL, NULL, NULL, &AddrInfo); + ok_dec(Error, WSANOTINITIALISED); + ok_ptr(AddrInfo, InvalidPointer); + EndSeh(STATUS_SUCCESS); + Error = getaddrinfo("127.0.0.1", "80", NULL, &AddrInfo); ok_dec(Error, WSANOTINITIALISED); @@ -239,9 +253,9 @@ ZeroMemory(&Hints, sizeof(Hints)); /* parameter tests */ - StartSeh(); getaddrinfo(NULL, NULL, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh(); getaddrinfo("", "", &Hints, NULL); EndSeh(STATUS_ACCESS_VIOLATION); - StartSeh(); + StartSeh() getaddrinfo(NULL, NULL, NULL, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() getaddrinfo("", "", &Hints, NULL); EndSeh(STATUS_ACCESS_VIOLATION); + StartSeh() AddrInfo = InvalidPointer; Error = getaddrinfo(NULL, NULL, NULL, &AddrInfo); ok_dec(Error, WSAHOST_NOT_FOUND); Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Mon Jun 25 08:21:11 2012 @@ -8,12 +8,14 @@ extern void func_getaddrinfo(void); extern void func_ioctlsocket(void); extern void func_recv(void); +extern void func_WSAStartup(void); const struct test winetest_testlist[] = { { "getaddrinfo", func_getaddrinfo }, { "ioctlsocket", func_ioctlsocket }, { "recv", func_recv }, + { "WSAStartup", func_WSAStartup }, { 0, 0 } };

1 0

[ekohl] 56801: [SAMSRV] Implement SamrQueryInformationAlias and simplify SamrSetInformationAlias.
by ekohl＠svn.reactos.org 24 Jun '12

24 Jun '12

Author: ekohl Date: Sun Jun 24 21:42:13 2012 New Revision: 56801 URL: http://svn.reactos.org/svn/reactos?rev=56801&view=rev Log: [SAMSRV] Implement SamrQueryInformationAlias and simplify SamrSetInformationAlias. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jun 24 21:42:13 2012 @@ -1506,6 +1506,254 @@ return STATUS_SUCCESS; } + +static NTSTATUS +SampQueryAliasGeneral(PSAM_DB_OBJECT AliasObject, + PSAMPR_ALIAS_INFO_BUFFER *Buffer) +{ + PSAMPR_ALIAS_INFO_BUFFER InfoBuffer = NULL; + HANDLE MembersKeyHandle = NULL; + ULONG NameLength = 0; + ULONG DescriptionLength = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_ALIAS_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(AliasObject, + L"Name", + NULL, + NULL, + &NameLength); + TRACE("Status 0x%08lx\n", Status); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->General.Name.Length = NameLength - sizeof(WCHAR); + InfoBuffer->General.Name.MaximumLength = NameLength; + InfoBuffer->General.Name.Buffer = midl_user_allocate(NameLength); + if (InfoBuffer->General.Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Name Length: %lu\n", NameLength); + Status = SampGetObjectAttribute(AliasObject, + L"Name", + NULL, + (PVOID)InfoBuffer->General.Name.Buffer, + &NameLength); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + Status = SampGetObjectAttribute(AliasObject, + L"Description", + NULL, + NULL, + &DescriptionLength); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->General.AdminComment.Length = DescriptionLength - sizeof(WCHAR); + InfoBuffer->General.AdminComment.MaximumLength = DescriptionLength; + InfoBuffer->General.AdminComment.Buffer = midl_user_allocate(DescriptionLength); + if (InfoBuffer->General.AdminComment.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Description Length: %lu\n", DescriptionLength); + Status = SampGetObjectAttribute(AliasObject, + L"Description", + NULL, + (PVOID)InfoBuffer->General.AdminComment.Buffer, + &DescriptionLength); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Open the Members subkey */ + Status = SampRegOpenKey(AliasObject->KeyHandle, + L"Members", + KEY_READ, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + /* Retrieve the number of members of the alias */ + Status = SampRegQueryKeyInfo(MembersKeyHandle, + NULL, + &InfoBuffer->General.MemberCount); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *Buffer = InfoBuffer; + +done: + if (MembersKeyHandle != NULL) + SampRegCloseKey(MembersKeyHandle); + + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->General.Name.Buffer != NULL) + midl_user_free(InfoBuffer->General.Name.Buffer); + + if (InfoBuffer->General.AdminComment.Buffer != NULL) + midl_user_free(InfoBuffer->General.AdminComment.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryAliasName(PSAM_DB_OBJECT AliasObject, + PSAMPR_ALIAS_INFO_BUFFER *Buffer) +{ + PSAMPR_ALIAS_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_ALIAS_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(AliasObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Name.Name.Length = Length - sizeof(WCHAR); + InfoBuffer->Name.Name.MaximumLength = Length; + InfoBuffer->Name.Name.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Name.Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(AliasObject, + L"Name", + NULL, + (PVOID)InfoBuffer->Name.Name.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->Name.Name.Buffer != NULL) + midl_user_free(InfoBuffer->Name.Name.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryAliasAdminComment(PSAM_DB_OBJECT AliasObject, + PSAMPR_ALIAS_INFO_BUFFER *Buffer) +{ + PSAMPR_ALIAS_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_ALIAS_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(AliasObject, + L"Description", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + goto done; + + InfoBuffer->AdminComment.AdminComment.Length = Length - sizeof(WCHAR); + InfoBuffer->AdminComment.AdminComment.MaximumLength = Length; + InfoBuffer->AdminComment.AdminComment.Buffer = midl_user_allocate(Length); + if (InfoBuffer->AdminComment.AdminComment.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Status = SampGetObjectAttribute(AliasObject, + L"Description", + NULL, + (PVOID)InfoBuffer->AdminComment.AdminComment.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + if (InfoBuffer->AdminComment.AdminComment.Buffer != NULL) + midl_user_free(InfoBuffer->AdminComment.AdminComment.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + /* Function 28 */ NTSTATUS NTAPI @@ -1529,22 +1777,20 @@ switch (AliasInformationClass) { -#if 0 case AliasGeneralInformation: Status = SampQueryAliasGeneral(AliasObject, - &Buffer->General); + Buffer); break; case AliasNameInformation: Status = SampQueryAliasName(AliasObject, - &Buffer->Name); + Buffer); break; case AliasAdminCommentInformation: Status = SampQueryAliasAdminComment(AliasObject, - &Buffer->AdminComment); + Buffer); break; -#endif default: Status = STATUS_INVALID_INFO_CLASS; @@ -1557,30 +1803,30 @@ static NTSTATUS SampSetAliasName(PSAM_DB_OBJECT AliasObject, - PSAMPR_ALIAS_NAME_INFORMATION AliasNameInfo) + PSAMPR_ALIAS_INFO_BUFFER Buffer) { NTSTATUS Status; Status = SampSetObjectAttribute(AliasObject, L"Name", REG_SZ, - AliasNameInfo->Name.Buffer, - AliasNameInfo->Name.Length + sizeof(WCHAR)); + Buffer->Name.Name.Buffer, + Buffer->Name.Name.Length + sizeof(WCHAR)); return Status; } static NTSTATUS SampSetAliasAdminComment(PSAM_DB_OBJECT AliasObject, - PSAMPR_ALIAS_ADM_COMMENT_INFORMATION AliasAdminCommentInfo) + PSAMPR_ALIAS_INFO_BUFFER Buffer) { NTSTATUS Status; Status = SampSetObjectAttribute(AliasObject, L"Description", REG_SZ, - AliasAdminCommentInfo->AdminComment.Buffer, - AliasAdminCommentInfo->AdminComment.Length + sizeof(WCHAR)); + Buffer->AdminComment.AdminComment.Buffer, + Buffer->AdminComment.AdminComment.Length + sizeof(WCHAR)); return Status; } @@ -1610,12 +1856,12 @@ { case AliasNameInformation: Status = SampSetAliasName(AliasObject, - &Buffer->Name); + Buffer); break; case AliasAdminCommentInformation: Status = SampSetAliasAdminComment(AliasObject, - &Buffer->AdminComment); + Buffer); break; default:

1 0

[ekohl] 56800: [NTOSKRNL] Fix error handling for SepDuplicateToken and SeCreateToken.
by ekohl＠svn.reactos.org 24 Jun '12

24 Jun '12

Author: ekohl Date: Sun Jun 24 21:04:11 2012 New Revision: 56800 URL: http://svn.reactos.org/svn/reactos?rev=56800&view=rev Log: [NTOSKRNL] Fix error handling for SepDuplicateToken and SeCreateToken. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sun Jun 24 21:04:11 2012 @@ -234,7 +234,7 @@ ULONG uLength; ULONG i; PVOID EndMem; - PTOKEN AccessToken; + PTOKEN AccessToken = NULL; NTSTATUS Status; PAGED_CODE(); @@ -290,10 +290,14 @@ for (i = 0; i < Token->UserAndGroupCount; i++) uLength += RtlLengthSid(Token->UserAndGroups[i].Sid); - AccessToken->UserAndGroups = - (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG_TOKEN_USERS); + AccessToken->UserAndGroups = ExAllocatePoolWithTag(PagedPool, + uLength, + TAG_TOKEN_USERS); + if (AccessToken->UserAndGroups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -304,48 +308,69 @@ EndMem, &EndMem, &uLength); - if (NT_SUCCESS(Status)) - { - Status = SepFindPrimaryGroupAndDefaultOwner( - AccessToken, - Token->PrimaryGroup, - 0); - } - - if (NT_SUCCESS(Status)) - { - AccessToken->PrivilegeCount = Token->PrivilegeCount; - - uLength = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + if (!NT_SUCCESS(Status)) + goto done; + + Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, + Token->PrimaryGroup, + 0); + if (!NT_SUCCESS(Status)) + goto done; + + AccessToken->PrivilegeCount = Token->PrivilegeCount; + + uLength = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); + AccessToken->Privileges = ExAllocatePoolWithTag(PagedPool, uLength, TAG_TOKEN_PRIVILAGES); - - for (i = 0; i < AccessToken->PrivilegeCount; i++) - { - RtlCopyLuid(&AccessToken->Privileges[i].Luid, - &Token->Privileges[i].Luid); - AccessToken->Privileges[i].Attributes = - Token->Privileges[i].Attributes; - } - - if (Token->DefaultDacl) - { - AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_ACL); - memcpy(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - } - - if (NT_SUCCESS(Status)) - { - *NewAccessToken = AccessToken; - return(STATUS_SUCCESS); + if (AccessToken->Privileges == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + for (i = 0; i < AccessToken->PrivilegeCount; i++) + { + RtlCopyLuid(&AccessToken->Privileges[i].Luid, + &Token->Privileges[i].Luid); + AccessToken->Privileges[i].Attributes = + Token->Privileges[i].Attributes; + } + + if (Token->DefaultDacl) + { + AccessToken->DefaultDacl = ExAllocatePoolWithTag(PagedPool, + Token->DefaultDacl->AclSize, + TAG_TOKEN_ACL); + if (AccessToken->DefaultDacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(AccessToken->DefaultDacl, + Token->DefaultDacl, + Token->DefaultDacl->AclSize); + } + + *NewAccessToken = AccessToken; + +done: + if (!NT_SUCCESS(Status)) + { + if (AccessToken) + { + if (AccessToken->UserAndGroups) + ExFreePoolWithTag(AccessToken->UserAndGroups, TAG_TOKEN_USERS); + + if (AccessToken->Privileges) + ExFreePoolWithTag(AccessToken->Privileges, TAG_TOKEN_PRIVILAGES); + + if (AccessToken->DefaultDacl) + ExFreePoolWithTag(AccessToken->DefaultDacl, TAG_TOKEN_ACL); + + ObDereferenceObject(AccessToken); + } } return Status; @@ -636,10 +661,14 @@ for (i = 0; i < GroupCount; i++) uLength += RtlLengthSid(Groups[i].Sid); - AccessToken->UserAndGroups = - (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG_TOKEN_USERS); + AccessToken->UserAndGroups = ExAllocatePoolWithTag(PagedPool, + uLength, + TAG_TOKEN_USERS); + if (AccessToken->UserAndGroups == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -650,65 +679,71 @@ EndMem, &EndMem, &uLength); - if (NT_SUCCESS(Status)) - { - Status = RtlCopySidAndAttributesArray(GroupCount, - Groups, - uLength, - &AccessToken->UserAndGroups[1], - EndMem, - &EndMem, - &uLength); - } - - if (NT_SUCCESS(Status)) - { - Status = SepFindPrimaryGroupAndDefaultOwner( - AccessToken, - PrimaryGroup, - Owner); - } - - if (NT_SUCCESS(Status)) - { - uLength = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlCopySidAndAttributesArray(GroupCount, + Groups, + uLength, + &AccessToken->UserAndGroups[1], + EndMem, + &EndMem, + &uLength); + if (!NT_SUCCESS(Status)) + goto done; + + Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, + PrimaryGroup, + Owner); + if (!NT_SUCCESS(Status)) + goto done; + + uLength = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); + AccessToken->Privileges = ExAllocatePoolWithTag(PagedPool, uLength, TAG_TOKEN_PRIVILAGES); - - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - RtlCopyMemory(AccessToken->Privileges, - Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - else + if (AccessToken->Privileges == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + if (PreviousMode != KernelMode) + { + _SEH2_TRY { RtlCopyMemory(AccessToken->Privileges, Privileges, PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); } - } - - if (NT_SUCCESS(Status)) - { - AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(PagedPool, - DefaultDacl->AclSize, - TAG_TOKEN_ACL); - memcpy(AccessToken->DefaultDacl, - DefaultDacl, - DefaultDacl->AclSize); - } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + RtlCopyMemory(AccessToken->Privileges, + Privileges, + PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); + } + + if (!NT_SUCCESS(Status)) + goto done; + + AccessToken->DefaultDacl = ExAllocatePoolWithTag(PagedPool, + DefaultDacl->AclSize, + TAG_TOKEN_ACL); + if (AccessToken->DefaultDacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + RtlCopyMemory(AccessToken->DefaultDacl, + DefaultDacl, + DefaultDacl->AclSize); if (!SystemToken) { @@ -727,6 +762,24 @@ { /* Return pointer instead of handle */ *TokenHandle = (HANDLE)AccessToken; + } + +done: + if (!NT_SUCCESS(Status)) + { + if (AccessToken) + { + if (AccessToken->UserAndGroups) + ExFreePoolWithTag(AccessToken->UserAndGroups, TAG_TOKEN_USERS); + + if (AccessToken->Privileges) + ExFreePoolWithTag(AccessToken->Privileges, TAG_TOKEN_PRIVILAGES); + + if (AccessToken->DefaultDacl) + ExFreePoolWithTag(AccessToken->DefaultDacl, TAG_TOKEN_ACL); + + ObDereferenceObject(AccessToken); + } } return Status;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs