Ros-diffs June 2012

ros-diffs@reactos.org

11 participants
120 discussions

[tfaber] 56805: [WS2_32_APITEST] - Fix GCC build

by tfaber＠svn.reactos.org

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; }

12 years, 6 months

[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

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);

12 years, 6 months

[tfaber] 56803: [WINETESTS] - Make function-style macros in test.h actually behave function-like (aka fix build)

by tfaber＠svn.reactos.org

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)

12 years, 6 months

[tfaber] 56802: [WS2_32_APITEST] - Add a few more getaddrinfo tests - Add a test for WSAStartup

by tfaber＠svn.reactos.org

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 } };

12 years, 6 months

[ekohl] 56801: [SAMSRV] Implement SamrQueryInformationAlias and simplify SamrSetInformationAlias.

by ekohl＠svn.reactos.org

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:

12 years, 6 months

[ekohl] 56800: [NTOSKRNL] Fix error handling for SepDuplicateToken and SeCreateToken.

by ekohl＠svn.reactos.org

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;

12 years, 6 months

[tkreuzer] 56799: [RTL] Fix remainung RtlBitmapApi tests

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 24 18:33:08 2012 New Revision: 56799 URL: http://svn.reactos.org/svn/reactos?rev=56799&view=rev Log: [RTL] Fix remainung RtlBitmapApi tests Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=56799… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Jun 24 18:33:08 2012 @@ -450,10 +450,14 @@ return MAXULONG; } + /* Check if the hint is outside the bitmap */ + if (HintIndex >= BitMapHeader->SizeOfBitMap) HintIndex = 0; + /* Check for trivial case */ if (NumberToFind == 0) { - return HintIndex; + /* Return hint rounded down to byte margin */ + return HintIndex & ~7; } /* First margin is end of bitmap */ @@ -514,10 +518,14 @@ return MAXULONG; } + /* Check if the hint is outside the bitmap */ + if (HintIndex >= BitMapHeader->SizeOfBitMap) HintIndex = 0; + /* Check for trivial case */ if (NumberToFind == 0) { - return HintIndex; + /* Return hint rounded down to byte margin */ + return HintIndex & ~7; } /* First margin is end of bitmap */

12 years, 6 months

[tkreuzer] 56798: [NTDLL_APITEST] Add some more tests for rtl bitmap functions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 24 18:28:33 2012 New Revision: 56798 URL: http://svn.reactos.org/svn/reactos?rev=56798&view=rev Log: [NTDLL_APITEST] Add some more tests for rtl bitmap functions Modified: trunk/rostests/apitests/ntdll/RtlBitmap.c Modified: trunk/rostests/apitests/ntdll/RtlBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlBitmap.… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlBitmap.c [iso-8859-1] Sun Jun 24 18:28:33 2012 @@ -290,6 +290,7 @@ ok_int(RtlFindClearBits(&BitMapHeader, 1, 1), -1); RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 3), 0); ok_int(RtlFindClearBits(&BitMapHeader, 1, 0), 1); ok_int(RtlFindClearBits(&BitMapHeader, 1, 1), 1); ok_int(RtlFindClearBits(&BitMapHeader, 1, 2), 4); @@ -298,14 +299,21 @@ ok_int(RtlFindClearBits(&BitMapHeader, 3, 0), -1); RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 21), 16); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 12), 8); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 31), 24); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 32), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 0, 39), 0); ok_int(RtlFindClearBits(&BitMapHeader, 4, 0), 11); ok_int(RtlFindClearBits(&BitMapHeader, 5, 0), 20); ok_int(RtlFindClearBits(&BitMapHeader, 4, 11), 11); ok_int(RtlFindClearBits(&BitMapHeader, 4, 12), 20); ok_int(RtlFindClearBits(&BitMapHeader, 2, 11), 11); ok_int(RtlFindClearBits(&BitMapHeader, 2, 12), 12); - ok_int(RtlFindClearBits(&BitMapHeader, 0, 12), 8); - ok_int(RtlFindClearBits(&BitMapHeader, 0, 39), 0); + ok_int(RtlFindClearBits(&BitMapHeader, 1, 32), 1); + ok_int(RtlFindClearBits(&BitMapHeader, 4, 32), 11); + ok_int(RtlFindClearBits(&BitMapHeader, 5, 32), 20); } @@ -325,6 +333,7 @@ ok_int(RtlFindSetBits(&BitMapHeader, 1, 1), -1); RtlInitializeBitMap(&BitMapHeader, Buffer, 8); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 3), 0); ok_int(RtlFindSetBits(&BitMapHeader, 1, 0), 1); ok_int(RtlFindSetBits(&BitMapHeader, 1, 1), 1); ok_int(RtlFindSetBits(&BitMapHeader, 1, 2), 4); @@ -333,14 +342,20 @@ ok_int(RtlFindSetBits(&BitMapHeader, 3, 0), -1); RtlInitializeBitMap(&BitMapHeader, Buffer, 32); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 3), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 21), 16); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 12), 8); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 31), 24); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 32), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 0, 39), 0); ok_int(RtlFindSetBits(&BitMapHeader, 4, 0), 11); ok_int(RtlFindSetBits(&BitMapHeader, 5, 0), 20); ok_int(RtlFindSetBits(&BitMapHeader, 4, 11), 11); ok_int(RtlFindSetBits(&BitMapHeader, 4, 12), 20); ok_int(RtlFindSetBits(&BitMapHeader, 2, 11), 11); - ok_int(RtlFindSetBits(&BitMapHeader, 2, 12), 12); - ok_int(RtlFindSetBits(&BitMapHeader, 0, 12), 8); - ok_int(RtlFindSetBits(&BitMapHeader, 0, 39), 0); + ok_int(RtlFindSetBits(&BitMapHeader, 1, 32), 1); + ok_int(RtlFindSetBits(&BitMapHeader, 4, 32), 11); + ok_int(RtlFindSetBits(&BitMapHeader, 5, 32), 20); }

12 years, 6 months

[tkreuzer] 56797: [RTL] Fix a really stupid mistake in RtlNumberOfSetBits

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 24 17:50:46 2012 New Revision: 56797 URL: http://svn.reactos.org/svn/reactos?rev=56797&view=rev Log: [RTL] Fix a really stupid mistake in RtlNumberOfSetBits Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=56797… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Jun 24 17:50:46 2012 @@ -415,7 +415,7 @@ Byte = (PUCHAR)BitMapHeader->Buffer; MaxByte = Byte + BitMapHeader->SizeOfBitMap / 8; - while (Byte < MaxByte); + while (Byte < MaxByte) { BitCount += BitCountTable[*Byte++]; }

12 years, 6 months

[pschweitzer] 56796: [RTL] Fix c/p mistake in PropertyLengthAsVariant

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 24 16:23:28 2012 New Revision: 56796 URL: http://svn.reactos.org/svn/reactos?rev=56796&view=rev Log: [RTL] Fix c/p mistake in PropertyLengthAsVariant Modified: trunk/reactos/lib/rtl/propvar.c Modified: trunk/reactos/lib/rtl/propvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/propvar.c?rev=5679… ============================================================================== --- trunk/reactos/lib/rtl/propvar.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/propvar.c [iso-8859-1] Sun Jun 24 16:23:28 2012 @@ -67,7 +67,7 @@ IN USHORT CodePage, IN BYTE bReserved) { - BOOLEAN Success = FALSE; + ULONG Length = 0; PVOID BaseAddress = NULL; ULONG (*ProcedureAddress)(PSERIALIZEDPROPERTYVALUE, ULONG, USHORT, BYTE); @@ -77,7 +77,7 @@ ProcedureAddress = LoadOle32Export(&BaseAddress, "StgPropertyLengthAsVariant"); - Success = ProcedureAddress(pProp, cbProp, CodePage, bReserved); + Length = ProcedureAddress(pProp, cbProp, CodePage, bReserved); } _SEH2_FINALLY { @@ -88,7 +88,7 @@ } _SEH2_END; - return Success; + return Length; } /*

12 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2012