Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 71302: [TEST]
by spetreolle＠svn.reactos.org 09 May '16

09 May '16

Author: spetreolle Date: Mon May 9 20:57:35 2016 New Revision: 71302 URL: http://svn.reactos.org/svn/reactos?rev=71302&view=rev Log: [TEST] Modified: trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Mon May 9 20:57:35 2016 @@ -14,7 +14,6 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/AHK_Tests/) add_subdirectory(AHK_Tests) endif() - ## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras ## in the same layout as you want them to be in the CD.

1 0

[tfaber] 71301: [USBHUB] - Fix memory leak in failure case of CreateDeviceIds. Patch by Víctor Martínez Calvo. CID 1102364 CORE-11208 #resolve
by tfaber＠svn.reactos.org 09 May '16

09 May '16

Author: tfaber Date: Mon May 9 17:44:16 2016 New Revision: 71301 URL: http://svn.reactos.org/svn/reactos?rev=71301&view=rev Log: [USBHUB] - Fix memory leak in failure case of CreateDeviceIds. Patch by Víctor Martínez Calvo. CID 1102364 CORE-11208 #resolve Modified: trunk/reactos/drivers/usb/usbhub/fdo.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Mon May 9 17:44:16 2016 @@ -1035,6 +1035,9 @@ { // construct instance id buffer Index = swprintf(Buffer, L"%04d&%s", HubDeviceExtension->InstanceCount, SerialBuffer) + 1; + + ExFreePool(SerialBuffer); + UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); if (UsbChildExtension->usInstanceId.Buffer == NULL) { @@ -1047,7 +1050,6 @@ // RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); - ExFreePool(SerialBuffer); DPRINT("Usb InstanceId %wZ InstanceCount %x\n", &UsbChildExtension->usInstanceId, HubDeviceExtension->InstanceCount); return Status;

1 0

[ekohl] 71300: [SHELL32] Improvements to the file types property page: - Always show the selected file type. - Set the focus to the listview control when the file types page gets activated. - Enabl...
by ekohl＠svn.reactos.org 09 May '16

09 May '16

Author: ekohl Date: Mon May 9 15:11:25 2016 New Revision: 71300 URL: http://svn.reactos.org/svn/reactos?rev=71300&view=rev Log: [SHELL32] Improvements to the file types property page: - Always show the selected file type. - Set the focus to the listview control when the file types page gets activated. - Enable/disable the Delete button for the initial file type selection too. Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] Mon May 9 15:11:25 2016 @@ -309,8 +309,8 @@ lvItem.pszText = Entry->FileDescription; lvItem.iItem = *iItem; lvItem.iSubItem = 1; - - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&lvItem); + ListView_SetItem(hDlgCtrl, &lvItem); + (*iItem)++; } @@ -333,7 +333,7 @@ } static -BOOL +PFOLDER_FILE_TYPE_ENTRY InitializeFileTypesListCtrl(HWND hwndDlg) { HWND hDlgCtrl; @@ -353,7 +353,7 @@ /* default to english */ wcscpy(szFile, L"%s File"); } - szFile[(_countof(szFile))-1] = 0; + szFile[(_countof(szFile)) - 1] = 0; dwName = _countof(szName); @@ -362,6 +362,10 @@ InsertFileType(hDlgCtrl, szName, &iItem, szFile); dwName = _countof(szName); } + + /* Leave if the list is empty */ + if (iItem == 0) + return NULL; /* sort list */ ListView_SortItems(hDlgCtrl, ListViewCompareProc, NULL); @@ -369,12 +373,15 @@ /* select first item */ ZeroMemory(&lvItem, sizeof(LVITEMW)); lvItem.mask = LVIF_STATE; - lvItem.stateMask = (UINT) - 1; + lvItem.stateMask = (UINT)-1; lvItem.state = LVIS_FOCUSED | LVIS_SELECTED; lvItem.iItem = 0; - (void)SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&lvItem); - - return TRUE; + ListView_SetItem(hDlgCtrl, &lvItem); + + lvItem.mask = LVIF_PARAM; + ListView_GetItem(hDlgCtrl, &lvItem); + + return (PFOLDER_FILE_TYPE_ENTRY)lvItem.lParam; } static @@ -421,10 +428,12 @@ switch(uMsg) { case WM_INITDIALOG: - InitializeFileTypesListCtrl(hwndDlg); - - /* Disable the Delete button by default */ - EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); + pItem = InitializeFileTypesListCtrl(hwndDlg); + + /* Disable the Delete button if the listview is empty or + the selected item should not be deleted by the user */ + if (pItem == NULL || (pItem->EditFlags & 0x00000010)) // FTA_NoRemove + EnableWindow(GetDlgItem(hwndDlg, 14002), FALSE); return TRUE; case WM_COMMAND: @@ -488,6 +497,11 @@ EnableWindow(GetDlgItem(hwndDlg, 14002), TRUE); } } + else if (lppl->hdr.code == PSN_SETACTIVE) + { + /* On page activation, set the focus to the listview */ + SetFocus(GetDlgItem(hwndDlg, 14000)); + } break; } Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸ &Ð²Ð¸Ð´Ð¾Ð²Ðµ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ:", -1, 7, 10, 170, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&ÐÐ¾Ð²", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÐ·&ÑÑÐ¸Ð²Ð°Ð½Ðµ", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð·Ð° ÑÐ°Ð·ÑÐ¸ÑÐµÐ½Ð¸Ðµ '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -448,7 +448,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "RegistrovanÃ© &typy souborÅ¯:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&NovÃ½", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "O&dstranit", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Podrobnosti pro typ souborÅ¯ '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -448,7 +448,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Registrierte Dateitypen:", -1, 7, 10, 80, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 PUSHBUTTON "&Neu", 14001, 140, 140, 55, 14, WS_TABSTOP PUSHBUTTON "&LÃ¶schen", 14002, 200, 140, 55, 14, WS_TABSTOP GROUPBOX "Details zum Dateityp '%s'", 14003, 7, 170, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -444,7 +444,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de archivo registrados:", -1, 7, 10, 120, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 279, 80 PUSHBUTTON "&Nueva", 14001, 170, 110, 50, 14, WS_TABSTOP PUSHBUTTON "Eli&minar", 14002, 230, 110, 50, 14, WS_TABSTOP GROUPBOX "Detalles para el tipo de archivo Â«%sÂ»", 14003, 7, 130, 279, 100 Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Types de fichiers enregistrÃ©s :", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Nouveau", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "Supprimer", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "DÃ©tails concernant l'extension '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipi di file Registrati:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Nuovo", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Cancella", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Dettagli per l'estensione '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "ç»é²ããã¦ãããã¡ã¤ã«ã®ç¨®é¡(&T):", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "æ°è¦(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "åé¤(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "æ¡å¼µå '%s' ã®è©³ç´°", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registerert fil&typer:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Slett", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detailjer for '%s' utvidelser", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -446,7 +446,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Zarejestrowane &typy plikÃ³w:", -1, 7, 10, 196, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Nowy", 14001, 120, 110, 60, 14, WS_TABSTOP PUSHBUTTON "&Skasuj", 14002, 180, 110, 60, 14, WS_TABSTOP GROUPBOX "SzczegÃ³Åy dla rozszerzenia '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de arquivo registrado:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Novo", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Apagar", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detalhes para extensÃ£o '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tipos de ficheiros registados:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Novo", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Apagar", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detalhes para '%s' extensÃ£o", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -444,7 +444,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tipurile de fiÈier Ã®nregistrate:", -1, 7, 10, 120, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "N&ouâ¦", 14001, 140, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&EliminÄ", 14002, 200, 110, 50, 14, WS_TABSTOP GROUPBOX "Detalii pentru extensia â%sâ", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -444,7 +444,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²:", -1, 7, 10, 125, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Ð¡Ð¾Ð·Ð´Ð°ÑÑ", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Ð£Ð´Ð°Ð»Ð¸ÑÑ", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "RegistrovanÃ© &typy sÃºborov:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&NovÃ½", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "O&dstrÃ¡niÅ¥", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -446,7 +446,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Dokumentat e regjistruar dhe lloji:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "E're", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Fshi", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Detaje pÃ«r '%s' zgjerim", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&KayÄ±tlÄ± dosya tÃ¼rleri:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Yeni", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Sil", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "'%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -442,7 +442,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ÐÐ°ÑÐµÑÑÑÑÐ¾Ð²Ð°Ð½Ñ &ÑÐ¸Ð¿Ð¸ ÑÐ°Ð¹Ð»ÑÐ²:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "Ð&Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "ÐÐ¾Ð´ÑÐ¾Ð±Ð¸ÑÑ Ð´Ð»Ñ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ '%s'", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -451,7 +451,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "å·²æ³¨åçæä»¶ç±»å(&T):", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "æ°å»º(&N)", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "å é¤(&D)", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "'%S' æ©å±çè¯¦ç»ä¿¡æ¯", 14003, 7, 130, 249, 70 Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon May 9 15:11:25 2016 @@ -450,7 +450,7 @@ FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Registered file &types:", -1, 7, 10, 70, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70

1 0

[ekohl] 71299: [NETAPI32] Prevent dereferencing null-pointers.
by ekohl＠svn.reactos.org 09 May '16

09 May '16

Author: ekohl Date: Mon May 9 10:26:55 2016 New Revision: 71299 URL: http://svn.reactos.org/svn/reactos?rev=71299&view=rev Log: [NETAPI32] Prevent dereferencing null-pointers. Modified: trunk/reactos/dll/win32/netapi32/local_group.c 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] Mon May 9 10:26:55 2016 @@ -1163,7 +1163,7 @@ // } done: - if (ApiStatus == NERR_Success && EnumContext->Phase != DonePhase) + if (ApiStatus == NERR_Success && EnumContext != NULL && EnumContext->Phase != DonePhase) ApiStatus = ERROR_MORE_DATA; if (EnumContext != NULL) 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] Mon May 9 10:26:55 2016 @@ -2554,7 +2554,7 @@ // } done: - if (ApiStatus == NERR_Success && EnumContext->Index < EnumContext->Count) + if (ApiStatus == NERR_Success && EnumContext != NULL && EnumContext->Index < EnumContext->Count) ApiStatus = ERROR_MORE_DATA; if (EnumContext != NULL)

1 0

[tfaber] 71298: [BTRFS] - Fix warnings
by tfaber＠svn.reactos.org 09 May '16

09 May '16

Author: tfaber Date: Mon May 9 09:10:13 2016 New Revision: 71298 URL: http://svn.reactos.org/svn/reactos?rev=71298&view=rev Log: [BTRFS] - Fix warnings Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt trunk/reactos/drivers/filesystems/btrfs/create.c trunk/reactos/drivers/filesystems/btrfs/fileinfo.c trunk/reactos/drivers/filesystems/btrfs/read.c trunk/reactos/drivers/filesystems/btrfs/write.c Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt [iso-8859-1] Mon May 9 09:10:13 2016 @@ -25,12 +25,6 @@ add_library(btrfs SHARED ${SOURCE} btrfs.rc) -if(NOT MSVC) - replace_compile_flags("-Werror" " ") -else() - replace_compile_flags("/we\"4189\"" " ") -endif() - add_definitions(-D__KERNEL__) set_module_type(btrfs kernelmodedriver) target_link_libraries(btrfs ntoskrnl_vista ${PSEH_LIB}) Modified: trunk/reactos/drivers/filesystems/btrfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/create.c [iso-8859-1] Mon May 9 09:10:13 2016 @@ -15,7 +15,9 @@ * You should have received a copy of the GNU Lesser General Public Licence * along with WinBtrfs. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef __REACTOS__ #include <sys/stat.h> +#endif /* __REACTOS__ */ #include "btrfs_drv.h" extern PDEVICE_OBJECT devobj; Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/fileinfo.c [iso-8859-1] Mon May 9 09:10:13 2016 @@ -2984,6 +2984,7 @@ return Status; } +#ifndef __REACTOS__ static NTSTATUS STDCALL fill_in_file_standard_link_information(FILE_STANDARD_LINK_INFORMATION* fsli, fcb* fcb, file_ref* fileref, LONG* length) { TRACE("FileStandardLinkInformation\n"); @@ -2998,6 +2999,7 @@ return STATUS_SUCCESS; } +#endif /* __REACTOS__ */ typedef struct { UNICODE_STRING name; @@ -3280,6 +3282,7 @@ return Status; } +#ifndef __REACTOS__ static NTSTATUS STDCALL fill_in_hard_link_information(FILE_LINKS_INFORMATION* fli, fcb* fcb, LONG* length) { KEY searchkey; traverse_ptr tp, next_tp; @@ -3465,6 +3468,7 @@ } return Status; } +#endif /* __REACTOS__ */ static NTSTATUS STDCALL query_info(device_extension* Vcb, PFILE_OBJECT FileObject, PIRP Irp) { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); Modified: trunk/reactos/drivers/filesystems/btrfs/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/read.c [iso-8859-1] Mon May 9 09:10:13 2016 @@ -602,7 +602,7 @@ Status = STATUS_SUCCESS; - try { + _SEH2_TRY { if (!FileObject->PrivateCacheMap) { CC_FILE_SIZES ccfs; @@ -635,9 +635,9 @@ } TRACE("CcCopyRead finished\n"); } - } except (EXCEPTION_EXECUTE_HANDLER) { - Status = GetExceptionCode(); - } + } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; if (NT_SUCCESS(Status)) { Status = Irp->IoStatus.Status; Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/write.c [iso-8859-1] Mon May 9 09:10:13 2016 @@ -3086,6 +3086,9 @@ if (t->parent) { LIST_ENTRY* le2; KEY firstitem = {0xcccccccccccccccc,0xcc,0xcccccccccccccccc}; +#ifdef __REACTOS__ + (void)firstitem; +#endif done_deletions = TRUE;

1 0

[akhaldi] 71297: [0.4.1] Merge the SepPropagateAcl() unknown ACE types handling by Thomas in r71296. CORE-10694
by akhaldi＠svn.reactos.org 09 May '16

09 May '16

Author: akhaldi Date: Mon May 9 08:56:51 2016 New Revision: 71297 URL: http://svn.reactos.org/svn/reactos?rev=71297&view=rev Log: [0.4.1] Merge the SepPropagateAcl() unknown ACE types handling by Thomas in r71296. CORE-10694 Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/ntoskrnl/se/acl.c branches/ros-branch-0_4_1/rostests/ (props changed) branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeHelpers.c branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeInheritance.c branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/se.h Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 9 08:56:51 2016 @@ -1 +1 @@ -/trunk:71217,71231,71245,71252,71255 +/trunk:71217,71231,71245,71252,71255,71296 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 9 08:56:51 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71245,71252,71262,71279 +/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296 Modified: branches/ros-branch-0_4_1/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_4_1/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/ntoskrnl/se/acl.c [iso-8859-1] Mon May 9 08:56:51 2016 @@ -462,10 +462,27 @@ AceDest = (PACCESS_ALLOWED_ACE)CurrentDest; AceSource = (PACCESS_ALLOWED_ACE)CurrentSource; + if (AceSource->Header.AceType > ACCESS_MAX_MS_V2_ACE_TYPE) + { + /* FIXME: handle object & compound ACEs */ + AceSize = AceSource->Header.AceSize; + + if (*AclLength >= Written + AceSize) + { + RtlCopyMemory(AceDest, AceSource, AceSize); + } + CurrentDest += AceSize; + CurrentSource += AceSize; + Written += AceSize; + AceCount++; + continue; + } + /* These all have the same structure */ ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || - AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || - AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE); + AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || + AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE || + AceSource->Header.AceType == SYSTEM_ALARM_ACE_TYPE); ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); Propchange: branches/ros-branch-0_4_1/rostests/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 9 08:56:51 2016 @@ -1,3 +1,3 @@ /branches/GSoC_2011/KMTestSuite:51165-53670 /branches/ros-amd64-bringup/rostests:44459,44462,44537 -/trunk/rostests:71232,71236,71278 +/trunk/rostests:71232,71236,71278,71296 Modified: branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeHelpers.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/kmtes… ============================================================================== --- branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeHelpers.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeHelpers.c [iso-8859-1] Mon May 9 08:56:51 2016 @@ -34,6 +34,42 @@ Ace->Header.AceSize = AceSize; Ace->Mask = AccessMask; Status = RtlCopySid(AceSize - FIELD_OFFSET(SYSTEM_AUDIT_ACE, SidStart), + (PSID)&Ace->SidStart, + Sid); + ASSERT(NT_SUCCESS(Status)); + if (NT_SUCCESS(Status)) + { + Status = RtlAddAce(Acl, + Revision, + MAXULONG, + Ace, + AceSize); + } + ExFreePoolWithTag(Ace, 'cAmK'); + return Status; +} + +NTSTATUS +RtlxAddMandatoryLabelAceEx( + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid) +{ + NTSTATUS Status; + USHORT AceSize; + PSYSTEM_MANDATORY_LABEL_ACE Ace; + + AceSize = FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart) + RtlLengthSid(Sid); + Ace = ExAllocatePoolWithTag(PagedPool, AceSize, 'cAmK'); + if (!Ace) + return STATUS_INSUFFICIENT_RESOURCES; + Ace->Header.AceType = SYSTEM_MANDATORY_LABEL_ACE_TYPE; + Ace->Header.AceFlags = Flags; + Ace->Header.AceSize = AceSize; + Ace->Mask = AccessMask; + Status = RtlCopySid(AceSize - FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart), (PSID)&Ace->SidStart, Sid); ASSERT(NT_SUCCESS(Status)); Modified: branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeInheritance.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/kmtes… ============================================================================== --- branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeInheritance.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/SeInheritance.c [iso-8859-1] Mon May 9 08:56:51 2016 @@ -780,6 +780,81 @@ EndTestAssign() } + /* ACE type that Win2003 doesn't know about (> ACCESS_MAX_MS_ACE_TYPE) */ + for (UsingDefault = 0; UsingDefault <= 3; UsingDefault++) + { + Status = RtlCreateAcl(Acl, AclSize, ACL_REVISION); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlxAddMandatoryLabelAceEx(Acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, SeExports->SeWorldSid); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ParentDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 1)); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ExplicitDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 2)); + ok_eq_hex(Status, STATUS_SUCCESS); + + TestAssignExpectDefault(&ParentDescriptor, NULL, FALSE) + TestAssignExpectDefault(&ParentDescriptor, NULL, TRUE) + StartTestAssign(NULL, &ExplicitDescriptor, FALSE, TRUE, TRUE) + ok_eq_uint(DaclDefaulted, FALSE); + CheckAcl(Dacl, 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, STANDARD_RIGHTS_ALL | 0x800F, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, STANDARD_RIGHTS_READ | 0x0005); + ok_eq_uint(SaclDefaulted, FALSE); + CheckAcl(Sacl, 1, SYSTEM_MANDATORY_LABEL_ACE_TYPE, 0, SeExports->SeWorldSid, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP); + ok_eq_uint(OwnerDefaulted, FALSE); + CheckSid(Owner, NO_SIZE, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); + ok_eq_uint(GroupDefaulted, FALSE); + CheckSid(Group, NO_SIZE, Token->PrimaryGroup); + EndTestAssign() + } + + for (UsingDefault = 0; UsingDefault <= 3; UsingDefault++) + { + Status = RtlCreateAcl(Acl, AclSize, ACL_REVISION); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlxAddMandatoryLabelAceEx(Acl, ACL_REVISION, OBJECT_INHERIT_ACE, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, SeExports->SeCreatorOwnerSid); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ParentDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 1)); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ExplicitDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 2)); + ok_eq_hex(Status, STATUS_SUCCESS); + + StartTestAssign(&ParentDescriptor, NULL, FALSE, TRUE, TRUE) + ok_eq_uint(DaclDefaulted, FALSE); + CheckAcl(Dacl, 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, STANDARD_RIGHTS_ALL | 0x800F, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, STANDARD_RIGHTS_READ | 0x0005); + ok_eq_uint(SaclDefaulted, FALSE); + CheckAcl(Sacl, 1, SYSTEM_MANDATORY_LABEL_ACE_TYPE, 0, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP); + ok_eq_uint(OwnerDefaulted, FALSE); + CheckSid(Owner, NO_SIZE, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); + ok_eq_uint(GroupDefaulted, FALSE); + CheckSid(Group, NO_SIZE, Token->PrimaryGroup); + EndTestAssign() + StartTestAssign(NULL, &ExplicitDescriptor, FALSE, TRUE, TRUE) + ok_eq_uint(DaclDefaulted, FALSE); + CheckAcl(Dacl, 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, STANDARD_RIGHTS_ALL | 0x800F, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, STANDARD_RIGHTS_READ | 0x0005); + ok_eq_uint(SaclDefaulted, FALSE); + CheckAcl(Sacl, 1, SYSTEM_MANDATORY_LABEL_ACE_TYPE, OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP); + ok_eq_uint(OwnerDefaulted, FALSE); + CheckSid(Owner, NO_SIZE, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); + ok_eq_uint(GroupDefaulted, FALSE); + CheckSid(Group, NO_SIZE, Token->PrimaryGroup); + EndTestAssign() + } + + /* TODO: Test object/compound ACEs */ /* TODO: Test duplicate ACEs */ /* TODO: Test INHERITED_ACE flag */ /* TODO: Test invalid ACE flags */ Modified: branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/se.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/rostests/kmtes… ============================================================================== --- branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/se.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/rostests/kmtests/ntos_se/se.h [iso-8859-1] Mon May 9 08:56:51 2016 @@ -33,6 +33,14 @@ _In_ BOOLEAN Success, _In_ BOOLEAN Failure); +NTSTATUS +RtlxAddMandatoryLabelAceEx( + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid); + #define NO_SIZE ((ULONG)-1) #define CheckSid(Sid, SidSize, ExpectedSid) CheckSid_(Sid, SidSize, ExpectedSid, __FILE__, __LINE__)

1 0

[tfaber] 71296: [NTOS:SE] - In SepPropagateAcl, gracefully handle unknown ACE types by simply copying them. CORE-10694 #resolve
by tfaber＠svn.reactos.org 09 May '16

09 May '16

Author: tfaber Date: Mon May 9 08:49:18 2016 New Revision: 71296 URL: http://svn.reactos.org/svn/reactos?rev=71296&view=rev Log: [NTOS:SE] - In SepPropagateAcl, gracefully handle unknown ACE types by simply copying them. CORE-10694 #resolve Modified: trunk/reactos/ntoskrnl/se/acl.c trunk/rostests/kmtests/ntos_se/SeHelpers.c trunk/rostests/kmtests/ntos_se/SeInheritance.c trunk/rostests/kmtests/ntos_se/se.h Modified: trunk/reactos/ntoskrnl/se/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/acl.c?rev=7129… ============================================================================== --- trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/acl.c [iso-8859-1] Mon May 9 08:49:18 2016 @@ -462,10 +462,27 @@ AceDest = (PACCESS_ALLOWED_ACE)CurrentDest; AceSource = (PACCESS_ALLOWED_ACE)CurrentSource; + if (AceSource->Header.AceType > ACCESS_MAX_MS_V2_ACE_TYPE) + { + /* FIXME: handle object & compound ACEs */ + AceSize = AceSource->Header.AceSize; + + if (*AclLength >= Written + AceSize) + { + RtlCopyMemory(AceDest, AceSource, AceSize); + } + CurrentDest += AceSize; + CurrentSource += AceSize; + Written += AceSize; + AceCount++; + continue; + } + /* These all have the same structure */ ASSERT(AceSource->Header.AceType == ACCESS_ALLOWED_ACE_TYPE || - AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || - AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE); + AceSource->Header.AceType == ACCESS_DENIED_ACE_TYPE || + AceSource->Header.AceType == SYSTEM_AUDIT_ACE_TYPE || + AceSource->Header.AceType == SYSTEM_ALARM_ACE_TYPE); ASSERT(AceSource->Header.AceSize % sizeof(ULONG) == 0); ASSERT(AceSource->Header.AceSize >= sizeof(*AceSource)); Modified: trunk/rostests/kmtests/ntos_se/SeHelpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/SeHelpers… ============================================================================== --- trunk/rostests/kmtests/ntos_se/SeHelpers.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_se/SeHelpers.c [iso-8859-1] Mon May 9 08:49:18 2016 @@ -34,6 +34,42 @@ Ace->Header.AceSize = AceSize; Ace->Mask = AccessMask; Status = RtlCopySid(AceSize - FIELD_OFFSET(SYSTEM_AUDIT_ACE, SidStart), + (PSID)&Ace->SidStart, + Sid); + ASSERT(NT_SUCCESS(Status)); + if (NT_SUCCESS(Status)) + { + Status = RtlAddAce(Acl, + Revision, + MAXULONG, + Ace, + AceSize); + } + ExFreePoolWithTag(Ace, 'cAmK'); + return Status; +} + +NTSTATUS +RtlxAddMandatoryLabelAceEx( + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid) +{ + NTSTATUS Status; + USHORT AceSize; + PSYSTEM_MANDATORY_LABEL_ACE Ace; + + AceSize = FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart) + RtlLengthSid(Sid); + Ace = ExAllocatePoolWithTag(PagedPool, AceSize, 'cAmK'); + if (!Ace) + return STATUS_INSUFFICIENT_RESOURCES; + Ace->Header.AceType = SYSTEM_MANDATORY_LABEL_ACE_TYPE; + Ace->Header.AceFlags = Flags; + Ace->Header.AceSize = AceSize; + Ace->Mask = AccessMask; + Status = RtlCopySid(AceSize - FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart), (PSID)&Ace->SidStart, Sid); ASSERT(NT_SUCCESS(Status)); Modified: trunk/rostests/kmtests/ntos_se/SeInheritance.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/SeInherit… ============================================================================== --- trunk/rostests/kmtests/ntos_se/SeInheritance.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_se/SeInheritance.c [iso-8859-1] Mon May 9 08:49:18 2016 @@ -780,6 +780,81 @@ EndTestAssign() } + /* ACE type that Win2003 doesn't know about (> ACCESS_MAX_MS_ACE_TYPE) */ + for (UsingDefault = 0; UsingDefault <= 3; UsingDefault++) + { + Status = RtlCreateAcl(Acl, AclSize, ACL_REVISION); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlxAddMandatoryLabelAceEx(Acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, SeExports->SeWorldSid); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ParentDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 1)); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ExplicitDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 2)); + ok_eq_hex(Status, STATUS_SUCCESS); + + TestAssignExpectDefault(&ParentDescriptor, NULL, FALSE) + TestAssignExpectDefault(&ParentDescriptor, NULL, TRUE) + StartTestAssign(NULL, &ExplicitDescriptor, FALSE, TRUE, TRUE) + ok_eq_uint(DaclDefaulted, FALSE); + CheckAcl(Dacl, 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, STANDARD_RIGHTS_ALL | 0x800F, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, STANDARD_RIGHTS_READ | 0x0005); + ok_eq_uint(SaclDefaulted, FALSE); + CheckAcl(Sacl, 1, SYSTEM_MANDATORY_LABEL_ACE_TYPE, 0, SeExports->SeWorldSid, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP); + ok_eq_uint(OwnerDefaulted, FALSE); + CheckSid(Owner, NO_SIZE, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); + ok_eq_uint(GroupDefaulted, FALSE); + CheckSid(Group, NO_SIZE, Token->PrimaryGroup); + EndTestAssign() + } + + for (UsingDefault = 0; UsingDefault <= 3; UsingDefault++) + { + Status = RtlCreateAcl(Acl, AclSize, ACL_REVISION); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlxAddMandatoryLabelAceEx(Acl, ACL_REVISION, OBJECT_INHERIT_ACE, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, SeExports->SeCreatorOwnerSid); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ParentDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 1)); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = RtlSetSaclSecurityDescriptor(&ExplicitDescriptor, + TRUE, + Acl, + BooleanFlagOn(UsingDefault, 2)); + ok_eq_hex(Status, STATUS_SUCCESS); + + StartTestAssign(&ParentDescriptor, NULL, FALSE, TRUE, TRUE) + ok_eq_uint(DaclDefaulted, FALSE); + CheckAcl(Dacl, 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, STANDARD_RIGHTS_ALL | 0x800F, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, STANDARD_RIGHTS_READ | 0x0005); + ok_eq_uint(SaclDefaulted, FALSE); + CheckAcl(Sacl, 1, SYSTEM_MANDATORY_LABEL_ACE_TYPE, 0, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP); + ok_eq_uint(OwnerDefaulted, FALSE); + CheckSid(Owner, NO_SIZE, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); + ok_eq_uint(GroupDefaulted, FALSE); + CheckSid(Group, NO_SIZE, Token->PrimaryGroup); + EndTestAssign() + StartTestAssign(NULL, &ExplicitDescriptor, FALSE, TRUE, TRUE) + ok_eq_uint(DaclDefaulted, FALSE); + CheckAcl(Dacl, 2, ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeLocalSystemSid, STANDARD_RIGHTS_ALL | 0x800F, + ACCESS_ALLOWED_ACE_TYPE, 0, SeExports->SeAliasAdminsSid, STANDARD_RIGHTS_READ | 0x0005); + ok_eq_uint(SaclDefaulted, FALSE); + CheckAcl(Sacl, 1, SYSTEM_MANDATORY_LABEL_ACE_TYPE, OBJECT_INHERIT_ACE, SeExports->SeCreatorOwnerSid, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP); + ok_eq_uint(OwnerDefaulted, FALSE); + CheckSid(Owner, NO_SIZE, Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); + ok_eq_uint(GroupDefaulted, FALSE); + CheckSid(Group, NO_SIZE, Token->PrimaryGroup); + EndTestAssign() + } + + /* TODO: Test object/compound ACEs */ /* TODO: Test duplicate ACEs */ /* TODO: Test INHERITED_ACE flag */ /* TODO: Test invalid ACE flags */ Modified: trunk/rostests/kmtests/ntos_se/se.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/se.h?rev=… ============================================================================== --- trunk/rostests/kmtests/ntos_se/se.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_se/se.h [iso-8859-1] Mon May 9 08:49:18 2016 @@ -33,6 +33,14 @@ _In_ BOOLEAN Success, _In_ BOOLEAN Failure); +NTSTATUS +RtlxAddMandatoryLabelAceEx( + _Inout_ PACL Acl, + _In_ ULONG Revision, + _In_ ULONG Flags, + _In_ ACCESS_MASK AccessMask, + _In_ PSID Sid); + #define NO_SIZE ((ULONG)-1) #define CheckSid(Sid, SidSize, ExpectedSid) CheckSid_(Sid, SidSize, ExpectedSid, __FILE__, __LINE__)

1 0

[tfaber] 71295: [SHELL32] - Fix uninitialized return value in _SHGetDefaultValue. CID 1322231 CORE-11213 #resolve
by tfaber＠svn.reactos.org 09 May '16

09 May '16

Author: tfaber Date: Mon May 9 08:12:00 2016 New Revision: 71295 URL: http://svn.reactos.org/svn/reactos?rev=71295&view=rev Log: [SHELL32] - Fix uninitialized return value in _SHGetDefaultValue. CID 1322231 CORE-11213 #resolve Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] Mon May 9 08:12:00 2016 @@ -1518,6 +1518,7 @@ ; /* no corresponding env. var, do nothing */ } + hr = S_OK; if (CSIDL_Data[folder].szDefaultPath) { if (IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) @@ -1525,7 +1526,6 @@ if (LoadStringW(shell32_hInstance, LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH)) { - hr = S_OK; PathAppendW(pszPath, resourcePath); } else @@ -1537,7 +1537,6 @@ } else { - hr = S_OK; PathAppendW(pszPath, CSIDL_Data[folder].szDefaultPath); } }

1 0

[cwittich] 71294: ZeroMemory expects buffer size in bytes
by cwittich＠svn.reactos.org 09 May '16

09 May '16

Author: cwittich Date: Mon May 9 08:01:49 2016 New Revision: 71294 URL: http://svn.reactos.org/svn/reactos?rev=71294&view=rev Log: ZeroMemory expects buffer size in bytes Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Mon May 9 08:01:49 2016 @@ -150,7 +150,7 @@ TCHAR szStatusText[128]; TCHAR szTempText[64]; - ZeroMemory(szStatusText, sizeof(szStatusText) / sizeof(TCHAR)); + ZeroMemory(szStatusText, sizeof(szStatusText)); if (GetScoreMode() != SCORE_NONE) {

1 0

[tfaber] 71293: [WS2_32_NEW] - Use the correct size of ServiceBuffer in getnameinfo. Patch by Víctor Martínez Calvo. CID 716150 CORE-11214 #resolve
by tfaber＠svn.reactos.org 09 May '16

09 May '16

Author: tfaber Date: Mon May 9 07:49:58 2016 New Revision: 71293 URL: http://svn.reactos.org/svn/reactos?rev=71293&view=rev Log: [WS2_32_NEW] - Use the correct size of ServiceBuffer in getnameinfo. Patch by Víctor Martínez Calvo. CID 716150 CORE-11214 #resolve Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Mon May 9 07:49:58 2016 @@ -937,7 +937,7 @@ { /* Setup the data for it */ ServiceString = ServiceBuffer; - ServLength = sizeof(ServiceBuffer) - 1; + ServLength = sizeof(ServiceBuffer) / sizeof(WCHAR); } /* Now call the unicode function */

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