Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 56655: - Add RegisterClassNameW to ComCtl32.
by jimtabor＠svn.reactos.org 24 May '12

24 May '12

Author: jimtabor Date: Thu May 24 00:42:19 2012 New Revision: 56655 URL: http://svn.reactos.org/svn/reactos?rev=56655&view=rev Log: - Add RegisterClassNameW to ComCtl32. Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/commctrl.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] Thu May 24 00:42:19 2012 @@ -188,6 +188,7 @@ @ stdcall PropertySheet(ptr) PropertySheetA @ stdcall PropertySheetA(ptr) @ stdcall PropertySheetW(ptr) +@ stdcall RegisterClassNameW(wstr) @ stdcall TaskDialogIndirect(ptr ptr ptr ptr) @ stdcall UninitializeFlatSB(long) @ stdcall _TrackMouseEvent(ptr) Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Thu May 24 00:42:19 2012 @@ -222,6 +222,23 @@ } /*********************************************************************** +@@ -1821,3 +1821,15 @@ + if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; + return S_OK; + } ++ ++/*********************************************************************** ++ * RegisterClassNameW [COMCTL32.@] ++ * ++ * Register window class again while using as SxS module. ++ */ ++BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) ++{ ++ /* FIXME: actually register redirected user32 class, ++ comctl32 classes are registered by this module anyway */ ++ return TRUE; ++} + Index: propsheet.c =================================================================== --- propsheet.c (revision 38890) @@ -470,3 +487,15 @@ /* Prev/Next buttons */ enum nav_direction +Index: comctl32.spec +=================================================================== +--- comctl32.spec (revision 56653) ++++ comctl32.spec (working copy) +@@ -188,6 +188,7 @@ + @ stdcall PropertySheet(ptr) PropertySheetA + @ stdcall PropertySheetA(ptr) + @ stdcall PropertySheetW(ptr) ++@ stdcall RegisterClassNameW(wstr) + @ stdcall TaskDialogIndirect(ptr ptr ptr ptr) + @ stdcall UninitializeFlatSB(long) + @ stdcall _TrackMouseEvent(ptr) Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c [iso-8859-1] Thu May 24 00:42:19 2012 @@ -1821,3 +1821,15 @@ if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; return S_OK; } + +/*********************************************************************** + * RegisterClassNameW [COMCTL32.@] + * + * Register window class again while using as SxS module. + */ +BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) +{ + /* FIXME: actually register redirected user32 class, + comctl32 classes are registered by this module anyway */ + return TRUE; +}

1 0

[jimtabor] 56654: [UXTHEME] - Sync port up to Wine 1.5.4 and head.
by jimtabor＠svn.reactos.org 23 May '12

23 May '12

Author: jimtabor Date: Wed May 23 23:04:23 2012 New Revision: 56654 URL: http://svn.reactos.org/svn/reactos?rev=56654&view=rev Log: [UXTHEME] - Sync port up to Wine 1.5.4 and head. Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/metric.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed May 23 23:04:23 2012 @@ -906,14 +906,14 @@ vert[0].Red = GetRValue(gradient1) << 8; vert[0].Green = GetGValue(gradient1) << 8; vert[0].Blue = GetBValue(gradient1) << 8; - vert[0].Alpha = 0x0000; + vert[0].Alpha = 0xff00; vert[1].x = pRect->right; vert[1].y = pRect->bottom; vert[1].Red = GetRValue(gradient2) << 8; vert[1].Green = GetGValue(gradient2) << 8; vert[1].Blue = GetBValue(gradient2) << 8; - vert[1].Alpha = 0x0000; + vert[1].Alpha = 0xff00; gRect.UpperLeft = 0; gRect.LowerRight = 1; Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Wed May 23 23:04:23 2012 @@ -74,7 +74,7 @@ SetLastError(hr); } } - return GetSysColor(iColorID - TMT_FIRSTCOLOR); + return GetSysColor(iColorID); } /*********************************************************************** @@ -105,7 +105,7 @@ } } if(iFontID == TMT_ICONTITLEFONT) { - if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), &plf, 0)) + if(!SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONTW), plf, 0)) return HRESULT_FROM_WIN32(GetLastError()); } else {

1 0

[jimtabor] 56653: - Add wine netsh, see bug 6758.
by jimtabor＠svn.reactos.org 23 May '12

23 May '12

Author: jimtabor Date: Wed May 23 22:36:17 2012 New Revision: 56653 URL: http://svn.reactos.org/svn/reactos?rev=56653&view=rev Log: - Add wine netsh, see bug 6758. Added: trunk/reactos/base/applications/network/netsh/ trunk/reactos/base/applications/network/netsh/CMakeLists.txt (with props) trunk/reactos/base/applications/network/netsh/netsh.c (with props) Modified: trunk/reactos/base/applications/network/CMakeLists.txt Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Wed May 23 22:36:17 2012 @@ -5,6 +5,7 @@ add_subdirectory(ftp) add_subdirectory(ipconfig) add_subdirectory(net) +add_subdirectory(netsh) add_subdirectory(netstat) add_subdirectory(nslookup) add_subdirectory(ping) Added: trunk/reactos/base/applications/network/netsh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/netsh/CMakeLists.txt (added) +++ trunk/reactos/base/applications/network/netsh/CMakeLists.txt [iso-8859-1] Wed May 23 22:36:17 2012 @@ -1,0 +1,10 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/wine) + +add_executable(netsh netsh.c) +target_link_libraries(netsh wine) +set_module_type(netsh win32cui UNICODE) +add_importlibs(netsh msvcrt kernel32 ntdll) +add_cd_file(TARGET netsh DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/network/netsh/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/netsh/netsh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/netsh/netsh.c (added) +++ trunk/reactos/base/applications/network/netsh/netsh.c [iso-8859-1] Wed May 23 22:36:17 2012 @@ -1,0 +1,33 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netsh); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} Propchange: trunk/reactos/base/applications/network/netsh/netsh.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 56652: [WIP User32 SxS] - Add SxS for classes, still not plugged in for a year now. - Need more information on global headers to support class contexts. ATM the headers are local, for no...
by jimtabor＠svn.reactos.org 23 May '12

23 May '12

Author: jimtabor Date: Wed May 23 20:21:29 2012 New Revision: 56652 URL: http://svn.reactos.org/svn/reactos?rev=56652&view=rev Log: [WIP User32 SxS] - Add SxS for classes, still not plugged in for a year now. - Need more information on global headers to support class contexts. ATM the headers are local, for noting what is needed. Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Wed May 23 20:21:29 2012 @@ -12,6 +12,167 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); + +/* From rtl/actctx.c and must match! */ +struct entity +{ + DWORD kind; // Activation context type + WCHAR *name; // Class name + WCHAR *clsid; // Not supported yet but needed for menu name. +}; + +struct dll_redirect +{ + WCHAR *name; // Dll name + WCHAR *hash; + DWORD Data; // Junk +}; + +LPCWSTR +FASTCALL +ClassNameToVersion( + LPCTSTR lpszClass, + LPCWSTR lpszMenuName, + LPCWSTR *plpLibFileName, + HANDLE *pContext, + BOOL bAnsi) +{ + NTSTATUS Status; + UNICODE_STRING SectionName; + WCHAR SeactionNameBuf[256] = {0}; + ACTCTX_SECTION_KEYED_DATA KeyedData = { sizeof(KeyedData) }; + + if (IS_ATOM(lpszClass)) + { + SectionName.Buffer = (LPWSTR)&SeactionNameBuf; + SectionName.MaximumLength = sizeof(SeactionNameBuf); + if(!NtUserGetAtomName(LOWORD((DWORD_PTR)lpszClass), &SectionName)) + { + return NULL; + } + } + else + { + if (bAnsi) + { + RtlCreateUnicodeStringFromAsciiz(&SectionName, (LPSTR)lpszClass); + } + else + { + RtlInitUnicodeString(&SectionName, lpszClass); + } + } + Status = RtlFindActivationContextSectionString( FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, + NULL, + ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, + &SectionName, + &KeyedData ); + + if (NT_SUCCESS(Status) && KeyedData.ulDataFormatVersion == 1) + { + struct dll_redirect *dll = KeyedData.lpSectionBase; + + if (plpLibFileName) *plpLibFileName = dll->name; + + if (lpszMenuName) + { + WCHAR * mnubuf; + LPWSTR mnuNameW; + LPSTR mnuNameA; + int len = 0; + struct entity *entity = KeyedData.lpData; + + FIXME("actctx: Needs to support menu name from redirected class!"); + + if (entity->clsid) + { + mnubuf = entity->clsid; + if (bAnsi) + { + mnuNameA = (LPSTR)lpszMenuName; + RtlUnicodeToMultiByteN( mnuNameA, 255, (PULONG)&len, mnubuf, strlenW(mnubuf) * sizeof(WCHAR) ); + mnuNameA[len] = 0; + } + else + { + mnuNameW = (LPWSTR)lpszMenuName; + len = strlenW(mnubuf) * sizeof(WCHAR); + RtlCopyMemory((void *)mnuNameW, mnubuf, len); + mnuNameW[len] = 0; + } + } + } + if (pContext) *pContext = KeyedData.hActCtx; + } + + if (!IS_ATOM(lpszClass) && bAnsi) + RtlFreeUnicodeString(&SectionName); + if (KeyedData.hActCtx) + RtlReleaseActivationContext(KeyedData.hActCtx); + + return lpszClass; +} + +BOOL +FASTCALL +VersionRegisterClass( + PCWSTR pszClass, + LPCWSTR lpLibFileName, + HANDLE Contex, + HMODULE * phLibModule) +{ + BOOL Ret; + HMODULE hLibModule; + PREGISTERCLASSNAMEW pRegisterClassNameW; + UNICODE_STRING ClassName; + WCHAR ClassNameBuf[256] = {0}; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame = { sizeof(Frame), 1 }; + + RtlActivateActivationContextUnsafeFast(&Frame, Contex); + + Ret = FALSE; + hLibModule = NULL; + + _SEH2_TRY + { + hLibModule = LoadLibraryW(lpLibFileName); + if ( hLibModule ) + { + if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule, "RegisterClassNameW"))) + { + if (IS_ATOM(pszClass)) + { + ClassName.Buffer = (LPWSTR)&ClassNameBuf; + ClassName.MaximumLength = sizeof(ClassNameBuf); + if (!NtUserGetAtomName(LOWORD((DWORD_PTR)pszClass), &ClassName)) + { + _SEH2_YIELD(goto Error_Exit); + } + pszClass = (PCWSTR)&ClassNameBuf; + } + Ret = pRegisterClassNameW(pszClass); + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + +Error_Exit: + if ( Ret || !hLibModule ) + { + if ( phLibModule ) *phLibModule = hLibModule; + } + else + { + DWORD save_error = GetLastError(); + FreeLibrary(hLibModule); + SetLastError(save_error); + } + + return Ret; +} /* * @implemented

1 0

[ion] 56651: [KERNEL32]: Formatting cleanups and annotations. [KERNEL32]: Simplify QueueWorkItem since the trampoline is in Rtl. [KERNEL32]: Add SxS support to QueueUserApc. [KERNEL32]: Add some ex...
by ion＠svn.reactos.org 23 May '12

23 May '12

Author: ion Date: Wed May 23 17:35:25 2012 New Revision: 56651 URL: http://svn.reactos.org/svn/reactos?rev=56651&view=rev Log: [KERNEL32]: Formatting cleanups and annotations. [KERNEL32]: Simplify QueueWorkItem since the trampoline is in Rtl. [KERNEL32]: Add SxS support to QueueUserApc. [KERNEL32]: Add some extra sanity checks/assertions in certain places. Modified: trunk/reactos/dll/win32/kernel32/client/thread.c Modified: trunk/reactos/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/thread.c [iso-8859-1] Wed May 23 17:35:25 2012 @@ -8,15 +8,13 @@ * */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -/* FIXME: NDK */ -#define HIGH_PRIORITY 31 #define SXS_SUPPORT_FIXME typedef NTSTATUS (NTAPI *PCSR_CREATE_REMOTE_THREAD)(IN HANDLE ThreadHandle, IN PCLIENT_ID ClientId); @@ -26,14 +24,15 @@ BasepNotifyCsrOfThread(IN HANDLE ThreadHandle, IN PCLIENT_ID ClientId); -/* FUNCTIONS *****************************************************************/ +/* FUNCTIONS ******************************************************************/ + static LONG BaseThreadExceptionFilter(EXCEPTION_POINTERS * ExceptionInfo) { LONG ExceptionDisposition = EXCEPTION_EXECUTE_HANDLER; LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); - + if (RealFilter != NULL) { _SEH2_TRY @@ -53,8 +52,8 @@ __declspec(noreturn) VOID WINAPI -BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, - LPVOID lpParameter) +BaseThreadStartup(IN LPTHREAD_START_ROUTINE lpStartAddress, + IN LPVOID lpParameter) { /* Attempt to call the Thread Start Address */ _SEH2_TRY @@ -86,17 +85,58 @@ _SEH2_END; } +VOID +NTAPI +BaseDispatchApc(IN PAPCFUNC ApcRoutine, + IN PVOID Data, + IN PACTIVATION_CONTEXT ActivationContext) +{ + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME ActivationFrame; + + /* Setup the activation context */ + ActivationFrame.Size = sizeof(ActivationFrame); + ActivationFrame.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + + /* Check if caller wanted one */ + if (ActivationContext == INVALID_ACTIVATION_CONTEXT) + { + /* Do the APC directly */ + ApcRoutine((ULONG_PTR)Data); + return; + } + + /* Then activate it */ + RtlActivateActivationContextUnsafeFast(&ActivationFrame, ActivationContext); + + /* Call the routine under SEH */ + _SEH2_TRY + { + ApcRoutine((ULONG_PTR)Data); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + + } + _SEH2_END; + + /* Now de-activate and release the activation context */ + RtlDeactivateActivationContextUnsafeFast(&ActivationFrame); + RtlReleaseActivationContext(ActivationContext); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + /* * @implemented */ HANDLE WINAPI -CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, - DWORD dwStackSize, - LPTHREAD_START_ROUTINE lpStartAddress, - LPVOID lpParameter, - DWORD dwCreationFlags, - LPDWORD lpThreadId) +CreateThread(IN LPSECURITY_ATTRIBUTES lpThreadAttributes, + IN DWORD dwStackSize, + IN LPTHREAD_START_ROUTINE lpStartAddress, + IN LPVOID lpParameter, + IN DWORD dwCreationFlags, + OUT LPDWORD lpThreadId) { /* Act as if we're going to create a remote thread in ourselves */ return CreateRemoteThread(NtCurrentProcess(), @@ -251,7 +291,7 @@ if (hProcess != NtCurrentProcess()) { PCSR_CREATE_REMOTE_THREAD CsrCreateRemoteThread; - + /* Get the direct CSRSRV export */ CsrCreateRemoteThread = (PCSR_CREATE_REMOTE_THREAD) GetProcAddress(GetModuleHandleA("csrsrv"), @@ -263,7 +303,7 @@ } } } - + if (!NT_SUCCESS(Status)) { ASSERT(FALSE); @@ -287,10 +327,15 @@ */ VOID WINAPI -ExitThread(DWORD uExitCode) +ExitThread(IN DWORD uExitCode) { NTSTATUS Status; ULONG LastThread; + PRTL_CRITICAL_SECTION LoaderLock; + + /* Make sure loader lock isn't held */ + LoaderLock = NtCurrentPeb()->LoaderLock; + if (LoaderLock) ASSERT(NtCurrentTeb()->ClientId.UniqueThread != LoaderLock->OwningThread); /* * Terminate process if this is the last thread @@ -301,11 +346,7 @@ &LastThread, sizeof(LastThread), NULL); - if (NT_SUCCESS(Status) && LastThread) - { - /* Exit the Process */ - ExitProcess(uExitCode); - } + if ((NT_SUCCESS(Status)) && (LastThread)) ExitProcess(uExitCode); /* Notify DLLs and TLS Callbacks of termination */ LdrShutdownThread(); @@ -316,7 +357,7 @@ /* We should never reach this place */ DPRINT1("It should not happen\n"); - while (TRUE) ; + while (TRUE); } /* @@ -324,14 +365,14 @@ */ HANDLE WINAPI -OpenThread(DWORD dwDesiredAccess, - BOOL bInheritHandle, - DWORD dwThreadId) +OpenThread(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN DWORD dwThreadId) { NTSTATUS Status; HANDLE ThreadHandle; OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID ClientId ; + CLIENT_ID ClientId; ClientId.UniqueProcess = 0; ClientId.UniqueThread = ULongToHandle(dwThreadId); @@ -390,11 +431,11 @@ */ BOOL NTAPI -GetThreadTimes(HANDLE hThread, - LPFILETIME lpCreationTime, - LPFILETIME lpExitTime, - LPFILETIME lpKernelTime, - LPFILETIME lpUserTime) +GetThreadTimes(IN HANDLE hThread, + OUT LPFILETIME lpCreationTime, + OUT LPFILETIME lpExitTime, + OUT LPFILETIME lpKernelTime, + OUT LPFILETIME lpUserTime) { KERNEL_USER_TIMES KernelUserTimes; NTSTATUS Status; @@ -407,7 +448,7 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - return(FALSE); + return FALSE; } *lpCreationTime = *(LPFILETIME)&KernelUserTimes.CreateTime; @@ -422,8 +463,8 @@ */ BOOL WINAPI -GetThreadContext(HANDLE hThread, - LPCONTEXT lpContext) +GetThreadContext(IN HANDLE hThread, + OUT LPCONTEXT lpContext) { NTSTATUS Status; @@ -442,8 +483,8 @@ */ BOOL WINAPI -SetThreadContext(HANDLE hThread, - CONST CONTEXT *lpContext) +SetThreadContext(IN HANDLE hThread, + IN CONST CONTEXT *lpContext) { NTSTATUS Status; @@ -462,8 +503,8 @@ */ BOOL WINAPI -GetExitCodeThread(HANDLE hThread, - LPDWORD lpExitCode) +GetExitCodeThread(IN HANDLE hThread, + OUT LPDWORD lpExitCode) { THREAD_BASIC_INFORMATION ThreadBasic; NTSTATUS Status; @@ -476,7 +517,7 @@ if (!NT_SUCCESS(Status)) { BaseSetLastNTError(Status); - return(FALSE); + return FALSE; } *lpExitCode = ThreadBasic.ExitStatus; @@ -488,7 +529,7 @@ */ DWORD WINAPI -ResumeThread(HANDLE hThread) +ResumeThread(IN HANDLE hThread) { ULONG PreviousResumeCount; NTSTATUS Status; @@ -508,24 +549,49 @@ */ BOOL WINAPI -TerminateThread(HANDLE hThread, - DWORD dwExitCode) -{ - NTSTATUS Status; - +TerminateThread(IN HANDLE hThread, + IN DWORD dwExitCode) +{ + NTSTATUS Status; + PRTL_CRITICAL_SECTION LoaderLock; + THREAD_BASIC_INFORMATION ThreadInfo; + + /* Check for invalid thread handle */ if (!hThread) { + /* Fail if one was passed */ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } + /* Get the loader lock */ + LoaderLock = NtCurrentPeb()->LoaderLock; + if (LoaderLock) + { + /* Get our TID */ + Status = NtQueryInformationThread(hThread, + ThreadBasicInformation, + &ThreadInfo, + sizeof(ThreadInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Assert that we don't hold the loader lock */ + ASSERT(NtCurrentTeb()->ClientId.UniqueThread != ThreadInfo.ClientId.UniqueThread); + ASSERT(NtCurrentTeb()->ClientId.UniqueThread != LoaderLock->OwningThread); + } + } + + /* Now terminate the thread */ Status = NtTerminateThread(hThread, dwExitCode); if (!NT_SUCCESS(Status)) { - BaseSetLastNTError(Status); - return FALSE; - } - + /* Fail */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* All done */ return TRUE; } @@ -534,7 +600,7 @@ */ DWORD WINAPI -SuspendThread(HANDLE hThread) +SuspendThread(IN HANDLE hThread) { ULONG PreviousSuspendCount; NTSTATUS Status; @@ -554,8 +620,8 @@ */ DWORD_PTR WINAPI -SetThreadAffinityMask(HANDLE hThread, - DWORD_PTR dwThreadAffinityMask) +SetThreadAffinityMask(IN HANDLE hThread, + IN DWORD_PTR dwThreadAffinityMask) { THREAD_BASIC_INFORMATION ThreadBasic; KAFFINITY AffinityMask; @@ -592,8 +658,8 @@ */ BOOL WINAPI -SetThreadPriority(HANDLE hThread, - int nPriority) +SetThreadPriority(IN HANDLE hThread, + IN int nPriority) { LONG Prio = nPriority; NTSTATUS Status; @@ -601,10 +667,12 @@ /* Check if values forcing saturation should be used */ if (Prio == THREAD_PRIORITY_TIME_CRITICAL) { + /* This is 16 */ Prio = (HIGH_PRIORITY + 1) / 2; } else if (Prio == THREAD_PRIORITY_IDLE) { + /* This is -16 */ Prio = -((HIGH_PRIORITY + 1) / 2); } @@ -629,7 +697,7 @@ */ int WINAPI -GetThreadPriority(HANDLE hThread) +GetThreadPriority(IN HANDLE hThread) { THREAD_BASIC_INFORMATION ThreadBasic; NTSTATUS Status; @@ -700,7 +768,7 @@ ULONG PriorityBoost; NTSTATUS Status; - PriorityBoost = (ULONG)bDisablePriorityBoost; + PriorityBoost = bDisablePriorityBoost != FALSE; Status = NtSetInformationThread(hThread, ThreadPriorityBoost, @@ -756,8 +824,8 @@ */ DWORD WINAPI -SetThreadIdealProcessor(HANDLE hThread, - DWORD dwIdealProcessor) +SetThreadIdealProcessor(IN HANDLE hThread, + IN DWORD dwIdealProcessor) { NTSTATUS Status; @@ -777,197 +845,171 @@ /* * @implemented */ -DWORD WINAPI -GetProcessIdOfThread(HANDLE Thread) -{ - THREAD_BASIC_INFORMATION ThreadBasic; - NTSTATUS Status; - - Status = NtQueryInformationThread(Thread, - ThreadBasicInformation, - &ThreadBasic, - sizeof(THREAD_BASIC_INFORMATION), - NULL); - if(!NT_SUCCESS(Status)) - { +DWORD +WINAPI +GetProcessIdOfThread(IN HANDLE Thread) +{ + THREAD_BASIC_INFORMATION ThreadBasic; + NTSTATUS Status; + + Status = NtQueryInformationThread(Thread, + ThreadBasicInformation, + &ThreadBasic, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return HandleToUlong(ThreadBasic.ClientId.UniqueProcess); +} + +/* + * @implemented + */ +DWORD +WINAPI +GetThreadId(IN HANDLE Thread) +{ + THREAD_BASIC_INFORMATION ThreadBasic; + NTSTATUS Status; + + Status = NtQueryInformationThread(Thread, + ThreadBasicInformation, + &ThreadBasic, + sizeof(THREAD_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return HandleToUlong(ThreadBasic.ClientId.UniqueThread); +} + +/* + * @unimplemented + */ +LANGID +WINAPI +SetThreadUILanguage(IN LANGID LangId) +{ + UNIMPLEMENTED; + return NtCurrentTeb()->CurrentLocale; +} + +/* + * @implemented + */ +DWORD +WINAPI +QueueUserAPC(IN PAPCFUNC pfnAPC, + IN HANDLE hThread, + IN ULONG_PTR dwData) +{ + NTSTATUS Status; + ACTIVATION_CONTEXT_BASIC_INFORMATION ActCtxInfo; + + /* Zero the activation context and query information on it */ + RtlZeroMemory(&ActCtxInfo, sizeof(ActCtxInfo)); + // WARNING!!! THIS IS USING THE WIN32 FLAG BECAUSE REACTOS CONTINUES TO BE A POS!!! /// + Status = RtlQueryInformationActivationContext(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, + NULL, + 0, + ActivationContextBasicInformation, + &ActCtxInfo, + sizeof(ActCtxInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail due to SxS */ + DbgPrint("SXS: %s failing because RtlQueryInformationActivationContext()" + "returned status %08lx\n", __FUNCTION__, Status); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Queue the APC */ + Status = NtQueueApcThread(hThread, + (PKNORMAL_ROUTINE)BaseDispatchApc, + pfnAPC, + (PVOID)dwData, + (ActCtxInfo.dwFlags & 1) ? + INVALID_ACTIVATION_CONTEXT : ActCtxInfo.hActCtx); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* All good */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetThreadIOPendingFlag(IN HANDLE hThread, + OUT PBOOL lpIOIsPending) +{ + ULONG IoPending; + NTSTATUS Status; + + /* Query the flag */ + Status = NtQueryInformationThread(hThread, + ThreadIsIoPending, + &IoPending, + sizeof(IoPending), + NULL); + if (NT_SUCCESS(Status)) + { + /* Return the flag */ + *lpIOIsPending = IoPending ? TRUE : FALSE; + return TRUE; + } + + /* Fail */ BaseSetLastNTError(Status); - return 0; - } - - return HandleToUlong(ThreadBasic.ClientId.UniqueProcess); -} - -/* - * @implemented - */ -DWORD WINAPI -GetThreadId(HANDLE Thread) -{ - THREAD_BASIC_INFORMATION ThreadBasic; - NTSTATUS Status; - - Status = NtQueryInformationThread(Thread, - ThreadBasicInformation, - &ThreadBasic, - sizeof(THREAD_BASIC_INFORMATION), - NULL); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return 0; - } - - return HandleToUlong(ThreadBasic.ClientId.UniqueThread); -} - -/* - * @unimplemented - */ -LANGID WINAPI -SetThreadUILanguage(LANGID LangId) -{ - DPRINT1("SetThreadUILanguage(0x%4x) unimplemented!\n", LangId); - return LangId; -} - -static void CALLBACK -IntCallUserApc(PVOID Function, PVOID dwData, PVOID Argument3) -{ - PAPCFUNC pfnAPC = (PAPCFUNC)Function; - pfnAPC((ULONG_PTR)dwData); -} - -/* - * @implemented - */ -DWORD WINAPI -QueueUserAPC(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData) -{ - NTSTATUS Status; - - Status = NtQueueApcThread(hThread, IntCallUserApc, pfnAPC, - (PVOID)dwData, NULL); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return 0; - } - - return 1; -} - -BOOL -WINAPI -SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) -{ - STUB; return FALSE; } - -/* - * @implemented - */ -BOOL WINAPI -GetThreadIOPendingFlag(HANDLE hThread, - PBOOL lpIOIsPending) -{ - ULONG IoPending; - NTSTATUS Status; - - if(lpIOIsPending == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Status = NtQueryInformationThread(hThread, - ThreadIsIoPending, - (PVOID)&IoPending, - sizeof(IoPending), - NULL); - if(NT_SUCCESS(Status)) - { - *lpIOIsPending = ((IoPending != 0) ? TRUE : FALSE); - return TRUE; - } - - BaseSetLastNTError(Status); - return FALSE; -} - - -typedef struct _QUEUE_USER_WORKITEM_CONTEXT -{ - LPTHREAD_START_ROUTINE Function; - PVOID Context; -} QUEUE_USER_WORKITEM_CONTEXT, *PQUEUE_USER_WORKITEM_CONTEXT; - -static VOID -NTAPI -InternalWorkItemTrampoline(PVOID Context) -{ - QUEUE_USER_WORKITEM_CONTEXT Info; - - ASSERT(Context); - - /* Save the context to the stack */ - Info = *(volatile QUEUE_USER_WORKITEM_CONTEXT *)Context; - - /* Free the context before calling the callback. This avoids - a memory leak in case the thread dies... */ - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Context); - - /* Call the real callback */ - Info.Function(Info.Context); -} - - -/* - * @implemented - */ -BOOL -WINAPI -QueueUserWorkItem( - LPTHREAD_START_ROUTINE Function, - PVOID Context, - ULONG Flags - ) -{ - PQUEUE_USER_WORKITEM_CONTEXT WorkItemContext; - NTSTATUS Status; - - /* Save the context for the trampoline function */ - WorkItemContext = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(*WorkItemContext)); - if (WorkItemContext == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - WorkItemContext->Function = Function; - WorkItemContext->Context = Context; - - /* NOTE: Don't use Function directly since the callback signature - differs. This might cause problems on certain platforms... */ - Status = RtlQueueWorkItem(InternalWorkItemTrampoline, - WorkItemContext, - Flags); - if (!NT_SUCCESS(Status)) - { - /* Free the allocated context in case of failure */ - RtlFreeHeap(RtlGetProcessHeap(), - 0, - WorkItemContext); - - BaseSetLastNTError(Status); - return FALSE; - } - +/* + * @implemented + */ +BOOL +WINAPI +QueueUserWorkItem(IN LPTHREAD_START_ROUTINE Function, + IN PVOID Context, + IN ULONG Flags) +{ + NTSTATUS Status; + + /* NOTE: Rtl needs to safely call the function using a trampoline */ + Status = RtlQueueWorkItem((WORKERCALLBACKFUNC)Function, Context, Flags); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* All good */ return TRUE; } @@ -1207,5 +1249,4 @@ return TRUE; } - /* EOF */

1 0

[ion] 56650: [KERNEL32]: Reimplement DeleteFileA and W to handle the new ansi-Unicode functions, as well as to handle the same cases that Pierre implemented in the directory functions (dealing with...
by ion＠svn.reactos.org 23 May '12

23 May '12

Author: ion Date: Wed May 23 16:51:22 2012 New Revision: 56650 URL: http://svn.reactos.org/svn/reactos?rev=56650&view=rev Log: [KERNEL32]: Reimplement DeleteFileA and W to handle the new ansi-Unicode functions, as well as to handle the same cases that Pierre implemented in the directory functions (dealing with reparse points and tags). Modified: trunk/reactos/dll/win32/kernel32/client/file/delete.c Modified: trunk/reactos/dll/win32/kernel32/client/file/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/delete.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/delete.c [iso-8859-1] Wed May 23 16:51:22 2012 @@ -14,7 +14,6 @@ #include <k32.h> #define NDEBUG #include <reactos/debug.h> -DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -23,101 +22,214 @@ */ BOOL WINAPI -DeleteFileA ( - LPCSTR lpFileName - ) +DeleteFileA(IN LPCSTR lpFileName) { - PWCHAR FileNameW; - - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) - return FALSE; - - return DeleteFileW (FileNameW); + PUNICODE_STRING FileName; + + /* Convert the string to unicode, and call the wide function */ + FileName = Basep8BitStringToStaticUnicodeString(lpFileName); + if (FileName) return DeleteFileW(FileName->Buffer); + return FALSE; } - /* * @implemented */ BOOL WINAPI -DeleteFileW ( - LPCWSTR lpFileName - ) +DeleteFileW(IN LPCWSTR lpFileName) { - FILE_DISPOSITION_INFORMATION FileDispInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; - HANDLE FileHandle; - NTSTATUS Status; - - TRACE("DeleteFileW (lpFileName %S)\n",lpFileName); - - if (!RtlDosPathNameToNtPathName_U (lpFileName, - &NtPathU, - NULL, - NULL)) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - TRACE("NtPathU \'%wZ\'\n", &NtPathU); - - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtCreateFile (&FileHandle, - DELETE, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_OPEN, - FILE_NON_DIRECTORY_FILE, - NULL, - 0); - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - WARN("Status 0x%08x\n", Status); - BaseSetLastNTError (Status); - return FALSE; - } - - FileDispInfo.DeleteFile = TRUE; - - Status = NtSetInformationFile (FileHandle, - &IoStatusBlock, - &FileDispInfo, - sizeof(FILE_DISPOSITION_INFORMATION), - FileDispositionInformation); - if (!NT_SUCCESS(Status)) - { - WARN("Status 0x%08x\n", Status); - NtClose (FileHandle); - BaseSetLastNTError (Status); - return FALSE; - } - - Status = NtClose (FileHandle); - if (!NT_SUCCESS (Status)) - { - WARN("Status 0x%08x\n", Status); - BaseSetLastNTError (Status); - return FALSE; - } - - return TRUE; + FILE_DISPOSITION_INFORMATION FileDispInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING NtPathU; + HANDLE FileHandle; + NTSTATUS Status; + RTL_RELATIVE_NAME_U RelativeName; + PWCHAR PathBuffer; + FILE_ATTRIBUTE_TAG_INFORMATION FileTagInformation; + + /* Convert to NT path and get the relative name too */ + if (!RtlDosPathNameToNtPathName_U(lpFileName, + &NtPathU, + NULL, + &RelativeName)) + { + /* Bail out if the path name makes no sense */ + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + /* Save the path buffer in case we free it later */ + PathBuffer = NtPathU.Buffer; + + /* If we have a relative name... */ + if (RelativeName.RelativeName.Length) + { + /* Do a relative open with only the relative path set */ + NtPathU = RelativeName.RelativeName; + } + else + { + /* Do a full path open with no containing directory */ + RelativeName.ContainingDirectory = NULL; + } + + /* Now open the directory name that was passed in */ + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + RelativeName.ContainingDirectory, + NULL); + Status = NtOpenFile(&FileHandle, + DELETE | FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | + FILE_OPEN_FOR_BACKUP_INTENT | + FILE_OPEN_REPARSE_POINT); + if (NT_SUCCESS(Status)) + { + /* Check if there's a reparse point associated with this file handle */ + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileTagInformation, + sizeof(FileTagInformation), + FileAttributeTagInformation); + if ((NT_SUCCESS(Status)) && + (FileTagInformation.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) && + (FileTagInformation.ReparseTag != IO_REPARSE_TAG_MOUNT_POINT)) + { + /* There is, so now try to open it with reparse behavior */ + NtClose(FileHandle); + Status = NtOpenFile(&FileHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE | + FILE_SHARE_READ | + FILE_SHARE_WRITE, + FILE_NON_DIRECTORY_FILE | + FILE_OPEN_FOR_BACKUP_INTENT); + if (!NT_SUCCESS(Status)) + { + /* We failed -- maybe whoever is handling this tag isn't there */ + if (Status == STATUS_IO_REPARSE_TAG_NOT_HANDLED) + { + /* Try to open it for delete, without reparse behavior */ + Status = NtOpenFile(&FileHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | + FILE_SHARE_WRITE | + FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | + FILE_OPEN_FOR_BACKUP_INTENT | + FILE_OPEN_REPARSE_POINT); + } + + if (!NT_SUCCESS(Status)) + { + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + BaseSetLastNTError(Status); + return FALSE; + } + } + } + else if (!(NT_SUCCESS(Status)) && + (Status != STATUS_NOT_IMPLEMENTED) && + (Status != STATUS_INVALID_PARAMETER)) + { + /* We had some critical error querying the attributes, bail out */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + NtClose(FileHandle); + BaseSetLastNTError(Status); + return FALSE; + } + } + else + { + /* It's possible that FILE_OPEN_REPARSE_POINT was not understood */ + if (Status == STATUS_INVALID_PARAMETER) + { + /* Try opening the file normally, with reparse behavior */ + Status = NtOpenFile(&FileHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE | + FILE_SHARE_READ | + FILE_SHARE_WRITE, + FILE_NON_DIRECTORY_FILE | + FILE_OPEN_FOR_BACKUP_INTENT); + if (!NT_SUCCESS(Status)) + { + /* This failed too, fail */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + BaseSetLastNTError(Status); + return FALSE; + } + } + else + { + /* Maybe we didn't have READ_ATTRIBUTE rights? */ + if (Status != STATUS_ACCESS_DENIED) + { + /* Nope, it was something else, let's fail */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + BaseSetLastNTError(Status); + return FALSE; + } + + /* Let's try again, without querying attributes */ + Status = NtOpenFile(&FileHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE | + FILE_SHARE_READ | + FILE_SHARE_WRITE, + FILE_NON_DIRECTORY_FILE | + FILE_OPEN_FOR_BACKUP_INTENT | + FILE_OPEN_REPARSE_POINT); + if (!NT_SUCCESS(Status)) + { + /* This failed too, so bail out */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + BaseSetLastNTError(Status); + return FALSE; + } + } + } + + /* Ready to delete the file, so cleanup temporary data */ + RtlReleaseRelativeName(&RelativeName); + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); + + /* Ask for the file to be deleted */ + FileDispInfo.DeleteFile = TRUE; + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileDispInfo, + sizeof(FILE_DISPOSITION_INFORMATION), + FileDispositionInformation); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + /* Deletion failed, tell the caller */ + BaseSetLastNTError(Status); + return FALSE; + } + + /* Tell the caller deletion worked */ + return TRUE; } /* EOF */

1 0

[tfaber] 56649: [RTL] - Use RtlAnsiStringToUnicodeString instead of mbstowcs to correctly handle manifests that aren't null-terminated See issue #6743 for more details.
by tfaber＠svn.reactos.org 23 May '12

23 May '12

Author: tfaber Date: Wed May 23 11:54:20 2012 New Revision: 56649 URL: http://svn.reactos.org/svn/reactos?rev=56649&view=rev Log: [RTL] - Use RtlAnsiStringToUnicodeString instead of mbstowcs to correctly handle manifests that aren't null-terminated See issue #6743 for more details. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=56649… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Wed May 23 11:54:20 2012 @@ -1576,13 +1576,17 @@ } else { - /* let's assume utf-8 for now */ - size_t len; - WCHAR *new_buff; + /* TODO: this doesn't handle arbitrary encodings */ + ANSI_STRING xmlA; + UNICODE_STRING xmlW; + + ASSERT(size < MAXUSHORT); + xmlA.Buffer = (PCHAR)buffer; + xmlA.Length = xmlA.MaximumLength = (USHORT)size; _SEH2_TRY { - len = mbstowcs(NULL, buffer, size); + status = RtlAnsiStringToUnicodeString(&xmlW, &xmlA, TRUE); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1591,23 +1595,18 @@ } _SEH2_END; - DPRINT("len = %x\n", len); - - if (len == -1) - { - DPRINT1( "utf-8 conversion failed\n" ); + if (!NT_SUCCESS(status)) + { + DPRINT1("RtlAnsiStringToUnicodeString failed with %lx\n", status); return STATUS_SXS_CANT_GEN_ACTCTX; } - if (!(new_buff = RtlAllocateHeap( RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len))) - return STATUS_NO_MEMORY; - - mbstowcs( new_buff, buffer, size); - xmlbuf.ptr = new_buff; - - xmlbuf.end = xmlbuf.ptr + len / sizeof(WCHAR); + ASSERT(xmlW.Buffer != NULL); + + xmlbuf.ptr = xmlW.Buffer; + xmlbuf.end = xmlbuf.ptr + xmlW.Length / sizeof(WCHAR); status = parse_manifest_buffer( acl, assembly, ai, &xmlbuf ); - RtlFreeHeap( RtlGetProcessHeap(), 0, new_buff ); + RtlFreeUnicodeString(&xmlW); } return status; }

1 0

[ekohl] 56648: [SAMLIB/SAMSRV/SYSSETUP] - Use Wine debug messages in samlib.dll. - Move SAM initialization code from samlib.dll to samsrv.dll. - Lsass.exe initializes SAM instead of syssetup.dll.
by ekohl＠svn.reactos.org 21 May '12

21 May '12

Author: ekohl Date: Mon May 21 13:38:32 2012 New Revision: 56648 URL: http://svn.reactos.org/svn/reactos?rev=56648&view=rev Log: [SAMLIB/SAMSRV/SYSSETUP] - Use Wine debug messages in samlib.dll. - Move SAM initialization code from samlib.dll to samsrv.dll. - Lsass.exe initializes SAM instead of syssetup.dll. Added: trunk/reactos/dll/win32/samsrv/setup.c (with props) Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/samlib/dllmain.c trunk/reactos/dll/win32/samlib/precomp.h trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/include/reactos/libs/samlib/samlib.h Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Mon May 21 13:38:32 2012 @@ -21,6 +21,7 @@ add_library(samlib SHARED ${SOURCE}) set_module_type(samlib win32dll UNICODE) +target_link_libraries(samlib wine ${PSEH_LIB}) add_importlibs(samlib rpcrt4 advapi32 msvcrt kernel32 ntdll) add_pch(samlib precomp.h) add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/samlib/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/dllmain.c [iso-8859-1] Mon May 21 13:38:32 2012 @@ -29,7 +29,7 @@ #include "precomp.h" -//#define LOG_DEBUG_MESSAGES +WINE_DEFAULT_DEBUG_CHANNEL(samlib); /* GLOBALS *******************************************************************/ @@ -45,50 +45,4 @@ return TRUE; } - -void -DebugPrint (char* fmt,...) -{ -#ifdef LOG_DEBUG_MESSAGES - char FileName[MAX_PATH]; - HANDLE hLogFile; - DWORD dwBytesWritten; -#endif - char buffer[512]; - va_list ap; - - va_start (ap, fmt); - vsprintf (buffer, fmt, ap); - va_end (ap); - - OutputDebugStringA (buffer); - -#ifdef LOG_DEBUG_MESSAGES - strcpy (FileName, "C:\\reactos\\samlib.log"); - hLogFile = CreateFileA (FileName, - GENERIC_WRITE, - 0, - NULL, - OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hLogFile == INVALID_HANDLE_VALUE) - return; - - if (SetFilePointer(hLogFile, 0, NULL, FILE_END) == 0xFFFFFFFF) - { - CloseHandle (hLogFile); - return; - } - - WriteFile (hLogFile, - buffer, - strlen(buffer), - &dwBytesWritten, - NULL); - - CloseHandle (hLogFile); -#endif -} - /* EOF */ Modified: trunk/reactos/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] Mon May 21 13:38:32 2012 @@ -10,4 +10,4 @@ #include "sam_c.h" -#include "debug.h" +#include <wine/debug.h> Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Mon May 21 13:38:32 2012 @@ -27,276 +27,14 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG #include "precomp.h" +WINE_DEFAULT_DEBUG_CHANNEL(samlib); /* GLOBALS *******************************************************************/ /* FUNCTIONS *****************************************************************/ - - -static BOOL -CreateBuiltinAliases (HKEY hAliasesKey) -{ - return TRUE; -} - - -static BOOL -CreateBuiltinGroups (HKEY hGroupsKey) -{ - return TRUE; -} - - -static BOOL -CreateBuiltinUsers (HKEY hUsersKey) -{ - return TRUE; -} - - -BOOL WINAPI -SamInitializeSAM (VOID) -{ - DWORD dwDisposition; - HKEY hSamKey; - HKEY hDomainsKey; - HKEY hAccountKey; - HKEY hBuiltinKey; - HKEY hAliasesKey; - HKEY hGroupsKey; - HKEY hUsersKey; - - DPRINT("SamInitializeSAM() called\n"); - - if (RegCreateKeyExW (HKEY_LOCAL_MACHINE, - L"SAM\\SAM", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hSamKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Sam' key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - if (RegCreateKeyExW (hSamKey, - L"Domains", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hDomainsKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Domains' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hSamKey); - return FALSE; - } - - RegCloseKey (hSamKey); - - /* Create the 'Domains\\Account' key */ - if (RegCreateKeyExW (hDomainsKey, - L"Account", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAccountKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Domains\\Account' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hDomainsKey); - return FALSE; - } - - - /* Create the 'Account\Aliases' key */ - if (RegCreateKeyExW (hAccountKey, - L"Aliases", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAliasesKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Account\\Aliases' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hAccountKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - RegCloseKey (hAliasesKey); - - - /* Create the 'Account\Groups' key */ - if (RegCreateKeyExW (hAccountKey, - L"Groups", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hGroupsKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Account\\Groups' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hAccountKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - RegCloseKey (hGroupsKey); - - - /* Create the 'Account\Users' key */ - if (RegCreateKeyExW (hAccountKey, - L"Users", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hUsersKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Account\\Users' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hAccountKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - RegCloseKey (hAccountKey); - - - /* Create the 'Domains\\Builtin' */ - if (RegCreateKeyExW (hDomainsKey, - L"Builtin", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hBuiltinKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create Builtin key! (Error %lu)\n", GetLastError()); - RegCloseKey (hDomainsKey); - return FALSE; - } - - - /* Create the 'Builtin\Aliases' key */ - if (RegCreateKeyExW (hBuiltinKey, - L"Aliases", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hAliasesKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Builtin\\Aliases' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hBuiltinKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - /* Create builtin aliases */ - if (!CreateBuiltinAliases (hAliasesKey)) - { - DPRINT1 ("Failed to create builtin aliases!\n"); - RegCloseKey (hAliasesKey); - RegCloseKey (hBuiltinKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - RegCloseKey (hAliasesKey); - - - /* Create the 'Builtin\Groups' key */ - if (RegCreateKeyExW (hBuiltinKey, - L"Groups", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hGroupsKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Builtin\\Groups' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hBuiltinKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - /* Create builtin groups */ - if (!CreateBuiltinGroups (hGroupsKey)) - { - DPRINT1 ("Failed to create builtin groups!\n"); - RegCloseKey (hGroupsKey); - RegCloseKey (hBuiltinKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - RegCloseKey (hGroupsKey); - - - /* Create the 'Builtin\Users' key */ - if (RegCreateKeyExW (hBuiltinKey, - L"Users", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hUsersKey, - &dwDisposition)) - { - DPRINT1 ("Failed to create 'Builtin\\Users' key! (Error %lu)\n", GetLastError()); - RegCloseKey (hBuiltinKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - /* Create builtin users */ - if (!CreateBuiltinUsers (hUsersKey)) - { - DPRINT1 ("Failed to create builtin users!\n"); - RegCloseKey (hUsersKey); - RegCloseKey (hBuiltinKey); - RegCloseKey (hDomainsKey); - return FALSE; - } - - RegCloseKey (hUsersKey); - - RegCloseKey (hBuiltinKey); - - RegCloseKey (hDomainsKey); - - DPRINT ("SamInitializeSAM() done\n"); - - return TRUE; -} - /* * ERROR_USER_EXISTS @@ -310,7 +48,7 @@ HKEY hUsersKey; HKEY hUserKey; - DPRINT ("SamCreateUser() called\n"); + TRACE("SamCreateUser() called\n"); /* FIXME: Check whether the SID is a real user sid */ @@ -321,7 +59,7 @@ KEY_ALL_ACCESS, &hUsersKey)) { - DPRINT1 ("Failed to open Account key! (Error %lu)\n", GetLastError()); + ERR("Failed to open Account key! (Error %lu)\n", GetLastError()); return FALSE; } @@ -336,7 +74,7 @@ &hUserKey, &dwDisposition)) { - DPRINT1 ("Failed to create/open the user key! (Error %lu)\n", GetLastError()); + ERR("Failed to create/open the user key! (Error %lu)\n", GetLastError()); RegCloseKey (hUsersKey); return FALSE; } @@ -345,7 +83,7 @@ if (dwDisposition == REG_OPENED_EXISTING_KEY) { - DPRINT1 ("User already exists!\n"); + ERR("User already exists!\n"); RegCloseKey (hUserKey); SetLastError (ERROR_USER_EXISTS); return FALSE; @@ -360,7 +98,7 @@ (LPBYTE)UserName, (wcslen (UserName) + 1) * sizeof (WCHAR))) { - DPRINT1 ("Failed to set the user name value! (Error %lu)\n", GetLastError()); + ERR("Failed to set the user name value! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; } @@ -373,7 +111,7 @@ (LPBYTE)UserPassword, (wcslen (UserPassword) + 1) * sizeof (WCHAR))) { - DPRINT1 ("Failed to set the user name value! (Error %lu)\n", GetLastError()); + ERR("Failed to set the user name value! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; } @@ -386,14 +124,14 @@ (LPBYTE)UserSid, RtlLengthSid (UserSid))) { - DPRINT1 ("Failed to set the user SID value! (Error %lu)\n", GetLastError()); + ERR("Failed to set the user SID value! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; } RegCloseKey (hUserKey); - DPRINT ("SamCreateUser() done\n"); + TRACE("SamCreateUser() done\n"); return TRUE; } @@ -412,7 +150,7 @@ HKEY hUsersKey; HKEY hUserKey; - DPRINT ("SamCheckUserPassword() called\n"); + TRACE("SamCheckUserPassword() called\n"); /* Open the Users key */ if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, @@ -421,7 +159,7 @@ KEY_READ, &hUsersKey)) { - DPRINT1 ("Failed to open Users key! (Error %lu)\n", GetLastError()); + ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); return FALSE; } @@ -434,12 +172,12 @@ { if (GetLastError () == ERROR_FILE_NOT_FOUND) { - DPRINT1 ("Invalid user name!\n"); + ERR("Invalid user name!\n"); SetLastError (ERROR_NO_SUCH_USER); } else { - DPRINT1 ("Failed to open user key! (Error %lu)\n", GetLastError()); + ERR("Failed to open user key! (Error %lu)\n", GetLastError()); } RegCloseKey (hUsersKey); @@ -457,7 +195,7 @@ (LPBYTE)szPassword, &dwLength)) { - DPRINT1 ("Failed to read the password! (Error %lu)\n", GetLastError()); + ERR("Failed to read the password! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; } @@ -468,12 +206,12 @@ if ((wcslen (szPassword) != wcslen (UserPassword)) || (wcscmp (szPassword, UserPassword) != 0)) { - DPRINT1 ("Wrong password!\n"); + ERR("Wrong password!\n"); SetLastError (ERROR_WRONG_PASSWORD); return FALSE; } - DPRINT ("SamCheckUserPassword() done\n"); + TRACE("SamCheckUserPassword() done\n"); return TRUE; } @@ -488,7 +226,7 @@ HKEY hUsersKey; HKEY hUserKey; - DPRINT ("SamGetUserSid() called\n"); + TRACE("SamGetUserSid() called\n"); if (Sid != NULL) *Sid = NULL; @@ -500,7 +238,7 @@ KEY_READ, &hUsersKey)) { - DPRINT1 ("Failed to open Users key! (Error %lu)\n", GetLastError()); + ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); return FALSE; } @@ -513,12 +251,12 @@ { if (GetLastError () == ERROR_FILE_NOT_FOUND) { - DPRINT1 ("Invalid user name!\n"); + ERR("Invalid user name!\n"); SetLastError (ERROR_NO_SUCH_USER); } else { - DPRINT1 ("Failed to open user key! (Error %lu)\n", GetLastError()); + ERR("Failed to open user key! (Error %lu)\n", GetLastError()); } RegCloseKey (hUsersKey); @@ -536,19 +274,19 @@ NULL, &dwLength)) { - DPRINT1 ("Failed to read the SID size! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; } /* Allocate sid buffer */ - DPRINT ("Required SID buffer size: %lu\n", dwLength); + TRACE("Required SID buffer size: %lu\n", dwLength); lpSid = (PSID)RtlAllocateHeap (RtlGetProcessHeap (), 0, dwLength); if (lpSid == NULL) { - DPRINT1 ("Failed to allocate SID buffer!\n"); + ERR("Failed to allocate SID buffer!\n"); RegCloseKey (hUserKey); return FALSE; } @@ -561,7 +299,7 @@ (LPBYTE)lpSid, &dwLength)) { - DPRINT1 ("Failed to read the SID! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); RtlFreeHeap (RtlGetProcessHeap (), 0, lpSid); @@ -573,7 +311,7 @@ *Sid = lpSid; - DPRINT ("SamGetUserSid() done\n"); + TRACE("SamGetUserSid() done\n"); return TRUE; } @@ -597,7 +335,7 @@ LPWSTR pszStringBinding; RPC_STATUS status; -// TRACE("PSAMPR_SERVER_NAME_bind() called\n"); + TRACE("PSAMPR_SERVER_NAME_bind() called\n"); status = RpcStringBindingComposeW(NULL, L"ncacn_np", @@ -607,7 +345,7 @@ &pszStringBinding); if (status) { -// TRACE("RpcStringBindingCompose returned 0x%x\n", status); + TRACE("RpcStringBindingCompose returned 0x%x\n", status); return NULL; } @@ -616,7 +354,7 @@ &hBinding); if (status) { -// TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeW(&pszStringBinding); @@ -635,12 +373,12 @@ { RPC_STATUS status; -// TRACE("PSAMPR_SERVER_NAME_unbind() called\n"); + TRACE("PSAMPR_SERVER_NAME_unbind() called\n"); status = RpcBindingFree(&hBinding); if (status) { -// TRACE("RpcBindingFree returned 0x%x\n", status); + TRACE("RpcBindingFree returned 0x%x\n", status); } } Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Mon May 21 13:38:32 2012 @@ -64,7 +64,6 @@ @ stub SamiSetDSRMPassword @ stub SamiSetDSRMPasswordOWF -@ stdcall SamInitializeSAM() @ stdcall SamCreateUser(wstr wstr ptr) @ stdcall SamCheckUserPassword(wstr wstr) @ stdcall SamGetUserSid(wstr ptr) Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Mon May 21 13:38:32 2012 @@ -10,6 +10,7 @@ list(APPEND SOURCE samrpc.c samsrv.c + setup.c samsrv.rc ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def @@ -19,6 +20,6 @@ set_module_type(samsrv win32dll ENTRYPOINT 0 UNICODE) target_link_libraries(samsrv wine ${PSEH_LIB}) -add_importlibs(samsrv rpcrt4 kernel32 ntdll) +add_importlibs(samsrv rpcrt4 advapi32 kernel32 ntdll) add_dependencies(samsrv psdk) add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Mon May 21 13:38:32 2012 @@ -29,9 +29,15 @@ NTAPI SamIInitialize(VOID) { + NTSTATUS Status = STATUS_SUCCESS; + TRACE("SamIInitialize() called\n"); - return STATUS_SUCCESS; + if (SampIsSetupRunning()) + Status = SampInitializeRegistry(); + + + return Status; } @@ -41,6 +47,8 @@ { TRACE("SampInitializeRegistry() called\n"); + SampInitializeSAM(); + return STATUS_SUCCESS; } 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 May 21 13:38:32 2012 @@ -16,4 +16,9 @@ #include "sam_s.h" -#include <wine/debug.h> +#include <wine/debug.h> + + +/* setup.c */ +BOOL SampIsSetupRunning(VOID); +BOOL SampInitializeSAM(VOID); Added: 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 (added) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Mon May 21 13:38:32 2012 @@ -1,0 +1,316 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Security Account Manager (SAM) Server + * FILE: reactos/dll/win32/samsrv/setup.c + * PURPOSE: Registry setup routines + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "samsrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(samsrv); + + +/* FUNCTIONS ***************************************************************/ + +BOOL +SampIsSetupRunning(VOID) +{ + DWORD dwError; + HKEY hKey; + DWORD dwType; + DWORD dwSize; + DWORD dwSetupType; + + TRACE("SampIsSetupRunning()\n"); + + /* Open key */ + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\Setup", + 0, + KEY_QUERY_VALUE, + &hKey); + if (dwError != ERROR_SUCCESS) + return FALSE; + + /* Read key */ + dwSize = sizeof(DWORD); + dwError = RegQueryValueExW(hKey, + L"SetupType", + NULL, + &dwType, + (LPBYTE)&dwSetupType, + &dwSize); + + /* Close key, and check if returned values are correct */ + RegCloseKey(hKey); + if (dwError != ERROR_SUCCESS || dwType != REG_DWORD || dwSize != sizeof(DWORD)) + return FALSE; + + TRACE("SampIsSetupRunning() returns %s\n", (dwSetupType != 0) ? "TRUE" : "FALSE"); + return (dwSetupType != 0); +} + + +static BOOL +CreateBuiltinAliases(HKEY hAliasesKey) +{ + return TRUE; +} + + +static BOOL +CreateBuiltinGroups(HKEY hGroupsKey) +{ + return TRUE; +} + + +static BOOL +CreateBuiltinUsers(HKEY hUsersKey) +{ + return TRUE; +} + + +BOOL +SampInitializeSAM(VOID) +{ + DWORD dwDisposition; + HKEY hSamKey; + HKEY hDomainsKey; + HKEY hAccountKey; + HKEY hBuiltinKey; + HKEY hAliasesKey; + HKEY hGroupsKey; + HKEY hUsersKey; + + TRACE("SampInitializeSAM() called\n"); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"SAM\\SAM", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hSamKey, + &dwDisposition)) + { + ERR("Failed to create 'Sam' key! (Error %lu)\n", GetLastError()); + return FALSE; + } + + if (RegCreateKeyExW(hSamKey, + L"Domains", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hDomainsKey, + &dwDisposition)) + { + ERR("Failed to create 'Domains' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hSamKey); + return FALSE; + } + + RegCloseKey (hSamKey); + + /* Create the 'Domains\\Account' key */ + if (RegCreateKeyExW(hDomainsKey, + L"Account", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hAccountKey, + &dwDisposition)) + { + ERR("Failed to create 'Domains\\Account' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hDomainsKey); + return FALSE; + } + + + /* Create the 'Account\Aliases' key */ + if (RegCreateKeyExW(hAccountKey, + L"Aliases", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hAliasesKey, + &dwDisposition)) + { + ERR("Failed to create 'Account\\Aliases' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hAccountKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + RegCloseKey (hAliasesKey); + + + /* Create the 'Account\Groups' key */ + if (RegCreateKeyExW(hAccountKey, + L"Groups", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hGroupsKey, + &dwDisposition)) + { + ERR("Failed to create 'Account\\Groups' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hAccountKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + RegCloseKey(hGroupsKey); + + + /* Create the 'Account\Users' key */ + if (RegCreateKeyExW(hAccountKey, + L"Users", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hUsersKey, + &dwDisposition)) + { + ERR("Failed to create 'Account\\Users' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hAccountKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + RegCloseKey(hUsersKey); + + RegCloseKey(hAccountKey); + + + /* Create the 'Domains\\Builtin' */ + if (RegCreateKeyExW(hDomainsKey, + L"Builtin", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hBuiltinKey, + &dwDisposition)) + { + ERR("Failed to create Builtin key! (Error %lu)\n", GetLastError()); + RegCloseKey(hDomainsKey); + return FALSE; + } + + + /* Create the 'Builtin\Aliases' key */ + if (RegCreateKeyExW(hBuiltinKey, + L"Aliases", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hAliasesKey, + &dwDisposition)) + { + ERR("Failed to create 'Builtin\\Aliases' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hBuiltinKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + /* Create builtin aliases */ + if (!CreateBuiltinAliases(hAliasesKey)) + { + ERR("Failed to create builtin aliases!\n"); + RegCloseKey(hAliasesKey); + RegCloseKey(hBuiltinKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + RegCloseKey(hAliasesKey); + + + /* Create the 'Builtin\Groups' key */ + if (RegCreateKeyExW(hBuiltinKey, + L"Groups", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hGroupsKey, + &dwDisposition)) + { + ERR("Failed to create 'Builtin\\Groups' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hBuiltinKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + /* Create builtin groups */ + if (!CreateBuiltinGroups(hGroupsKey)) + { + ERR("Failed to create builtin groups!\n"); + RegCloseKey(hGroupsKey); + RegCloseKey(hBuiltinKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + RegCloseKey(hGroupsKey); + + + /* Create the 'Builtin\Users' key */ + if (RegCreateKeyExW(hBuiltinKey, + L"Users", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hUsersKey, + &dwDisposition)) + { + ERR("Failed to create 'Builtin\\Users' key! (Error %lu)\n", GetLastError()); + RegCloseKey(hBuiltinKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + /* Create builtin users */ + if (!CreateBuiltinUsers(hUsersKey)) + { + ERR("Failed to create builtin users!\n"); + RegCloseKey(hUsersKey); + RegCloseKey(hBuiltinKey); + RegCloseKey(hDomainsKey); + return FALSE; + } + + RegCloseKey(hUsersKey); + + RegCloseKey(hBuiltinKey); + + RegCloseKey(hDomainsKey); + + TRACE("SampInitializeSAM() done\n"); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/samsrv/setup.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/samsrv/setup.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon May 21 13:38:32 2012 @@ -893,13 +893,6 @@ return 0; } - /* Initialize the Security Account Manager (SAM) */ - if (!SamInitializeSAM()) - { - FatalError("SamInitializeSAM() failed!"); - return 0; - } - /* Create the semi-random Domain-SID */ if (!CreateRandomSid(&DomainSid)) { Modified: trunk/reactos/include/reactos/libs/samlib/samlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samli… ============================================================================== --- trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] Mon May 21 13:38:32 2012 @@ -27,9 +27,6 @@ BOOL WINAPI -SamInitializeSAM (VOID); - -BOOL WINAPI SamCreateUser (PWSTR UserName, PWSTR UserPassword, PSID UserSid);

1 0

[ekohl] 56647: [LSASS] Load samsrv.dll and call SamIInitialize when lsass is started.
by ekohl＠svn.reactos.org 20 May '12

20 May '12

Author: ekohl Date: Sun May 20 21:10:53 2012 New Revision: 56647 URL: http://svn.reactos.org/svn/reactos?rev=56647&view=rev Log: [LSASS] Load samsrv.dll and call SamIInitialize when lsass is started. Modified: trunk/reactos/base/system/lsass/CMakeLists.txt trunk/reactos/base/system/lsass/lsass.c Modified: trunk/reactos/base/system/lsass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/CMakeLis… ============================================================================== --- trunk/reactos/base/system/lsass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/CMakeLists.txt [iso-8859-1] Sun May 20 21:10:53 2012 @@ -5,5 +5,5 @@ add_executable(lsass lsass.c lsass.rc) set_module_type(lsass win32gui UNICODE) -add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) +add_importlibs(lsass advapi32 lsasrv samsrv msvcrt kernel32 ntdll) add_cd_file(TARGET lsass DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Sun May 20 21:10:53 2012 @@ -30,7 +30,7 @@ #include <ndk/psfuncs.h> #include <lsass/lsasrv.h> -//#include <samsrv.h> +#include <samsrv/samsrv.h> #include <lsass/lsass.h> #define NDEBUG @@ -63,7 +63,6 @@ goto ByeBye; } -#if 0 /* Initialize the SAM server DLL. */ Status = SamIInitialize(); if (!NT_SUCCESS(Status)) @@ -71,7 +70,6 @@ DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); goto ByeBye; } -#endif /* FIXME: More initialization */

1 0

[ekohl] 56646: [samlib] - Add DDK header ntsam.h. - Add some client side stubs of the SAM RPC interface.
by ekohl＠svn.reactos.org 20 May '12

20 May '12

Author: ekohl Date: Sun May 20 20:33:16 2012 New Revision: 56646 URL: http://svn.reactos.org/svn/reactos?rev=56646&view=rev Log: [samlib] - Add DDK header ntsam.h. - Add some client side stubs of the SAM RPC interface. Added: trunk/reactos/include/ddk/ntsam.h (with props) Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/samlib/precomp.h trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Sun May 20 20:33:16 2012 @@ -1,20 +1,27 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${REACTOS_SOURCE_DIR}/include/reactos/wine) + add_definitions(-D__WINESRC__) set_rc_compiler() spec2def(samlib.dll samlib.spec ADD_IMPORTLIB) + +add_rpc_files(client + ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl) list(APPEND SOURCE dllmain.c samlib.c samlib.rc ${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/samlib.def) + ${CMAKE_CURRENT_BINARY_DIR}/samlib.def + ${CMAKE_CURRENT_BINARY_DIR}/sam_c.c) add_library(samlib SHARED ${SOURCE}) -set_module_type(samlib win32dll) -add_importlibs(samlib advapi32 msvcrt kernel32 ntdll) +set_module_type(samlib win32dll UNICODE) +add_importlibs(samlib rpcrt4 advapi32 msvcrt kernel32 ntdll) add_pch(samlib precomp.h) add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] Sun May 20 20:33:16 2012 @@ -6,5 +6,8 @@ #include <winerror.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> +#include <ntsam.h> + +#include "sam_c.h" #include "debug.h" Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sun May 20 20:33:16 2012 @@ -578,4 +578,95 @@ return TRUE; } +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +handle_t __RPC_USER +PSAMPR_SERVER_NAME_bind(PSAMPR_SERVER_NAME pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + +// TRACE("PSAMPR_SERVER_NAME_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszSystemName, + L"\\pipe\\samr", + NULL, + &pszStringBinding); + if (status) + { +// TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { +// TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +PSAMPR_SERVER_NAME_unbind(PSAMPR_SERVER_NAME pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + +// TRACE("PSAMPR_SERVER_NAME_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { +// TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +NTSTATUS +NTAPI +SamCloseHandle(IN SAM_HANDLE SamHandle) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +SamConnect(IN OUT PUNICODE_STRING ServerName, + OUT PSAM_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) +{ + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +SamShutdownSamServer(IN SAM_HANDLE ServerHandle) +{ + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sun May 20 20:33:16 2012 @@ -4,8 +4,8 @@ @ stub SamChangePasswordUser2 @ stub SamChangePasswordUser3 @ stub SamChangePasswordUser -@ stub SamCloseHandle -@ stub SamConnect +@ stdcall SamCloseHandle(ptr) +@ stdcall SamConnect(ptr ptr long ptr) @ stub SamConnectWithCreds @ stub SamCreateAliasInDomain @ stub SamCreateGroupInDomain @@ -49,7 +49,7 @@ @ stub SamSetInformationUser @ stub SamSetMemberAttributesOfGroup @ stub SamSetSecurityObject -@ stub SamShutdownSamServer +@ stdcall SamShutdownSamServer(ptr) @ stub SamTestPrivateFunctionsDomain @ stub SamTestPrivateFunctionsUser @ stub SamiChangeKeys Added: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h (added) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun May 20 20:33:16 2012 @@ -1,0 +1,31 @@ + +#ifndef _NTSAM_ +#define _NTSAM_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef PVOID SAM_HANDLE, *PSAM_HANDLE; + +NTSTATUS +NTAPI +SamCloseHandle(IN SAM_HANDLE SamHandle); + +NTSTATUS +NTAPI +SamConnect(IN OUT PUNICODE_STRING ServerName, + OUT PSAM_HANDLE ServerHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes); + +NTSTATUS +NTAPI +SamShutdownSamServer(IN SAM_HANDLE ServerHandle); + + +#ifdef __cplusplus +} +#endif + +#endif /* _NTSAM_ */ Propchange: trunk/reactos/include/ddk/ntsam.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/ddk/ntsam.h ------------------------------------------------------------------------------ svn:keywords = author date id revision

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