Ros-diffs

ros-diffs@reactos.org

81390 discussions

[bfreisen] 62113: [MSPAINT] - Text tool allows text input (I chose a design with separate editor window)
by bfreisen＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: bfreisen Date: Mon Feb 10 20:49:15 2014 New Revision: 62113 URL: http://svn.reactos.org/svn/reactos?rev=62113&view=rev Log: [MSPAINT] - Text tool allows text input (I chose a design with separate editor window) Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mspaint/globalvar.h trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -10,6 +10,7 @@ registry.c selection.c sizebox.c + textedit.c toolsettings.c winproc.c precomp.h) Modified: trunk/reactos/base/applications/mspaint/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/globalvar.h [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -54,6 +54,8 @@ extern HWND hImageArea; extern HBITMAP hSelBm; extern HBITMAP hSelMask; +extern HWND hwndTextEdit; +extern HWND hwndEditCtl; extern LOGFONT lfTextFont; extern HFONT hfontTextFont; extern LPTSTR textToolText; Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -15,6 +15,7 @@ #include "toolsettings.h" #include "selection.h" #include "sizebox.h" +#include "textedit.h" /* FUNCTIONS ********************************************************/ @@ -54,9 +55,10 @@ HBITMAP hSelMask; LOGFONT lfTextFont; HFONT hfontTextFont; -/* TODO: add dialog to edit the currently hard-coded text */ -LPTSTR textToolText = _T("Abc\n1234567890"); -int textToolTextMaxLen = SIZEOF(textToolText); +HWND hwndTextEdit; +HWND hwndEditCtl; +LPTSTR textToolText = NULL; +int textToolTextMaxLen = 0; /* array holding palette colors; may be changed by the user during execution */ int palColors[28]; @@ -142,6 +144,7 @@ WNDCLASSEX wclPal; WNDCLASSEX wclSettings; WNDCLASSEX wclSelection; + WNDCLASSEX wclTextEdit; TCHAR progtitle[1000]; TCHAR resstr[100]; @@ -282,6 +285,21 @@ wclSettings.hbrBackground = GetSysColorBrush(COLOR_HIGHLIGHT); RegisterClassEx (&wclSettings); + /* initializing and registering the window class used for the text editor */ + wclTextEdit.hInstance = hThisInstance; + wclTextEdit.lpszClassName = _T("TextEdit"); + wclTextEdit.lpfnWndProc = TextEditWinProc; + wclTextEdit.style = CS_DBLCLKS; + wclTextEdit.cbSize = sizeof(WNDCLASSEX); + wclTextEdit.hIcon = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclTextEdit.hIconSm = LoadIcon(hThisInstance, MAKEINTRESOURCE(IDI_APPICON)); + wclTextEdit.hCursor = LoadCursor(NULL, IDC_ARROW); + wclTextEdit.lpszMenuName = NULL; + wclTextEdit.cbClsExtra = 0; + wclTextEdit.cbWndExtra = 0; + wclTextEdit.hbrBackground = GetSysColorBrush(COLOR_BTNFACE); + RegisterClassEx (&wclTextEdit); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, filename, SIZEOF(filename)); LoadString(hThisInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); _stprintf(progtitle, resstr, filename); @@ -512,6 +530,16 @@ /* by moving the window, the things in WM_SIZE are done */ MoveWindow(hwnd, 100, 100, 600, 450, TRUE); + /* creating the text editor window for the text tool */ + hwndTextEdit = + CreateWindowEx(0, _T("TextEdit"), _T(""), WS_OVERLAPPEDWINDOW, 300, 0, 300, + 200, hwnd, NULL, hThisInstance, NULL); + /* creating the edit control within the editor window */ + hwndEditCtl = + CreateWindowEx(WS_EX_CLIENTEDGE, _T("EDIT"), _T(""), + WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 0, 0, 100, 100, hwndTextEdit, NULL, hThisInstance, NULL); + /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Mon Feb 10 20:49:15 2014 @@ -24,6 +24,7 @@ pointSP = 0; // resets the point-buffer of the polygon and bezier functions InvalidateRect(hToolSettings, NULL, TRUE); ShowWindow(hTrackbarZoom, (tool == TOOL_ZOOM) ? SW_SHOW : SW_HIDE); + ShowWindow(hwndTextEdit, (tool == TOOL_TEXT) ? SW_SHOW : SW_HIDE); } void @@ -299,17 +300,21 @@ EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(GetClipboardData(CF_BITMAP) != NULL)); CloseClipboard(); break; + case 2: /* View menu */ + CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(IsWindowVisible(hToolBoxContainer))); + CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(IsWindowVisible(hPalWin))); + CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(IsWindowVisible(hStatusBar))); + CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(IsWindowVisible(hwndTextEdit))); + EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(activeTool == TOOL_TEXT)); + + CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); + CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); + break; case 3: /* Image menu */ EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(IsWindowVisible(hSelection))); CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(transpBg == 0)); break; } - CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(IsWindowVisible(hToolBoxContainer))); - CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(IsWindowVisible(hPalWin))); - CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(IsWindowVisible(hStatusBar))); - - CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); - CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); CheckMenuItem(menu, IDM_VIEWZOOM125, CHECKED_IF(zoom == 125)); CheckMenuItem(menu, IDM_VIEWZOOM25, CHECKED_IF(zoom == 250)); @@ -1031,6 +1036,8 @@ ShowWindow(hStatusBar, IsWindowVisible(hStatusBar) ? SW_HIDE : SW_SHOW); alignChildrenToMainWindow(); break; + case IDM_FORMATICONBAR: + ShowWindow(hwndTextEdit, IsWindowVisible(hwndTextEdit) ? SW_HIDE : SW_SHOW); case IDM_VIEWSHOWGRID: showGrid = !showGrid;

1 0

[akhaldi] 62112: [SHELLEXTS] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 20:32:25 2014 New Revision: 62112 URL: http://svn.reactos.org/svn/reactos?rev=62112&view=rev Log: [SHELLEXTS] * Prepare the CMake scripts for PCH. CORE-7716 Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt trunk/reactos/dll/shellext/deskmon/CMakeLists.txt trunk/reactos/dll/shellext/fontext/CMakeLists.txt Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/CMake… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:32:25 2014 @@ -4,10 +4,13 @@ list(APPEND SOURCE deskadp.c shxiface.c + precomp.h) + +add_library(deskadp SHARED + ${SOURCE} deskadp.rc ${CMAKE_CURRENT_BINARY_DIR}/deskadp.def) -add_library(deskadp SHARED ${SOURCE}) set_module_type(deskadp win32dll UNICODE) target_link_libraries(deskadp uuid) @@ -20,5 +23,5 @@ kernel32 ntdll) -add_pch(deskadp precomp.h) +add_pch(deskadp precomp.h SOURCE) add_cd_file(TARGET deskadp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/CMake… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:32:25 2014 @@ -4,10 +4,13 @@ list(APPEND SOURCE deskmon.c shxiface.c + precomp.h) + +add_library(deskmon SHARED + ${SOURCE} deskmon.rc ${CMAKE_CURRENT_BINARY_DIR}/deskmon.def) -add_library(deskmon SHARED ${SOURCE}) set_module_type(deskmon win32dll UNICODE) target_link_libraries(deskmon uuid) @@ -20,5 +23,5 @@ kernel32 ntdll) -add_pch(deskmon precomp.h) +add_pch(deskmon precomp.h SOURCE) add_cd_file(TARGET deskmon DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/CMake… ============================================================================== --- trunk/reactos/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:32:25 2014 @@ -1,9 +1,13 @@ spec2def(fontext.dll fontext.spec) -add_library(fontext SHARED +list(APPEND SOURCE fontext.c regsvr.c + fontext.h) + +add_library(fontext SHARED + ${SOURCE} fontext.rc ${CMAKE_CURRENT_BINARY_DIR}/fontext.def) @@ -22,5 +26,5 @@ kernel32 ntdll) -add_pch(fontext fontext.h) +add_pch(fontext fontext.h SOURCE) add_cd_file(TARGET fontext DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 62111: [MESA/MAIN] * We don't need these source files in the static lib. Jerome please review.
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 20:08:53 2014 New Revision: 62111 URL: http://svn.reactos.org/svn/reactos?rev=62111&view=rev Log: [MESA/MAIN] * We don't need these source files in the static lib. Jerome please review. Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Feb 10 20:08:53 2014 @@ -35,7 +35,7 @@ getstring.c hash.c hint.c - histogram.c + #histogram.c image.c imports.c light.c @@ -62,7 +62,7 @@ texgetimage.c teximage.c texobj.c - texpal.c + #texpal.c texparam.c texstate.c texstorage.c

1 0

[ekohl] 62110: [MSV1_0] - Encrypt the old and new passwords before changing the password. [MSGINA] - Store the new password after a successful password change in order to be able to unlock a locked...
by ekohl＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: ekohl Date: Mon Feb 10 20:08:29 2014 New Revision: 62110 URL: http://svn.reactos.org/svn/reactos?rev=62110&view=rev Log: [MSV1_0] - Encrypt the old and new passwords before changing the password. [MSGINA] - Store the new password after a successful password change in order to be able to unlock a locked computer with the new password. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -283,7 +283,7 @@ IN HWND hwndDlg) { WCHAR UserName[256]; - WCHAR DomainName[256]; + WCHAR Domain[256]; WCHAR OldPassword[256]; WCHAR NewPassword1[256]; WCHAR NewPassword2[256]; @@ -297,7 +297,7 @@ NTSTATUS Status; GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, 256); - GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, DomainName, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, Domain, 256); GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, 256); GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, 256); GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, 256); @@ -315,7 +315,7 @@ /* Calculate the request buffer size */ RequestBufferSize = sizeof(MSV1_0_CHANGEPASSWORD_REQUEST) + - ((wcslen(DomainName) + 1) * sizeof(WCHAR)) + + ((wcslen(Domain) + 1) * sizeof(WCHAR)) + ((wcslen(UserName) + 1) * sizeof(WCHAR)) + ((wcslen(OldPassword) + 1) * sizeof(WCHAR)) + ((wcslen(NewPassword1) + 1) * sizeof(WCHAR)); @@ -337,12 +337,12 @@ Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST)); /* Pack the domain name */ - RequestBuffer->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + RequestBuffer->DomainName.Length = wcslen(Domain) * sizeof(WCHAR); RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR); RequestBuffer->DomainName.Buffer = Ptr; RtlCopyMemory(RequestBuffer->DomainName.Buffer, - DomainName, + Domain, RequestBuffer->DomainName.MaximumLength); Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength); @@ -412,6 +412,14 @@ MB_OK | MB_ICONINFORMATION, IDS_CHANGEPWDTITLE, IDS_PASSWORDCHANGED); + + if ((wcscmp(UserName, pgContext->UserName) == 0) && + (wcscmp(Domain, pgContext->Domain) == 0) && + (wcscmp(OldPassword, pgContext->Password) == 0)) + { + ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + wcscpy(pgContext->Password, NewPassword1); + } done: if (RequestBuffer != NULL) @@ -755,11 +763,8 @@ if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password) && DoLoginTasks(pgContext, UserName, Domain, Password)) { - pgContext->Password = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (wcslen(Password) + 1) * sizeof(WCHAR)); - if (pgContext->Password != NULL) - wcscpy(pgContext->Password, Password); + ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + wcscpy(pgContext->Password, Password); result = WLX_SAS_ACTION_LOGON; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -871,11 +871,8 @@ if (result == TRUE) { - pgContext->Password = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - (wcslen(Password) + 1) * sizeof(WCHAR)); - if (pgContext->Password != NULL) - wcscpy(pgContext->Password, Password); + ZeroMemory(pgContext->Password, 256 * sizeof(WCHAR)); + wcscpy(pgContext->Password, Password); NotifyBootConfigStatus(TRUE); } Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -42,7 +42,7 @@ /* Information to be filled during logon */ WCHAR UserName[256]; WCHAR Domain[256]; - LPWSTR Password; + WCHAR Password[256]; SYSTEMTIME LogonTime; HANDLE UserToken; PLUID pAuthenticationId; Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -437,6 +437,22 @@ SAMPR_ULONG_ARRAY Use = {0, NULL}; NTSTATUS Status; + ENCRYPTED_NT_OWF_PASSWORD OldNtPassword; + ENCRYPTED_NT_OWF_PASSWORD NewNtPassword; + ENCRYPTED_LM_OWF_PASSWORD OldLmPassword; + ENCRYPTED_LM_OWF_PASSWORD NewLmPassword; + OEM_STRING LmPwdString; + CHAR LmPwdBuffer[15]; + BOOLEAN OldLmPasswordPresent = FALSE; + BOOLEAN NewLmPasswordPresent = FALSE; + + ENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm; + ENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm; + ENCRYPTED_LM_OWF_PASSWORD OldNtEncryptedWithNewNt; + ENCRYPTED_LM_OWF_PASSWORD NewNtEncryptedWithOldNt; + PENCRYPTED_LM_OWF_PASSWORD pOldLmEncryptedWithNewLm = NULL; + PENCRYPTED_LM_OWF_PASSWORD pNewLmEncryptedWithOldLm = NULL; + TRACE("()\n"); RequestBuffer = (PMSV1_0_CHANGEPASSWORD_REQUEST)ProtocolSubmitBuffer; @@ -523,26 +539,128 @@ } - -#if 0 + /* Calculate the NT hash for the old password */ + Status = SystemFunction007(&RequestBuffer->OldPassword, + (LPBYTE)&OldNtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Calculate the NT hash for the new password */ + Status = SystemFunction007(&RequestBuffer->NewPassword, + (LPBYTE)&NewNtPassword); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction007 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Calculate the LM password and hash for the old password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + &RequestBuffer->OldPassword, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM hash value of the password */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&OldLmPassword); + if (NT_SUCCESS(Status)) + { + OldLmPasswordPresent = TRUE; + } + } + + /* Calculate the LM password and hash for the new password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + &RequestBuffer->NewPassword, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM hash value of the password */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&NewLmPassword); + if (NT_SUCCESS(Status)) + { + NewLmPasswordPresent = TRUE; + } + } + + /* Encrypt the old and new LM passwords, if they exist */ + if (OldLmPasswordPresent && NewLmPasswordPresent) + { + /* Encrypt the old LM password */ + Status = SystemFunction012((const BYTE *)&OldLmPassword, + (const BYTE *)&NewLmPassword, + (LPBYTE)&OldLmEncryptedWithNewLm); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Encrypt the new LM password */ + Status = SystemFunction012((const BYTE *)&NewLmPassword, + (const BYTE *)&OldLmPassword, + (LPBYTE)&NewLmEncryptedWithOldLm); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + + pOldLmEncryptedWithNewLm = &OldLmEncryptedWithNewLm; + pNewLmEncryptedWithOldLm = &NewLmEncryptedWithOldLm; + } + + /* Encrypt the old NT password */ + Status = SystemFunction012((const BYTE *)&OldNtPassword, + (const BYTE *)&NewNtPassword, + (LPBYTE)&OldNtEncryptedWithNewNt); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Encrypt the new NT password */ + Status = SystemFunction012((const BYTE *)&NewNtPassword, + (const BYTE *)&OldNtPassword, + (LPBYTE)&NewNtEncryptedWithOldNt); + if (!NT_SUCCESS(Status)) + { + TRACE("SystemFunction012 failed (Status 0x%08lx)\n", Status); + goto done; + } + /* Change the password */ Status = SamrChangePasswordUser(UserHandle, - IN unsigned char LmPresent, - IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, - IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, - IN unsigned char NtPresent, - IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, - IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, - IN unsigned char NtCrossEncryptionPresent, - IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, - IN unsigned char LmCrossEncryptionPresent, - IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt) + OldLmPasswordPresent && NewLmPasswordPresent, + pOldLmEncryptedWithNewLm, + pNewLmEncryptedWithOldLm, + TRUE, + &OldNtEncryptedWithNewNt, + &NewNtEncryptedWithOldNt, + FALSE, + NULL, + FALSE, + NULL); if (!NT_SUCCESS(Status)) { TRACE("SamrChangePasswordUser failed (Status %08lx)\n", Status); goto done; } -#endif done: if (UserHandle != NULL) Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Mon Feb 10 20:08:29 2014 @@ -186,6 +186,20 @@ NTSTATUS NTAPI +SamrChangePasswordUser(IN SAMPR_HANDLE UserHandle, + IN unsigned char LmPresent, + IN PENCRYPTED_LM_OWF_PASSWORD OldLmEncryptedWithNewLm, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithOldLm, + IN unsigned char NtPresent, + IN PENCRYPTED_NT_OWF_PASSWORD OldNtEncryptedWithNewNt, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithOldNt, + IN unsigned char NtCrossEncryptionPresent, + IN PENCRYPTED_NT_OWF_PASSWORD NewNtEncryptedWithNewLm, + IN unsigned char LmCrossEncryptionPresent, + IN PENCRYPTED_LM_OWF_PASSWORD NewLmEncryptedWithNewNt); + +NTSTATUS +NTAPI SamrCloseHandle(IN OUT SAMPR_HANDLE *SamHandle); NTSTATUS @@ -317,4 +331,10 @@ SystemFunction007(PUNICODE_STRING string, LPBYTE hash); +NTSTATUS +WINAPI +SystemFunction012(const BYTE *in, + const BYTE *key, + LPBYTE out); + /* EOF */

1 0

[akhaldi] 62109: [HAL] * Prepare the CMake scripts for PCH. CORE-7716
by akhaldi＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: akhaldi Date: Mon Feb 10 18:35:12 2014 New Revision: 62109 URL: http://svn.reactos.org/svn/reactos?rev=62109&view=rev Log: [HAL] * Prepare the CMake scripts for PCH. CORE-7716 Added: trunk/reactos/hal/halx86/minihal/ (with props) trunk/reactos/hal/halx86/minihal/CMakeLists.txt - copied, changed from r62101, trunk/reactos/hal/halx86/minihal.cmake Removed: trunk/reactos/hal/halx86/minihal.cmake Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/generic.cmake Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Mon Feb 10 18:35:12 2014 @@ -56,7 +56,7 @@ include(legacy.cmake) include(up.cmake) include(pic.cmake) - include(minihal.cmake) + add_subdirectory(minihal) # hal add_hal(hal SOURCES up/halup.rc COMPONENTS generic legacy up pic) Modified: trunk/reactos/hal/halx86/generic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] Mon Feb 10 18:35:12 2014 @@ -24,4 +24,3 @@ add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE}) add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm}) add_dependencies(lib_hal_generic asm) -add_pch(lib_hal_generic include/hal.h) Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Feb 10 18:35:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/hal/halx86/minihal/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Removed: trunk/reactos/hal/halx86/minihal.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/minihal.cmake (removed) @@ -1,31 +0,0 @@ - -list(APPEND MINI_HAL_SOURCE - generic/portio.c - legacy/bus/bushndlr.c - legacy/bus/cmosbus.c - legacy/bus/isabus.c - legacy/bus/pcibus.c - legacy/bus/sysbus.c - legacy/bussupp.c - generic/beep.c - generic/bios.c - generic/cmos.c - generic/dma.c - generic/display.c - generic/drive.c - generic/misc.c - generic/profil.c - generic/reboot.c - generic/spinlock.c - generic/sysinfo.c - generic/timer.c - generic/usage.c - up/halinit_mini.c - up/pic.c - up/processor.c) - -# mini_hal -add_asm_files(mini_hal_asm generic/systimer.S) -add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) -add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) -add_dependencies(mini_hal psdk bugcodes asm) Copied: trunk/reactos/hal/halx86/minihal/CMakeLists.txt (from r62101, trunk/reactos/hal/halx86/minihal.cmake) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal/CMakeLi… ============================================================================== --- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/minihal/CMakeLists.txt [iso-8859-1] Mon Feb 10 18:35:12 2014 @@ -1,31 +1,32 @@ list(APPEND MINI_HAL_SOURCE - generic/portio.c - legacy/bus/bushndlr.c - legacy/bus/cmosbus.c - legacy/bus/isabus.c - legacy/bus/pcibus.c - legacy/bus/sysbus.c - legacy/bussupp.c - generic/beep.c - generic/bios.c - generic/cmos.c - generic/dma.c - generic/display.c - generic/drive.c - generic/misc.c - generic/profil.c - generic/reboot.c - generic/spinlock.c - generic/sysinfo.c - generic/timer.c - generic/usage.c - up/halinit_mini.c - up/pic.c - up/processor.c) + ../generic/portio.c + ../legacy/bus/bushndlr.c + ../legacy/bus/cmosbus.c + ../legacy/bus/isabus.c + ../legacy/bus/pcibus.c + ../legacy/bus/sysbus.c + ../legacy/bussupp.c + ../generic/beep.c + ../generic/bios.c + ../generic/cmos.c + ../generic/dma.c + ../generic/display.c + ../generic/drive.c + ../generic/misc.c + ../generic/profil.c + ../generic/reboot.c + ../generic/spinlock.c + ../generic/sysinfo.c + ../generic/timer.c + ../generic/usage.c + ../up/halinit_mini.c + ../up/pic.c + ../up/processor.c + ../include/hal.h) -# mini_hal -add_asm_files(mini_hal_asm generic/systimer.S) +add_asm_files(mini_hal_asm ../generic/systimer.S) add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm) +add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE)

1 0

[tkreuzer] 62108: [NTOSKRNL] Implement TokenAuditPolicy case in NtSetInformationToken
by tkreuzer＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: tkreuzer Date: Mon Feb 10 18:05:08 2014 New Revision: 62108 URL: http://svn.reactos.org/svn/reactos?rev=62108&view=rev Log: [NTOSKRNL] Implement TokenAuditPolicy case in NtSetInformationToken Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Feb 10 18:05:08 2014 @@ -17,6 +17,18 @@ #pragma alloc_text(INIT, SepInitializeTokenImplementation) #endif +#include <ntlsa.h> + +typedef struct _TOKEN_AUDIT_POLICY_INFORMATION +{ + ULONG PolicyCount; + struct + { + ULONG Category; + UCHAR Value; + } Policies[1]; +} TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION; + /* GLOBALS ********************************************************************/ POBJECT_TYPE SeTokenObjectType = NULL; @@ -39,11 +51,11 @@ ICI_SQ_SAME( 0, 0, 0), /* TokenUser */ - ICI_SQ_SAME( sizeof(TOKEN_USER), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_USER), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenGroups */ - ICI_SQ_SAME( sizeof(TOKEN_GROUPS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_GROUPS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenPrivileges */ - ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_PRIVILEGES), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenOwner */ ICI_SQ_SAME( sizeof(TOKEN_OWNER), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), /* TokenPrimaryGroup */ @@ -51,13 +63,13 @@ /* TokenDefaultDacl */ ICI_SQ_SAME( sizeof(TOKEN_DEFAULT_DACL), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), /* TokenSource */ - ICI_SQ_SAME( sizeof(TOKEN_SOURCE), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_SOURCE), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenType */ ICI_SQ_SAME( sizeof(TOKEN_TYPE), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenImpersonationLevel */ ICI_SQ_SAME( sizeof(SECURITY_IMPERSONATION_LEVEL), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenStatistics */ - ICI_SQ_SAME( sizeof(TOKEN_STATISTICS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_STATISTICS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE ), /* TokenRestrictedSids */ ICI_SQ_SAME( sizeof(TOKEN_GROUPS), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenSessionId */ @@ -69,9 +81,9 @@ /* TokenSandBoxInert */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), /* TokenAuditPolicy */ - ICI_SQ_SAME( /* FIXME */0, sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), + ICI_SQ_SAME( /* FIXME */0, sizeof(ULONG), ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ), /* TokenOrigin */ - ICI_SQ_SAME( sizeof(TOKEN_ORIGIN), sizeof(ULONG), ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE ), + ICI_SQ_SAME( sizeof(TOKEN_ORIGIN), sizeof(ULONG), ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE ), }; /* FUNCTIONS *****************************************************************/ @@ -1945,11 +1957,106 @@ } - default: + + case TokenAuditPolicy: + { + PTOKEN_AUDIT_POLICY_INFORMATION PolicyInformation = + (PTOKEN_AUDIT_POLICY_INFORMATION)TokenInformation; + SEP_AUDIT_POLICY AuditPolicy; + ULONG i; + + _SEH2_TRY + { + ProbeForRead(PolicyInformation, + FIELD_OFFSET(TOKEN_AUDIT_POLICY_INFORMATION, + Policies[PolicyInformation->PolicyCount]), + sizeof(ULONG)); + + /* Loop all policies in the structure */ + for (i = 0; i < PolicyInformation->PolicyCount; i++) + { + /* Set the corresponding bits in the packed structure */ + switch (PolicyInformation->Policies[i].Category) + { + case AuditCategorySystem: + AuditPolicy.PolicyElements.System = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryLogon: + AuditPolicy.PolicyElements.Logon = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryObjectAccess: + AuditPolicy.PolicyElements.ObjectAccess = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryPrivilegeUse: + AuditPolicy.PolicyElements.PrivilegeUse = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryDetailedTracking: + AuditPolicy.PolicyElements.DetailedTracking = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryPolicyChange: + AuditPolicy.PolicyElements.PolicyChange = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryAccountManagement: + AuditPolicy.PolicyElements.AccountManagement = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryDirectoryServiceAccess: + AuditPolicy.PolicyElements.DirectoryServiceAccess = PolicyInformation->Policies[i].Value; + break; + + case AuditCategoryAccountLogon: + AuditPolicy.PolicyElements.AccountLogon = PolicyInformation->Policies[i].Value; + break; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto Cleanup; + } + _SEH2_END; + + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, + PreviousMode)) + { + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Lock the token */ + SepAcquireTokenLockExclusive(Token); + + /* Set the new audit policy */ + Token->AuditPolicy = AuditPolicy; + + /* Unlock the token */ + SepReleaseTokenLock(Token); + + break; + } + + + + case TokenOrigin: { DPRINT1("Unhandled TokenInformationClass: 0x%lx\n", TokenInformationClass); Status = STATUS_NOT_IMPLEMENTED; + break; + } + + default: + { + DPRINT1("Invalid TokenInformationClass: 0x%lx\n", + TokenInformationClass); + Status = STATUS_INVALID_INFO_CLASS; break; } }

1 0

[tkreuzer] 62107: [NTOSKRNL] Implement NtImpersonateClientOfPort
by tkreuzer＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: tkreuzer Date: Mon Feb 10 17:52:40 2014 New Revision: 62107 URL: http://svn.reactos.org/svn/reactos?rev=62107&view=rev Log: [NTOSKRNL] Implement NtImpersonateClientOfPort Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=62… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/port.c [iso-8859-1] Mon Feb 10 17:52:40 2014 @@ -84,6 +84,40 @@ return TRUE; } +BOOLEAN +NTAPI +LpcpValidateClientPort( + PETHREAD ClientThread, + PLPCP_PORT_OBJECT Port) +{ + PLPCP_PORT_OBJECT ThreadPort; + + /* Get the thread's port */ + ThreadPort = LpcpGetPortFromThread(ClientThread); + if (ThreadPort == NULL) + { + return FALSE; + } + + /* Check if the port matches directly */ + if ((Port == ThreadPort) || + (Port == ThreadPort->ConnectionPort) || + (Port == ThreadPort->ConnectedPort)) + { + return TRUE; + } + + /* Check if this is a communication port and the connection port matches */ + if (((Port->Flags & LPCP_PORT_TYPE_MASK) == LPCP_COMMUNICATION_PORT) && + (Port->ConnectionPort == ThreadPort)) + { + return TRUE; + } + + return FALSE; +} + + /* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS @@ -91,8 +125,153 @@ NtImpersonateClientOfPort(IN HANDLE PortHandle, IN PPORT_MESSAGE ClientMessage) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + CLIENT_ID ClientId; + ULONG MessageId; + PLPCP_PORT_OBJECT Port = NULL, ConnectedPort = NULL; + PETHREAD ClientThread = NULL; + SECURITY_CLIENT_CONTEXT ClientContext; + NTSTATUS Status; + PAGED_CODE(); + + /* Check the previous mode */ + PreviousMode = ExGetPreviousMode(); + if (PreviousMode == KernelMode) + { + ClientId = ClientMessage->ClientId; + MessageId = ClientMessage->MessageId; + } + else + { + _SEH2_TRY + { + ProbeForRead(ClientMessage, sizeof(*ClientMessage), sizeof(PVOID)); + ClientId = ClientMessage->ClientId; + MessageId = ClientMessage->MessageId; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("Got exception!\n"); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + + /* Reference the port handle */ + Status = ObReferenceObjectByHandle(PortHandle, + PORT_ALL_ACCESS, + LpcPortObjectType, + PreviousMode, + (PVOID*)&Port, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference port handle: 0x%ls\n", Status); + return Status; + } + + /* Make sure this is a connection port */ + if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_COMMUNICATION_PORT) + { + /* It isn't, fail */ + DPRINT1("Port is not a communication port\n"); + Status = STATUS_INVALID_PORT_HANDLE; + goto Cleanup; + } + + /* Look up the client thread */ + Status = PsLookupProcessThreadByCid(&ClientId, NULL, &ClientThread); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to lookup client thread: 0x%ls\n", Status); + goto Cleanup; + } + + /* Acquire the lock */ + KeAcquireGuardedMutex(&LpcpLock); + + /* Get the connected port and try to reference it */ + ConnectedPort = Port->ConnectedPort; + if ((ConnectedPort == NULL) || + !ObReferenceObjectSafe(ConnectedPort)) + { + DPRINT1("Failed to reference the connected port\n"); + ConnectedPort = NULL; + Status = STATUS_PORT_DISCONNECTED; + goto CleanupWithLock; + } + + /* Check for no-impersonation flag */ + if ((ULONG_PTR)ClientThread->LpcReplyMessage & LPCP_THREAD_FLAG_NO_IMPERSONATION) + { + DPRINT1("Reply message has no impersonation flag set\n"); + Status = STATUS_ACCESS_DENIED; + goto CleanupWithLock; + } + + /* Check for message id mismatch */ + if ((ClientThread->LpcReplyMessageId != MessageId) || (MessageId == 0)) + { + DPRINT1("LpcReplyMessageId mismatch: 0x%lx/0x%lx.\n", + ClientThread->LpcReplyMessageId, MessageId); + Status = STATUS_REPLY_MESSAGE_MISMATCH; + goto CleanupWithLock; + } + + /* Validate the port */ + if (!LpcpValidateClientPort(ClientThread, Port)) + { + DPRINT1("LpcpValidateClientPort failed\n"); + Status = STATUS_REPLY_MESSAGE_MISMATCH; + goto CleanupWithLock; + } + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + + /* Check if security is static */ + if (!(ConnectedPort->Flags & LPCP_SECURITY_DYNAMIC)) + { + /* Use the static security for impersonation */ + Status = SeImpersonateClientEx(&ConnectedPort->StaticSecurity, NULL); + goto Cleanup; + } + + /* Create new dynamic security */ + Status = SeCreateClientSecurity(ClientThread, + &ConnectedPort->SecurityQos, + FALSE, + &ClientContext); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SeCreateClientSecurity failed\n"); + goto Cleanup; + } + + /* Use dynamic security for impersonation */ + Status = SeImpersonateClientEx(&ClientContext, NULL); + + /* Get rid of the security context */ + SeDeleteClientSecurity(&ClientContext); + + goto Cleanup; + +CleanupWithLock: + + /* Release the lock */ + KeReleaseGuardedMutex(&LpcpLock); + +Cleanup: + + if (ConnectedPort != NULL) + ObDereferenceObject(ConnectedPort); + + if (ClientThread != NULL) + ObDereferenceObject(ClientThread); + + ObDereferenceObject(Port); + + return Status; } NTSTATUS

1 0

[tkreuzer] 62106: Another try to fix build
by tkreuzer＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: tkreuzer Date: Mon Feb 10 17:44:07 2014 New Revision: 62106 URL: http://svn.reactos.org/svn/reactos?rev=62106&view=rev Log: Another try to fix build Modified: trunk/reactos/include/psdk/ntlsa.h Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Mon Feb 10 17:44:07 2014 @@ -57,7 +57,7 @@ #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON 0x00000400 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800 -#ifndef _NTSECAPI_H // HACK to avoid redefinition from ntsecapi.h +#ifdef _NTIFS_INCLUDED_ // HACK to avoid redefinition from ntsecapi.h typedef enum _POLICY_AUDIT_EVENT_TYPE { AuditCategorySystem,

1 0

[tkreuzer] 62105: Fix build
by tkreuzer＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: tkreuzer Date: Mon Feb 10 17:37:20 2014 New Revision: 62105 URL: http://svn.reactos.org/svn/reactos?rev=62105&view=rev Log: Fix build Modified: trunk/reactos/include/psdk/ntlsa.h Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Mon Feb 10 17:37:20 2014 @@ -57,6 +57,7 @@ #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON 0x00000400 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800 +#ifndef _NTSECAPI_H // HACK to avoid redefinition from ntsecapi.h typedef enum _POLICY_AUDIT_EVENT_TYPE { AuditCategorySystem, @@ -69,6 +70,7 @@ AuditCategoryDirectoryServiceAccess, AuditCategoryAccountLogon } POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; +#endif #ifdef __cplusplus }

1 0

[tkreuzer] 62104: [PSDK] Add POLICY_AUDIT_EVENT_TYPE to ntlsa.h [NDK] Fix definition of SEP_AUDIT_POLICY_OVERLAY
by tkreuzer＠svn.reactos.org 10 Feb '14

10 Feb '14

Author: tkreuzer Date: Mon Feb 10 17:29:50 2014 New Revision: 62104 URL: http://svn.reactos.org/svn/reactos?rev=62104&view=rev Log: [PSDK] Add POLICY_AUDIT_EVENT_TYPE to ntlsa.h [NDK] Fix definition of SEP_AUDIT_POLICY_OVERLAY Modified: trunk/reactos/include/ndk/setypes.h trunk/reactos/include/psdk/ntlsa.h Modified: trunk/reactos/include/ndk/setypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/setypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/setypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/setypes.h [iso-8859-1] Mon Feb 10 17:29:50 2014 @@ -127,7 +127,7 @@ typedef struct _SEP_AUDIT_POLICY_OVERLAY { ULONGLONG PolicyBits:36; - UCHAR SetBit:1; + ULONGLONG SetBit:1; } SEP_AUDIT_POLICY_OVERLAY, *PSEP_AUDIT_POLICY_OVERLAY; typedef struct _SEP_AUDIT_POLICY Modified: trunk/reactos/include/psdk/ntlsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntlsa.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntlsa.h [iso-8859-1] Mon Feb 10 17:29:50 2014 @@ -57,6 +57,18 @@ #define SECURITY_ACCESS_REMOTE_INTERACTIVE_LOGON 0x00000400 #define SECURITY_ACCESS_DENY_REMOTE_INTERACTIVE_LOGON 0x00000800 +typedef enum _POLICY_AUDIT_EVENT_TYPE +{ + AuditCategorySystem, + AuditCategoryLogon, + AuditCategoryObjectAccess, + AuditCategoryPrivilegeUse, + AuditCategoryDetailedTracking, + AuditCategoryPolicyChange, + AuditCategoryAccountManagement, + AuditCategoryDirectoryServiceAccess, + AuditCategoryAccountLogon +} POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; #ifdef __cplusplus }

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