Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 70802: [ROSTESTS] Handle generated tests on all architectures. Update i386 files. The kernel32 generated remains disabled, Wine's definition of COMMCONFIG differs from our/MSDN definit...
by spetreolle＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: spetreolle Date: Sun Feb 28 20:56:00 2016 New Revision: 70802 URL: http://svn.reactos.org/svn/reactos?rev=70802&view=rev Log: [ROSTESTS] Handle generated tests on all architectures. Update i386 files. The kernel32 generated remains disabled, Wine's definition of COMMCONFIG differs from our/MSDN definition. Commented out nonexisting LPEXCEPTION_RECORD. Added: trunk/rostests/winetests/gdi32/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/gdi32/generated.c trunk/rostests/winetests/kernel32/generated_i386.c - copied, changed from r70795, trunk/rostests/winetests/kernel32/generated.c trunk/rostests/winetests/ntdll/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/ntdll/generated.c trunk/rostests/winetests/rpcrt4/generated_i386.c - copied, changed from r70795, trunk/rostests/winetests/rpcrt4/generated.c trunk/rostests/winetests/shell32/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/shell32/generated.c trunk/rostests/winetests/shlwapi/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/shlwapi/generated.c trunk/rostests/winetests/urlmon/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/urlmon/generated.c trunk/rostests/winetests/user32/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/user32/generated.c trunk/rostests/winetests/wininet/generated_i386.c - copied unchanged from r70795, trunk/rostests/winetests/wininet/generated.c Removed: trunk/rostests/winetests/gdi32/generated.c trunk/rostests/winetests/kernel32/generated.c trunk/rostests/winetests/ntdll/generated.c trunk/rostests/winetests/rpcrt4/generated.c trunk/rostests/winetests/shell32/generated.c trunk/rostests/winetests/shlwapi/generated.c trunk/rostests/winetests/urlmon/generated.c trunk/rostests/winetests/user32/generated.c trunk/rostests/winetests/wininet/generated.c Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shlwapi/CMakeLists.txt trunk/rostests/winetests/urlmon/CMakeLists.txt trunk/rostests/winetests/user32/CMakeLists.txt trunk/rostests/winetests/user32/testlist.c trunk/rostests/winetests/wininet/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… Removed: trunk/rostests/winetests/gdi32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/generated… Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… Removed: trunk/rostests/winetests/kernel32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/genera… Copied: trunk/rostests/winetests/kernel32/generated_i386.c (from r70795, trunk/rostests/winetests/kernel32/generated.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/genera… Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… Removed: trunk/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated… Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… Removed: trunk/rostests/winetests/rpcrt4/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/generate… Copied: trunk/rostests/winetests/rpcrt4/generated_i386.c (from r70795, trunk/rostests/winetests/rpcrt4/generated.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/generate… Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… Removed: trunk/rostests/winetests/shell32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/generat… Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLi… Removed: trunk/rostests/winetests/shlwapi/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/generat… Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeLis… Removed: trunk/rostests/winetests/urlmon/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/generate… Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… Removed: trunk/rostests/winetests/user32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/generate… Modified: trunk/rostests/winetests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/testlist… Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… Removed: trunk/rostests/winetests/wininet/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/generat…

1 0

[ekohl] 70801: [DESK] Brazilian Portuguese translation for desk.cpl. Patch by Edison Henrique Andreassy. CORE-10905 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: ekohl Date: Sun Feb 28 20:48:31 2016 New Revision: 70801 URL: http://svn.reactos.org/svn/reactos?rev=70801&view=rev Log: [DESK] Brazilian Portuguese translation for desk.cpl. Patch by Edison Henrique Andreassy. CORE-10905 #resolve #comment Thanks a lot! Added: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc (with props) Modified: trunk/reactos/dll/cpl/desk/desk.rc Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.rc [iso-8859-1] Sun Feb 28 20:48:31 2016 @@ -71,6 +71,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif Added: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pt-BR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pt-BR.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/pt-BR.rc [iso-8859-1] Sun Feb 28 20:48:31 2016 @@ -0,0 +1,258 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_BACKGROUND DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ãrea de trabalho" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "&Plano de fundo:", IDC_STATIC, 8, 103, 230, 9 + PUSHBUTTON "Proc&urar...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 + PUSHBUTTON "&Cor...", IDC_COLOR_BUTTON, 188, 177, 55, 15 + LTEXT "Po&siÃ§Ã£o:", IDC_STATIC, 188, 138, 55, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ProteÃ§Ã£o de tela" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "ProteÃ§Ã£o de &tela", IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&ConfiguraÃ§Ãµes", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Visualizar", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "Ag&uardar:", IDC_WAITTEXT, 14, 125, 30, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 46, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 + LTEXT "minutos", IDC_MINTEXT, 80, 125, 26, 9 + CONTROL "Ao continuar, &proteger com senha", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 122, 19 + GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Para ajustar a energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 14, 166, 146, 27 + PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 +END + +IDD_APPEARANCE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "AparÃªncia" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Janelas e botÃµes:", IDC_STATIC, 7, 130, 104, 9 + COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Esquema de &cores:", IDC_STATIC, 7, 160, 104, 9 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "&Tamanho da fonte:", IDC_STATIC, 7, 190, 104, 9 + COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Efeitos...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Ava&nÃ§ada...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "AparÃªncia avanÃ§ada" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Item:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + LTEXT "Taman&ho", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | + UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + LTEXT "C&or 1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "Cor &2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "&Fonte:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "&Tamanho:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + LTEXT "&Cor:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + PUSHBUTTON "Cancelar", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Efeitos" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Usar este efeito de transiÃ§Ã£o para menus e dicas de ferramenta:", + IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&sar este mÃ©todo para suavizar as bordas das fontes de tela:", IDC_EFFAPPEARANCE_SMOOTHING, + "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Usar Ãco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 + CONTROL "Mostr&ar sombras sob menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, + "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 267, 19 + CONTROL "&Mostrar conteÃºdo da janela ao arrastar", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 + CONTROL "&Ocultar sublinhados para navegaÃ§Ã£o do teclado atÃ© eu pressionar a tecla Alt", + IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + +IDD_SETTINGS DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ConfiguraÃ§Ãµes" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Arraste os Ãcones de monitor para que corresponda Ã disposiÃ§Ã£o fÃsica de seus monitores.", -1, 3, 3, 240, 20 + CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | + WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE + LTEXT "VÃdeo:", 1820, 3, 107, 70, 9 + LTEXT "<nenhum>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 + GROUPBOX "&ResoluÃ§Ã£o da tela", 1818, 3, 127, 115, 43 + CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 + LTEXT "Menos", 1815, 9, 137, 25, 9, NOT WS_GROUP + LTEXT "Mais", 1816, 93, 137, 20, 9, NOT WS_GROUP + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER + GROUPBOX "Qualidade da &cor", 1817, 125, 127, 115, 43 + COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 + PUSHBUTTON "Ava&nÃ§adas...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 14 +END + +IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "VÃdeo", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "ConfiguraÃ§Ã£o de &ppp:", -1, 14, 20, 222, 9 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibilidade", -1, 7, 67, 237, 97 + LTEXT "Alguns programas podem nÃ£o funcionar corretamente se vocÃª nÃ£o reiniciar o computador apÃ³s alterar as configuraÃ§Ãµes de vÃdeo.\n\nApÃ³s alterar as configuraÃ§Ãµes de vÃdeo:", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Reiniciar computador antes de aplicar novas configuraÃ§Ãµes de vÃdeo", IDC_RESTART_RB, 14, 116, 228, 10 + AUTORADIOBUTTON "&Aplicar as novas configuraÃ§Ãµes de vÃdeo sem reiniciar o computador", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + AUTORADIOBUTTON "Perg&untar antes de aplicar novas configuraÃ§Ãµes de vÃdeo", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Desabilitado", ID_MENU_DISABLED + MENUITEM "Selecionado", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Conectado", ID_MENU_ATTACHED + MENUITEM "&PrimÃ¡rio", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identificar", ID_MENU_IDENTIFY + MENUITEM "P&ropriedades", ID_MENU_PROPERTIES + END +END + +STRINGTABLE +BEGIN + IDS_SLIDEEFFECT "Rolagem" + IDS_FADEEFFECT "Esmaecimento" +END + +STRINGTABLE +BEGIN + IDS_STANDARDEFFECT "PadrÃ£o" + IDS_CLEARTYPEEFFECT "ClearType" +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiplos monitores)" + IDS_UNKNOWNMONITOR "(Monitor desconhecido)" + IDS_ADVANCEDTITLEFMT "%s e %s" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "VÃdeo" + IDS_CPLDESCRIPTION "Altera a aparÃªncia da Ã¡rea de trabalho, como plano de fundo, proteÃ§Ã£o de tela, cores, tamanhos de fonte e resoluÃ§Ã£o de tela." + IDS_NONE "(Nenhum)" + IDS_CENTER "Centralizar" + IDS_STRETCH "Estender" + IDS_TILE "Lado a lado" +END + +STRINGTABLE +BEGIN + IDS_COLOR_4BIT "16 cores" + IDS_COLOR_8BIT "256 cores" + IDS_COLOR_16BIT "MÃ©dia (16 bits)" + IDS_COLOR_24BIT "Alta (24 bits)" + IDS_COLOR_32BIT "MÃ¡xima (32 bits)" + IDS_PIXEL "%lu por %lu pixels" +END + +STRINGTABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Imagens" +END + +STRINGTABLE +BEGIN + IDS_INACTWIN "Janela inativa" + IDS_ACTWIN "Janela ativa" + IDS_WINTEXT "Texto da janela" + IDS_MESSBOX "Caixa de mensagem" + IDS_MESSTEXT "Texto da mensagem" + IDS_BUTTEXT "OK" + IDS_CLASSIC_THEME "Tema clÃ¡ssico" +END + +STRINGTABLE +BEGIN + IDS_ELEMENT_1 "Ãrea de trabalho" + IDS_ELEMENT_2 "Barra de tÃtulo inativa" + IDS_ELEMENT_3 "Borda de janela inativa" + IDS_ELEMENT_4 "Barra de tÃtulo ativa" + IDS_ELEMENT_5 "Borda de janela ativa" + IDS_ELEMENT_6 "Menu" + IDS_ELEMENT_7 "Itens selecionados" + IDS_ELEMENT_8 "Janela" + IDS_ELEMENT_9 "Barra de rolagem" + IDS_ELEMENT_10 "Objetos 3D" + IDS_ELEMENT_11 "TÃtulo da paleta" + IDS_ELEMENT_12 "RÃ³tulo do Ãcone" + IDS_ELEMENT_13 "Barra de tÃtulo" + IDS_ELEMENT_14 "Item de menu desativado" + IDS_ELEMENT_15 "Caixa de mensagem" + IDS_ELEMENT_16 "Controle da barra de rolagem" + IDS_ELEMENT_17 "Fundo da aplicaÃ§Ã£o" + IDS_ELEMENT_18 "Barra de tÃtulo pequena" + IDS_ELEMENT_19 "EspaÃ§amento de Ãcone (horizontal)" + IDS_ELEMENT_20 "EspaÃ§amento de Ãcone (vertical)" + IDS_ELEMENT_21 "Dica de ferramenta" + IDS_ELEMENT_22 "Ãcone" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_SETTINGS "ConfiguraÃ§Ãµes de vÃdeo" + IDS_APPLY_FAILED "Falha ao aplicar as novas configuraÃ§Ãµes..." + IDS_APPLY_NEEDS_RESTART "Ã necessÃ¡rio reiniciar o computador para aplicar as mudanÃ§as." +END Propchange: trunk/reactos/dll/cpl/desk/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 70800: Brazilian Portuguese translation for hdwwiz.cpl. Patch by Edison Henrique Andreassy. CORE-10901 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: ekohl Date: Sun Feb 28 20:44:26 2016 New Revision: 70800 URL: http://svn.reactos.org/svn/reactos?rev=70800&view=rev Log: Brazilian Portuguese translation for hdwwiz.cpl. Patch by Edison Henrique Andreassy. CORE-10901 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc Modified: trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/pt-BR.rc [iso-8859-1] Sun Feb 28 20:44:26 2016 @@ -2,21 +2,21 @@ IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Bem-vindo ao 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Este assistente o ajuda a:", -1, 114, 40, 182, 8 + LTEXT "1) Instalar software para dar suporte ao hardware adicionado ao computador.", -1, 121, 56, 184, 16 + LTEXT "2) Solucionar problemas que possam estar ocorrendo no hardware.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Se houver um CD de instalaÃ§Ã£o para o item de hardware, clique em 'Cancelar' para fechar este assistente e use o CD do fabricante para instalar o hardware.", 503, 150, 106, 155, 50 + LTEXT "Para continuar, clique em 'AvanÃ§ar'.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -25,63 +25,63 @@ IDD_ISCONNECTEDPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "VocÃª jÃ¡ conectou este hardware ao computador?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Sim, eu jÃ¡ conectei o hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "NÃ£o, eu nÃ£o adicionei o &hardware ainda", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "Na lista abaixo, selecione um dispositivo de hardware instalado e clique em 'AvanÃ§ar' para verificar as propriedades ou solucionar problemas.", -1, 21, 8, 275, 22 + LTEXT "Para adicionar itens de hardware que nÃ£o estejam na lista, clique em 'Adicionar novo dispositivo de hardware'.", -1, 21, 32, 275, 24 + LTEXT "&Hardware instalado:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "O assistente pode procurar outros itens de hardware e instalÃ¡-los automaticamente, ou, se vocÃª souber exatamente o modelo de hardware que deseja instalar, poderÃ¡ selecionÃ¡-lo na lista.", -1, 21, 8, 280, 24 + LTEXT "O que vocÃª deseja que o assistente faÃ§a?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Procurar e instalar automaticamente o hardware (recomendÃ¡vel)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Instalar o hardware que eu selecionar manualmente em uma lista (avanÃ§ado)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Hardware detectado:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "Se vocÃª nÃ£o estiver vendo a categoria de hardware que deseja, clique em 'Mostrar todos os dispositivos'.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Tipos comuns de &hardware:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "O processo de detecÃ§Ã£o de hardware pode levar alguns minutos.", -1, 21, 8, 275, 15 + LTEXT "Progresso geral:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -89,59 +89,59 @@ IDD_FINISHPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Concluindo o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "O 'Assistente para adicionar hardware' foi completado com sucesso.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Para fechar o assistente, clique em 'Concluir'.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Concluindo o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "O assistente encontrou o seguinte hardware conectado ao seu computador:", -1, 114, 32, 193, 19 + LTEXT "Para fechar o assistente, clique em 'Concluir'.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "Concluindo o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Este Ã© o status atual do hardware selecionado:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Para comeÃ§ar a solucionar os problemas que possam estar ocorrendo, clique em 'Concluir'.", -1, 114, 136, 193, 16 + LTEXT "Para fechar o assistente, clique em 'Cancelar'.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "NÃ£o Ã© possÃvel continuar o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Para continuar, conecte este item de hardware ao computador.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Desligar o computador quando eu clicar em 'Concluir' para que eu possa abrir o computador e conectar o hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "Na maioria dos casos, o ReactOS irÃ¡ instalar automaticamente o hardware depois que vocÃª o conectar. Se o hardware nÃ£o for encontrado, vocÃª poderÃ¡ abrir novamente o assistente para instalar o software de suporte.", -1, 114, 98, 193, 32 + LTEXT "Para fechar o assistente, clique em 'Concluir'.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Adicionar hardware" IDS_CPLDESCRIPTION "Adiciona hardware ao seu computador." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" - IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" + IDS_SEARCHTITLE "Aguarde enquanto o assistente faz uma pesquisa..." + IDS_SEARCHTEXT "O assistente estÃ¡ procurando itens de hardware conectados ao computador que ainda nÃ£o tenham sido instalados." + IDS_ISCONNECTED "O hardware estÃ¡ conectado?" + IDS_PROBELISTTITLE "O hardware a seguir jÃ¡ estÃ¡ instalado no computador" + IDS_ADDNEWDEVICE "Adicionar novo dispositivo de hardware" + IDS_SELECTWAYTITLE "Este assistente pode ajudÃ¡-lo a instalar outro hardware" + IDS_HDTYPESTITLE "Na lista abaixo, seleciona o tipo de hardware que vocÃª estÃ¡ instalando" END

1 0

[ekohl] 70799: [INPUT] Prevent removal of all languages from the language list by disabling the 'Remove' button when only one item remains. Enable the 'Remove' button when there is more than one it...
by ekohl＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: ekohl Date: Sun Feb 28 17:01:35 2016 New Revision: 70799 URL: http://svn.reactos.org/svn/reactos?rev=70799&view=rev Log: [INPUT] Prevent removal of all languages from the language list by disabling the 'Remove' button when only one item remains. Enable the 'Remove' button when there is more than one item in the list. CORE-3587 #resolve Modified: trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Sun Feb 28 17:01:35 2016 @@ -743,8 +743,13 @@ hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 0, 1); InitLangList(hwndDlg, hImgList); (VOID) ListView_SetImageList(GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST), hImgList, LVSIL_SMALL); + + /* Disable the Remove button if there is only one layout in the layout list */ + if (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST)) <= 1) + EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVE_BUTTON), FALSE); } break; + case WM_NOTIFY: { switch (LOWORD(wParam)) @@ -753,11 +758,16 @@ } } break; + case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_REMOVE_BUTTON: DeleteLayout(); + + /* Disable the Remove button if there is only one layout in the layout list */ + if (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST)) <= 1) + EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVE_BUTTON), FALSE); break; case IDC_KEY_SET_BTN: @@ -772,6 +782,10 @@ MAKEINTRESOURCE(IDD_ADD), hwndDlg, AddDlgProc); + + /* Enable the Remove button if there is more than one layout in the layout list */ + if (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST)) > 1) + EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVE_BUTTON), TRUE); break; case IDC_PROP_BUTTON: @@ -788,6 +802,7 @@ break; } break; + case WM_DESTROY: break; }

1 0

[hbelusca] 70798: [USETUP]: Isolate the recognition of the filesystem of a partition into its own function.
by hbelusca＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: hbelusca Date: Sun Feb 28 16:01:54 2016 New Revision: 70798 URL: http://svn.reactos.org/svn/reactos?rev=70798&view=rev Log: [USETUP]: Isolate the recognition of the filesystem of a partition into its own function. Modified: trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/fslist.h trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Sun Feb 28 16:01:54 2016 @@ -66,6 +66,93 @@ } +PFILE_SYSTEM_ITEM +GetFileSystemByName( + IN PFILE_SYSTEM_LIST List, + IN LPWSTR FileSystemName) +{ + PLIST_ENTRY ListEntry; + PFILE_SYSTEM_ITEM Item; + + ListEntry = List->ListHead.Flink; + while (ListEntry != &List->ListHead) + { + Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); + if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) + return Item; + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + + +PFILE_SYSTEM_ITEM +GetFileSystem( + IN PFILE_SYSTEM_LIST FileSystemList, + IN PPARTENTRY PartEntry) +{ + PFILE_SYSTEM_ITEM CurrentFileSystem; + LPWSTR FileSystemName = NULL; + + CurrentFileSystem = PartEntry->FileSystem; + + /* We have a file system, return it */ + if (CurrentFileSystem != NULL && CurrentFileSystem->FileSystemName != NULL) + return CurrentFileSystem; + + CurrentFileSystem = NULL; + + /* + * We don't have one... + * + * Try to infer a preferred file system for this partition, given its ID. + * + * WARNING: This is partly a hack, since partitions with the same ID can + * be formatted with different file systems: for example, usual Linux + * partitions that are formatted in EXT2/3/4, ReiserFS, etc... have the + * same partition ID 0x83. + * + * The proper fix is to make a function that detects the existing FS + * from a given partition (not based on the partition ID). + * On the contrary, for unformatted partitions with a given ID, the + * following code is OK. + */ + if ((PartEntry->PartitionType == PARTITION_FAT_12) || + (PartEntry->PartitionType == PARTITION_FAT_16) || + (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_XINT13) || + (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + { + FileSystemName = L"FAT"; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { + // WARNING: See the warning above. + FileSystemName = L"EXT2"; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { + // WARNING: See the warning above. + FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ + } + + // WARNING: We cannot write on this FS yet! + if (PartEntry->PartitionType == PARTITION_EXT2 || PartEntry->PartitionType == PARTITION_IFS) + DPRINT1("Recognized FileSystem %S that doesn't support write support yet!\n", FileSystemName); + + DPRINT1("GetFileSystem -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", + PartEntry->PartitionType, FileSystemName); + + if (FileSystemName != NULL) + CurrentFileSystem = GetFileSystemByName(FileSystemList, FileSystemName); + + return CurrentFileSystem; +} + + PFILE_SYSTEM_LIST CreateFileSystemList( IN SHORT Left, @@ -210,26 +297,4 @@ } } - -PFILE_SYSTEM_ITEM -GetFileSystemByName( - IN PFILE_SYSTEM_LIST List, - IN LPWSTR FileSystemName) -{ - PLIST_ENTRY ListEntry; - PFILE_SYSTEM_ITEM Item; - - ListEntry = List->ListHead.Flink; - while (ListEntry != &List->ListHead) - { - Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) - return Item; - - ListEntry = ListEntry->Flink; - } - - return NULL; -} - /* EOF */ Modified: trunk/reactos/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Sun Feb 28 16:01:54 2016 @@ -52,6 +52,16 @@ IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc); +PFILE_SYSTEM_ITEM +GetFileSystemByName( + IN PFILE_SYSTEM_LIST List, + IN LPWSTR FileSystemName); + +PFILE_SYSTEM_ITEM +GetFileSystem( + IN PFILE_SYSTEM_LIST FileSystemList, + IN PPARTENTRY PartEntry); + PFILE_SYSTEM_LIST CreateFileSystemList( IN SHORT Left, @@ -75,9 +85,4 @@ ScrollUpFileSystemList( IN PFILE_SYSTEM_LIST List); -PFILE_SYSTEM_ITEM -GetFileSystemByName( - IN PFILE_SYSTEM_LIST List, - IN LPWSTR FileSystemName); - /* EOF */ Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Feb 28 16:01:54 2016 @@ -2786,8 +2786,7 @@ { if (UnattendFormatPartition) { - PartEntry->FileSystem = GetFileSystemByName(FileSystemList, - L"FAT"); + PartEntry->FileSystem = GetFileSystemByName(FileSystemList, L"FAT"); return FORMAT_PARTITION_PAGE; } @@ -3076,7 +3075,6 @@ UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; - LPWSTR FileSystemName = NULL; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; NTSTATUS Status; @@ -3087,9 +3085,7 @@ return QUIT_PAGE; } - if (!GetNextUncheckedPartition(PartitionList, - &DiskEntry, - &PartEntry)) + if (!GetNextUncheckedPartition(PartitionList, &DiskEntry, &PartEntry)) { return INSTALL_DIRECTORY_PAGE; } @@ -3106,50 +3102,7 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - CurrentFileSystem = PartEntry->FileSystem; - if (CurrentFileSystem == NULL || CurrentFileSystem->FileSystemName == NULL) - { - /* - * Try to infer a preferred file system for this partition, given its ID. - * - * WARNING: This is partly a hack, since partitions with the same ID can - * be formatted with different file systems: for example, usual Linux - * partitions that are formatted in EXT2/3/4, ReiserFS, etc... have the - * same partition ID 0x83. - * - * The proper fix is to make a function that detects the existing FS - * from a given partition (not based on the partition ID). - * On the contrary, for unformatted partitions with a given ID, the - * following code is OK. - */ - if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { - FileSystemName = L"FAT"; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { - // WARNING: See the warning above. - FileSystemName = L"EXT2"; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { - // WARNING: See the warning above. - FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ - } - - DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystemName (guessed): %S\n", - PartEntry->PartitionType, FileSystemName); - - if (FileSystemName != NULL) - CurrentFileSystem = GetFileSystemByName(FileSystemList, - FileSystemName); - } - + CurrentFileSystem = GetFileSystem(FileSystemList, PartEntry); DPRINT1("CheckFileSystemPage -- PartitionType: 0x%02X ; FileSystemName: %S\n", PartEntry->PartitionType, (CurrentFileSystem ? CurrentFileSystem->FileSystemName : L"n/a"));

1 0

[hbelusca] 70797: [USETUP] - Remove some unused structure members. - Consistently use the vocable "system partition" and "boot partition" (using MS aka. hardware-oriented definition) according to: ...
by hbelusca＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: hbelusca Date: Sun Feb 28 15:25:22 2016 New Revision: 70797 URL: http://svn.reactos.org/svn/reactos?rev=70797&view=rev Log: [USETUP] - Remove some unused structure members. - Consistently use the vocable "system partition" and "boot partition" (using MS aka. hardware-oriented definition) according to: https://en.wikipedia.org/wiki/System_partition_and_boot_partition http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/boot-and-system-vo… in few words: "system partition": the one that will be started by the platform firmware, and where the bootloader is found (only one per computer); "boot partition": the one where the OS of your choice resides (any number). Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sun Feb 28 15:25:22 2016 @@ -1270,9 +1270,9 @@ } /* Copy partition table from old MBR to new */ - RtlCopyMemory (&NewBootSector->Signature, - &OrigBootSector->Signature, - sizeof(PARTITION_SECTOR) - offsetof(PARTITION_SECTOR, Signature) /* Length of partition table */); + RtlCopyMemory(&NewBootSector->Signature, + &OrigBootSector->Signature, + sizeof(PARTITION_SECTOR) - offsetof(PARTITION_SECTOR, Signature) /* Length of partition table */); /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -2262,7 +2262,7 @@ /* FAT or FAT32 partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the boot partition */ + /* Copy FreeLoader to the system partition */ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\freeldr.sys"); wcscpy(DstPath, SystemRootPath->Buffer); @@ -2520,7 +2520,7 @@ /* EXT2 partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); - /* Copy FreeLoader to the boot partition */ + /* Copy FreeLoader to the system partition */ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\freeldr.sys"); wcscpy(DstPath, SystemRootPath->Buffer); Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Feb 28 15:25:22 2016 @@ -66,15 +66,27 @@ static UNICODE_STRING InstallPath; -/* Path to the install directory */ +/* + * Path to the system partition, where the boot manager resides. + * On x86 PCs, this is usually the active partition. + * On ARC, (u)EFI, ... platforms, this is a dedicated partition. + * + * For more information, see: + * https://en.wikipedia.org/wiki/System_partition_and_boot_partition + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/boot-and-system-vo… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/arc-boot-process.h… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/efi-boot-process.h… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-system… + * http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-boot-v… + */ +static UNICODE_STRING SystemRootPath; + +/* Path to the install directory inside the ReactOS boot partition */ static UNICODE_STRING DestinationPath; static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath; static WCHAR DestinationDriveLetter; - -/* Path to the active partition (boot manager) */ -static UNICODE_STRING SystemRootPath; static HINF SetupInf; @@ -2525,7 +2537,7 @@ * * SIDEEFFECTS * Sets PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType (via UpdatePartitionType) - * Calls CheckActiveBootPartition() + * Calls CheckActiveSystemPartition() * * RETURNS * Number of the next page. @@ -2551,11 +2563,11 @@ return QUIT_PAGE; } - /* Find or set the active partition */ - CheckActiveBootPartition(PartitionList); - - if (PartitionList->BootDisk == NULL || - PartitionList->BootPartition == NULL) + /* Find or set the active system partition */ + CheckActiveSystemPartition(PartitionList); + + if (PartitionList->SystemDisk == NULL || + PartitionList->SystemPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; @@ -2564,10 +2576,10 @@ switch (PartitionList->FormatState) { case Start: - if (PartitionList->CurrentPartition != PartitionList->BootPartition) - { - PartitionList->TempDisk = PartitionList->BootDisk; - PartitionList->TempPartition = PartitionList->BootPartition; + if (PartitionList->CurrentPartition != PartitionList->SystemPartition) + { + PartitionList->TempDisk = PartitionList->SystemDisk; + PartitionList->TempPartition = PartitionList->SystemPartition; PartitionList->TempPartition->NeedsCheck = TRUE; PartitionList->FormatState = FormatSystemPartition; @@ -3224,8 +3236,7 @@ /* Create 'InstallPath' string */ RtlFreeUnicodeString(&InstallPath); - RtlCreateUnicodeString(&InstallPath, - InstallDir); + RtlCreateUnicodeString(&InstallPath, InstallDir); /* Create 'DestinationRootPath' string */ RtlFreeUnicodeString(&DestinationRootPath); @@ -4174,13 +4185,12 @@ RtlFreeUnicodeString(&SystemRootPath); swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->BootDisk->DiskNumber, - PartitionList->BootPartition->PartitionNumber); - RtlCreateUnicodeString(&SystemRootPath, - PathBuffer); + PartitionList->SystemDisk->DiskNumber, + PartitionList->SystemPartition->PartitionNumber); + RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); - PartitionType = PartitionList->BootPartition->PartitionType; + PartitionType = PartitionList->SystemPartition->PartitionType; if (IsUnattendedSetup) { @@ -4196,7 +4206,7 @@ if (PartitionType == PARTITION_ENTRY_UNUSED) { - DPRINT("Error: active partition invalid (unused)\n"); + DPRINT("Error: system partition invalid (unused)\n"); InstallOnFloppy = TRUE; } else if (PartitionType == PARTITION_OS2BOOTMGR) @@ -4207,8 +4217,8 @@ } else if (PartitionType == PARTITION_EXT2) { - /* Linux ext2 partition */ - DPRINT("Found Linux ext2 partition\n"); + /* Linux EXT2 partition */ + DPRINT("Found Linux EXT2 partition\n"); InstallOnFloppy = FALSE; } else if (PartitionType == PARTITION_IFS) @@ -4393,7 +4403,7 @@ UCHAR PartitionType; NTSTATUS Status; - PartitionType = PartitionList->BootPartition->PartitionType; + PartitionType = PartitionList->SystemPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, @@ -4432,7 +4442,7 @@ WCHAR SourceMbrPathBuffer[MAX_PATH]; /* Step 1: Write the VBR */ - PartitionType = PartitionList->BootPartition->PartitionType; + PartitionType = PartitionList->SystemPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, @@ -4447,7 +4457,7 @@ /* Step 2: Write the MBR */ swprintf(DestinationDevicePathBuffer, L"\\Device\\Harddisk%d\\Partition0", - PartitionList->BootDisk->DiskNumber); + PartitionList->SystemDisk->DiskNumber); wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Feb 28 15:25:22 2016 @@ -1434,14 +1434,11 @@ List->Line = 0; List->Offset = 0; - List->TopDisk = (ULONG)-1; - List->TopPartition = (ULONG)-1; - List->CurrentDisk = NULL; List->CurrentPartition = NULL; - List->BootDisk = NULL; - List->BootPartition = NULL; + List->SystemDisk = NULL; + List->SystemPartition = NULL; List->TempDisk = NULL; List->TempPartition = NULL; @@ -1495,9 +1492,6 @@ UpdateDiskSignatures(List); AssignDriveLetters(List); - - List->TopDisk = 0; - List->TopPartition = 0; /* Search for first usable disk and partition */ if (IsListEmpty(&List->DiskListHead)) @@ -3130,7 +3124,7 @@ VOID -CheckActiveBootPartition( +CheckActiveSystemPartition( PPARTLIST List) { PDISKENTRY DiskEntry; @@ -3138,18 +3132,18 @@ PLIST_ENTRY ListEntry; /* Check for empty disk list */ - if (IsListEmpty (&List->DiskListHead)) - { - List->BootDisk = NULL; - List->BootPartition = NULL; + if (IsListEmpty(&List->DiskListHead)) + { + List->SystemDisk = NULL; + List->SystemPartition = NULL; return; } #if 0 - if (List->BootDisk != NULL && - List->BootPartition != NULL) - { - /* We already have an active boot partition */ + if (List->SystemDisk != NULL && + List->SystemPartition != NULL) + { + /* We already have an active system partition */ return; } #endif @@ -3158,18 +3152,23 @@ DiskEntry = List->CurrentDisk; /* Check for empty partition list */ - if (IsListEmpty (&DiskEntry->PrimaryPartListHead)) - { - List->BootDisk = NULL; - List->BootPartition = NULL; + if (IsListEmpty(&DiskEntry->PrimaryPartListHead)) + { + List->SystemDisk = NULL; + List->SystemPartition = NULL; return; } + + /* + * Check the first partition of the disk in case it is fresh new, + * and if so, use it as the system partition. + */ PartEntry = CONTAINING_RECORD(DiskEntry->PrimaryPartListHead.Flink, PARTENTRY, ListEntry); - /* Set active boot partition */ + /* Set active system partition */ if ((DiskEntry->NewDisk == TRUE) || (PartEntry->BootIndicator == FALSE)) { @@ -3179,15 +3178,15 @@ DiskEntry->Dirty = TRUE; /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->BootDisk = DiskEntry; - List->BootPartition = PartEntry; + List->SystemDisk = DiskEntry; + List->SystemPartition = PartEntry; return; } /* Disk is not new, scan all partitions to find a bootable one */ - List->BootDisk = NULL; - List->BootPartition = NULL; + List->SystemDisk = NULL; + List->SystemPartition = NULL; ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) @@ -3203,8 +3202,8 @@ PartEntry->BootIndicator) { /* Yes, we found it */ - List->BootDisk = DiskEntry; - List->BootPartition = PartEntry; + List->SystemDisk = DiskEntry; + List->SystemPartition = PartEntry; DPRINT("Found bootable partition disk %d, drive letter %c\n", DiskEntry->DiskNumber, PartEntry->DriveLetter); Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Feb 28 15:25:22 2016 @@ -71,10 +71,10 @@ /* Partition is partitioned disk space */ BOOLEAN IsPartitioned; - /* Partition is new. Table does not exist on disk yet */ + /* Partition is new, table does not exist on disk yet */ BOOLEAN New; - /* Partition was created automatically. */ + /* Partition was created automatically */ BOOLEAN AutoCreate; FORMATSTATE FormatState; @@ -149,14 +149,12 @@ SHORT Line; SHORT Offset; - ULONG TopDisk; - ULONG TopPartition; - PDISKENTRY CurrentDisk; PPARTENTRY CurrentPartition; - PDISKENTRY BootDisk; - PPARTENTRY BootPartition; + /* The system disk and partition where the boot manager resides */ + PDISKENTRY SystemDisk; + PPARTENTRY SystemPartition; PDISKENTRY TempDisk; PPARTENTRY TempPartition; @@ -259,7 +257,7 @@ PPARTLIST List); VOID -CheckActiveBootPartition( +CheckActiveSystemPartition( PPARTLIST List); BOOLEAN

1 0

[pschweitzer] 70796: [FS_REC] --MagicValues;
by pschweitzer＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: pschweitzer Date: Sun Feb 28 11:27:05 2016 New Revision: 70796 URL: http://svn.reactos.org/svn/reactos?rev=70796&view=rev Log: [FS_REC] --MagicValues; Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c trunk/reactos/drivers/filesystems/fs_rec/ext2.h Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Sun Feb 28 11:27:05 2016 @@ -53,10 +53,10 @@ if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) { /* Try to read the superblock */ - Offset.QuadPart = 0x400; + Offset.QuadPart = EXT2_SB_OFFSET; if (FsRecReadBlock(MountDevice, &Offset, - 0x400, + EXT2_SB_SIZE, SectorSize, (PVOID)&Spb, &DeviceError)) Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.h [iso-8859-1] Sun Feb 28 11:27:05 2016 @@ -44,3 +44,5 @@ C_ASSERT(FIELD_OFFSET(EXT2_SUPER_BLOCK, DefResUid) == 0x50); #define EXT2_SUPER_MAGIC 0xEF53 +#define EXT2_SB_OFFSET 0x400 +#define EXT2_SB_SIZE 0x400

1 0

[hbelusca] 70795: [USETUP]: Fix some translations (especially the french one).
by hbelusca＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: hbelusca Date: Sun Feb 28 02:51:47 2016 New Revision: 70795 URL: http://svn.reactos.org/svn/reactos?rev=70795&view=rev Log: [USETUP]: Fix some translations (especially the french one). Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/da-DK.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -835,7 +835,7 @@ } }; -static MUI_ENTRY bgBGConfirmDeletePartitionEntries[] = +static MUI_ENTRY bgBGConfirmDeleteSystemPartitionEntries[] = { { 4, @@ -846,13 +846,13 @@ { 6, 8, - "You asked Setup to delete the system partition.", + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1660,7 +1660,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - bgBGConfirmDeletePartitionEntries + bgBGConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -825,24 +825,24 @@ } }; -static MUI_ENTRY bnBDConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY bnBDConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1647,7 +1647,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - bnBDConfirmDeletePartitionEntries + bnBDConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -833,24 +833,24 @@ } }; -static MUI_ENTRY csCZConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " Instalace ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY csCZConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " Instalace ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1655,7 +1655,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - csCZConfirmDeletePartitionEntries + csCZConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -843,7 +843,7 @@ } }; -static MUI_ENTRY daDKConfirmDeletePartitionEntries[] = +static MUI_ENTRY daDKConfirmDeleteSystemPartitionEntries[] = { { 4, @@ -1667,7 +1667,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - daDKConfirmDeletePartitionEntries + daDKConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -820,24 +820,24 @@ } }; -static MUI_ENTRY deDEConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY deDEConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1651,7 +1651,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - deDEConfirmDeletePartitionEntries + deDEConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -838,24 +838,24 @@ } }; -static MUI_ENTRY elGRConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY elGRConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1664,7 +1664,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - elGRConfirmDeletePartitionEntries + elGRConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -824,24 +824,24 @@ } }; -static MUI_ENTRY enUSConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY enUSConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1647,7 +1647,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - enUSConfirmDeletePartitionEntries + enUSConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -835,7 +835,7 @@ } }; -static MUI_ENTRY esESConfirmDeletePartitionEntries[] = +static MUI_ENTRY esESConfirmDeleteSystemPartitionEntries[] = { { 4, @@ -1657,7 +1657,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - esESConfirmDeletePartitionEntries + esESConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -826,24 +826,24 @@ } }; -static MUI_ENTRY etEEConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " paigaldamine ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY etEEConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " paigaldamine ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1645,7 +1645,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - etEEConfirmDeletePartitionEntries + etEEConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -815,7 +815,7 @@ { 8, 19, - "\x07 Press L to create a logical partition.", + "\x07 Appuyer sur L pour crer une partition logique.", TEXT_STYLE_NORMAL }, { @@ -838,90 +838,102 @@ } }; -static MUI_ENTRY frFRConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " Installation de ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", - TEXT_STYLE_NORMAL - }, - { - 6, - 10, - "System partitions can contain diagnose programs, hardware configuration", +static MUI_ENTRY frFRConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " Installation de ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Vous avez choisi de supprimer la partition systme.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "La partition systme peut contenir des programmes de diagnostic, de", TEXT_STYLE_NORMAL }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + "configuration du matriel, des programmes pour dmarrer un systme", TEXT_STYLE_NORMAL }, { 6, 12, - "programs provided by the hardware manufacturer.", - TEXT_STYLE_NORMAL - }, - { - 6, - 14, - "Delete a system partition only when you are sure that there are no such", + "d'exploitation (comme ReactOS) ou d'autres programmes fournis par le", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "constructeur du matriel.", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partiton, or when you are sure you want to delete them.", + "Ne supprimez la partition systme que si vous tes sr qu'il n'y a aucun", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "programme dans la partition, ou bien si vous souhaitez les supprimer.", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, - "\x07 Press ENTER to delete the system partition. You will be asked", - TEXT_STYLE_NORMAL - }, - { - 8, - 21, - " to confirm the deletion of the partition again later.", - TEXT_STYLE_NORMAL - }, - { - 8, - 24, - "\x07 Press ESC to return to the previous page. The partition will", - TEXT_STYLE_NORMAL - }, - { - 8, - 25, - " not be deleted.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER=Continue ESC=Cancel", + "Lorsque vous supprimez la partition systme, vous ne pourrez peut-tre", + TEXT_STYLE_NORMAL + }, + { + 6, + 18, + "plus dmarrer votre ordinateur depuis le disque dur jusqu' ce que vous", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "finissiez l'installation de ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 8, + 22, + "\x07 Appuyer sur ENTRE pour supprimer la partition systme. Il vous sera", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + " demand de confirmer la suppression de la partition plus tard.", + TEXT_STYLE_NORMAL + }, + { + 8, + 26, + "\x07 Appuyer sur CHAP pour retourner la page principale. La partition", + TEXT_STYLE_NORMAL + }, + { + 8, + 27, + " ne sera pas supprime.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTRE = Continuer CHAP = Annuler", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1660,7 +1672,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - frFRConfirmDeletePartitionEntries + frFRConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, @@ -1727,7 +1739,7 @@ {STRING_INSTALLCREATEPARTITION, " ENTRE = Installer P/E = Crer Partition Primaire/tendue F3 = Quitter"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTRE = Installer L = Crer Partition Logique F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTRE = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_DELETEPARTITION, @@ -1739,7 +1751,7 @@ {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Vous avez choisi de crer une partition tendue sur"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "You have chosen to create a logical partition on"}, + "Vous avez choisi de crer une partition logique sur"}, {STRING_HDDSIZE, "Veuillez entrer la taille de la nouvelle partition en mgaoctets."}, {STRING_CREATEPARTITION, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -826,7 +826,7 @@ } }; -static MUI_ENTRY heILConfirmDeletePartitionEntries[] = +static MUI_ENTRY heILConfirmDeleteSystemPartitionEntries[] = { { 4, @@ -837,13 +837,13 @@ { 6, 8, - "You asked Setup to delete the system partition.", + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1648,7 +1648,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - heILConfirmDeletePartitionEntries + heILConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -833,24 +833,24 @@ } }; -static MUI_ENTRY itITConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " Installazione di ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY itITConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " Installazione di ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1655,7 +1655,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - itITConfirmDeletePartitionEntries + itITConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -827,24 +827,24 @@ } }; -static MUI_ENTRY jaJPConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY jaJPConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1649,7 +1649,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - jaJPConfirmDeletePartitionEntries + jaJPConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -835,24 +835,24 @@ } }; -static MUI_ENTRY ltLTConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " diegimo programa ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY ltLTConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " diegimo programa ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1657,7 +1657,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - ltLTConfirmDeletePartitionEntries + ltLTConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -855,24 +855,24 @@ } }; -static MUI_ENTRY nlNLConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", - TEXT_STYLE_NORMAL - }, - { - 6, - 10, - "System partitions can contain diagnose programs, hardware configuration", +static MUI_ENTRY nlNLConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1687,7 +1687,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - nlNLConfirmDeletePartitionEntries + nlNLConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -836,24 +836,24 @@ } }; -static MUI_ENTRY plPLConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " Instalator ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY plPLConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " Instalator ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1658,7 +1658,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - plPLConfirmDeletePartitionEntries + plPLConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -845,24 +845,24 @@ } }; -static MUI_ENTRY ptBRConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " InstalaÆo do ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY ptBRConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " InstalaÆo do ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1685,7 +1685,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - ptBRConfirmDeletePartitionEntries + ptBRConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -881,7 +881,7 @@ } }; -static MUI_ENTRY roROConfirmDeletePartitionEntries[] = +static MUI_ENTRY roROConfirmDeleteSystemPartitionEntries[] = { { 4, @@ -1718,7 +1718,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - roROConfirmDeletePartitionEntries + roROConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -826,24 +826,24 @@ } }; -static MUI_ENTRY ruRUConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY ruRUConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " áâ ®¢ª ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1648,7 +1648,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - ruRUConfirmDeletePartitionEntries + ruRUConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -834,24 +834,24 @@ } }; -static MUI_ENTRY skSKConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY skSKConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " Inçtal tor systmu ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1659,7 +1659,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - skSKConfirmDeletePartitionEntries + skSKConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -830,24 +830,24 @@ } }; -static MUI_ENTRY sqALConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " Instalimi i ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY sqALConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " Instalimi i ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1652,7 +1652,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - sqALConfirmDeletePartitionEntries + sqALConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -833,24 +833,24 @@ } }; -static MUI_ENTRY svSEConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY svSEConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1655,7 +1655,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - svSEConfirmDeletePartitionEntries + svSEConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -818,7 +818,7 @@ } }; -static MUI_ENTRY trTRConfirmDeletePartitionEntries[] = +static MUI_ENTRY trTRConfirmDeleteSystemPartitionEntries[] = { { 4, @@ -1628,7 +1628,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - trTRConfirmDeletePartitionEntries + trTRConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Feb 28 02:51:47 2016 @@ -832,24 +832,24 @@ } }; -static MUI_ENTRY ukUAConfirmDeletePartitionEntries[] = -{ - { - 4, - 3, - " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You asked Setup to delete the system partition.", +static MUI_ENTRY ukUAConfirmDeleteSystemPartitionEntries[] = +{ + { + 4, + 3, + " áâ ®¢«¥ï ReactOS " KERNEL_VERSION_STR " ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the system partition.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnose programs, hardware configuration", + "System partitions can contain diagnostic programs, hardware configuration", TEXT_STYLE_NORMAL }, { @@ -1655,7 +1655,7 @@ }, { CONFIRM_DELETE_SYSTEM_PARTITION_PAGE, - ukUAConfirmDeletePartitionEntries + ukUAConfirmDeleteSystemPartitionEntries }, { SELECT_FILE_SYSTEM_PAGE,

1 0

[pschweitzer] 70794: [SHELL32] Thanks to r70793, this hack is no longer needed. CORE-10878 CORE-10032
by pschweitzer＠svn.reactos.org 27 Feb '16

27 Feb '16

Author: pschweitzer Date: Sat Feb 27 21:01:11 2016 New Revision: 70794 URL: http://svn.reactos.org/svn/reactos?rev=70794&view=rev Log: [SHELL32] Thanks to r70793, this hack is no longer needed. CORE-10878 CORE-10032 Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Sat Feb 27 21:01:11 2016 @@ -138,11 +138,6 @@ if ((lpCur->dwUsage & RESOURCEUSAGE_CONTAINER) == RESOURCEUSAGE_CONTAINER) { TRACE("Found provider: %S\n", lpCur->lpProvider); - /* Sounds like a WTF hack.... Is Wine doing correct? */ - if (!wcscmp(lpCur->lpRemoteName, lpCur->lpProvider)) - { - lpCur->lpRemoteName = NULL; - } EnumerateRec(lpCur); } else

1 0

[pschweitzer] 70793: [MPR] Fix enumeration of network places root directory when starting the enumeration from network providers enumeration CORE-10878 #resolve #comment Fixed with r70793
by pschweitzer＠svn.reactos.org 27 Feb '16

27 Feb '16

Author: pschweitzer Date: Sat Feb 27 20:58:32 2016 New Revision: 70793 URL: http://svn.reactos.org/svn/reactos?rev=70793&view=rev Log: [MPR] Fix enumeration of network places root directory when starting the enumeration from network providers enumeration CORE-10878 #resolve #comment Fixed with r70793 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Sat Feb 27 20:58:32 2016 @@ -49,6 +49,28 @@ =================================================================== --- wnet.c (rÃ©vision 70645) +++ wnet.c (copie de travail) +@@ -750,7 +750,12 @@ + providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) + { + HANDLE handle; ++ PVOID RemoteName = lpNet->lpRemoteName; + ++ if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && ++ RemoteName && !strcmpW(RemoteName, lpNet->lpProvider)) ++ lpNet->lpRemoteName = NULL; ++ + ret = providerTable->table[index].openEnum( + dwScope, dwType, dwUsage, lpNet, &handle); + if (ret == WN_SUCCESS) +@@ -760,6 +765,8 @@ + ret = *lphEnum ? WN_SUCCESS : + WN_OUT_OF_MEMORY; + } ++ ++ lpNet->lpRemoteName = RemoteName; + } + else + ret = WN_NOT_SUPPORTED; @@ -1553,6 +1553,33 @@ dwFlags, NULL, 0, NULL); } Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Sat Feb 27 20:58:32 2016 @@ -750,6 +750,11 @@ providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) { HANDLE handle; + PVOID RemoteName = lpNet->lpRemoteName; + + if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && + RemoteName && !strcmpW(RemoteName, lpNet->lpProvider)) + lpNet->lpRemoteName = NULL; ret = providerTable->table[index].openEnum( dwScope, dwType, dwUsage, lpNet, &handle); @@ -760,6 +765,8 @@ ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } + + lpNet->lpRemoteName = RemoteName; } else ret = WN_NOT_SUPPORTED;

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