Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SDK] As sole author of the file, relicense it as LPGL
by Pierre Schweitzer 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2faee11672366e9b028a3… commit 2faee11672366e9b028a382e24cc55fa267b7356 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 16 19:54:44 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 16 19:54:44 2019 +0200 [SDK] As sole author of the file, relicense it as LPGL It allows third party developers (such as Mark Harmstone :-)) to use it --- sdk/lib/drivers/ntoskrnl_vista/fsrtl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c b/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c index 8b714af57aa..8072ee00135 100644 --- a/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c +++ b/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Kernel - Vista+ APIs - * LICENSE: GPL v2 - See COPYING in the top level directory + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * FILE: lib/drivers/ntoskrnl_vista/fsrtl.c * PURPOSE: FsRtl functions of Vista+ * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org>

1 0

[reactos] 01/01: [USBOHCI_NEW] Fix unused variable
by Victor Perevertkin 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90b86467907e3f899abe5… commit 90b86467907e3f899abe595f5263158698b7b47c Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Fri Aug 16 20:37:11 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Aug 16 20:37:11 2019 +0300 [USBOHCI_NEW] Fix unused variable --- drivers/usb/usbohci_new/usbohci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index 39986e47070..e7aa0bcb5d8 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -1666,7 +1666,7 @@ OHCI_ProcessDoneIsoTD(IN POHCI_EXTENSION OhciExtension, * @param[in] ohciExtension The ohci extension * @param[in] ohciEndpoint The ohci endpoint * @param[in] ohciTransfer The ohci transfer - * @param[out] CompletedLength + * @param[out] CompletedLength */ VOID NTAPI @@ -1679,7 +1679,6 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, POHCI_ENDPOINT OhciEndpoint = ohciEndpoint; POHCI_TRANSFER OhciTransfer = ohciTransfer; POHCI_HCD_ED ED = OhciEndpoint->HcdED; - ULONG_PTR NextTdPA; POHCI_HCD_TD TD, NextTD, LastTD; ULONG ix; BOOLEAN IsIsoEndpoint;

1 0

[reactos] 04/05: [DESKMON] Update Portuguese Translation
by Jose Carlos Jesus 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23cac567400aa54d39019… commit 23cac567400aa54d39019bc0a17b45e35bcd1859 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Aug 6 00:20:18 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 19:32:23 2019 +0200 [DESKMON] Update Portuguese Translation --- dll/shellext/deskmon/lang/pt-PT.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/deskmon/lang/pt-PT.rc b/dll/shellext/deskmon/lang/pt-PT.rc index 6e046a926df..9386f13bdd8 100644 --- a/dll/shellext/deskmon/lang/pt-PT.rc +++ b/dll/shellext/deskmon/lang/pt-PT.rc @@ -10,8 +10,8 @@ BEGIN LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Propriedades", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED - GROUPBOX "Definições do monitor", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 - LTEXT "&Frequencia de actualização do ecrã:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + GROUPBOX "Definições do monitor", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 70 + LTEXT "&Frequência de actualização do ecrã:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT AUTOCHECKBOX "&Ocultar modos que este monitor não possa apresentar", IDC_PRUNINGCHECK, 13, 106, 225, 10 END

1 0

[reactos] 03/05: [DESK] New Portuguese translation
by Jose Carlos Jesus 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c12b06fb8e5c81bb2fded… commit c12b06fb8e5c81bb2fded8edbed63c9aabf18e6a Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Aug 6 00:14:11 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 19:32:23 2019 +0200 [DESK] New Portuguese translation --- dll/cpl/desk/desk.rc | 6 +- dll/cpl/desk/lang/pt-BR.rc | 2 +- dll/cpl/desk/lang/{pt-BR.rc => pt-PT.rc} | 156 ++++++++++++++++--------------- 3 files changed, 87 insertions(+), 77 deletions(-) diff --git a/dll/cpl/desk/desk.rc b/dll/cpl/desk/desk.rc index b202b6b4d18..08301b0fee7 100644 --- a/dll/cpl/desk/desk.rc +++ b/dll/cpl/desk/desk.rc @@ -80,6 +80,9 @@ IDB_SPECTRUM_16 BITMAP "resources/spectrum_16.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif @@ -106,4 +109,5 @@ IDB_SPECTRUM_16 BITMAP "resources/spectrum_16.bmp" #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif + diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-BR.rc index 4aa6d50a9fe..c8f72aa8653 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION diff --git a/dll/cpl/desk/lang/pt-BR.rc b/dll/cpl/desk/lang/pt-PT.rc similarity index 60% copy from dll/cpl/desk/lang/pt-BR.rc copy to dll/cpl/desk/lang/pt-PT.rc index 4aa6d50a9fe..954e306fe68 100644 --- a/dll/cpl/desk/lang/pt-BR.rc +++ b/dll/cpl/desk/lang/pt-PT.rc @@ -1,8 +1,13 @@ +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 05-08-2019 zecarlos1957(a)hotmail.com + */ + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX 0, 0, 246, 210 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Área de trabalho" +CAPTION "Ambiente de trabalho" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 74, 0 @@ -17,29 +22,29 @@ END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Proteção de tela" +CAPTION "Protecção de ecrã" 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 + GROUPBOX "Protecção de &ecrã", IDC_SCREENS_DUMMY, 8, 92, 230, 75 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Configurações", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP - PUSHBUTTON "&Visualizar", IDC_SCREENS_TESTSC, 175, 102, 50, 15 + PUSHBUTTON "&Definições", IDC_SCREENS_SETTINGS, 120, 102, 50, 15, WS_GROUP + PUSHBUTTON "&Pré-visualizar", IDC_SCREENS_TESTSC, 175, 102, 50, 15 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, 8, 150, 230, 41 - LTEXT "Para ajustar a energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 16, 161, 146, 27 - PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 165, 61, 15 + CONTROL "Ao reiniciar, &proteger por palavra-passe", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 30, 145, 200, 19 + GROUPBOX "Energia do monitor", IDC_SCREENS_DUMMY2, 8, 175, 230, 41 + LTEXT "Para ajustar as definições de energia do monitor e poupar energia, clique em 'Energia'.", IDC_STATIC, 16, 185, 146, 27 + PUSHBUTTON "&Energia...", IDC_SCREENS_POWER_BUTTON, 167, 190, 61, 15 END IDD_APPEARANCE DIALOGEX 0, 0, 246, 212 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Aparência" +CAPTION "Aspecto" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -49,17 +54,17 @@ BEGIN LTEXT "Esquema de &cores:", IDC_STATIC, 7, 157, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 167, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "&Tamanho da fonte:", IDC_STATIC, 7, 184, 104, 9 + LTEXT "&Tamanho do tipo de letra:", IDC_STATIC, 7, 184, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 194, 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 + PUSHBUTTON "Ava&nçadas...", 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" +CAPTION "Aspecto avançado" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -74,7 +79,7 @@ BEGIN 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 + LTEXT "&Tipo de letra:", 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 @@ -87,29 +92,29 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END -IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 +IDD_EFFAPPEARANCE DIALOGEX 0, 0, 300, 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:", + CONTROL "&Utilizar o seguinte efeito de transição para menus e descrições de ferramentas:", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 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, + CONTROL "Utilizar o seguinte método para suavizar as arestas dos tipos de letra do ecrã:", IDC_EFFAPPEARANCE_SMOOTHING, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "Usar íco&nes grandes", IDC_EFFAPPEARANCE_LARGEICONS, "button", + CONTROL "Utilizar í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, + CONTROL "Mostr&ar sombras sob os menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 - CONTROL "&Mostrar conteúdo da janela ao arrastar", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, + CONTROL "&Mostrar o conteúdo das janelas 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", + CONTROL "&Ocultar letras sublinhadas para navegação por teclado até que a tecla Alt seja premida", IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 - CONTROL "Use &flat menus", IDC_EFFAPPEARANCE_FLATMENUS, + CONTROL "Utilizar menus planos", IDC_EFFAPPEARANCE_FLATMENUS, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 140, 267, 19 PUSHBUTTON "Cancelar", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 @@ -117,23 +122,23 @@ END IDD_SETTINGS DIALOGEX 0, 0, 246, 202 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configurações" +CAPTION "Definiçõ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 + LTEXT "Arraste os ícones dos monitores, para que correspondam à disposição física dos 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, 15 + WS_TABSTOP, 3, 23, 250, 82, WS_EX_CLIENTEDGE + LTEXT "Monitor:", 1820, 3, 107, 70, 9 + LTEXT "<Desconhecido>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 + GROUPBOX "&Resolução do ecrã", 1818, 3, 142, 115, 43 + CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 152, 58, 17 + LTEXT "Menos", 1815, 9, 152, 25, 9, NOT WS_GROUP + LTEXT "Mais", 1816, 93, 152, 20, 9, NOT WS_GROUP + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 172, 100, 10, NOT WS_GROUP | SS_CENTER + GROUPBOX "Qualidade da &cor", 1817, 125, 142, 115, 43 + COMBOBOX IDC_SETTINGS_BPP, 131, 152, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 170, 103, 9 + PUSHBUTTON "&Avançadas...", IDC_SETTINGS_ADVANCED, 170, 199, 70, 15 END IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 @@ -141,40 +146,41 @@ 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 + GROUPBOX "Visualização", -1, 7, 6, 237, 105, WS_GROUP + LTEXT "Se a resolução do ecrã tornar os items demasiado pequenos para ver confortavelmente, pode aumentar o valor ppp para compensar. Para alterar apenas o tamanho do tipo de letra, clique em ""Cancelar"" e vá até ao separador ""Aspecto"".", -1, 14, 20, 220, 45 + LTEXT "Definição do valor ppp:", -1, 14, 65, 222, 9 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 75, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 91, 223, 12 + GROUPBOX "Compatibilidade", -1, 7, 115, 237, 100 + LTEXT "Alguns programas podem não funcionar correctamente se não reiniciar o computador após alterar as definições de visualização.\n\nApós alterar as definições de visualização:", -1, 12, 130, 228, 34 + AUTORADIOBUTTON "&Reiniciar o computador antes de aplicar as novas definições", IDC_RESTART_RB, 14, 165, 228, 10 + AUTORADIOBUTTON "&Aplicar as novas definições sem reiniciar", IDC_WITHOUTREBOOT_RB, 14, 180, 228, 10 + AUTORADIOBUTTON "&Perguntar antes de aplicar as novas definições de visualização", IDC_ASKME_RB, 14, 195, 228, 10 END IDD_CONFIRMSETTINGS DIALOGEX 20, 30, 233, 57 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Display Settings" +CAPTION "Definições de visualização" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want to keep these display settings?", IDC_STATIC, 7, 7, 219, 8 + LTEXT "O ambiente de trabalho foi reconfigurado.\nPretende manter estas definições?", IDC_STATIC, 7, 7, 219, 8 LTEXT "", IDC_TIMEOUTTEXT, 7, 20, 219, 8 - PUSHBUTTON "&Yes", IDYES, 121, 36, 50, 14 - DEFPUSHBUTTON "&No", IDNO, 175, 36, 50, 14 + PUSHBUTTON "&Sim", IDYES, 121, 36, 50, 14 + DEFPUSHBUTTON "&Não", IDNO, 175, 36, 50, 14 END IDR_PREVIEW_MENU MENU BEGIN MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Desabilitado", ID_MENU_DISABLED - MENUITEM "Selecionado", ID_MENU_SELECTED + MENUITEM "Seleccionado", ID_MENU_SELECTED END IDM_MONITOR_MENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Conectado", ID_MENU_ATTACHED + MENUITEM "&Ligado", ID_MENU_ATTACHED MENUITEM "&Primário", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identificar", ID_MENU_IDENTIFY @@ -184,8 +190,8 @@ END STRINGTABLE BEGIN - IDS_SLIDEEFFECT "Rolagem" - IDS_FADEEFFECT "Esmaecimento" + IDS_SLIDEEFFECT "Deslocamento" + IDS_FADEEFFECT "Desvanecimento" END STRINGTABLE @@ -203,14 +209,14 @@ 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_CPLNAME "Monitor" + IDS_CPLDESCRIPTION "Altera o aspecto do ambiente de trabalho, como plano de fundo, protecção de ecrã, cores, tamanhos de tipos de letra e resolução de ecrã." IDS_NONE "(Nenhum)" - IDS_CENTER "Centralizar" - IDS_STRETCH "Estender" - IDS_TILE "Lado a lado" - IDS_FIT "Fit" - IDS_FILL "Fill" + IDS_CENTER "Centrar" + IDS_STRETCH "Esticar" + IDS_TILE "Mosaico" + IDS_FIT "Encaixar" + IDS_FILL "Ajustar" END STRINGTABLE @@ -230,8 +236,8 @@ END STRINGTABLE BEGIN - IDS_INACTWIN "Janela inativa" - IDS_ACTWIN "Janela ativa" + IDS_INACTWIN "Janela inactiva" + IDS_ACTWIN "Janela activa" IDS_WINTEXT "Texto da janela" IDS_MESSBOX "Caixa de mensagem" IDS_MESSTEXT "Texto da mensagem" @@ -241,15 +247,15 @@ END STRINGTABLE BEGIN - IDS_ELEMENT_0 "Área de trabalho" - IDS_ELEMENT_1 "Barra de título inativa" - IDS_ELEMENT_2 "Borda de janela inativa" - IDS_ELEMENT_3 "Barra de título ativa" - IDS_ELEMENT_4 "Borda de janela ativa" + IDS_ELEMENT_0 "Ambiente de trabalho" + IDS_ELEMENT_1 "Barra de título inactiva" + IDS_ELEMENT_2 "Borda de janela inactiva" + IDS_ELEMENT_3 "Barra de título activa" + IDS_ELEMENT_4 "Borda de janela activa" IDS_ELEMENT_5 "Menu" - IDS_ELEMENT_6 "Itens selecionados" + IDS_ELEMENT_6 "Itens seleccionados" IDS_ELEMENT_7 "Janela" - IDS_ELEMENT_8 "Barra de rolagem" + IDS_ELEMENT_8 "Barra de deslocamento" IDS_ELEMENT_9 "Objetos 3D" IDS_ELEMENT_10 "Título da paleta" IDS_ELEMENT_11 "Barra de título" @@ -257,15 +263,15 @@ BEGIN IDS_ELEMENT_13 "Fundo da aplicação" IDS_ELEMENT_14 "Espaçamento de ícone (horizontal)" IDS_ELEMENT_15 "Espaçamento de ícone (vertical)" - IDS_ELEMENT_16 "Dica de ferramenta" + IDS_ELEMENT_16 "Descrição de ferramenta" IDS_ELEMENT_17 "Ícone" // IDS_ELEMENT_18 "Item de menu desativado" 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." - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." + IDS_DISPLAY_SETTINGS "Definições de visualização" + IDS_APPLY_FAILED "Falha ao aplicar as novas definições..." + IDS_APPLY_NEEDS_RESTART "É necessário reiniciar o computador para aplicar as alterações." + IDS_TIMEOUTTEXT "Reversão dentro de %d seconds." END

1 0

[reactos] 01/05: [HDWWIZ] New pt_PT_Translation
by Jose Carlos Jesus 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ddbf9a5528e4a84ee758… commit 0ddbf9a5528e4a84ee758894f2c1cc1490271ae4 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Aug 3 17:52:05 2019 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 19:32:16 2019 +0200 [HDWWIZ] New pt_PT_Translation --- dll/cpl/hdwwiz/hdwwiz.rc | 3 ++ dll/cpl/hdwwiz/lang/pt-BR.rc | 2 +- dll/cpl/hdwwiz/lang/{pt-BR.rc => pt-PT.rc} | 66 ++++++++++++++++-------------- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dll/cpl/hdwwiz/hdwwiz.rc b/dll/cpl/hdwwiz/hdwwiz.rc index b7be222d796..110e6cbe934 100644 --- a/dll/cpl/hdwwiz/hdwwiz.rc +++ b/dll/cpl/hdwwiz/hdwwiz.rc @@ -73,6 +73,9 @@ IDB_HEADER BITMAP "resources/header.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/cpl/hdwwiz/lang/pt-BR.rc b/dll/cpl/hdwwiz/lang/pt-BR.rc index 722ea4d9812..5f4249ff893 100644 --- a/dll/cpl/hdwwiz/lang/pt-BR.rc +++ b/dll/cpl/hdwwiz/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dll/cpl/hdwwiz/lang/pt-BR.rc b/dll/cpl/hdwwiz/lang/pt-PT.rc similarity index 62% copy from dll/cpl/hdwwiz/lang/pt-BR.rc copy to dll/cpl/hdwwiz/lang/pt-PT.rc index 722ea4d9812..4509027b13c 100644 --- a/dll/cpl/hdwwiz/lang/pt-BR.rc +++ b/dll/cpl/hdwwiz/lang/pt-PT.rc @@ -1,3 +1,9 @@ + +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 03-08-2019 zecarlos1957(a)hotmail.com + */ + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_STARTPAGE DIALOGEX 0, 0, 317, 186 @@ -6,11 +12,11 @@ CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN 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 "Este assistente auxilia a:", -1, 114, 40, 182, 8 + LTEXT "1) Instalar software de 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 "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 "Se tem um CD de instalação para o novo hardware, clique em 'Cancelar' para fechar este assistente e utilizar o CD do fabricante para instalar este hardware.", 503, 150, 106, 155, 50 LTEXT "Para continuar, clique em 'Avançar'.", -1, 114, 166, 193, 8 END @@ -28,9 +34,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - 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 + LTEXT "Já ligou este hardware ao computador?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Sim, já liguei o hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "Não, ainda não liguei o &hardware", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOGEX 0, 0, 317, 143 @@ -38,7 +44,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - 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 "A partir da lista abaixo, seleccione o dispositivo de hardware instalado, em seguida 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 @@ -49,10 +55,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - 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 + LTEXT "O assistente pode procurar outros itens de hardware e instalá-los automaticamente, ou, se souber exactamente o modelo de hardware que deseja instalar, poderá seleccioná-lo na lista.", -1, 21, 8, 280, 24 + LTEXT "O que deseja que o assistente faça?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Procurar e instalar automaticamente o hardware (recomendado)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Instalar o hardware que eu seleccionar manualmente na lista (avançado)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOGEX 0, 0, 317, 143 @@ -70,7 +76,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - 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 "Se não conseguir ver a categoria de hardware que deseja instalar, 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 @@ -92,10 +98,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - 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 "A concluir o 'Assistente para adicionar hardware'", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "O 'Assistente para adicionar hardware' foi executado com sucesso.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "Para fechar o assistente, clique em 'Concluir'.", -1, 114, 166, 132, 8 + LTEXT "Para fechar o assistente, clique em 'Finalizar'.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOGEX 0, 0, 317, 186 @@ -104,8 +110,8 @@ CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN 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 + LTEXT "O assistente encontrou o seguinte hardware ligado ao computador:", -1, 114, 32, 193, 19 + LTEXT "Para fechar o assistente, clique em 'Finalizar'.", -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 @@ -115,9 +121,9 @@ CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN 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 + LTEXT "Este é o status actual 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 "Para começar a solucionar os problemas que possam estar ocorrendo, clique em 'Concluir'.", -1, 114, 136, 193, 16 + LTEXT "Para começar a solucionar os problemas que possam estar a ocorrer, clique em 'Finalizar'.", -1, 114, 136, 193, 16 LTEXT "Para fechar o assistente, clique em 'Cancelar'.", IDC_STATUSTEXT, 114, 166, 132, 8 END @@ -126,22 +132,22 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Assistente para adicionar hardware" FONT 8, "MS Shell Dlg" BEGIN - 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 + LTEXT "Não é possível continuar com o 'Assistente'", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Para continuar, ligue o novo hardware ao computador.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "&Desligar o computador quando eu clico em 'Finalizar' para que possa abrir o computador e ligar o hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "Na maioria dos casos, o ReactOS instala automaticamente o hardware após o ligar ao computador. Se o ReactOS não o encontrar poderá reabrir este assistente para instalar o software de suporte.", -1, 114, 98, 193, 32 + LTEXT "Para fechar o assistente, clique em 'Finalizar'.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Adicionar hardware" - IDS_CPLDESCRIPTION "Adiciona hardware ao seu computador." - 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_CPLDESCRIPTION "Adiciona hardware ao computador." + IDS_SEARCHTITLE "Aguarde enquanto o assistente faz a pesquisa..." + IDS_SEARCHTEXT "O assistente está a procurar novo hardware ligado ao computador que ainda não tenha sido instalado." + IDS_ISCONNECTED "O hardware está ligado?" + IDS_PROBELISTTITLE "O seguinte hardware 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" + IDS_HDTYPESTITLE "Na lista abaixo, seleccione o tipo de hardware que está a instalar" END

1 0

[reactos] 01/01: [FREELDR] Add PCI BIOS emulation and PCI bus enumeration for Xbox (#1830)
by Stanislav Motylkov 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c08beef1cf6cce3e69696… commit c08beef1cf6cce3e69696f6f1b32f8e04fc6d448 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Aug 16 20:14:10 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 16 19:14:10 2019 +0200 [FREELDR] Add PCI BIOS emulation and PCI bus enumeration for Xbox (#1830) CORE-16216 CORE-16308 --- boot/freeldr/freeldr/arch/i386/hwpci.c | 6 ++++-- boot/freeldr/freeldr/arch/i386/machpc.c | 1 + boot/freeldr/freeldr/arch/i386/machxbox.c | 14 ++++++++++++++ boot/freeldr/freeldr/include/arch/pc/hardware.h | 6 ++++++ boot/freeldr/freeldr/include/arch/pc/machpc.h | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index 8e6062da061..c5aa14a1333 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -24,6 +24,8 @@ DBG_DEFAULT_CHANNEL(HWDETECT); +FIND_PCI_BIOS FindPciBios = NULL; + static PPCI_IRQ_ROUTING_TABLE GetPciIrqRoutingTable(VOID) @@ -75,8 +77,8 @@ GetPciIrqRoutingTable(VOID) } -static BOOLEAN -FindPciBios(PPCI_REGISTRY_INFO BusData) +BOOLEAN +PcFindPciBios(PPCI_REGISTRY_INFO BusData) { REGS RegsIn; REGS RegsOut; diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 0d17add29c6..ede5441dfae 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -1353,6 +1353,7 @@ PcHwDetect(VOID) // TODO: Discover and set the machine type as the Component->Identifier GetHarddiskConfigurationData = PcGetHarddiskConfigurationData; + FindPciBios = PcFindPciBios; /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 139f5719251..4b96228f1cf 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -23,6 +23,18 @@ DBG_DEFAULT_CHANNEL(HWDETECT); +BOOLEAN +XboxFindPciBios(PPCI_REGISTRY_INFO BusData) +{ + /* We emulate PCI BIOS here, there are 2 known working PCI buses on an original Xbox */ + + BusData->NoBuses = 2; + BusData->MajorRevision = 1; + BusData->MinorRevision = 0; + BusData->HardwareMechanism = 1; + return TRUE; +} + VOID XboxGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize) { @@ -175,8 +187,10 @@ XboxHwDetect(VOID) FldrCreateSystemKey(&SystemKey); GetHarddiskConfigurationData = XboxGetHarddiskConfigurationData; + FindPciBios = XboxFindPciBios; /* TODO: Build actual xbox's hardware configuration tree */ + DetectPciBios(SystemKey, &BusNumber); DetectIsaBios(SystemKey, &BusNumber); TRACE("DetectHardware() Done\n"); diff --git a/boot/freeldr/freeldr/include/arch/pc/hardware.h b/boot/freeldr/freeldr/include/arch/pc/hardware.h index 76a9bb5feda..bc6aad11971 100644 --- a/boot/freeldr/freeldr/include/arch/pc/hardware.h +++ b/boot/freeldr/freeldr/include/arch/pc/hardware.h @@ -38,6 +38,12 @@ PCM_PARTIAL_RESOURCE_LIST extern GET_HARDDISK_CONFIG_DATA GetHarddiskConfigurationData; +typedef +BOOLEAN +(*FIND_PCI_BIOS)(PPCI_REGISTRY_INFO BusData); + +extern FIND_PCI_BIOS FindPciBios; + VOID DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, PCONFIGURATION_COMPONENT_DATA BusKey); diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index fb8284fe763..e07eab29a9c 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -49,6 +49,7 @@ VOID PcVideoPrepareForReactOS(VOID); VOID PcPrepareForReactOS(VOID); PFREELDR_MEMORY_DESCRIPTOR PcMemGetMemoryMap(ULONG *MemoryMapSize); +BOOLEAN PcFindPciBios(PPCI_REGISTRY_INFO BusData); BOOLEAN DiskResetController(UCHAR DriveNumber); BOOLEAN DiskGetExtendedDriveParameters(UCHAR DriveNumber, PVOID Buffer, USHORT BufferSize);

1 0

[reactos] 01/01: [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826)
by Oleg Dubinskiy 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f7575909f7730aca9112… commit 5f7575909f7730aca9112e7b736951c9cc6e9fea Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Aug 16 20:11:04 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 16 19:11:04 2019 +0200 [AUDIOSRV][BOOTDATA][INCLUDE][MMSYS] Rename RosAudioSrv to AudioSrv (#1826) Rename RosAudioSrv to AudioSrv in audio service itself and in all system components which are related to this, same as it done in Win2k3. It allows MS DxDiag to detect the system audio service correctly, so it becomes possible to run DirectSound test properly with MS dsound.dll, although it works with some minor errors and only in older VirtualBox versions, ~ up to 5.1.38 (and in other emulators as well). CORE-16307 --- base/services/audiosrv/audiosrv.txt | 14 +++++++------- boot/bootdata/hivesys.inf | 16 ++++++++-------- dll/cpl/mmsys/mmsys.c | 4 ++-- sdk/include/reactos/libs/audiosrv/audiosrv.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/base/services/audiosrv/audiosrv.txt b/base/services/audiosrv/audiosrv.txt index 7d3fa23ef13..37c9d24d24b 100644 --- a/base/services/audiosrv/audiosrv.txt +++ b/base/services/audiosrv/audiosrv.txt @@ -19,18 +19,18 @@ subsequently passes to wdmaud.drv It is not necessary to duplicate the exact structure of this mapped file, since it appears to only be used internally by Windows components. -The ROS Audio Service (RosAudioSrv) is intended to be able to run +The ROS Audio Service (AudioSrv) is intended to be able to run alongside the Windows Audio Service on XP/Vista, so it should be possible to test in a "known working environment" ;) It will create a mutex, to: 1) Allow synchronization when accessing the device list -2) Provide a simple method of identifying if RosAudioSrv is running +2) Provide a simple method of identifying if AudioSrv is running (It might be worth using an event to notify WinMM when things are happening?) -The intention is to make RosAudioSrv receive PnP notifications for +The intention is to make AudioSrv receive PnP notifications for relevant audio devices, and also let AudioSrv in Windows do this. Then it should be possible to create a small application that imitates WinMM's actions :) @@ -54,12 +54,12 @@ Testing the Service =================== The service can be installed on Windows XP (possibly also Vista) like so: -sc create RosAudioSrv <path to audiosrv.exe> -net start RosAudioSrv +sc create AudioSrv <path to audiosrv.exe> +net start AudioSrv ...and can be removed like so: -net stop RosAudioSrv -sc delete RosAudioSrv +net stop AudioSrv +sc delete AudioSrv You can view a list of the currently available devices (device list is identical to the one offered by Windows' own AudioSrv) by running diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 8f65a0ac783..dde3a8e9fd8 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1521,14 +1521,14 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001 ; Audio Service -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE% -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION% -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Group",0x00000000,"Audio" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","DisplayName",0x00000000,%AUDIO_SERVICE% +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Description",0x00000000,%AUDIO_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Group",0x00000000,"Audio" +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ImagePath",0x00020000,"%SystemRoot%\system32\audiosrv.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\AudioSrv","Type",0x00010001,0x00000010 ; Background Intelligent Transfer Service (BITS) HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,%BITS_SERVICE% diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index e2d7c8e5391..7b8ab726446 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -553,10 +553,10 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) return ERROR_DI_DO_DEFAULT; } - hService = OpenService(hSCManager, L"RosAudioSrv", SERVICE_ALL_ACCESS); + hService = OpenService(hSCManager, L"AudioSrv", SERVICE_ALL_ACCESS); if (hService) { - /* Make RosAudioSrv start automatically */ + /* Make AudioSrv start automatically */ ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); StartService(hService, 0, NULL); diff --git a/sdk/include/reactos/libs/audiosrv/audiosrv.h b/sdk/include/reactos/libs/audiosrv/audiosrv.h index 057ce3e4300..016f9cddd54 100644 --- a/sdk/include/reactos/libs/audiosrv/audiosrv.h +++ b/sdk/include/reactos/libs/audiosrv/audiosrv.h @@ -11,8 +11,8 @@ #ifndef AUDIOSRV_H #define AUDIOSRV_H -/* This is currently set to avoid conflicting service names in Windows! */ -#define SERVICE_NAME L"RosAudioSrv" +/* The service name */ +#define SERVICE_NAME L"AudioSrv" /* A named mutex is used for synchronizing access to the device list. If this mutex doesn't exist, it means the audio service isn't running. */

1 0

[reactos] 01/01: [USBOHCI_NEW] Refactor OHCI_AbortTransfer function
by Stanislav Motylkov 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a8fc2b411ad7b9676ed7… commit 2a8fc2b411ad7b9676ed776dd25773289a141dbd Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 28 02:38:10 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Aug 16 19:08:04 2019 +0200 [USBOHCI_NEW] Refactor OHCI_AbortTransfer function - Added SAL annotation - Simplified local variables - Replace counterintuitive `do {} while ()` loops with nice `for` loops - Get rid of goto and its label, it can be simply avoided --- drivers/usb/usbohci_new/usbohci.c | 111 ++++++++++++++------------------------ 1 file changed, 40 insertions(+), 71 deletions(-) diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci_new/usbohci.c index b68cc4081cc..39986e47070 100644 --- a/drivers/usb/usbohci_new/usbohci.c +++ b/drivers/usb/usbohci_new/usbohci.c @@ -1660,6 +1660,14 @@ OHCI_ProcessDoneIsoTD(IN POHCI_EXTENSION OhciExtension, DPRINT1("OHCI_ProcessDoneIsoTD: UNIMPLEMENTED. FIXME\n"); } +/** + * @brief Aborts the transfer descriptor chain in a given endpoint + * + * @param[in] ohciExtension The ohci extension + * @param[in] ohciEndpoint The ohci endpoint + * @param[in] ohciTransfer The ohci transfer + * @param[out] CompletedLength + */ VOID NTAPI OHCI_AbortTransfer(IN PVOID ohciExtension, @@ -1670,32 +1678,19 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, POHCI_EXTENSION OhciExtension = ohciExtension; POHCI_ENDPOINT OhciEndpoint = ohciEndpoint; POHCI_TRANSFER OhciTransfer = ohciTransfer; - POHCI_TRANSFER TmpTransfer; - POHCI_HCD_ED ED; + POHCI_HCD_ED ED = OhciEndpoint->HcdED; ULONG_PTR NextTdPA; - POHCI_HCD_TD NextTD; - POHCI_HCD_TD TD; - POHCI_HCD_TD PrevTD; - POHCI_HCD_TD LastTD; - POHCI_HCD_TD td = NULL; + POHCI_HCD_TD TD, NextTD, LastTD; ULONG ix; - BOOLEAN IsIsoEndpoint = FALSE; + BOOLEAN IsIsoEndpoint; BOOLEAN IsProcessed = FALSE; DPRINT("OHCI_AbortTransfer: ohciEndpoint - %p, ohciTransfer - %p\n", OhciEndpoint, OhciTransfer); - if (OhciEndpoint->EndpointProperties.TransferType == - USBPORT_TRANSFER_TYPE_ISOCHRONOUS) - { - IsIsoEndpoint = TRUE; - } - - ED = OhciEndpoint->HcdED; - NextTdPA = ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_MASK; - - NextTD = RegPacket.UsbPortGetMappedVirtualAddress(NextTdPA, + IsIsoEndpoint = (OhciEndpoint->EndpointProperties.TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS); + NextTD = RegPacket.UsbPortGetMappedVirtualAddress(ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_MASK, OhciExtension, OhciEndpoint); @@ -1703,6 +1698,7 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, { LastTD = OhciTransfer->NextTD; + /* Keeping the carry bit from previous pointer value */ ED->HwED.HeadPointer = LastTD->PhysicalAddress | (ED->HwED.HeadPointer & OHCI_ED_HEAD_POINTER_CARRY); @@ -1712,94 +1708,67 @@ OHCI_AbortTransfer(IN PVOID ohciExtension, { TD = &OhciEndpoint->FirstTD[ix]; - if (TD->OhciTransfer == OhciTransfer) - { - if (IsIsoEndpoint) - OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); - else - OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); - } + if (TD->OhciTransfer != OhciTransfer) + continue; + + if (IsIsoEndpoint) + OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); + else + OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); } *CompletedLength = OhciTransfer->TransferLen; return; } - TD = OhciEndpoint->HcdHeadP; - - if (TD == NextTD) - goto Exit; + if (NextTD == OhciEndpoint->HcdHeadP) + IsProcessed = TRUE; - do + for (TD = OhciEndpoint->HcdHeadP; TD != NextTD; TD = TD->NextTDVa) { - if (TD->OhciTransfer == ohciTransfer) - { - PrevTD = TD; - TD = TD->NextTDVa; - - if (PrevTD == OhciEndpoint->HcdHeadP) - OhciEndpoint->HcdHeadP = TD; + if (TD->OhciTransfer != OhciTransfer) + continue; - if (IsIsoEndpoint) - OHCI_ProcessDoneIsoTD(OhciExtension, PrevTD, FALSE); - else - OHCI_ProcessDoneTD(OhciExtension, PrevTD, FALSE); + if (OhciEndpoint->HcdHeadP == TD) + OhciEndpoint->HcdHeadP = TD->NextTDVa; - IsProcessed = TRUE; - } + if (IsIsoEndpoint) + OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); else - { - TD = TD->NextTDVa; - } + OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); + + IsProcessed = TRUE; } - while (TD != NextTD); if (!IsProcessed) { - TD = OhciEndpoint->HcdHeadP; - - LastTD = TD; - td = NULL; - - while (TD != OhciEndpoint->HcdTailP) + for (TD = OhciEndpoint->HcdHeadP; TD->OhciTransfer != OhciTransfer; TD = TD->NextTDVa) { - if (TD->OhciTransfer == OhciTransfer) + if (TD == OhciEndpoint->HcdTailP) { - td = TD; + TD = NULL; break; } - LastTD = TD; - - TD = TD->NextTDVa; } - TD = td; - - do + for (; TD->OhciTransfer == OhciTransfer; TD = TD->NextTDVa) { if (TD == OhciEndpoint->HcdTailP) break; - PrevTD = TD; - TD = TD->NextTDVa; - if (IsIsoEndpoint) - OHCI_ProcessDoneIsoTD(OhciExtension, PrevTD, FALSE); + OHCI_ProcessDoneIsoTD(OhciExtension, TD, FALSE); else - OHCI_ProcessDoneTD(OhciExtension, PrevTD, FALSE); + OHCI_ProcessDoneTD(OhciExtension, TD, FALSE); } - while (TD->OhciTransfer == OhciTransfer); - TmpTransfer = LastTD->OhciTransfer; - TmpTransfer->NextTD = TD; + LastTD->OhciTransfer->NextTD = TD; LastTD->NextTDVa = TD; LastTD->HwTD.gTD.NextTD = TD->PhysicalAddress; } -Exit: - *CompletedLength = OhciTransfer->TransferLen; if (OhciTransfer->TransferLen)

1 0

[reactos] 01/01: [COMCTL32] Export LoadIconMetric and LoadIconWithScaleDown
by Andrew Boyarshin 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0a8459767965cb948eb29… commit 0a8459767965cb948eb29303ef904002f3049e0a Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> AuthorDate: Sun Nov 25 13:47:11 2018 +0700 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 18:31:07 2019 +0200 [COMCTL32] Export LoadIconMetric and LoadIconWithScaleDown They are already implemented and there is little sense for them to be hidden. Required for ProcessHacker 3.0+. --- dll/win32/comctl32/comctl32.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/comctl32/comctl32.spec b/dll/win32/comctl32/comctl32.spec index b7715531819..99d7ea4599e 100644 --- a/dll/win32/comctl32/comctl32.spec +++ b/dll/win32/comctl32/comctl32.spec @@ -181,3 +181,5 @@ ; Exported in v6 but not v5 @ stdcall DrawShadowText(long wstr long ptr long long long long long) +@ stdcall -version=0x600+ LoadIconWithScaleDown(long wstr long long long) +@ stdcall -version=0x600+ LoadIconMetric(long wstr long long)

1 0

[reactos] 01/01: [HAL] Add Xbox Hardware Abstraction Layer
by Stanislav Motylkov 16 Aug '19

16 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d57e396553423cb21e35… commit 5d57e396553423cb21e35d384e9f4d4f1feb95a5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Aug 12 12:23:25 2019 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Aug 16 18:28:52 2019 +0200 [HAL] Add Xbox Hardware Abstraction Layer - Create xbox.cmake based on legacy.cmake and pic.cmake - Revive Xbox HAL files and add them to the build - Fix boot with Xbox HAL, add missing parts from halinit_up.c - Code style and debug logging improvements in pcibus.c - Allow to choose Xbox HAL in usetup CORE-16216 --- boot/bootdata/txtsetup.sif | 6 ++++++ hal/halx86/CMakeLists.txt | 2 ++ hal/halx86/legacy/bus/pcibus.c | 18 +++++++++--------- hal/halx86/xbox.cmake | 34 ++++++++++++++++++++++++++++++++++ hal/halx86/xbox/halinit_xbox.c | 25 +++++++++++++++++++++++-- 5 files changed, 74 insertions(+), 11 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index e86b59f6a3f..22d0b045a41 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -224,6 +224,7 @@ pci_up = "Standard PC Uniprocessor" ;pci_mp = "Standard PC Multiprocessor" acpi_up = "ACPI PC Uniprocessor" ;acpi_mp = "ACPI PC Multiprocessor" +xbox = "Original Xbox" [Map.Computer] ;<id> = <pnp id string> @@ -231,6 +232,7 @@ pci_up = "PC UP" ;pci_mp = "PC MP" acpi_up = "ACPI UP" ;acpi_mp = "ACPI MP" +xbox = "Xbox" [Files.pci_up] ntoskrnl.exe = 1,,,,,,,2,,,,1,2 @@ -248,6 +250,10 @@ halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 ;ntkrnlmp.exe = 1,,,,,,,2,,,ntoskrnl.exe,1,2 ;halacpi.dll = 1,,,,,,,2,,,hal.dll,1,2 +[Files.xbox] +ntoskrnl.exe = 1,,,,,,,2,,,,1,2 +halxbox.dll = 1,,,,,,,2,,,hal.dll,1,2 + [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<height>,<width>,<bpp> vga = "VGA Display (640x480x4)",,Vga,640,480,4 diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index f4148eb5ec0..7ed08815974 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -55,6 +55,7 @@ if(ARCH STREQUAL "i386") include(legacy.cmake) include(up.cmake) include(pic.cmake) + include(xbox.cmake) add_subdirectory(minihal) # hal @@ -62,6 +63,7 @@ if(ARCH STREQUAL "i386") add_hal(halacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up pic) add_hal(halapic SOURCES acpi/halacpi.rc COMPONENTS generic legacy up apic) add_hal(halaacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi up apic) + add_hal(halxbox SOURCES xbox/halxbox.rc COMPONENTS generic up xbox) #add_hal(halmps SOURCES up/halup.rc COMPONENTS generic legacy smp pic) #add_hal(halmacpi SOURCES acpi/halacpi.rc COMPONENTS generic acpi smp pic) diff --git a/hal/halx86/legacy/bus/pcibus.c b/hal/halx86/legacy/bus/pcibus.c index c06f0bafec5..93ed9cb5ca1 100644 --- a/hal/halx86/legacy/bus/pcibus.c +++ b/hal/halx86/legacy/bus/pcibus.c @@ -368,12 +368,12 @@ HalpGetPCIData(IN PBUS_HANDLER BusHandler, * video card, so it appears to be present on 1:0:0 - 1:31:0. * We hack around these problems by indicating "device not present" for devices * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) { - DPRINT("Blacklisted PCI slot\n"); - if (0 == Offset && sizeof(USHORT) <= Length) + DPRINT("Blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); + if (Offset == 0 && Length >= sizeof(USHORT)) { *(PUSHORT)Buffer = PCI_INVALID_VENDORID; return sizeof(USHORT); @@ -460,11 +460,11 @@ HalpSetPCIData(IN PBUS_HANDLER BusHandler, * video card, so it appears to be present on 1:0:0 - 1:31:0. * We hack around these problems by indicating "device not present" for devices * 0:0:1, 0:0:2, 1:1:0, 1:2:0, 1:3:0, ...., 1:31:0 */ - if ((0 == BusHandler->BusNumber && 0 == Slot.u.bits.DeviceNumber && - (1 == Slot.u.bits.FunctionNumber || 2 == Slot.u.bits.FunctionNumber)) || - (1 == BusHandler->BusNumber && 0 != Slot.u.bits.DeviceNumber)) + if ((BusHandler->BusNumber == 0 && Slot.u.bits.DeviceNumber == 0 && + (Slot.u.bits.FunctionNumber == 1 || Slot.u.bits.FunctionNumber == 2)) || + (BusHandler->BusNumber == 1 && Slot.u.bits.DeviceNumber != 0)) { - DPRINT1("Trying to set data on blacklisted PCI slot\n"); + DPRINT1("Trying to set data on blacklisted PCI slot (%d:%d:%d)\n", BusHandler->BusNumber, Slot.u.bits.DeviceNumber, Slot.u.bits.FunctionNumber); return 0; } #endif diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake new file mode 100644 index 00000000000..d21cb602894 --- /dev/null +++ b/hal/halx86/xbox.cmake @@ -0,0 +1,34 @@ + +list(APPEND HAL_XBOX_ASM_SOURCE + generic/systimer.S + generic/trap.S + up/pic.S) + +list(APPEND HAL_XBOX_SOURCE + legacy/bus/bushndlr.c + legacy/bus/cmosbus.c + legacy/bus/isabus.c + legacy/bus/pcibus.c + ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c + ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c + legacy/bus/sysbus.c + legacy/bussupp.c + legacy/halpnpdd.c + legacy/halpcat.c + generic/profil.c + generic/timer.c + xbox/part_xbox.c + xbox/halinit_xbox.c + up/pic.c) + +add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) +add_object_library(lib_hal_xbox ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) +if(NOT SARCH STREQUAL "xbox") + add_target_compile_definitions(lib_hal_xbox SARCH_XBOX) +endif() +add_dependencies(lib_hal_xbox bugcodes xdk asm) +#add_pch(lib_hal_xbox xbox/halxbox.h) + +if(MSVC) + target_link_libraries(lib_hal_xbox lib_hal_generic) +endif() diff --git a/hal/halx86/xbox/halinit_xbox.c b/hal/halx86/xbox/halinit_xbox.c index a950c988460..9069c5d64a2 100644 --- a/hal/halx86/xbox/halinit_xbox.c +++ b/hal/halx86/xbox/halinit_xbox.c @@ -15,9 +15,11 @@ #define NDEBUG #include <debug.h> +/* GLOBALS ******************************************************************/ + const USHORT HalpBuildType = HAL_BUILD_TYPE; -/* FUNCTIONS ***************************************************************/ +/* FUNCTIONS ****************************************************************/ VOID NTAPI @@ -30,14 +32,33 @@ HalpInitProcessor( } VOID -HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + /* Initialize Xbox-specific disk hacks */ HalpXboxInitPartIo(); } VOID HalpInitPhase1(VOID) { + /* Enable IRQ 0 */ + HalpEnableInterruptHandler(IDT_DEVICE, + 0, + PRIMARY_VECTOR_BASE, + CLOCK2_LEVEL, + HalpClockInterrupt, + Latched); + + /* Enable IRQ 8 */ + HalpEnableInterruptHandler(IDT_DEVICE, + 0, + PRIMARY_VECTOR_BASE + 8, + PROFILE_LEVEL, + HalpProfileInterrupt, + Latched); + + /* Initialize DMA. NT does this in Phase 0 */ + HalpInitDma(); } /* EOF */

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