Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [TRANSLATION] Improve Portuguese (pt-PT) translation (#4522)
by Jose Carlos Jesus 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d432436fedbbe9ed0b966… commit d432436fedbbe9ed0b966069b8e77ac508ebd729 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue May 31 00:04:41 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 31 02:04:41 2022 +0300 [TRANSLATION] Improve Portuguese (pt-PT) translation (#4522) - [REGEDIT] [INTL] [DEVMGR] Improve pt-PT translation - [W32TIME] Add pt-PT translation - [BOOTDATA] Add pt-PT to hivesys.inf --- base/applications/regedit/lang/pt-PT.rc | 146 +++++++++++++++--------------- base/services/w32time/lang/pt-PT.rc | 14 +++ base/services/w32time/w32time.rc | 3 + boot/bootdata/hivesys.inf | 156 ++++++++++++++++++++++++++++++++ dll/cpl/intl/lang/pt-PT.rc | 40 ++++---- dll/win32/devmgr/lang/pt-PT.rc | 38 ++++---- 6 files changed, 285 insertions(+), 112 deletions(-) diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index 4f55cd6ffc9..8b65e6cde89 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -14,7 +14,7 @@ END IDC_REGEDIT MENU BEGIN - POPUP "&Arquivo" + POPUP "&Ficheiro" BEGIN MENUITEM "Sai&r", ID_REGISTRY_EXIT END @@ -28,14 +28,14 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Registo" BEGIN - MENUITEM "&Importar arquivo do Registo...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Exportar arquivo do Registo...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Importar ficheiro de Registo...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Exportar ficheiro de Registo...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "Carregar ramo de registo...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Descarregar ramo de registo...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Ligar Registo da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "&Desligar Registo da rede...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + MENUITEM "&Ligar ao Registo de rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY + MENUITEM "&Desligar do Registo de rede...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primir...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -49,24 +49,24 @@ BEGIN BEGIN MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valor da &cadeia", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "Valor &Expand. String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "Valor &Multi-cadeia", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valor c&adeia expansível", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Permissões...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE - MENUITEM "&Renomear", ID_EDIT_RENAME + MENUITEM "&Mudar o nome", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Copiar nome da chave", ID_EDIT_COPYKEYNAME + MENUITEM "&Copiar nome de chave", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Localizar...\tCtrl+F", ID_EDIT_FIND - MENUITEM "L&ocalizar próxima\tF3", ID_EDIT_FINDNEXT + MENUITEM "L&ocalizar seguinte\tF3", ID_EDIT_FINDNEXT END - POPUP "E&xibir" + POPUP "&Ver" BEGIN MENUITEM "&Barra de status", ID_VIEW_STATUSBAR MENUITEM SEPARATOR @@ -81,9 +81,9 @@ BEGIN END POPUP "Aj&uda" BEGIN - MENUITEM "&Topics da Ajuda", ID_HELP_HELPTOPICS + MENUITEM "&Tópicos da Ajuda", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Sobre o Editor do Registo", ID_HELP_ABOUT + MENUITEM "&Acerca do Editor de Registo", ID_HELP_ABOUT END END @@ -95,7 +95,7 @@ BEGIN MENUITEM "Modificar dados binários", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "&Excluir\tDel", ID_EDIT_DELETE - MENUITEM "&Renomear", ID_EDIT_RENAME + MENUITEM "&Mudar o nome", ID_EDIT_RENAME END POPUP "" BEGIN @@ -103,11 +103,11 @@ BEGIN BEGIN MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "Valor &Texto", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valor da &cadeia", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE - MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "valor &Expand String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "Valor &Multi-cadeia", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valor c&adeia expansível", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" @@ -117,16 +117,16 @@ BEGIN BEGIN MENUITEM "&Chave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE - MENUITEM "Valor &Multi-String", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "Valor &Expand String", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "Valor da &cadeia", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valor &Binário", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valor &Multi-cadeia", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Valor c&adeia expansível", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "&Localizar...", ID_EDIT_FIND MENUITEM SEPARATOR - MENUITEM "&Apagar", ID_TREE_DELETE - MENUITEM "&Renomear", ID_TREE_RENAME + MENUITEM "&Eliminar", ID_TREE_DELETE + MENUITEM "&Mudar o nome", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT MENUITEM "&Permissões...", ID_TREE_PERMISSIONS @@ -139,14 +139,14 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT MENUITEM SEPARATOR - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "Descarregar ramo de registo...", ID_REGISTRY_UNLOADHIVE, GRAYED END POPUP "" BEGIN MENUITEM "C&ortar", ID_HEXEDIT_CUT MENUITEM "&Copiar", ID_HEXEDIT_COPY MENUITEM "&Colar", ID_HEXEDIT_PASTE - MENUITEM "&Apagar", ID_HEXEDIT_DELETE + MENUITEM "&Excluir", ID_HEXEDIT_DELETE MENUITEM SEPARATOR MENUITEM "Seleccionar &Tudo", ID_HEXEDIT_SELECT_ALL END @@ -169,26 +169,26 @@ END IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Multi-String" +CAPTION "Editar Multi-Cadeia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Valor &nome:", IDC_STATIC, 6, 6, 134, 8 + LTEXT "&Nome do valor:", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Valor dados:", IDC_STATIC, 6, 35, 161, 8 + LTEXT "&Dados do valor:", IDC_STATIC, 6, 35, 161, 8 EDITTEXT IDC_VALUE_DATA, 6, 46, 240, 102, ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 142, 154, 50, 14 - PUSHBUTTON "Cancearl", IDCANCEL, 196, 154, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 196, 154, 50, 14 END IDD_EDIT_BIN_DATA DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Binary Value" +CAPTION "Editar valor binário" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Valor &nome:", IDC_STATIC, 6, 6, 134, 8 + LTEXT "&Nome do valor:", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Valor dados:", IDC_STATIC, 6, 35, 161, 8 + LTEXT "&Dados do valor:", IDC_STATIC, 6, 35, 161, 8 CONTROL "", IDC_VALUE_DATA, "HexEdit32", WS_VSCROLL | WS_BORDER | WS_TABSTOP, 6, 46, 240, 102 DEFPUSHBUTTON "OK", IDOK, 142, 154, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 196, 154, 50, 14 @@ -196,12 +196,12 @@ END IDD_EDIT_DWORD DIALOGEX 32, 24, 252, 104 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit DWORD" +CAPTION "Editar valor DWORD" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Valor &nome:", IDC_STATIC, 6, 6, 134, 8 + LTEXT "&Nome do valor:", IDC_STATIC, 6, 6, 134, 8 EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Valor dados:", IDC_STATIC, 6, 35, 161, 8 + LTEXT "&Dados do valor:", IDC_STATIC, 6, 35, 161, 8 EDITTEXT IDC_VALUE_DATA, 6, 46, 116, 12, ES_AUTOHSCROLL GROUPBOX "Base", IDC_STATIC, 130, 35, 116, 39 AUTORADIOBUTTON "&Hexadecimal", IDC_FORMAT_HEX, 141, 46, 60, 10, WS_GROUP @@ -212,7 +212,7 @@ END IDD_EDIT_RESOURCE_LIST DIALOGEX 32, 24, 170, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resource List" +CAPTION "Lista de recursos" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_RESOURCE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | @@ -223,39 +223,39 @@ END IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resources" +CAPTION "Recursos" FONT 8, "MS Shell Dlg" BEGIN LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "Interrupções:", IDC_STATIC, 10, 48, 35, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 - LTEXT "Memory:", IDC_STATIC, 10, 91, 32, 8 + LTEXT "Memoria:", IDC_STATIC, 10, 91, 32, 8 CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31 - LTEXT "Port:", IDC_STATIC, 10, 134, 38, 8 + LTEXT "Portas:", IDC_STATIC, 10, 134, 38, 8 CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31 - LTEXT "Device specific data:", IDC_STATIC, 10, 177, 80, 8 + LTEXT "Dados específicos do dispositivo:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "Usage", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED - LTEXT "Shared", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED - LTEXT "Device exclusive", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED - LTEXT "Driver exclusive", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED - RTEXT "Interface Type:", IDC_STATIC, 144, 220, 58, 8 + GROUPBOX "Utilização", IDC_STATIC, 10, 219, 125, 39 + LTEXT "Indeterminado", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "Partilhado", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED + LTEXT "Exclusivo do dispositivo", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED + LTEXT "Exclusivo do controlador", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED + RTEXT "Tipo de Interface:", IDC_STATIC, 144, 220, 58, 8 LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8 - RTEXT "Bus Nummer:", IDC_STATIC, 151, 230, 51, 8 + RTEXT "Bus número:", IDC_STATIC, 151, 230, 51, 8 LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8 - RTEXT "Version:", IDC_STATIC, 151, 240, 51, 8 + RTEXT "Versão:", IDC_STATIC, 151, 240, 51, 8 LTEXT "", IDC_VERSION, 205, 240, 66, 8 - RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8 + RTEXT "Revisão:", IDC_STATIC, 151, 250, 51, 8 LTEXT "", IDC_REVISION, 205, 250, 66, 8 DEFPUSHBUTTON "OK", IDOK, 92, 263, 40, 14 - PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED + PUSHBUTTON "&Dados...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED END /* String Tables */ @@ -278,7 +278,7 @@ STRINGTABLE BEGIN ID_REGISTRY_MENU "Contém comandos para trabalhar com o Registo inteiro." ID_EDIT_MENU "Contém comandos para edição de valores ou chaves." - ID_VIEW_MENU "Contém comandos para personalização da janela do Registro." + ID_VIEW_MENU "Contém comandos para personalização da janela do Registo." ID_FAVOURITES_MENU "Contém comandos para acessar chaves frequentemente usadas." ID_HELP_MENU "Contém comandos para exibição da ajuda e informações sobre o Editor do Registo." ID_EDIT_NEW_MENU "Contém comandos para criação de novas chaves ou valores" @@ -291,10 +291,10 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Adiciona um novo valor texto." ID_EDIT_NEW_BINARYVALUE "Adiciona um novo valor binário." ID_EDIT_NEW_DWORDVALUE "Adiciona um novo valor DWORD." - ID_REGISTRY_IMPORTREGISTRYFILE "Importa um arquivo texto para o registro." - ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um arquivo texto." - ID_REGISTRY_LOADHIVE "Carrega um arquivo de secção no registo" - ID_REGISTRY_UNLOADHIVE "Descarrega um arquivo de seção no registro" + ID_REGISTRY_IMPORTREGISTRYFILE "Importa um ficheiro de texto para o registo." + ID_REGISTRY_EXPORTREGISTRYFILE "Exporta todo ou parte do registo para um ficheiro de texto." + ID_REGISTRY_LOADHIVE "Carrega um ficheiro de secção no registo" + ID_REGISTRY_UNLOADHIVE "Descarrega um ficheiro de secção no registo" ID_REGISTRY_CONNECTNETWORKREGISTRY "Liga a um registo num computador remoto." ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Desliga um registo de um computador remoto." ID_REGISTRY_PRINT "Imprime todo ou parte do registo." @@ -307,12 +307,12 @@ BEGIN ID_REGISTRY_EXIT "Encerra o Editor do Registo." ID_FAVOURITES_ADDTOFAVOURITES "Adiciona chaves na lista de favoritos." ID_FAVOURITES_REMOVEFAVOURITE "Remove chaves da lista de favoritos." - ID_VIEW_STATUSBAR "Mostra ou oculta a barra de status." + ID_VIEW_STATUSBAR "Mostra ou oculta a barra de estado." ID_VIEW_SPLIT "Altera a posição da divisão entre os painéis." ID_VIEW_REFRESH "Actualiza a janela." ID_EDIT_DELETE "Exclui a seleccão." ID_EDIT_RENAME "Renomeia a seleccão." - ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a Área de transferência." + ID_EDIT_COPYKEYNAME "Copia o nome da chave seleccionada para a área de transferência." ID_EDIT_FIND "Localiza um texto numa chave, valor ou dado." ID_EDIT_FINDNEXT "Localiza a próxima ocorrência do texto especificado na pesquisa anterior." END @@ -325,19 +325,19 @@ BEGIN IDS_BAD_VALUE "Não pode perguntar o valor '%s'" IDS_UNSUPPORTED_TYPE "Não pode editar chaves deste tipo (%ld)" IDS_TOO_BIG_VALUE "Valor é muito grande (%ld)" - IDS_MULTI_SZ_EMPTY_STRING "Os dados do tipo REG_MULTI_SZ não podem conter strings vazias.\nAs strings vazias foram removidas da lista." + IDS_MULTI_SZ_EMPTY_STRING "Os dados do tipo REG_MULTI_SZ não podem conter cadeias vazias.\nAs cadeias vazias foram removidas da lista." IDS_QUERY_DELETE_KEY_ONE "Tem certeza que deseja excluir esta chave?" IDS_QUERY_DELETE_KEY_MORE "Tem certeza que deseja excluir estas chaves?" IDS_QUERY_DELETE_KEY_CONFIRM "Confirme exclusão da chave" IDS_QUERY_DELETE_ONE "Tem certeza que deseja excluir este valor?" - IDS_QUERY_DELETE_MORE "Tem certeza que deseja excluir estes valores??" + IDS_QUERY_DELETE_MORE "Tem certeza que deseja excluir estes valores?" IDS_QUERY_DELETE_CONFIRM "Confirme a exclusão do Valor" IDS_ERR_DELVAL_CAPTION "Erro ao apagar Valor" IDS_ERR_DELETEVALUE "Não foi possível apagar todos os valores especificados!" IDS_ERR_RENVAL_CAPTION "Erro ao Renomear Valor" IDS_ERR_RENVAL_TOEMPTY "Não foi possível renomear %s. O nome do valor especificado está vazio. Tente outro nome." IDS_QUERY_IMPORT_HIVE_CAPTION "Confirme a restauração da chave" - IDS_QUERY_IMPORT_HIVE_MSG "A chave será restaurada no topo da chave atualmente selecionada.\nTodos os valores e subchaves desta chave serão excluídos.\nDeseja continuar a operação?" + IDS_QUERY_IMPORT_HIVE_MSG "A chave será restaurada no topo da chave actualmente seleccionada.\nTodos os valores e subchaves desta chave serão excluídos.\nDeseja continuar a operação?" IDS_NEW_KEY "Nova chave #%d" IDS_NEW_VALUE "Novo valor #%d" END @@ -345,7 +345,7 @@ END STRINGTABLE BEGIN IDS_BINARY_EMPTY "(valor binário de comprimento zero)" - IDS_DEFAULT_VALUE_NAME "(Por default)" + IDS_DEFAULT_VALUE_NAME "(Predefinição)" IDS_VALUE_NOT_SET "(valor não atribuido)" IDS_UNKNOWN_TYPE "tipo desconhecido: (0x%lx)" IDS_MY_COMPUTER "O meu computador" @@ -358,12 +358,12 @@ END STRINGTABLE BEGIN - IDS_FLT_REGFILE "Arquivo de registo" - IDS_FLT_REGFILES "Arquivos de registo (*.reg)" + IDS_FLT_REGFILE "Ficheiro de registo" + IDS_FLT_REGFILES "Ficheiro de registo (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_HIVFILES "Arquivo de secção do registo (*.*)" + IDS_FLT_HIVFILES "Ficheiro de secção do registo (*.*)" IDS_FLT_HIVFILES_FLT "*.*" - IDS_FLT_REGEDIT4 "Win9x/NT4 Arquivos de registo (REGEDIT4) (*.reg)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Ficheiros de registo (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os ficheiros (*.*)" IDS_FLT_ALLFILES_FLT "*.*" @@ -389,7 +389,7 @@ STRINGTABLE BEGIN IDS_INHERIT_THISKEYONLY "Sómente esta chave" IDS_INHERIT_THISKEYANDSUBKEYS "Esta chave e sub-chave" - IDS_INHERIT_SUBKEYSONLY "Somente sub-chaves" + IDS_INHERIT_SUBKEYSONLY "Sómente sub-chaves" END STRINGTABLE @@ -404,8 +404,8 @@ STRINGTABLE BEGIN IDS_IMPORT_PROMPT "Adicionar informações pode, inadvertidamente, alterar ou excluir valores e fazer com que os componentes parem de funcionar correctamente.\nSe não confiar na fonte dessas informações em '%s', não as adicione ao registro.\n\nTem certeza de que deseja continuar ?" IDS_IMPORT_OK "As chaves e valores contidos em '%s' foram adicionados com sucesso ao registo." - IDS_IMPORT_ERROR "Não é possível importar '%s': Erro ao abrir o arquivo. Pode haver um erro no sistema de ficheiros ou o arquivo pode não existir." - IDS_EXPORT_ERROR "Não é possível exportar '%s': Erro ao criar ou gravar no arquivo. Pode haver um erro no disco ou no sistema de ficheiros." + IDS_IMPORT_ERROR "Não é possível importar '%s': Erro ao abrir o ficheiro. Pode haver um erro no sistema de ficheiros ou o arquivo pode não existir." + IDS_EXPORT_ERROR "Não é possível exportar '%s': Erro ao criar ou gravar no ficheiro. Pode haver um erro no disco ou no sistema de ficheiros." END STRINGTABLE diff --git a/base/services/w32time/lang/pt-PT.rc b/base/services/w32time/lang/pt-PT.rc new file mode 100644 index 00000000000..0b8a90483eb --- /dev/null +++ b/base/services/w32time/lang/pt-PT.rc @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATORS: Copyright 2022 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Serviço de horário" + IDS_DESCRIPTION "Mantém a sincronização de data e hora em todos os clientes e servidores da rede." +END diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc index 2cb5688229e..4177188a782 100644 --- a/base/services/w32time/w32time.rc +++ b/base/services/w32time/w32time.rc @@ -24,6 +24,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 7017bb41447..4a447614b8f 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2696,6 +2696,162 @@ US_INTERNATIONAL = "Międzynarodowy (USA)" UZBEK_CYRILLIC = "Uzbecki (Cyrylica)" VIETNAMESE = "Wietnamski" +; LANG_PORTUGUESE SUBLANG_NEUTRAL +[Strings.0016] + +; Services names and descriptions +AUDIO_SERVICE="Serviços de Audio do ReactOS" +AUDIO_SERVICE_DESCRIPTION="Fornece recursos de áudio para aplicações" + +BITS_SERVICE="Serviço de transferência inteligente em segundo plano" +BITS_SERVICE_DESCRIPTION="Transfere dados entre clientes e servidores em segundo plano." + +BROWSER_SERVICE="Navegador de computador" +BROWSER_SERVICE_DESCRIPTION="Mantém uma lista actualizada de computadores na rede e fornece essa lista aos computadores designados como navegadores." + +DCOMLAUNCH_SERVICE="DCOM - Lançador de processo de servidor" +DCOMLAUNCH_SERVICE_DESCRIPTION="Fornece funcionalidades de lançamento para serviços DCOM." + +EVENTLOG_SERVICE="Registo de Eventos" +EVENTLOG_SERVICE_DESCRIPTION="Regista eventos ou mensagens enviadas pelo sistema operativo num banco de dados acessíveis através do visualizador de eventos." + +MSISERVER_SERVICE="Instalador do ReactOS" +MSISERVER_SERVICE_DESCRIPTION="Controla a instalação, manutenção e remoção de software empacotado como um MSI (Instalador do Windows)." + +NETLOGON_SERVICE="Inicio de sessão de rede" +NETLOGON_SERVICE_DESCRIPTION="Suporta a autenticação pass-through dos eventos de início de sessão de conta para os computadores num domínio." + +PLUGPLAY_SERVICE="Plug and Play" +PLUGPLAY_SERVICE_DESCRIPTION="Permite que o computador identifique e se adapte a alterações de hardware com pouca ou nenhuma intervenção do utilizador." + +RPCSS_SERVICE="Chamada de procedimento remoto (RPC)" +RPCSS_SERVICE_DESCRIPTION="Fornece um mapeador de pontos finais e outros serviços RPC." + +SAMSS_SERVICE="Gestor de contas de segurança" +SAMSS_SERVICE_DESCRIPTION="A iniciação deste serviço sinaliza a outros serviços que o Gestor de contas de segurança (SAM) está pronto para aceitar solicitações. A desactivação deste serviço impedirá que outros serviços no sistema sejam notificados quando o SAM estiver pronto, o que provocará a incorrecta iniciação desses serviços. Este serviço não deve ser desactivado." + +SCHEDULE_SERVICE="Programador de tarefas" +SCHEDULE_SERVICE_DESCRIPTION="Permite ao utilizador configurar e agendar tarefas automatizadas neste computador. Se este serviço estiver parado, estas tarefas não serão executadas nas horas agendadas." + +SECLOGON_SERVICE="Inicio de sessão secundário" +SECLOGON_SERVICE_DESCRIPTION="Activa processos de início sob credenciais alternativas." + +SERVER_SERVICE="Servidor" +SERVER_SERVICE_DESCRIPTION="Suporta a partilha de ficheiros, impressoras e recursos de rede." + +SPOOLER_SERVICE="Spooler de impressão" +SPOOLER_SERVICE_DESCRIPTION="Carrega ficheiros na memória para impressão posterior." + +TCPSVCS_SERVICE="Serviços TCP/IP simples" +TCPSVCS_SERVICE_DECRIPTION="Soporta os seguintes serviços TCP/IP: Chargen, Daytime, Discard, Echo, QOTD." + +TELNETD_SERVICE="Serviço Telnet do ReactOS" +TELNETD_SERVICE_DESCRIPTION="Permite que um utilizador remoto inicie sessão e execute programas neste computador." + +THEMES_SERVICE="Temas" +THEMES_SERVICE_DESCRIPTION="Fornece a gestão de temas por parte dos utilizadores.." + +WINMGMT_SERVICE="Infra-estrutura de gestão do ReactOS" +WINMGMT_SERVICE_DESCRIPTION="Fornece interface para informações de gestão do sistema." + +WLANSVC_SERVICE="Serviço WLAN" +WLANSVC_SERVICE_DESCRIPTION="Serviço de redes inalámbricas WLAN." + +WORKSTATION_SERVICE="Estação de trabalho" +WORKSTATION_SERVICE_DESCRIPTION="Cria e mantém cliente de ligações de rede a servidores remotos." + +WUAUSERV_SERVICE="Actualizações automáticas" +WUAUSERV_SERVICE_DESCRIPTION="Permite a transferência e instalação de actualizações do ReactOS." + +; Keyboard layouts +ALBANIAN = "Albanês" +ARABIC_101 = "Árabe (101)" +ARABIC_102 = "Árabe (102)" +ARABIC_102_AZERTY = "Árabe (102) AZERTY" +ARMENIAN_EASTERN = "Arménio oriental" +ARMENIAN_WESTERN = "Arménio ocidental" +ASSAMESE = "Asamês" +AZERI_CYRILLIC = "Azerí cirílico" +AZERI_LATIN = "Azerí latino" +BELARUSIAN = "Bielorrusso" +BELGIAN_DUTCH = "Belga (Holandês)" +BELGIAN_FRENCH = "Belga (Francês)" +BENGALI = "Bengalí" +BENGALI_INSCRIPT = "Bengalí - INSCRIPT" +BULGARIAN_BDS = "Búlgaro BDS 5237-1978" +BULGARIAN_PHONETIC = "Búlgaro fonético clássico" +BULGARIAN_PHONETIC_BDS = "Búlgaro fonético BDS 5237-2006" +BURMESE = "Birmano" +CANADIAN_FRENCH = "Francês canadense (Herdado)" +CANADIAN_MULTILINGUAL = "Canadense estandarte multilingüe" +CROATIAN = "Croata" +CZECH = "Checo" +CZECH_QWERTY = "Checo (QWERTY)" +DANISH = "Danês" +DEVANAGARI = "Devanagari - INSCRIPT" +DUTCH = "Holandês" +ESPERANTO = "Esperanto" +ESTONIAN = "Estonio" +GERMAN_ERGO = "Alemão (de_ergo)" +GERMAN_NEO = "Alemão (NEO-1.1)" +GERMAN_RISTOME = "Alemão (RISTOME)" +GERMAN = "Alemão" +GREEK = "Grêgo" +GUJARATI = "Gujarati" +IRISH = "Irlandês" +FAEROESE = "Faeroese" +FINNISH = "Finês" +FRENCH = "Francês" +GEORGIAN = "Georgiano" +HEBREW = "Hebreu" +HUNGARIAN = "Húngaro" +ICELANDIC = "Islandês" +ITALIAN = "Italiano" +JAPANESE = "Japonês" +KAZAKH = "Kazajo" +KOREAN = "Coreano" +LATIN_AMERICAN = "Espanhol (America Latina)" +LATVIAN = "Letão" +LATVIAN_QWERTY = "Letão (QWERTY)" +LITHUANIAN = "Lituano" +MACEDONIAN = "Macedonia (FYRO)" +MALAYALAM = "Malabari" +NORWEGIAN = "Norueguês" +POLISH_214 = "Polaco (214)" +POLISH_PROGRAMMERS = "Polaco (Programmers)" +PORTUGESE = "Português (Portugal)" +PORTUGESE_BRAZILIAN = "Português (Brasil ABNT2)" +ROMANIAN_LEGACY = "Romano (Legacy)" +ROMANIAN_STANDARD = "Romano (Standard)" +RUSSIAN = "Russo" +RUSSIAN_TYPEWRITER = "Russo (Máquina de escrever)" +SERBIAN_CYRILLIC = "Sérvio (Cirílico)" +SERBIAN_LATIN = "Sérvio (Latin)" +SLOVAK = "Eslovaco" +SLOVAK_QWERTY = "Eslovaco (QWERTY)" +SPANISH = "Espanhol" +SWEDISH = "Sueco" +SWISS_FRENCH = "Suiço (Francês)" +SWISS_GERMAN = "Suiço (Alemão)" +TATAR = "Tártaro" +THAI_KEDMANEE = "Tailandês Kedmanee" +THAI_KEDMANEE_NON_SHIFTLOCK = "Tailandês Kedmanee (sin-BloqMayus)" +THAI_PATTACHOTE = "Tailandês Pattachote" +THAI_PATTACHOTE_NON_SHIFTLOCK = "Tailandês Pattachote (sin-BloqMayus)" +TURKISH_Q = "Turco Q" +TURKISH_F = "Turco F" +UK = "Reino Unido" +UKRAINIAN = "Ucraniano" +UKRAINIAN_STUDENT = "Ucraniano (Estudantil)" +US = "Estados Unidos" +US_ARABIC = "Inglês EEUU (IBM Arabic 238_L)" +US_DVORAK = "EEUU-Dvorak" +US_DVORAK_LEFT = "EEUU Dvorak para surdos" +US_DVORAK_RIGHT = "EEUU Dvorak para destros" +US_INTERNATIONAL = "EEUU Internacional" +UZBEK_CYRILLIC = "Uzbek (Cyrillic)" +VIETNAMESE = "Vietnamita" + ; LANG_ROMANIAN SUBLANG_NEUTRAL [Strings.0018] diff --git a/dll/cpl/intl/lang/pt-PT.rc b/dll/cpl/intl/lang/pt-PT.rc index f57d9fe6f41..7045b113a2d 100644 --- a/dll/cpl/intl/lang/pt-PT.rc +++ b/dll/cpl/intl/lang/pt-PT.rc @@ -6,7 +6,7 @@ CAPTION "Opções regionais" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Padrões e formatos", -1, 5, 5, 234, 162 - LTEXT "Esta opção influencia a forma como alguns programas formatam números, unidades monetárias, horários e datas.", -1, 14, 17, 220, 25 + LTEXT "Esta opção influencia a forma como alguns programas formatam números, unidades monetárias, datas e horas.", -1, 14, 17, 220, 25 LTEXT "Selecci&one um item para definir as suas preferências ou clique em 'Personalizar' para escolher seus próprios formatos:", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Personalizar...", IDC_SETUP_BUTTON, 178, 56, 52, 13 @@ -22,7 +22,7 @@ BEGIN EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Localização", -1, 5, 172, 234, 55 - LTEXT "Para aj&udar os serviços a fornecer-lhe informações locais, tal como notícias e meteorologia, seleccione a sua localização actual:", -1, 14, 184, 210, 24 + LTEXT "Para aj&udar os serviços a fornecer-lhe informação local, tal como notícias e meteorologia, seleccione a sua localização actual:", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -65,7 +65,7 @@ BEGIN EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Negativo:", -1, 120, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "&Símbolo decimal:", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Separador decimal:", -1, 8, 67, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Nº de &casas decimais:", -1, 8, 83, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -77,11 +77,11 @@ BEGIN COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "&Formato de número negativo:", -1, 8, 149, 100, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Exibir &zeros à esquerda:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Apresentar &zeros à esquerda:", -1, 8, 166, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Separador de lis&ta:", -1, 8, 181, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Sistema de &medidas:", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Sistema de &medida:", -1, 8, 197, 96, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -97,11 +97,11 @@ BEGIN EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "&Símbolo da unidade monetária:", -1, 10, 51, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 134, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Formato de moeda &positivo:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Formato monetário &positivo:", -1, 10, 68, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 134, 66, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Formato de moeda &negativo:", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Formato monetário &negativo:", -1, 10, 85, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYNEGVALUE, 134, 83, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "Sím&bolo decimal:", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Separador decimal:", -1, 10, 111, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECSEP, 134, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL LTEXT "Nº de &casas decimais:", -1, 10, 128, 121, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECNUM, 134, 126, 100, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL @@ -119,16 +119,16 @@ BEGIN GROUPBOX "Exemplo", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "Exemplo de hora:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - LTEXT "&Formato de hora:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Formato da hora:", -1, 13, 52, 130, 10, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEFORMAT, 149, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "&Separador de hora:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "&Separador da hora:", -1, 13, 70, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMESEPARATOR, 149, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Sí&mbolo a.m.:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "Símbolo &AM.:", -1, 13, 88, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEAMSYMBOL, 149, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Sím&bolo p.m.:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP + LTEXT "Símbolo &PM.:", -1, 13, 106, 130, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 149, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 140, 230, 80, WS_VISIBLE - LTEXT "Notação de formato de hora\nh = hora m = minuto s = segundo t = a.m. ou p.m.\n\nh = 12 horas\nH = 24 horas\n\nhh, mm, ss = com zero à esquerda\nh, m, s = sem zero à esquerda", -1, 13, 150, 214, 66, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Notação do formato da hora\nh = hora m = minuto s = segundo t = AM. ou PM.\n\nh = 12 horas\nH = 24 horas\n\nhh, mm, ss = com zero à esquerda\nh, m, s = sem zero à esquerda", -1, 13, 150, 214, 66, WS_CHILD | WS_VISIBLE | WS_GROUP END IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 @@ -137,12 +137,12 @@ CAPTION "Data" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Calendário", -1, 7, 7, 230, 74 - LTEXT "&Quando for dig. 1 ano de 2 dígitos, interpretá-lo como 1 ano entre:", -1, 13, 18, 215, 8 + LTEXT "&Quando um ano de 2 dígitos é introduzido, interpretar como um ano entre:", -1, 13, 18, 215, 8 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED LTEXT "e", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "&Tipo de calendário:", -1, 13, 48, 56, 10 + LTEXT "&Tipo de calendário:", -1, 13, 48, 60, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED LTEXT "Calendário &Hijri:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED @@ -170,8 +170,8 @@ CAPTION "Classificação" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Classificação", -1, 7, 7, 230, 74 - LTEXT "Os métodos de classificação alteram a maneira como os programas classificam caracteres, palavras, arquivos e pastas.", -1, 14, 17, 220, 25 - LTEXT "&Selecione o método de classificação a ser usado com este idioma:", -1, 14, 37, 220, 22 + LTEXT "Os métodos de classificação alteram a maneira como os programas classificam caracteres, palavras, ficheiros e pastas.", -1, 14, 17, 220, 25 + LTEXT "&Seleccione o método de classificação a ser usado com este idioma:", -1, 14, 37, 220, 22 COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -180,7 +180,7 @@ BEGIN IDS_CUSTOMIZE_TITLE "Personalizar opções regionais" IDS_SPAIN "Espanhol (Espanha)" IDS_METRIC "Métrico" - IDS_IMPERIAL "Imperial" + IDS_IMPERIAL "Inglês" END STRINGTABLE @@ -201,8 +201,8 @@ STRINGTABLE BEGIN IDS_ERROR "Erro" IDS_ERROR_SYMBOL_SEPARATE "Um ou mais caracteres digitados para Separador de data são inválidos." - IDS_ERROR_SYMBOL_FORMAT_SHORT "Um ou mais caracteres que você digitou para o formato Data abreviada são inválidos." - IDS_ERROR_SYMBOL_FORMAT_LONG "Um ou mais caracteres que você digitou para o formato Data por extenso são inválidos." + IDS_ERROR_SYMBOL_FORMAT_SHORT "Um ou mais caracteres que digitou para o formato Data abreviada são inválidos." + IDS_ERROR_SYMBOL_FORMAT_LONG "Um ou mais caracteres que digitou para o formato Data por extenso são inválidos." IDS_ERROR_OEM_CODE_PAGE "Erro ao ler a tabela de conversão de página de código OEM" IDS_ERROR_ANSI_CODE_PAGE "Erro ao ler a tabela de conversão de página de código ANSI" IDS_ERROR_INT_KEY_REG "Erro ao abrir a chave: HKCU\\Control Panel\\International" diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index f2b8ab3edbf..5870e00a93a 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -43,27 +43,27 @@ BEGIN IDS_DEV_DEVLOADER_FAILED "O ReactOS não pôde carregar o controlador para este dispositivo porque o computador está a reportar dois tipos de barramento %1." IDS_DEV_DEVLOADER_FAILED2 "O(s) carregadore(es) do dispositivo %1 não pôde/puderam carregar o controlador para este dispositivo." IDS_DEV_OUT_OF_MEMORY "O controlador para este dispositivo pode estar danificado, ou o sistema com pouca memória ou insuficiência de outros recursos." - IDS_DEV_ENTRY_IS_WRONG_TYPE "Este dispositivo não está a funcionar correctamente porque um de seus controladores pode estar danificado, ou o registo pode estar danificado." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Este dispositivo não está a funcionar correctamente porque um de seus controladores ou o registo poderão estar danificados." IDS_DEV_LACKED_ARBITRATOR "O controlador para este dispositivo requisitou um recurso que o ReactOS não sabe como manusear." IDS_DEV_BOOT_CONFIG_CONFLICT "Outro dispositivo está a usar os recursos que este dispositivo necessita." IDS_DEV_FAILED_FILTER "Os controladores para este dispositivo precisam ser reinstalados." - IDS_DEV_DEVLOADER_NOT_FOUND "Este dispositivo não está a funcionar correctamente porque o ReactOS não pôde carregar o arquivo %1 que carrega os controladores para o dispositivo." - IDS_DEV_DEVLOADER_NOT_FOUND2 "Este dispositivo não está a funcionar correctamente porque o arquivo %1 que carrega os controladores para este dispositivo está danificado." + IDS_DEV_DEVLOADER_NOT_FOUND "Este dispositivo não está a funcionar correctamente porque o ReactOS não pôde carregar o ficheiro %1 que carrega os controladores para o dispositivo." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Este dispositivo não está a funcionar correctamente porque o ficheiro %1 que carrega os controladores para este dispositivo está danificado." IDS_DEV_DEVLOADER_NOT_FOUND3 "Falha no dispositivo: tente mudar o controlador para este dispositivo. Se isto não funcionar, consulte a documentação do seu hardware." IDS_DEV_INVALID_DATA "Este dispositivo não está a funcionar correctamente porque a BIOS do seu computador está a reportar os recursos para este dispositivo incorrectamente." IDS_DEV_INVALID_DATA2 "Este dispositivo não está a funcionar correctamente porque a BIOS do dispositivo está a reportar os recursos para este dispositivo incorrectamente." IDS_DEV_FAILED_START "Este dispositivo não está presente, não está a funcionar correctamente ou não tem todos os controladores instalados." - IDS_DEV_LIAR "O ReactOS parou de responder enquanto tentava inicializar este dispositivo e em conseqüência não irá mais tentar inicializá-lo." + IDS_DEV_LIAR "O ReactOS parou de responder enquanto tentava iniciar este dispositivo. Em conseqüência não mais o irá iniciar." IDS_DEV_NORMAL_CONFLICT "Este dispositivo não pôde encontrar recursos %1 livres para utilizar." IDS_DEV_NOT_VERIFIED "Este dispositivo não está presente, não está a funcionar correctamente ou não tem todos os controladores instalados." IDS_DEV_NEED_RESTART "Este dispositivo não pode funcionar correctamente até que o computador seja reiniciado." IDS_DEV_REENUMERATION "Este dispositivo está a causar um conflito de recursos." IDS_DEV_PARTIAL_LOG_CONF "O ReactOS não pôde identificar todos os recursos que este dispositivo utiliza." - IDS_DEV_UNKNOWN_RESOURCE "O arquivo %1 de informações de controlador indica que este dispositivo filho utilize um recurso que o dispositivo pai não possui ou reconhece." + IDS_DEV_UNKNOWN_RESOURCE "O ficheiro %1 de informações de controlador indica que este dispositivo filho utiliza um recurso que o dispositivo pai não possui ou reconhece." IDS_DEV_REINSTALL "Os controladores para este dispositivo precisam ser reinstalados." IDS_DEV_REGISTRY "O registo pode estar danificado." IDS_DEV_WILL_BE_REMOVED "O ReactOS está a remover este dispositivo." - IDS_DEV_DISABLED "Este dispositivo não foi inicializado." + IDS_DEV_DISABLED "Este dispositivo não foi iniciado." IDS_DEV_DISABLED2 "Este dispositivo está desactivado." IDS_DEV_DEVLOADER_NOT_READY "Os carregadores para este dispositivo não puderam carregar os controladores necessários." IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ @@ -71,30 +71,30 @@ BEGIN IDS_DEV_DEVICE_NOT_THERE "Este dispositivo não está presente, não está a funcionar correctamente ou não tem todos os controladores instalados." IDS_DEV_MOVED "O ReactOS está no processo de configuração deste dispositivo." IDS_DEV_TOO_EARLY "O ReactOS está no processo de configuração deste dispositivo." - IDS_DEV_NO_VALID_LOG_CONF "O ReactOS não pode especificar os recursos pra este dispositivo." + IDS_DEV_NO_VALID_LOG_CONF "O ReactOS não pode especificar os recursos para este dispositivo." IDS_DEV_FAILED_INSTALL "Os controladores para este dispositivo não estão instalados." IDS_DEV_HARDWARE_DISABLED "Este dispositivo está desactivado porque a BIOS para o dispositivo não lhe deu nenhum recurso." IDS_DEV_CANT_SHARE_IRQ "Este dispositivo utiliza um recurso de Requisição de Interrupção (IRQ) que está em uso por outro dispositivo e não pode ser compartilhado.\nDeve alterar a configuração conflitante ou remover o controlador de modo real que está a causar o conflito." IDS_DEV_FAILED_ADD "Este dispositivo não está a funcionar correctamente porque %1 não está a funcionar correctamente." IDS_DEV_DISABLED_SERVICE "O ReactOS não pode instalar os controladores para este dispositivo porque não consegue acessar o controlador ou local de rede que possui os ficheiros de configuração." IDS_DEV_TRANSLATION_FAILED "Este dispositivo não está a responder ao seu controlador." - IDS_DEV_NO_SOFTCONFIG "O ReactOS não pode determinar as configurações para este dispositivo. Consulte a documentação que veio com este dispositivo e utilize a guia Recursos para definir a configuração." + IDS_DEV_NO_SOFTCONFIG "O ReactOS não pode determinar as configurações para este dispositivo. Consulte a documentação que veio com este dispositivo e utilize o guia de recursos para definir a configuração." IDS_DEV_BIOS_TABLE "O firmware de seu sistema não possui informação suficiente para configurar e utilizar este dispositivo correctamente.\nPara utilizar este dispositivo, contacte o fabricante de seu computador para obter uma actualização de firmware ou BIOS." IDS_DEV_IRQ_TRANSLATION_FAILED "Este dispositivo requisita uma interrupção PCI mas está configurado para uma interrupção ISA (ou vice-versa).\nPor favor, utilize o sistema de configuração do computador para reconfigurar a interrupção para este dispositivo." - IDS_DEV_FAILED_DRIVER_ENTRY "O ReactOS não pode inicializar o controlador do dispositivo para este hardware." + IDS_DEV_FAILED_DRIVER_ENTRY "O ReactOS não pode iniciar o controlador do dispositivo para este hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "O ReactOS não pode carregar o controlador do dispositivo para este hardware porque uma instância anterior do controlador do dispositivo ainda está na memória." IDS_DEV_DRIVER_FAILED_LOAD "O ReactOS não pode carregar o controlador do dispositivo para este hardware. O controlador pode estar corrompido ou ausente." - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "O ReactOS não pode acessar este hardware porque suas informações sobre a chave do serviço não estão no Registo ou estão registadas incorrectamente." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "O ReactOS não pode acessar este hardware porque as informações sobre a chave do serviço não estão no registo ou estão registadas incorrectamente." IDS_DEV_LEGACY_SERVICE_NO_DEVICES "O ReactOS carregou o controlador do dispositivo para este hardware correctamente mas não consegue encontrar o dispositivo de hardware." IDS_DEV_DUPLICATE_DEVICE "O ReactOS não pode carregar o controlador do dispositivo para este hardware porque já existe uma instância deste dispositivo em execução no sistema." IDS_DEV_FAILED_POST_START "O ReactOS parou este dispositivo porque ele reportou problemas." IDS_DEV_HALTED "Uma aplicação ou serviço desligou este dispositivo de hardware." IDS_DEV_PHANTOM "No momento, este dispositivo de hardware não está ligado ao computador." IDS_DEV_SYSTEM_SHUTDOWN "O ReactOS não pode obter acesso a este dispositivo de hardware porque o sistema operativo está em processo de desligamento." - IDS_DEV_HELD_FOR_EJECT "O ReactOS não pode utilizar este dispositivo de hardware porque este foi preparado para remoção segura mas não foi removido do computador." - IDS_DEV_DRIVER_BLOCKED "O software para este dispositivo teve sua inicialização bloqueada pois é conhecido por possuir problemas com o ReactOS. Contacte o revendedor do hardware para um novo controlador." - IDS_DEV_REGISTRY_TOO_LARGE "O ReactOS não pode iniciar os novos dispositivos de hardware porque a secção do sistema é muito grande (excede o limite de tamanho do Registo)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS não pôde alterar as configurações para este dispositivo." + IDS_DEV_HELD_FOR_EJECT "O ReactOS não pode utilizar este dispositivo de hardware porque este foi preparado para remoção segura porém, não foi removido do computador." + IDS_DEV_DRIVER_BLOCKED "O software para este dispositivo teve sua iniciação bloqueada pois é conhecido por possuir problemas com o ReactOS. Contacte o revendedor do hardware para um novo controlador." + IDS_DEV_REGISTRY_TOO_LARGE "O ReactOS não pode iniciar os novos dispositivos de hardware porque a secção do sistema é muito grande (excede o limite de tamanho do registo)." + IDS_DEV_SETPROPERTIES_FAILED "O ReactOS não pôde alterar as configurações para este dispositivo." END STRINGTABLE @@ -156,7 +156,7 @@ BEGIN GROUPBOX "Estado do dispositivo", IDC_DEVSTATUSGROUP, 7, 83, 238, 100 EDITTEXT IDC_DEVSTATUS, 14, 96, 224, 61, NOT WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL PUSHBUTTON "&Resolução de problemas...", IDC_DEVPROBLEM, 148, 163, 90, 15 - LTEXT "&Uso do dispositivo:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED + LTEXT "&Utilização do dispositivo:", IDC_DEVUSAGELABEL, 7, 188, 222, 8, WS_DISABLED COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END @@ -192,7 +192,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "&Arquivos de controlador:", -1, 7, 36, 204, 8 + LTEXT "&Ficheiros do controlador:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 @@ -227,7 +227,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Definições de recursos:", -1, 7, 36, 204, 8 + LTEXT "Definições do recurso:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 @@ -244,7 +244,7 @@ END IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Confirmar Remoção do dispositivo" +CAPTION "Confirmar remoção do dispositivo" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -317,7 +317,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_HINT_BLANK " " - IDS_HINT_PROPERTIES " Abrir caixa de diálogo propriedade para a selecção actual." + IDS_HINT_PROPERTIES " Abrir a caixa de diálogo ""Propriedades"" para a selecção actual." IDS_HINT_SCAN " Verificar se há novos dispositivos plug and play." IDS_HINT_ENABLE " Habilita o dispositivo seleccionado." IDS_HINT_DISABLE " Desabilita o dispositivo seleccionado."

1 0

[reactos] 02/02: [WIN32SS] Add missing code parts for monitor handling
by Stanislav Motylkov 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26b88af6420f1ed707bd9… commit 26b88af6420f1ed707bd978656624868d428f820 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed May 25 00:18:10 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 30 15:28:44 2022 +0300 [WIN32SS] Add missing code parts for monitor handling - [VIDEOPRT] Add stub for IOCTL_VIDEO_ENUM_MONITOR_PDO. - [WIN32SS:ENG] Add missing checks and comments. - [WIN32SS:NTUSER] Add missing monitor handling and comments. Addendum to 31827c43. CORE-18197 CORE-11715 --- win32ss/drivers/videoprt/dispatch.c | 5 +++++ win32ss/gdi/eng/device.c | 28 ++++++++++++++++++++++++++-- win32ss/user/ntuser/display.c | 32 ++++++++++++++++++++++++++------ 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index 1878e797550..79a20481b91 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -790,6 +790,11 @@ IntVideoPortDispatchDeviceControl( Status = STATUS_NOT_IMPLEMENTED; break; + case IOCTL_VIDEO_ENUM_MONITOR_PDO: + WARN_(VIDEOPRT, "- IOCTL_VIDEO_ENUM_MONITOR_PDO is UNIMPLEMENTED!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + case IOCTL_VIDEO_INIT_WIN32K_CALLBACKS: INFO_(VIDEOPRT, "- IOCTL_VIDEO_INIT_WIN32K_CALLBACKS\n"); Status = VideoPortInitWin32kCallbacks(DeviceObject, diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index af6bd3e42aa..3bd3827c9e7 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -351,6 +351,19 @@ EngpRegisterGraphicsDevice( // if (Win32kCallbacks.DualviewFlags & ???) pGraphicsDevice->PhysDeviceHandle = Win32kCallbacks.pPhysDeviceObject; + /* FIXME: Enumerate children monitor devices for this video adapter + * + * - Force the adapter to re-enumerate its monitors: + * IoSynchronousInvalidateDeviceRelations(pdo, BusRelations) + * + * - Retrieve all monitor PDOs from VideoPrt: + * EngDeviceIoControl(0x%p, IOCTL_VIDEO_ENUM_MONITOR_PDO) + * + * - Initialize these fields and structures accordingly: + * pGraphicsDevice->dwMonCnt + * pGraphicsDevice->pvMonDev[0..dwMonCnt-1] + */ + /* Copy the device name */ RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, sizeof(pGraphicsDevice->szNtDeviceName), @@ -445,7 +458,7 @@ EngpFindGraphicsDevice( if (pustrDevice && pustrDevice->Buffer) { - /* Loop through the list of devices */ + /* Find specified video adapter by name */ for (pGraphicsDevice = gpGraphicsDeviceFirst; pGraphicsDevice; pGraphicsDevice = pGraphicsDevice->pNextGraphicsDevice) @@ -457,10 +470,21 @@ EngpFindGraphicsDevice( break; } } + + if (pGraphicsDevice) + { + /* Validate selected monitor number */ +#if 0 + if (iDevNum >= pGraphicsDevice->dwMonCnt) + pGraphicsDevice = NULL; +#else + /* FIXME: dwMonCnt not initialized, see EngpRegisterGraphicsDevice */ +#endif + } } else { - /* Loop through the list of devices */ + /* Select video adapter by device number */ for (pGraphicsDevice = gpGraphicsDeviceFirst, i = 0; pGraphicsDevice && i < iDevNum; pGraphicsDevice = pGraphicsDevice->pNextGraphicsDevice, i++); diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 4d14c6552c1..5feb8077db6 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -237,6 +237,7 @@ UserEnumDisplayDevices( DWORD dwFlags) { PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pdo; PWCHAR pHardwareId; ULONG cbSize, dwLength; HKEY hkey; @@ -284,9 +285,19 @@ UserEnumDisplayDevices( pdispdev->DeviceID[0] = UNICODE_NULL; /* Fill in DeviceID */ - if (pGraphicsDevice->PhysDeviceHandle != NULL) + if (!pustrDevice) + pdo = pGraphicsDevice->PhysDeviceHandle; + else +#if 0 + pdo = pGraphicsDevice->pvMonDev[iDevNum].pdo; +#else + /* FIXME: pvMonDev not initialized, see EngpRegisterGraphicsDevice */ + pdo = NULL; +#endif + + if (pdo != NULL) { - Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + Status = IoGetDeviceProperty(pdo, DevicePropertyHardwareID, 0, NULL, @@ -303,7 +314,7 @@ UserEnumDisplayDevices( return STATUS_INSUFFICIENT_RESOURCES; } - Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + Status = IoGetDeviceProperty(pdo, DevicePropertyHardwareID, dwLength, pHardwareId, @@ -319,10 +330,19 @@ UserEnumDisplayDevices( * which usually is the longest one and unique enough */ RtlStringCbCopyW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); - /* For monitors it should be the first Hardware ID - * concatenated with the unique driver registry key */ + if (pustrDevice) + { + /* For monitors it should be the first Hardware ID, + * which we already have obtained above, + * concatenated with the unique driver registry key */ + + RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), L"\\"); + + /* FIXME: DevicePropertyDriverKeyName string should be appended */ + pHardwareId[0] = UNICODE_NULL; + RtlStringCbCatW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); + } - /* FIXME: Handle monitors! */ TRACE("Hardware ID: %ls\n", pdispdev->DeviceID); }

1 0

[reactos] 01/02: [WIN32SS] EnumDisplayDevices: Fill DeviceID field properly
by Stanislav Motylkov 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31827c43b6faaa88f94da… commit 31827c43b6faaa88f94dad5dd6caf3cbfa6b9925 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue May 24 02:54:57 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon May 30 15:28:21 2022 +0300 [WIN32SS] EnumDisplayDevices: Fill DeviceID field properly - [VIDEOPRT] Return the real PhysicalDeviceObject in Win32k callbacks. - [WIN32SS:ENG] Pass PhysDeviceObject into the GraphicsDevice structure and rename the destination field accordingly. - [WIN32SS:NTUSER] Request hardware identifiers from device PDO and fill DISPLAY_DEVICE's DeviceID field with the first identifier. Now it's correctly passed to the usermode, and Desktop Propertes applet can open the video adapter device properties. Thanks to Hervé Poussineau for the help. CORE-18197 CORE-11715 --- win32ss/drivers/videoprt/dispatch.c | 4 ++- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/pdevobj.h | 2 +- win32ss/user/ntuser/display.c | 55 +++++++++++++++++++++++++++++++++++-- 4 files changed, 58 insertions(+), 5 deletions(-) diff --git a/win32ss/drivers/videoprt/dispatch.c b/win32ss/drivers/videoprt/dispatch.c index ac5e5b880d7..1878e797550 100644 --- a/win32ss/drivers/videoprt/dispatch.c +++ b/win32ss/drivers/videoprt/dispatch.c @@ -630,6 +630,8 @@ VideoPortInitWin32kCallbacks( _In_ ULONG BufferLength, _Out_ PULONG_PTR Information) { + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + *Information = sizeof(VIDEO_WIN32K_CALLBACKS); if (BufferLength < sizeof(VIDEO_WIN32K_CALLBACKS)) { @@ -643,7 +645,7 @@ VideoPortInitWin32kCallbacks( /* Return reasonable values to Win32k */ Win32kCallbacks->bACPI = FALSE; - Win32kCallbacks->pPhysDeviceObject = DeviceObject; + Win32kCallbacks->pPhysDeviceObject = DeviceExtension->PhysicalDeviceObject; Win32kCallbacks->DualviewFlags = 0; return STATUS_SUCCESS; diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 2b96ca409c9..af6bd3e42aa 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -349,7 +349,7 @@ EngpRegisterGraphicsDevice( // TODO: Set flags according to the results. // if (Win32kCallbacks.bACPI) // if (Win32kCallbacks.DualviewFlags & ???) - // Win32kCallbacks.pPhysDeviceObject; + pGraphicsDevice->PhysDeviceHandle = Win32kCallbacks.pPhysDeviceObject; /* Copy the device name */ RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index 12673ac20f4..b9d439d3dda 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -61,7 +61,7 @@ typedef struct _GRAPHICS_DEVICE struct _GRAPHICS_DEVICE * pNextGraphicsDevice; struct _GRAPHICS_DEVICE * pVgaDevice; PDEVICE_OBJECT DeviceObject; - PVOID pDeviceHandle; + PDEVICE_OBJECT PhysDeviceHandle; DWORD hkClassDriverConfig; DWORD StateFlags; /* See DISPLAY_DEVICE_* */ ULONG cbdevmodeInfo; diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 8f15a68e1bf..4d14c6552c1 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -237,7 +237,8 @@ UserEnumDisplayDevices( DWORD dwFlags) { PGRAPHICS_DEVICE pGraphicsDevice; - ULONG cbSize; + PWCHAR pHardwareId; + ULONG cbSize, dwLength; HKEY hkey; NTSTATUS Status; @@ -280,9 +281,59 @@ UserEnumDisplayDevices( RtlStringCbCopyW(pdispdev->DeviceName, sizeof(pdispdev->DeviceName), pGraphicsDevice->szWinDeviceName); RtlStringCbCopyW(pdispdev->DeviceString, sizeof(pdispdev->DeviceString), pGraphicsDevice->pwszDescription); pdispdev->StateFlags = pGraphicsDevice->StateFlags; - // FIXME: fill in DEVICE ID pdispdev->DeviceID[0] = UNICODE_NULL; + /* Fill in DeviceID */ + if (pGraphicsDevice->PhysDeviceHandle != NULL) + { + Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + DevicePropertyHardwareID, + 0, + NULL, + &dwLength); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + pHardwareId = ExAllocatePoolWithTag(PagedPool, + dwLength, + USERTAG_DISPLAYINFO); + if (!pHardwareId) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoGetDeviceProperty(pGraphicsDevice->PhysDeviceHandle, + DevicePropertyHardwareID, + dwLength, + pHardwareId, + &dwLength); + + if (!NT_SUCCESS(Status)) + { + ERR("IoGetDeviceProperty() failed with status 0x%08lx\n", Status); + } + else + { + /* For video adapters it should be the first Hardware ID + * which usually is the longest one and unique enough */ + RtlStringCbCopyW(pdispdev->DeviceID, sizeof(pdispdev->DeviceID), pHardwareId); + + /* For monitors it should be the first Hardware ID + * concatenated with the unique driver registry key */ + + /* FIXME: Handle monitors! */ + TRACE("Hardware ID: %ls\n", pdispdev->DeviceID); + } + + ExFreePoolWithTag(pHardwareId, USERTAG_DISPLAYINFO); + } + else + { + ERR("IoGetDeviceProperty() failed with status 0x%08lx\n", Status); + } + } + return STATUS_SUCCESS; }

1 0

[reactos] 01/01: [DISKPART] Fix build. Simplify PrintMessageString().
by Hermès Bélusca-Maïto 30 May '22

30 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee613a18ebed2843e80eb… commit ee613a18ebed2843e80eb8e02bdc8168e3c4b730 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 30 02:41:31 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 30 02:41:31 2022 +0200 [DISKPART] Fix build. Simplify PrintMessageString(). --- base/system/diskpart/CMakeLists.txt | 6 ++++-- base/system/diskpart/misc.c | 21 +++++---------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index 7f31e513b4f..3d2d6cf7a86 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -46,6 +46,10 @@ list(APPEND SOURCE diskpart.h) add_executable(diskpart ${SOURCE} diskpart.rc) +add_pch(diskpart diskpart.h SOURCE) +add_message_headers(UNICODE diskpart_msg.mc) +add_dependencies(diskpart diskpart_msg) + set_module_type(diskpart win32cui UNICODE) target_link_libraries(diskpart conutils ${PSEH_LIB}) add_importlibs(diskpart advapi32 msvcrt kernel32 ntdll) @@ -54,6 +58,4 @@ if(MSVC) add_importlibs(diskpart ntdll) endif() -add_pch(diskpart diskpart.h SOURCE) -add_message_headers(UNICODE diskpart_msg.mc) add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index b530f6581df..ddb2946a840 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -84,20 +84,9 @@ VOID PrintMessageString( _In_ DWORD dwMessage) { - PWSTR pBuffer; - - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, //hModuleNetMsg, - dwMessage, - LANG_USER_DEFAULT, - (LPWSTR)&pBuffer, - 0, - NULL); - if (pBuffer) - { - ConPuts(StdOut, pBuffer); - LocalFree(pBuffer); - pBuffer = NULL; - } + ConMsgPuts(StdOut, + FORMAT_MESSAGE_FROM_HMODULE, + NULL, //hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT); }

1 0

[reactos] 01/01: [DISKPART] Convert command help to messages and fix some texts
by Eric Kohl 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c287c08b278bb9f8998db… commit c287c08b278bb9f8998dbde0f5a21254eaf752c6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon May 30 01:09:08 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon May 30 01:09:08 2022 +0200 [DISKPART] Convert command help to messages and fix some texts --- base/system/diskpart/CMakeLists.txt | 1 + base/system/diskpart/detail.c | 4 +- base/system/diskpart/diskpart.h | 5 +- base/system/diskpart/diskpart.rc | 2 + base/system/diskpart/diskpart_msg.mc | 1736 ++++++++++++++++++++++++++++++++++ base/system/diskpart/help.c | 8 +- base/system/diskpart/interpreter.c | 155 +-- base/system/diskpart/lang/en-US.rc | 250 +---- base/system/diskpart/lang/pl-PL.rc | 248 +---- base/system/diskpart/lang/pt-PT.rc | 248 +---- base/system/diskpart/lang/ro-RO.rc | 248 +---- base/system/diskpart/lang/ru-RU.rc | 248 +---- base/system/diskpart/lang/sq-AL.rc | 248 +---- base/system/diskpart/lang/tr-TR.rc | 248 +---- base/system/diskpart/lang/zh-CN.rc | 248 +---- base/system/diskpart/lang/zh-TW.rc | 248 +---- base/system/diskpart/misc.c | 23 + base/system/diskpart/resource.h | 58 +- 18 files changed, 1891 insertions(+), 2335 deletions(-) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index 0c0c9977947..7f31e513b4f 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -55,4 +55,5 @@ if(MSVC) endif() add_pch(diskpart diskpart.h SOURCE) +add_message_headers(UNICODE diskpart_msg.mc) add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) diff --git a/base/system/diskpart/detail.c b/base/system/diskpart/detail.c index 388cb8a45af..9182a7a46ab 100644 --- a/base/system/diskpart/detail.c +++ b/base/system/diskpart/detail.c @@ -186,7 +186,7 @@ DetailPartition( } if (bVolumeFound == FALSE) - ConPuts(StdOut, L"\nThere is no volume associated with this partition.\n"); + ConResPuts(StdOut, IDS_DETAIL_NO_VOLUME); ConPuts(StdOut, L"\n"); @@ -241,7 +241,7 @@ DetailVolume( } if (bDiskFound == FALSE) - ConPuts(StdOut, L"\nThere are no disks attached to this volume.\n"); + ConResPuts(StdOut, IDS_DETAIL_NO_DISKS); /* TODO: Print more volume details */ diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index c4a4c2fad9e..e3b4c247861 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -57,7 +57,7 @@ typedef struct _COMMAND PWSTR cmd3; BOOL (*func)(INT, WCHAR**); INT help; - INT help_detail; + DWORD help_detail; } COMMAND, *PCOMMAND; extern COMMAND cmds[]; @@ -392,6 +392,9 @@ RoundingDivide( _In_ ULONGLONG Dividend, _In_ ULONGLONG Divisor); +VOID +PrintMessageString( + _In_ DWORD dwMessage); /* offline.c */ BOOL offline_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/diskpart.rc b/base/system/diskpart/diskpart.rc index a1df42efce4..f0d1dd71690 100644 --- a/base/system/diskpart/diskpart.rc +++ b/base/system/diskpart/diskpart.rc @@ -8,6 +8,8 @@ #define REACTOS_STR_ORIGINAL_COPYRIGHT "(C) 2011 Lee Schroeder" #include <reactos/version.rc> +#include <diskpart_msg.rc> + /* UTF-8 */ #pragma code_page(65001) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc new file mode 100644 index 00000000000..669998227fd --- /dev/null +++ b/base/system/diskpart/diskpart_msg.mc @@ -0,0 +1,1736 @@ + +MessageIdTypedef=DWORD + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS + Informational=0x1:STATUS_SEVERITY_INFORMATIONAL + Warning=0x2:STATUS_SEVERITY_WARNING + Error=0x3:STATUS_SEVERITY_ERROR + ) + +FacilityNames=(System=0x0:FACILITY_SYSTEM + ) + +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415 + Portugese=0x816:MSG00416 + Romanian=0x418:MSG00418 + Russian=0x419:MSG00419 + Albanian=0x41C:MSG0041C + Turkish=0x41F:MSG0041F + Chinese=0x804:MSG00804 + Taiwanese=0x404:MSG00404 + ) + + +MessageId=10000 +SymbolicName=MSG_COMMAND_ACTIVE +Severity=Informational +Facility=System +Language=English +<Add ACTIVE command help text here> +. +Language=Polish +<Add ACTIVE command help text here> +. +Language=Portugese +<Add ACTIVE command help text here> +. +Language=Romanian +<Add ACTIVE command help text here> +. +Language=Russian +<Add ACTIVE command help text here> +. +Language=Albanian +<Add ACTIVE command help text here> +. +Language=Turkish +<Add ACTIVE command help text here> +. +Language=Chinese +<Add ACTIVE command help text here> +. +Language=Taiwanese +<Add ACTIVE command help text here> +. + + +MessageId=10001 +SymbolicName=MSG_COMMAND_ADD +Severity=Informational +Facility=System +Language=English +<Add ADD command help text here> +. +Language=Polish +<Add ADD command help text here> +. +Language=Portugese +<Add ADD command help text here> +. +Language=Romanian +<Add ADD command help text here> +. +Language=Russian +<Add ADD command help text here> +. +Language=Albanian +<Add ADD command help text here> +. +Language=Turkish +<Add ADD command help text here> +. +Language=Chinese +<Add ADD command help text here> +. +Language=Taiwanese +<Add ADD command help text here> +. + + +MessageId=10002 +SymbolicName=MSG_COMMAND_ASSIGN +Severity=Informational +Facility=System +Language=English +<Add ASSIGN command help text here> +. +Language=Polish +<Add ASSIGN command help text here> +. +Language=Portugese +<Add ASSIGN command help text here> +. +Language=Romanian +<Add ASSIGN command help text here> +. +Language=Russian +<Add ASSIGN command help text here> +. +Language=Albanian +<Add ASSIGN command help text here> +. +Language=Turkish +<Add ASSIGN command help text here> +. +Language=Chinese +<Add ASSIGN command help text here> +. +Language=Taiwanese +<Add ASSIGN command help text here> +. + + +MessageId=10003 +SymbolicName=MSG_COMMAND_ATTACH +Severity=Informational +Facility=System +Language=English +<Add ATTACH command help text here> +. +Language=Polish +<Add ATTACH command help text here> +. +Language=Portugese +<Add ATTACH command help text here> +. +Language=Romanian +<Add ATTACH command help text here> +. +Language=Russian +<Add ATTACH command help text here> +. +Language=Albanian +<Add ATTACH command help text here> +. +Language=Turkish +<Add ATTACH command help text here> +. +Language=Chinese +<Add ATTACH command help text here> +. +Language=Taiwanese +<Add ATTACH command help text here> +. + + +MessageId=10004 +SymbolicName=MSG_COMMAND_ATTRIBUTES +Severity=Informational +Facility=System +Language=English +<Add ATTRIBUTES command help text here> +. +Language=Polish +<Add ATTRIBUTES command help text here> +. +Language=Portugese +<Add ATTRIBUTES command help text here> +. +Language=Romanian +<Add ATTRIBUTES command help text here> +. +Language=Russian +<Add ATTRIBUTES command help text here> +. +Language=Albanian +<Add ATTRIBUTES command help text here> +. +Language=Turkish +<Add ATTRIBUTES command help text here> +. +Language=Chinese +<Add ATTRIBUTES command help text here> +. +Language=Taiwanese +<Add ATTRIBUTES command help text here> +. + + +MessageId=10005 +SymbolicName=MSG_COMMAND_AUTOMOUNT +Severity=Informational +Facility=System +Language=English +<Add AUTOMOUNT command help text here> +. +Language=Polish +<Add AUTOMOUNT command help text here> +. +Language=Portugese +<Add AUTOMOUNT command help text here> +. +Language=Romanian +<Add AUTOMOUNT command help text here> +. +Language=Russian +<Add AUTOMOUNT command help text here> +. +Language=Albanian +<Add AUTOMOUNT command help text here> +. +Language=Turkish +<Add AUTOMOUNT command help text here> +. +Language=Chinese +<Add AUTOMOUNT command help text here> +. +Language=Taiwanese +<Add AUTOMOUNT command help text here> +. + + + +MessageId=10006 +SymbolicName=MSG_COMMAND_BREAK +Severity=Informational +Facility=System +Language=English +<Add BREAK command help text here> +. +Language=Polish +<Add BREAK command help text here> +. +Language=Portugese +<Add BREAK command help text here> +. +Language=Romanian +<Add BREAK command help text here> +. +Language=Russian +<Add BREAK command help text here> +. +Language=Albanian +<Add BREAK command help text here> +. +Language=Turkish +<Add BREAK command help text here> +. +Language=Chinese +<Add BREAK command help text here> +. +Language=Taiwanese +<Add BREAK command help text here> +. + + +MessageId=10007 +SymbolicName=MSG_COMMAND_CLEAN +Severity=Informational +Facility=System +Language=English +<Add CLEAN command help text here> +. +Language=Polish +<Add CLEAN command help text here> +. +Language=Portugese +<Add CLEAN command help text here> +. +Language=Romanian +<Add CLEAN command help text here> +. +Language=Russian +<Add CLEAN command help text here> +. +Language=Albanian +<Add CLEAN command help text here> +. +Language=Turkish +<Add CLEAN command help text here> +. +Language=Chinese +<Add CLEAN command help text here> +. +Language=Taiwanese +<Add CLEAN command help text here> +. + + +MessageId=10008 +SymbolicName=MSG_COMMAND_COMPACT +Severity=Informational +Facility=System +Language=English +<Add COMPACT command help text here> +. +Language=Polish +<Add COMPACT command help text here> +. +Language=Portugese +<Add COMPACT command help text here> +. +Language=Romanian +<Add COMPACT command help text here> +. +Language=Russian +<Add COMPACT command help text here> +. +Language=Albanian +<Add COMPACT command help text here> +. +Language=Turkish +<Add COMPACT command help text here> +. +Language=Chinese +<Add COMPACT command help text here> +. +Language=Taiwanese +<Add COMPACT command help text here> +. + + +MessageId=10010 +SymbolicName=MSG_COMMAND_CONVERT +Severity=Informational +Facility=System +Language=English +<Add CONVERT command help text here> +. +Language=Polish +<Add CONVERT command help text here> +. +Language=Portugese +<Add CONVERT command help text here> +. +Language=Romanian +<Add CONVERT command help text here> +. +Language=Russian +<Add CONVERT command help text here> +. +Language=Albanian +<Add CONVERT command help text here> +. +Language=Turkish +<Add CONVERT command help text here> +. +Language=Chinese +<Add CONVERT command help text here> +. +Language=Taiwanese +<Add CONVERT command help text here> +. + + +MessageId=10011 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_EFI +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION EFI command help text here> +. +Language=Polish +<Add CREATE PARTITION EFI command help text here> +. +Language=Portugese +<Add CREATE PARTITION EFI command help text here> +. +Language=Romanian +<Add CREATE PARTITION EFI command help text here> +. +Language=Russian +<Add CREATE PARTITION EFI command help text here> +. +Language=Albanian +<Add CREATE PARTITION EFI command help text here> +. +Language=Turkish +<Add CREATE PARTITION EFI command help text here> +. +Language=Chinese +<Add CREATE PARTITION EFI command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION EFI command help text here> +. + + +MessageId=10012 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_EXTENDED +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Polish +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Portugese +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Romanian +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Russian +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Albanian +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Turkish +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Chinese +<Add CREATE PARTITION EXTENDED command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION EXTENDED command help text here> +. + + +MessageId=10013 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_LOGICAL +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Polish +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Portugese +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Romanian +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Russian +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Albanian +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Turkish +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Chinese +<Add CREATE PARTITION LOGICAL command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION LOGICAL command help text here> +. + + +MessageId=10014 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_MSR +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION MSR command help text here> +. +Language=Polish +<Add CREATE PARTITION MSR command help text here> +. +Language=Portugese +<Add CREATE PARTITION MSR command help text here> +. +Language=Romanian +<Add CREATE PARTITION MSR command help text here> +. +Language=Russian +<Add CREATE PARTITION MSR command help text here> +. +Language=Albanian +<Add CREATE PARTITION MSR command help text here> +. +Language=Turkish +<Add CREATE PARTITION MSR command help text here> +. +Language=Chinese +<Add CREATE PARTITION MSR command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION MSR command help text here> +. + + +MessageId=10015 +SymbolicName=MSG_COMMAND_CREATE_PARTITION_PRIMARY +Severity=Informational +Facility=System +Language=English +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Polish +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Portugese +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Romanian +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Russian +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Albanian +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Turkish +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Chinese +<Add CREATE PARTITION PRIMARY command help text here> +. +Language=Taiwanese +<Add CREATE PARTITION PRIMARY command help text here> +. + + +MessageId=10016 +SymbolicName=MSG_COMMAND_DELETE_DISK +Severity=Informational +Facility=System +Language=English +<Add DELETE DISK command help text here> +. +Language=Polish +<Add DELETE DISK command help text here> +. +Language=Portugese +<Add DELETE DISK command help text here> +. +Language=Romanian +<Add DELETE DISK command help text here> +. +Language=Russian +<Add DELETE DISK command help text here> +. +Language=Albanian +<Add DELETE DISK command help text here> +. +Language=Turkish +<Add DELETE DISK command help text here> +. +Language=Chinese +<Add DELETE DISK command help text here> +. +Language=Taiwanese +<Add DELETE DISK command help text here> +. + + +MessageId=10017 +SymbolicName=MSG_COMMAND_DELETE_PARTITION +Severity=Informational +Facility=System +Language=English +<Add DELETE PARTITION command help text here> +. +Language=Polish +<Add DELETE PARTITION command help text here> +. +Language=Portugese +<Add DELETE PARTITION command help text here> +. +Language=Romanian +<Add DELETE PARTITION command help text here> +. +Language=Russian +<Add DELETE PARTITION command help text here> +. +Language=Albanian +<Add DELETE PARTITION command help text here> +. +Language=Turkish +<Add DELETE PARTITION command help text here> +. +Language=Chinese +<Add DELETE PARTITION command help text here> +. +Language=Taiwanese +<Add DELETE PARTITION command help text here> +. + + +MessageId=10018 +SymbolicName=MSG_COMMAND_DELETE_VOLUME +Severity=Informational +Facility=System +Language=English +<Add DELETE VOLUME command help text here> +. +Language=Polish +<Add DELETE VOLUME command help text here> +. +Language=Portugese +<Add DELETE VOLUME command help text here> +. +Language=Romanian +<Add DELETE VOLUME command help text here> +. +Language=Russian +<Add DELETE VOLUME command help text here> +. +Language=Albanian +<Add DELETE VOLUME command help text here> +. +Language=Turkish +<Add DELETE VOLUME command help text here> +. +Language=Chinese +<Add DELETE VOLUME command help text here> +. +Language=Taiwanese +<Add DELETE VOLUME command help text here> +. + + +MessageId=10019 +SymbolicName=MSG_COMMAND_DETAIL_DISK +Severity=Informational +Facility=System +Language=English +<Add DETAIL DISK command help text here> +. +Language=Polish +<Add DETAIL DISK command help text here> +. +Language=Portugese +<Add DETAIL DISK command help text here> +. +Language=Romanian +<Add DETAIL DISK command help text here> +. +Language=Russian +<Add DETAIL DISK command help text here> +. +Language=Albanian +<Add DETAIL DISK command help text here> +. +Language=Turkish +<Add DETAIL DISK command help text here> +. +Language=Chinese +<Add DETAIL DISK command help text here> +. +Language=Taiwanese +<Add DETAIL DISK command help text here> +. + +MessageId=10020 +SymbolicName=MSG_COMMAND_DETAIL_PARTITION +Severity=Informational +Facility=System +Language=English +<Add DETAIL PARTITION command help text here> +. +Language=Polish +<Add DETAIL PARTITION command help text here> +. +Language=Portugese +<Add DETAIL PARTITION command help text here> +. +Language=Romanian +<Add DETAIL PARTITION command help text here> +. +Language=Russian +<Add DETAIL PARTITION command help text here> +. +Language=Albanian +<Add DETAIL PARTITION command help text here> +. +Language=Turkish +<Add DETAIL PARTITION command help text here> +. +Language=Chinese +<Add DETAIL PARTITION command help text here> +. +Language=Taiwanese +<Add DETAIL PARTITION command help text here> +. + +MessageId=10021 +SymbolicName=MSG_COMMAND_DETAIL_VOLUME +Severity=Informational +Facility=System +Language=English +<Add DETAIL VOLUME command help text here> +. +Language=Polish +<Add DETAIL VOLUME command help text here> +. +Language=Portugese +<Add DETAIL VOLUME command help text here> +. +Language=Romanian +<Add DETAIL VOLUME command help text here> +. +Language=Russian +<Add DETAIL VOLUME command help text here> +. +Language=Albanian +<Add DETAIL VOLUME command help text here> +. +Language=Turkish +<Add DETAIL VOLUME command help text here> +. +Language=Chinese +<Add DETAIL VOLUME command help text here> +. +Language=Taiwanese +<Add DETAIL VOLUME command help text here> +. + + +MessageId=10022 +SymbolicName=MSG_COMMAND_DETACH +Severity=Informational +Facility=System +Language=English +<Add DETACH command help text here> +. +Language=Polish +<Add DETACH command help text here> +. +Language=Portugese +<Add DETACH command help text here> +. +Language=Romanian +<Add DETACH command help text here> +. +Language=Russian +<Add DETACH command help text here> +. +Language=Albanian +<Add DETACH command help text here> +. +Language=Turkish +<Add DETACH command help text here> +. +Language=Chinese +<Add DETACH command help text here> +. +Language=Taiwanese +<Add DETACH command help text here> +. + + +MessageId=10023 +SymbolicName=MSG_COMMAND_EXIT +Severity=Informational +Facility=System +Language=English +<Add EXIT command help text here> +. +Language=Polish +<Add EXIT command help text here> +. +Language=Portugese +<Add EXIT command help text here> +. +Language=Romanian +<Add EXIT command help text here> +. +Language=Russian +<Add EXIT command help text here> +. +Language=Albanian +<Add EXIT command help text here> +. +Language=Turkish +<Add EXIT command help text here> +. +Language=Chinese +<Add EXIT command help text here> +. +Language=Taiwanese +<Add EXIT command help text here> +. + + +MessageId=10024 +SymbolicName=MSG_COMMAND_EXPAND +Severity=Informational +Facility=System +Language=English +<Add EXPAND command help text here> +. +Language=Polish +<Add EXPAND command help text here> +. +Language=Portugese +<Add EXPAND command help text here> +. +Language=Romanian +<Add EXPAND command help text here> +. +Language=Russian +<Add EXPAND command help text here> +. +Language=Albanian +<Add EXPAND command help text here> +. +Language=Turkish +<Add EXPAND command help text here> +. +Language=Chinese +<Add EXPAND command help text here> +. +Language=Taiwanese +<Add EXPAND command help text here> +. + + +MessageId=10025 +SymbolicName=MSG_COMMAND_EXTEND +Severity=Informational +Facility=System +Language=English +<Add EXTEND command help text here> +. +Language=Polish +<Add EXTEND command help text here> +. +Language=Portugese +<Add EXTEND command help text here> +. +Language=Romanian +<Add EXTEND command help text here> +. +Language=Russian +<Add EXTEND command help text here> +. +Language=Albanian +<Add EXTEND command help text here> +. +Language=Turkish +<Add EXTEND command help text here> +. +Language=Chinese +<Add EXTEND command help text here> +. +Language=Taiwanese +<Add EXTEND command help text here> +. + + +MessageId=10026 +SymbolicName=MSG_COMMAND_FILESYSTEMS +Severity=Informational +Facility=System +Language=English +<Add FILESYSTEMS command help text here> +. +Language=Polish +<Add FILESYSTEMS command help text here> +. +Language=Portugese +<Add FILESYSTEMS command help text here> +. +Language=Romanian +<Add FILESYSTEMS command help text here> +. +Language=Russian +<Add FILESYSTEMS command help text here> +. +Language=Albanian +<Add FILESYSTEMS command help text here> +. +Language=Turkish +<Add FILESYSTEMS command help text here> +. +Language=Chinese +<Add FILESYSTEMS command help text here> +. +Language=Taiwanese +<Add FILESYSTEMS command help text here> +. + + +MessageId=10027 +SymbolicName=MSG_COMMAND_FORMAT +Severity=Informational +Facility=System +Language=English +<Add FORMAT command help text here> +. +Language=Polish +<Add FORMAT command help text here> +. +Language=Portugese +<Add FORMAT command help text here> +. +Language=Romanian +<Add FORMAT command help text here> +. +Language=Russian +<Add FORMAT command help text here> +. +Language=Albanian +<Add FORMAT command help text here> +. +Language=Turkish +<Add FORMAT command help text here> +. +Language=Chinese +<Add FORMAT command help text here> +. +Language=Taiwanese +<Add FORMAT command help text here> +. + + +MessageId=10028 +SymbolicName=MSG_COMMAND_GPT +Severity=Informational +Facility=System +Language=English +<Add GPT command help text here> +. +Language=Polish +<Add GPT command help text here> +. +Language=Portugese +<Add GPT command help text here> +. +Language=Romanian +<Add GPT command help text here> +. +Language=Russian +<Add GPT command help text here> +. +Language=Albanian +<Add GPT command help text here> +. +Language=Turkish +<Add GPT command help text here> +. +Language=Chinese +<Add GPT command help text here> +. +Language=Taiwanese +<Add GPT command help text here> +. + + +MessageId=10029 +SymbolicName=MSG_COMMAND_HELP +Severity=Informational +Facility=System +Language=English +<Add HELP command help text here> +. +Language=Polish +<Add HELP command help text here> +. +Language=Portugese +<Add HELP command help text here> +. +Language=Romanian +<Add HELP command help text here> +. +Language=Russian +<Add HELP command help text here> +. +Language=Albanian +<Add HELP command help text here> +. +Language=Turkish +<Add HELP command help text here> +. +Language=Chinese +<Add HELP command help text here> +. +Language=Taiwanese +<Add HELP command help text here> +. + + +MessageId=10030 +SymbolicName=MSG_COMMAND_IMPORT +Severity=Informational +Facility=System +Language=English +<Add IMPORT command help text here> +. +Language=Polish +<Add IMPORT command help text here> +. +Language=Portugese +<Add IMPORT command help text here> +. +Language=Romanian +<Add IMPORT command help text here> +. +Language=Russian +<Add IMPORT command help text here> +. +Language=Albanian +<Add IMPORT command help text here> +. +Language=Turkish +<Add IMPORT command help text here> +. +Language=Chinese +<Add IMPORT command help text here> +. +Language=Taiwanese +<Add IMPORT command help text here> +. + + +MessageId=10031 +SymbolicName=MSG_COMMAND_INACTIVE +Severity=Informational +Facility=System +Language=English +<Add INACTIVE command help text here> +. +Language=Polish +<Add INACTIVE command help text here> +. +Language=Portugese +<Add INACTIVE command help text here> +. +Language=Romanian +<Add INACTIVE command help text here> +. +Language=Russian +<Add INACTIVE command help text here> +. +Language=Albanian +<Add INACTIVE command help text here> +. +Language=Turkish +<Add INACTIVE command help text here> +. +Language=Chinese +<Add INACTIVE command help text here> +. +Language=Taiwanese +<Add INACTIVE command help text here> +. + + +MessageId=10032 +SymbolicName=MSG_COMMAND_LIST_DISK +Severity=Informational +Facility=System +Language=English +<Add LIST DISK command help text here> +. +Language=Polish +<Add LIST DISK command help text here> +. +Language=Portugese +<Add LIST DISK command help text here> +. +Language=Romanian +<Add LIST DISK command help text here> +. +Language=Russian +<Add LIST DISK command help text here> +. +Language=Albanian +<Add LIST DISK command help text here> +. +Language=Turkish +<Add LIST DISK command help text here> +. +Language=Chinese +<Add LIST DISK command help text here> +. +Language=Taiwanese +<Add LIST DISK command help text here> +. + +MessageId=10033 +SymbolicName=MSG_COMMAND_LIST_PARTITION +Severity=Informational +Facility=System +Language=English +<Add LIST PARTITION command help text here> +. +Language=Polish +<Add LIST PARTITION command help text here> +. +Language=Portugese +<Add LIST PARTITION command help text here> +. +Language=Romanian +<Add LIST PARTITION command help text here> +. +Language=Russian +<Add LIST PARTITION command help text here> +. +Language=Albanian +<Add LIST PARTITION command help text here> +. +Language=Turkish +<Add LIST PARTITION command help text here> +. +Language=Chinese +<Add LIST PARTITION command help text here> +. +Language=Taiwanese +<Add LIST PARTITION command help text here> +. + + +MessageId=10034 +SymbolicName=MSG_COMMAND_LIST_VOLUME +Severity=Informational +Facility=System +Language=English +<Add LIST VOLUME command help text here> +. +Language=Polish +<Add LIST VOLUME command help text here> +. +Language=Portugese +<Add LIST VOLUME command help text here> +. +Language=Romanian +<Add LIST VOLUME command help text here> +. +Language=Russian +<Add LIST VOLUME command help text here> +. +Language=Albanian +<Add LIST VOLUME command help text here> +. +Language=Turkish +<Add LIST VOLUME command help text here> +. +Language=Chinese +<Add LIST VOLUME command help text here> +. +Language=Taiwanese +<Add LIST VOLUME command help text here> +. + + +MessageId=10035 +SymbolicName=MSG_COMMAND_LIST_VDISK +Severity=Informational +Facility=System +Language=English +<Add LIST VDISK command help text here> +. +Language=Polish +<Add LIST VDISK command help text here> +. +Language=Portugese +<Add LIST VDISK command help text here> +. +Language=Romanian +<Add LIST VDISK command help text here> +. +Language=Russian +<Add LIST VDISK command help text here> +. +Language=Albanian +<Add LIST VDISK command help text here> +. +Language=Turkish +<Add LIST VDISK command help text here> +. +Language=Chinese +<Add LIST VDISK command help text here> +. +Language=Taiwanese +<Add LIST VDISK command help text here> +. + + +MessageId=10036 +SymbolicName=MSG_COMMAND_MERGE +Severity=Informational +Facility=System +Language=English +<Add MERGE command help text here> +. +Language=Polish +<Add MERGE command help text here> +. +Language=Portugese +<Add MERGE command help text here> +. +Language=Romanian +<Add MERGE command help text here> +. +Language=Russian +<Add MERGE command help text here> +. +Language=Albanian +<Add MERGE command help text here> +. +Language=Turkish +<Add MERGE command help text here> +. +Language=Chinese +<Add MERGE command help text here> +. +Language=Taiwanese +<Add MERGE command help text here> +. + + +MessageId=10037 +SymbolicName=MSG_COMMAND_OFFLINE +Severity=Informational +Facility=System +Language=English +<Add OFFLINE command help text here> +. +Language=Polish +<Add OFFLINE command help text here> +. +Language=Portugese +<Add OFFLINE command help text here> +. +Language=Romanian +<Add OFFLINE command help text here> +. +Language=Russian +<Add OFFLINE command help text here> +. +Language=Albanian +<Add OFFLINE command help text here> +. +Language=Turkish +<Add OFFLINE command help text here> +. +Language=Chinese +<Add OFFLINE command help text here> +. +Language=Taiwanese +<Add OFFLINE command help text here> +. + + +MessageId=10038 +SymbolicName=MSG_COMMAND_ONLINE +Severity=Informational +Facility=System +Language=English +<Add ONLINE command help text here> +. +Language=Polish +<Add ONLINE command help text here> +. +Language=Portugese +<Add ONLINE command help text here> +. +Language=Romanian +<Add ONLINE command help text here> +. +Language=Russian +<Add ONLINE command help text here> +. +Language=Albanian +<Add ONLINE command help text here> +. +Language=Turkish +<Add ONLINE command help text here> +. +Language=Chinese +<Add ONLINE command help text here> +. +Language=Taiwanese +<Add ONLINE command help text here> +. + + +MessageId=10039 +SymbolicName=MSG_COMMAND_RECOVER +Severity=Informational +Facility=System +Language=English +<Add RECOVER command help text here> +. +Language=Polish +<Add RECOVER command help text here> +. +Language=Portugese +<Add RECOVER command help text here> +. +Language=Romanian +<Add RECOVER command help text here> +. +Language=Russian +<Add RECOVER command help text here> +. +Language=Albanian +<Add RECOVER command help text here> +. +Language=Turkish +<Add RECOVER command help text here> +. +Language=Chinese +<Add RECOVER command help text here> +. +Language=Taiwanese +<Add RECOVER command help text here> +. + + +MessageId=10040 +SymbolicName=MSG_COMMAND_REM +Severity=Informational +Facility=System +Language=English +<Add REM command help text here> +. +Language=Polish +<Add REM command help text here> +. +Language=Portugese +<Add REM command help text here> +. +Language=Romanian +<Add REM command help text here> +. +Language=Russian +<Add REM command help text here> +. +Language=Albanian +<Add REM command help text here> +. +Language=Turkish +<Add REM command help text here> +. +Language=Chinese +<Add REM command help text here> +. +Language=Taiwanese +<Add REM command help text here> +. + + +MessageId=10041 +SymbolicName=MSG_COMMAND_REMOVE +Severity=Informational +Facility=System +Language=English +<Add REMOVE command help text here> +. +Language=Polish +<Add REMOVE command help text here> +. +Language=Portugese +<Add REMOVE command help text here> +. +Language=Romanian +<Add REMOVE command help text here> +. +Language=Russian +<Add REMOVE command help text here> +. +Language=Albanian +<Add REMOVE command help text here> +. +Language=Turkish +<Add REMOVE command help text here> +. +Language=Chinese +<Add REMOVE command help text here> +. +Language=Taiwanese +<Add REMOVE command help text here> +. + + +MessageId=10042 +SymbolicName=MSG_COMMAND_REPAIR +Severity=Informational +Facility=System +Language=English +<Add REPAIR command help text here> +. +Language=Polish +<Add REPAIR command help text here> +. +Language=Portugese +<Add REPAIR command help text here> +. +Language=Romanian +<Add REPAIR command help text here> +. +Language=Russian +<Add REPAIR command help text here> +. +Language=Albanian +<Add REPAIR command help text here> +. +Language=Turkish +<Add REPAIR command help text here> +. +Language=Chinese +<Add REPAIR command help text here> +. +Language=Taiwanese +<Add REPAIR command help text here> +. + + +MessageId=10043 +SymbolicName=MSG_COMMAND_RESCAN +Severity=Informational +Facility=System +Language=English +<Add RESCAN command help text here> +. +Language=Polish +<Add RESCAN command help text here> +. +Language=Portugese +<Add RESCAN command help text here> +. +Language=Romanian +<Add RESCAN command help text here> +. +Language=Russian +<Add RESCAN command help text here> +. +Language=Albanian +<Add RESCAN command help text here> +. +Language=Turkish +<Add RESCAN command help text here> +. +Language=Chinese +<Add RESCAN command help text here> +. +Language=Taiwanese +<Add RESCAN command help text here> +. + + +MessageId=10044 +SymbolicName=MSG_COMMAND_RETAIN +Severity=Informational +Facility=System +Language=English +<Add RETAIN command help text here> +. +Language=Polish +<Add RETAIN command help text here> +. +Language=Portugese +<Add RETAIN command help text here> +. +Language=Romanian +<Add RETAIN command help text here> +. +Language=Russian +<Add RETAIN command help text here> +. +Language=Albanian +<Add RETAIN command help text here> +. +Language=Turkish +<Add RETAIN command help text here> +. +Language=Chinese +<Add RETAIN command help text here> +. +Language=Taiwanese +<Add RETAIN command help text here> +. + + +MessageId=10045 +SymbolicName=MSG_COMMAND_SAN +Severity=Informational +Facility=System +Language=English +<Add SAN command help text here> +. +Language=Polish +<Add SAN command help text here> +. +Language=Portugese +<Add SAN command help text here> +. +Language=Romanian +<Add SAN command help text here> +. +Language=Russian +<Add SAN command help text here> +. +Language=Albanian +<Add SAN command help text here> +. +Language=Turkish +<Add SAN command help text here> +. +Language=Chinese +<Add SAN command help text here> +. +Language=Taiwanese +<Add SAN command help text here> +. + + +MessageId=10046 +SymbolicName=MSG_COMMAND_SELECT_DISK +Severity=Informational +Facility=System +Language=English +<Add SELECT DISK command help text here> +. +Language=Polish +<Add SELECT DISK command help text here> +. +Language=Portugese +<Add SELECT DISK command help text here> +. +Language=Romanian +<Add SELECT DISK command help text here> +. +Language=Russian +<Add SELECT DISK command help text here> +. +Language=Albanian +<Add SELECT DISK command help text here> +. +Language=Turkish +<Add SELECT DISK command help text here> +. +Language=Chinese +<Add SELECT DISK command help text here> +. +Language=Taiwanese +<Add SELECT DISK command help text here> +. + + +MessageId=10047 +SymbolicName=MSG_COMMAND_SELECT_PARTITION +Severity=Informational +Facility=System +Language=English +<Add SELECT PARTITION command help text here> +. +Language=Polish +<Add SELECT PARTITION command help text here> +. +Language=Portugese +<Add SELECT PARTITION command help text here> +. +Language=Romanian +<Add SELECT PARTITION command help text here> +. +Language=Russian +<Add SELECT PARTITION command help text here> +. +Language=Albanian +<Add SELECT PARTITION command help text here> +. +Language=Turkish +<Add SELECT PARTITION command help text here> +. +Language=Chinese +<Add SELECT PARTITION command help text here> +. +Language=Taiwanese +<Add SELECT PARTITION command help text here> +. + + +MessageId=10048 +SymbolicName=MSG_COMMAND_SELECT_VOLUME +Severity=Informational +Facility=System +Language=English +<Add SELECT VOLUME command help text here> +. +Language=Polish +<Add SELECT VOLUME command help text here> +. +Language=Portugese +<Add SELECT VOLUME command help text here> +. +Language=Romanian +<Add SELECT VOLUME command help text here> +. +Language=Russian +<Add SELECT VOLUME command help text here> +. +Language=Albanian +<Add SELECT VOLUME command help text here> +. +Language=Turkish +<Add SELECT VOLUME command help text here> +. +Language=Chinese +<Add SELECT VOLUME command help text here> +. +Language=Taiwanese +<Add SELECT VOLUME command help text here> +. + + +MessageId=10049 +SymbolicName=MSG_COMMAND_SELECT_VDISK +Severity=Informational +Facility=System +Language=English +<Add SELECT VDISK command help text here> +. +Language=Polish +<Add SELECT VDISK command help text here> +. +Language=Portugese +<Add SELECT VDISK command help text here> +. +Language=Romanian +<Add SELECT VDISK command help text here> +. +Language=Russian +<Add SELECT VDISK command help text here> +. +Language=Albanian +<Add SELECT VDISK command help text here> +. +Language=Turkish +<Add SELECT VDISK command help text here> +. +Language=Chinese +<Add SELECT VDISK command help text here> +. +Language=Taiwanese +<Add SELECT VDISK command help text here> +. + + +MessageId=10050 +SymbolicName=MSG_COMMAND_SETID +Severity=Informational +Facility=System +Language=English +<Add SETID command help text here> +. +Language=Polish +<Add SETID command help text here> +. +Language=Portugese +<Add SETID command help text here> +. +Language=Romanian +<Add SETID command help text here> +. +Language=Russian +<Add SETID command help text here> +. +Language=Albanian +<Add SETID command help text here> +. +Language=Turkish +<Add SETID command help text here> +. +Language=Chinese +<Add SETID command help text here> +. +Language=Taiwanese +<Add SETID command help text here> +. + + +MessageId=10051 +SymbolicName=MSG_COMMAND_SHRINK +Severity=Informational +Facility=System +Language=English +<Add SHRINK command help text here> +. +Language=Polish +<Add SHRINK command help text here> +. +Language=Portugese +<Add SHRINK command help text here> +. +Language=Romanian +<Add SHRINK command help text here> +. +Language=Russian +<Add SHRINK command help text here> +. +Language=Albanian +<Add SHRINK command help text here> +. +Language=Turkish +<Add SHRINK command help text here> +. +Language=Chinese +<Add SHRINK command help text here> +. +Language=Taiwanese +<Add SHRINK command help text here> +. + + +MessageId=10052 +SymbolicName=MSG_COMMAND_UNIQUEID_DISK +Severity=Informational +Facility=System +Language=English +<Add UNIQUEID DISK command help text here> +. +Language=Polish +<Add UNIQUEID DISK command help text here> +. +Language=Portugese +<Add UNIQUEID DISK command help text here> +. +Language=Romanian +<Add UNIQUEID DISK command help text here> +. +Language=Russian +<Add UNIQUEID DISK command help text here> +. +Language=Albanian +<Add UNIQUEID DISK command help text here> +. +Language=Turkish +<Add UNIQUEID DISK command help text here> +. +Language=Chinese +<Add UNIQUEID DISK command help text here> +. +Language=Taiwanese +<Add UNIQUEID DISK command help text here> +. diff --git a/base/system/diskpart/help.c b/base/system/diskpart/help.c index d271844d0cf..f2a23960ae0 100644 --- a/base/system/diskpart/help.c +++ b/base/system/diskpart/help.c @@ -87,17 +87,17 @@ HelpCommand( if ((wcsicmp(pCommand->cmd1, cmdptr->cmd1) == 0) && (wcsicmp(pCommand->cmd2, cmdptr->cmd2) == 0) && (wcsicmp(pCommand->cmd3, cmdptr->cmd3) == 0) && - (cmdptr->help_detail != IDS_NONE)) + (cmdptr->help_detail != MSG_NONE)) { - ConResPuts(StdOut, cmdptr->help_detail); + PrintMessageString(cmdptr->help_detail); bSubCommands = TRUE; } } } - if ((bSubCommands == FALSE) && (pCommand->help_detail != IDS_NONE)) + if ((bSubCommands == FALSE) && (pCommand->help_detail != MSG_NONE)) { - ConResPuts(StdOut, pCommand->help_detail); + PrintMessageString(pCommand->help_detail); } ConPuts(StdOut, L"\n"); diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index d2decf537f1..08be9411fdb 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -8,6 +8,7 @@ */ #include "diskpart.h" +#include "diskpart_msg.h" BOOL exit_main(INT argc, LPWSTR *argv); BOOL rem_main(INT argc, LPWSTR *argv); @@ -15,83 +16,83 @@ BOOL rem_main(INT argc, LPWSTR *argv); COMMAND cmds[] = { - {L"ACTIVE", NULL, NULL, active_main, IDS_HELP_ACTIVE, IDS_COMMAND_ACTIVE}, - {L"ADD", NULL, NULL, add_main, IDS_HELP_ADD, IDS_COMMAND_ADD}, - {L"ASSIGN", NULL, NULL, assign_main, IDS_HELP_ASSIGN, IDS_COMMAND_ASSIGN}, - {L"ATTACH", NULL, NULL, attach_main, IDS_HELP_ATTACH, IDS_COMMAND_ATTACH}, - {L"ATTRIBUTES", NULL, NULL, attributes_main, IDS_HELP_ATTRIBUTES, IDS_COMMAND_ATTRIBUTES}, - {L"AUTOMOUNT", NULL, NULL, automount_main, IDS_HELP_AUTOMOUNT, IDS_COMMAND_AUTOMOUNT}, - {L"BREAK", NULL, NULL, break_main, IDS_HELP_BREAK, IDS_COMMAND_BREAK}, - {L"CLEAN", NULL, NULL, clean_main, IDS_HELP_CLEAN, IDS_COMMAND_CLEAN}, - {L"COMPACT", NULL, NULL, compact_main, IDS_HELP_COMPACT, IDS_COMMAND_COMPACT}, - {L"CONVERT", NULL, NULL, convert_main, IDS_HELP_CONVERT, IDS_COMMAND_CONVERT}, - - {L"CREATE", NULL, NULL, NULL, IDS_HELP_CREATE, IDS_NONE}, - {L"CREATE", L"PARTITION", NULL, NULL, IDS_HELP_CREATE_PARTITION, IDS_NONE}, -// {L"CREATE", L"PARTITION", L"EFI", CreateEfiPartition, IDS_HELP_CREATE_PARTITION_EFI, IDS_COMMAND_CREATE_PARTITION_EFI}, - {L"CREATE", L"PARTITION", L"EXTENDED", CreateExtendedPartition, IDS_HELP_CREATE_PARTITION_EXTENDED, IDS_COMMAND_CREATE_PARTITION_EXTENDED}, - {L"CREATE", L"PARTITION", L"LOGICAL", CreateLogicalPartition, IDS_HELP_CREATE_PARTITION_LOGICAL, IDS_COMMAND_CREATE_PARTITION_LOGICAL}, -// {L"CREATE", L"PARTITION", L"MSR", CreateMsrPartition, IDS_HELP_CREATE_PARTITION_MSR, IDS_COMMAND_CREATE_PARTITION_MSR}, - {L"CREATE", L"PARTITION", L"PRIMARY", CreatePrimaryPartition, IDS_HELP_CREATE_PARTITION_PRIMARY, IDS_COMMAND_CREATE_PARTITION_PRIMARY}, - {L"CREATE", L"VOLUME", NULL, NULL, IDS_HELP_CREATE_VOLUME, IDS_NONE}, - {L"CREATE", L"VDISK", NULL, NULL, IDS_HELP_CREATE_VDISK, IDS_NONE}, - - {L"DELETE", NULL, NULL, NULL, IDS_HELP_DELETE, IDS_NONE}, - {L"DELETE", L"DISK", NULL, DeleteDisk, IDS_HELP_DELETE_DISK, IDS_COMMAND_DELETE_DISK}, - {L"DELETE", L"PARTITION", NULL, DeletePartition, IDS_HELP_DELETE_PARTITION, IDS_COMMAND_DELETE_PARTITION}, - {L"DELETE", L"VOLUME", NULL, DeleteVolume, IDS_HELP_DELETE_VOLUME, IDS_COMMAND_DELETE_VOLUME}, - - {L"DETACH", NULL, NULL, detach_main, IDS_HELP_DETACH, IDS_COMMAND_DETACH}, - - {L"DETAIL", NULL, NULL, NULL, IDS_HELP_DETAIL, IDS_NONE}, - {L"DETAIL", L"DISK", NULL, DetailDisk, IDS_HELP_DETAIL_DISK, IDS_COMMAND_DETAIL_DISK}, - {L"DETAIL", L"PARTITION", NULL, DetailPartition, IDS_HELP_DETAIL_PARTITION, IDS_COMMAND_DETAIL_PARTITION}, - {L"DETAIL", L"VOLUME", NULL, DetailVolume, IDS_HELP_DETAIL_VOLUME, IDS_COMMAND_DETAIL_VOLUME}, - - {L"DUMP", NULL, NULL, NULL, IDS_NONE, IDS_NONE}, - {L"DUMP", L"DISK", NULL, DumpDisk, IDS_NONE, IDS_NONE}, - {L"DUMP", L"PARTITION", NULL, DumpPartition, IDS_NONE, IDS_NONE}, - {L"EXIT", NULL, NULL, NULL, IDS_HELP_EXIT, IDS_COMMAND_EXIT}, - - {L"EXPAND", NULL, NULL, expand_main, IDS_HELP_EXPAND, IDS_COMMAND_EXPAND}, - {L"EXTEND", NULL, NULL, extend_main, IDS_HELP_EXTEND, IDS_COMMAND_EXTEND}, - {L"FILESYSTEMS", NULL, NULL, filesystems_main, IDS_HELP_FILESYSTEMS, IDS_COMMAND_FILESYSTEMS}, - {L"FORMAT", NULL, NULL, format_main, IDS_HELP_FORMAT, IDS_COMMAND_FORMAT}, - {L"GPT", NULL, NULL, gpt_main, IDS_HELP_GPT, IDS_COMMAND_GPT}, - {L"HELP", NULL, NULL, help_main, IDS_HELP_HELP, IDS_COMMAND_HELP}, - {L"IMPORT", NULL, NULL, import_main, IDS_HELP_IMPORT, IDS_COMMAND_IMPORT}, - {L"INACTIVE", NULL, NULL, inactive_main, IDS_HELP_INACTIVE, IDS_COMMAND_INACTIVE}, - - {L"LIST", NULL, NULL, NULL, IDS_HELP_LIST, IDS_NONE}, - {L"LIST", L"DISK", NULL, ListDisk, IDS_HELP_LIST_DISK, IDS_COMMAND_LIST_DISK}, - {L"LIST", L"PARTITION", NULL, ListPartition, IDS_HELP_LIST_PARTITION, IDS_COMMAND_LIST_PARTITION}, - {L"LIST", L"VOLUME", NULL, ListVolume, IDS_HELP_LIST_VOLUME, IDS_COMMAND_LIST_VOLUME}, - {L"LIST", L"VDISK", NULL, ListVirtualDisk, IDS_HELP_LIST_VDISK, IDS_COMMAND_LIST_VDISK}, - - {L"MERGE", NULL, NULL, merge_main, IDS_HELP_MERGE, IDS_COMMAND_MERGE}, - {L"OFFLINE", NULL, NULL, offline_main, IDS_HELP_OFFLINE, IDS_COMMAND_OFFLINE}, - {L"ONLINE", NULL, NULL, online_main, IDS_HELP_ONLINE, IDS_COMMAND_ONLINE}, - {L"RECOVER", NULL, NULL, recover_main, IDS_HELP_RECOVER, IDS_COMMAND_RECOVER}, - {L"REM", NULL, NULL, NULL, IDS_HELP_REM, IDS_COMMAND_REM}, - {L"REMOVE", NULL, NULL, remove_main, IDS_HELP_REMOVE, IDS_COMMAND_REMOVE}, - {L"REPAIR", NULL, NULL, repair_main, IDS_HELP_REPAIR, IDS_COMMAND_REPAIR}, - {L"RESCAN", NULL, NULL, rescan_main, IDS_HELP_RESCAN, IDS_COMMAND_RESCAN}, - {L"RETAIN", NULL, NULL, retain_main, IDS_HELP_RETAIN, IDS_COMMAND_RETAIN}, - {L"SAN", NULL, NULL, san_main, IDS_HELP_SAN, IDS_COMMAND_SAN}, - - {L"SELECT", NULL, NULL, NULL, IDS_HELP_SELECT, IDS_NONE}, - {L"SELECT", L"DISK", NULL, SelectDisk, IDS_HELP_SELECT_DISK, IDS_COMMAND_SELECT_DISK}, - {L"SELECT", L"PARTITION", NULL, SelectPartition, IDS_HELP_SELECT_PARTITION, IDS_COMMAND_SELECT_PARTITION}, - {L"SELECT", L"VOLUME", NULL, SelectVolume, IDS_HELP_SELECT_VOLUME, IDS_COMMAND_SELECT_VOLUME}, -// {L"SELECT", L"VDISK", NULL, SelectVirtualDisk, IDS_HELP_SELECT_VDISK, IDS_COMMAND_SELECT_VDISK}, - - {L"SETID", NULL, NULL, setid_main, IDS_HELP_SETID, IDS_COMMAND_SETID}, - {L"SHRINK", NULL, NULL, shrink_main, IDS_HELP_SHRINK, IDS_COMMAND_SHRINK}, - - {L"UNIQUEID", NULL, NULL, NULL, IDS_HELP_UNIQUEID, IDS_NONE}, - {L"UNIQUEID", L"DISK", NULL, UniqueIdDisk, IDS_HELP_UNIQUEID_DISK, IDS_COMMAND_UNIQUEID_DISK}, - - {NULL, NULL, NULL, NULL, IDS_NONE, IDS_NONE} + {L"ACTIVE", NULL, NULL, active_main, IDS_HELP_ACTIVE, MSG_COMMAND_ACTIVE}, + {L"ADD", NULL, NULL, add_main, IDS_HELP_ADD, MSG_COMMAND_ADD}, + {L"ASSIGN", NULL, NULL, assign_main, IDS_HELP_ASSIGN, MSG_COMMAND_ASSIGN}, + {L"ATTACH", NULL, NULL, attach_main, IDS_HELP_ATTACH, MSG_COMMAND_ATTACH}, + {L"ATTRIBUTES", NULL, NULL, attributes_main, IDS_HELP_ATTRIBUTES, MSG_COMMAND_ATTRIBUTES}, + {L"AUTOMOUNT", NULL, NULL, automount_main, IDS_HELP_AUTOMOUNT, MSG_COMMAND_AUTOMOUNT}, + {L"BREAK", NULL, NULL, break_main, IDS_HELP_BREAK, MSG_COMMAND_BREAK}, + {L"CLEAN", NULL, NULL, clean_main, IDS_HELP_CLEAN, MSG_COMMAND_CLEAN}, + {L"COMPACT", NULL, NULL, compact_main, IDS_HELP_COMPACT, MSG_COMMAND_COMPACT}, + {L"CONVERT", NULL, NULL, convert_main, IDS_HELP_CONVERT, MSG_COMMAND_CONVERT}, + + {L"CREATE", NULL, NULL, NULL, IDS_HELP_CREATE, MSG_NONE}, + {L"CREATE", L"PARTITION", NULL, NULL, IDS_HELP_CREATE_PARTITION, MSG_NONE}, +// {L"CREATE", L"PARTITION", L"EFI", CreateEfiPartition, IDS_HELP_CREATE_PARTITION_EFI, MSG_COMMAND_CREATE_PARTITION_EFI}, + {L"CREATE", L"PARTITION", L"EXTENDED", CreateExtendedPartition, IDS_HELP_CREATE_PARTITION_EXTENDED, MSG_COMMAND_CREATE_PARTITION_EXTENDED}, + {L"CREATE", L"PARTITION", L"LOGICAL", CreateLogicalPartition, IDS_HELP_CREATE_PARTITION_LOGICAL, MSG_COMMAND_CREATE_PARTITION_LOGICAL}, +// {L"CREATE", L"PARTITION", L"MSR", CreateMsrPartition, IDS_HELP_CREATE_PARTITION_MSR, MSG_COMMAND_CREATE_PARTITION_MSR}, + {L"CREATE", L"PARTITION", L"PRIMARY", CreatePrimaryPartition, IDS_HELP_CREATE_PARTITION_PRIMARY, MSG_COMMAND_CREATE_PARTITION_PRIMARY}, + {L"CREATE", L"VOLUME", NULL, NULL, IDS_HELP_CREATE_VOLUME, MSG_NONE}, + {L"CREATE", L"VDISK", NULL, NULL, IDS_HELP_CREATE_VDISK, MSG_NONE}, + + {L"DELETE", NULL, NULL, NULL, IDS_HELP_DELETE, MSG_NONE}, + {L"DELETE", L"DISK", NULL, DeleteDisk, IDS_HELP_DELETE_DISK, MSG_COMMAND_DELETE_DISK}, + {L"DELETE", L"PARTITION", NULL, DeletePartition, IDS_HELP_DELETE_PARTITION, MSG_COMMAND_DELETE_PARTITION}, + {L"DELETE", L"VOLUME", NULL, DeleteVolume, IDS_HELP_DELETE_VOLUME, MSG_COMMAND_DELETE_VOLUME}, + + {L"DETACH", NULL, NULL, detach_main, IDS_HELP_DETACH, MSG_COMMAND_DETACH}, + + {L"DETAIL", NULL, NULL, NULL, IDS_HELP_DETAIL, MSG_NONE}, + {L"DETAIL", L"DISK", NULL, DetailDisk, IDS_HELP_DETAIL_DISK, MSG_COMMAND_DETAIL_DISK}, + {L"DETAIL", L"PARTITION", NULL, DetailPartition, IDS_HELP_DETAIL_PARTITION, MSG_COMMAND_DETAIL_PARTITION}, + {L"DETAIL", L"VOLUME", NULL, DetailVolume, IDS_HELP_DETAIL_VOLUME, MSG_COMMAND_DETAIL_VOLUME}, + + {L"DUMP", NULL, NULL, NULL, IDS_NONE, MSG_NONE}, + {L"DUMP", L"DISK", NULL, DumpDisk, IDS_NONE, MSG_NONE}, + {L"DUMP", L"PARTITION", NULL, DumpPartition, IDS_NONE, MSG_NONE}, + {L"EXIT", NULL, NULL, NULL, IDS_HELP_EXIT, MSG_COMMAND_EXIT}, + + {L"EXPAND", NULL, NULL, expand_main, IDS_HELP_EXPAND, MSG_COMMAND_EXPAND}, + {L"EXTEND", NULL, NULL, extend_main, IDS_HELP_EXTEND, MSG_COMMAND_EXTEND}, + {L"FILESYSTEMS", NULL, NULL, filesystems_main, IDS_HELP_FILESYSTEMS, MSG_COMMAND_FILESYSTEMS}, + {L"FORMAT", NULL, NULL, format_main, IDS_HELP_FORMAT, MSG_COMMAND_FORMAT}, + {L"GPT", NULL, NULL, gpt_main, IDS_HELP_GPT, MSG_COMMAND_GPT}, + {L"HELP", NULL, NULL, help_main, IDS_HELP_HELP, MSG_COMMAND_HELP}, + {L"IMPORT", NULL, NULL, import_main, IDS_HELP_IMPORT, MSG_COMMAND_IMPORT}, + {L"INACTIVE", NULL, NULL, inactive_main, IDS_HELP_INACTIVE, MSG_COMMAND_INACTIVE}, + + {L"LIST", NULL, NULL, NULL, IDS_HELP_LIST, MSG_NONE}, + {L"LIST", L"DISK", NULL, ListDisk, IDS_HELP_LIST_DISK, MSG_COMMAND_LIST_DISK}, + {L"LIST", L"PARTITION", NULL, ListPartition, IDS_HELP_LIST_PARTITION, MSG_COMMAND_LIST_PARTITION}, + {L"LIST", L"VOLUME", NULL, ListVolume, IDS_HELP_LIST_VOLUME, MSG_COMMAND_LIST_VOLUME}, + {L"LIST", L"VDISK", NULL, ListVirtualDisk, IDS_HELP_LIST_VDISK, MSG_COMMAND_LIST_VDISK}, + + {L"MERGE", NULL, NULL, merge_main, IDS_HELP_MERGE, MSG_COMMAND_MERGE}, + {L"OFFLINE", NULL, NULL, offline_main, IDS_HELP_OFFLINE, MSG_COMMAND_OFFLINE}, + {L"ONLINE", NULL, NULL, online_main, IDS_HELP_ONLINE, MSG_COMMAND_ONLINE}, + {L"RECOVER", NULL, NULL, recover_main, IDS_HELP_RECOVER, MSG_COMMAND_RECOVER}, + {L"REM", NULL, NULL, NULL, IDS_HELP_REM, MSG_COMMAND_REM}, + {L"REMOVE", NULL, NULL, remove_main, IDS_HELP_REMOVE, MSG_COMMAND_REMOVE}, + {L"REPAIR", NULL, NULL, repair_main, IDS_HELP_REPAIR, MSG_COMMAND_REPAIR}, + {L"RESCAN", NULL, NULL, rescan_main, IDS_HELP_RESCAN, MSG_COMMAND_RESCAN}, + {L"RETAIN", NULL, NULL, retain_main, IDS_HELP_RETAIN, MSG_COMMAND_RETAIN}, + {L"SAN", NULL, NULL, san_main, IDS_HELP_SAN, MSG_COMMAND_SAN}, + + {L"SELECT", NULL, NULL, NULL, IDS_HELP_SELECT, MSG_NONE}, + {L"SELECT", L"DISK", NULL, SelectDisk, IDS_HELP_SELECT_DISK, MSG_COMMAND_SELECT_DISK}, + {L"SELECT", L"PARTITION", NULL, SelectPartition, IDS_HELP_SELECT_PARTITION, MSG_COMMAND_SELECT_PARTITION}, + {L"SELECT", L"VOLUME", NULL, SelectVolume, IDS_HELP_SELECT_VOLUME, MSG_COMMAND_SELECT_VOLUME}, +// {L"SELECT", L"VDISK", NULL, SelectVirtualDisk, IDS_HELP_SELECT_VDISK, MSG_COMMAND_SELECT_VDISK}, + + {L"SETID", NULL, NULL, setid_main, IDS_HELP_SETID, MSG_COMMAND_SETID}, + {L"SHRINK", NULL, NULL, shrink_main, IDS_HELP_SHRINK, MSG_COMMAND_SHRINK}, + + {L"UNIQUEID", NULL, NULL, NULL, IDS_HELP_UNIQUEID, MSG_NONE}, + {L"UNIQUEID", L"DISK", NULL, UniqueIdDisk, IDS_HELP_UNIQUEID_DISK, MSG_COMMAND_UNIQUEID_DISK}, + + {NULL, NULL, NULL, NULL, IDS_NONE, MSG_NONE} }; diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index 4eeadf4066a..1554d37cee8 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -37,6 +37,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END STRINGTABLE @@ -49,10 +51,10 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partition ### Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" - IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" + IDS_LIST_PARTITION_FORMAT "%c Partition %-3lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label FS Type Size Status Info\n" IDS_LIST_VOLUME_LINE " ---------- --- ----------- ----- ---------- ------- ------- --------\n" @@ -176,248 +178,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Displays or sets the GUID partition table (GPT) identifier\n or master boot record (MBR) signature of a disk.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index 69de3471d20..f392db0f256 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -37,6 +37,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Ukryta : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Aktywna : %s\n" IDS_DETAIL_PARTITION_OFFSET "Przesunięcie w bajtach: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END STRINGTABLE @@ -49,8 +51,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Dysk ### Stan Rozmiar Wolne Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partycja Typ Rozmiar Przesunięcie\n" + IDS_LIST_DISK_FORMAT "%c Dysk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partycja ### Typ Rozmiar Przesunięcie\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- ------------\n" IDS_LIST_PARTITION_FORMAT "%c Partycja %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNie wybrano dysku do wyświetlenia partycji.\nWybierz dysk i spróbuj ponownie.\n\n" @@ -176,248 +178,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Wyświetla lub ustawia identyfikator tabeli partycji GUID (GPT)\n lub sygnaturę głównego rekordu rozruchowego (MBR).\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 0edee6239c9..b39f2027624 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disco ## Estado Tamanho Livre Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- --------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partição Tipo Tamanho deslocamento\n" + IDS_LIST_DISK_FORMAT "%c Disco %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partição ### Tipo Tamanho deslocamento\n" IDS_LIST_PARTITION_LINE " ------------- ------- --------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partição %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nSem discos para listar Partições.\nPor favor seleccione um disco e tente novamente.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Mostra ou define o identificador da tabela de partição GUID (GPT)\n ou assinatura do master boot recorder (MBR) de um disco.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 7f69919ca93..337dc506afb 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disc ### Stare Dimensiune Liber Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ---------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partiție Tip Dim. Depl.\n" + IDS_LIST_DISK_FORMAT "%c Disc %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partiție ### Tip Dim. Depl.\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partiție %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nNu există niciun disc pentru a afișa partiții.\nSelectați un disc apoi reîncercați.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Afișează sau instituie identificatorul tabelei GUID a partiției\n (GPT) sau semnătura de inițializare (MBR) a discului.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index 3ecfe9122bf..320aaa12620 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Диск ### Состояние Размер Свободно Дин GPT\n" IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Разметка Тип Размер Отступ\n" + IDS_LIST_DISK_FORMAT "%c Диск %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Разметка ### Тип Размер Отступ\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Раздел %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nДиск с разметкой элементов не выбран.\nУкажите диск и повторите попытку.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Отображение или установка кода таблицы разделов GUID (GPT) или\n подписи основной загрузочной записи (MBR) диска.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 49e7ea9ff34..d03ea2b3522 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -41,6 +41,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -48,8 +50,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disk ### Status Size Free Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Partition Type Size Offset\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Partition ### Type Size Offset\n" IDS_LIST_PARTITION_LINE "%c ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT " Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" @@ -180,248 +182,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Shfaq ose vendos tabelen e particionit GUID - (GPT) identifikues\n ose master boot record (MBR) firmen e një disku.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index bb106bccd82..61099db6c2e 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -39,6 +39,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -46,8 +48,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " Disk ### Durum Boyut Boş Dev Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " Bölüm Tür Boyut Ofset\n" + IDS_LIST_DISK_FORMAT "%c Disk %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " Bölüm ### Tür Boyut Ofset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Bölüm %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\nBölümleri listelemek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" @@ -178,248 +180,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "Bir diskin GUID bölüm tablosu (GPT) tanımlayıcısını ya da üst ön yükleme kaydı (MBR) imini görüntüler ya da ayarlar.\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 1a23e12d8cd..ab86d06dc8e 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -46,6 +46,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -53,8 +55,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " 磁盘 ### 状态大小可用活动 Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " 分区类型大小偏移量\n" + IDS_LIST_DISK_FORMAT "%c 磁盘 %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " 分区 ### 类型大小偏移量\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n这里没有要列出分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" @@ -185,248 +187,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "显示或设置 GUID 分区表（GPT）的标识符\n 或主引导记录（MBR）磁盘的签名。\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index 6f931d2e0dd..fbdbf64992e 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -40,6 +40,8 @@ BEGIN IDS_DETAIL_PARTITION_HIDDEN "Hidden : %s\n" IDS_DETAIL_PARTITION_ACTIVE "Active : %s\n" IDS_DETAIL_PARTITION_OFFSET "Offset in Byte: %I64u\n" + IDS_DETAIL_NO_DISKS "\nThere are no disks attached to this volume.\n" + IDS_DETAIL_NO_VOLUME "\nThere is no volume associated with this partition.\n" END /* Detail header titles */ @@ -47,8 +49,8 @@ STRINGTABLE BEGIN IDS_LIST_DISK_HEAD " 磁碟 ### 狀態大小可用 Dyn Gpt\n" IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" - IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" - IDS_LIST_PARTITION_HEAD " 分區類型大小偏移量\n" + IDS_LIST_DISK_FORMAT "%c 磁碟 %-3lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_PARTITION_HEAD " 分區 ### 類型大小偏移量\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c 磁碟分割 %2lu %-16s %4I64u %-2s %4I64u %-2s\n" IDS_LIST_PARTITION_NO_DISK "\n沒有可列出分區的磁碟。\n請選擇一個磁碟，再試一次。\n\n" @@ -179,248 +181,6 @@ BEGIN IDS_HELP_UNIQUEID_DISK "顯示或設定 GUID 分區表 (GPT) 的標識符\n 或主開機記錄 (MBR) 磁碟的簽名。\n" END -/* Active help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ACTIVE "<Add ACTIVE command help text here>\n" -END - -/* Add help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ADD "<Add ADD command help text here>\n" -END - -/* Assign help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ASSIGN "<Add ASSIGN command help text here>\n" -END - -/* Attach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTACH "<Add ATTACH command help text here>\n" -END - -/* Attributes Command Messages */ -STRINGTABLE -BEGIN - IDS_COMMAND_ATTRIBUTES "<Add ATTRIBUTES command help text here>\n" -END - -/* Automount help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_AUTOMOUNT "<Add AUTOMOUNT command help text here>\n" -END - -/* Break help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_BREAK "<Add BREAK command help text here>\n" -END - -/* Clean help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_CLEAN "<Add CLEAN command help text here>\n" -END - -/* Compact help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_COMPACT "<Add COMPACT command help text here>\n" -END - -/* Convert help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CONVERT "<Add CONVERT command help text here>\n" -END - -/* Create help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_CREATE_PARTITION_EFI "<Add CREATE PARTITION EFI command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_EXTENDED "<Add CREATE PARTITION EXTENDED command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_LOGICAL"<Add CREATE PARTITION LOGICAL command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_MSR"<Add CREATE PARTITION MSR command help text here>\n" - IDS_COMMAND_CREATE_PARTITION_PRIMARY"<Add CREATE PARTITION PRIMARY command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DELETE_DISK "<Add DELETE DISK command help text here>\n" - IDS_COMMAND_DELETE_PARTITION "<Add DELETE PARTITION command help text here>\n" - IDS_COMMAND_DELETE_VOLUME "<Add DELETE VOLUME command help text here>\n" -END - -/* Delete help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETAIL_DISK "<Add DETAIL DISK command help text here>\n" - IDS_COMMAND_DETAIL_PARTITION "<Add DETAIL PARTITION command help text here>\n" - IDS_COMMAND_DETAIL_VOLUME "<Add DETAIL VOLUME command help text here>\n" -END - -/* Detach help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_DETACH "<Add DETACH command help text here>\n" -END - -/* Exit help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXIT "<Add EXIT command help text here>\n" -END - -/* Expand help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXPAND "<Add EXPAND command help text here>\n" -END - -/* Extend help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_EXTEND "<Add EXTEND command help text here>\n" -END - -/* Filesystems help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FILESYSTEMS "<Add FILESYSTEMS command help text here>\n" -END - -/* Format help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_FORMAT "<Add FORMAT command help text here>\n" -END - -/* GPT help description */ -STRINGTABLE -BEGIN - IDS_COMMAND_GPT "<Add GPT command help text here>\n" -END - -/* Help help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_HELP "<Add HELP command help text here>\n" -END - -/* Import help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_IMPORT "<Add IMPORT command help text here>\n" -END - -/* Inactive help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_INACTIVE "<Add INTERACTIVE command help text here>\n" -END - -/* List help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_LIST_DISK "<Add LIST DISK command help text here>\n" - IDS_COMMAND_LIST_PARTITION "<Add LIST PARTITION command help text here>\n" - IDS_COMMAND_LIST_VOLUME "<Add LIST VOLUME command help text here>\n" - IDS_COMMAND_LIST_VDISK "<Add LIST VDISK command help text here>\n" -END - -/* Merge help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_MERGE "<Add MERGE command help text here>\n" -END - -/* Offline help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_OFFLINE "<Add OFFLINE command help text here>\n" -END - -/* Online help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_ONLINE "<Add ONLINE command help text here>\n" -END - -/* Recover help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RECOVER "<Add RECOVER command help text here>\n" -END - -/* Rem help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REM "<Add REM command help text here>\n" -END - -/* Remove help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REMOVE "<Add REMOVE command help text here>\n" -END - -/* Repair help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_REPAIR "<Add REPAIR command help text here>\n" -END - -/* Rescan help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RESCAN "<Add RESCAN command help text here>\n" -END - -/* Retain help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_RETAIN "<Add RETAIN command help text here>\n" -END - -/* San help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SAN "<Add SAN command help text here>\n" -END - -/* Select help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SELECT_DISK "<Add SELECT DISK command help text here>\n" - IDS_COMMAND_SELECT_PARTITION "<Add SELECT PARTITION command help text here>\n" - IDS_COMMAND_SELECT_VOLUME "<Add SELECT VOLUME command help text here>\n" - IDS_COMMAND_SELECT_VDISK "<Add SELECT VDISK command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SETID "<Add SETID command help text here>\n" -END - -/* Setid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_SHRINK "<Add SHRINK command help text here>\n" -END - -/* Uniqueid help descriptions */ -STRINGTABLE -BEGIN - IDS_COMMAND_UNIQUEID_DISK "<Add UNIQUEID DISK command help text here>\n" -END - /* Common Error Messages */ STRINGTABLE BEGIN diff --git a/base/system/diskpart/misc.c b/base/system/diskpart/misc.c index b46651b670b..b530f6581df 100644 --- a/base/system/diskpart/misc.c +++ b/base/system/diskpart/misc.c @@ -78,3 +78,26 @@ RoundingDivide( { return (Dividend + Divisor / 2) / Divisor; } + + +VOID +PrintMessageString( + _In_ DWORD dwMessage) +{ + PWSTR pBuffer; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, //hModuleNetMsg, + dwMessage, + LANG_USER_DEFAULT, + (LPWSTR)&pBuffer, + 0, + NULL); + if (pBuffer) + { + ConPuts(StdOut, pBuffer); + LocalFree(pBuffer); + pBuffer = NULL; + } +} diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 313e9b6eee5..51a3946af55 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -9,6 +9,7 @@ #pragma once #define IDS_NONE -1 +#define MSG_NONE 0 #define IDS_APP_HEADER 0 #define IDS_APP_USAGE 1 @@ -38,6 +39,9 @@ #define IDS_DETAIL_PARTITION_ACTIVE 1133 #define IDS_DETAIL_PARTITION_OFFSET 1134 +#define IDS_DETAIL_NO_DISKS 1135 +#define IDS_DETAIL_NO_VOLUME 1136 + #define IDS_HELP_FORMAT_STRING 1200 #define IDS_LIST_DISK_HEAD 3300 @@ -148,60 +152,6 @@ #define IDS_HELP_UNIQUEID 117 #define IDS_HELP_UNIQUEID_DISK 118 - -#define IDS_COMMAND_ACTIVE 1000 -#define IDS_COMMAND_ADD 1001 -#define IDS_COMMAND_ASSIGN 1002 -#define IDS_COMMAND_ATTACH 1003 -#define IDS_COMMAND_ATTRIBUTES 1004 -#define IDS_COMMAND_AUTOMOUNT 1005 -#define IDS_COMMAND_BREAK 1006 -#define IDS_COMMAND_CLEAN 1007 -#define IDS_COMMAND_COMPACT 1008 -#define IDS_COMMAND_CONVERT 1009 -#define IDS_COMMAND_CREATE_PARTITION_EFI 1010 -#define IDS_COMMAND_CREATE_PARTITION_EXTENDED 1011 -#define IDS_COMMAND_CREATE_PARTITION_LOGICAL 1012 -#define IDS_COMMAND_CREATE_PARTITION_MSR 1013 -#define IDS_COMMAND_CREATE_PARTITION_PRIMARY 1014 -#define IDS_COMMAND_DELETE_DISK 1015 -#define IDS_COMMAND_DELETE_PARTITION 1016 -#define IDS_COMMAND_DELETE_VOLUME 1017 -#define IDS_COMMAND_DETACH 1018 -#define IDS_COMMAND_DETAIL_DISK 1019 -#define IDS_COMMAND_DETAIL_PARTITION 1020 -#define IDS_COMMAND_DETAIL_VOLUME 1021 -#define IDS_COMMAND_EXIT 1022 -#define IDS_COMMAND_EXPAND 1023 -#define IDS_COMMAND_EXTEND 1024 -#define IDS_COMMAND_FILESYSTEMS 1025 -#define IDS_COMMAND_FORMAT 1026 -#define IDS_COMMAND_GPT 1027 -#define IDS_COMMAND_HELP 1028 -#define IDS_COMMAND_IMPORT 1029 -#define IDS_COMMAND_INACTIVE 1030 -#define IDS_COMMAND_LIST_DISK 1031 -#define IDS_COMMAND_LIST_PARTITION 1032 -#define IDS_COMMAND_LIST_VOLUME 1033 -#define IDS_COMMAND_LIST_VDISK 1034 -#define IDS_COMMAND_MERGE 1035 -#define IDS_COMMAND_ONLINE 1036 -#define IDS_COMMAND_OFFLINE 1037 -#define IDS_COMMAND_RECOVER 1038 -#define IDS_COMMAND_REM 1039 -#define IDS_COMMAND_REMOVE 1040 -#define IDS_COMMAND_REPAIR 1041 -#define IDS_COMMAND_RESCAN 1042 -#define IDS_COMMAND_RETAIN 1043 -#define IDS_COMMAND_SAN 1044 -#define IDS_COMMAND_SELECT_DISK 1045 -#define IDS_COMMAND_SELECT_PARTITION 1046 -#define IDS_COMMAND_SELECT_VOLUME 1047 -#define IDS_COMMAND_SELECT_VDISK 1048 -#define IDS_COMMAND_SETID 1049 -#define IDS_COMMAND_SHRINK 1050 -#define IDS_COMMAND_UNIQUEID_DISK 1051 - #define IDS_ERROR_MSG_NO_SCRIPT 2000 #define IDS_ERROR_MSG_BAD_ARG 2001 #define IDS_ERROR_INVALID_ARGS 2002

1 0

[reactos] 01/01: [USETUP] Fix several typos in Russian (ru-RU) translation
by Stanislav Motylkov 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=488643583da3b408e44a6… commit 488643583da3b408e44a67fff84750024ad14422 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun May 29 23:46:19 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun May 29 23:46:19 2022 +0300 [USETUP] Fix several typos in Russian (ru-RU) translation CORE-18203 --- base/setup/usetup/lang/ru-RU.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 19690daeb4c..9b6b1c9b7c1 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -140,7 +140,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { 8, 19, - "\x07 \215\240\246\254\250\342\245 L \244\253\357 \257\340\256\341\254\256\342\340\240 \253\250\346\245\255\247\250\256\255\255\256\243\256 \341\256\243\253\240\350\245\255\250\357 ReactOS", + "\x07 \215\240\246\254\250\342\245 L \244\253\357 \257\340\256\341\254\256\342\340\240 \253\250\346\245\255\247\250\256\255\255\256\243\256 \341\256\243\253\240\350\245\255\250\357 ReactOS.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -363,7 +363,7 @@ static MUI_ENTRY ruRULicensePageEntries[] = { 8, 18, - "\205\341\253\250 \257\256 \252\240\252\256\254-\253\250\241\256 \257\340\250\347\250\255\240\254 \242\353 \255\245 \257\256\253\343\347\250\253\250 \252\256\257\250\356 \216\342\252\340\353\342\256\243\256", + "\205\341\253\250 \257\256 \252\240\252\250\254-\253\250\241\256 \257\340\250\347\250\255\240\254 \242\353 \255\245 \257\256\253\343\347\250\253\250 \252\256\257\250\356 \216\342\252\340\353\342\256\243\256", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, @@ -405,7 +405,7 @@ static MUI_ENTRY ruRULicensePageEntries[] = { 8, 26, - "\217\220\210\203\216\204\215\216\221\222\210 \204\213\237 \212\216\215\212\220\205\222\215\233\225 \226\205\213\205\211", + "\217\220\210\203\216\204\215\216\221\222\210 \204\213\237 \212\216\215\212\220\205\222\215\233\225 \226\205\213\205\211.", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

1 0

[reactos] 01/01: [NTOS:SE] Reorganize the security manager component
by George Bișoc 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a2c62b544d6539f6c671… commit 9a2c62b544d6539f6c6719190d841731d81816d2 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat May 28 21:14:04 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 29 20:22:19 2022 +0200 [NTOS:SE] Reorganize the security manager component The current state of Security manager's code is kind of a mess. Mainly, there's code scattered around places where they shouldn't belong and token implementation (token.c) is already of a bloat in itself as it is. The file has over 6k lines and it's subject to grow exponentially with improvements, features, whatever that is. With that being said, the token implementation code in the kernel will be split accordingly and rest of the code moved to appropriate places. The new layout will look as follows (excluding the already existing files): - client.c (Client security implementation code) - objtype.c (Object type list implementation code -- more code related to object types will be put here when I'm going to implement object type access checks in the future) - subject.c (Subject security context support) The token implementation in the kernel will be split in 4 distinct files as shown: - token.c (Base token support routines) - tokenlif.c (Life management of a token object -- that is Duplication, Creation and Filtering) - tokencls.c (Token Query/Set Information Classes support) - tokenadj.c (Token privileges/groups adjusting support) In addition to that, tidy up the internal header and reorganize it as well. --- ntoskrnl/include/internal/se.h | 532 ++-- ntoskrnl/ntos.cmake | 6 + ntoskrnl/se/access.c | 711 ----- ntoskrnl/se/audit.c | 103 +- ntoskrnl/se/client.c | 331 +++ ntoskrnl/se/objtype.c | 115 + ntoskrnl/se/sid.c | 140 + ntoskrnl/se/subject.c | 185 ++ ntoskrnl/se/token.c | 5563 ++++------------------------------------ ntoskrnl/se/tokenadj.c | 910 +++++++ ntoskrnl/se/tokencls.c | 1588 ++++++++++++ ntoskrnl/se/tokenlif.c | 2201 ++++++++++++++++ 12 files changed, 6325 insertions(+), 6060 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 034203d9313..db2dd0b58a3 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -1,5 +1,16 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Internal header for the Security Manager + * COPYRIGHT: Copyright Eric Kohl + * Copyright 2022 George Bișoc <george.bisoc(a)reactos.org> + */ + #pragma once +// +// Internal ACE type structures +// typedef struct _KNOWN_ACE { ACE_HEADER Header; @@ -24,6 +35,9 @@ typedef struct _KNOWN_COMPOUND_ACE ULONG SidStart; } KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE; +// +// Access Check Rights +// typedef struct _ACCESS_CHECK_RIGHTS { ACCESS_MASK RemainingAccessRights; @@ -37,6 +51,9 @@ typedef enum _ACCESS_CHECK_RIGHT_TYPE AccessCheckRegular } ACCESS_CHECK_RIGHT_TYPE; +// +// Token Audit Policy Information structure +// typedef struct _TOKEN_AUDIT_POLICY_INFORMATION { ULONG PolicyCount; @@ -47,10 +64,16 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION } Policies[1]; } TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION; +// +// Token creation method defines (for debugging purposes) +// #define TOKEN_CREATE_METHOD 0xCUL #define TOKEN_DUPLICATE_METHOD 0xDUL #define TOKEN_FILTER_METHOD 0xFUL +// +// Security descriptor internal helpers +// FORCEINLINE PSID SepGetGroupFromDescriptor( @@ -137,14 +160,18 @@ SepGetSaclFromDescriptor( #ifndef RTL_H -/* SID Authorities */ +// +// SID Authorities +// extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeWorldSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeLocalSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeCreatorSidAuthority; extern SID_IDENTIFIER_AUTHORITY SeNtSidAuthority; -/* SIDs */ +// +// SIDs +// extern PSID SeNullSid; extern PSID SeWorldSid; extern PSID SeLocalSid; @@ -177,7 +204,9 @@ extern PSID SeAnonymousLogonSid; extern PSID SeLocalServiceSid; extern PSID SeNetworkServiceSid; -/* Privileges */ +// +// Privileges +// extern const LUID SeCreateTokenPrivilege; extern const LUID SeAssignPrimaryTokenPrivilege; extern const LUID SeLockMemoryPrivilege; @@ -213,14 +242,18 @@ extern const LUID SeIncreaseWorkingSetPrivilege; extern const LUID SeTimeZonePrivilege; extern const LUID SeCreateSymbolicLinkPrivilege; -/* DACLs */ +// +// DACLs +// extern PACL SePublicDefaultUnrestrictedDacl; extern PACL SePublicOpenDacl; extern PACL SePublicOpenUnrestrictedDacl; extern PACL SeUnrestrictedDacl; extern PACL SeSystemAnonymousLogonDacl; -/* SDs */ +// +// SDs +// extern PSECURITY_DESCRIPTOR SePublicDefaultSd; extern PSECURITY_DESCRIPTOR SePublicDefaultUnrestrictedSd; extern PSECURITY_DESCRIPTOR SePublicOpenSd; @@ -229,11 +262,16 @@ extern PSECURITY_DESCRIPTOR SeSystemDefaultSd; extern PSECURITY_DESCRIPTOR SeUnrestrictedSd; extern PSECURITY_DESCRIPTOR SeSystemAnonymousLogonSd; -/* Anonymous Logon Tokens */ +// +// Anonymous Logon Tokens +// extern PTOKEN SeAnonymousLogonToken; extern PTOKEN SeAnonymousLogonTokenNoEveryone; +// +// Token lock management macros +// #define SepAcquireTokenLockExclusive(Token) \ { \ KeEnterCriticalRegion(); \ @@ -254,68 +292,116 @@ extern PTOKEN SeAnonymousLogonTokenNoEveryone; // // Token Functions // -BOOLEAN +CODE_SEG("INIT") +VOID NTAPI -SepTokenIsOwner( - _In_ PACCESS_TOKEN _Token, - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ BOOLEAN TokenLocked); +SepInitializeTokenImplementation(VOID); -BOOLEAN +CODE_SEG("INIT") +PTOKEN NTAPI -SepSidInToken( - _In_ PACCESS_TOKEN _Token, - _In_ PSID Sid); +SepCreateSystemProcessToken(VOID); -BOOLEAN +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonToken(VOID); + +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonTokenNoEveryone(VOID); + +NTSTATUS NTAPI -SepSidInTokenEx( - _In_ PACCESS_TOKEN _Token, - _In_ PSID PrincipalSelfSid, - _In_ PSID _Sid, - _In_ BOOLEAN Deny, - _In_ BOOLEAN Restricted); +SepDuplicateToken( + _In_ PTOKEN Token, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ BOOLEAN EffectiveOnly, + _In_ TOKEN_TYPE TokenType, + _In_ SECURITY_IMPERSONATION_LEVEL Level, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ PTOKEN* NewAccessToken); -BOOLEAN +NTSTATUS NTAPI -SeTokenCanImpersonate( - _In_ PTOKEN ProcessToken, - _In_ PTOKEN TokenToImpersonate, - _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); +SepCreateToken( + _Out_ PHANDLE TokenHandle, + _In_ KPROCESSOR_MODE PreviousMode, + _In_ ACCESS_MASK DesiredAccess, + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ TOKEN_TYPE TokenType, + _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, + _In_ PLUID AuthenticationId, + _In_ PLARGE_INTEGER ExpirationTime, + _In_ PSID_AND_ATTRIBUTES User, + _In_ ULONG GroupCount, + _In_ PSID_AND_ATTRIBUTES Groups, + _In_ ULONG GroupsLength, + _In_ ULONG PrivilegeCount, + _In_ PLUID_AND_ATTRIBUTES Privileges, + _In_opt_ PSID Owner, + _In_ PSID PrimaryGroup, + _In_opt_ PACL DefaultDacl, + _In_ PTOKEN_SOURCE TokenSource, + _In_ BOOLEAN SystemToken); -/* Functions */ -CODE_SEG("INIT") BOOLEAN NTAPI -SeInitSystem(VOID); +SepTokenIsOwner( + _In_ PACCESS_TOKEN _Token, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN TokenLocked); + +NTSTATUS +SepCreateTokenLock( + _Inout_ PTOKEN Token); -CODE_SEG("INIT") VOID -NTAPI -SepInitPrivileges(VOID); +SepDeleteTokenLock( + _Inout_ PTOKEN Token); -CODE_SEG("INIT") -BOOLEAN -NTAPI -SepInitSecurityIDs(VOID); +VOID +SepUpdatePrivilegeFlagsToken( + _Inout_ PTOKEN Token); -CODE_SEG("INIT") -BOOLEAN -NTAPI -SepInitDACLs(VOID); +NTSTATUS +SepFindPrimaryGroupAndDefaultOwner( + _In_ PTOKEN Token, + _In_ PSID PrimaryGroup, + _In_opt_ PSID DefaultOwner, + _Out_opt_ PULONG PrimaryGroupIndex, + _Out_opt_ PULONG DefaultOwnerIndex); -CODE_SEG("INIT") -BOOLEAN -NTAPI -SepInitSDs(VOID); +VOID +SepUpdateSinglePrivilegeFlagToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index); + +VOID +SepUpdatePrivilegeFlagsToken( + _Inout_ PTOKEN Token); + +VOID +SepRemovePrivilegeToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index); + +VOID +SepRemoveUserGroupToken( + _Inout_ PTOKEN Token, + _In_ ULONG Index); BOOLEAN NTAPI -SeRmInitPhase0(VOID); +SeTokenCanImpersonate( + _In_ PTOKEN ProcessToken, + _In_ PTOKEN TokenToImpersonate, + _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel); -BOOLEAN +VOID NTAPI -SeRmInitPhase1(VOID); +SeGetTokenControlInformation( + _In_ PACCESS_TOKEN _Token, + _Out_ PTOKEN_CONTROL TokenControl); VOID NTAPI @@ -330,23 +416,6 @@ SeSubProcessToken( _In_ BOOLEAN InUse, _In_ ULONG SessionId); -NTSTATUS -NTAPI -SeInitializeProcessAuditName( - _In_ PFILE_OBJECT FileObject, - _In_ BOOLEAN DoAudit, - _Out_ POBJECT_NAME_INFORMATION *AuditInfo); - -NTSTATUS -NTAPI -SeCreateAccessStateEx( - _In_ PETHREAD Thread, - _In_ PEPROCESS Process, - _In_ OUT PACCESS_STATE AccessState, - _In_ PAUX_ACCESS_DATA AuxData, - _In_ ACCESS_MASK Access, - _In_ PGENERIC_MAPPING GenericMapping); - NTSTATUS NTAPI SeIsTokenChild( @@ -361,87 +430,63 @@ SeIsTokenSibling( NTSTATUS NTAPI -SepCreateImpersonationTokenDacl( - _In_ PTOKEN Token, - _In_ PTOKEN PrimaryToken, - _Out_ PACL* Dacl); - -NTSTATUS -NTAPI -SepRmInsertLogonSessionIntoToken( - _Inout_ PTOKEN Token); +SeExchangePrimaryToken( + _In_ PEPROCESS Process, + _In_ PACCESS_TOKEN NewAccessToken, + _Out_ PACCESS_TOKEN* OldAccessToken); NTSTATUS NTAPI -SepRmRemoveLogonSessionFromToken( - _Inout_ PTOKEN Token); - -CODE_SEG("INIT") -VOID -NTAPI -SepInitializeTokenImplementation(VOID); - -CODE_SEG("INIT") -PTOKEN -NTAPI -SepCreateSystemProcessToken(VOID); +SeCopyClientToken( + _In_ PACCESS_TOKEN Token, + _In_ SECURITY_IMPERSONATION_LEVEL Level, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ PACCESS_TOKEN* NewToken); -CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonToken(VOID); +ULONG +RtlLengthSidAndAttributes( + _In_ ULONG Count, + _In_ PSID_AND_ATTRIBUTES Src); +// +// Security Manager (SeMgr) functions +// CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonTokenNoEveryone(VOID); - BOOLEAN NTAPI -SeDetailedAuditingWithToken( - _In_ PTOKEN Token); - -VOID -NTAPI -SeAuditProcessExit( - _In_ PEPROCESS Process); - -VOID -NTAPI -SeAuditProcessCreate( - _In_ PEPROCESS Process); +SeInitSystem(VOID); NTSTATUS NTAPI -SeExchangePrimaryToken( - _In_ PEPROCESS Process, - _In_ PACCESS_TOKEN NewAccessToken, - _Out_ PACCESS_TOKEN* OldAccessToken); +SeDefaultObjectMethod( + _In_ PVOID Object, + _In_ SECURITY_OPERATION_CODE OperationType, + _In_ PSECURITY_INFORMATION SecurityInformation, + _Inout_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_opt_ PULONG ReturnLength, + _Inout_opt_ PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + _In_ POOL_TYPE PoolType, + _In_ PGENERIC_MAPPING GenericMapping); VOID NTAPI -SeCaptureSubjectContextEx( - _In_ PETHREAD Thread, - _In_ PEPROCESS Process, - _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext); +SeQuerySecurityAccessMask( + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PACCESS_MASK DesiredAccess); -NTSTATUS +VOID NTAPI -SeCaptureLuidAndAttributesArray( - _In_ PLUID_AND_ATTRIBUTES Src, - _In_ ULONG PrivilegeCount, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ PLUID_AND_ATTRIBUTES AllocatedMem, - _In_ ULONG AllocatedLength, - _In_ POOL_TYPE PoolType, - _In_ BOOLEAN CaptureIfKernel, - _Out_ PLUID_AND_ATTRIBUTES* Dest, - _Inout_ PULONG Length); +SeSetSecurityAccessMask( + _In_ SECURITY_INFORMATION SecurityInformation, + _Out_ PACCESS_MASK DesiredAccess); +// +// Privilege functions +// +CODE_SEG("INIT") VOID NTAPI -SeReleaseLuidAndAttributesArray( - _In_ PLUID_AND_ATTRIBUTES Privilege, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ BOOLEAN CaptureIfKernel); +SepInitPrivileges(VOID); BOOLEAN NTAPI @@ -462,6 +507,12 @@ SePrivilegePolicyCheck( _Out_opt_ PPRIVILEGE_SET *OutPrivilegeSet, _In_ KPROCESSOR_MODE PreviousMode); +BOOLEAN +NTAPI +SeCheckAuditPrivilege( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ KPROCESSOR_MODE PreviousMode); + BOOLEAN NTAPI SeCheckPrivilegedObject( @@ -472,32 +523,32 @@ SeCheckPrivilegedObject( NTSTATUS NTAPI -SepDuplicateToken( - _In_ PTOKEN Token, - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ BOOLEAN EffectiveOnly, - _In_ TOKEN_TYPE TokenType, - _In_ SECURITY_IMPERSONATION_LEVEL Level, +SeCaptureLuidAndAttributesArray( + _In_ PLUID_AND_ATTRIBUTES Src, + _In_ ULONG PrivilegeCount, _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PTOKEN* NewAccessToken); - -NTSTATUS -NTAPI -SepCaptureSecurityQualityOfService( - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ KPROCESSOR_MODE AccessMode, + _In_ PLUID_AND_ATTRIBUTES AllocatedMem, + _In_ ULONG AllocatedLength, _In_ POOL_TYPE PoolType, _In_ BOOLEAN CaptureIfKernel, - _Out_ PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, - _Out_ PBOOLEAN Present); + _Out_ PLUID_AND_ATTRIBUTES* Dest, + _Inout_ PULONG Length); VOID NTAPI -SepReleaseSecurityQualityOfService( - _In_opt_ PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService, - _In_ KPROCESSOR_MODE AccessMode, +SeReleaseLuidAndAttributesArray( + _In_ PLUID_AND_ATTRIBUTES Privilege, + _In_ KPROCESSOR_MODE PreviousMode, _In_ BOOLEAN CaptureIfKernel); +// +// SID functions +// +CODE_SEG("INIT") +BOOLEAN +NTAPI +SepInitSecurityIDs(VOID); + NTSTATUS NTAPI SepCaptureSid( @@ -514,6 +565,21 @@ SepReleaseSid( _In_ KPROCESSOR_MODE AccessMode, _In_ BOOLEAN CaptureIfKernel); +BOOLEAN +NTAPI +SepSidInToken( + _In_ PACCESS_TOKEN _Token, + _In_ PSID Sid); + +BOOLEAN +NTAPI +SepSidInTokenEx( + _In_ PACCESS_TOKEN _Token, + _In_ PSID PrincipalSelfSid, + _In_ PSID _Sid, + _In_ BOOLEAN Deny, + _In_ BOOLEAN Restricted); + PSID NTAPI SepGetSidFromAce( @@ -540,11 +606,20 @@ SeReleaseSidAndAttributesArray( _In_ KPROCESSOR_MODE AccessMode, _In_ BOOLEAN CaptureIfKernel); +// +// ACL functions +// +CODE_SEG("INIT") +BOOLEAN +NTAPI +SepInitDACLs(VOID); + NTSTATUS NTAPI -SeComputeQuotaInformationSize( - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _Out_ PULONG QuotaInfoSize); +SepCreateImpersonationTokenDacl( + _In_ PTOKEN Token, + _In_ PTOKEN PrimaryToken, + _Out_ PACL* Dacl); NTSTATUS NTAPI @@ -588,17 +663,13 @@ SepSelectAcl( _In_ BOOLEAN IsDirectoryObject, _In_ PGENERIC_MAPPING GenericMapping); -NTSTATUS +// +// SD functions +// +CODE_SEG("INIT") +BOOLEAN NTAPI -SeDefaultObjectMethod( - _In_ PVOID Object, - _In_ SECURITY_OPERATION_CODE OperationType, - _In_ PSECURITY_INFORMATION SecurityInformation, - _Inout_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _Inout_opt_ PULONG ReturnLength, - _Inout_opt_ PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - _In_ POOL_TYPE PoolType, - _In_ PGENERIC_MAPPING GenericMapping); +SepInitSDs(VOID); NTSTATUS NTAPI @@ -609,11 +680,38 @@ SeSetWorldSecurityDescriptor( NTSTATUS NTAPI -SeCopyClientToken( - _In_ PACCESS_TOKEN Token, - _In_ SECURITY_IMPERSONATION_LEVEL Level, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PACCESS_TOKEN* NewToken); +SeComputeQuotaInformationSize( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Out_ PULONG QuotaInfoSize); + +// +// Security Reference Monitor (SeRm) functions +// +BOOLEAN +NTAPI +SeRmInitPhase0(VOID); + +BOOLEAN +NTAPI +SeRmInitPhase1(VOID); + +NTSTATUS +NTAPI +SepRmInsertLogonSessionIntoToken( + _Inout_ PTOKEN Token); + +NTSTATUS +NTAPI +SepRmRemoveLogonSessionFromToken( + _Inout_ PTOKEN Token); + +NTSTATUS +SepRmReferenceLogonSession( + _Inout_ PLUID LogonLuid); + +NTSTATUS +SepRmDereferenceLogonSession( + _Inout_ PLUID LogonLuid); NTSTATUS NTAPI @@ -624,31 +722,36 @@ SepRegQueryHelper( _In_ ULONG DataLength, _Out_ PVOID ValueData); -VOID +NTSTATUS NTAPI -SeQuerySecurityAccessMask( - _In_ SECURITY_INFORMATION SecurityInformation, - _Out_ PACCESS_MASK DesiredAccess); +SeGetLogonIdDeviceMap( + _In_ PLUID LogonId, + _Out_ PDEVICE_MAP *DeviceMap); -VOID +// +// Audit functions +// +NTSTATUS NTAPI -SeSetSecurityAccessMask( - _In_ SECURITY_INFORMATION SecurityInformation, - _Out_ PACCESS_MASK DesiredAccess); +SeInitializeProcessAuditName( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN DoAudit, + _Out_ POBJECT_NAME_INFORMATION *AuditInfo); BOOLEAN NTAPI -SeFastTraverseCheck( - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ PACCESS_STATE AccessState, - _In_ ACCESS_MASK DesiredAccess, - _In_ KPROCESSOR_MODE AccessMode); +SeDetailedAuditingWithToken( + _In_ PTOKEN Token); -BOOLEAN +VOID NTAPI -SeCheckAuditPrivilege( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, - _In_ KPROCESSOR_MODE PreviousMode); +SeAuditProcessExit( + _In_ PEPROCESS Process); + +VOID +NTAPI +SeAuditProcessCreate( + _In_ PEPROCESS Process); VOID NTAPI @@ -658,19 +761,74 @@ SePrivilegedServiceAuditAlarm( _In_ PPRIVILEGE_SET PrivilegeSet, _In_ BOOLEAN AccessGranted); +// +// Subject functions +// +VOID +NTAPI +SeCaptureSubjectContextEx( + _In_ PETHREAD Thread, + _In_ PEPROCESS Process, + _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext); + +// +// Security Quality of Service (SQoS) functions +// NTSTATUS -SepRmReferenceLogonSession( - _Inout_ PLUID LogonLuid); +NTAPI +SepCaptureSecurityQualityOfService( + _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, + _In_ KPROCESSOR_MODE AccessMode, + _In_ POOL_TYPE PoolType, + _In_ BOOLEAN CaptureIfKernel, + _Out_ PSECURITY_QUALITY_OF_SERVICE *CapturedSecurityQualityOfService, + _Out_ PBOOLEAN Present); + +VOID +NTAPI +SepReleaseSecurityQualityOfService( + _In_opt_ PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService, + _In_ KPROCESSOR_MODE AccessMode, + _In_ BOOLEAN CaptureIfKernel); +// +// Object type list functions +// NTSTATUS -SepRmDereferenceLogonSession( - _Inout_ PLUID LogonLuid); +SeCaptureObjectTypeList( + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList); +VOID +SeReleaseObjectTypeList( + _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ KPROCESSOR_MODE PreviousMode); + +// +// Access state functions +// NTSTATUS NTAPI -SeGetLogonIdDeviceMap( - _In_ PLUID LogonId, - _Out_ PDEVICE_MAP *DeviceMap); +SeCreateAccessStateEx( + _In_ PETHREAD Thread, + _In_ PEPROCESS Process, + _In_ OUT PACCESS_STATE AccessState, + _In_ PAUX_ACCESS_DATA AuxData, + _In_ ACCESS_MASK Access, + _In_ PGENERIC_MAPPING GenericMapping); + +// +// Access check functions +// +BOOLEAN +NTAPI +SeFastTraverseCheck( + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ PACCESS_STATE AccessState, + _In_ ACCESS_MASK DesiredAccess, + _In_ KPROCESSOR_MODE AccessMode); #endif diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 2284563e436..af8217bc480 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -275,13 +275,19 @@ list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/se/accesschk.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/acl.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/audit.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/client.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/objtype.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/priv.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sd.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/semgr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sid.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/sqos.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/srm.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/subject.c ${REACTOS_SOURCE_DIR}/ntoskrnl/se/token.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/tokenadj.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/tokencls.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/se/tokenlif.c ${REACTOS_SOURCE_DIR}/ntoskrnl/vf/driver.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/guidobj.c ${REACTOS_SOURCE_DIR}/ntoskrnl/wmi/smbios.c diff --git a/ntoskrnl/se/access.c b/ntoskrnl/se/access.c index 98b00a70d1e..77100336509 100644 --- a/ntoskrnl/se/access.c +++ b/ntoskrnl/se/access.c @@ -11,529 +11,8 @@ #define NDEBUG #include <debug.h> -/* GLOBALS ********************************************************************/ - -ERESOURCE SepSubjectContextLock; - -/* PRIVATE FUNCTIONS **********************************************************/ - -/** - * @brief - * Checks if a SID is present in a token. - * - * @param[in] _Token - * A valid token object. - * - * @param[in] PrincipalSelfSid - * A principal self SID. - * - * @param[in] _Sid - * A regular SID. - * - * @param[in] Deny - * If set to TRUE, the caller expected that a SID in a token - * must be a deny-only SID, that is, access checks are performed - * only for deny-only ACEs of the said SID. - * - * @param[in] Restricted - * If set to TRUE, the caller expects that a SID in a token is - * restricted (by the general definition, a token is restricted). - * - * @return - * Returns TRUE if the specified SID in the call is present in the token, - * FALSE otherwise. - */ -BOOLEAN -NTAPI -SepSidInTokenEx( - _In_ PACCESS_TOKEN _Token, - _In_ PSID PrincipalSelfSid, - _In_ PSID _Sid, - _In_ BOOLEAN Deny, - _In_ BOOLEAN Restricted) -{ - ULONG SidIndex; - PTOKEN Token = (PTOKEN)_Token; - PISID TokenSid, Sid = (PISID)_Sid; - PSID_AND_ATTRIBUTES SidAndAttributes; - ULONG SidCount, SidLength; - USHORT SidMetadata; - PAGED_CODE(); - - /* Check if a principal SID was given, and this is our current SID already */ - if ((PrincipalSelfSid) && (RtlEqualSid(SePrincipalSelfSid, Sid))) - { - /* Just use the principal SID in this case */ - Sid = PrincipalSelfSid; - } - - /* Check if this is a restricted token or not */ - if (Restricted) - { - /* Use the restricted SIDs and count */ - SidAndAttributes = Token->RestrictedSids; - SidCount = Token->RestrictedSidCount; - } - else - { - /* Use the normal SIDs and count */ - SidAndAttributes = Token->UserAndGroups; - SidCount = Token->UserAndGroupCount; - } - - /* Do checks here by hand instead of the usual 4 function calls */ - SidLength = FIELD_OFFSET(SID, - SubAuthority[Sid->SubAuthorityCount]); - SidMetadata = *(PUSHORT)&Sid->Revision; - - /* Loop every SID */ - for (SidIndex = 0; SidIndex < SidCount; SidIndex++) - { - TokenSid = (PISID)SidAndAttributes->Sid; -#if SE_SID_DEBUG - UNICODE_STRING sidString; - RtlConvertSidToUnicodeString(&sidString, TokenSid, TRUE); - DPRINT1("SID in Token: %wZ\n", &sidString); - RtlFreeUnicodeString(&sidString); -#endif - /* Check if the SID metadata matches */ - if (*(PUSHORT)&TokenSid->Revision == SidMetadata) - { - /* Check if the SID data matches */ - if (RtlEqualMemory(Sid, TokenSid, SidLength)) - { - /* - * Check if the group is enabled, or used for deny only. - * Otherwise we have to check if this is the first user. - * We understand that by looking if this SID is not - * restricted, this is the first element we are iterating - * and that it doesn't have SE_GROUP_USE_FOR_DENY_ONLY - * attribute. - */ - if ((!Restricted && (SidIndex == 0) && !(SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY)) || - (SidAndAttributes->Attributes & SE_GROUP_ENABLED) || - ((Deny) && (SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY))) - { - /* SID is present */ - return TRUE; - } - else - { - /* SID is not present */ - return FALSE; - } - } - } - - /* Move to the next SID */ - SidAndAttributes++; - } - - /* SID is not present */ - return FALSE; -} - -/** - * @brief - * Checks if a SID is present in a token. - * - * @param[in] _Token - * A valid token object. - * - * @param[in] _Sid - * A regular SID. - * - * @return - * Returns TRUE if the specified SID in the call is present in the token, - * FALSE otherwise. - */ -BOOLEAN -NTAPI -SepSidInToken( - _In_ PACCESS_TOKEN _Token, - _In_ PSID Sid) -{ - /* Call extended API */ - return SepSidInTokenEx(_Token, NULL, Sid, FALSE, FALSE); -} - -/** - * @brief - * Checks if a token belongs to the main user, being the owner. - * - * @param[in] _Token - * A valid token object. - * - * @param[in] SecurityDescriptor - * A security descriptor where the owner is to be found. - * - * @param[in] TokenLocked - * If set to TRUE, the token has been already locked and there's - * no need to lock it again. Otherwise the function will acquire - * the lock. - * - * @return - * Returns TRUE if the token belongs to a owner, FALSE otherwise. - */ -BOOLEAN -NTAPI -SepTokenIsOwner( - _In_ PACCESS_TOKEN _Token, - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, - _In_ BOOLEAN TokenLocked) -{ - PSID Sid; - BOOLEAN Result; - PTOKEN Token = _Token; - - /* Get the owner SID */ - Sid = SepGetOwnerFromDescriptor(SecurityDescriptor); - ASSERT(Sid != NULL); - - /* Lock the token if needed */ - if (!TokenLocked) SepAcquireTokenLockShared(Token); - - /* Check if the owner SID is found, handling restricted case as well */ - Result = SepSidInToken(Token, Sid); - if ((Result) && (Token->TokenFlags & TOKEN_IS_RESTRICTED)) - { - Result = SepSidInTokenEx(Token, NULL, Sid, FALSE, TRUE); - } - - /* Release the lock if we had acquired it */ - if (!TokenLocked) SepReleaseTokenLock(Token); - - /* Return the result */ - return Result; -} - -/** - * @brief - * Retrieves token control information. - * - * @param[in] _Token - * A valid token object. - * - * @param[out] SecurityDescriptor - * The returned token control information. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeGetTokenControlInformation( - _In_ PACCESS_TOKEN _Token, - _Out_ PTOKEN_CONTROL TokenControl) -{ - PTOKEN Token = _Token; - PAGED_CODE(); - - /* Capture the main fields */ - TokenControl->AuthenticationId = Token->AuthenticationId; - TokenControl->TokenId = Token->TokenId; - TokenControl->TokenSource = Token->TokenSource; - - /* Lock the token */ - SepAcquireTokenLockShared(Token); - - /* Capture the modified ID */ - TokenControl->ModifiedId = Token->ModifiedId; - - /* Unlock it */ - SepReleaseTokenLock(Token); -} - -/** - * @brief - * Creates a client security context based upon an access token. - * - * @param[in] Token - * A valid token object. - * - * @param[in] ClientSecurityQos - * The Quality of Service (QoS) of a client security context. - * - * @param[in] ServerIsRemote - * If the client is a remote server (TRUE), the function will retrieve the - * control information of an access token, that is, we're doing delegation - * and that the server isn't local. - * - * @param[in] TokenType - * Type of token. - * - * @param[in] ThreadEffectiveOnly - * If set to TRUE, the client wants that the current thread wants to modify - * (enable or disable) privileges and groups. - * - * @param[in] ImpersonationLevel - * Security impersonation level filled in the QoS context. - * - * @param[out] ClientContext - * The returned security client context. - * - * @return - * Returns STATUS_SUCCESS if client security creation has completed successfully. - * STATUS_INVALID_PARAMETER is returned if one or more of the parameters are bogus. - * STATUS_BAD_IMPERSONATION_LEVEL is returned if the current impersonation level - * within QoS context doesn't meet with the conditions required. A failure - * NTSTATUS code is returned otherwise. - */ -NTSTATUS -NTAPI -SepCreateClientSecurity( - _In_ PACCESS_TOKEN Token, - _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, - _In_ BOOLEAN ServerIsRemote, - _In_ TOKEN_TYPE TokenType, - _In_ BOOLEAN ThreadEffectiveOnly, - _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, - _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) -{ - NTSTATUS Status; - PACCESS_TOKEN NewToken; - PAGED_CODE(); - - /* Check for bogus impersonation level */ - if (!VALID_IMPERSONATION_LEVEL(ClientSecurityQos->ImpersonationLevel)) - { - /* Fail the call */ - return STATUS_INVALID_PARAMETER; - } - - /* Check what kind of token this is */ - if (TokenType != TokenImpersonation) - { - /* On a primary token, if we do direct access, copy the flag from the QOS */ - ClientContext->DirectAccessEffectiveOnly = ClientSecurityQos->EffectiveOnly; - } - else - { - /* This is an impersonation token, is the level ok? */ - if (ClientSecurityQos->ImpersonationLevel > ImpersonationLevel) - { - /* Nope, fail */ - return STATUS_BAD_IMPERSONATION_LEVEL; - } - - /* Is the level too low, or are we doing something other than delegation remotely */ - if ((ImpersonationLevel == SecurityAnonymous) || - (ImpersonationLevel == SecurityIdentification) || - ((ServerIsRemote) && (ImpersonationLevel != SecurityDelegation))) - { - /* Fail the call */ - return STATUS_BAD_IMPERSONATION_LEVEL; - } - - /* Pick either the thread setting or the QOS setting */ - ClientContext->DirectAccessEffectiveOnly = - ((ThreadEffectiveOnly) || (ClientSecurityQos->EffectiveOnly)) ? TRUE : FALSE; - } - - /* Is this static tracking */ - if (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING) - { - /* Do not use direct access and make a copy */ - ClientContext->DirectlyAccessClientToken = FALSE; - Status = SeCopyClientToken(Token, - ClientSecurityQos->ImpersonationLevel, - KernelMode, - &NewToken); - if (!NT_SUCCESS(Status)) - return Status; - } - else - { - /* Use direct access and check if this is local */ - ClientContext->DirectlyAccessClientToken = TRUE; - if (ServerIsRemote) - { - /* We are doing delegation, so make a copy of the control data */ - SeGetTokenControlInformation(Token, - &ClientContext->ClientTokenControl); - } - - /* Keep the same token */ - NewToken = Token; - } - - /* Fill out the context and return success */ - ClientContext->SecurityQos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); - ClientContext->SecurityQos.ImpersonationLevel = ClientSecurityQos->ImpersonationLevel; - ClientContext->SecurityQos.ContextTrackingMode = ClientSecurityQos->ContextTrackingMode; - ClientContext->SecurityQos.EffectiveOnly = ClientSecurityQos->EffectiveOnly; - ClientContext->ServerIsRemote = ServerIsRemote; - ClientContext->ClientToken = NewToken; - return STATUS_SUCCESS; -} - /* PUBLIC FUNCTIONS ***********************************************************/ -/** - * @brief - * An extended function that captures the security subject context based upon - * the specified thread and process. - * - * @param[in] Thread - * A thread where the calling thread's token is to be referenced for - * the security context. - * - * @param[in] Process - * A process where the main process' token is to be referenced for - * the security context. - * - * @param[out] SubjectContext - * The returned security subject context. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeCaptureSubjectContextEx( - _In_ PETHREAD Thread, - _In_ PEPROCESS Process, - _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - BOOLEAN CopyOnOpen, EffectiveOnly; - - PAGED_CODE(); - - /* Save the unique ID */ - SubjectContext->ProcessAuditId = Process->UniqueProcessId; - - /* Check if we have a thread */ - if (!Thread) - { - /* We don't, so no token */ - SubjectContext->ClientToken = NULL; - } - else - { - /* Get the impersonation token */ - SubjectContext->ClientToken = PsReferenceImpersonationToken(Thread, - &CopyOnOpen, - &EffectiveOnly, - &SubjectContext->ImpersonationLevel); - } - - /* Get the primary token */ - SubjectContext->PrimaryToken = PsReferencePrimaryToken(Process); -} - -/** - * @brief - * Captures the security subject context of the calling thread and calling - * process. - * - * @param[out] SubjectContext - * The returned security subject context. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeCaptureSubjectContext( - _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - /* Call the extended API */ - SeCaptureSubjectContextEx(PsGetCurrentThread(), - PsGetCurrentProcess(), - SubjectContext); -} - -/** - * @brief - * Locks both the referenced primary and client access tokens of a - * security subject context. - * - * @param[in] SubjectContext - * A valid security context with both referenced tokens. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeLockSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - PTOKEN PrimaryToken, ClientToken; - PAGED_CODE(); - - /* Read both tokens */ - PrimaryToken = SubjectContext->PrimaryToken; - ClientToken = SubjectContext->ClientToken; - - /* Always lock the primary */ - SepAcquireTokenLockShared(PrimaryToken); - - /* Lock the impersonation one if it's there */ - if (!ClientToken) return; - SepAcquireTokenLockShared(ClientToken); -} - -/** - * @brief - * Unlocks both the referenced primary and client access tokens of a - * security subject context. - * - * @param[in] SubjectContext - * A valid security context with both referenced tokens. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeUnlockSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - PTOKEN PrimaryToken, ClientToken; - PAGED_CODE(); - - /* Read both tokens */ - PrimaryToken = SubjectContext->PrimaryToken; - ClientToken = SubjectContext->ClientToken; - - /* Unlock the impersonation one if it's there */ - if (ClientToken) - { - SepReleaseTokenLock(ClientToken); - } - - /* Always unlock the primary one */ - SepReleaseTokenLock(PrimaryToken); -} - -/** - * @brief - * Releases both the primary and client tokens of a security - * subject context. - * - * @param[in] SubjectContext - * The captured security context. - * - * @return - * Nothing. - */ -VOID -NTAPI -SeReleaseSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) -{ - PAGED_CODE(); - - /* Drop reference on the primary */ - ObFastDereferenceObject(&PsGetCurrentProcess()->Token, SubjectContext->PrimaryToken); - SubjectContext->PrimaryToken = NULL; - - /* Drop reference on the impersonation, if there was one */ - PsDereferenceImpersonationToken(SubjectContext->ClientToken); - SubjectContext->ClientToken = NULL; -} - /** * @brief * An extended function that creates an access state. @@ -721,194 +200,4 @@ SeSetAccessStateGenericMapping( ((PAUX_ACCESS_DATA)AccessState->AuxData)->GenericMapping = *GenericMapping; } -/** - * @brief - * Creates a client security context. - * - * @param[in] Thread - * Thread object of the client where impersonation has to begin. - * - * @param[in] Qos - * Quality of service to specify what kind of impersonation to be done. - * - * @param[in] RemoteClient - * If set to TRUE, the client that we're going to impersonate is remote. - * - * @param[out] ClientContext - * The returned security client context. - * - * @return - * See SepCreateClientSecurity. - */ -NTSTATUS -NTAPI -SeCreateClientSecurity( - _In_ PETHREAD Thread, - _In_ PSECURITY_QUALITY_OF_SERVICE Qos, - _In_ BOOLEAN RemoteClient, - _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) -{ - TOKEN_TYPE TokenType; - BOOLEAN ThreadEffectiveOnly; - SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; - PACCESS_TOKEN Token; - NTSTATUS Status; - PAGED_CODE(); - - /* Reference the correct token */ - Token = PsReferenceEffectiveToken(Thread, - &TokenType, - &ThreadEffectiveOnly, - &ImpersonationLevel); - - /* Create client security from it */ - Status = SepCreateClientSecurity(Token, - Qos, - RemoteClient, - TokenType, - ThreadEffectiveOnly, - ImpersonationLevel, - ClientContext); - - /* Check if we failed or static tracking was used */ - if (!(NT_SUCCESS(Status)) || (Qos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) - { - /* Dereference our copy since it's not being used */ - ObDereferenceObject(Token); - } - - /* Return status */ - return Status; -} - -/** - * @brief - * Creates a client security context based upon the captured security - * subject context. - * - * @param[in] SubjectContext - * The captured subject context where client security is to be created - * from. - * - * @param[in] ClientSecurityQos - * Quality of service to specify what kind of impersonation to be done. - * - * @param[in] ServerIsRemote - * If set to TRUE, the client that we're going to impersonate is remote. - * - * @param[out] ClientContext - * The returned security client context. - * - * @return - * See SepCreateClientSecurity. - */ -NTSTATUS -NTAPI -SeCreateClientSecurityFromSubjectContext( - _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, - _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, - _In_ BOOLEAN ServerIsRemote, - _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) -{ - PACCESS_TOKEN Token; - NTSTATUS Status; - PAGED_CODE(); - - /* Get the right token and reference it */ - Token = SeQuerySubjectContextToken(SubjectContext); - ObReferenceObject(Token); - - /* Create the context */ - Status = SepCreateClientSecurity(Token, - ClientSecurityQos, - ServerIsRemote, - SubjectContext->ClientToken ? - TokenImpersonation : TokenPrimary, - FALSE, - SubjectContext->ImpersonationLevel, - ClientContext); - - /* Check if we failed or static tracking was used */ - if (!(NT_SUCCESS(Status)) || - (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) - { - /* Dereference our copy since it's not being used */ - ObDereferenceObject(Token); - } - - /* Return status */ - return Status; -} - -/** - * @brief - * Extended function that impersonates a client. - * - * @param[in] ClientContext - * A valid client context. - * - * @param[in] ServerThread - * The thread where impersonation is to be done. - * - * @return - * STATUS_SUCCESS is returned if the calling thread successfully impersonates - * the client. A failure NTSTATUS code is returned otherwise. - */ -NTSTATUS -NTAPI -SeImpersonateClientEx( - _In_ PSECURITY_CLIENT_CONTEXT ClientContext, - _In_opt_ PETHREAD ServerThread) -{ - BOOLEAN EffectiveOnly; - PAGED_CODE(); - - /* Check if direct access is requested */ - if (!ClientContext->DirectlyAccessClientToken) - { - /* No, so get the flag from QOS */ - EffectiveOnly = ClientContext->SecurityQos.EffectiveOnly; - } - else - { - /* Yes, so see if direct access should be effective only */ - EffectiveOnly = ClientContext->DirectAccessEffectiveOnly; - } - - /* Use the current thread if one was not passed */ - if (!ServerThread) ServerThread = PsGetCurrentThread(); - - /* Call the lower layer routine */ - return PsImpersonateClient(ServerThread, - ClientContext->ClientToken, - TRUE, - EffectiveOnly, - ClientContext->SecurityQos.ImpersonationLevel); -} - -/** - * @brief - * Impersonates a client user. - * - * @param[in] ClientContext - * A valid client context. - * - * @param[in] ServerThread - * The thread where impersonation is to be done. - * * - * @return - * Nothing. - */ -VOID -NTAPI -SeImpersonateClient( - _In_ PSECURITY_CLIENT_CONTEXT ClientContext, - _In_opt_ PETHREAD ServerThread) -{ - PAGED_CODE(); - - /* Call the new API */ - SeImpersonateClientEx(ClientContext, ServerThread); -} - /* EOF */ diff --git a/ntoskrnl/se/audit.c b/ntoskrnl/se/audit.c index 0d993a1761d..a201e214907 100644 --- a/ntoskrnl/se/audit.c +++ b/ntoskrnl/se/audit.c @@ -16,7 +16,7 @@ UNICODE_STRING SeSubsystemName = RTL_CONSTANT_STRING(L"Security"); -/* PRIVATE FUNCTIONS***********************************************************/ +/* PRIVATE FUNCTIONS ***********************************************************/ /** * @unimplemented @@ -411,107 +411,6 @@ SePrivilegedServiceAuditAlarm( } -/** - * @brief - * Captures a list of object types. - * - * @param[in] ObjectTypeList - * An existing list of object types. - * - * @param[in] ObjectTypeListLength - * The length size of the list. - * - * @param[in] PreviousMode - * Processor access level mode. - * - * @param[out] CapturedObjectTypeList - * The captured list of object types. - * - * @return - * Returns STATUS_SUCCESS if the list of object types has been captured - * successfully. STATUS_INVALID_PARAMETER is returned if the caller hasn't - * supplied a buffer list of object types. STATUS_INSUFFICIENT_RESOURCES - * is returned if pool memory allocation for the captured list has failed. - */ -static -NTSTATUS -SeCaptureObjectTypeList( - _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, - _In_ ULONG ObjectTypeListLength, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList) -{ - SIZE_T Size; - - if (PreviousMode == KernelMode) - { - return STATUS_NOT_IMPLEMENTED; - } - - if (ObjectTypeListLength == 0) - { - *CapturedObjectTypeList = NULL; - return STATUS_SUCCESS; - } - - if (ObjectTypeList == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - /* Calculate the list size and check for integer overflow */ - Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST); - if (Size == 0) - { - return STATUS_INVALID_PARAMETER; - } - - /* Allocate a new list */ - *CapturedObjectTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA); - if (*CapturedObjectTypeList == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - _SEH2_TRY - { - ProbeForRead(ObjectTypeList, Size, sizeof(ULONG)); - RtlCopyMemory(*CapturedObjectTypeList, ObjectTypeList, Size); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); - *CapturedObjectTypeList = NULL; - _SEH2_YIELD(return _SEH2_GetExceptionCode()); - } - _SEH2_END; - - return STATUS_SUCCESS; -} - -/** - * @brief - * Releases a buffer list of object types. - * - * @param[in] CapturedObjectTypeList - * A list of object types to free. - * - * @param[in] PreviousMode - * Processor access level mode. - * - * @return - * Nothing. - */ -static -VOID -SeReleaseObjectTypeList( - _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, - _In_ KPROCESSOR_MODE PreviousMode) -{ - if ((PreviousMode != KernelMode) && (CapturedObjectTypeList != NULL)) - ExFreePoolWithTag(CapturedObjectTypeList, TAG_SEPA); -} - /** * @unimplemented * @brief diff --git a/ntoskrnl/se/client.c b/ntoskrnl/se/client.c new file mode 100644 index 00000000000..773428009a9 --- /dev/null +++ b/ntoskrnl/se/client.c @@ -0,0 +1,331 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security client support routines + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS **********************************************************/ + +/** + * @brief + * Creates a client security context based upon an access token. + * + * @param[in] Token + * A valid token object. + * + * @param[in] ClientSecurityQos + * The Quality of Service (QoS) of a client security context. + * + * @param[in] ServerIsRemote + * If the client is a remote server (TRUE), the function will retrieve the + * control information of an access token, that is, we're doing delegation + * and that the server isn't local. + * + * @param[in] TokenType + * Type of token. + * + * @param[in] ThreadEffectiveOnly + * If set to TRUE, the client wants that the current thread wants to modify + * (enable or disable) privileges and groups. + * + * @param[in] ImpersonationLevel + * Security impersonation level filled in the QoS context. + * + * @param[out] ClientContext + * The returned security client context. + * + * @return + * Returns STATUS_SUCCESS if client security creation has completed successfully. + * STATUS_INVALID_PARAMETER is returned if one or more of the parameters are bogus. + * STATUS_BAD_IMPERSONATION_LEVEL is returned if the current impersonation level + * within QoS context doesn't meet with the conditions required. A failure + * NTSTATUS code is returned otherwise. + */ +NTSTATUS +NTAPI +SepCreateClientSecurity( + _In_ PACCESS_TOKEN Token, + _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, + _In_ BOOLEAN ServerIsRemote, + _In_ TOKEN_TYPE TokenType, + _In_ BOOLEAN ThreadEffectiveOnly, + _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, + _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) +{ + NTSTATUS Status; + PACCESS_TOKEN NewToken; + PAGED_CODE(); + + /* Check for bogus impersonation level */ + if (!VALID_IMPERSONATION_LEVEL(ClientSecurityQos->ImpersonationLevel)) + { + /* Fail the call */ + return STATUS_INVALID_PARAMETER; + } + + /* Check what kind of token this is */ + if (TokenType != TokenImpersonation) + { + /* On a primary token, if we do direct access, copy the flag from the QOS */ + ClientContext->DirectAccessEffectiveOnly = ClientSecurityQos->EffectiveOnly; + } + else + { + /* This is an impersonation token, is the level ok? */ + if (ClientSecurityQos->ImpersonationLevel > ImpersonationLevel) + { + /* Nope, fail */ + return STATUS_BAD_IMPERSONATION_LEVEL; + } + + /* Is the level too low, or are we doing something other than delegation remotely */ + if ((ImpersonationLevel == SecurityAnonymous) || + (ImpersonationLevel == SecurityIdentification) || + ((ServerIsRemote) && (ImpersonationLevel != SecurityDelegation))) + { + /* Fail the call */ + return STATUS_BAD_IMPERSONATION_LEVEL; + } + + /* Pick either the thread setting or the QOS setting */ + ClientContext->DirectAccessEffectiveOnly = + ((ThreadEffectiveOnly) || (ClientSecurityQos->EffectiveOnly)) ? TRUE : FALSE; + } + + /* Is this static tracking */ + if (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING) + { + /* Do not use direct access and make a copy */ + ClientContext->DirectlyAccessClientToken = FALSE; + Status = SeCopyClientToken(Token, + ClientSecurityQos->ImpersonationLevel, + KernelMode, + &NewToken); + if (!NT_SUCCESS(Status)) + return Status; + } + else + { + /* Use direct access and check if this is local */ + ClientContext->DirectlyAccessClientToken = TRUE; + if (ServerIsRemote) + { + /* We are doing delegation, so make a copy of the control data */ + SeGetTokenControlInformation(Token, + &ClientContext->ClientTokenControl); + } + + /* Keep the same token */ + NewToken = Token; + } + + /* Fill out the context and return success */ + ClientContext->SecurityQos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + ClientContext->SecurityQos.ImpersonationLevel = ClientSecurityQos->ImpersonationLevel; + ClientContext->SecurityQos.ContextTrackingMode = ClientSecurityQos->ContextTrackingMode; + ClientContext->SecurityQos.EffectiveOnly = ClientSecurityQos->EffectiveOnly; + ClientContext->ServerIsRemote = ServerIsRemote; + ClientContext->ClientToken = NewToken; + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * Creates a client security context. + * + * @param[in] Thread + * Thread object of the client where impersonation has to begin. + * + * @param[in] Qos + * Quality of service to specify what kind of impersonation to be done. + * + * @param[in] RemoteClient + * If set to TRUE, the client that we're going to impersonate is remote. + * + * @param[out] ClientContext + * The returned security client context. + * + * @return + * See SepCreateClientSecurity. + */ +NTSTATUS +NTAPI +SeCreateClientSecurity( + _In_ PETHREAD Thread, + _In_ PSECURITY_QUALITY_OF_SERVICE Qos, + _In_ BOOLEAN RemoteClient, + _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) +{ + TOKEN_TYPE TokenType; + BOOLEAN ThreadEffectiveOnly; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + PACCESS_TOKEN Token; + NTSTATUS Status; + PAGED_CODE(); + + /* Reference the correct token */ + Token = PsReferenceEffectiveToken(Thread, + &TokenType, + &ThreadEffectiveOnly, + &ImpersonationLevel); + + /* Create client security from it */ + Status = SepCreateClientSecurity(Token, + Qos, + RemoteClient, + TokenType, + ThreadEffectiveOnly, + ImpersonationLevel, + ClientContext); + + /* Check if we failed or static tracking was used */ + if (!(NT_SUCCESS(Status)) || (Qos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) + { + /* Dereference our copy since it's not being used */ + ObDereferenceObject(Token); + } + + /* Return status */ + return Status; +} + +/** + * @brief + * Creates a client security context based upon the captured security + * subject context. + * + * @param[in] SubjectContext + * The captured subject context where client security is to be created + * from. + * + * @param[in] ClientSecurityQos + * Quality of service to specify what kind of impersonation to be done. + * + * @param[in] ServerIsRemote + * If set to TRUE, the client that we're going to impersonate is remote. + * + * @param[out] ClientContext + * The returned security client context. + * + * @return + * See SepCreateClientSecurity. + */ +NTSTATUS +NTAPI +SeCreateClientSecurityFromSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext, + _In_ PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, + _In_ BOOLEAN ServerIsRemote, + _Out_ PSECURITY_CLIENT_CONTEXT ClientContext) +{ + PACCESS_TOKEN Token; + NTSTATUS Status; + PAGED_CODE(); + + /* Get the right token and reference it */ + Token = SeQuerySubjectContextToken(SubjectContext); + ObReferenceObject(Token); + + /* Create the context */ + Status = SepCreateClientSecurity(Token, + ClientSecurityQos, + ServerIsRemote, + SubjectContext->ClientToken ? + TokenImpersonation : TokenPrimary, + FALSE, + SubjectContext->ImpersonationLevel, + ClientContext); + + /* Check if we failed or static tracking was used */ + if (!(NT_SUCCESS(Status)) || + (ClientSecurityQos->ContextTrackingMode == SECURITY_STATIC_TRACKING)) + { + /* Dereference our copy since it's not being used */ + ObDereferenceObject(Token); + } + + /* Return status */ + return Status; +} + +/** + * @brief + * Extended function that impersonates a client. + * + * @param[in] ClientContext + * A valid client context. + * + * @param[in] ServerThread + * The thread where impersonation is to be done. + * + * @return + * STATUS_SUCCESS is returned if the calling thread successfully impersonates + * the client. A failure NTSTATUS code is returned otherwise. + */ +NTSTATUS +NTAPI +SeImpersonateClientEx( + _In_ PSECURITY_CLIENT_CONTEXT ClientContext, + _In_opt_ PETHREAD ServerThread) +{ + BOOLEAN EffectiveOnly; + PAGED_CODE(); + + /* Check if direct access is requested */ + if (!ClientContext->DirectlyAccessClientToken) + { + /* No, so get the flag from QOS */ + EffectiveOnly = ClientContext->SecurityQos.EffectiveOnly; + } + else + { + /* Yes, so see if direct access should be effective only */ + EffectiveOnly = ClientContext->DirectAccessEffectiveOnly; + } + + /* Use the current thread if one was not passed */ + if (!ServerThread) ServerThread = PsGetCurrentThread(); + + /* Call the lower layer routine */ + return PsImpersonateClient(ServerThread, + ClientContext->ClientToken, + TRUE, + EffectiveOnly, + ClientContext->SecurityQos.ImpersonationLevel); +} + +/** + * @brief + * Impersonates a client user. + * + * @param[in] ClientContext + * A valid client context. + * + * @param[in] ServerThread + * The thread where impersonation is to be done. + * * + * @return + * Nothing. + */ +VOID +NTAPI +SeImpersonateClient( + _In_ PSECURITY_CLIENT_CONTEXT ClientContext, + _In_opt_ PETHREAD ServerThread) +{ + PAGED_CODE(); + + /* Call the new API */ + SeImpersonateClientEx(ClientContext, ServerThread); +} + +/* EOF */ diff --git a/ntoskrnl/se/objtype.c b/ntoskrnl/se/objtype.c new file mode 100644 index 00000000000..f4648d1a8ec --- /dev/null +++ b/ntoskrnl/se/objtype.c @@ -0,0 +1,115 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security object type list support routines + * COPYRIGHT: Copyright Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS ***********************************************************/ + +/** + * @brief + * Captures a list of object types. + * + * @param[in] ObjectTypeList + * An existing list of object types. + * + * @param[in] ObjectTypeListLength + * The length size of the list. + * + * @param[in] PreviousMode + * Processor access level mode. + * + * @param[out] CapturedObjectTypeList + * The captured list of object types. + * + * @return + * Returns STATUS_SUCCESS if the list of object types has been captured + * successfully. STATUS_INVALID_PARAMETER is returned if the caller hasn't + * supplied a buffer list of object types. STATUS_INSUFFICIENT_RESOURCES + * is returned if pool memory allocation for the captured list has failed. + */ +NTSTATUS +SeCaptureObjectTypeList( + _In_reads_opt_(ObjectTypeListLength) POBJECT_TYPE_LIST ObjectTypeList, + _In_ ULONG ObjectTypeListLength, + _In_ KPROCESSOR_MODE PreviousMode, + _Out_ POBJECT_TYPE_LIST *CapturedObjectTypeList) +{ + SIZE_T Size; + + if (PreviousMode == KernelMode) + { + return STATUS_NOT_IMPLEMENTED; + } + + if (ObjectTypeListLength == 0) + { + *CapturedObjectTypeList = NULL; + return STATUS_SUCCESS; + } + + if (ObjectTypeList == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Calculate the list size and check for integer overflow */ + Size = ObjectTypeListLength * sizeof(OBJECT_TYPE_LIST); + if (Size == 0) + { + return STATUS_INVALID_PARAMETER; + } + + /* Allocate a new list */ + *CapturedObjectTypeList = ExAllocatePoolWithTag(PagedPool, Size, TAG_SEPA); + if (*CapturedObjectTypeList == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + _SEH2_TRY + { + ProbeForRead(ObjectTypeList, Size, sizeof(ULONG)); + RtlCopyMemory(*CapturedObjectTypeList, ObjectTypeList, Size); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ExFreePoolWithTag(*CapturedObjectTypeList, TAG_SEPA); + *CapturedObjectTypeList = NULL; + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + return STATUS_SUCCESS; +} + +/** + * @brief + * Releases a buffer list of object types. + * + * @param[in] CapturedObjectTypeList + * A list of object types to free. + * + * @param[in] PreviousMode + * Processor access level mode. + * + * @return + * Nothing. + */ +VOID +SeReleaseObjectTypeList( + _In_ _Post_invalid_ POBJECT_TYPE_LIST CapturedObjectTypeList, + _In_ KPROCESSOR_MODE PreviousMode) +{ + if ((PreviousMode != KernelMode) && (CapturedObjectTypeList != NULL)) + ExFreePoolWithTag(CapturedObjectTypeList, TAG_SEPA); +} + +/* EOF */ diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 13aeba2662b..3d4d8931a15 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -412,6 +412,146 @@ SepReleaseSid( } } +/** + * @brief + * Checks if a SID is present in a token. + * + * @param[in] _Token + * A valid token object. + * + * @param[in] PrincipalSelfSid + * A principal self SID. + * + * @param[in] _Sid + * A regular SID. + * + * @param[in] Deny + * If set to TRUE, the caller expected that a SID in a token + * must be a deny-only SID, that is, access checks are performed + * only for deny-only ACEs of the said SID. + * + * @param[in] Restricted + * If set to TRUE, the caller expects that a SID in a token is + * restricted (by the general definition, a token is restricted). + * + * @return + * Returns TRUE if the specified SID in the call is present in the token, + * FALSE otherwise. + */ +BOOLEAN +NTAPI +SepSidInTokenEx( + _In_ PACCESS_TOKEN _Token, + _In_ PSID PrincipalSelfSid, + _In_ PSID _Sid, + _In_ BOOLEAN Deny, + _In_ BOOLEAN Restricted) +{ + ULONG SidIndex; + PTOKEN Token = (PTOKEN)_Token; + PISID TokenSid, Sid = (PISID)_Sid; + PSID_AND_ATTRIBUTES SidAndAttributes; + ULONG SidCount, SidLength; + USHORT SidMetadata; + PAGED_CODE(); + + /* Check if a principal SID was given, and this is our current SID already */ + if ((PrincipalSelfSid) && (RtlEqualSid(SePrincipalSelfSid, Sid))) + { + /* Just use the principal SID in this case */ + Sid = PrincipalSelfSid; + } + + /* Check if this is a restricted token or not */ + if (Restricted) + { + /* Use the restricted SIDs and count */ + SidAndAttributes = Token->RestrictedSids; + SidCount = Token->RestrictedSidCount; + } + else + { + /* Use the normal SIDs and count */ + SidAndAttributes = Token->UserAndGroups; + SidCount = Token->UserAndGroupCount; + } + + /* Do checks here by hand instead of the usual 4 function calls */ + SidLength = FIELD_OFFSET(SID, + SubAuthority[Sid->SubAuthorityCount]); + SidMetadata = *(PUSHORT)&Sid->Revision; + + /* Loop every SID */ + for (SidIndex = 0; SidIndex < SidCount; SidIndex++) + { + TokenSid = (PISID)SidAndAttributes->Sid; +#if SE_SID_DEBUG + UNICODE_STRING sidString; + RtlConvertSidToUnicodeString(&sidString, TokenSid, TRUE); + DPRINT1("SID in Token: %wZ\n", &sidString); + RtlFreeUnicodeString(&sidString); +#endif + /* Check if the SID metadata matches */ + if (*(PUSHORT)&TokenSid->Revision == SidMetadata) + { + /* Check if the SID data matches */ + if (RtlEqualMemory(Sid, TokenSid, SidLength)) + { + /* + * Check if the group is enabled, or used for deny only. + * Otherwise we have to check if this is the first user. + * We understand that by looking if this SID is not + * restricted, this is the first element we are iterating + * and that it doesn't have SE_GROUP_USE_FOR_DENY_ONLY + * attribute. + */ + if ((!Restricted && (SidIndex == 0) && !(SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY)) || + (SidAndAttributes->Attributes & SE_GROUP_ENABLED) || + ((Deny) && (SidAndAttributes->Attributes & SE_GROUP_USE_FOR_DENY_ONLY))) + { + /* SID is present */ + return TRUE; + } + else + { + /* SID is not present */ + return FALSE; + } + } + } + + /* Move to the next SID */ + SidAndAttributes++; + } + + /* SID is not present */ + return FALSE; +} + +/** + * @brief + * Checks if a SID is present in a token. + * + * @param[in] _Token + * A valid token object. + * + * @param[in] _Sid + * A regular SID. + * + * @return + * Returns TRUE if the specified SID in the call is present in the token, + * FALSE otherwise. + */ +BOOLEAN +NTAPI +SepSidInToken( + _In_ PACCESS_TOKEN _Token, + _In_ PSID Sid) +{ + /* Call extended API */ + return SepSidInTokenEx(_Token, NULL, Sid, FALSE, FALSE); +} + /** * @brief * Captures a security identifier from a diff --git a/ntoskrnl/se/subject.c b/ntoskrnl/se/subject.c new file mode 100644 index 00000000000..51a9e132028 --- /dev/null +++ b/ntoskrnl/se/subject.c @@ -0,0 +1,185 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security subject context support routines + * COPYRIGHT: Copyright Alex Ionescu <alex(a)relsoft.net> + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +ERESOURCE SepSubjectContextLock; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/** + * @brief + * An extended function that captures the security subject context based upon + * the specified thread and process. + * + * @param[in] Thread + * A thread where the calling thread's token is to be referenced for + * the security context. + * + * @param[in] Process + * A process where the main process' token is to be referenced for + * the security context. + * + * @param[out] SubjectContext + * The returned security subject context. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeCaptureSubjectContextEx( + _In_ PETHREAD Thread, + _In_ PEPROCESS Process, + _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + BOOLEAN CopyOnOpen, EffectiveOnly; + + PAGED_CODE(); + + /* Save the unique ID */ + SubjectContext->ProcessAuditId = Process->UniqueProcessId; + + /* Check if we have a thread */ + if (!Thread) + { + /* We don't, so no token */ + SubjectContext->ClientToken = NULL; + } + else + { + /* Get the impersonation token */ + SubjectContext->ClientToken = PsReferenceImpersonationToken(Thread, + &CopyOnOpen, + &EffectiveOnly, + &SubjectContext->ImpersonationLevel); + } + + /* Get the primary token */ + SubjectContext->PrimaryToken = PsReferencePrimaryToken(Process); +} + +/** + * @brief + * Captures the security subject context of the calling thread and calling + * process. + * + * @param[out] SubjectContext + * The returned security subject context. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeCaptureSubjectContext( + _Out_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + /* Call the extended API */ + SeCaptureSubjectContextEx(PsGetCurrentThread(), + PsGetCurrentProcess(), + SubjectContext); +} + +/** + * @brief + * Locks both the referenced primary and client access tokens of a + * security subject context. + * + * @param[in] SubjectContext + * A valid security context with both referenced tokens. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeLockSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + PTOKEN PrimaryToken, ClientToken; + PAGED_CODE(); + + /* Read both tokens */ + PrimaryToken = SubjectContext->PrimaryToken; + ClientToken = SubjectContext->ClientToken; + + /* Always lock the primary */ + SepAcquireTokenLockShared(PrimaryToken); + + /* Lock the impersonation one if it's there */ + if (!ClientToken) return; + SepAcquireTokenLockShared(ClientToken); +} + +/** + * @brief + * Unlocks both the referenced primary and client access tokens of a + * security subject context. + * + * @param[in] SubjectContext + * A valid security context with both referenced tokens. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeUnlockSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + PTOKEN PrimaryToken, ClientToken; + PAGED_CODE(); + + /* Read both tokens */ + PrimaryToken = SubjectContext->PrimaryToken; + ClientToken = SubjectContext->ClientToken; + + /* Unlock the impersonation one if it's there */ + if (ClientToken) + { + SepReleaseTokenLock(ClientToken); + } + + /* Always unlock the primary one */ + SepReleaseTokenLock(PrimaryToken); +} + +/** + * @brief + * Releases both the primary and client tokens of a security + * subject context. + * + * @param[in] SubjectContext + * The captured security context. + * + * @return + * Nothing. + */ +VOID +NTAPI +SeReleaseSubjectContext( + _In_ PSECURITY_SUBJECT_CONTEXT SubjectContext) +{ + PAGED_CODE(); + + /* Drop reference on the primary */ + ObFastDereferenceObject(&PsGetCurrentProcess()->Token, SubjectContext->PrimaryToken); + SubjectContext->PrimaryToken = NULL; + + /* Drop reference on the impersonation, if there was one */ + PsDereferenceImpersonationToken(SubjectContext->ClientToken); + SubjectContext->ClientToken = NULL; +} + +/* EOF */ diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index e773358b356..83b962f1ba9 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) - * PURPOSE: Security token implementation support + * PURPOSE: Security access token implementation base support routines * COPYRIGHT: Copyright David Welch <welch(a)cwcom.net> * Copyright 2021-2022 George Bișoc <george.bisoc(a)reactos.org> */ @@ -12,8 +12,6 @@ #define NDEBUG #include <debug.h> -#include <ntlsa.h> - /* GLOBALS ********************************************************************/ POBJECT_TYPE SeTokenObjectType = NULL; @@ -29,48 +27,7 @@ static GENERIC_MAPPING SepTokenMapping = { TOKEN_ALL_ACCESS }; -static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { - - /* Class 0 not used, blame MS! */ - IQS_NONE, - - /* TokenUser */ - IQS_SAME(TOKEN_USER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenGroups */ - IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenPrivileges */ - IQS_SAME(TOKEN_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenOwner */ - IQS_SAME(TOKEN_OWNER, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE), - /* TokenPrimaryGroup */ - IQS_SAME(TOKEN_PRIMARY_GROUP, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE), - /* TokenDefaultDacl */ - IQS_SAME(TOKEN_DEFAULT_DACL, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE), - /* TokenSource */ - IQS_SAME(TOKEN_SOURCE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenType */ - IQS_SAME(TOKEN_TYPE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenImpersonationLevel */ - IQS_SAME(SECURITY_IMPERSONATION_LEVEL, ULONG, ICIF_QUERY), - /* TokenStatistics */ - IQS_SAME(TOKEN_STATISTICS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenRestrictedSids */ - IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenSessionId */ - IQS_SAME(ULONG, ULONG, ICIF_QUERY | ICIF_SET), - /* TokenGroupsAndPrivileges */ - IQS_SAME(TOKEN_GROUPS_AND_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE), - /* TokenSessionReference */ - IQS_SAME(ULONG, ULONG, ICIF_SET), - /* TokenSandBoxInert */ - IQS_SAME(ULONG, ULONG, ICIF_QUERY), - /* TokenAuditPolicy */ - IQS_SAME(TOKEN_AUDIT_POLICY_INFORMATION, ULONG, ICIF_SET | ICIF_SET_SIZE_VARIABLE), - /* TokenOrigin */ - IQS_SAME(TOKEN_ORIGIN, ULONG, ICIF_QUERY | ICIF_SET), -}; - -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *****************************************************************/ /** * @brief @@ -84,7 +41,6 @@ static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { * completed successfully, otherwise STATUS_INSUFFICIENT_RESOURCES on a * pool allocation failure. */ -static NTSTATUS SepCreateTokenLock( _Inout_ PTOKEN Token) @@ -114,7 +70,6 @@ SepCreateTokenLock( * @return * Nothing. */ -static VOID SepDeleteTokenLock( _Inout_ PTOKEN Token) @@ -483,7 +438,6 @@ SepImpersonateAnonymousToken( * @return * Nothing. */ -static VOID SepUpdateSinglePrivilegeFlagToken( _Inout_ PTOKEN Token, @@ -534,6 +488,56 @@ SepUpdateSinglePrivilegeFlagToken( } } +/** + * @brief + * Checks if a token belongs to the main user, being the owner. + * + * @param[in] _Token + * A valid token object. + * + * @param[in] SecurityDescriptor + * A security descriptor where the owner is to be found. + * + * @param[in] TokenLocked + * If set to TRUE, the token has been already locked and there's + * no need to lock it again. Otherwise the function will acquire + * the lock. + * + * @return + * Returns TRUE if the token belongs to a owner, FALSE otherwise. + */ +BOOLEAN +NTAPI +SepTokenIsOwner( + _In_ PACCESS_TOKEN _Token, + _In_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ BOOLEAN TokenLocked) +{ + PSID Sid; + BOOLEAN Result; + PTOKEN Token = _Token; + + /* Get the owner SID */ + Sid = SepGetOwnerFromDescriptor(SecurityDescriptor); + ASSERT(Sid != NULL); + + /* Lock the token if needed */ + if (!TokenLocked) SepAcquireTokenLockShared(Token); + + /* Check if the owner SID is found, handling restricted case as well */ + Result = SepSidInToken(Token, Sid); + if ((Result) && (Token->TokenFlags & TOKEN_IS_RESTRICTED)) + { + Result = SepSidInTokenEx(Token, NULL, Sid, FALSE, TRUE); + } + + /* Release the lock if we had acquired it */ + if (!TokenLocked) SepReleaseTokenLock(Token); + + /* Return the result */ + return Result; +} + /** * @brief * Updates the token's flags based upon the privilege that the token @@ -546,7 +550,6 @@ SepUpdateSinglePrivilegeFlagToken( * @return * Nothing. */ -static VOID SepUpdatePrivilegeFlagsToken( _Inout_ PTOKEN Token) @@ -575,7 +578,6 @@ SepUpdatePrivilegeFlagsToken( * @return * Nothing. */ -static VOID SepRemovePrivilegeToken( _Inout_ PTOKEN Token, @@ -612,7 +614,6 @@ SepRemovePrivilegeToken( * @return * Nothing. */ -static VOID SepRemoveUserGroupToken( _Inout_ PTOKEN Token, @@ -819,7 +820,7 @@ SeDeassignPrimaryToken( * @return * Returns the total length of a SID size. */ -static ULONG +ULONG RtlLengthSidAndAttributes( _In_ ULONG Count, _In_ PSID_AND_ATTRIBUTES Src) @@ -865,7 +866,7 @@ RtlLengthSidAndAttributes( * user from the token. STATUS_INVALID_PRIMARY_GROUP is returned if the specified default primary group does not match with the * other group from the token. */ -static NTSTATUS +NTSTATUS SepFindPrimaryGroupAndDefaultOwner( _In_ PTOKEN Token, _In_ PSID PrimaryGroup, @@ -959,349 +960,6 @@ SepFindPrimaryGroupAndDefaultOwner( return STATUS_SUCCESS; } -/** - * @brief - * Duplicates an access token, from an existing valid token. - * - * @param[in] Token - * Access token to duplicate. - * - * @param[in] ObjectAttributes - * Object attributes for the new token. - * - * @param[in] EffectiveOnly - * If set to TRUE, the function removes all the disabled privileges and groups of the token - * to duplicate. - * - * @param[in] TokenType - * Type of token. - * - * @param[in] Level - * Security impersonation level of a token. - * - * @param[in] PreviousMode - * The processor request level mode. - * - * @param[out] NewAccessToken - * The duplicated token. - * - * @return - * Returns STATUS_SUCCESS if the token has been duplicated. STATUS_INSUFFICIENT_RESOURCES is returned - * if memory pool allocation of the dynamic part of the token for duplication has failed due to the lack - * of memory resources. A failure NTSTATUS code is returned otherwise. - */ -NTSTATUS -NTAPI -SepDuplicateToken( - _In_ PTOKEN Token, - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ BOOLEAN EffectiveOnly, - _In_ TOKEN_TYPE TokenType, - _In_ SECURITY_IMPERSONATION_LEVEL Level, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PTOKEN* NewAccessToken) -{ - NTSTATUS Status; - PTOKEN AccessToken; - PVOID EndMem; - ULONG PrimaryGroupIndex; - ULONG VariableLength; - ULONG TotalSize; - ULONG PrivilegesIndex, GroupsIndex; - - PAGED_CODE(); - - /* Compute how much size we need to allocate for the token */ - VariableLength = Token->VariableLength; - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; - - Status = ObCreateObject(PreviousMode, - SeTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - TotalSize, - 0, - 0, - (PVOID*)&AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObCreateObject() failed (Status 0x%lx)\n", Status); - return Status; - } - - /* Zero out the buffer and initialize the token */ - RtlZeroMemory(AccessToken, TotalSize); - - ExAllocateLocallyUniqueId(&AccessToken->TokenId); - - AccessToken->TokenType = TokenType; - AccessToken->ImpersonationLevel = Level; - - /* Initialise the lock for the access token */ - Status = SepCreateTokenLock(AccessToken); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(AccessToken); - return Status; - } - - /* Copy the immutable fields */ - AccessToken->TokenSource.SourceIdentifier = Token->TokenSource.SourceIdentifier; - RtlCopyMemory(AccessToken->TokenSource.SourceName, - Token->TokenSource.SourceName, - sizeof(Token->TokenSource.SourceName)); - - AccessToken->AuthenticationId = Token->AuthenticationId; - AccessToken->ParentTokenId = Token->ParentTokenId; - AccessToken->ExpirationTime = Token->ExpirationTime; - AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; - - /* Lock the source token and copy the mutable fields */ - SepAcquireTokenLockShared(Token); - - AccessToken->SessionId = Token->SessionId; - AccessToken->ModifiedId = Token->ModifiedId; - - AccessToken->TokenFlags = Token->TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; - - /* Reference the logon session */ - Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - if (!NT_SUCCESS(Status)) - { - /* No logon session could be found, bail out */ - DPRINT1("SepRmReferenceLogonSession() failed (Status 0x%lx)\n", Status); - /* Set the flag for proper cleanup by the delete procedure */ - AccessToken->TokenFlags |= TOKEN_SESSION_NOT_REFERENCED; - goto Quit; - } - - /* Insert the referenced logon session into the token */ - Status = SepRmInsertLogonSessionIntoToken(AccessToken); - if (!NT_SUCCESS(Status)) - { - /* Failed to insert the logon session into the token, bail out */ - DPRINT1("SepRmInsertLogonSessionIntoToken() failed (Status 0x%lx)\n", Status); - goto Quit; - } - - /* Fill in token debug information */ -#if DBG - RtlCopyMemory(AccessToken->ImageFileName, - PsGetCurrentProcess()->ImageFileName, - min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); - - AccessToken->ProcessCid = PsGetCurrentProcessId(); - AccessToken->ThreadCid = PsGetCurrentThreadId(); - AccessToken->CreateMethod = TOKEN_DUPLICATE_METHOD; -#endif - - /* Assign the data that reside in the token's variable information area */ - AccessToken->VariableLength = VariableLength; - EndMem = (PVOID)&AccessToken->VariablePart; - - /* Copy the privileges */ - AccessToken->PrivilegeCount = 0; - AccessToken->Privileges = NULL; - if (Token->Privileges && (Token->PrivilegeCount > 0)) - { - ULONG PrivilegesLength = Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - PrivilegesLength = ALIGN_UP_BY(PrivilegesLength, sizeof(PVOID)); - - ASSERT(VariableLength >= PrivilegesLength); - - AccessToken->PrivilegeCount = Token->PrivilegeCount; - AccessToken->Privileges = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + PrivilegesLength); - VariableLength -= PrivilegesLength; - - RtlCopyMemory(AccessToken->Privileges, - Token->Privileges, - AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - - /* Copy the user and groups */ - AccessToken->UserAndGroupCount = 0; - AccessToken->UserAndGroups = NULL; - if (Token->UserAndGroups && (Token->UserAndGroupCount > 0)) - { - AccessToken->UserAndGroupCount = Token->UserAndGroupCount; - AccessToken->UserAndGroups = EndMem; - EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->UserAndGroups); - - Status = RtlCopySidAndAttributesArray(AccessToken->UserAndGroupCount, - Token->UserAndGroups, - VariableLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlCopySidAndAttributesArray(UserAndGroups) failed (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* Find the token primary group */ - Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, - Token->PrimaryGroup, - NULL, - &PrimaryGroupIndex, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepFindPrimaryGroupAndDefaultOwner failed (Status 0x%lx)\n", Status); - goto Quit; - } - - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; - - /* Copy the restricted SIDs */ - AccessToken->RestrictedSidCount = 0; - AccessToken->RestrictedSids = NULL; - if (Token->RestrictedSids && (Token->RestrictedSidCount > 0)) - { - AccessToken->RestrictedSidCount = Token->RestrictedSidCount; - AccessToken->RestrictedSids = EndMem; - EndMem = &AccessToken->RestrictedSids[AccessToken->RestrictedSidCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->RestrictedSids); - - Status = RtlCopySidAndAttributesArray(AccessToken->RestrictedSidCount, - Token->RestrictedSids, - VariableLength, - AccessToken->RestrictedSids, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlCopySidAndAttributesArray(RestrictedSids) failed (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* - * Filter the token by removing the disabled privileges - * and groups if the caller wants to duplicate an access - * token as effective only. - */ - if (EffectiveOnly) - { - /* Begin querying the groups and search for disabled ones */ - for (GroupsIndex = 0; GroupsIndex < AccessToken->UserAndGroupCount; GroupsIndex++) - { - /* - * A group or user is considered disabled if its attributes is either - * 0 or SE_GROUP_ENABLED is not included in the attributes flags list. - * That is because a certain user and/or group can have several attributes - * that bear no influence on whether a user/group is enabled or not - * (SE_GROUP_ENABLED_BY_DEFAULT for example which is a mere indicator - * that the group has just been enabled by default). A mandatory - * group (that is, the group has SE_GROUP_MANDATORY attribute) - * by standards it's always enabled and no one can disable it. - */ - if (AccessToken->UserAndGroups[GroupsIndex].Attributes == 0 || - (AccessToken->UserAndGroups[GroupsIndex].Attributes & SE_GROUP_ENABLED) == 0) - { - /* - * If this group is an administrators group - * and the token belongs to such group, - * we've to take away TOKEN_HAS_ADMIN_GROUP - * for the fact that's not enabled and as - * such the token no longer belongs to - * this group. - */ - if (RtlEqualSid(SeAliasAdminsSid, - &AccessToken->UserAndGroups[GroupsIndex].Sid)) - { - AccessToken->TokenFlags &= ~TOKEN_HAS_ADMIN_GROUP; - } - - /* - * A group is not enabled, it's time to remove - * from the token and update the groups index - * accordingly and continue with the next group. - */ - SepRemoveUserGroupToken(AccessToken, GroupsIndex); - GroupsIndex--; - } - } - - /* Begin querying the privileges and search for disabled ones */ - for (PrivilegesIndex = 0; PrivilegesIndex < AccessToken->PrivilegeCount; PrivilegesIndex++) - { - /* - * A privilege is considered disabled if its attributes is either - * 0 or SE_PRIVILEGE_ENABLED is not included in the attributes flags list. - * That is because a certain privilege can have several attributes - * that bear no influence on whether a privilege is enabled or not - * (SE_PRIVILEGE_ENABLED_BY_DEFAULT for example which is a mere indicator - * that the privilege has just been enabled by default). - */ - if (AccessToken->Privileges[PrivilegesIndex].Attributes == 0 || - (AccessToken->Privileges[PrivilegesIndex].Attributes & SE_PRIVILEGE_ENABLED) == 0) - { - /* - * A privilege is not enabled, therefor it's time - * to strip it from the token and continue with the next - * privilege. Of course we must also want to update the - * privileges index accordingly. - */ - SepRemovePrivilegeToken(AccessToken, PrivilegesIndex); - PrivilegesIndex--; - } - } - } - - // - // NOTE: So far our dynamic area only contains - // the default dacl, so this makes the following - // code pretty simple. The day where it stores - // other data, the code will require adaptations. - // - - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; // Unused memory in the dynamic area. - AccessToken->DynamicPart = NULL; - if (Token->DynamicPart && Token->DefaultDacl) - { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - EndMem = (PVOID)AccessToken->DynamicPart; - AccessToken->DefaultDacl = EndMem; - - RtlCopyMemory(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - - /* Return the token to the caller */ - *NewAccessToken = AccessToken; - Status = STATUS_SUCCESS; - -Quit: - if (!NT_SUCCESS(Status)) - { - /* Dereference the token, the delete procedure will clean it up */ - ObDereferenceObject(AccessToken); - } - - /* Unlock the source token */ - SepReleaseTokenLock(Token); - - return Status; -} - /** * @brief * Subtracts a token in exchange of duplicating a new one. @@ -1638,1207 +1296,292 @@ SeAssignPrimaryToken( /** * @brief - * Internal function responsible for access token object creation in the kernel. - * A fully created token objected is inserted into the token handle, thus the handle - * becoming a valid handle to an access token object and ready for use. + * Retrieves token control information. * - * @param[out] TokenHandle - * Valid token handle that's ready for use after token creation and object insertion. - * - * @param[in] PreviousMode - * Processor request level mode. - * - * @param[in] DesiredAccess - * Desired access right for the token object to be granted. This kind of access right - * impacts how the token can be used and who. - * - * @param[in] ObjectAttributes - * Object attributes for the token to be created. - * - * @param[in] TokenType - * Type of token to assign upon creation. - * - * @param[in] ImpersonationLevel - * Security impersonation level of token to assign upon creation. - * - * @param[in] AuthenticationId - * Authentication ID that represents the authentication information of the token. - * - * @param[in] ExpirationTime - * Expiration time of the token to assign. A value of -1 means that the token never - * expires and its life depends upon the amount of references this token object has. - * - * @param[in] User - * User entry to assign to the token. - * - * @param[in] GroupCount - * The total number of groups count for the token. - * - * @param[in] Groups - * The group entries for the token. - * - * @param[in] GroupsLength - * The length size of the groups array, pointed by the Groups parameter. + * @param[in] _Token + * A valid token object. * - * @param[in] PrivilegeCount - * The total number of priivleges that the newly created token has. - * - * @param[in] Privileges - * The privileges for the token. - * - * @param[in] Owner - * The main user (or also owner) that represents the token that we create. - * - * @param[in] PrimaryGroup - * The main group that represents the token that we create. - * - * @param[in] DefaultDacl - * A discretionary access control list for the token. - * - * @param[in] TokenSource - * Source (or the origin) of the access token that creates it. - * - * @param[in] SystemToken - * If set to TRUE, the newly created token is a system token and only in charge - * by the internal system. The function directly returns a pointer to the - * created token object for system kernel use. Otherwise if set to FALSE, the - * function inserts the object to a handle making it a regular access token. + * @param[out] SecurityDescriptor + * The returned token control information. * * @return - * Returns STATUS_SUCCESS if token creation has completed successfully. - * STATUS_INSUFFICIENT_RESOURCES is returned if the dynamic area of memory of the - * token hasn't been allocated because of lack of memory resources. A failure - * NTSTATUS code is returned otherwise. + * Nothing. */ -NTSTATUS +VOID NTAPI -SepCreateToken( - _Out_ PHANDLE TokenHandle, - _In_ KPROCESSOR_MODE PreviousMode, - _In_ ACCESS_MASK DesiredAccess, - _In_opt_ POBJECT_ATTRIBUTES ObjectAttributes, - _In_ TOKEN_TYPE TokenType, - _In_ SECURITY_IMPERSONATION_LEVEL ImpersonationLevel, - _In_ PLUID AuthenticationId, - _In_ PLARGE_INTEGER ExpirationTime, - _In_ PSID_AND_ATTRIBUTES User, - _In_ ULONG GroupCount, - _In_ PSID_AND_ATTRIBUTES Groups, - _In_ ULONG GroupsLength, - _In_ ULONG PrivilegeCount, - _In_ PLUID_AND_ATTRIBUTES Privileges, - _In_opt_ PSID Owner, - _In_ PSID PrimaryGroup, - _In_opt_ PACL DefaultDacl, - _In_ PTOKEN_SOURCE TokenSource, - _In_ BOOLEAN SystemToken) +SeGetTokenControlInformation( + _In_ PACCESS_TOKEN _Token, + _Out_ PTOKEN_CONTROL TokenControl) { - NTSTATUS Status; - PTOKEN AccessToken; - ULONG TokenFlags = 0; - ULONG PrimaryGroupIndex, DefaultOwnerIndex; - LUID TokenId; - LUID ModifiedId; - PVOID EndMem; - ULONG PrivilegesLength; - ULONG UserGroupsLength; - ULONG VariableLength; - ULONG TotalSize; - ULONG i; - + PTOKEN Token = _Token; PAGED_CODE(); - /* Loop all groups */ - for (i = 0; i < GroupCount; i++) - { - /* Check for mandatory groups */ - if (Groups[i].Attributes & SE_GROUP_MANDATORY) - { - /* Force them to be enabled */ - Groups[i].Attributes |= (SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT); - } - - /* Check of the group is an admin group */ - if (RtlEqualSid(SeAliasAdminsSid, Groups[i].Sid)) - { - /* Remember this so we can optimize queries later */ - TokenFlags |= TOKEN_HAS_ADMIN_GROUP; - } - } - - /* Allocate unique IDs for the token */ - ExAllocateLocallyUniqueId(&TokenId); - ExAllocateLocallyUniqueId(&ModifiedId); - - /* Compute how much size we need to allocate for the token */ - - /* Privileges size */ - PrivilegesLength = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - PrivilegesLength = ALIGN_UP_BY(PrivilegesLength, sizeof(PVOID)); - - /* User and groups size */ - UserGroupsLength = (1 + GroupCount) * sizeof(SID_AND_ATTRIBUTES); - UserGroupsLength += RtlLengthSid(User->Sid); - for (i = 0; i < GroupCount; i++) - { - UserGroupsLength += RtlLengthSid(Groups[i].Sid); - } - UserGroupsLength = ALIGN_UP_BY(UserGroupsLength, sizeof(PVOID)); + /* Capture the main fields */ + TokenControl->AuthenticationId = Token->AuthenticationId; + TokenControl->TokenId = Token->TokenId; + TokenControl->TokenSource = Token->TokenSource; - /* Add the additional groups array length */ - UserGroupsLength += ALIGN_UP_BY(GroupsLength, sizeof(PVOID)); + /* Lock the token */ + SepAcquireTokenLockShared(Token); - VariableLength = PrivilegesLength + UserGroupsLength; - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; + /* Capture the modified ID */ + TokenControl->ModifiedId = Token->ModifiedId; - Status = ObCreateObject(PreviousMode, - SeTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - TotalSize, - 0, - 0, - (PVOID*)&AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObCreateObject() failed (Status 0x%lx)\n", Status); - return Status; - } + /* Unlock it */ + SepReleaseTokenLock(Token); +} - /* Zero out the buffer and initialize the token */ - RtlZeroMemory(AccessToken, TotalSize); +/** + * @brief + * Creates the system process token. + * + * @return + * Returns the system process token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") +PTOKEN +NTAPI +SepCreateSystemProcessToken(VOID) +{ + LUID_AND_ATTRIBUTES Privileges[25]; + ULONG GroupAttributes, OwnerAttributes; + SID_AND_ATTRIBUTES Groups[32]; + LARGE_INTEGER Expiration; + SID_AND_ATTRIBUTES UserSid; + ULONG GroupsLength; + PSID PrimaryGroup; + OBJECT_ATTRIBUTES ObjectAttributes; + PSID Owner; + ULONG i; + PTOKEN Token; + NTSTATUS Status; - AccessToken->TokenId = TokenId; - AccessToken->TokenType = TokenType; - AccessToken->ImpersonationLevel = ImpersonationLevel; + /* Don't ever expire */ + Expiration.QuadPart = -1; - /* Initialise the lock for the access token */ - Status = SepCreateTokenLock(AccessToken); - if (!NT_SUCCESS(Status)) - goto Quit; + /* All groups mandatory and enabled */ + GroupAttributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; + OwnerAttributes = SE_GROUP_ENABLED | SE_GROUP_OWNER | SE_GROUP_ENABLED_BY_DEFAULT; - AccessToken->TokenSource.SourceIdentifier = TokenSource->SourceIdentifier; - RtlCopyMemory(AccessToken->TokenSource.SourceName, - TokenSource->SourceName, - sizeof(TokenSource->SourceName)); + /* User is Local System */ + UserSid.Sid = SeLocalSystemSid; + UserSid.Attributes = 0; - AccessToken->ExpirationTime = *ExpirationTime; - AccessToken->ModifiedId = ModifiedId; + /* Primary group is Local System */ + PrimaryGroup = SeLocalSystemSid; - AccessToken->TokenFlags = TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; + /* Owner is Administrators */ + Owner = SeAliasAdminsSid; - /* Copy and reference the logon session */ - AccessToken->AuthenticationId = *AuthenticationId; - Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - if (!NT_SUCCESS(Status)) - { - /* No logon session could be found, bail out */ - DPRINT1("SepRmReferenceLogonSession() failed (Status 0x%lx)\n", Status); - /* Set the flag for proper cleanup by the delete procedure */ - AccessToken->TokenFlags |= TOKEN_SESSION_NOT_REFERENCED; - goto Quit; - } + /* Groups are Administrators, World, and Authenticated Users */ + Groups[0].Sid = SeAliasAdminsSid; + Groups[0].Attributes = OwnerAttributes; + Groups[1].Sid = SeWorldSid; + Groups[1].Attributes = GroupAttributes; + Groups[2].Sid = SeAuthenticatedUsersSid; + Groups[2].Attributes = GroupAttributes; + GroupsLength = sizeof(SID_AND_ATTRIBUTES) + + SeLengthSid(Groups[0].Sid) + + SeLengthSid(Groups[1].Sid) + + SeLengthSid(Groups[2].Sid); + ASSERT(GroupsLength <= sizeof(Groups)); - /* Insert the referenced logon session into the token */ - Status = SepRmInsertLogonSessionIntoToken(AccessToken); - if (!NT_SUCCESS(Status)) - { - /* Failed to insert the logon session into the token, bail out */ - DPRINT1("SepRmInsertLogonSessionIntoToken() failed (Status 0x%lx)\n", Status); - goto Quit; - } + /* Setup the privileges */ + i = 0; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeTcbPrivilege; - /* Fill in token debug information */ -#if DBG - /* - * We must determine ourselves that the current - * process is not the initial CPU one. The initial - * process is not a "real" process, that is, the - * Process Manager has not yet been initialized and - * as a matter of fact we are creating a token before - * any process gets created by Ps. If it turns out - * that the current process is the initial CPU process - * where token creation execution takes place, don't - * do anything. - */ - if (PsGetCurrentProcess() != &KiInitialProcess) - { - RtlCopyMemory(AccessToken->ImageFileName, - PsGetCurrentProcess()->ImageFileName, - min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeCreateTokenPrivilege; - AccessToken->ProcessCid = PsGetCurrentProcessId(); - AccessToken->ThreadCid = PsGetCurrentThreadId(); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeTakeOwnershipPrivilege; - AccessToken->CreateMethod = TOKEN_CREATE_METHOD; -#endif + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeCreatePagefilePrivilege; - /* Assign the data that reside in the token's variable information area */ - AccessToken->VariableLength = VariableLength; - EndMem = (PVOID)&AccessToken->VariablePart; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeLockMemoryPrivilege; - /* Copy the privileges */ - AccessToken->PrivilegeCount = PrivilegeCount; - AccessToken->Privileges = NULL; - if (PrivilegeCount > 0) - { - AccessToken->Privileges = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + PrivilegesLength); - VariableLength -= PrivilegesLength; + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeAssignPrimaryTokenPrivilege; - if (PreviousMode != KernelMode) - { - _SEH2_TRY - { - RtlCopyMemory(AccessToken->Privileges, - Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - else - { - RtlCopyMemory(AccessToken->Privileges, - Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeIncreaseQuotaPrivilege; - if (!NT_SUCCESS(Status)) - goto Quit; - } + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeIncreaseBasePriorityPrivilege; - /* Update the privilege flags */ - SepUpdatePrivilegeFlagsToken(AccessToken); - - /* Copy the user and groups */ - AccessToken->UserAndGroupCount = 1 + GroupCount; - AccessToken->UserAndGroups = EndMem; - EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->UserAndGroups); - - Status = RtlCopySidAndAttributesArray(1, - User, - VariableLength, - &AccessToken->UserAndGroups[0], - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - goto Quit; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeCreatePermanentPrivilege; - Status = RtlCopySidAndAttributesArray(GroupCount, - Groups, - VariableLength, - &AccessToken->UserAndGroups[1], - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - goto Quit; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeDebugPrivilege; - /* Find the token primary group and default owner */ - Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, - PrimaryGroup, - Owner, - &PrimaryGroupIndex, - &DefaultOwnerIndex); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepFindPrimaryGroupAndDefaultOwner failed (Status 0x%lx)\n", Status); - goto Quit; - } + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeAuditPrivilege; - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = DefaultOwnerIndex; + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeSecurityPrivilege; - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; // Unused memory in the dynamic area. - AccessToken->DynamicPart = NULL; - if (DefaultDacl != NULL) - { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeSystemEnvironmentPrivilege; - EndMem = (PVOID)AccessToken->DynamicPart; - AccessToken->DefaultDacl = EndMem; + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeChangeNotifyPrivilege; - RtlCopyMemory(AccessToken->DefaultDacl, - DefaultDacl, - DefaultDacl->AclSize); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeBackupPrivilege; - /* Insert the token only if it's not the system token, otherwise return it directly */ - if (!SystemToken) - { - Status = ObInsertObject(AccessToken, - NULL, - DesiredAccess, - 0, - NULL, - TokenHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObInsertObject() failed (Status 0x%lx)\n", Status); - } - } - else - { - /* Return pointer instead of handle */ - *TokenHandle = (HANDLE)AccessToken; - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeRestorePrivilege; -Quit: - if (!NT_SUCCESS(Status)) - { - /* Dereference the token, the delete procedure will clean it up */ - ObDereferenceObject(AccessToken); - } + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeShutdownPrivilege; - return Status; + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeLoadDriverPrivilege; + + Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; + Privileges[i++].Luid = SeProfileSingleProcessPrivilege; + + Privileges[i].Attributes = 0; + Privileges[i++].Luid = SeSystemtimePrivilege; + ASSERT(i == 20); + + /* Setup the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemDefaultDacl != NULL); + + /* Create the token */ + Status = SepCreateToken((PHANDLE)&Token, + KernelMode, + 0, + &ObjectAttributes, + TokenPrimary, + SecurityAnonymous, + &SeSystemAuthenticationId, + &Expiration, + &UserSid, + 3, + Groups, + GroupsLength, + 20, + Privileges, + Owner, + PrimaryGroup, + SeSystemDefaultDacl, + &SeSystemTokenSource, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + + /* Return the token */ + return Token; } /** * @brief - * Private helper function responsible for creating a restricted access - * token, that is, a filtered token from privileges and groups and with - * restricted SIDs added into the token on demand by the caller. - * - * @param[in] Token - * An existing and valid access token. - * - * @param[in] PrivilegesToBeDeleted - * A list of privileges to be deleted within the token that's going - * to be filtered. This parameter is ignored if the caller wants to disable - * all the privileges by specifying DISABLE_MAX_PRIVILEGE in the flags - * parameter. - * - * @param[in] SidsToBeDisabled - * A list of group SIDs to be disabled within the token. This parameter - * can be NULL. - * - * @param[in] RestrictedSidsIntoToken - * A list of restricted SIDs to be added into the token. This parameter - * can be NULL. - * - * @param[in] PrivilegesCount - * The privilege count of the privileges list. - * - * @param[in] RegularGroupsSidCount - * The SIDs count of the group SIDs list. - * - * @param[in] RestrictedSidsCount - * The restricted SIDs count of restricted SIDs list. - * - * @param[in] PrivilegeFlags - * Influences how the privileges should be filtered in an access - * token. See NtFilterToken syscall for more information. - * - * @param[in] PreviousMode - * Processor level access mode. - * - * @param[out] FilteredToken - * The filtered token, returned to the caller. + * Creates the anonymous logon token for the system. The difference between this + * token and the other one is the inclusion of everyone SID group (being SeWorldSid). + * The other token lacks such group. * * @return - * Returns STATUS_SUCCESS if token token filtering has completed successfully. - * STATUS_INVALID_PARAMETER is returned if one or more of the parameters - * do not meet the conditions imposed by the function. A failure NTSTATUS - * code is returned otherwise. - * - * @remarks - * The final outcome of privileges and/or SIDs filtering is not always - * deterministic. That is, any privileges or SIDs that aren't present - * in the access token are ignored and the function continues with the - * next privilege or SID to find for filtering. For a fully deterministic - * outcome the caller is responsible for querying the information details - * of privileges and SIDs present in the token and then afterwards use - * such obtained information to do any kind of filtering to the token. + * Returns the system's anonymous logon token if the operations have + * completed successfully. */ -static -NTSTATUS -SepPerformTokenFiltering( - _In_ PTOKEN Token, - _In_opt_ PLUID_AND_ATTRIBUTES PrivilegesToBeDeleted, - _In_opt_ PSID_AND_ATTRIBUTES SidsToBeDisabled, - _In_opt_ PSID_AND_ATTRIBUTES RestrictedSidsIntoToken, - _When_(PrivilegesToBeDeleted != NULL, _In_) ULONG PrivilegesCount, - _When_(SidsToBeDisabled != NULL, _In_) ULONG RegularGroupsSidCount, - _When_(RestrictedSidsIntoToken != NULL, _In_) ULONG RestrictedSidsCount, - _In_ ULONG PrivilegeFlags, - _In_ KPROCESSOR_MODE PreviousMode, - _Out_ PTOKEN *FilteredToken) +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonToken(VOID) { + SID_AND_ATTRIBUTES Groups[32], UserSid; + PSID PrimaryGroup; + PTOKEN Token; + ULONG GroupsLength; + LARGE_INTEGER Expiration; + OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; - PTOKEN AccessToken; - PVOID EndMem; - ULONG RestrictedSidsLength; - ULONG PrivilegesLength; - ULONG PrimaryGroupIndex; - ULONG RestrictedSidsInList; - ULONG RestrictedSidsInToken; - ULONG VariableLength, TotalSize; - ULONG PrivsInToken, PrivsInList; - ULONG GroupsInToken, GroupsInList; - BOOLEAN WantPrivilegesDisabled; - BOOLEAN FoundPrivilege; - BOOLEAN FoundGroup; - - PAGED_CODE(); - - /* Ensure that the source token is valid, and lock it */ - ASSERT(Token); - SepAcquireTokenLockShared(Token); - /* Assume the caller doesn't want privileges disabled */ - WantPrivilegesDisabled = FALSE; + /* The token never expires */ + Expiration.QuadPart = -1; - /* Assume we haven't found anything */ - FoundPrivilege = FALSE; - FoundGroup = FALSE; + /* The user is the anonymous logon */ + UserSid.Sid = SeAnonymousLogonSid; + UserSid.Attributes = 0; - /* - * Take the size that we need for filtered token - * allocation based upon the existing access token - * we've been given. - */ - VariableLength = Token->VariableLength; + /* The primary group is also the anonymous logon */ + PrimaryGroup = SeAnonymousLogonSid; - if (RestrictedSidsIntoToken != NULL) - { - /* - * If the caller provided a list of restricted SIDs - * to be added onto the filtered access token then - * we must compute the size which is the total space - * of the current token and the length of the restricted - * SIDs for the filtered token. - */ - RestrictedSidsLength = RestrictedSidsCount * sizeof(SID_AND_ATTRIBUTES); - RestrictedSidsLength += RtlLengthSidAndAttributes(RestrictedSidsCount, RestrictedSidsIntoToken); - RestrictedSidsLength = ALIGN_UP_BY(RestrictedSidsLength, sizeof(PVOID)); + /* The only group for the token is the World */ + Groups[0].Sid = SeWorldSid; + Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; + GroupsLength = sizeof(SID_AND_ATTRIBUTES) + + SeLengthSid(Groups[0].Sid); + ASSERT(GroupsLength <= sizeof(Groups)); - /* - * The variable length of the token is not just - * the actual space length of the existing token - * but also the sum of the restricted SIDs length. - */ - VariableLength += RestrictedSidsLength; - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength + RestrictedSidsLength; - } - else - { - /* Otherwise the size is of the actual current token */ - TotalSize = FIELD_OFFSET(TOKEN, VariablePart) + VariableLength; - } + /* Initialise the object attributes for the token */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemAnonymousLogonDacl != NULL); - /* Set up a filtered token object */ - Status = ObCreateObject(PreviousMode, - SeTokenObjectType, - NULL, - PreviousMode, - NULL, - TotalSize, + /* Create token */ + Status = SepCreateToken((PHANDLE)&Token, + KernelMode, 0, + &ObjectAttributes, + TokenPrimary, + SecurityAnonymous, + &SeAnonymousAuthenticationId, + &Expiration, + &UserSid, + 1, + Groups, + GroupsLength, 0, - (PVOID*)&AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed to create the filtered token object (Status 0x%lx)\n", Status); - - /* Unlock the source token and bail out */ - SepReleaseTokenLock(Token); - return Status; - } - - /* Initialize the token and begin filling stuff to it */ - RtlZeroMemory(AccessToken, TotalSize); + NULL, + NULL, + PrimaryGroup, + SeSystemAnonymousLogonDacl, + &SeSystemTokenSource, + TRUE); + ASSERT(Status == STATUS_SUCCESS); - /* Set up a lock for the new token */ - Status = SepCreateTokenLock(AccessToken); - if (!NT_SUCCESS(Status)) - goto Quit; + /* Return the anonymous logon token */ + return Token; +} - /* Allocate new IDs for the token */ - ExAllocateLocallyUniqueId(&AccessToken->TokenId); - ExAllocateLocallyUniqueId(&AccessToken->ModifiedId); +/** + * @brief + * Creates the anonymous logon token for the system. This kind of token + * doesn't include the everyone SID group (being SeWorldSid). + * + * @return + * Returns the system's anonymous logon token if the operations have + * completed successfully. + */ +CODE_SEG("INIT") +PTOKEN +SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) +{ + SID_AND_ATTRIBUTES UserSid; + PSID PrimaryGroup; + PTOKEN Token; + LARGE_INTEGER Expiration; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; - /* Copy the type and impersonation level from the token */ - AccessToken->TokenType = Token->TokenType; - AccessToken->ImpersonationLevel = Token->ImpersonationLevel; + /* The token never expires */ + Expiration.QuadPart = -1; - /* Copy the immutable fields */ - AccessToken->TokenSource.SourceIdentifier = Token->TokenSource.SourceIdentifier; - RtlCopyMemory(AccessToken->TokenSource.SourceName, - Token->TokenSource.SourceName, - sizeof(Token->TokenSource.SourceName)); - - AccessToken->AuthenticationId = Token->AuthenticationId; - AccessToken->ParentTokenId = Token->TokenId; - AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; - - AccessToken->ExpirationTime = Token->ExpirationTime; - - /* Copy the mutable fields */ - AccessToken->SessionId = Token->SessionId; - AccessToken->TokenFlags = Token->TokenFlags & ~TOKEN_SESSION_NOT_REFERENCED; - - /* Reference the logon session */ - Status = SepRmReferenceLogonSession(&AccessToken->AuthenticationId); - if (!NT_SUCCESS(Status)) - { - /* We failed, bail out*/ - DPRINT1("SepPerformTokenFiltering(): Failed to reference the logon session (Status 0x%lx)\n", Status); - AccessToken->TokenFlags |= TOKEN_SESSION_NOT_REFERENCED; - goto Quit; - } - - /* Insert the referenced logon session into the token */ - Status = SepRmInsertLogonSessionIntoToken(AccessToken); - if (!NT_SUCCESS(Status)) - { - /* Failed to insert the logon session into the token, bail out */ - DPRINT1("SepPerformTokenFiltering(): Failed to insert the logon session into token (Status 0x%lx)\n", Status); - goto Quit; - } - - /* Fill in token debug information */ -#if DBG - RtlCopyMemory(AccessToken->ImageFileName, - PsGetCurrentProcess()->ImageFileName, - min(sizeof(AccessToken->ImageFileName), sizeof(PsGetCurrentProcess()->ImageFileName))); - - AccessToken->ProcessCid = PsGetCurrentProcessId(); - AccessToken->ThreadCid = PsGetCurrentThreadId(); - AccessToken->CreateMethod = TOKEN_FILTER_METHOD; -#endif - - /* Assign the data that reside in the token's variable information area */ - AccessToken->VariableLength = VariableLength; - EndMem = (PVOID)&AccessToken->VariablePart; - - /* Copy the privileges from the existing token */ - AccessToken->PrivilegeCount = 0; - AccessToken->Privileges = NULL; - if (Token->Privileges && (Token->PrivilegeCount > 0)) - { - PrivilegesLength = Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); - PrivilegesLength = ALIGN_UP_BY(PrivilegesLength, sizeof(PVOID)); - - /* - * Ensure that the token can actually hold all - * the privileges from the existing token. - * Otherwise something's seriously wrong and - * we've to guard ourselves. - */ - ASSERT(VariableLength >= PrivilegesLength); - - AccessToken->PrivilegeCount = Token->PrivilegeCount; - AccessToken->Privileges = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + PrivilegesLength); - VariableLength -= PrivilegesLength; - - RtlCopyMemory(AccessToken->Privileges, - Token->Privileges, - AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - } - - /* Copy the user and groups */ - AccessToken->UserAndGroupCount = 0; - AccessToken->UserAndGroups = NULL; - if (Token->UserAndGroups && (Token->UserAndGroupCount > 0)) - { - AccessToken->UserAndGroupCount = Token->UserAndGroupCount; - AccessToken->UserAndGroups = EndMem; - EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->UserAndGroups); - - Status = RtlCopySidAndAttributesArray(AccessToken->UserAndGroupCount, - Token->UserAndGroups, - VariableLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed to copy the groups into token (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* Copy the restricted SIDs */ - AccessToken->RestrictedSidCount = 0; - AccessToken->RestrictedSids = NULL; - if (Token->RestrictedSids && (Token->RestrictedSidCount > 0)) - { - AccessToken->RestrictedSidCount = Token->RestrictedSidCount; - AccessToken->RestrictedSids = EndMem; - EndMem = &AccessToken->RestrictedSids[AccessToken->RestrictedSidCount]; - VariableLength -= ((ULONG_PTR)EndMem - (ULONG_PTR)AccessToken->RestrictedSids); - - Status = RtlCopySidAndAttributesArray(AccessToken->RestrictedSidCount, - Token->RestrictedSids, - VariableLength, - AccessToken->RestrictedSids, - EndMem, - &EndMem, - &VariableLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed to copy the restricted SIDs into token (Status 0x%lx)\n", Status); - goto Quit; - } - } - - /* - * Insert the restricted SIDs into the token on - * the request by the caller. - */ - if (RestrictedSidsIntoToken != NULL) - { - for (RestrictedSidsInList = 0; RestrictedSidsInList < RestrictedSidsCount; RestrictedSidsInList++) - { - /* Did the caller assign attributes to the restricted SIDs? */ - if (RestrictedSidsIntoToken[RestrictedSidsInList].Attributes != 0) - { - /* There mustn't be any attributes, bail out */ - DPRINT1("SepPerformTokenFiltering(): There mustn't be any attributes to restricted SIDs!\n"); - Status = STATUS_INVALID_PARAMETER; - goto Quit; - } - } - - /* - * Ensure that the token can hold the restricted SIDs - * (the variable length is calculated at the beginning - * of the routine call). - */ - ASSERT(VariableLength >= RestrictedSidsLength); - - /* - * Now let's begin inserting the restricted SIDs into the filtered - * access token from the list the caller gave us. - */ - AccessToken->RestrictedSidCount = RestrictedSidsCount; - AccessToken->RestrictedSids = EndMem; - EndMem = (PVOID)((ULONG_PTR)EndMem + RestrictedSidsLength); - VariableLength -= RestrictedSidsLength; - - RtlCopyMemory(AccessToken->RestrictedSids, - RestrictedSidsIntoToken, - AccessToken->RestrictedSidCount * sizeof(SID_AND_ATTRIBUTES)); - - /* - * As we've copied the restricted SIDs into - * the token, we must assign them the following - * combination of attributes SE_GROUP_ENABLED, - * SE_GROUP_ENABLED_BY_DEFAULT and SE_GROUP_MANDATORY. - * With such attributes we estabilish that restricting - * SIDs into the token are enabled for access checks. - */ - for (RestrictedSidsInToken = 0; RestrictedSidsInToken < AccessToken->RestrictedSidCount; RestrictedSidsInToken++) - { - AccessToken->RestrictedSids[RestrictedSidsInToken].Attributes |= (SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY); - } - - /* - * As we added restricted SIDs into the token, mark - * it as restricted. - */ - AccessToken->TokenFlags |= TOKEN_IS_RESTRICTED; - } - - /* Search for the primary group */ - Status = SepFindPrimaryGroupAndDefaultOwner(AccessToken, - Token->PrimaryGroup, - NULL, - &PrimaryGroupIndex, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SepPerformTokenFiltering(): Failed searching for the primary group (Status 0x%lx)\n", Status); - goto Quit; - } - - /* Assign the primary group and default owner index now */ - AccessToken->PrimaryGroup = AccessToken->UserAndGroups[PrimaryGroupIndex].Sid; - AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; - - /* Now allocate the token's dynamic information area and set the data */ - AccessToken->DynamicAvailable = 0; - AccessToken->DynamicPart = NULL; - if (Token->DynamicPart && Token->DefaultDacl) - { - AccessToken->DynamicPart = ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG_TOKEN_DYNAMIC); - if (AccessToken->DynamicPart == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - EndMem = (PVOID)AccessToken->DynamicPart; - AccessToken->DefaultDacl = EndMem; - - RtlCopyMemory(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - - /* - * Now figure out what does the caller - * want with the privileges. - */ - if (PrivilegeFlags & DISABLE_MAX_PRIVILEGE) - { - /* - * The caller wants them disabled, cache this request - * for later operations. - */ - WantPrivilegesDisabled = TRUE; - } - - if (PrivilegeFlags & SANDBOX_INERT) - { - /* The caller wants an inert token, store the TOKEN_SANDBOX_INERT flag now */ - AccessToken->TokenFlags |= TOKEN_SANDBOX_INERT; - } - - /* - * Now it's time to filter the token's privileges. - * Loop all the privileges in the token. - */ - for (PrivsInToken = 0; PrivsInToken < AccessToken->PrivilegeCount; PrivsInToken++) - { - if (WantPrivilegesDisabled) - { - /* - * We got the acknowledgement that the caller wants - * to disable all the privileges so let's just do it. - * However, as per the general documentation is stated - * that only SE_CHANGE_NOTIFY_PRIVILEGE must be kept - * therefore in that case we must skip this privilege. - */ - if (AccessToken->Privileges[PrivsInToken].Luid.LowPart == SE_CHANGE_NOTIFY_PRIVILEGE) - { - continue; - } - else - { - /* - * The act of disabling privileges actually means - * "deleting" them from the access token entirely. - * First we must disable them so that we can update - * token flags accordingly. - */ - AccessToken->Privileges[PrivsInToken].Attributes &= ~SE_PRIVILEGE_ENABLED; - SepUpdateSinglePrivilegeFlagToken(AccessToken, PrivsInToken); - - /* Remove the privileges now */ - SepRemovePrivilegeToken(AccessToken, PrivsInToken); - PrivsInToken--; - } - } - else - { - if (PrivilegesToBeDeleted != NULL) - { - /* Loop the privileges we've got to delete */ - for (PrivsInList = 0; PrivsInList < PrivilegesCount; PrivsInList++) - { - /* Does this privilege exist in the token? */ - if (RtlEqualLuid(&AccessToken->Privileges[PrivsInToken].Luid, - &PrivilegesToBeDeleted[PrivsInList].Luid)) - { - /* Mark that we found it */ - FoundPrivilege = TRUE; - break; - } - } - - /* Did we find the privilege? */ - if (PrivsInList == PrivilegesCount) - { - /* We didn't, continue with next one */ - continue; - } - } - } - - /* - * If we have found the target privilege in the token - * based on the privileges list given by the caller - * then begin deleting it. - */ - if (FoundPrivilege) - { - /* Disable the privilege and update the flags */ - AccessToken->Privileges[PrivsInToken].Attributes &= ~SE_PRIVILEGE_ENABLED; - SepUpdateSinglePrivilegeFlagToken(AccessToken, PrivsInToken); - - /* Delete the privilege */ - SepRemovePrivilegeToken(AccessToken, PrivsInToken); - - /* - * Adjust the index and reset the FoundPrivilege indicator - * so that we can continue with the next privilege to delete. - */ - PrivsInToken--; - FoundPrivilege = FALSE; - continue; - } - } - - /* - * Loop the group SIDs that we want to disable as - * per on the request by the caller. - */ - if (SidsToBeDisabled != NULL) - { - for (GroupsInToken = 0; GroupsInToken < AccessToken->UserAndGroupCount; GroupsInToken++) - { - for (GroupsInList = 0; GroupsInList < RegularGroupsSidCount; GroupsInList++) - { - /* Does this group SID exist in the token? */ - if (RtlEqualSid(&AccessToken->UserAndGroups[GroupsInToken].Sid, - &SidsToBeDisabled[GroupsInList].Sid)) - { - /* Mark that we found it */ - FoundGroup = TRUE; - break; - } - } - - /* Did we find the group? */ - if (GroupsInList == RegularGroupsSidCount) - { - /* We didn't, continue with next one */ - continue; - } - - /* If we have found the group, disable it */ - if (FoundGroup) - { - /* - * If the acess token belongs to the administrators - * group and this is the target group, we must take - * away TOKEN_HAS_ADMIN_GROUP flag from the token. - */ - if (RtlEqualSid(SeAliasAdminsSid, - &AccessToken->UserAndGroups[GroupsInToken].Sid)) - { - AccessToken->TokenFlags &= ~TOKEN_HAS_ADMIN_GROUP; - } - - /* - * If the target group that we have found it is the - * owner then from now on it no longer is but the user. - * Therefore assign the default owner index as the user. - */ - if (AccessToken->DefaultOwnerIndex == GroupsInToken) - { - AccessToken->DefaultOwnerIndex = 0; - } - - /* - * The principle of disabling a group SID is by - * taking away SE_GROUP_ENABLED_BY_DEFAULT and - * SE_GROUP_ENABLED attributes and assign - * SE_GROUP_USE_FOR_DENY_ONLY. This renders - * SID a "Deny only" SID. - */ - AccessToken->UserAndGroups[GroupsInToken].Attributes &= ~(SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT); - AccessToken->UserAndGroups[GroupsInToken].Attributes |= SE_GROUP_USE_FOR_DENY_ONLY; - - /* Adjust the index and continue with the next group */ - GroupsInToken--; - FoundGroup = FALSE; - continue; - } - } - } - - /* We've finally filtered the token, return it to the caller */ - *FilteredToken = AccessToken; - Status = STATUS_SUCCESS; - DPRINT("SepPerformTokenFiltering(): The token has been filtered!\n"); - -Quit: - if (!NT_SUCCESS(Status)) - { - /* Dereference the created token */ - ObDereferenceObject(AccessToken); - } - - /* Unlock the source token */ - SepReleaseTokenLock(Token); - - return Status; -} - -/** - * @brief - * Creates the system process token. - * - * @return - * Returns the system process token if the operations have - * completed successfully. - */ -CODE_SEG("INIT") -PTOKEN -NTAPI -SepCreateSystemProcessToken(VOID) -{ - LUID_AND_ATTRIBUTES Privileges[25]; - ULONG GroupAttributes, OwnerAttributes; - SID_AND_ATTRIBUTES Groups[32]; - LARGE_INTEGER Expiration; - SID_AND_ATTRIBUTES UserSid; - ULONG GroupsLength; - PSID PrimaryGroup; - OBJECT_ATTRIBUTES ObjectAttributes; - PSID Owner; - ULONG i; - PTOKEN Token; - NTSTATUS Status; - - /* Don't ever expire */ - Expiration.QuadPart = -1; - - /* All groups mandatory and enabled */ - GroupAttributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; - OwnerAttributes = SE_GROUP_ENABLED | SE_GROUP_OWNER | SE_GROUP_ENABLED_BY_DEFAULT; - - /* User is Local System */ - UserSid.Sid = SeLocalSystemSid; + /* The user is the anonymous logon */ + UserSid.Sid = SeAnonymousLogonSid; UserSid.Attributes = 0; - /* Primary group is Local System */ - PrimaryGroup = SeLocalSystemSid; - - /* Owner is Administrators */ - Owner = SeAliasAdminsSid; - - /* Groups are Administrators, World, and Authenticated Users */ - Groups[0].Sid = SeAliasAdminsSid; - Groups[0].Attributes = OwnerAttributes; - Groups[1].Sid = SeWorldSid; - Groups[1].Attributes = GroupAttributes; - Groups[2].Sid = SeAuthenticatedUsersSid; - Groups[2].Attributes = GroupAttributes; - GroupsLength = sizeof(SID_AND_ATTRIBUTES) + - SeLengthSid(Groups[0].Sid) + - SeLengthSid(Groups[1].Sid) + - SeLengthSid(Groups[2].Sid); - ASSERT(GroupsLength <= sizeof(Groups)); - - /* Setup the privileges */ - i = 0; - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeTcbPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeCreateTokenPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeTakeOwnershipPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeCreatePagefilePrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeLockMemoryPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeAssignPrimaryTokenPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeIncreaseQuotaPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeIncreaseBasePriorityPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeCreatePermanentPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeDebugPrivilege; + /* The primary group is also the anonymous logon */ + PrimaryGroup = SeAnonymousLogonSid; - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeAuditPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeSecurityPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeSystemEnvironmentPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeChangeNotifyPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeBackupPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeRestorePrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeShutdownPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeLoadDriverPrivilege; - - Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED; - Privileges[i++].Luid = SeProfileSingleProcessPrivilege; - - Privileges[i].Attributes = 0; - Privileges[i++].Luid = SeSystemtimePrivilege; - ASSERT(i == 20); - - /* Setup the object attributes */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - ASSERT(SeSystemDefaultDacl != NULL); - - /* Create the token */ - Status = SepCreateToken((PHANDLE)&Token, - KernelMode, - 0, - &ObjectAttributes, - TokenPrimary, - SecurityAnonymous, - &SeSystemAuthenticationId, - &Expiration, - &UserSid, - 3, - Groups, - GroupsLength, - 20, - Privileges, - Owner, - PrimaryGroup, - SeSystemDefaultDacl, - &SeSystemTokenSource, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Return the token */ - return Token; -} - -/** - * @brief - * Creates the anonymous logon token for the system. The difference between this - * token and the other one is the inclusion of everyone SID group (being SeWorldSid). - * The other token lacks such group. - * - * @return - * Returns the system's anonymous logon token if the operations have - * completed successfully. - */ -CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonToken(VOID) -{ - SID_AND_ATTRIBUTES Groups[32], UserSid; - PSID PrimaryGroup; - PTOKEN Token; - ULONG GroupsLength; - LARGE_INTEGER Expiration; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - - /* The token never expires */ - Expiration.QuadPart = -1; - - /* The user is the anonymous logon */ - UserSid.Sid = SeAnonymousLogonSid; - UserSid.Attributes = 0; - - /* The primary group is also the anonymous logon */ - PrimaryGroup = SeAnonymousLogonSid; - - /* The only group for the token is the World */ - Groups[0].Sid = SeWorldSid; - Groups[0].Attributes = SE_GROUP_ENABLED | SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT; - GroupsLength = sizeof(SID_AND_ATTRIBUTES) + - SeLengthSid(Groups[0].Sid); - ASSERT(GroupsLength <= sizeof(Groups)); - - /* Initialise the object attributes for the token */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - ASSERT(SeSystemAnonymousLogonDacl != NULL); - - /* Create token */ - Status = SepCreateToken((PHANDLE)&Token, - KernelMode, - 0, - &ObjectAttributes, - TokenPrimary, - SecurityAnonymous, - &SeAnonymousAuthenticationId, - &Expiration, - &UserSid, - 1, - Groups, - GroupsLength, - 0, - NULL, - NULL, - PrimaryGroup, - SeSystemAnonymousLogonDacl, - &SeSystemTokenSource, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Return the anonymous logon token */ - return Token; -} - -/** - * @brief - * Creates the anonymous logon token for the system. This kind of token - * doesn't include the everyone SID group (being SeWorldSid). - * - * @return - * Returns the system's anonymous logon token if the operations have - * completed successfully. - */ -CODE_SEG("INIT") -PTOKEN -SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) -{ - SID_AND_ATTRIBUTES UserSid; - PSID PrimaryGroup; - PTOKEN Token; - LARGE_INTEGER Expiration; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - - /* The token never expires */ - Expiration.QuadPart = -1; - - /* The user is the anonymous logon */ - UserSid.Sid = SeAnonymousLogonSid; - UserSid.Attributes = 0; - - /* The primary group is also the anonymous logon */ - PrimaryGroup = SeAnonymousLogonSid; - - /* Initialise the object attributes for the token */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - ASSERT(SeSystemAnonymousLogonDacl != NULL); + /* Initialise the object attributes for the token */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + ASSERT(SeSystemAnonymousLogonDacl != NULL); /* Create token */ Status = SepCreateToken((PHANDLE)&Token, @@ -2852,3316 +1595,296 @@ SepCreateSystemAnonymousLogonTokenNoEveryone(VOID) &UserSid, 0, NULL, - 0, - 0, - NULL, - NULL, - PrimaryGroup, - SeSystemAnonymousLogonDacl, - &SeSystemTokenSource, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Return the anonymous (not including everyone) logon token */ - return Token; -} - -/* PUBLIC FUNCTIONS ***********************************************************/ - -/** - * @brief - * Filters an access token from an existing token, making it more restricted - * than the previous one. - * - * @param[in] ExistingToken - * An existing token for filtering. - * - * @param[in] Flags - * Privilege flag options. This parameter argument influences how the token - * is filtered. Such parameter can be 0. See NtFilterToken syscall for - * more information. - * - * @param[in] SidsToDisable - * Array of SIDs to disable. Such parameter can be NULL. - * - * @param[in] PrivilegesToDelete - * Array of privileges to delete. If DISABLE_MAX_PRIVILEGE flag is specified - * in the Flags parameter, PrivilegesToDelete is ignored. - * - * @param[in] RestrictedSids - * An array of restricted SIDs for the new filtered token. Such parameter - * can be NULL. - * - * @param[out] FilteredToken - * The newly filtered token, returned to the caller. - * - * @return - * Returns STATUS_SUCCESS if the function has successfully completed its - * operations and that the access token has been filtered. STATUS_INVALID_PARAMETER - * is returned if one or more of the parameter are not valid. A failure NTSTATUS code - * is returned otherwise. - */ -NTSTATUS -NTAPI -SeFilterToken( - _In_ PACCESS_TOKEN ExistingToken, - _In_ ULONG Flags, - _In_opt_ PTOKEN_GROUPS SidsToDisable, - _In_opt_ PTOKEN_PRIVILEGES PrivilegesToDelete, - _In_opt_ PTOKEN_GROUPS RestrictedSids, - _Out_ PACCESS_TOKEN *FilteredToken) -{ - NTSTATUS Status; - PTOKEN AccessToken; - ULONG PrivilegesCount = 0; - ULONG SidsCount = 0; - ULONG RestrictedSidsCount = 0; - - PAGED_CODE(); - - /* Begin copying the counters */ - if (SidsToDisable != NULL) - { - SidsCount = SidsToDisable->GroupCount; - } - - if (PrivilegesToDelete != NULL) - { - PrivilegesCount = PrivilegesToDelete->PrivilegeCount; - } - - if (RestrictedSids != NULL) - { - RestrictedSidsCount = RestrictedSids->GroupCount; - } - - /* Call the internal API */ - Status = SepPerformTokenFiltering(ExistingToken, - PrivilegesToDelete->Privileges, - SidsToDisable->Groups, - RestrictedSids->Groups, - PrivilegesCount, - SidsCount, - RestrictedSidsCount, - Flags, - KernelMode, - &AccessToken); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SeFilterToken(): Failed to filter the token (Status 0x%lx)\n", Status); - return Status; - } - - /* Insert the filtered token */ - Status = ObInsertObject(AccessToken, - NULL, - 0, - 0, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SeFilterToken(): Failed to insert the filtered token (Status 0x%lx)\n", Status); - return Status; - } - - /* Return it to the caller */ - *FilteredToken = AccessToken; - return Status; -} - -/** - * @brief - * Queries information details about the given token to the call. The difference - * between NtQueryInformationToken and this routine is that the system call has - * user mode buffer data probing and additional protection checks whereas this - * routine doesn't have any of these. The routine is used exclusively in kernel - * mode. - * - * @param[in] AccessToken - * An access token to be given. - * - * @param[in] TokenInformationClass - * Token information class. - * - * @param[out] TokenInformation - * Buffer with retrieved information. Such information is arbitrary, depending - * on the requested information class. - * - * @return - * Returns STATUS_SUCCESS if the operation to query the desired information - * has completed successfully. STATUS_INSUFFICIENT_RESOURCES is returned if - * pool memory allocation has failed to satisfy an operation. Otherwise - * STATUS_INVALID_INFO_CLASS is returned indicating that the information - * class provided is not supported by the routine. - * - * @remarks - * Only certain information classes are not implemented in this function and - * these are TokenOrigin, TokenGroupsAndPrivileges, TokenRestrictedSids and - * TokenSandBoxInert. The following classes are implemented in NtQueryInformationToken - * only. - */ -NTSTATUS -NTAPI -SeQueryInformationToken( - _In_ PACCESS_TOKEN AccessToken, - _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, - _Outptr_result_buffer_(_Inexpressible_(token-dependent)) PVOID *TokenInformation) -{ - NTSTATUS Status; - PTOKEN Token = (PTOKEN)AccessToken; - ULONG RequiredLength; - union - { - PSID PSid; - ULONG Ulong; - } Unused; - - PAGED_CODE(); - - /* Lock the token */ - SepAcquireTokenLockShared(Token); - - switch (TokenInformationClass) - { - case TokenUser: - { - PTOKEN_USER tu; - - DPRINT("SeQueryInformationToken(TokenUser)\n"); - RequiredLength = sizeof(TOKEN_USER) + - RtlLengthSid(Token->UserAndGroups[0].Sid); - - /* Allocate the output buffer */ - tu = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tu == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - Status = RtlCopySidAndAttributesArray(1, - &Token->UserAndGroups[0], - RequiredLength - sizeof(TOKEN_USER), - &tu->User, - (PSID)(tu + 1), - &Unused.PSid, - &Unused.Ulong); - - /* Return the structure */ - *TokenInformation = tu; - Status = STATUS_SUCCESS; - break; - } - - case TokenGroups: - { - PTOKEN_GROUPS tg; - ULONG SidLen; - PSID Sid; - - DPRINT("SeQueryInformationToken(TokenGroups)\n"); - RequiredLength = sizeof(tg->GroupCount) + - RtlLengthSidAndAttributes(Token->UserAndGroupCount - 1, &Token->UserAndGroups[1]); - - SidLen = RequiredLength - sizeof(tg->GroupCount) - - ((Token->UserAndGroupCount - 1) * sizeof(SID_AND_ATTRIBUTES)); - - /* Allocate the output buffer */ - tg = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tg == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - Sid = (PSID)((ULONG_PTR)tg + sizeof(tg->GroupCount) + - ((Token->UserAndGroupCount - 1) * sizeof(SID_AND_ATTRIBUTES))); - - tg->GroupCount = Token->UserAndGroupCount - 1; - Status = RtlCopySidAndAttributesArray(Token->UserAndGroupCount - 1, - &Token->UserAndGroups[1], - SidLen, - &tg->Groups[0], - Sid, - &Unused.PSid, - &Unused.Ulong); - - /* Return the structure */ - *TokenInformation = tg; - Status = STATUS_SUCCESS; - break; - } - - case TokenPrivileges: - { - PTOKEN_PRIVILEGES tp; - - DPRINT("SeQueryInformationToken(TokenPrivileges)\n"); - RequiredLength = sizeof(tp->PrivilegeCount) + - (Token->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); - - /* Allocate the output buffer */ - tp = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tp == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - tp->PrivilegeCount = Token->PrivilegeCount; - RtlCopyLuidAndAttributesArray(Token->PrivilegeCount, - Token->Privileges, - &tp->Privileges[0]); - - /* Return the structure */ - *TokenInformation = tp; - Status = STATUS_SUCCESS; - break; - } - - case TokenOwner: - { - PTOKEN_OWNER to; - ULONG SidLen; - - DPRINT("SeQueryInformationToken(TokenOwner)\n"); - SidLen = RtlLengthSid(Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); - RequiredLength = sizeof(TOKEN_OWNER) + SidLen; - - /* Allocate the output buffer */ - to = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (to == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - to->Owner = (PSID)(to + 1); - Status = RtlCopySid(SidLen, - to->Owner, - Token->UserAndGroups[Token->DefaultOwnerIndex].Sid); - - /* Return the structure */ - *TokenInformation = to; - Status = STATUS_SUCCESS; - break; - } - - case TokenPrimaryGroup: - { - PTOKEN_PRIMARY_GROUP tpg; - ULONG SidLen; - - DPRINT("SeQueryInformationToken(TokenPrimaryGroup)\n"); - SidLen = RtlLengthSid(Token->PrimaryGroup); - RequiredLength = sizeof(TOKEN_PRIMARY_GROUP) + SidLen; - - /* Allocate the output buffer */ - tpg = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tpg == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - tpg->PrimaryGroup = (PSID)(tpg + 1); - Status = RtlCopySid(SidLen, - tpg->PrimaryGroup, - Token->PrimaryGroup); - - /* Return the structure */ - *TokenInformation = tpg; - Status = STATUS_SUCCESS; - break; - } - - case TokenDefaultDacl: - { - PTOKEN_DEFAULT_DACL tdd; - - DPRINT("SeQueryInformationToken(TokenDefaultDacl)\n"); - RequiredLength = sizeof(TOKEN_DEFAULT_DACL); - - if (Token->DefaultDacl != NULL) - RequiredLength += Token->DefaultDacl->AclSize; - - /* Allocate the output buffer */ - tdd = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tdd == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - if (Token->DefaultDacl != NULL) - { - tdd->DefaultDacl = (PACL)(tdd + 1); - RtlCopyMemory(tdd->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } - else - { - tdd->DefaultDacl = NULL; - } - - /* Return the structure */ - *TokenInformation = tdd; - Status = STATUS_SUCCESS; - break; - } - - case TokenSource: - { - PTOKEN_SOURCE ts; - - DPRINT("SeQueryInformationToken(TokenSource)\n"); - RequiredLength = sizeof(TOKEN_SOURCE); - - /* Allocate the output buffer */ - ts = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (ts == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - *ts = Token->TokenSource; - - /* Return the structure */ - *TokenInformation = ts; - Status = STATUS_SUCCESS; - break; - } - - case TokenType: - { - PTOKEN_TYPE tt; - - DPRINT("SeQueryInformationToken(TokenType)\n"); - RequiredLength = sizeof(TOKEN_TYPE); - - /* Allocate the output buffer */ - tt = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tt == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - *tt = Token->TokenType; - - /* Return the structure */ - *TokenInformation = tt; - Status = STATUS_SUCCESS; - break; - } - - case TokenImpersonationLevel: - { - PSECURITY_IMPERSONATION_LEVEL sil; - - DPRINT("SeQueryInformationToken(TokenImpersonationLevel)\n"); - RequiredLength = sizeof(SECURITY_IMPERSONATION_LEVEL); - - /* Fail if the token is not an impersonation token */ - if (Token->TokenType != TokenImpersonation) - { - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - /* Allocate the output buffer */ - sil = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (sil == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - *sil = Token->ImpersonationLevel; - - /* Return the structure */ - *TokenInformation = sil; - Status = STATUS_SUCCESS; - break; - } - - case TokenStatistics: - { - PTOKEN_STATISTICS ts; - - DPRINT("SeQueryInformationToken(TokenStatistics)\n"); - RequiredLength = sizeof(TOKEN_STATISTICS); - - /* Allocate the output buffer */ - ts = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (ts == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - ts->TokenId = Token->TokenId; - ts->AuthenticationId = Token->AuthenticationId; - ts->ExpirationTime = Token->ExpirationTime; - ts->TokenType = Token->TokenType; - ts->ImpersonationLevel = Token->ImpersonationLevel; - ts->DynamicCharged = Token->DynamicCharged; - ts->DynamicAvailable = Token->DynamicAvailable; - ts->GroupCount = Token->UserAndGroupCount - 1; - ts->PrivilegeCount = Token->PrivilegeCount; - ts->ModifiedId = Token->ModifiedId; - - /* Return the structure */ - *TokenInformation = ts; - Status = STATUS_SUCCESS; - break; - } - - case TokenSessionId: - { - DPRINT("SeQueryInformationToken(TokenSessionId)\n"); - Status = SeQuerySessionIdToken(Token, (PULONG)TokenInformation); - break; - } - - default: - DPRINT1("SeQueryInformationToken(%d) invalid information class\n", TokenInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - /* Release the lock of the token */ - SepReleaseTokenLock(Token); - - return Status; -} - -/** - * @brief - * Queries the session ID of an access token. - * - * @param[in] Token - * A valid access token where the session ID has to be gathered. - * - * @param[out] pSessionId - * The returned pointer to a session ID to the caller. - * - * @return - * Returns STATUS_SUCCESS. - */ -NTSTATUS -NTAPI -SeQuerySessionIdToken( - _In_ PACCESS_TOKEN Token, - _Out_ PULONG pSessionId) -{ - PAGED_CODE(); - - /* Lock the token */ - SepAcquireTokenLockShared(Token); - - *pSessionId = ((PTOKEN)Token)->SessionId; - - /* Unlock the token */ - SepReleaseTokenLock(Token); - - return STATUS_SUCCESS; -} - -/** - * @brief - * Queries the authentication ID of an access token. - * - * @param[in] Token - * A valid access token where the authentication ID has to be gathered. - * - * @param[out] pSessionId - * The returned pointer to an authentication ID to the caller. - * - * @return - * Returns STATUS_SUCCESS. - */ -NTSTATUS -NTAPI -SeQueryAuthenticationIdToken( - _In_ PACCESS_TOKEN Token, - _Out_ PLUID LogonId) -{ - PAGED_CODE(); - - *LogonId = ((PTOKEN)Token)->AuthenticationId; - - return STATUS_SUCCESS; -} - -/** - * @brief - * Gathers the security impersonation level of an access token. - * - * @param[in] Token - * A valid access token where the impersonation level has to be gathered. - * - * @return ... 7988 lines suppressed ...

1 0

[reactos] 01/01: [GITHUB] Add workflow to close stale PR's
by Mark Jansen 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96eacfc352adb9d37ab23… commit 96eacfc352adb9d37ab2324a62518106eeb2bddc Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun May 15 17:59:37 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun May 29 20:10:31 2022 +0200 [GITHUB] Add workflow to close stale PR's --- .github/workflows/stale.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 00000000000..a243274f9f8 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,32 @@ +# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time. +# +# You can adjust the behavior by modifying this file. +# For more information, see: +# https://github.com/actions/stale +name: Mark stale issues and pull requests + +on: + schedule: + - cron: '43 0 * * *' + +jobs: + stale: + + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + + steps: + - uses: actions/stale@v5 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + days-before-stale: 120 + days-before-issue-stale: -1 + days-before-close: 14 + days-before-issue-close: -1 + exempt-all-assignees: true + stale-pr-message: 'This PR is stale because it received no updates in the last 4 months. Without removing the stale label, or commenting on this ticket it will be closed in 2 weeks.' + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + operations-per-run: 50

1 0

[reactos] 01/01: [DISKPART] Improve DETAIL commands
by Eric Kohl 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54efd758891980351e737… commit 54efd758891980351e73738a21432f7c9b01b223 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun May 29 17:32:34 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun May 29 17:32:34 2022 +0200 [DISKPART] Improve DETAIL commands --- base/system/diskpart/detail.c | 152 ++++++++++++++++++++++++++++++++-- base/system/diskpart/diskpart.h | 8 ++ base/system/diskpart/list.c | 178 ++++++++++++++++++++++------------------ 3 files changed, 249 insertions(+), 89 deletions(-) diff --git a/base/system/diskpart/detail.c b/base/system/diskpart/detail.c index 0c0de3e262a..388cb8a45af 100644 --- a/base/system/diskpart/detail.c +++ b/base/system/diskpart/detail.c @@ -13,11 +13,66 @@ /* FUNCTIONS ******************************************************************/ +static +BOOL +IsDiskInVolume( + _In_ PVOLENTRY VolumeEntry, + _In_ PDISKENTRY DiskEntry) +{ + ULONG i; + + if ((VolumeEntry == NULL) || + (VolumeEntry->pExtents == NULL) || + (DiskEntry == NULL)) + return FALSE; + + for (i = 0; i < VolumeEntry->pExtents->NumberOfDiskExtents; i++) + { + if (VolumeEntry->pExtents->Extents[i].DiskNumber == DiskEntry->DiskNumber) + return TRUE; + } + + return FALSE; +} + + +static +BOOL +IsPartitionInVolume( + _In_ PVOLENTRY VolumeEntry, + _In_ PPARTENTRY PartEntry) +{ + ULONG i; + + if ((VolumeEntry == NULL) || + (VolumeEntry->pExtents == NULL) || + (PartEntry == NULL) || + (PartEntry->DiskEntry == NULL)) + return FALSE; + + for (i = 0; i < VolumeEntry->pExtents->NumberOfDiskExtents; i++) + { + if (VolumeEntry->pExtents->Extents[i].DiskNumber == PartEntry->DiskEntry->DiskNumber) + { + if ((VolumeEntry->pExtents->Extents[i].StartingOffset.QuadPart == PartEntry->StartSector.QuadPart * PartEntry->DiskEntry->BytesPerSector) && + (VolumeEntry->pExtents->Extents[i].ExtentLength.QuadPart == PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector)) + return TRUE; + } + } + + return FALSE; +} + + BOOL DetailDisk( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + BOOL bPrintHeader = TRUE; + DPRINT("DetailDisk()\n"); if (argc > 2) @@ -38,6 +93,28 @@ DetailDisk( ConResPrintf(StdOut, IDS_DETAIL_INFO_PATH, CurrentDisk->PathId); ConResPrintf(StdOut, IDS_DETAIL_INFO_TARGET, CurrentDisk->TargetId); ConResPrintf(StdOut, IDS_DETAIL_INFO_LUN_ID, CurrentDisk->Lun); + + Entry = VolumeListHead.Flink; + while (Entry != &VolumeListHead) + { + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + if (IsDiskInVolume(VolumeEntry, CurrentDisk)) + { + if (bPrintHeader) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); + ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); + bPrintHeader = FALSE; + } + + PrintVolume(VolumeEntry); + } + + Entry = Entry->Flink; + } + ConPuts(StdOut, L"\n"); return TRUE; @@ -46,11 +123,14 @@ DetailDisk( BOOL DetailPartition( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { PPARTENTRY PartEntry; ULONGLONG PartOffset; + PLIST_ENTRY Entry; + PVOLENTRY VolumeEntry; + BOOL bVolumeFound = FALSE, bPrintHeader = TRUE; DPRINT("DetailPartition()\n"); @@ -82,6 +162,32 @@ DetailPartition( ConResPrintf(StdOut, IDS_DETAIL_PARTITION_HIDDEN, ""); ConResPrintf(StdOut, IDS_DETAIL_PARTITION_ACTIVE, PartEntry->BootIndicator ? L"Yes" : L"No"); ConResPrintf(StdOut, IDS_DETAIL_PARTITION_OFFSET, PartOffset); + + Entry = VolumeListHead.Flink; + while (Entry != &VolumeListHead) + { + VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); + + if (IsPartitionInVolume(VolumeEntry, CurrentPartition)) + { + if (bPrintHeader) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); + ConResPuts(StdOut, IDS_LIST_VOLUME_LINE); + bPrintHeader = FALSE; + } + + PrintVolume(VolumeEntry); + bVolumeFound = TRUE; + } + + Entry = Entry->Flink; + } + + if (bVolumeFound == FALSE) + ConPuts(StdOut, L"\nThere is no volume associated with this partition.\n"); + ConPuts(StdOut, L"\n"); return TRUE; @@ -90,9 +196,13 @@ DetailPartition( BOOL DetailVolume( - INT argc, - PWSTR *argv) + _In_ INT argc, + _In_ PWSTR *argv) { + PDISKENTRY DiskEntry; + PLIST_ENTRY Entry; + BOOL bDiskFound = FALSE, bPrintHeader = TRUE; + DPRINT("DetailVolume()\n"); if (argc > 2) @@ -107,7 +217,35 @@ DetailVolume( return TRUE; } - /* TODO: Print volume details */ + + Entry = DiskListHead.Flink; + while (Entry != &DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + if (IsDiskInVolume(CurrentVolume, DiskEntry)) + { + if (bPrintHeader) + { + ConPuts(StdOut, L"\n"); + ConResPuts(StdOut, IDS_LIST_DISK_HEAD); + ConResPuts(StdOut, IDS_LIST_DISK_LINE); + bPrintHeader = FALSE; + } + + PrintDisk(DiskEntry); + bDiskFound = TRUE; + } + + Entry = Entry->Flink; + } + + if (bDiskFound == FALSE) + ConPuts(StdOut, L"\nThere are no disks attached to this volume.\n"); + + /* TODO: Print more volume details */ + + ConPuts(StdOut, L"\n"); return TRUE; } diff --git a/base/system/diskpart/diskpart.h b/base/system/diskpart/diskpart.h index 23ea593e7b4..c4a4c2fad9e 100644 --- a/base/system/diskpart/diskpart.h +++ b/base/system/diskpart/diskpart.h @@ -361,6 +361,14 @@ ListVirtualDisk( INT argc, PWSTR *argv); +VOID +PrintDisk( + _In_ PDISKENTRY DiskEntry); + +VOID +PrintVolume( + _In_ PVOLENTRY VolumeEntry); + /* merge.c */ BOOL merge_main(INT argc, LPWSTR *argv); diff --git a/base/system/diskpart/list.c b/base/system/diskpart/list.c index 21589c727cf..6591a7f14f1 100644 --- a/base/system/diskpart/list.c +++ b/base/system/diskpart/list.c @@ -13,6 +13,48 @@ /* FUNCTIONS ******************************************************************/ +VOID +PrintDisk( + _In_ PDISKENTRY DiskEntry) +{ + ULONGLONG DiskSize; + ULONGLONG FreeSize; + LPWSTR lpSizeUnit; + LPWSTR lpFreeUnit; + + DiskSize = DiskEntry->SectorCount.QuadPart * + (ULONGLONG)DiskEntry->BytesPerSector; + + if (DiskSize >= 10737418240) /* 10 GB */ + { + DiskSize = RoundingDivide(DiskSize, 1073741824); + lpSizeUnit = L"GB"; + } + else + { + DiskSize = RoundingDivide(DiskSize, 1048576); + if (DiskSize == 0) + DiskSize = 1; + lpSizeUnit = L"MB"; + } + + /* FIXME */ + FreeSize = 0; + lpFreeUnit = L"B"; + + ConResPrintf(StdOut, IDS_LIST_DISK_FORMAT, + (CurrentDisk == DiskEntry) ? L'*' : L' ', + DiskEntry->DiskNumber, + L"Online", + DiskSize, + lpSizeUnit, + FreeSize, + lpFreeUnit, + L" ", + L" "); +} + + BOOL ListDisk( INT argc, @@ -20,10 +62,6 @@ ListDisk( { PLIST_ENTRY Entry; PDISKENTRY DiskEntry; - ULONGLONG DiskSize; - ULONGLONG FreeSize; - LPWSTR lpSizeUnit; - LPWSTR lpFreeUnit; /* Header labels */ ConPuts(StdOut, L"\n"); @@ -35,36 +73,7 @@ ListDisk( { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - DiskSize = DiskEntry->SectorCount.QuadPart * - (ULONGLONG)DiskEntry->BytesPerSector; - - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = RoundingDivide(DiskSize, 1073741824); - lpSizeUnit = L"GB"; - } - else - { - DiskSize = RoundingDivide(DiskSize, 1048576); - if (DiskSize == 0) - DiskSize = 1; - lpSizeUnit = L"MB"; - } - - /* FIXME */ - FreeSize = 0; - lpFreeUnit = L"B"; - - ConResPrintf(StdOut, IDS_LIST_DISK_FORMAT, - (CurrentDisk == DiskEntry) ? L'*' : L' ', - DiskEntry->DiskNumber, - L"Online", - DiskSize, - lpSizeUnit, - FreeSize, - lpFreeUnit, - L" ", - L" "); + PrintDisk(DiskEntry); Entry = Entry->Flink; } @@ -217,6 +226,58 @@ ListPartition( } +VOID +PrintVolume( + _In_ PVOLENTRY VolumeEntry) +{ + ULONGLONG VolumeSize; + PWSTR pszSizeUnit; + PWSTR pszVolumeType; + + VolumeSize = VolumeEntry->Size.QuadPart; + if (VolumeSize >= 10737418240) /* 10 GB */ + { + VolumeSize = RoundingDivide(VolumeSize, 1073741824); + pszSizeUnit = L"GB"; + } + else if (VolumeSize >= 10485760) /* 10 MB */ + { + VolumeSize = RoundingDivide(VolumeSize, 1048576); + pszSizeUnit = L"MB"; + } + else + { + VolumeSize = RoundingDivide(VolumeSize, 1024); + pszSizeUnit = L"KB"; + } + switch (VolumeEntry->VolumeType) + { + case VOLUME_TYPE_CDROM: + pszVolumeType = L"DVD"; + break; + case VOLUME_TYPE_PARTITION: + pszVolumeType = L"Partition"; + break; + case VOLUME_TYPE_REMOVABLE: + pszVolumeType = L"Removable"; + break; + case VOLUME_TYPE_UNKNOWN: + default: + pszVolumeType = L"Unknown"; + break; + } + + ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, + (CurrentVolume == VolumeEntry) ? L'*' : L' ', + VolumeEntry->VolumeNumber, + VolumeEntry->DriveLetter, + (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", + (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", + pszVolumeType, + VolumeSize, pszSizeUnit); +} + + BOOL ListVolume( INT argc, @@ -224,9 +285,6 @@ ListVolume( { PLIST_ENTRY Entry; PVOLENTRY VolumeEntry; - ULONGLONG VolumeSize; - PWSTR pszSizeUnit; - PWSTR pszVolumeType; ConPuts(StdOut, L"\n"); ConResPuts(StdOut, IDS_LIST_VOLUME_HEAD); @@ -237,51 +295,7 @@ ListVolume( { VolumeEntry = CONTAINING_RECORD(Entry, VOLENTRY, ListEntry); - VolumeSize = VolumeEntry->Size.QuadPart; - if (VolumeSize >= 10737418240) /* 10 GB */ - { - VolumeSize = RoundingDivide(VolumeSize, 1073741824); - pszSizeUnit = L"GB"; - } - else if (VolumeSize >= 10485760) /* 10 MB */ - { - VolumeSize = RoundingDivide(VolumeSize, 1048576); - pszSizeUnit = L"MB"; - } - else - { - VolumeSize = RoundingDivide(VolumeSize, 1024); - pszSizeUnit = L"KB"; - } - - switch (VolumeEntry->VolumeType) - { - case VOLUME_TYPE_CDROM: - pszVolumeType = L"DVD"; - break; - - case VOLUME_TYPE_PARTITION: - pszVolumeType = L"Partition"; - break; - - case VOLUME_TYPE_REMOVABLE: - pszVolumeType = L"Removable"; - break; - - case VOLUME_TYPE_UNKNOWN: - default: - pszVolumeType = L"Unknown"; - break; - } - - ConResPrintf(StdOut, IDS_LIST_VOLUME_FORMAT, - (CurrentVolume == VolumeEntry) ? L'*' : L' ', - VolumeEntry->VolumeNumber, - VolumeEntry->DriveLetter, - (VolumeEntry->pszLabel) ? VolumeEntry->pszLabel : L"", - (VolumeEntry->pszFilesystem) ? VolumeEntry->pszFilesystem : L"", - pszVolumeType, - VolumeSize, pszSizeUnit); + PrintVolume(VolumeEntry); Entry = Entry->Flink; }

1 0

[reactos] 01/01: [NTOS:MM] Fix MiInsertSharedUserPageVad preventing boot on x64
by Tuur Martens 29 May '22

29 May '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc99b9d96e22934723b67… commit cc99b9d96e22934723b67f5ad4c8d3bcc60aeeff Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Mon May 23 21:08:17 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 29 13:28:27 2022 +0200 [NTOS:MM] Fix MiInsertSharedUserPageVad preventing boot on x64 Fix MiInsertSharedUserPageVad to not charge the system process pool quota. Even though PsChargeProcessNonPagedPoolQuota itself checks if the process specified is the system process, this doesn't work here as we're too early into boot for the kernel to know what the system process is. --- ntoskrnl/mm/ARM3/procsup.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 2ddd91c5ca2..4111d711e3c 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -901,12 +901,15 @@ MiInsertSharedUserPageVad( return Status; } - Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); - if (!NT_SUCCESS(Status)) + if (Process->QuotaBlock != NULL) { - DPRINT1("Ran out of quota.\n"); - ExFreePoolWithTag(Vad, 'ldaV'); - return Status; + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of quota.\n"); + ExFreePoolWithTag(Vad, 'ldaV'); + return Status; + } }

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