Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 59207: [INF] - recognize PCI\CC_0000 as a valid ID for VBE adapters. CORE-6773. #resolve #comment Should be fixed with r59207, thanks.
by jgardou＠svn.reactos.org 13 Jun '13

13 Jun '13

Author: jgardou Date: Thu Jun 13 15:09:45 2013 New Revision: 59207 URL: http://svn.reactos.org/svn/reactos?rev=59207&view=rev Log: [INF] - recognize PCI\CC_0000 as a valid ID for VBE adapters. CORE-6773. #resolve #comment Should be fixed with r59207, thanks. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/media/inf/display.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Jun 13 15:09:45 2013 @@ -60,6 +60,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"VBE" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","Service",0x00000000,"VBE" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0001","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" @@ -1553,7 +1556,7 @@ ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pcix.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 59206: [NETAPI32] NetLocalGroupSetInfo: Implement level 1.
by ekohl＠svn.reactos.org 12 Jun '13

12 Jun '13

Author: ekohl Date: Wed Jun 12 21:37:31 2013 New Revision: 59206 URL: http://svn.reactos.org/svn/reactos?rev=59206&view=rev Log: [NETAPI32] NetLocalGroupSetInfo: Implement level 1. 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] Wed Jun 12 21:37:31 2013 @@ -1718,7 +1718,7 @@ SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; ALIAS_NAME_INFORMATION AliasNameInfo; - + ALIAS_ADM_COMMENT_INFORMATION AdminCommentInfo; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -1808,6 +1808,22 @@ Status = SamSetInformationAlias(AliasHandle, AliasNameInformation, &AliasNameInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("SamSetInformationAlias failed (ApiStatus %lu)\n", ApiStatus); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + break; + + case 1: + /* Set the alias admin comment */ + RtlInitUnicodeString(&AdminCommentInfo.AdminComment, + ((PLOCALGROUP_INFO_1)buf)->lgrpi1_comment); + + Status = SamSetInformationAlias(AliasHandle, + AliasAdminCommentInformation, + &AdminCommentInfo); if (!NT_SUCCESS(Status)) { TRACE("SamSetInformationAlias failed (ApiStatus %lu)\n", ApiStatus);

1 0

[dreimer] 59205: Update for some German resource files by zehnvor.
by dreimer＠svn.reactos.org 11 Jun '13

11 Jun '13

Author: dreimer Date: Tue Jun 11 22:21:49 2013 New Revision: 59205 URL: http://svn.reactos.org/svn/reactos?rev=59205&view=rev Log: Update for some German resource files by zehnvor. Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/dll/cpl/console/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Tue Jun 11 22:21:49 2013 @@ -527,12 +527,12 @@ BLOCK "040904b0" BEGIN VALUE "CompanyName", "Brian Palmer\0" - VALUE "FileDescription", "Task Manager von Brian Palmer\0" + VALUE "FileDescription", "ReactOS Task-Manager von Brian Palmer\0" VALUE "FileVersion", "1.0.0.1\0" VALUE "InternalName", "taskmgr\0" VALUE "LegalCopyright", "Copyright Â© Brian Palmer 2000\0" VALUE "OriginalFilename", "taskmgr.exe\0" - VALUE "ProductName", "Task Manager von Brian Palmer\0" + VALUE "ProductName", "ReactOS Task-Manager\0" VALUE "ProductVersion", "1.0.0.1\0" END END Modified: trunk/reactos/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Tue Jun 11 22:21:49 2013 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/console/de-DE.rc - * PURPOSE: English resource file + * PURPOSE: German resource file * PROGRAMMERS: Daniel Reimer (reimer.daniel(a)freenet.de) */ @@ -47,12 +47,12 @@ LTEXT "&Schrift", -1, 10, 105, 35, 10 CHECKBOX "&Fette Schriften", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL - GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 - CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 - LTEXT "Jedes Zeichen ist:", -1, 130, 165, 75, 10 - LTEXT "BildschirmpixeÃ¶ breit\nBildschirmpixel hoch", -1, 140, 180, 65, 20 - LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 - LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 + LTEXT "Jedes Zeichen ist:", -1, 130, 165, 75, 10 + LTEXT "Bildschirmpixel breit\nBildschirmpixel hoch", -1, 140, 180, 65, 20 + LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 END IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 @@ -92,13 +92,13 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Fenster&text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 - CONTROL "Fenster&hintergrund", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 - CONTROL "&Popuptext", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 - CONTROL "Pop&uphintergrund", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 - GROUPBOX "Selected Color Components", -1, 120, 15, 90, 45 - LTEXT "&Rot:", -1, 125, 25, 30, 10 - EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP - CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 + CONTROL "Fenster&hintergrund", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 + CONTROL "&Popuptext", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 + CONTROL "Pop&uphintergrund", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 + GROUPBOX "Farbkomponenten", -1, 120, 15, 90, 45 + LTEXT "&Rot:", -1, 125, 25, 30, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 25, 30, 10 LTEXT "&GrÃ¼n:", -1, 125, 35, 30, 10 EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 165, 35, 30, 10 Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Tue Jun 11 22:21:49 2013 @@ -51,11 +51,11 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 64, 7 + LTEXT "Fenster und SchaltflÃ¤chen", IDC_STATIC, 7, 130, 64, 7 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Farbschema", IDC_STATIC, 7, 160, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 64, 7 + LTEXT "SchriftgrÃ¶Ãe", IDC_STATIC, 7, 190, 64, 7 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effekte...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 @@ -213,9 +213,9 @@ BEGIN IDS_COLOR_4BIT "16 Farben" IDS_COLOR_8BIT "256 Farben" - IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_24BIT "True Color (24 Bit)" - IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_COLOR_16BIT "Mittlere (16 Bit)" + IDS_COLOR_24BIT "Hoch (24 Bit)" + IDS_COLOR_32BIT "HÃ¶chste (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END @@ -233,7 +233,7 @@ IDS_MESSBOX "Dialogfeld" IDS_MESSTEXT "Dialogfeldtext" IDS_BUTTEXT "OK" - IDS_CLASSIC_THEME "Classic Theme" + IDS_CLASSIC_THEME "Klassischer Stil" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Tue Jun 11 22:21:49 2013 @@ -17,12 +17,12 @@ IDD_PROPPAGEADVANCEDSETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Advanced Settings" +CAPTION "Erweiterte Einstellungen" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "System Configuration", -1, 7, 7, 240, 70 - AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 - LTEXT "Select this check box to turn off advanced text services in all programs.\nThis is not recommended for East Asian users because this closes the language bar.", -1, 14, 40, 230, 35 + AUTOCHECKBOX "&Erweiterte &Textdienste deaktivieren", IDC_TURNOFFTEXTSVCS_CB, 14, 20, 130, 12 + LTEXT "AuswÃ¤hlen, um die erweiterte SprachunterstÃ¼tzung in allen Programmen zu deaktivieren.\nNicht empfohlen fÃ¼r ostasiatische Benutzer, da die Sprachleiste hierdurch geschlossen wird.", -1, 14, 40, 230, 35 END IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Tue Jun 11 22:21:49 2013 @@ -26,7 +26,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "<A HREF=""http://www.reactos.de/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 100, 10 + CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 100, 10 PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 199, 78, 14 END @@ -71,7 +71,7 @@ LTEXT "Start- und Wiederherstellungseinstellungen regeln, wie der Computer gestartet werden soll und was passieren soll, wenn ein Fehler auftritt.", IDC_STATIC, 16, 144, 210, 27 PUSHBUTTON "Einstellungen", IDC_STAREC, 194, 162, 50, 14 - PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 2, 192, 80, 15//FIXME + PUSHBUTTON "Systemeinstellungen", IDC_SYSSETTINGS, 2, 192, 80, 15//FIXME PUSHBUTTON "Umgebungsvariablen", IDC_ENVVAR, 84, 192, 80, 14 PUSHBUTTON "Fehler melden", IDC_ERRORREPORT, 170, 192, 80, 14 END Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Tue Jun 11 22:21:49 2013 @@ -40,7 +40,7 @@ IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS ist unter der GNU General Public License (GPL) verÃ¶ffentlicht. Wenn Sie ReactOS oder Teile davon wiederverwenden oder wiederverÃ¶ffentlichen wollen, mÃ¼ssen Sie die Bestimmungen der GPL anerkennen.", + LTEXT "ReactOS ist unter der GNU General Public License (GPL) verÃ¶ffentlicht. Wenn Sie ReactOS oder Teile davon weiterverwenden wollen, mÃ¼ssen Sie die Bestimmungen der GPL anerkennen.", IDC_STATIC,15,110,227,24 PUSHBUTTON "GPL &ansehen...",IDC_VIEWGPL,251,110,55,19 LTEXT "Klicken Sie auf Weiter, um mit der Einrichtung fortzufahren.",IDC_STATIC,15,136,

1 0

[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

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