Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 56829: [Gdi32] - Implement support for TCI_SRCLOCALE.
by jimtabor＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: jimtabor Date: Wed Jul 4 22:44:52 2012 New Revision: 56829 URL: http://svn.reactos.org/svn/reactos?rev=56829&view=rev Log: [Gdi32] - Implement support for TCI_SRCLOCALE. Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/win32ss/gdi/gdi32/objects/font.c Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Wed Jul 4 22:44:52 2012 @@ -952,6 +952,7 @@ #define TCI_SRCCHARSET 1 #define TCI_SRCCODEPAGE 2 #define TCI_SRCFONTSIG 3 +#define TCI_SRCLOCALE 4096 #if (_WIN32_WINNT >= 0x0500) #define SHADEBLENDCAPS 120 #define COLORMGMTCAPS 121 Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Wed Jul 4 22:44:52 2012 @@ -1785,10 +1785,24 @@ case TCI_SRCCHARSET: while (index < MAXTCIINDEX && PtrToUlong(lpSrc) != FONT_tci[index].ciCharset) index++; break; + case TCI_SRCLOCALE: + { + LCID lCid = (LCID)PtrToUlong(lpSrc); + LOCALESIGNATURE LocSig; + INT Ret = GetLocaleInfoW(lCid, LOCALE_FONTSIGNATURE, (LPWSTR)&LocSig, 0); + if ( GetLocaleInfoW(lCid, LOCALE_FONTSIGNATURE, (LPWSTR)&LocSig, Ret)) + { + while (index < MAXTCIINDEX && !(LocSig.lsCsbDefault[0]>>index & 0x0001)) index++; + break; + } + } default: + GdiSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } if (index >= MAXTCIINDEX || FONT_tci[index].ciCharset == DEFAULT_CHARSET) return FALSE; + DPRINT("Index %d Charset %d CodePage %d FontSig %d\n", + index,FONT_tci[index].ciCharset,FONT_tci[index].ciACP,FONT_tci[index].fs.fsCsb[0]); memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO)); return TRUE; }

1 0

[tfaber] 56828: [WS2_32_APITEST] - Gracefully handle uninitialized data in WSAStartup test
by tfaber＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tfaber Date: Wed Jul 4 20:05:43 2012 New Revision: 56828 URL: http://svn.reactos.org/svn/reactos?rev=56828&view=rev Log: [WS2_32_APITEST] - Gracefully handle uninitialized data in WSAStartup test 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] Wed Jul 4 20:05:43 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", (int)MaximumLength, Buffer, Expected); Result = FALSE; }

1 0

[tkreuzer] 56827: [CRT] Fix a bug in streamout() causing "%.*s" to crash when the buffer was not zero terminaed. Found by Thomas Faber.
by tkreuzer＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tkreuzer Date: Wed Jul 4 18:58:09 2012 New Revision: 56827 URL: http://svn.reactos.org/svn/reactos?rev=56827&view=rev Log: [CRT] Fix a bug in streamout() causing "%.*s" to crash when the buffer was not zero terminaed. Found by Thomas Faber. Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Wed Jul 4 18:58:09 2012 @@ -34,6 +34,8 @@ printf/wvsprintfW.c printf/wvsnprintfA.c printf/wvsnprintfW.c + string/strnlen.c + string/wcsnlen.c string/mbstowcs_nt.c string/wcstombs_nt.c) Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Wed Jul 4 18:58:09 2012 @@ -508,10 +508,9 @@ } if (flags & FLAG_WIDECHAR) - len = wcslen((wchar_t*)string); + len = wcsnlen((wchar_t*)string, (unsigned)precision); else - len = strlen((char*)string); - if (precision >= 0 && len > (unsigned)precision) len = precision; + len = strnlen((char*)string, (unsigned)precision); precision = 0; break;

1 0

[tkreuzer] 56826: [KMTEST] Include strnlen.c and wcsnlen.c in kmtest_printf (needed for upcoming change)
by tkreuzer＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tkreuzer Date: Wed Jul 4 18:51:34 2012 New Revision: 56826 URL: http://svn.reactos.org/svn/reactos?rev=56826&view=rev Log: [KMTEST] Include strnlen.c and wcsnlen.c in kmtest_printf (needed for upcoming change) Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 4 18:51:34 2012 @@ -68,6 +68,8 @@ add_library(kmtest_printf kmtest_drv/printf_stubs.c + ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/strnlen.c + ${REACTOS_SOURCE_DIR}/lib/sdk/crt/string/wcsnlen.c ${REACTOS_SOURCE_DIR}/lib/sdk/crt/printf/streamout.c) add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb) add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)

1 0

[tfaber] 56825: [REGEDIT] - Acquire the necessary privileges when loading/unloading hives. Patch by Hermes Belusca. See issue #7159 for more details.
by tfaber＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tfaber Date: Wed Jul 4 18:28:49 2012 New Revision: 56825 URL: http://svn.reactos.org/svn/reactos?rev=56825&view=rev Log: [REGEDIT] - Acquire the necessary privileges when loading/unloading hives. Patch by Hermes Belusca. See issue #7159 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Wed Jul 4 18:28:49 2012 @@ -310,6 +310,38 @@ break; } return FALSE; +} + +static BOOL EnablePrivilege(LPCTSTR lpszPrivilegeName, LPCTSTR lpszSystemName, BOOL bEnablePrivilege) +{ + BOOL bRet = FALSE; + HANDLE hToken = NULL; + + if (OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES, + &hToken)) + { + TOKEN_PRIVILEGES tp; + + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + + if (LookupPrivilegeValue(lpszSystemName, + lpszPrivilegeName, + &tp.Privileges[0].Luid)) + { + bRet = AdjustTokenPrivileges(hToken, + FALSE, + &tp, + sizeof(tp), + NULL, + NULL); + } + + CloseHandle(hToken); + } + + return bRet; } static BOOL LoadHive(HWND hWnd) @@ -340,7 +372,19 @@ { if(DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_LOADHIVE), hWnd, &LoadHive_KeyNameInHookProc, (LPARAM)xPath)) { - LONG regLoadResult = RegLoadKey(hRootKey, xPath, ofn.lpstrFile); + LONG regLoadResult; + + /* Enable the required privileges */ + EnablePrivilege(SE_BACKUP_NAME, NULL, TRUE); + EnablePrivilege(SE_RESTORE_NAME, NULL, TRUE); + + /* Load the hive */ + regLoadResult = RegLoadKey(hRootKey, xPath, ofn.lpstrFile); + + /* Disable the privileges */ + EnablePrivilege(SE_RESTORE_NAME, NULL, FALSE); + EnablePrivilege(SE_BACKUP_NAME, NULL, FALSE); + if(regLoadResult == ERROR_SUCCESS) { /* refresh tree and list views */ @@ -373,8 +417,18 @@ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); /* load and set the caption and flags for dialog */ LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption)); - /* now unload the hive */ + + /* Enable the required privileges */ + EnablePrivilege(SE_BACKUP_NAME, NULL, TRUE); + EnablePrivilege(SE_RESTORE_NAME, NULL, TRUE); + + /* Unload the hive */ regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); + + /* Disable the privileges */ + EnablePrivilege(SE_RESTORE_NAME, NULL, FALSE); + EnablePrivilege(SE_BACKUP_NAME, NULL, FALSE); + if(regUnloadResult == ERROR_SUCCESS) { /* refresh tree and list views */

1 0

[tfaber] 56824: [USER32_APITEST] - Prevent duplicate test name
by tfaber＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tfaber Date: Wed Jul 4 18:01:13 2012 New Revision: 56824 URL: http://svn.reactos.org/svn/reactos?rev=56824&view=rev Log: [USER32_APITEST] - Prevent duplicate test name Modified: trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Jul 4 18:01:13 2012 @@ -39,7 +39,7 @@ { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "WndProc", func_WndProc }, - { "wsprintf", func_wsprintf }, + { "wsprintfApi", func_wsprintf }, { 0, 0 } };

1 0

[tfaber] 56823: [CRT TEST][USER32_APITEST] - Add a test for sprintf/wsprintfA (mainly NULL buffer and string precision)
by tfaber＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tfaber Date: Wed Jul 4 17:33:56 2012 New Revision: 56823 URL: http://svn.reactos.org/svn/reactos?rev=56823&view=rev Log: [CRT TEST][USER32_APITEST] - Add a test for sprintf/wsprintfA (mainly NULL buffer and string precision) Added: trunk/rostests/apitests/crt/sprintf.c (with props) trunk/rostests/apitests/user32/wsprintf.c (with props) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -454,7 +454,7 @@ # signal.c # sin.c # sinh.c -# sprintf.c + sprintf.c # sqrt.c # srand.c # sscanf.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -1156,7 +1156,7 @@ # signal.c # sin.c # sinh.c -# sprintf.c + sprintf.c # sprintf_s.c # sqrt.c # srand.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -80,7 +80,7 @@ # pow.c # qsort.c # sin.c -# sprintf.c + sprintf.c # sqrt.c # sscanf.c # strcat.c Added: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c (added) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -1,0 +1,271 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for sprintf + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wformat-zero-length" +#pragma GCC diagnostic ignored "-Wnonnull" +#endif + +#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); +} + +/* NOTE: This test is not only used for all the CRT apitests, but also for + * user32's wsprintf. Make sure to test them all */ +START_TEST(sprintf) +{ + NTSTATUS ExceptionStatus; + int Length; + CHAR Buffer[128]; + PCHAR String; + + /* basic parameter tests */ + StartSeh() + Length = sprintf(NULL, NULL); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + Length = sprintf(NULL, ""); + ok_int(Length, 0); +#if defined(TEST_CRTDLL) || defined(TEST_USER32) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif + + StartSeh() + Length = sprintf(NULL, "Hello"); + ok_int(Length, 5); +#if defined(TEST_CRTDLL) || defined(TEST_USER32) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif + + /* some basic formats */ + Length = sprintf(Buffer, "abcde"); + ok_str(Buffer, "abcde"); + ok_int(Length, 5); + + Length = sprintf(Buffer, "%%"); + ok_str(Buffer, "%"); + ok_int(Length, 1); + + Length = sprintf(Buffer, "%"); + ok_str(Buffer, ""); + ok_int(Length, 0); + + Length = sprintf(Buffer, "%%%"); + ok_str(Buffer, "%"); + ok_int(Length, 1); + + Length = sprintf(Buffer, "%d", 8); + ok_str(Buffer, "8"); + ok_int(Length, 1); + + Length = sprintf(Buffer, "%s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + /* field width for %s */ + Length = sprintf(Buffer, "%8s", "hello"); + ok_str(Buffer, " hello"); + ok_int(Length, 8); + + Length = sprintf(Buffer, "%4s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + Length = sprintf(Buffer, "%-8s", "hello"); + ok_str(Buffer, "hello "); + ok_int(Length, 8); + + Length = sprintf(Buffer, "%-5s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + Length = sprintf(Buffer, "%0s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + Length = sprintf(Buffer, "%-0s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + /* TODO: wsprintf can't do * */ +#ifndef TEST_USER32 + Length = sprintf(Buffer, "%*s", -8, "hello"); + ok_str(Buffer, "hello "); + ok_int(Length, 8); +#endif + + /* precision for %s */ + Length = sprintf(Buffer, "%.s", "hello"); + ok_str(Buffer, ""); + ok_int(Length, 0); + + Length = sprintf(Buffer, "%.0s", "hello"); + ok_str(Buffer, ""); + ok_int(Length, 0); + + Length = sprintf(Buffer, "%.10s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + Length = sprintf(Buffer, "%.5s", "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + + Length = sprintf(Buffer, "%.4s", "hello"); + ok_str(Buffer, "hell"); + ok_int(Length, 4); + +#ifndef TEST_USER32 + StartSeh() + Length = sprintf(Buffer, "%.*s", -1, "hello"); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + EndSeh(STATUS_SUCCESS); +#endif + + String = AllocateGuarded(6); + if (!String) + { + skip("Guarded allocation failure\n"); + return; + } + + strcpy(String, "hello"); + StartSeh() + Length = sprintf(Buffer, "%.8s", String); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%.6s", String); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%.5s", String); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%.4s", String); + ok_str(Buffer, "hell"); + ok_int(Length, 4); + EndSeh(STATUS_SUCCESS); + + /* TODO: wsprintf can't do *, and also seems to use strlen despite a + * precision being given */ +#ifndef TEST_USER32 + String[5] = '!'; + StartSeh() + Length = sprintf(Buffer, "%.5s", String); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%.6s", String); + ok_str(Buffer, "hello!"); + ok_int(Length, 6); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%.*s", 5, String); + ok_str(Buffer, "hello"); + ok_int(Length, 5); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%.*s", 6, String); + ok_str(Buffer, "hello!"); + ok_int(Length, 6); + EndSeh(STATUS_SUCCESS); + + /* both field width and precision */ + StartSeh() + Length = sprintf(Buffer, "%8.5s", String); + ok_str(Buffer, " hello"); + ok_int(Length, 8); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%-*.6s", -8, String); + ok_str(Buffer, "hello! "); + ok_int(Length, 8); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Length = sprintf(Buffer, "%*.*s", -8, 6, String); + ok_str(Buffer, "hello! "); + ok_int(Length, 8); + EndSeh(STATUS_SUCCESS); +#endif + + FreeGuarded(String); +} Propchange: trunk/rostests/apitests/crt/sprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -5,10 +5,12 @@ #define STANDALONE #include "wine/test.h" +extern void func_sprintf(void); extern void func_strcpy(void); const struct test winetest_testlist[] = { + { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -1,7 +1,3 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP) - -set_rc_compiler() list(APPEND SOURCE helper.c @@ -15,16 +11,17 @@ RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c + SetActiveWindow.c SetCursorPos.c - SetActiveWindow.c SystemParametersInfo.c TrackMouseEvent.c WndProc.c + wsprintf.c testlist.c user32_apitest.rc) add_executable(user32_apitest ${SOURCE}) -target_link_libraries(user32_apitest wine) +target_link_libraries(user32_apitest wine ${PSEH_LIB}) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET user32_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -5,39 +5,41 @@ #define STANDALONE #include "wine/test.h" +extern void func_DeferWindowPos(void); extern void func_desktop(void); +extern void func_GetIconInfo(void); +extern void func_GetKeyState(void); +extern void func_GetPeekMessage(void); +extern void func_GetSystemMetrics(void); extern void func_InitializeLpkHooks(void); extern void func_RealGetWindowClass(void); extern void func_ScrollDC(void); extern void func_ScrollWindowEx(void); -extern void func_GetSystemMetrics(void); -extern void func_GetIconInfo(void); -extern void func_GetPeekMessage(void); -extern void func_DeferWindowPos(void); -extern void func_GetKeyState(void); +extern void func_SetActiveWindow(void); extern void func_SetCursorPos(void); -extern void func_SetActiveWindow(void); extern void func_SystemParametersInfo(void); extern void func_TrackMouseEvent(void); extern void func_WndProc(void); +extern void func_wsprintf(void); const struct test winetest_testlist[] = { + { "desktop", func_desktop }, + { "DeferWindowPos", func_DeferWindowPos }, + { "GetIconInfo", func_GetIconInfo }, + { "GetKeyState", func_GetKeyState }, + { "GetPeekMessage", func_GetPeekMessage }, + { "GetSystemMetrics", func_GetSystemMetrics }, { "InitializeLpkHooks", func_InitializeLpkHooks }, { "RealGetWindowClass", func_RealGetWindowClass }, { "ScrollDC", func_ScrollDC }, { "ScrollWindowEx", func_ScrollWindowEx }, - { "GetSystemMetrics", func_GetSystemMetrics }, - { "GetIconInfo", func_GetIconInfo }, - { "GetPeekMessage", func_GetPeekMessage }, - { "DeferWindowPos", func_DeferWindowPos }, - { "desktop", func_desktop } , - { "GetKeyState", func_GetKeyState }, + { "SetActiveWindow", func_SetActiveWindow }, { "SetCursorPos", func_SetCursorPos }, - { "SetActiveWindow", func_SetActiveWindow }, { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "WndProc", func_WndProc }, + { "wsprintf", func_wsprintf }, { 0, 0 } }; Added: trunk/rostests/apitests/user32/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/wsprintf.… ============================================================================== --- trunk/rostests/apitests/user32/wsprintf.c (added) +++ trunk/rostests/apitests/user32/wsprintf.c [iso-8859-1] Wed Jul 4 17:33:56 2012 @@ -1,0 +1,4 @@ +#define sprintf wsprintfA +#define func_sprintf func_wsprintf +#define TEST_USER32 1 +#include "../crt/sprintf.c" Propchange: trunk/rostests/apitests/user32/wsprintf.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 56822: [ROSTESTS] - Add CRT tests to build See issue #7155 for more details.
by tfaber＠svn.reactos.org 04 Jul '12

04 Jul '12

Author: tfaber Date: Wed Jul 4 17:04:44 2012 New Revision: 56822 URL: http://svn.reactos.org/svn/reactos?rev=56822&view=rev Log: [ROSTESTS] - Add CRT tests to build See issue #7155 for more details. Removed: trunk/rostests/apitests/crt/msvcrt_mini.spec Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/crt/CMakeLists.txt trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.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] Wed Jul 4 17:04:44 2012 @@ -2,7 +2,7 @@ add_library(apitest apitest.c) add_subdirectory(advapi32) -#add_subdirectory(crt) +add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) add_subdirectory(kernel32) Modified: trunk/rostests/apitests/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/CMakeLists.txt [iso-8859-1] Wed Jul 4 17:04:44 2012 @@ -1,6 +1,4 @@ -spec2def(msvcrt_mini.dll msvcrt_mini.spec ADD_IMPORTLIB) -remove_definitions(-D_DLL -D__USE_CRTIMP) include(ntdll_crt_apitest.cmake) include(crtdll_crt_apitest.cmake) include(msvcrt_crt_apitest.cmake) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Wed Jul 4 17:04:44 2012 @@ -554,8 +554,8 @@ add_executable(crtdll_crt_apitest testlist.c ${SOURCE_CRTDLL}) -add_target_compile_definitions(crtdll_crt_apitest _DLL __USE_CRTIMP) +add_target_compile_definitions(crtdll_crt_apitest TEST_CRTDLL) target_link_libraries(crtdll_crt_apitest wine ${PSEH_LIB}) set_module_type(crtdll_crt_apitest win32cui) -add_importlibs(crtdll_crt_apitest crtdll msvcrt_mini kernel32) +add_importlibs(crtdll_crt_apitest crtdll msvcrt kernel32 ntdll) add_cd_file(TARGET crtdll_crt_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Wed Jul 4 17:04:44 2012 @@ -1370,15 +1370,17 @@ ) endif() +# Startup code doesn't go together well with the static CRT... too much __imp_ #add_executable(static_crt_apitest testlist.c ${SOURCE_MSVCRT}) -#target_link_libraries(static_crt_apitest wine ${PSEH_LIB} crt msvcrtex wine) +#add_target_compile_definitions(static_crt_apitest TEST_STATIC_CRT) +#target_link_libraries(static_crt_apitest ${PSEH_LIB} crt wine) #set_module_type(static_crt_apitest win32cui) -#add_importlibs(static_crt_apitest kernel32) +#add_importlibs(static_crt_apitest kernel32 ntdll) #add_cd_file(TARGET static_crt_apitest DESTINATION reactos/bin FOR all) add_executable(msvcrt_crt_apitest testlist.c ${SOURCE_MSVCRT}) -add_target_compile_definitions(msvcrt_crt_apitest _DLL __USE_CRTIMP) +add_target_compile_definitions(msvcrt_crt_apitest TEST_MSVCRT) target_link_libraries(msvcrt_crt_apitest wine ${PSEH_LIB}) set_module_type(msvcrt_crt_apitest win32cui) -add_importlibs(msvcrt_crt_apitest msvcrt kernel32) +add_importlibs(msvcrt_crt_apitest msvcrt kernel32 ntdll) add_cd_file(TARGET msvcrt_crt_apitest DESTINATION reactos/bin FOR all) Removed: trunk/rostests/apitests/crt/msvcrt_mini.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_mini.… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_mini.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_mini.spec (removed) @@ -1,30 +1,0 @@ - -@ cdecl fputs(str ptr) MSVCRT.fputs -@ extern _iob MSVCRT._iob -@ varargs fprintf(ptr str) MSVCRT.fprintf -@ cdecl vfprintf(ptr str ptr) MSVCRT.vfprintf -@ cdecl fflush(ptr) MSVCRT.fflush -@ cdecl setvbuf(ptr str long long) MSVCRT.setvbuf -@ cdecl _strdup(str) MSVCRT._strdup -@ cdecl __getmainargs(ptr ptr ptr long ptr) MSVCRT.__getmainargs -@ cdecl __setusermatherr(ptr) MSVCRT.__setusermatherr -@ cdecl _amsg_exit(long) MSVCRT._amsg_exit -@ cdecl __set_app_type(long) MSVCRT.__set_app_type -@ extern _fmode MSVCRT._fmode -@ cdecl _initterm(ptr ptr) MSVCRT._initterm -@ extern _acmdln MSVCRT._acmdln -@ cdecl signal(long long) MSVCRT.signal -@ cdecl _fpreset() MSVCRT._fpreset -@ cdecl _onexit(ptr) MSVCRT._onexit -@ cdecl __dllonexit(ptr ptr ptr) MSVCRT.__dllonexit -@ cdecl _unlock(long) MSVCRT._unlock -@ cdecl abort() MSVCRT.abort -@ cdecl calloc(long long) MSVCRT.calloc -@ cdecl malloc(long) MSVCRT.malloc -@ extern __initenv MSVCRT.__initenv -@ cdecl _cexit() MSVCRT._cexit -@ extern _winmajor MSVCRT._winmajor -@ cdecl __lconv_init() MSVCRT.__lconv_init -@ cdecl _lock(long) MSVCRT._lock -@ cdecl free(ptr) MSVCRT.free -@ cdecl exit(long) MSVCRT.exit Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Wed Jul 4 17:04:44 2012 @@ -153,9 +153,9 @@ add_executable(ntdll_crt_apitest testlist.c ${SOURCE_NTDLL}) -add_target_compile_definitions(ntdll_crt_apitest _DLL __USE_CRTIMP) +add_target_compile_definitions(ntdll_crt_apitest TEST_NTDLL) target_link_libraries(ntdll_crt_apitest wine ${PSEH_LIB}) set_module_type(ntdll_crt_apitest win32cui) -add_importlibs(ntdll_crt_apitest ntdll msvcrt_mini kernel32) +add_importlibs(ntdll_crt_apitest ntdll msvcrt kernel32) add_cd_file(TARGET ntdll_crt_apitest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Wed Jul 4 17:04:44 2012 @@ -10,8 +10,13 @@ const struct test winetest_testlist[] = { { "strcpy", func_strcpy }, -#if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) +#if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... +#endif +#if defined(TEST_STATIC_CRT) || defined(TEST_MSVCRT) + // ... +#endif +#if defined(TEST_STATIC_CRT) #elif defined(TEST_MSVCRT) #elif defined(TEST_NTDLL) #elif defined(TEST_CRTDLL)

1 0

[tfaber] 56821: [ROSTESTS] - Clarify readme file. Patch by Hermes Belusca. Bug 7151
by tfaber＠svn.reactos.org 03 Jul '12

03 Jul '12

Author: tfaber Date: Tue Jul 3 19:59:56 2012 New Revision: 56821 URL: http://svn.reactos.org/svn/reactos?rev=56821&view=rev Log: [ROSTESTS] - Clarify readme file. Patch by Hermes Belusca. Bug 7151 Modified: trunk/rostests/readme.txt Modified: trunk/rostests/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/readme.txt?rev=56821&r1=5… ============================================================================== --- trunk/rostests/readme.txt [iso-8859-1] (original) +++ trunk/rostests/readme.txt [iso-8859-1] Tue Jul 3 19:59:56 2012 @@ -1,9 +1,10 @@ -$Id: readme.txt 21229 2006-03-05 13:57:35Z frik85 $ - ==================== ReactOS Tests ==================== This directory contains various tests for ReactOS. Make sure you also have a copy of the rest of the ReactOS -source before you attempt to build anything in this module. +source before you attempt to build anything in this module. +It is to be placed under "modules" subdirectory of a trunk checkout. +No additional changes to build files are necessary, it'll be picked up +automatically.

1 0

[ekohl] 56820: [SAMSRV] - Store all fixed size user attributes in the registry value "F". - Initialize fixed size domain attributes in SampCreateUserAccount and SamrCreateUserInDomain. - Implement ...
by ekohl＠svn.reactos.org 02 Jul '12

02 Jul '12

Author: ekohl Date: Mon Jul 2 23:09:20 2012 New Revision: 56820 URL: http://svn.reactos.org/svn/reactos?rev=56820&view=rev Log: [SAMSRV] - Store all fixed size user attributes in the registry value "F". - Initialize fixed size domain attributes in SampCreateUserAccount and SamrCreateUserInDomain. - Implement most information classes of SamrQueryInformationUser. - Disable all informationclasses of SamrSetInformationUser that store fixed size attributes. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/setup.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] Mon Jul 2 23:09:20 2012 @@ -1712,6 +1712,7 @@ OUT unsigned long *RelativeId) { SAM_DOMAIN_FIXED_DATA FixedDomainData; + SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; ULONG ulSize; @@ -1803,6 +1804,24 @@ L"Users", Name->Buffer, ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Initialize fixed user data */ + memset(&FixedUserData, 0, sizeof(SAM_USER_FIXED_DATA)); + FixedUserData.Version = 1; + + FixedUserData.UserId = ulRid; + + /* Set fixed user data attribute */ + Status = SampSetObjectAttribute(UserObject, + L"F", + REG_BINARY, + (LPVOID)&FixedUserData, + sizeof(SAM_USER_FIXED_DATA)); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -3158,14 +3177,719 @@ return STATUS_NOT_IMPLEMENTED; } + static NTSTATUS SampQueryUserName(PSAM_DB_OBJECT UserObject, PSAMPR_USER_INFO_BUFFER *Buffer) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Name.UserName.Length = Length - sizeof(WCHAR); + InfoBuffer->Name.UserName.MaximumLength = Length; + InfoBuffer->Name.UserName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Name.UserName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"Name", + NULL, + (PVOID)InfoBuffer->Name.UserName.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + Length = 0; + Status = SampGetObjectAttribute(UserObject, + L"FullName", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Name.FullName.Length = Length - sizeof(WCHAR); + InfoBuffer->Name.FullName.MaximumLength = Length; + InfoBuffer->Name.FullName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Name.FullName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"FullName", + NULL, + (PVOID)InfoBuffer->Name.FullName.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.UserName.Buffer != NULL) + midl_user_free(InfoBuffer->Name.UserName.Buffer); + + if (InfoBuffer->Name.FullName.Buffer != NULL) + midl_user_free(InfoBuffer->Name.FullName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryUserAccountName(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"Name", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->AccountName.UserName.Length = Length - sizeof(WCHAR); + InfoBuffer->AccountName.UserName.MaximumLength = Length; + InfoBuffer->AccountName.UserName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->AccountName.UserName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"Name", + NULL, + (PVOID)InfoBuffer->AccountName.UserName.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->AccountName.UserName.Buffer != NULL) + midl_user_free(InfoBuffer->AccountName.UserName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryUserFullName(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"FullName", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->FullName.FullName.Length = Length - sizeof(WCHAR); + InfoBuffer->FullName.FullName.MaximumLength = Length; + InfoBuffer->FullName.FullName.Buffer = midl_user_allocate(Length); + if (InfoBuffer->FullName.FullName.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"FullName", + NULL, + (PVOID)InfoBuffer->FullName.FullName.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->FullName.FullName.Buffer != NULL) + midl_user_free(InfoBuffer->FullName.FullName.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static +NTSTATUS +SampQueryUserPrimaryGroup(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_USER_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->PrimaryGroup.PrimaryGroupId = FixedData.PrimaryGroupId; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryUserHome(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"HomeDirectory", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Home.HomeDirectory.Length = Length - sizeof(WCHAR); + InfoBuffer->Home.HomeDirectory.MaximumLength = Length; + InfoBuffer->Home.HomeDirectory.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Home.HomeDirectory.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"HomeDirectory", + NULL, + (PVOID)InfoBuffer->Home.HomeDirectory.Buffer, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + Length = 0; + Status = SampGetObjectAttribute(UserObject, + L"HomeDirectoryDrive", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Home.HomeDirectoryDrive.Length = Length - sizeof(WCHAR); + InfoBuffer->Home.HomeDirectoryDrive.MaximumLength = Length; + InfoBuffer->Home.HomeDirectoryDrive.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Home.HomeDirectoryDrive.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"HomeDirectoryDrive", + NULL, + (PVOID)InfoBuffer->Home.HomeDirectoryDrive.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->Home.HomeDirectory.Buffer != NULL) + midl_user_free(InfoBuffer->Home.HomeDirectory.Buffer); + + if (InfoBuffer->Home.HomeDirectoryDrive.Buffer != NULL) + midl_user_free(InfoBuffer->Home.HomeDirectoryDrive.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryUserScript(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"ScriptPath", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Script.ScriptPath.Length = Length - sizeof(WCHAR); + InfoBuffer->Script.ScriptPath.MaximumLength = Length; + InfoBuffer->Script.ScriptPath.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Script.ScriptPath.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"ScriptPath", + NULL, + (PVOID)InfoBuffer->Script.ScriptPath.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->Script.ScriptPath.Buffer != NULL) + midl_user_free(InfoBuffer->Script.ScriptPath.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryUserProfile(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"ProfilePath", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->Profile.ProfilePath.Length = Length - sizeof(WCHAR); + InfoBuffer->Profile.ProfilePath.MaximumLength = Length; + InfoBuffer->Profile.ProfilePath.Buffer = midl_user_allocate(Length); + if (InfoBuffer->Profile.ProfilePath.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"ProfilePath", + NULL, + (PVOID)InfoBuffer->Profile.ProfilePath.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->Profile.ProfilePath.Buffer != NULL) + midl_user_free(InfoBuffer->Profile.ProfilePath.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static NTSTATUS +SampQueryUserAdminComment(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"AdminComment", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + 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; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"AdminComment", + NULL, + (PVOID)InfoBuffer->AdminComment.AdminComment.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->AdminComment.AdminComment.Buffer != NULL) + midl_user_free(InfoBuffer->AdminComment.AdminComment.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + + +static NTSTATUS +SampQueryUserWorkStations(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = SampGetObjectAttribute(UserObject, + L"WorkStations", + NULL, + NULL, + &Length); + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + TRACE("Status 0x%08lx\n", Status); + goto done; + } + + InfoBuffer->WorkStations.WorkStations.Length = Length - sizeof(WCHAR); + InfoBuffer->WorkStations.WorkStations.MaximumLength = Length; + InfoBuffer->WorkStations.WorkStations.Buffer = midl_user_allocate(Length); + if (InfoBuffer->WorkStations.WorkStations.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Length: %lu\n", Length); + Status = SampGetObjectAttribute(UserObject, + L"WorkStations", + NULL, + (PVOID)InfoBuffer->WorkStations.WorkStations.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->WorkStations.WorkStations.Buffer != NULL) + midl_user_free(InfoBuffer->WorkStations.WorkStations.Buffer); + + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static +NTSTATUS +SampQueryUserControl(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_USER_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Control.UserAccountControl = FixedData.UserAccountControl; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + + +static +NTSTATUS +SampQueryUserExpires(PSAM_DB_OBJECT UserObject, + PSAMPR_USER_INFO_BUFFER *Buffer) +{ + PSAMPR_USER_INFO_BUFFER InfoBuffer = NULL; + SAM_USER_FIXED_DATA FixedData; + ULONG Length = 0; + NTSTATUS Status; + + *Buffer = NULL; + + InfoBuffer = midl_user_allocate(sizeof(SAMPR_USER_INFO_BUFFER)); + if (InfoBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + (PVOID)&FixedData, + &Length); + if (!NT_SUCCESS(Status)) + goto done; + + InfoBuffer->Expires.AccountExpires.LowPart = FixedData.AccountExpires.LowPart; + InfoBuffer->Expires.AccountExpires.HighPart = FixedData.AccountExpires.HighPart; + + *Buffer = InfoBuffer; + +done: + if (!NT_SUCCESS(Status)) + { + if (InfoBuffer != NULL) + { + midl_user_free(InfoBuffer); + } + } + + return Status; +} + /* Function 36 */ NTSTATUS @@ -3192,6 +3916,31 @@ DesiredAccess = USER_READ_GENERAL; break; + case UserLogonHoursInformation: + case UserHomeInformation: + case UserScriptInformation: + case UserProfileInformation: + case UserWorkStationsInformation: + DesiredAccess = USER_READ_LOGON; + break; + + case UserControlInformation: + case UserExpiresInformation: + DesiredAccess = USER_READ_ACCOUNT; + break; + + case UserPreferencesInformation: + DesiredAccess = USER_READ_GENERAL | + USER_READ_PREFERENCES; + break; + + case UserLogonInformation: + case UserAccountInformation: + DesiredAccess = USER_READ_GENERAL | + USER_READ_PREFERENCES | + USER_READ_LOGON | + USER_READ_ACCOUNT; + break; default: return STATUS_INVALID_INFO_CLASS; @@ -3210,9 +3959,64 @@ switch (UserInformationClass) { +// case UserGeneralInformation: +// case UserPreferencesInformation: +// case UserLogonInformation: +// case UserLogonHoursInformation: +// case UserAccountInformation: + case UserNameInformation: Status = SampQueryUserName(UserObject, Buffer); + break; + + case UserAccountNameInformation: + Status = SampQueryUserAccountName(UserObject, + Buffer); + break; + + case UserFullNameInformation: + Status = SampQueryUserFullName(UserObject, + Buffer); + break; + + case UserPrimaryGroupInformation: + Status = SampQueryUserPrimaryGroup(UserObject, + Buffer); + break; + + case UserHomeInformation: + Status = SampQueryUserHome(UserObject, + Buffer); + + case UserScriptInformation: + Status = SampQueryUserScript(UserObject, + Buffer); + break; + + case UserProfileInformation: + Status = SampQueryUserProfile(UserObject, + Buffer); + break; + + case UserAdminCommentInformation: + Status = SampQueryUserAdminComment(UserObject, + Buffer); + break; + + case UserWorkStationsInformation: + Status = SampQueryUserWorkStations(UserObject, + Buffer); + break; + + case UserControlInformation: + Status = SampQueryUserControl(UserObject, + Buffer); + break; + + case UserExpiresInformation: + Status = SampQueryUserExpires(UserObject, + Buffer); break; default: @@ -3309,6 +4113,7 @@ Buffer->FullName.FullName.MaximumLength); break; +/* case UserPrimaryGroupInformation: Status = SampSetObjectAttribute(UserObject, L"PrimaryGroupId", @@ -3316,6 +4121,7 @@ &Buffer->PrimaryGroup.PrimaryGroupId, sizeof(ULONG)); break; +*/ case UserHomeInformation: Status = SampSetObjectAttribute(UserObject, @@ -3376,6 +4182,7 @@ Buffer->SetPassword.Password.MaximumLength); break; +/* case UserControlInformation: Status = SampSetObjectAttribute(UserObject, L"UserAccountControl", @@ -3383,7 +4190,8 @@ &Buffer->Control.UserAccountControl, sizeof(ULONG)); break; - +*/ +/* case UserExpiresInformation: Status = SampSetObjectAttribute(UserObject, L"AccountExpires", @@ -3391,6 +4199,7 @@ &Buffer->Expires.AccountExpires, sizeof(OLD_LARGE_INTEGER)); break; +*/ // case UserInternal1Information: // case UserParametersInformation: Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Mon Jul 2 23:09:20 2012 @@ -73,6 +73,26 @@ BOOLEAN UasCompatibilityRequired; } SAM_DOMAIN_FIXED_DATA, *PSAM_DOMAIN_FIXED_DATA; +typedef struct _SAM_USER_FIXED_DATA +{ + ULONG Version; + ULONG Reserved; + LARGE_INTEGER LastLogon; + LARGE_INTEGER LastLogoff; + LARGE_INTEGER PasswordLastSet; + LARGE_INTEGER AccountExpires; + LARGE_INTEGER LastBadPasswordTime; + ULONG UserId; + ULONG PrimaryGroupId; + ULONG UserAccountControl; + USHORT CountryCode; + USHORT CodePage; + USHORT BadPasswordCount; + USHORT LogonCount; + USHORT AdminCount; + USHORT OperatorCount; +} SAM_USER_FIXED_DATA, *PSAM_USER_FIXED_DATA; + /* database.c */ NTSTATUS Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Mon Jul 2 23:09:20 2012 @@ -223,11 +223,18 @@ LPCWSTR lpAccountName, ULONG ulRelativeId) { + SAM_USER_FIXED_DATA FixedUserData; DWORD dwDisposition; WCHAR szAccountKeyName[32]; HKEY hAccountKey = NULL; HKEY hNamesKey = NULL; + /* Initialize fixed user data */ + memset(&FixedUserData, 0, sizeof(SAM_USER_FIXED_DATA)); + FixedUserData.Version = 1; + + FixedUserData.UserId = ulRelativeId; + swprintf(szAccountKeyName, L"Users\\%08lX", ulRelativeId); if (!RegCreateKeyExW(hDomainKey, @@ -240,6 +247,13 @@ &hAccountKey, &dwDisposition)) { + RegSetValueEx(hAccountKey, + L"F", + 0, + REG_BINARY, + (LPVOID)&FixedUserData, + sizeof(SAM_USER_FIXED_DATA)); + RegSetValueEx(hAccountKey, L"Name", 0,

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