Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[ekohl] 59204: [SAMSRV] Fix group renaming code. It is not enough to set the name attribute. The domain object also need a new name-id mapping. Also fail if the new group name is already used by an...
by ekohl＠svn.reactos.org 11 Jun '13

11 Jun '13

Author: ekohl Date: Tue Jun 11 21:09:26 2013 New Revision: 59204 URL: http://svn.reactos.org/svn/reactos?rev=59204&view=rev Log: [SAMSRV] Fix group renaming code. It is not enough to set the name attribute. The domain object also need a new name-id mapping. Also fail if the new group name is already used by any account object in the domain. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Tue Jun 11 21:09:26 2013 @@ -3963,6 +3963,76 @@ static NTSTATUS +SampSetGroupName(PSAM_DB_OBJECT GroupObject, + PSAMPR_GROUP_INFO_BUFFER Buffer) +{ + UNICODE_STRING OldGroupName = {0, 0, NULL}; + UNICODE_STRING NewGroupName; + NTSTATUS Status; + + Status = SampGetObjectAttributeString(GroupObject, + L"Name", + (PRPC_UNICODE_STRING)&OldGroupName); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttributeString failed (Status 0x%08lx)\n", Status); + goto done; + } + + NewGroupName.Length = Buffer->Name.Name.Length; + NewGroupName.MaximumLength = Buffer->Name.Name.MaximumLength; + NewGroupName.Buffer = Buffer->Name.Name.Buffer; + + if (!RtlEqualUnicodeString(&OldGroupName, &NewGroupName, TRUE)) + { + Status = SampCheckAccountNameInDomain(GroupObject->ParentObject, + NewGroupName.Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("Group name \'%S\' already exists in domain (Status 0x%08lx)\n", + NewGroupName.Buffer, Status); + goto done; + } + } + + Status = SampSetAccountNameInDomain(GroupObject->ParentObject, + L"Groups", + NewGroupName.Buffer, + GroupObject->RelativeId); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetAccountNameInDomain failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampRemoveAccountNameFromDomain(GroupObject->ParentObject, + L"Groups", + OldGroupName.Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRemoveAccountNameFromDomain failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampSetObjectAttribute(GroupObject, + L"Name", + REG_SZ, + NewGroupName.Buffer, + NewGroupName.Length + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + if (OldGroupName.Buffer != NULL) + midl_user_free(OldGroupName.Buffer); + + return Status; +} + + +static NTSTATUS SampSetGroupAttribute(PSAM_DB_OBJECT GroupObject, PSAMPR_GROUP_INFO_BUFFER Buffer) { @@ -4016,11 +4086,8 @@ switch (GroupInformationClass) { case GroupNameInformation: - Status = SampSetObjectAttribute(GroupObject, - L"Name", - REG_SZ, - Buffer->Name.Name.Buffer, - Buffer->Name.Name.Length + sizeof(WCHAR)); + Status = SampSetGroupName(GroupObject, + Buffer); break; case GroupAttributeInformation:

1 0

[ekohl] 59203: [USRMGR] Enable the call to NetLocalGroupSetInfo. Now we can rename groups.
by ekohl＠svn.reactos.org 10 Jun '13

10 Jun '13

Author: ekohl Date: Mon Jun 10 19:27:45 2013 New Revision: 59203 URL: http://svn.reactos.org/svn/reactos?rev=59203&view=rev Log: [USRMGR] Enable the call to NetLocalGroupSetInfo. Now we can rename groups. Modified: trunk/reactos/dll/cpl/usrmgr/groups.c Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Mon Jun 10 19:27:45 2013 @@ -338,7 +338,7 @@ { TCHAR szOldGroupName[UNLEN]; TCHAR szNewGroupName[UNLEN]; - //LOCALGROUP_INFO_0 lgrpi0; + LOCALGROUP_INFO_0 lgrpi0; NET_API_STATUS status; /* Leave, if there is no valid listview item */ @@ -367,13 +367,9 @@ return FALSE; /* Change the user name */ - //lgrpi0.lgrpi0_name = szNewGroupName; - -#if 0 + lgrpi0.lgrpi0_name = szNewGroupName; + status = NetLocalGroupSetInfo(NULL, szOldGroupName, 0, (LPBYTE)&lgrpi0, NULL); -#else - status = NERR_Success; -#endif if (status != NERR_Success) { TCHAR szText[256];

1 0

[ekohl] 59202: [NETAPI32] Implement NetLocalGroupSetInfo (level 0 only).
by ekohl＠svn.reactos.org 10 Jun '13

10 Jun '13

Author: ekohl Date: Mon Jun 10 18:19:03 2013 New Revision: 59202 URL: http://svn.reactos.org/svn/reactos?rev=59202&view=rev Log: [NETAPI32] Implement NetLocalGroupSetInfo (level 0 only). Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Mon Jun 10 18:19:03 2013 @@ -1703,17 +1703,137 @@ /************************************************************ * NetLocalGroupSetInfo (NETAPI32.@) */ -NET_API_STATUS WINAPI NetLocalGroupSetInfo( +NET_API_STATUS +WINAPI +NetLocalGroupSetInfo( LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE buf, LPDWORD parm_err) { - FIXME("(%s %s %d %p %p) stub!\n", debugstr_w(servername), + UNICODE_STRING ServerName; + UNICODE_STRING AliasName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + ALIAS_NAME_INFORMATION AliasNameInfo; + + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %s %d %p %p)\n", debugstr_w(servername), debugstr_w(groupname), level, buf, parm_err); - return NERR_Success; + + if (parm_err != NULL) + *parm_err = PARM_ERROR_NONE; + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&AliasName, groupname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the builtin domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_WRITE_ACCOUNT, + &AliasHandle); + if (ApiStatus != NERR_Success && ApiStatus != ERROR_NONE_MAPPED) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; + } + + if (AliasHandle == NULL) + { + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the alias account in the account domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_WRITE_ACCOUNT, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + if (ApiStatus == ERROR_NONE_MAPPED) + ApiStatus = NERR_GroupNotFound; + goto done; + } + } + + switch (level) + { + case 0: + /* Set the alias name */ + RtlInitUnicodeString(&AliasNameInfo.Name, + ((PLOCALGROUP_INFO_0)buf)->lgrpi0_name); + + Status = SamSetInformationAlias(AliasHandle, + AliasNameInformation, + &AliasNameInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("SamSetInformationAlias failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + +done: + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; } + /************************************************************ * NetLocalGroupSetMember (NETAPI32.@)

1 0

[jimtabor] 59201: [User32] - Release capture if the scroll is not tracking events. This fixes CORE-7075. - Minor sync porting to minimize differences.
by jimtabor＠svn.reactos.org 10 Jun '13

10 Jun '13

Author: jimtabor Date: Mon Jun 10 17:36:04 2013 New Revision: 59201 URL: http://svn.reactos.org/svn/reactos?rev=59201&view=rev Log: [User32] - Release capture if the scroll is not tracking events. This fixes CORE-7075. - Minor sync porting to minimize differences. Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Mon Jun 10 17:36:04 2013 @@ -63,10 +63,12 @@ static INT ScrollTrackingBar = 0; static INT ScrollTrackingPos = 0; static INT ScrollTrackingVal = 0; -static BOOL ScrollMovingThumb = FALSE; - + /* Hit test code of the last button-down event */ static DWORD ScrollTrackHitTest = SCROLL_NOWHERE; static BOOL ScrollTrackVertical; + + /* Is the moving thumb being displayed? */ +static BOOL ScrollMovingThumb = FALSE; HBRUSH DefWndControlColor(HDC hDC, UINT ctlType); @@ -766,6 +768,12 @@ } if ((ScrollTrackHitTest == SCROLL_NOWHERE) && (Msg != WM_LBUTTONDOWN)) { + //// ReactOS : Justin Case something goes wrong. + if (Wnd == GetCapture()) + { + ReleaseCapture(); + } + //// return; } @@ -773,7 +781,7 @@ NewInfo.reserved = ScrollBarInfo.reserved; memcpy(NewInfo.rgstate, ScrollBarInfo.rgstate, (CCHILDREN_SCROLLBAR + 1) * sizeof(DWORD)); - if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX))) + if (SBType == SB_CTL && (GetWindowLongPtrW(Wnd, GWL_STYLE) & (SBS_SIZEGRIP | SBS_SIZEBOX))) { switch(Msg) { @@ -826,7 +834,7 @@ LastMousePos = LastClickPos; TrackThumbPos = ScrollBarInfo.xyThumbTop; PrevPt = Pt; - if (SB_CTL == SBType && 0 != (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) SetFocus(Wnd); + if (SBType == SB_CTL && (GetWindowLongPtrW(Wnd, GWL_STYLE) & WS_TABSTOP)) SetFocus(Wnd); SetCapture(Wnd); ScrollBarInfo.rgstate[ScrollTrackHitTest] |= STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; @@ -1226,9 +1234,15 @@ case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: + if (GetWindowLongW( Wnd, GWL_STYLE ) & SBS_SIZEGRIP) + { + SendMessageW( GetParent(Wnd), WM_SYSCOMMAND, + SC_SIZE + ((GetWindowLongW( Wnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? + WMSZ_BOTTOMLEFT : WMSZ_BOTTOMRIGHT), lParam ); + } + else { POINT Pt; - Pt.x = (short)LOWORD(lParam); Pt.y = (short)HIWORD(lParam); ScrollTrackScrollBar(Wnd, SB_CTL, Pt); @@ -1240,7 +1254,6 @@ case WM_SYSTIMER: { POINT Pt; - Pt.x = (short)LOWORD(lParam); Pt.y = (short)HIWORD(lParam); IntScrollHandleScrollEvent(Wnd, SB_CTL, Msg, Pt); @@ -1540,7 +1553,7 @@ } SetLastError(ERROR_NO_SCROLLBARS); - ERR("GetScrollPos No Scroll Info\n"); + TRACE("GetScrollPos No Scroll Info\n"); return 0; } SetLastError(ERROR_INVALID_PARAMETER);

1 0

[ekohl] 59200: [SAMSRV] Fix alias renaming code. It is not enough to set the name attribute. The domain object also need a new name-id mapping. Also fail if the new alias name is already used by an...
by ekohl＠svn.reactos.org 10 Jun '13

10 Jun '13

Author: ekohl Date: Mon Jun 10 16:20:43 2013 New Revision: 59200 URL: http://svn.reactos.org/svn/reactos?rev=59200&view=rev Log: [SAMSRV] Fix alias renaming code. It is not enough to set the name attribute. The domain object also need a new name-id mapping. Also fail if the new alias name is already used by any account object in the domain. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Jun 10 16:20:43 2013 @@ -4622,6 +4622,76 @@ } +static NTSTATUS +SampSetAliasName(PSAM_DB_OBJECT AliasObject, + PSAMPR_ALIAS_INFO_BUFFER Buffer) +{ + UNICODE_STRING OldAliasName = {0, 0, NULL}; + UNICODE_STRING NewAliasName; + NTSTATUS Status; + + Status = SampGetObjectAttributeString(AliasObject, + L"Name", + (PRPC_UNICODE_STRING)&OldAliasName); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttributeString failed (Status 0x%08lx)\n", Status); + goto done; + } + + NewAliasName.Length = Buffer->Name.Name.Length; + NewAliasName.MaximumLength = Buffer->Name.Name.MaximumLength; + NewAliasName.Buffer = Buffer->Name.Name.Buffer; + + if (!RtlEqualUnicodeString(&OldAliasName, &NewAliasName, TRUE)) + { + Status = SampCheckAccountNameInDomain(AliasObject->ParentObject, + NewAliasName.Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", + NewAliasName.Buffer, Status); + goto done; + } + } + + Status = SampSetAccountNameInDomain(AliasObject->ParentObject, + L"Aliases", + NewAliasName.Buffer, + AliasObject->RelativeId); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetAccountNameInDomain failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampRemoveAccountNameFromDomain(AliasObject->ParentObject, + L"Aliases", + OldAliasName.Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRemoveAccountNameFromDomain failed (Status 0x%08lx)\n", Status); + goto done; + } + + Status = SampSetObjectAttribute(AliasObject, + L"Name", + REG_SZ, + NewAliasName.Buffer, + NewAliasName.Length + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + TRACE("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + if (OldAliasName.Buffer != NULL) + midl_user_free(OldAliasName.Buffer); + + return Status; +} + + /* Function 29 */ NTSTATUS NTAPI @@ -4646,11 +4716,8 @@ switch (AliasInformationClass) { case AliasNameInformation: - Status = SampSetObjectAttribute(AliasObject, - L"Name", - REG_SZ, - Buffer->Name.Name.Buffer, - Buffer->Name.Name.Length + sizeof(WCHAR)); + Status = SampSetAliasName(AliasObject, + Buffer); break; case AliasAdminCommentInformation:

1 0

[hbelusca] 59199: Code formatting only
by hbelusca＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: hbelusca Date: Sun Jun 9 21:37:34 2013 New Revision: 59199 URL: http://svn.reactos.org/svn/reactos?rev=59199&view=rev Log: Code formatting only Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=59199&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Sun Jun 9 21:37:34 2013 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/env.c * PURPOSE: Environment functions

1 0

[hbelusca] 59198: [CONSRV] - Pressing the Shift key while copying text in the console, allows us to copy it without newlines (tested on Windows). - When starting keyboard selection ("Marking"), put...
by hbelusca＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: hbelusca Date: Sun Jun 9 19:03:53 2013 New Revision: 59198 URL: http://svn.reactos.org/svn/reactos?rev=59198&view=rev Log: [CONSRV] - Pressing the Shift key while copying text in the console, allows us to copy it without newlines (tested on Windows). - When starting keyboard selection ("Marking"), put the cursor on top left of the console view. - Improve key presses actions when being in selection mode (pressing ENTER when being in selection mode, copies the text and cancels selection mode, pressing ESC or Ctrl-C cancels the selection, etc...) - Try to fix erratic context menu apparitions when being in Quick-Edit mode (caught by Javier Fernandez, aka. elhoir) Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Jun 9 19:03:53 2013 @@ -250,8 +250,8 @@ LPWSTR WindowTitle = NULL; SIZE_T Length = 0; - Console->dwSelectionCursor.X = 0; - Console->dwSelectionCursor.Y = 0; + Console->dwSelectionCursor.X = ActiveBuffer->ViewOrigin.X; + Console->dwSelectionCursor.Y = ActiveBuffer->ViewOrigin.Y; Console->Selection.dwSelectionAnchor = Console->dwSelectionCursor; Console->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; GuiConsoleUpdateSelection(Console, &Console->Selection.dwSelectionAnchor); @@ -716,28 +716,67 @@ return; } +static BOOL +IsSystemKey(WORD VirtualKeyCode) +{ + switch (VirtualKeyCode) + { + /* From MSDN, "Virtual-Key Codes" */ + case VK_RETURN: + case VK_SHIFT: + case VK_CONTROL: + case VK_MENU: + case VK_PAUSE: + case VK_CAPITAL: + case VK_ESCAPE: + case VK_LWIN: + case VK_RWIN: + case VK_NUMLOCK: + case VK_SCROLL: + return TRUE; + default: + return FALSE; + } +} + static VOID GuiConsoleHandleKey(PGUI_CONSOLE_DATA GuiData, UINT msg, WPARAM wParam, LPARAM lParam) { PCONSOLE Console = GuiData->Console; PCONSOLE_SCREEN_BUFFER ActiveBuffer; MSG Message; + WORD VirtualKeyCode = LOWORD(wParam); if (!ConSrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; ActiveBuffer = Console->ActiveBuffer; - if ( (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && - ((Console->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) == 0) ) - { - BOOL Interpreted = FALSE; - - /* Selection with keyboard */ - if (msg == WM_KEYDOWN) - { - BOOL MajPressed = (GetKeyState(VK_SHIFT) & 0x8000); - - switch (wParam) + if (Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) + { + if (msg != WM_KEYDOWN) goto Quit; + + if (VirtualKeyCode == VK_RETURN) + { + /* Copy (and clear) selection if ENTER is pressed */ + GuiConsoleCopy(GuiData); + goto Quit; + } + else if ( VirtualKeyCode == VK_ESCAPE || + (VirtualKeyCode == 'C' && GetKeyState(VK_CONTROL) & 0x8000) ) + { + /* Cancel selection if ESC or Ctrl-C are pressed */ + GuiConsoleUpdateSelection(Console, NULL); + SetWindowText(GuiData->hWindow, Console->Title.Buffer); + goto Quit; + } + + if ((Console->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) == 0) + { + /* Selection mode with keyboard */ + BOOL Interpreted = FALSE; + BOOL MajPressed = (GetKeyState(VK_SHIFT) & 0x8000); + + switch (VirtualKeyCode) { case VK_LEFT: { @@ -821,25 +860,34 @@ GuiConsoleUpdateSelection(Console, &Console->dwSelectionCursor); } - } - } - else + else if (!IsSystemKey(VirtualKeyCode)) + { + /* Emit an error beep sound */ + SendNotifyMessage(GuiData->hWindow, PM_CONSOLE_BEEP, 0, 0); + } + } + else + { + /* Selection mode with mouse, clear the selection if needed */ + if (!IsSystemKey(VirtualKeyCode)) + { + GuiConsoleUpdateSelection(Console, NULL); + SetWindowText(GuiData->hWindow, Console->Title.Buffer); + } + } + } + + if ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) { Message.hwnd = GuiData->hWindow; Message.message = msg; Message.wParam = wParam; Message.lParam = lParam; - if (msg == WM_KEYDOWN) - { - /* If we are in selection mode (with mouse), clear the selection */ - GuiConsoleUpdateSelection(Console, NULL); - SetWindowText(GuiData->hWindow, Console->Title.Buffer); - } - ConioProcessKey(Console, &Message); } +Quit: LeaveCriticalSection(&Console->Lock); } @@ -1105,10 +1153,6 @@ else { GuiConsoleCopy(GuiData); - - /* Clear the selection */ - GuiConsoleUpdateSelection(Console, NULL); - SetWindowText(GuiData->hWindow, Console->Title.Buffer); } GuiData->IgnoreNextMouseSignal = TRUE; @@ -1129,7 +1173,7 @@ } default: - Err = TRUE; + Err = FALSE; // TRUE; break; } } @@ -1287,6 +1331,10 @@ } CloseClipboard(); + + /* Clear the selection */ + GuiConsoleUpdateSelection(Console, NULL); + SetWindowText(GuiData->hWindow, Console->Title.Buffer); } } @@ -1628,9 +1676,12 @@ case WM_KEYDOWN: case WM_KEYUP: + case WM_CHAR: + case WM_DEADCHAR: case WM_SYSKEYDOWN: case WM_SYSKEYUP: - case WM_CHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: { /* Detect Alt-Enter presses and switch back and forth to fullscreen mode */ if (msg == WM_SYSKEYDOWN && (HIWORD(lParam) & KF_ALTDOWN) && wParam == VK_RETURN) Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… ============================================================================== --- trunk/reactos/win32ss/user/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/frontends/gui/text.c [iso-8859-1] Sun Jun 9 19:03:53 2013 @@ -38,6 +38,12 @@ PCONSOLE Console = Buffer->Header.Console; + /* + * Pressing the Shift key while copying text, allows us to copy + * text without newline characters (inline-text copy mode). + */ + BOOL InlineCopyMode = (GetKeyState(VK_SHIFT) & 0x8000); + HANDLE hData; PBYTE ptr; LPWSTR data, dstPos; @@ -52,13 +58,18 @@ Console->Selection.srSelection.Right, Console->Selection.srSelection.Bottom); - /* Basic size for one line and termination */ - size = selWidth + 1; + /* Basic size for one line... */ + size = selWidth; + /* ... and for the other lines, add newline characters if needed. */ if (selHeight > 0) { - /* Multiple line selections have to get \r\n appended */ - size += ((selWidth + 2) * (selHeight - 1)); - } + /* + * If we are not in inline-text copy mode, each selected line must + * finish with \r\n . Otherwise, the lines will be just concatenated. + */ + size += (selWidth + (!InlineCopyMode ? 2 : 0)) * (selHeight - 1); + } + size += 1; /* Null-termination */ size *= sizeof(WCHAR); /* Allocate memory, it will be passed to the system and may not be freed here */ @@ -82,10 +93,15 @@ ConsoleAnsiCharToUnicodeChar(Console, &dstPos[xPos], (LPCSTR)&ptr[xPos * 2]); } dstPos += selWidth; - if (yPos != (selHeight - 1)) - { - wcscat(data, L"\r\n"); - dstPos += 2; + + /* Add newline characters if we are not in inline-text copy mode */ + if (!InlineCopyMode) + { + if (yPos != (selHeight - 1)) + { + wcscat(data, L"\r\n"); + dstPos += 2; + } } }

1 0

[spetreolle] 59197: configure.sh: Allow passing -D parameters to cmake. Both -DVAR=value and -D VAR=value syntaxes are supported.
by spetreolle＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: spetreolle Date: Sun Jun 9 13:47:01 2013 New Revision: 59197 URL: http://svn.reactos.org/svn/reactos?rev=59197&view=rev Log: configure.sh: Allow passing -D parameters to cmake. Both -DVAR=value and -D VAR=value syntaxes are supported. Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59197&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sun Jun 9 13:47:01 2013 @@ -9,11 +9,34 @@ ARCH=$ROS_ARCH REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH -if [ "$1" = "Makefiles" -o "$1" = "makefiles" ]; then -CMAKE_GENERATOR="Unix Makefiles" -else + +usage() { +echo Invalid parameter given. +exit 1 +} + CMAKE_GENERATOR="Ninja" -fi +for (( i=1; i<=$#; i++ )); do + case ${!i} in + -D) + ((i++)) + if [[ "x${!i}" == x?*=* ]] ; then + ROS_CMAKEOPTS+=" -D ${!i}" + else + usage + fi + ;; + + -D?*=*) + ROS_CMAKEOPTS+=" ${!i}" + ;; + makefiles|Makefiles) + CMAKE_GENERATOR="Unix Makefiles" + ;; + *) + usage + esac +done if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then echo Creating directories in $REACTOS_OUTPUT_PATH @@ -28,12 +51,12 @@ rm -f CMakeCache.txt REACTOS_BUILD_TOOLS_DIR="$PWD" -cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Preparing reactos... cd ../reactos rm -f CMakeCache.txt -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands$ex: ninja, make, makex, etc...$.

1 0

[akhaldi] 59196: [CMAKE] * Update base addresses. CORE-7262 #resolve
by akhaldi＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: akhaldi Date: Sun Jun 9 10:47:20 2013 New Revision: 59196 URL: http://svn.reactos.org/svn/reactos?rev=59196&view=rev Log: [CMAKE] * Update base addresses. CORE-7262 #resolve Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Jun 9 10:47:20 2013 @@ -1,300 +1,311 @@ -set(baseaddress_ntdll 0x77f20000) -set(baseaddress_kernel32 0x77da0000) -set(baseaddress_msvcrt 0x77d10000) -set(baseaddress_advapi32 0x77c60000) -set(baseaddress_msv1_0 0x77c40000) -set(baseaddress_gdi32 0x77bf0000) -set(baseaddress_user32 0x77a60000) -set(baseaddress_dhcpcsvc 0x77a10000) -set(baseaddress_dnsapi 0x779d0000) -set(baseaddress_icmp 0x779a0000) -set(baseaddress_iphlpapi 0x77960000) -set(baseaddress_ws2_32 0x77920000) -set(baseaddress_ws2help 0x778f0000) -set(baseaddress_shlwapi 0x77860000) -set(baseaddress_rpcrt4 0x777a0000) -set(baseaddress_comctl32 0x77640000) -set(baseaddress_ole32 0x77470000) -set(baseaddress_winspool.drv 0x77440000) -set(baseaddress_winmm 0x773a0000) -set(baseaddress_comdlg32 0x772b0000) -set(baseaddress_shell32 0x765d0000) -set(baseaddress_lz32 0x765b0000) -set(baseaddress_version 0x76580000) -set(baseaddress_oleaut32 0x763e0000) -set(baseaddress_setupapi 0x76220000) -set(baseaddress_mpr 0x761e0000) -set(baseaddress_crypt32 0x760e0000) -set(baseaddress_wininet 0x76050000) -set(baseaddress_urlmon 0x75f90000) -set(baseaddress_psapi 0x75f60000) -set(baseaddress_imm32 0x75f20000) -set(baseaddress_msvfw32 0x75ee0000) -set(baseaddress_dbghelp 0x75e50000) -set(baseaddress_devmgr 0x75dd0000) -set(baseaddress_msacm32 0x75d90000) -set(baseaddress_netapi32 0x75d40000) -set(baseaddress_powrprof 0x75d10000) -set(baseaddress_secur32 0x75ce0000) -set(baseaddress_wintrust 0x75c90000) -set(baseaddress_avicap32 0x75c60000) -set(baseaddress_cabinet 0x75c20000) -set(baseaddress_dsound 0x75ba0000) -set(baseaddress_glu32 0x75aa0000) -set(baseaddress_opengl32 0x75a70000) -set(baseaddress_riched20 0x759e0000) -set(baseaddress_smdll 0x759c0000) -set(baseaddress_userenv 0x75970000) -set(baseaddress_uxtheme 0x75910000) -set(baseaddress_cryptui 0x75860000) -set(baseaddress_csrsrv 0x75830000) -set(baseaddress_dplayx 0x757d0000) -set(baseaddress_gdiplus 0x75730000) -set(baseaddress_msimg32 0x75700000) -set(baseaddress_mswsock 0x756d0000) -set(baseaddress_oledlg 0x75690000) -set(baseaddress_rasapi32 0x75660000) -set(baseaddress_rsaenh 0x75600000) -set(baseaddress_samlib 0x755d0000) -set(baseaddress_sensapi 0x755a0000) -set(baseaddress_sfc_os 0x75570000) -set(baseaddress_snmpapi 0x75540000) -set(baseaddress_spoolss 0x75510000) -set(baseaddress_usp10 0x754b0000) -set(baseaddress_access 0x75440000) -set(baseaddress_acledit 0x75410000) -set(baseaddress_aclui 0x753d0000) -set(baseaddress_activeds 0x753a0000) -set(baseaddress_actxprxy 0x751d0000) -set(baseaddress_advpack 0x75190000) -set(baseaddress_amstream 0x75150000) -set(baseaddress_atl 0x75110000) -set(baseaddress_authz 0x750e0000) -set(baseaddress_avifil32 0x75080000) -set(baseaddress_batt 0x75050000) -set(baseaddress_bcrypt 0x75020000) -set(baseaddress_beepmidi 0x75000000) -set(baseaddress_browseui 0x74f40000) -set(baseaddress_cards 0x74e90000) -set(baseaddress_cfgmgr32 0x74e70000) -set(baseaddress_clusapi 0x74e40000) -set(baseaddress_comcat 0x74e20000) -set(baseaddress_compstui 0x74df0000) -set(baseaddress_credui 0x74db0000) -set(baseaddress_crtdll 0x74d60000) -set(baseaddress_cryptdlg 0x74d30000) -set(baseaddress_cryptdll 0x74d00000) -set(baseaddress_cryptnet 0x74cd0000) -set(baseaddress_csrsrv2 0x74ca0000) -set(baseaddress_d3d8 0x74c40000) -set(baseaddress_d3d8thk 0x74c20000) -set(baseaddress_d3d9 0x74bc0000) -set(baseaddress_d3dx9_24 0x74b90000) -set(baseaddress_d3dx9_25 0x74b60000) -set(baseaddress_d3dx9_26 0x74b30000) -set(baseaddress_d3dx9_27 0x74b00000) -set(baseaddress_d3dx9_28 0x74ad0000) -set(baseaddress_d3dx9_29 0x74aa0000) -set(baseaddress_d3dx9_30 0x74a70000) -set(baseaddress_d3dx9_31 0x74a40000) -set(baseaddress_d3dx9_32 0x74a10000) -set(baseaddress_d3dx9_33 0x749e0000) -set(baseaddress_d3dx9_34 0x749b0000) -set(baseaddress_d3dx9_35 0x74980000) -set(baseaddress_d3dx9_36 0x74920000) -set(baseaddress_d3dx9_37 0x748f0000) -set(baseaddress_d3dx9_38 0x748c0000) -set(baseaddress_d3dx9_39 0x74890000) -set(baseaddress_d3dx9_40 0x74860000) -set(baseaddress_d3dx9_41 0x74830000) -set(baseaddress_d3dx9_42 0x74800000) -set(baseaddress_dciman32 0x747d0000) -set(baseaddress_ddraw 0x74730000) -set(baseaddress_deskadp 0x74700000) -set(baseaddress_deskmon 0x746d0000) -set(baseaddress_devcpux 0x746a0000) -set(baseaddress_devenum 0x74660000) -set(baseaddress_dinput 0x74610000) -set(baseaddress_dinput8 0x745e0000) -set(baseaddress_dmusic 0x745a0000) -set(baseaddress_dplay 0x74580000) -set(baseaddress_dwmapi 0x74550000) -set(baseaddress_dxdiagn 0x74520000) -set(baseaddress_faultrep 0x744f0000) -set(baseaddress_fmifs 0x744d0000) -set(baseaddress_fontext 0x744a0000) -#fusion has to have dynamic address -#set(baseaddress_fusion 0x74470000) -set(baseaddress_getuname 0x74440000) -set(baseaddress_hhctrl 0x74400000) -set(baseaddress_hlink 0x743c0000) -set(baseaddress_hnetcfg 0x74380000) -set(baseaddress_httpapi 0x74350000) -set(baseaddress_iccvid 0x74320000) -set(baseaddress_imaadp32.acm 0x74300000) -set(baseaddress_imagehlp 0x742d0000) -set(baseaddress_inetcomm 0x74270000) -set(baseaddress_inetmib1 0x74240000) -set(baseaddress_initpki 0x74210000) -set(baseaddress_inseng 0x741e0000) -set(baseaddress_itircl 0x741b0000) -set(baseaddress_itss 0x74170000) -set(baseaddress_jscript 0x740c0000) -set(baseaddress_kbsdll 0x74090000) -set(baseaddress_ksproxy 0x74010000) -set(baseaddress_ksuser 0x73fe0000) -set(baseaddress_libjpeg 0x73f60000) -set(baseaddress_libpng 0x73ee0000) -set(baseaddress_libtiff 0x73e20000) -set(baseaddress_libxslt 0x73be0000) -set(baseaddress_loadperf 0x73bb0000) -set(baseaddress_localspl 0x73b70000) -set(baseaddress_localui 0x73b40000) -set(baseaddress_lpk 0x73b10000) -set(baseaddress_lsasrv 0x73ae0000) -set(baseaddress_main 0x73a30000) -set(baseaddress_mapi32 0x739f0000) -set(baseaddress_mciavi32 0x739b0000) -set(baseaddress_mcicda 0x73980000) -set(baseaddress_mciqtz32 0x73940000) -set(baseaddress_mciseq 0x73910000) -set(baseaddress_mciwave 0x738e0000) -set(baseaddress_mesa32 0x73570000) -set(baseaddress_midimap 0x73550000) -set(baseaddress_mlang 0x73520000) -set(baseaddress_mmdrv 0x73500000) -set(baseaddress_modemui 0x734a0000) -set(baseaddress_mprapi 0x73470000) -set(baseaddress_msacm32.drv 0x73440000) -set(baseaddress_msadp32.acm 0x73420000) -set(baseaddress_msafd 0x733f0000) -set(baseaddress_mscat32 0x733c0000) -set(baseaddress_mscms 0x73390000) -set(baseaddress_mscoree 0x73340000) -set(baseaddress_msctf 0x732f0000) -set(baseaddress_msdmo 0x732c0000) -set(baseaddress_msftedit 0x73290000) -set(baseaddress_msg711.acm 0x73270000) -set(baseaddress_msgina 0x73220000) -set(baseaddress_msgsm32.acm 0x73200000) -set(baseaddress_mshtml 0x730a0000) -set(baseaddress_msi 0x72f60000) -set(baseaddress_msimtf 0x72f30000) -set(baseaddress_msisip 0x72f00000) -set(baseaddress_msisys 0x72ed0000) -set(baseaddress_msports 0x72ea0000) -set(baseaddress_msrle32 0x72e70000) -set(baseaddress_mssign32 0x72e40000) -set(baseaddress_mssip32 0x72e10000) -set(baseaddress_mstask 0x72de0000) -set(baseaddress_msvcrt20 0x72d30000) -set(baseaddress_msvcrt40 0x72c80000) -set(baseaddress_msvidc32 0x72c50000) -set(baseaddress_msxml3 0x729f0000) -set(baseaddress_nddeapi 0x729d0000) -set(baseaddress_netcfgx 0x72950000) -set(baseaddress_netid 0x72900000) -set(baseaddress_netshell 0x72880000) -set(baseaddress_newdev 0x72820000) -set(baseaddress_notifyhook 0x727f0000) -set(baseaddress_ntdsapi 0x727c0000) -set(baseaddress_ntlanman 0x72790000) -set(baseaddress_ntmarta 0x72760000) -set(baseaddress_ntprint 0x72730000) -set(baseaddress_objsel 0x72700000) -set(baseaddress_odbc32 0x726c0000) -set(baseaddress_odbccp32 0x72690000) -set(baseaddress_oleacc 0x72660000) -set(baseaddress_olecli32 0x72630000) -set(baseaddress_olepro32 0x72610000) -set(baseaddress_olesvr32 0x725f0000) -set(baseaddress_olethk32 0x725c0000) -set(baseaddress_pdh 0x72590000) -set(baseaddress_pidgen 0x72560000) -set(baseaddress_printui 0x72540000) -set(baseaddress_pstorec 0x72510000) -set(baseaddress_qedit 0x724d0000) -set(baseaddress_qmgr 0x724a0000) -set(baseaddress_qmgrprxy 0x72440000) -set(baseaddress_quartz 0x722f0000) -set(baseaddress_query 0x722c0000) -set(baseaddress_rasadhlp 0x72290000) -set(baseaddress_rasdlg 0x72100000) -set(baseaddress_rasman 0x720c0000) -set(baseaddress_resutils 0x72090000) -set(baseaddress_riched32 0x72060000) -set(baseaddress_rsabase 0x72040000) -set(baseaddress_samsrv 0x72020000) -set(baseaddress_sccbase 0x71ff0000) -set(baseaddress_schannel 0x71fc0000) -set(baseaddress_security 0x71fa0000) -set(baseaddress_serialui 0x71f70000) -set(baseaddress_sfc 0x71f40000) -set(baseaddress_shdoclc 0x71f00000) -set(baseaddress_shdocvw 0x71e70000) -set(baseaddress_shfolder 0x71e50000) -set(baseaddress_shimgvw 0x71e10000) -set(baseaddress_slayer 0x71de0000) -set(baseaddress_slbcsp 0x71db0000) -set(baseaddress_sndblst 0x71d80000) -set(baseaddress_softpub 0x71d60000) -set(baseaddress_srclient 0x71d40000) -set(baseaddress_sti 0x71d00000) -set(baseaddress_sxs 0x71cd0000) -set(baseaddress_syssetup 0x71c20000) -set(baseaddress_t2embed 0x71bf0000) -set(baseaddress_tapi32 0x71bb0000) -set(baseaddress_traffic 0x71b80000) -set(baseaddress_twain_32 0x71b50000) -set(baseaddress_uext2 0x71b10000) -set(baseaddress_ufat 0x71af0000) -set(baseaddress_ufatx 0x71ad0000) -set(baseaddress_unicows 0x71aa0000) -set(baseaddress_untfs 0x71a80000) -set(baseaddress_updspapi 0x71a60000) -set(baseaddress_url 0x71a30000) -set(baseaddress_vdmdbg 0x71a00000) -set(baseaddress_wdmaud.drv 0x71840000) -set(baseaddress_win32csr 0x717a0000) -set(baseaddress_windowscodecs 0x71730000) -set(baseaddress_wined3d 0x71570000) -set(baseaddress_winemp3.acm 0x71500000) -set(baseaddress_winfax 0x714e0000) -set(baseaddress_wing32 0x714c0000) -set(baseaddress_winhttp 0x71480000) -set(baseaddress_winsta 0x71450000) -set(baseaddress_wlanapi 0x71420000) -set(baseaddress_wldap32 0x713e0000) -set(baseaddress_wmi 0x713c0000) -set(baseaddress_ws2_32_new 0x71370000) -set(baseaddress_wshirda 0x71340000) -set(baseaddress_wshtcpip 0x71320000) -set(baseaddress_wsock32 0x712f0000) -set(baseaddress_wtsapi32 0x712c0000) -set(baseaddress_wuapi 0x71290000) -set(baseaddress_xinput1_1 0x71260000) -set(baseaddress_xinput1_2 0x71230000) -set(baseaddress_xinput1_3 0x71200000) -set(baseaddress_xinput9_1_0 0x711d0000) -set(baseaddress_xmllite 0x711a0000) -set(baseaddress_appwiz 0x71140000) -set(baseaddress_console 0x71100000) -set(baseaddress_desk 0x71070000) -set(baseaddress_hdwwiz 0x70fe0000) -set(baseaddress_inetcpl 0x70fa0000) -set(baseaddress_input 0x70f50000) -set(baseaddress_intl 0x70ef0000) -set(baseaddress_joy 0x70eb0000) -set(baseaddress_mmsys 0x70dc0000) -set(baseaddress_ncpa 0x70d90000) -set(baseaddress_powercfg 0x70d30000) -set(baseaddress_sysdm 0x70c60000) -set(baseaddress_telephon 0x70c30000) -set(baseaddress_timedate 0x70be0000) -set(baseaddress_usrmgr 0x70b90000) -set(baseaddress_wined3dcfg 0x70b60000) -set(baseaddress_ftfd 0x70a60000) -set(baseaddress_hid 0x70a30000) -set(baseaddress_netevent 0x70a10000) -set(baseaddress_tapiui 0x709b0000) -set(baseaddress_iologmsg 0x669a0000) +set(baseaddress_ntdll 0x77f00000) +set(baseaddress_kernel32 0x77d70000) +set(baseaddress_msvcrt 0x77cc0000) +set(baseaddress_advapi32 0x77c10000) +set(baseaddress_gdi32 0x77ba0000) +set(baseaddress_user32 0x77a00000) +set(baseaddress_dhcpcsvc 0x779b0000) +set(baseaddress_dnsapi 0x77960000) +set(baseaddress_icmp 0x77930000) +set(baseaddress_iphlpapi 0x778f0000) +set(baseaddress_ws2_32 0x778b0000) +set(baseaddress_ws2help 0x77880000) +set(baseaddress_shlwapi 0x777e0000) +set(baseaddress_rpcrt4 0x77720000) +set(baseaddress_comctl32 0x775b0000) +set(baseaddress_ole32 0x773c0000) +set(baseaddress_winspool.drv 0x77380000) +set(baseaddress_winmm 0x772e0000) +set(baseaddress_comdlg32 0x771f0000) +set(baseaddress_shell32 0x76500000) +set(baseaddress_lz32 0x764e0000) +set(baseaddress_version 0x764b0000) +set(baseaddress_oleaut32 0x762d0000) +set(baseaddress_setupapi 0x76100000) +set(baseaddress_mpr 0x760c0000) +set(baseaddress_crypt32 0x75fc0000) +set(baseaddress_wininet 0x75f10000) +set(baseaddress_urlmon 0x75e10000) +set(baseaddress_psapi 0x75de0000) +set(baseaddress_imm32 0x75da0000) +set(baseaddress_msvfw32 0x75d60000) +set(baseaddress_dbghelp 0x75cc0000) +set(baseaddress_devmgr 0x75c40000) +set(baseaddress_msacm32 0x75c00000) +set(baseaddress_netapi32 0x75ba0000) +set(baseaddress_powrprof 0x75b70000) +set(baseaddress_secur32 0x75b40000) +set(baseaddress_wintrust 0x75ae0000) +set(baseaddress_avicap32 0x75ab0000) +set(baseaddress_cabinet 0x75a60000) +set(baseaddress_dsound 0x759f0000) +set(baseaddress_glu32 0x758e0000) +set(baseaddress_opengl32 0x758a0000) +set(baseaddress_riched20 0x75810000) +set(baseaddress_smdll 0x757f0000) +set(baseaddress_userenv 0x757a0000) +set(baseaddress_uxtheme 0x75740000) +set(baseaddress_cryptui 0x756a0000) +set(baseaddress_csrsrv 0x75670000) +set(baseaddress_basesrv 0x75640000) +set(baseaddress_consrv 0x75590000) +set(baseaddress_winsrv 0x75540000) +set(baseaddress_dplayx 0x754e0000) +set(baseaddress_gdiplus 0x75420000) +set(baseaddress_msimg32 0x753f0000) +set(baseaddress_mswsock 0x753c0000) +set(baseaddress_oledlg 0x75370000) +set(baseaddress_rasapi32 0x75340000) +set(baseaddress_rsaenh 0x752e0000) +set(baseaddress_samlib 0x752a0000) +set(baseaddress_sensapi 0x75270000) +set(baseaddress_sfc_os 0x75240000) +set(baseaddress_snmpapi 0x75210000) +set(baseaddress_spoolss 0x751d0000) +set(baseaddress_usp10 0x75160000) +set(baseaddress_acledit 0x75130000) +set(baseaddress_aclui 0x750f0000) +set(baseaddress_activeds 0x750c0000) +set(baseaddress_actxprxy 0x74eb0000) +set(baseaddress_advpack 0x74e70000) +set(baseaddress_amstream 0x74e30000) +set(baseaddress_atl100 0x74df0000) +set(baseaddress_atl 0x74dc0000) +set(baseaddress_authz 0x74d90000) +set(baseaddress_avifil32 0x74d20000) +set(baseaddress_batt 0x74cf0000) +set(baseaddress_bcrypt 0x74cc0000) +set(baseaddress_beepmidi 0x74c90000) +set(baseaddress_browseui 0x74bc0000) +set(baseaddress_cards 0x74b10000) +set(baseaddress_cfgmgr32 0x74ae0000) +set(baseaddress_clusapi 0x74ab0000) +set(baseaddress_comcat 0x74a80000) +set(baseaddress_compstui 0x74a50000) +set(baseaddress_console 0x749d0000) +set(baseaddress_credui 0x74990000) +set(baseaddress_crtdll 0x74930000) +set(baseaddress_cryptdlg 0x74900000) +set(baseaddress_cryptdll 0x748d0000) +set(baseaddress_cryptnet 0x748a0000) +set(baseaddress_d3d8 0x74840000) +set(baseaddress_d3d8thk 0x74820000) +set(baseaddress_d3d9 0x747c0000) +set(baseaddress_d3dx9_24 0x74790000) +set(baseaddress_d3dx9_25 0x74760000) +set(baseaddress_d3dx9_26 0x74730000) +set(baseaddress_d3dx9_27 0x74700000) +set(baseaddress_d3dx9_28 0x746d0000) +set(baseaddress_d3dx9_29 0x746a0000) +set(baseaddress_d3dx9_30 0x74670000) +set(baseaddress_d3dx9_31 0x74640000) +set(baseaddress_d3dx9_32 0x74610000) +set(baseaddress_d3dx9_33 0x745e0000) +set(baseaddress_d3dx9_34 0x745b0000) +set(baseaddress_d3dx9_35 0x74580000) +set(baseaddress_d3dx9_36 0x74520000) +set(baseaddress_d3dx9_37 0x744f0000) +set(baseaddress_d3dx9_38 0x744c0000) +set(baseaddress_d3dx9_39 0x74490000) +set(baseaddress_d3dx9_40 0x74460000) +set(baseaddress_d3dx9_41 0x74430000) +set(baseaddress_d3dx9_42 0x74400000) +set(baseaddress_dciman32 0x743d0000) +set(baseaddress_ddraw 0x74320000) +set(baseaddress_deskadp 0x742f0000) +set(baseaddress_deskmon 0x742c0000) +set(baseaddress_devcpux 0x74290000) +set(baseaddress_devenum 0x74250000) +set(baseaddress_dinput8 0x74220000) +set(baseaddress_dinput 0x741c0000) +set(baseaddress_dmusic 0x74170000) +set(baseaddress_dplay 0x74140000) +set(baseaddress_dwmapi 0x74110000) +set(baseaddress_dxdiagn 0x740e0000) +set(baseaddress_faultrep 0x740b0000) +set(baseaddress_fmifs 0x74090000) +set(baseaddress_fontext 0x74060000) +set(baseaddress_framebuf 0x74040000) +set(baseaddress_framebuf_new 0x74020000) +set(baseaddress_genincdata 0x73ff0000) +set(baseaddress_getuname 0x73fc0000) +set(baseaddress_hid 0x73f90000) +set(baseaddress_hlink 0x73f50000) +set(baseaddress_hnetcfg 0x73f10000) +set(baseaddress_httpapi 0x73ee0000) +set(baseaddress_iccvid 0x73eb0000) +set(baseaddress_ieframe 0x73e20000) +set(baseaddress_iernonce 0x73df0000) +set(baseaddress_imagehlp 0x73dc0000) +set(baseaddress_inetcomm 0x73d60000) +set(baseaddress_inetmib1 0x73d30000) +set(baseaddress_initpki 0x73d00000) +set(baseaddress_input 0x73ca0000) +set(baseaddress_inseng 0x73c70000) +set(baseaddress_iologmsg 0x73c50000) +set(baseaddress_itircl 0x73c20000) +set(baseaddress_itss 0x73be0000) +set(baseaddress_jscript 0x73b20000) +set(baseaddress_kbsdll 0x73af0000) +set(baseaddress_ksuser 0x73ac0000) +set(baseaddress_libjpeg 0x73a20000) +set(baseaddress_libpng 0x739a0000) +set(baseaddress_libtiff 0x738c0000) +set(baseaddress_libxslt 0x73640000) +set(baseaddress_loadperf 0x73610000) +set(baseaddress_localspl 0x735d0000) +set(baseaddress_localui 0x735a0000) +set(baseaddress_lpk 0x73570000) +set(baseaddress_lsasrv 0x73510000) +set(baseaddress_mapi32 0x734d0000) +set(baseaddress_mciavi32 0x73490000) +set(baseaddress_mcicda 0x73460000) +set(baseaddress_mciqtz32 0x73420000) +set(baseaddress_mciseq 0x733f0000) +set(baseaddress_mciwave 0x733c0000) +set(baseaddress_mesa32 0x72bc0000) +set(baseaddress_midimap 0x72b90000) +set(baseaddress_mlang 0x72b50000) +set(baseaddress_mmdrv 0x72b20000) +set(baseaddress_modemui 0x72ab0000) +set(baseaddress_mprapi 0x72a80000) +set(baseaddress_msafd 0x72a40000) +set(baseaddress_mscat32 0x72a10000) +set(baseaddress_mscms 0x729e0000) +set(baseaddress_mscoree 0x72990000) +set(baseaddress_msctf 0x72940000) +set(baseaddress_msdmo 0x72910000) +set(baseaddress_msftedit 0x728e0000) +set(baseaddress_msgina 0x72880000) +set(baseaddress_mshtml 0x726a0000) +set(baseaddress_msi 0x72550000) +set(baseaddress_msimtf 0x72520000) +set(baseaddress_msisip 0x724f0000) +set(baseaddress_msports 0x724c0000) +set(baseaddress_msrle32 0x72490000) +set(baseaddress_mssign32 0x72460000) +set(baseaddress_mssip32 0x72430000) +set(baseaddress_mstask 0x723f0000) +set(baseaddress_msv1_0 0x723c0000) +set(baseaddress_msvcrt20 0x722f0000) +set(baseaddress_msvcrt40 0x72220000) +set(baseaddress_msvidc32 0x721f0000) +set(baseaddress_msxml2 0x721c0000) +set(baseaddress_msxml3 0x71eb0000) +set(baseaddress_msxml4 0x71e70000) +set(baseaddress_msxml6 0x71e30000) +set(baseaddress_msxml 0x71e00000) +set(baseaddress_nddeapi 0x71dd0000) +set(baseaddress_netcfgx 0x71d50000) +set(baseaddress_netevent 0x71d30000) +set(baseaddress_netid 0x71ce0000) +set(baseaddress_netshell 0x71c60000) +set(baseaddress_newdev 0x71c00000) +set(baseaddress_notifyhook 0x71bd0000) +set(baseaddress_ntdsapi 0x71ba0000) +set(baseaddress_ntlanman 0x71b70000) +set(baseaddress_ntmarta 0x71b40000) +set(baseaddress_ntprint 0x71b10000) +set(baseaddress_objsel 0x71ae0000) +set(baseaddress_odbc32 0x71aa0000) +set(baseaddress_odbccp32 0x71a70000) +set(baseaddress_oleacc 0x71a40000) +set(baseaddress_olecli32 0x71a10000) +set(baseaddress_olepro32 0x719e0000) +set(baseaddress_olesvr32 0x719b0000) +set(baseaddress_olethk32 0x71980000) +set(baseaddress_pdh 0x71940000) +set(baseaddress_pidgen 0x71910000) +set(baseaddress_printui 0x718e0000) +set(baseaddress_propsys 0x718a0000) +set(baseaddress_pstorec 0x71870000) +set(baseaddress_qedit 0x71830000) +set(baseaddress_qmgr 0x71800000) +set(baseaddress_qmgrprxy 0x717a0000) +set(baseaddress_quartz 0x71640000) +set(baseaddress_query 0x71610000) +set(baseaddress_rasadhlp 0x715e0000) +set(baseaddress_rasdlg 0x71450000) +set(baseaddress_rasman 0x71410000) +set(baseaddress_resutils 0x713e0000) +set(baseaddress_riched32 0x713b0000) +set(baseaddress_rsabase 0x71390000) +set(baseaddress_samsrv 0x71330000) +set(baseaddress_sccbase 0x71300000) +set(baseaddress_schannel 0x712d0000) +set(baseaddress_security 0x712b0000) +set(baseaddress_serialui 0x71280000) +set(baseaddress_sfc 0x71250000) +set(baseaddress_shdoclc 0x71210000) +set(baseaddress_shdocvw 0x711c0000) +set(baseaddress_shfolder 0x711a0000) +set(baseaddress_shimgvw 0x71160000) +set(baseaddress_slayer 0x71130000) +set(baseaddress_slbcsp 0x71100000) +set(baseaddress_sndblst 0x710d0000) +set(baseaddress_softpub 0x710b0000) +set(baseaddress_srclient 0x71080000) +set(baseaddress_sti 0x71040000) +set(baseaddress_sxs 0x71010000) +set(baseaddress_syssetup 0x70f60000) +set(baseaddress_t2embed 0x70f30000) +set(baseaddress_tapi32 0x70ef0000) +set(baseaddress_tapiui 0x70e90000) +set(baseaddress_traffic 0x70e60000) +set(baseaddress_twain_32 0x70e30000) +set(baseaddress_uext2 0x70df0000) +set(baseaddress_ufat 0x70dd0000) +set(baseaddress_ufatx 0x70db0000) +set(baseaddress_unicows 0x70d80000) +set(baseaddress_untfs 0x70d60000) +set(baseaddress_updspapi 0x70d30000) +set(baseaddress_url 0x70d00000) +set(baseaddress_vbscript 0x70c80000) +set(baseaddress_vdmdbg 0x70c50000) +set(baseaddress_windowscodecs 0x70b20000) +set(baseaddress_wined3d 0x70960000) +set(baseaddress_winfax 0x70930000) +set(baseaddress_wing32 0x70900000) +set(baseaddress_winhttp 0x708a0000) +set(baseaddress_winsta 0x70870000) +set(baseaddress_wlanapi 0x70840000) +set(baseaddress_wldap32 0x70800000) +set(baseaddress_wmi 0x707e0000) +set(baseaddress_ws2_32_new 0x70790000) +set(baseaddress_wshirda 0x70760000) +set(baseaddress_wshtcpip 0x70730000) +set(baseaddress_wsock32 0x70700000) +set(baseaddress_wtsapi32 0x706d0000) +set(baseaddress_wuapi 0x70690000) +set(baseaddress_xinput1_1 0x70660000) +set(baseaddress_xinput1_2 0x70630000) +set(baseaddress_xinput1_3 0x70600000) +set(baseaddress_xinput9_1_0 0x705d0000) +set(baseaddress_xmllite 0x70590000) +set(baseaddress_access 0x70510000) +set(baseaddress_appwiz 0x704b0000) +set(baseaddress_cmicpl 0x70470000) +set(baseaddress_desk 0x703d0000) +set(baseaddress_hdwwiz 0x70340000) +set(baseaddress_hhctrl 0x702f0000) +set(baseaddress_imaadp32.acm 0x702c0000) +set(baseaddress_inetcpl 0x70280000) +set(baseaddress_intl 0x70220000) +set(baseaddress_joy 0x701e0000) +set(baseaddress_main 0x70130000) +set(baseaddress_mmsys 0x70030000) +set(baseaddress_msacm32.drv 0x70000000) +set(baseaddress_msadp32.acm 0x6ffd0000) +set(baseaddress_msg711.acm 0x6ffa0000) +set(baseaddress_msgsm32.acm 0x6ff70000) +set(baseaddress_msisys 0x6ff40000) +set(baseaddress_ncpa 0x6ff10000) +set(baseaddress_odbccp32i 0x6fee0000) +set(baseaddress_powercfg 0x6fe80000) +set(baseaddress_sysdm 0x6fdb0000) +set(baseaddress_telephon 0x6fd80000) +set(baseaddress_timedate 0x6fd20000) +set(baseaddress_usrmgr 0x6fcc0000) +set(baseaddress_wdmaud.drv 0x6fb00000) +set(baseaddress_wined3dcfg 0x6fad0000) +set(baseaddress_winemp3.acm 0x6fa50000)

1 0

[ekohl] 59195: [NETAPI32] Add level 3 support to NetLocalGroupAddMembers and NetLocalGroupDelMembers.
by ekohl＠svn.reactos.org 09 Jun '13

09 Jun '13

Author: ekohl Date: Sun Jun 9 09:40:24 2013 New Revision: 59195 URL: http://svn.reactos.org/svn/reactos?rev=59195&view=rev Log: [NETAPI32] Add level 3 support to NetLocalGroupAddMembers and NetLocalGroupDelMembers. Modified: trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/misc.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -213,6 +213,115 @@ if (Use != NULL) SamFreeMemory(Use); + + return ApiStatus; +} + + +static +NET_API_STATUS +BuildSidListFromDomainAndName(IN PUNICODE_STRING ServerName, + IN PLOCALGROUP_MEMBERS_INFO_3 buf, + IN ULONG EntryCount, + OUT PLOCALGROUP_MEMBERS_INFO_0 *MemberList) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE LsaHandle = NULL; + PUNICODE_STRING NamesArray = NULL; + ULONG i; + PLSA_REFERENCED_DOMAIN_LIST Domains = NULL; + PLSA_TRANSLATED_SID Sids = NULL; + PLOCALGROUP_MEMBERS_INFO_0 MemberBuffer = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + ApiStatus = NetApiBufferAllocate(sizeof(UNICODE_STRING) * EntryCount, + (LPVOID*)&NamesArray); + if (ApiStatus != NERR_Success) + { + goto done; + } + + for (i = 0; i < EntryCount; i++) + { + RtlInitUnicodeString(&NamesArray[i], + buf[i].lgrmi3_domainandname); + } + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + 0, + NULL); + + Status = LsaOpenPolicy(ServerName, + (PLSA_OBJECT_ATTRIBUTES)&ObjectAttributes, + POLICY_EXECUTE, + &LsaHandle); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = LsaLookupNames(LsaHandle, + EntryCount, + NamesArray, + &Domains, + &Sids); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + ApiStatus = NetApiBufferAllocate(sizeof(LOCALGROUP_MEMBERS_INFO_0) * EntryCount, + (LPVOID*)&MemberBuffer); + if (ApiStatus != NERR_Success) + { + goto done; + } + + for (i = 0; i < EntryCount; i++) + { + ApiStatus = BuildSidFromSidAndRid(Domains->Domains[Sids[i].DomainIndex].Sid, + Sids[i].RelativeId, + &MemberBuffer[i].lgrmi0_sid); + if (ApiStatus != NERR_Success) + { + goto done; + } + } + +done: + if (ApiStatus != NERR_Success) + { + if (MemberBuffer != NULL) + { + for (i = 0; i < EntryCount; i++) + { + if (MemberBuffer[i].lgrmi0_sid != NULL) + NetApiBufferFree(MemberBuffer[i].lgrmi0_sid); + } + + NetApiBufferFree(MemberBuffer); + MemberBuffer = NULL; + } + } + + if (Sids != NULL) + LsaFreeMemory(Sids); + + if (Domains != NULL) + LsaFreeMemory(Domains); + + if (LsaHandle != NULL) + LsaClose(LsaHandle); + + if (NamesArray != NULL) + NetApiBufferFree(NamesArray); + + *MemberList = MemberBuffer; return ApiStatus; } @@ -433,6 +542,18 @@ break; case 3: + Status = BuildSidListFromDomainAndName((servername != NULL) ? &ServerName : NULL, + (PLOCALGROUP_MEMBERS_INFO_3)buf, + totalentries, + &MemberList); + if (!NT_SUCCESS(Status)) + { + ERR("BuildSidListFromDomainAndName failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + default: ApiStatus = ERROR_INVALID_LEVEL; goto done; @@ -517,6 +638,17 @@ } done: + if (level == 3 && MemberList != NULL) + { + for (i = 0; i < totalentries; i++) + { + if (MemberList[i].lgrmi0_sid != NULL) + NetApiBufferFree(MemberList[i].lgrmi0_sid); + } + + NetApiBufferFree(MemberList); + } + if (AliasHandle != NULL) SamCloseHandle(AliasHandle); @@ -707,6 +839,18 @@ break; case 3: + Status = BuildSidListFromDomainAndName((servername != NULL) ? &ServerName : NULL, + (PLOCALGROUP_MEMBERS_INFO_3)buf, + totalentries, + &MemberList); + if (!NT_SUCCESS(Status)) + { + ERR("BuildSidListFromDomainAndName failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + default: ApiStatus = ERROR_INVALID_LEVEL; goto done; @@ -791,6 +935,17 @@ } done: + if (level == 3 && MemberList != NULL) + { + for (i = 0; i < totalentries; i++) + { + if (MemberList[i].lgrmi0_sid != NULL) + NetApiBufferFree(MemberList[i].lgrmi0_sid); + } + + NetApiBufferFree(MemberList); + } + if (AliasHandle != NULL) SamCloseHandle(AliasHandle); Modified: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -175,4 +175,47 @@ return Status; } + +NET_API_STATUS +BuildSidFromSidAndRid(IN PSID SrcSid, + IN ULONG RelativeId, + OUT PSID *DestSid) +{ + UCHAR RidCount; + PSID DstSid; + ULONG i; + ULONG DstSidSize; + PULONG p, q; + NET_API_STATUS ApiStatus = NERR_Success; + + RidCount = *RtlSubAuthorityCountSid(SrcSid); + if (RidCount >= 8) + return ERROR_INVALID_PARAMETER; + + DstSidSize = RtlLengthRequiredSid(RidCount + 1); + + ApiStatus = NetApiBufferAllocate(DstSidSize, + &DstSid); + if (ApiStatus != NERR_Success) + return ApiStatus; + + RtlInitializeSid(DstSid, + RtlIdentifierAuthoritySid(SrcSid), + RidCount + 1); + + for (i = 0; i < (ULONG)RidCount; i++) + { + p = RtlSubAuthoritySid(SrcSid, i); + q = RtlSubAuthoritySid(DstSid, i); + *q = *p; + } + + q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); + *q = RelativeId; + + *DestSid = DstSid; + + return NERR_Success; +} + /* EOF */ Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -52,4 +52,9 @@ IN ULONG DesiredAccess, OUT SAM_HANDLE *DomainHandle); +NET_API_STATUS +BuildSidFromSidAndRid(IN PSID SrcSid, + IN ULONG RelativeId, + OUT PSID *DestSid); + #endif Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jun 9 09:40:24 2013 @@ -47,46 +47,6 @@ BOOLEAN BuiltinDone; } ENUM_CONTEXT, *PENUM_CONTEXT; - - -static PSID -CreateSidFromSidAndRid(PSID SrcSid, - ULONG RelativeId) -{ - UCHAR RidCount; - PSID DstSid; - ULONG i; - ULONG DstSidSize; - PULONG p, q; - - RidCount = *RtlSubAuthorityCountSid(SrcSid); - if (RidCount >= 8) - return NULL; - - DstSidSize = RtlLengthRequiredSid(RidCount + 1); - - DstSid = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - DstSidSize); - if (DstSid == NULL) - return NULL; - - RtlInitializeSid(DstSid, - RtlIdentifierAuthoritySid(SrcSid), - RidCount + 1); - - for (i = 0; i < (ULONG)RidCount; i++) - { - p = RtlSubAuthoritySid(SrcSid, i); - q = RtlSubAuthoritySid(DstSid, i); - *q = *p; - } - - q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); - *q = RelativeId; - - return DstSid; -} static @@ -1728,12 +1688,12 @@ } /* Build the User SID from the Account Domain SID and the users RID */ - UserSid = CreateSidFromSidAndRid(AccountDomainSid, - RelativeIds[0]); - if (UserSid == NULL) - { - ERR("CreateSidFromSidAndRid failed!\n"); - ApiStatus = ERROR_NOT_ENOUGH_MEMORY; + ApiStatus = BuildSidFromSidAndRid(AccountDomainSid, + RelativeIds[0], + &UserSid); + if (ApiStatus != NERR_Success) + { + ERR("BuildSidFromSidAndRid failed!\n"); goto done; } @@ -1881,7 +1841,7 @@ SamFreeMemory(Use); if (UserSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, UserSid); + NetApiBufferFree(UserSid); if (AccountDomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013