Ros-diffs May 2019

ros-diffs@reactos.org

17 participants
165 discussions

[reactos] 01/01: [KERNEL32] Fix SetComputerNameExW (#1583)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2db0e159a472aca5d1e71… commit 2db0e159a472aca5d1e713271a62853728b41930 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 27 16:18:38 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 27 16:18:38 2019 +0900 [KERNEL32] Fix SetComputerNameExW (#1583) Based on @Doug-Lyons's patch. CORE-16058 --- dll/win32/kernel32/client/compname.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/client/compname.c b/dll/win32/kernel32/client/compname.c index cfe9df5137..c2efa30b92 100644 --- a/dll/win32/kernel32/client/compname.c +++ b/dll/win32/kernel32/client/compname.c @@ -592,6 +592,8 @@ WINAPI SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, LPCWSTR lpBuffer) { + BOOL ret1, ret2; + if (!IsValidComputerName(NameType, lpBuffer)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -607,10 +609,16 @@ SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, lpBuffer); case ComputerNamePhysicalDnsHostname: - return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + ret1 = SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" L"\\Services\\Tcpip\\Parameters", - L"Hostname", + L"NV Hostname", + lpBuffer); + + ret2 = SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Control\\ComputerName\\ComputerName", + L"ComputerName", lpBuffer); + return (ret1 && ret2); case ComputerNamePhysicalNetBIOS: return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet"

5 years, 3 months

[reactos] 01/01: [KERNEL32_APITEST] Check also 'NV Hostname' in SetComputerNameExW testcase (#1581)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbc20b6484408b807b4d2… commit dbc20b6484408b807b4d2971e4f3afe174104e07 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 27 11:24:16 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 27 11:24:16 2019 +0900 [KERNEL32_APITEST] Check also 'NV Hostname' in SetComputerNameExW testcase (#1581) Also test NV Hostname registry value in the testcase of kernel32!SetComputerNameW. ROSTESTS-322 --- .../rostests/apitests/kernel32/SetComputerNameExW.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/rostests/apitests/kernel32/SetComputerNameExW.c b/modules/rostests/apitests/kernel32/SetComputerNameExW.c index 5019265400..89ba26460a 100644 --- a/modules/rostests/apitests/kernel32/SetComputerNameExW.c +++ b/modules/rostests/apitests/kernel32/SetComputerNameExW.c @@ -44,6 +44,7 @@ START_TEST(SetComputerNameExW) BOOL ret; HKEY hKeyHN, hKeyCN; DWORD cbData; + WCHAR szNVHostNameOld[MAX_PATH], szNVHostNameNew[MAX_PATH]; WCHAR szHostNameOld[MAX_PATH], szHostNameNew[MAX_PATH]; WCHAR szComputerNameOld[MAX_PATH], szComputerNameNew[MAX_PATH]; @@ -62,6 +63,13 @@ START_TEST(SetComputerNameExW) return; } + /* Get Old NV Hostname */ + szNVHostNameOld[0] = UNICODE_NULL; + cbData = sizeof(szNVHostNameOld); + Error = RegQueryValueExW(hKeyHN, L"NV Hostname", NULL, NULL, (LPBYTE)szNVHostNameOld, &cbData); + ok_long(Error, ERROR_SUCCESS); + ok(szNVHostNameOld[0], "szNVHostNameOld is empty\n"); + /* Get Old Hostname */ szHostNameOld[0] = UNICODE_NULL; cbData = sizeof(szHostNameOld); @@ -80,6 +88,15 @@ START_TEST(SetComputerNameExW) ret = SetComputerNameExW(ComputerNamePhysicalDnsHostname, szNewName); ok_int(ret, TRUE); + /* Get New NV Hostname */ + szNVHostNameNew[0] = UNICODE_NULL; + cbData = sizeof(szNVHostNameNew); + Error = RegQueryValueExW(hKeyHN, L"NV Hostname", NULL, NULL, (LPBYTE)szNVHostNameNew, &cbData); + ok_long(Error, ERROR_SUCCESS); + ok(szNVHostNameNew[0], "szNVHostNameNew is empty\n"); + ok(lstrcmpW(szNVHostNameNew, szNewName) == 0, + "szNVHostNameNew '%S' should be szNewName '%S'\n", szNVHostNameNew, szNewName); + /* Get New Hostname */ szHostNameNew[0] = UNICODE_NULL; cbData = sizeof(szHostNameNew); @@ -99,6 +116,10 @@ START_TEST(SetComputerNameExW) "szComputerNameNew '%S' should be szNewName '%S'\n", szComputerNameNew, szNewName); /* Restore the registry values */ + cbData = (lstrlenW(szNVHostNameOld) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKeyHN, L"NV Hostname", 0, REG_SZ, (LPBYTE)szNVHostNameOld, cbData); + ok_long(Error, ERROR_SUCCESS); + cbData = (lstrlenW(szHostNameOld) + 1) * sizeof(WCHAR); Error = RegSetValueExW(hKeyHN, L"Hostname", 0, REG_SZ, (LPBYTE)szHostNameOld, cbData); ok_long(Error, ERROR_SUCCESS);

5 years, 3 months

[reactos] 01/01: [GDI32_APITEST] Improve GetGlyphIndices testcase (#1582)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed0c6135284f2fb74da13… commit ed0c6135284f2fb74da138f3f1f3c34cf0ee7e9e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 27 11:19:44 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 27 11:19:44 2019 +0900 [GDI32_APITEST] Improve GetGlyphIndices testcase (#1582) Strengthen the testcase for gdi32!GetGlyphIndicesW. CORE-12825 --- modules/rostests/apitests/gdi32/GetGlyphIndices.c | 33 ++++++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/gdi32/GetGlyphIndices.c b/modules/rostests/apitests/gdi32/GetGlyphIndices.c index 281616b614..745ab2d067 100644 --- a/modules/rostests/apitests/gdi32/GetGlyphIndices.c +++ b/modules/rostests/apitests/gdi32/GetGlyphIndices.c @@ -90,6 +90,8 @@ START_TEST(GetGlyphIndices) HFONT hFont; HDC hdc; int i; + DWORD ret; + static const WCHAR s_invalids[] = {0xFEFE, 0xFEFF, 0xFFFE, 0}; if (!InstallTempFont(TempTTFFile)) { @@ -116,21 +118,32 @@ START_TEST(GetGlyphIndices) ok_lasterrornotchanged(); /* Test invalid params */ + ok_int(GetGlyphIndicesW(hdc, NULL, 1, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, NULL, 32, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); ok_int(GetGlyphIndicesW(hdc, NULL, 0, Indices, 0), GDI_ERROR); ok_lasterrornotchanged(); ok_int(GetGlyphIndicesW(hdc, NULL, 1, Indices, 0), GDI_ERROR); ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, NULL, 32, Indices, 0), GDI_ERROR); + ok_lasterrornotchanged(); ok_int(GetGlyphIndicesW(hdc, Single, 0, NULL, 0), GDI_ERROR); ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, Single, 1, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, Glyphs, 32, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); ok_int(GetGlyphIndicesW(hdc, Single, 0, Indices, 0), GDI_ERROR); ok_lasterrornotchanged(); - ok_int(GetGlyphIndicesW(hdc, Single, 1, NULL, 0), GDI_ERROR); + ok_int(GetGlyphIndicesW(hdc, Single, 1, Indices, 0xFFFFFFFF), 1); ok_lasterrornotchanged(); /* Test an exceptional case that does not seem to return an error */ - // FIXME: What does the returned value exactly means? - ok(GetGlyphIndicesW(hdc, NULL, 0, NULL, 0) != 0, - "GetGlyphIndicesW(hdc, NULL, 0, NULL, 0) return expected not zero, but got zero!\n"); + /* In this case, it returns the number of glyphs */ + ret = GetGlyphIndicesW(hdc, NULL, 0, NULL, 0); + ok(ret == 988, + "GetGlyphIndicesW(hdc, NULL, 0, NULL, 0) return expected 988, but got %ld\n", ret); ok_lasterrornotchanged(); /* Test a single valid char */ @@ -152,6 +165,18 @@ START_TEST(GetGlyphIndices) ok_int(Indices[2], 21); ok_int(Indices[3], 22); + ok_int(GetGlyphIndicesW(hdc, s_invalids, 3, Indices, 0), 3); + ok_lasterrornotchanged(); + ok_int(Indices[0], 0); + ok_int(Indices[1], 0); + ok_int(Indices[2], 0); + + ok_int(GetGlyphIndicesW(hdc, s_invalids, 3, Indices, GGI_MARK_NONEXISTING_GLYPHS), 3); + ok_lasterrornotchanged(); + ok_int(Indices[0], 0xFFFF); + ok_int(Indices[1], 0xFFFF); + ok_int(Indices[2], 0xFFFF); + /* Setup an array of all possible BMP glyphs */ for (i = 0; i < MAX_BMP_GLYPHS; i++) Glyphs[i] = (WCHAR)i;

5 years, 3 months

[reactos] 02/02: [EXPLORER] Update Portuguese Translation

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2f898aa9404aaecb5019… commit e2f898aa9404aaecb501935b142bc98df731f2d9 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Mon May 20 19:15:10 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 26 21:19:35 2019 +0200 [EXPLORER] Update Portuguese Translation --- base/shell/explorer/lang/pt-BR.rc | 4 ++-- base/shell/explorer/lang/pt-PT.rc | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index de6a66923d..45de6a7778 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -143,9 +143,9 @@ BEGIN DEFPUSHBUTTON "&Ignore", IDIGNORE, 215, 60, 50, 14 PUSHBUTTON "&Rename", IDC_FILE_RENAME, 159, 60, 50, 14 LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP - AUTOCHECKBOX "&Don't perform this check at startup", IDC_NOTCHECK, 7, 62, 139, 10 + AUTOCHECKBOX "&Não executar esta verificação na inicialização", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "There is a file or folder on your computer called %s which could cause certain applications to not function correctly. Renaming it to %s would solve this problem. Would you like to rename it now?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Existe uma pasta ou ficheiro no seu computador, de nome %s que poderá causar funcionamento incorrecto em algumas aplicações. Renomeando para %s, resolverá esse problema. Gostaria de o renomear agora?", IDC_STATIC, 34, 7, 224, 37 END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index d228b7b8a0..adb7ec5fef 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -14,7 +14,7 @@ BEGIN MENUITEM "Lado a Lado &Horizontalmente", ID_SHELL_CMD_TILE_WND_H MENUITEM "Lado a Lado &Verticalmente", ID_SHELL_CMD_TILE_WND_V MENUITEM "&Exibir Área de Trabalho", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Desfazer", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "&Retroceder", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "&Gerenciador de Tarefas", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR @@ -45,7 +45,7 @@ BEGIN MENUITEM "&Painel de Controle", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Segurança...", IDM_SECURITY, MFT_STRING, MFS_ENABLED - MENUITEM "&Conexões de Rede", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Ligações de Rede", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED MENUITEM "&Impressoras e Fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Barra de Tarefas e Menu Iniciar", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END @@ -91,10 +91,10 @@ CAPTION "Menu Iniciar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_STARTMENU_BITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 7, 183, 108 - AUTORADIOBUTTON "&Menu 'Iniciar'", IDC_TASKBARPROP_STARTMENU, 7, 145, 105, 10 - LTEXT "Seleccione este estilo para um acesso fácil à Internet, correio electrónicoe aos seus programas favoritos.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 155, 150, 24 + AUTORADIOBUTTON "&Menu 'Iniciar'", IDC_TASKBARPROP_STARTMENU, 7, 135, 90, 10 + LTEXT "Seleccione este estilo para um acesso fácil à Internet, correio electrónicoe e aos seus programas favoritos.", IDC_TASKBARPROP_STARTMENUMODERNTEXT, 20, 145, 150, 24 PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCUST, 192, 132, 53, 14 - AUTORADIOBUTTON "M&enu 'Inicar' clássico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 185, 105, 10 + AUTORADIOBUTTON "M&enu 'Inicar' clássico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 185, 90, 10 LTEXT "Seleccione esta opção para utilizar o estilo e funcionalidades do menu clássico", IDC_TASKBARPROP_STARTMENUCLASSICTEXT, 20, 195, 150, 24 PUSHBUTTON "&Personalizar...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 172, 53, 14 END @@ -105,7 +105,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Personalizar Notificações" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS mostra icones para as notificações activas e urgentes, e oculta as inactivas. Pode modificar este comportamento para os items na lista abaixo.", IDC_STATIC, 6, 6, 220, 30 + LTEXT "O ReactOS mostra icones para as notificações activas e urgentes, e oculta as inactivas. Pode modificar este comportamento para os items na lista abaixo.", IDC_STATIC, 6, 6, 220, 30 LTEXT "Seleccione um item, e em seguida escolha o seu comportamento de notificação:", IDC_STATIC, 6, 40, 220, 10 CONTROL "", IDC_NOTIFICATION_LIST, "SysListView32", WS_CLIPSIBLINGS | WS_BORDER | 0x00008005, 6, 80, 220, 128 COMBOBOX IDC_NOTIFICATION_BEHAVIOUR, 103, 178, 78, 200, CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_CLIPSIBLINGS @@ -145,7 +145,7 @@ BEGIN LTEXT "", IDC_STATIC, 7, 51, 258, 1, NOT WS_GROUP AUTOCHECKBOX "&Não executar esta verificação na inicialização", IDC_NOTCHECK, 7, 62, 139, 10 ICON 32515, IDC_STATIC, 7, 7, 21, 20 - LTEXT "Existe uma pasta ou ficheiro no seu computador, de nome %s que poderá causar funcionamento incorrecto em algumas aplicações . Renomeando para %s, resolverá esse problema. Gostaria de o renomear agora?", IDC_STATIC, 34, 7, 224, 37 + LTEXT "Existe uma pasta ou ficheiro no seu computador, de nome %s que poderá causar funcionamento incorrecto em algumas aplicações. Renomeando para %s, resolverá esse problema. Gostaria de o renomear agora?", IDC_STATIC, 34, 7, 224, 37 END IDD_MODERNSTART_ADVANCED DIALOGEX 0, 0, 251, 198, 0 @@ -179,7 +179,7 @@ BEGIN LTEXT "&Numero de programas no menu 'Iniciar':", IDC_STATIC, 14, 86, 112, 8 EDITTEXT IDC_NUMBEROFPROGRAMS, 133, 84, 27, 12, ES_LEFT | ES_RIGHT | ES_NUMBER CONTROL "", IDC_NUMBERUPDOWN, "msctls_updown32", WS_BORDER | 0x000000B6, 160, 84, 11, 12 - PUSHBUTTON "&Limpar Lista", IDC_CLEARLIST, 182, 98, 57, 14 + PUSHBUTTON "&Limpar a Lista", IDC_CLEARLIST, 182, 98, 57, 14 GROUPBOX "Mostrar no menu 'Iniciar'", IDC_STATIC, 7, 126, 238, 63 AUTOCHECKBOX "&Internet:", IDC_SHOWINTERNET, 14, 140, 42, 10 COMBOBOX IDC_INTERNETDEFAULTAPP, 98, 138, 140, 200, CBS_DROPDOWNLIST | WS_VSCROLL @@ -191,8 +191,8 @@ STRINGTABLE BEGIN IDS_START "Iniciar" IDS_PROPERTIES "P&ropriedades" - IDS_OPEN_ALL_USERS "A&brir Todos os Usuários" - IDS_EXPLORE_ALL_USERS "E&xplorar Todos os Usuários" + IDS_OPEN_ALL_USERS "A&brir Todos os Utilizadores" + IDS_EXPLORE_ALL_USERS "E&xplorar Todos os Utilizadores" IDS_STARTUP_ERROR "O sistema não pode iniciar o explorer porque o registo está corrompido ou inacessível." END

5 years, 3 months

[reactos] 01/02: [TRANSLATIONS] Update/Add Portuguese translations.

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f5e960e32879db7875f4… commit 7f5e960e32879db7875f4f9400d6c4c237a0359f Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri May 17 18:32:10 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 26 21:19:31 2019 +0200 [TRANSLATIONS] Update/Add Portuguese translations. Translations for: reactos/setup, usetup, syssetup, netshell, shell32. --- base/setup/reactos/lang/pt-PT.rc | 12 +-- base/setup/usetup/lang/pt-PT.h | 10 +- dll/shellext/netshell/lang/pt-PT.rc | 176 ++++++++++++++++++++++++++++++++++++ dll/shellext/netshell/netshell.rc | 3 + dll/win32/shell32/lang/pt-PT.rc | 8 +- dll/win32/syssetup/lang/pt-PT.rc | 97 +++++++++++--------- 6 files changed, 250 insertions(+), 56 deletions(-) diff --git a/base/setup/reactos/lang/pt-PT.rc b/base/setup/reactos/lang/pt-PT.rc index 3be5384f35..05627b87fa 100644 --- a/base/setup/reactos/lang/pt-PT.rc +++ b/base/setup/reactos/lang/pt-PT.rc @@ -96,17 +96,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation type:", IDC_STATIC, 18, 5, 74, 11 + LTEXT "Tipo de Instalação:", IDC_STATIC, 18, 5, 74, 11 EDITTEXT IDC_INSTALLTYPE, 95, 4, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Installation source:", IDC_STATIC, 18, 17, 74, 11 + LTEXT "Instalação fonte:", IDC_STATIC, 18, 17, 74, 11 EDITTEXT IDC_INSTALLSOURCE, 95, 16, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Architecture:", IDC_STATIC, 18, 29, 74, 11 + LTEXT "Arquitectura:", IDC_STATIC, 18, 29, 74, 11 EDITTEXT IDC_ARCHITECTURE, 95, 28, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Computer:", IDC_STATIC, 18, 41, 74, 11 + LTEXT "Computador:", IDC_STATIC, 18, 41, 74, 11 EDITTEXT IDC_COMPUTER, 95, 40, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Display:", IDC_STATIC, 18, 53, 74, 11 + LTEXT "Monitor:", IDC_STATIC, 18, 53, 74, 11 EDITTEXT IDC_DISPLAY, 95, 52, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Keyboard:", IDC_STATIC, 18, 65, 74, 11 + LTEXT "Teclado:", IDC_STATIC, 18, 65, 74, 11 EDITTEXT IDC_KEYBOARD, 95, 64, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Volume:", IDC_STATIC, 18, 77, 74, 11 EDITTEXT IDC_DESTDRIVE, 95, 76, 210, 13, ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE | NOT WS_BORDER | NOT WS_TABSTOP diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 19f2c904d8..17f5515a27 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -563,7 +563,7 @@ static MUI_ENTRY ptPTUpgradePageEntries[] = { 0, 0, - "U = Actualizar ESC = Não actualizar F3 = Terminar", + "U = Actualizar ESC = N\343o actualizar F3 = Terminar", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -910,7 +910,7 @@ static MUI_ENTRY ptPTSelectPartitionEntries[] = 8, 15, "\x07 Para criar uma parti\207\306o prim\240ria, pressione P.", -// "\x07 Para criar uma parti‡Æo no espa‡o nÆo particionado, pressione C.", +// "\x07 Para criar uma parti\207\306o no espa\207o n\306o particionado, pressione C.", TEXT_STYLE_NORMAL }, { @@ -1853,7 +1853,7 @@ MUI_STRING ptPTStrings[] = " Por favor, aguarde..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTER=Instalar C=Criar parti‡Æo F3=Sair"}, +// " ENTER=Instalar C=Criar parti\207\306o F3=Sair"}, {STRING_INSTALLCREATELOGICAL, " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, @@ -1864,7 +1864,7 @@ MUI_STRING ptPTStrings[] = "Tamanho da nova parti\207\306o:"}, {STRING_CHOOSENEWPARTITION, "Seleccionou criar uma parti\207\306o prim\240ria"}, -// "Vocˆ solicitou a cria‡Æo de uma nova parti‡Æo em"}, +// "Voc\210 solicitou a cria\207\306o de uma nova parti\207\306o em"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, "Seleccionou criar uma parti\207\306o extendida"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, @@ -1978,6 +1978,6 @@ MUI_STRING ptPTStrings[] = {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adicionando tipos de teclado"}, + "A adicionar tipos de teclado"}, {0, 0} }; diff --git a/dll/shellext/netshell/lang/pt-PT.rc b/dll/shellext/netshell/lang/pt-PT.rc new file mode 100644 index 0000000000..131fd207e7 --- /dev/null +++ b/dll/shellext/netshell/lang/pt-PT.rc @@ -0,0 +1,176 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_NETPROPERTIES DIALOGEX 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Ligar usando:", -1, 9, 9, 217, 8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_TABSTOP | ES_READONLY + PUSHBUTTON "Con&figurar", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Esta ligação utiliza os seguintes items:", -1, 9, 59, 217, 8 + PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Descrição ", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "A descrição dos componentes...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Mostrar icon na área de notificação quando ligado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Notificar-me quando a conectividade esta ligação for limitada ou nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_STATUS DIALOGEX 0, 0, 200, 280 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_LAN_NETSTATUS DIALOGEX 0, 0, 200, 180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ligação ", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Estado:", -1, 19, 20, 60, 8 + LTEXT "Duração:", -1, 19, 34, 60, 8 + LTEXT "Velocidade:", -1, 19, 48, 60, 8 + GROUPBOX "Actividade ", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Enviados", -1, 26, 90, 60, 8 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 + LTEXT "Recebidos", -1, 149, 90, 37, 8 + LTEXT "Pacotes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propriedades", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "", IDC_STATUS, 83, 20, 98, 8 + RTEXT "", IDC_DURATION, 83, 34, 98, 8 + RTEXT "", IDC_SPEED, 83, 48, 98, 8 +END + +IDD_LAN_NETSTATUSADVANCED DIALOGEX 0, 0, 200, 180 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Suporte" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Estado de ligação ", -1, 9, 8, 191, 88, BS_GROUPBOX + LTEXT "Tipo de endereço:", -1, 22, 20, 80, 8 + LTEXT "Endereço IP:", -1, 22, 34, 80, 8 + LTEXT "Máscara de sub-rede:", -1, 22, 48, 80, 8 + LTEXT "Gateway predefinido:", -1, 22, 62, 80, 8 + RTEXT "Não disponivel", IDC_DETAILSTYPE, 110, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 110, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 110, 48, 80, 8 + RTEXT "", IDC_DETAILSGATEWAY, 110, 62, 80, 8 + PUSHBUTTON "&Detalhes...", IDC_DETAILS, 22, 76, 62, 14 +END + +IDD_LAN_NETSTATUSDETAILS DIALOGEX 0, 0, 190, 175 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | DS_MODALFRAME +CAPTION "Detalhes da ligação" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Detalhes da ligação:", -1, 10, 4, 170, 12 + CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 10, 15, 170, 130 + PUSHBUTTON "&Fechar", IDC_CLOSE, 120, 155, 60, 14 +END + +IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalador do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 + LTEXT "Seleccione configuração típica ou personalizada:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "Configuração típica", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Configuração personalizada", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "Cria ligações de rede utilizando Cliente para Redes de ReactOS, Arquivos e Impresoras partilhadas para Redes de ReactOS, e o protocolo TCP/IP com endereçamento automático.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "Permite configurar manualmente componentes de rede.", IDC_STATIC, 65, 90, 243, 20 +END + +IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalador de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Dispositivo:", IDC_STATIC, 33, 2, 100, 20 + LTEXT "n/d", IDC_NETWORK_DEVICE, 75, 2, 253, 20 + LTEXT "Os componentes assinalados serão utilizados por esta ligação:", IDC_STATIC, 33, 12, 253, 20 + CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 + PUSHBUTTON "&Instalar...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propriedades", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "Descrição", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX +END + +IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalador de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Deseja que este computador faça parte de un domínio?\n\ +(Pode obter máis informações do seu administrador de rede.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "Não, este computador será parte de um grupo de trabalho.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sim, este computador será parte de um domínio.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "Nome do domínio ou grupo de trabalho:", IDC_STATIC, 33, 72, 152, 20 + EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "NOTE: Se este computador não fizer parte de uma rede, não terá privilégios suficientes para se juntar a um domínio, ou se simplesmente não sabe que escolher, então seleccione ""Grupo de trabalho"" por agora. Ésta opção pode ser alterada mais tarde.", IDC_STATIC, 33, 107, 263, 50 +END + +STRINGTABLE +BEGIN + IDS_PHYSICAL_ADDRESS "Endereço físico" + IDS_IP_ADDRESS "Endereço IP" + IDS_SUBNET_MASK "Máscara de subred" + IDS_DEF_GATEWAY "Gateway predefinido" + IDS_DHCP_SERVER "Servidor DHCP" + IDS_LEASE_OBTAINED "Permissão concedida" + IDS_LEASE_EXPIRES "Permissão expirada" + IDS_DNS_SERVERS "Servidor DNS" + IDS_WINS_SERVERS "Servidor WINS" + IDS_PROPERTY "Propriedades" + IDS_VALUE "Valor" + IDS_NETWORKCONNECTION "Ligações de rede" + IDS_SHV_COLUMN_NAME "Nome" + IDS_SHV_COLUMN_TYPE "Tipo" + IDS_SHV_COLUMN_STATE "Estado" + IDS_SHV_COLUMN_DEVNAME "Nome do dispositivo" + IDS_SHV_COLUMN_PHONE "Número de telefone ou endereço do host" + IDS_SHV_COLUMN_OWNER "Proprietário" + IDS_TYPE_ETHERNET "LAN ou Internet de alta velocidade" + IDS_STATUS_NON_OPERATIONAL "Desabilitado" + IDS_STATUS_UNREACHABLE "Desligado" + IDS_STATUS_DISCONNECTED "Cabo de redo desligado" + IDS_STATUS_CONNECTING "A obter endereço de rede" + IDS_STATUS_CONNECTED "Ligado" + IDS_STATUS_OPERATIONAL "Ligado" + IDS_NET_ACTIVATE "Habilitar" + IDS_NET_DEACTIVATE "Desabilitar" + IDS_NET_STATUS "Estado" + IDS_NET_REPAIR "Reparar" + IDS_NET_CREATELINK "Criar acesso directo" + IDS_NET_DELETE "Apagar" + IDS_NET_RENAME "Renomear" + IDS_NET_PROPERTIES "Propriedades" + IDS_FORMAT_BIT "%u Bit/s" + IDS_FORMAT_KBIT "%u KBit/s" + IDS_FORMAT_MBIT "%u MBit/s" + IDS_FORMAT_GBIT "%u GBit/s" + IDS_DURATION_DAY "%d día %s" + IDS_DURATION_DAYS "%d días %s" + IDS_ASSIGNED_DHCP "Atribuido por DHCP" + IDS_ASSIGNED_MANUAL "Configurado manualmente" +END + +STRINGTABLE +BEGIN + IDS_NETWORKSETTINGSTITLE "Configuração de rede" + IDS_NETWORKSETTINGSSUBTITLE "Instala aplicações de rede necessárias para ligar a outras redes, equipamentos, e à Internet." + IDS_NETWORKCOMPONENTTITLE "Componetes de rede" + IDS_NETWORKCOMPONENTSUBTITLE "Determina quais os componentes de rede a utilizar no seu equipamento. Para adicionar novos componentes, clice em Instalar." + IDS_NETWORKDOMAINTITLE "Grupo de trabalho ou domínio" + IDS_NETWORKDOMAINSUBTITLE "Um domínio é um grupo de computadores gerido por um administrador de rede. Um grupo de trabalho é um grupo de computadores que partilham o mesmo nome." + IDS_REACTOS_SETUP "Instalador de ReactOS" + IDS_WZD_DOMAIN_NAME "A instalação não pode continuar\naté que digite o nome do\n domínio ou grupo de trabalho." +END diff --git a/dll/shellext/netshell/netshell.rc b/dll/shellext/netshell/netshell.rc index 36f6e84fd6..24fab39eed 100644 --- a/dll/shellext/netshell/netshell.rc +++ b/dll/shellext/netshell/netshell.rc @@ -81,6 +81,9 @@ IDR_NETSHELL REGISTRY "res/netshell.rgs" #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 1f14d56bef..479ea8a73f 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL MENU_001 MENUEX BEGIN @@ -244,7 +244,7 @@ BEGIN AUTOCHECKBOX "&Sómente de Leitura", 14021, 58, 151, 70, 10 AUTOCHECKBOX "&Escondido", 14022, 126, 151, 70, 10 AUTOCHECKBOX "&Arquivo", 14023, 181, 151, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "A&vançado...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -440,7 +440,7 @@ BEGIN GROUPBOX "Vistas das Pastas", -1, 7, 10, 249, 60 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 LTEXT "Pode aplicar a vista (como detalhes ou títulos) que\nestá a usar para esta pasta para todas as pastas.", -1, 60, 20, 180, 20 - PUSHBUTTON "Applicar a T&odas as Pastas", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP + PUSHBUTTON "Aplicar a T&odas as Pastas", IDC_VIEW_APPLY_TO_ALL, 60, 50, 80, 14, WS_TABSTOP PUSHBUTTON "&Reiniciar todas as Pastas", IDC_VIEW_RESET_ALL, 150, 50, 80, 14, WS_TABSTOP LTEXT "Definições avançadas:", -1, 7, 80, 100, 10 CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120 @@ -797,7 +797,7 @@ BEGIN IDS_RESTART_PROMPT "Deseja simular a reinicialização do ReactOS?" IDS_SHUTDOWN_TITLE "Desligar" IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sessão do ReactOS?" - + /* Format Dialog Strings */ IDS_FORMAT_TITLE "Format Local Disk" IDS_FORMAT_WARNING "WARNING: Formatting will erase ALL data on this disk.\nTo format the disk, click OK. To quit, click CANCEL." diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index c215fddba7..3a6a8b032a 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -6,7 +6,7 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo ao assistente de instalação do ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Este assistente instala o ReactOS no seu computador. Ele precisa reunir algumas informações sobre você e seu computador para instalar o ReactOS devidamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Este assistente instala o ReactOS no seu computador. Precisamos reunir algumas informações para instalar o ReactOS devidamente.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END @@ -15,9 +15,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Os desenvolvedores do ReactOS gostariam de agradecer aos seguintes projetos Open Source, cujo partes foram utilizadas para criar o ReactOS:", IDC_STATIC, 15, 7, 286, 19 + LTEXT "Os desenvolvedores do ReactOS gostariam de agradecer aos seguintes projectos Open Source, cujas partes foram utilizadas para criar o ReactOS:", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS está licenciado sob a GPL, se você deseja reutilizar ou redistribuir (partes) (d)ele você deve respeitar a GPL.", IDC_STATIC, 15, 110, 227, 19 + LTEXT "ReactOS está licenciado sob a GPL, se deseja reutilizar ou redistribuir (partes) (d)ele deve respeitar a GPL.", IDC_STATIC, 15, 110, 227, 19 PUSHBUTTON "&Visualizar GPL...", IDC_VIEWGPL, 251, 110, 50, 19 LTEXT "Clique Avançar para continuar com a instalação.", IDC_STATIC, 15, 136, 195, 17 END @@ -28,7 +28,7 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Digite seu nome completo e o nome de sua empresa ou organização.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "Digite o seu nome completo e da sua empresa ou organização.", IDC_STATIC, 54, 7, 242, 21 LTEXT "No&me:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Organização:", IDC_STATIC, 54, 57, 44, 8 @@ -41,15 +41,15 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Digite um nome para o seu computador com 15 caracteres ou menos. Se você está em uma rede, o nome do computador deve ser exclusivo.", IDC_STATIC, 54, 7, 250, 24 + LTEXT "Digite um nome para o seu computador com 15 caracteres ou menos. Se está numa rede, o nome do computador terá de ser exclusivo.", IDC_STATIC, 54, 7, 250, 24 LTEXT "Nome do &Computador:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "A instalação vai criar uma conta no seu computador chamada Administrator. Você pode usar esta conta se precisar de acesso total ao seu computador.", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Digite uma senha para o administrador com 127 caracteres ou menos.", IDC_STATIC, 54, 87, 250, 8 - LTEXT "Senha do &Administrador:", IDC_STATIC, 54, 104, 105, 8 + LTEXT "A instalação vai criar uma conta chamada Administrator. Pode usar esta conta se precisar de acesso total ao seu computador.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "Digite uma palavra-passe para o administrador com 127 caracteres ou menos.", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Palavra-passe do &Administrador:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfirma Senha:", IDC_STATIC, 54, 123, 105, 8 + LTEXT "C&onfirme a palavra-passe:", IDC_STATIC, 54, 123, 105, 8 EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -59,13 +59,13 @@ CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "A localidade do sistema deve coincidir com o idioma das aplicações que você quer utilizar. A localidade de usuário controla como números, moeda e datas aparecem.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "A localização do sistema deve coincidir com o idioma das aplicações que quer utilizar. As informações regionais controlam o formato dos números, unidade monetária, data e hora.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Para alterar a localidade de sistema ou usuário, clique Personalizar.", IDC_STATIC, 53, 60, 196, 8 + LTEXT "Para alterar a localização do sistema, clique em Personalizar.", IDC_STATIC, 53, 60, 196, 8 PUSHBUTTON "&Personalizar...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 - LTEXT "O layout do teclado controla os caracteres que aparecem quando você digita.", IDC_STATIC, 53, 86, 253, 8 + LTEXT "O tipo de teclado controla os caracteres que aparecem quando digita.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Para alterar o layout do teclado, clique Personalizar.", IDC_STATIC, 53, 126, 184, 8 + LTEXT "Para alterar o tipo do teclado, clique em Personalizar.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "P&ersonalizar...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END @@ -103,13 +103,13 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Finalizando a instalação do ReactOS" +CAPTION "A finalizar a instalação do ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Finalizando o Assistente de Instalação do ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Você completou a instalação do ReactOS com sucesso.\n\nQuando você clicar em Finalizar, o computador será reiniciado.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "A finalizar o Assistente de Instalação do ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Completou a instalação do ReactOS com sucesso.\n\nQuando clicar em Finalizar, o computador será reiniciado.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Se houver um cd em algum drive, remova-o. Depois, para reiniciar seu computador, clique Finalizar.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Se houver um cd em algum drive, remova-o. Depois, para reiniciar o computador, clique em Finalizar.", IDC_STATIC, 115, 169, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230 @@ -132,20 +132,20 @@ END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Settings" +CAPTION "Definições avançadas" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 - LTEXT "reports per second", -1, 169, 35, 76, 8 + RTEXT "&Frequencia de amostragem:", -1, 27, 35, 90, 8 + LTEXT "Relatórios por segundo", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + RTEXT "&Detecção da roda:", -1, 27, 55, 90, 8 COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 - LTEXT "packets", -1, 169, 75, 26, 8 + RTEXT "&Tamanho da memória intermédia:", -1, 27, 75, 90, 8 + LTEXT "pacotes", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 - PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 + AUTOCHECKBOX "&Inicialização rápida", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "&Predefinições", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END STRINGTABLE @@ -153,29 +153,29 @@ BEGIN IDS_ACKTITLE "Agradecimentos" IDS_ACKSUBTITLE "Os ombros nos quais o ReactOS se apoia e informações de licença" IDS_OWNERTITLE "Personalize seu Software" - IDS_OWNERSUBTITLE "A Instalação utiliza esta sua informação para personalizar o ReactOS." - IDS_COMPUTERTITLE "Nome do computador e senha do administrador" - IDS_COMPUTERSUBTITLE "Você deve fornecer um nome e senha de administrador para o seu computador." + IDS_OWNERSUBTITLE "A Instalação utiliza esta informação para personalizar o ReactOS." + IDS_COMPUTERTITLE "Nome do computador e palavra-passe do administrador" + IDS_COMPUTERSUBTITLE "Deve fornecer um nome e palavra-passe de administrador para o seu computador." IDS_LOCALETITLE "Configurações Regionais" - IDS_LOCALESUBTITLE "Você pode personalizar o ReactOS para diferentes regiões e línguas." + IDS_LOCALESUBTITLE "Pode personalizar o ReactOS para diferentes regiões e línguas." IDS_DATETIMETITLE "Data e Hora" - IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu computador." - IDS_PROCESSTITLE "Registrando componentes" + IDS_DATETIMESUBTITLE "Definir a data e a hora correctas para o seu computador." + IDS_PROCESSTITLE "A registar componentes" IDS_PROCESSSUBTITLE "Por favor aguarde..." - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." + IDS_THEMESELECTIONTITLE "Aparencia" + IDS_THEMESELECTIONSUBTITLE "Seleccione o tema perferido." END STRINGTABLE BEGIN IDS_REACTOS_SETUP "Instalação do ReactOS" IDS_UNKNOWN_ERROR "Erro Desconhecido" - IDS_REGISTERING_COMPONENTS "Registrando componentes..." + IDS_REGISTERING_COMPONENTS "A registar componentes..." IDS_LOADLIBRARY_FAILED "LoadLibrary falhou: " IDS_GETPROCADDR_FAILED "GetProcAddr falhou: " IDS_REGSVR_FAILED "DllRegisterServer falhou: " IDS_DLLINSTALL_FAILED "DllInstall falhou: " - IDS_TIMEOUT "Tempo limite esgotado durante registro" + IDS_TIMEOUT "Tempo limite esgotado durante o registo" IDS_REASON_UNKNOWN "" /* * ATTENTION: @@ -189,18 +189,18 @@ END STRINGTABLE BEGIN - IDS_WZD_NAME "A Instalação não pode continuar até que você digite seu nome." + IDS_WZD_NAME "A Instalação não pode continuar até que digite o seu nome." IDS_WZD_SETCOMPUTERNAME "A Instalação falhou tentando definir o nome do computador." - IDS_WZD_COMPUTERNAME "A Instalação não pode continuar até que você digite o nome do seu computador." - IDS_WZD_PASSWORDEMPTY "Você deve digitar uma senha." - IDS_WZD_PASSWORDMATCH "As senhas digitadas não coincidem. Por favor, entre com a senha desejada novamente." - IDS_WZD_PASSWORDCHAR "A senha que você digitou contém caracteres inválidos. Por favor digite uma senha diferente." + IDS_WZD_COMPUTERNAME "A Instalação não pode continuar até que digite o nome do seu computador." + IDS_WZD_PASSWORDEMPTY "Deve digitar uma palavra-passe." + IDS_WZD_PASSWORDMATCH "As palavras-passe digitadas não coincidem. Por favor, digite a palavra-passe desejada novamente." + IDS_WZD_PASSWORDCHAR "A palavra-passe que digitou contém caracteres inválidos. Por favor digite uma palavra-passe diferente." IDS_WZD_LOCALTIME "A Instalação não pôde definir a hora local." END STRINGTABLE BEGIN - IDS_STATUS_INSTALL_DEV "Instalando dispositivos..." + IDS_STATUS_INSTALL_DEV "A instalar dispositivos..." END /* ATTENTION: Synchronize the translation of these strings with shell32 */ @@ -209,3 +209,18 @@ BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Arquivos de programas" IDS_COMMONFILES "Arquivos comuns" END + +STRINGTABLE +BEGIN + IDS_DETECTIONDISABLED "Detecção desabilitada" + IDS_LOOKFORWHEEL "A detectar o volante do rato" + IDS_ASSUMEPRESENT "Assume volante está presente" +END + +STRINGTABLE +BEGIN + IDS_CLASSIC "Classic" + IDS_LAUTUS "Lautus" + IDS_LUNAR "Lunar" + IDS_MIZU "Mizu" +END

5 years, 3 months

[reactos] 01/01: [KERNEL32_APITEST] Fix build

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87f5d017a4514d4440998… commit 87f5d017a4514d4440998b62e2d83a815ccf225d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon May 27 02:34:32 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon May 27 02:34:32 2019 +0900 [KERNEL32_APITEST] Fix build --- modules/rostests/apitests/kernel32/SetComputerNameExW.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/kernel32/SetComputerNameExW.c b/modules/rostests/apitests/kernel32/SetComputerNameExW.c index fc55c96f15..5019265400 100644 --- a/modules/rostests/apitests/kernel32/SetComputerNameExW.c +++ b/modules/rostests/apitests/kernel32/SetComputerNameExW.c @@ -49,9 +49,9 @@ START_TEST(SetComputerNameExW) /* Open keys */ hKeyHN = OpenHostNameKey(); - ok(hKeyHN, "hKeyHN is NULL\n"); + ok(hKeyHN != NULL, "hKeyHN is NULL\n"); hKeyCN = OpenComputerNameKey(); - ok(hKeyCN, "hKeyCN is NULL\n"); + ok(hKeyCN != NULL, "hKeyCN is NULL\n"); if (!hKeyHN || !hKeyCN) { if (hKeyHN)

5 years, 3 months

[reactos] 01/01: [KERNEL32_APITEST] Improve SetComputerNameExW test a bit (#1580)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de2b20d2408c19374671c… commit de2b20d2408c19374671cef31047f972a32b8ad9 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun May 26 19:33:03 2019 +0200 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon May 27 02:33:03 2019 +0900 [KERNEL32_APITEST] Improve SetComputerNameExW test a bit (#1580) Addendum to 8aeb6a9. ROSTESTS-227 --- .../rostests/apitests/kernel32/SetComputerNameExW.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/kernel32/SetComputerNameExW.c b/modules/rostests/apitests/kernel32/SetComputerNameExW.c index 658e74e8a4..fc55c96f15 100644 --- a/modules/rostests/apitests/kernel32/SetComputerNameExW.c +++ b/modules/rostests/apitests/kernel32/SetComputerNameExW.c @@ -39,24 +39,26 @@ static HKEY OpenComputerNameKey(void) START_TEST(SetComputerNameExW) { + static const WCHAR szNewName[] = L"SRVROSTEST"; LONG Error; BOOL ret; HKEY hKeyHN, hKeyCN; DWORD cbData; WCHAR szHostNameOld[MAX_PATH], szHostNameNew[MAX_PATH]; WCHAR szComputerNameOld[MAX_PATH], szComputerNameNew[MAX_PATH]; - static const WCHAR szNewName[] = L"SRVROSTEST"; /* Open keys */ hKeyHN = OpenHostNameKey(); + ok(hKeyHN, "hKeyHN is NULL\n"); hKeyCN = OpenComputerNameKey(); + ok(hKeyCN, "hKeyCN is NULL\n"); if (!hKeyHN || !hKeyCN) { if (hKeyHN) RegCloseKey(hKeyHN); if (hKeyCN) RegCloseKey(hKeyCN); - skip("Unable to open keys (%p, %p).\n", hKeyHN, hKeyCN); + skip("Unable to open keys. Missing Admin rights?\n"); return; } @@ -65,14 +67,14 @@ START_TEST(SetComputerNameExW) cbData = sizeof(szHostNameOld); Error = RegQueryValueExW(hKeyHN, L"Hostname", NULL, NULL, (LPBYTE)szHostNameOld, &cbData); ok_long(Error, ERROR_SUCCESS); - ok(szHostNameOld[0], "szHostNameOld is %S", szHostNameOld); + ok(szHostNameOld[0], "szHostNameOld is empty\n"); /* Get Old Computer Name */ szComputerNameOld[0] = UNICODE_NULL; cbData = sizeof(szComputerNameOld); Error = RegQueryValueExW(hKeyCN, L"ComputerName", NULL, NULL, (LPBYTE)szComputerNameOld, &cbData); ok_long(Error, ERROR_SUCCESS); - ok(szComputerNameOld[0], "szHostNameOld is %S", szComputerNameOld); + ok(szComputerNameOld[0], "szComputerNameOld is empty\n"); /* Change the value */ ret = SetComputerNameExW(ComputerNamePhysicalDnsHostname, szNewName); @@ -83,18 +85,18 @@ START_TEST(SetComputerNameExW) cbData = sizeof(szHostNameNew); Error = RegQueryValueExW(hKeyHN, L"Hostname", NULL, NULL, (LPBYTE)szHostNameNew, &cbData); ok_long(Error, ERROR_SUCCESS); - ok(szHostNameNew[0], "szHostNameNew was empty.\n"); + ok(szHostNameNew[0], "szHostNameNew is empty\n"); ok(lstrcmpW(szHostNameNew, szHostNameOld) == 0, - "szHostNameNew '%S' should be szHostNameOld '%S'.\n", szHostNameNew, szHostNameOld); + "szHostNameNew '%S' should be szHostNameOld '%S'\n", szHostNameNew, szHostNameOld); /* Get New Computer Name */ szComputerNameNew[0] = UNICODE_NULL; cbData = sizeof(szComputerNameNew); Error = RegQueryValueExW(hKeyCN, L"ComputerName", NULL, NULL, (LPBYTE)szComputerNameNew, &cbData); ok_long(Error, ERROR_SUCCESS); - ok(szComputerNameNew[0], "szComputerNameNew was empty.\n"); + ok(szComputerNameNew[0], "szComputerNameNew is empty\n"); ok(lstrcmpW(szComputerNameNew, szNewName) == 0, - "szComputerNameNew '%S' should be szNewName '%S'.\n", szComputerNameNew, szNewName); + "szComputerNameNew '%S' should be szNewName '%S'\n", szComputerNameNew, szNewName); /* Restore the registry values */ cbData = (lstrlenW(szHostNameOld) + 1) * sizeof(WCHAR);

5 years, 3 months

[reactos] 01/01: [WIN32SS][NTGDI] Improve Text Transformation (#1573)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0be8d2c2d974128b48a1… commit a0be8d2c2d974128b48a118da8d987d30a951a51 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun May 26 16:12:35 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 26 16:12:35 2019 +0900 [WIN32SS][NTGDI] Improve Text Transformation (#1573) Reduce gdi32_apitest!TextTransform failures. Optimize for speed. Add Width and Escapement parameters to FONT_CACHE_ENTRY structure. CORE-15554 --- win32ss/gdi/ntgdi/font.h | 2 + win32ss/gdi/ntgdi/freetype.c | 180 ++++++++++++++++++++++--------------------- 2 files changed, 95 insertions(+), 87 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index a5e43330cc..b5629c794f 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -30,6 +30,8 @@ typedef struct _FONT_CACHE_ENTRY FT_Face Face; FT_BitmapGlyph BitmapGlyph; int Height; + int Width; + int Escapement; FT_Render_Mode RenderMode; MATRIX mxWorldToDevice; } FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index eef7cb3e5c..60f8c5669c 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -684,7 +684,7 @@ InitFontSupport(VOID) return TRUE; } -VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) +LONG FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) { LONG tmAveCharWidth; TT_OS2 *pOS2; @@ -693,12 +693,12 @@ VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) *pmat = identityMat; if (lfWidth == 0) - return; + return 0; ASSERT_FREETYPE_LOCK_HELD(); pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2); if (!pOS2) - return; + return 0; XScale = face->size->metrics.x_scale; tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6; @@ -708,12 +708,13 @@ VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) } if (lfWidth == tmAveCharWidth) - return; + return 0; - pmat->xx = (FT_Fixed)((1 << 16) * lfWidth / tmAveCharWidth); + pmat->xx = INT_TO_FIXED(lfWidth) / tmAveCharWidth; pmat->xy = 0; pmat->yx = 0; - pmat->yy = (FT_Fixed)(1 << 16); + pmat->yy = INT_TO_FIXED(1); + return lfWidth; } VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) @@ -2866,6 +2867,8 @@ ftGdiGlyphCacheGet( FT_Face Face, INT GlyphIndex, INT Height, + INT Width, + INT Escapement, FT_Render_Mode RenderMode, PMATRIX pmx) { @@ -2882,6 +2885,8 @@ ftGdiGlyphCacheGet( if ((FontEntry->Face == Face) && (FontEntry->GlyphIndex == GlyphIndex) && (FontEntry->Height == Height) && + (FontEntry->Width == Width) && + (FontEntry->Escapement == Escapement) && (FontEntry->RenderMode == RenderMode) && (SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx))) break; @@ -2944,6 +2949,8 @@ ftGdiGlyphCacheSet( FT_Face Face, INT GlyphIndex, INT Height, + INT Width, + INT Escapement, PMATRIX pmx, FT_GlyphSlot GlyphSlot, FT_Render_Mode RenderMode) @@ -2997,6 +3004,8 @@ ftGdiGlyphCacheSet( NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; NewEntry->Height = Height; + NewEntry->Width = Width; + NewEntry->Escapement = Escapement; NewEntry->RenderMode = RenderMode; NewEntry->mxWorldToDevice = *pmx; @@ -3962,6 +3971,7 @@ TextIntGetTextExtentPoint(PDC dc, realglyph = NULL; else realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + plf->lfWidth, plf->lfEscapement, RenderMode, pmxWorldToDevice); if (EmuBold || EmuItalic || !realglyph) @@ -3987,6 +3997,8 @@ TextIntGetTextExtentPoint(PDC dc, realglyph = ftGdiGlyphCacheSet(face, glyph_index, plf->lfHeight, + plf->lfWidth, + plf->lfEscapement, pmxWorldToDevice, glyph, RenderMode); @@ -5594,7 +5606,7 @@ IntExtTextOutW( FT_Face face; FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; - LONGLONG TextLeft64, TextTop64, DeltaX64, DeltaY64, XStart64, YStart64; + LONGLONG TextLeft64, TextTop64, TextWidth64, DeltaX64, DeltaY64, XStart64, YStart64; ULONG previous; FT_Bool use_kerning; RECTL DestRect, MaskRect; @@ -5620,6 +5632,7 @@ IntExtTextOutW( BOOL bResult; FT_Matrix mat = identityMat, matWidth, matEscape, matWorld; FT_Vector vecs[9]; + BOOL bNeedCache; /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) @@ -5765,32 +5778,10 @@ IntExtTextOutW( goto Cleanup; } - /* NOTE: Don't trust face->size->metrics.ascender and descender values. */ - DC_vUpdateWorldToDevice(dc); - if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) - { - pmxWorldToDevice = DC_pmxWorldToDevice(dc); - } - else - { - pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; - } + FT_Set_Transform(face, NULL, NULL); - IntWidthMatrix(face, &matWidth, lfWidth); - FT_Matrix_Multiply(&matWidth, &mat); - - IntEscapeMatrix(&matEscape, lfEscapement); - FT_Matrix_Multiply(&matEscape, &mat); - - FtMatrixFromMx(&matWorld, pmxWorldToDevice); - matWorld.yx = -matWorld.yx; - matWorld.xy = -matWorld.xy; - FT_Matrix_Multiply(&matWorld, &mat); - - FT_Set_Transform(face, &mat, NULL); - - // Calculate displacement of the text. - DeltaX64 = DeltaY64 = 0; + // Calculate the text width. + TextWidth64 = 0; DxShift = fuOptions & ETO_PDY ? 1 : 0; use_kerning = FT_HAS_KERNING(face); previous = 0; @@ -5803,7 +5794,6 @@ IntExtTextOutW( { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); - // FIXME: Use FT_LOAD_BITMAP_METRICS_ONLY or cache. error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { @@ -5832,14 +5822,12 @@ IntExtTextOutW( { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - DeltaX64 += delta.x; - DeltaY64 -= delta.y; + TextWidth64 += delta.x; } if (Dx == NULL) { - DeltaX64 += realglyph->root.advance.x >> 10; - DeltaY64 -= realglyph->root.advance.y >> 10; + TextWidth64 += realglyph->root.advance.x >> 10; } else { @@ -5850,12 +5838,7 @@ IntExtTextOutW( /* do the shift before multiplying to preserve precision */ FLOATOBJ_MulLong(&Scale, Dx[i << DxShift] << 6); - DeltaX64 += FLOATOBJ_GetLong(&Scale); - } - - if (DxShift) - { - DeltaY64 -= Dx[2 * i + 1] << 6; + TextWidth64 += FLOATOBJ_GetLong(&Scale); } previous = glyph_index; @@ -5864,21 +5847,43 @@ IntExtTextOutW( } } - // Process the X and Y alignments. - if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) + /* NOTE: Don't trust face->size->metrics.ascender and descender values. */ + if (lfWidth) { - XStart64 = -DeltaX64 / 2; - YStart64 = -DeltaY64 / 2; + lfWidth = IntWidthMatrix(face, &matWidth, lfWidth); + FT_Matrix_Multiply(&matWidth, &mat); } - else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT) + + if (lfEscapement) { - XStart64 = -DeltaX64; - YStart64 = -DeltaY64; + IntEscapeMatrix(&matEscape, lfEscapement); + FT_Matrix_Multiply(&matEscape, &mat); + } + + DC_vUpdateWorldToDevice(dc); + if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) + { + pmxWorldToDevice = DC_pmxWorldToDevice(dc); } else { - XStart64 = YStart64 = 0; + pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; } + FtMatrixFromMx(&matWorld, pmxWorldToDevice); + matWorld.xy = -matWorld.xy; + matWorld.yx = -matWorld.yx; + FT_Matrix_Multiply(&matWorld, &mat); + + vecs[0].x = TextWidth64 << 10; + vecs[0].y = 0; + FT_Vector_Transform(&vecs[0], &mat); + DeltaX64 = vecs[0].x >> 10; + DeltaY64 = -vecs[0].y >> 10; + + XStart64 = (Start.x << 6); + YStart64 = (Start.y << 6); + + FT_Set_Transform(face, &mat, NULL); psurf = dc->dclevel.pSurface; SurfObj = &psurf->SurfObj ; @@ -5919,8 +5924,10 @@ IntExtTextOutW( vecs[4].y = FontGDI->tmAscent << 16; // baseline vecs[0].y = FontGDI->tmHeight << 16; // lower left } - vecs[2] = vecs[1]; // upper right - vecs[3] = vecs[0]; // lower right + vecs[2] = vecs[1]; + vecs[2].x += (TextWidth64 << 10); // upper right + vecs[3] = vecs[0]; + vecs[3].x += (TextWidth64 << 10); // lower right #undef VALIGN_MASK // underline @@ -5933,51 +5940,50 @@ IntExtTextOutW( face->size->metrics.y_ppem / face->units_per_EM; } vecs[5].y = vecs[6].y = vecs[4].y - (position << 16); + vecs[6].x += (TextWidth64 << 10); } // strike through if (plf->lfStrikeOut) { vecs[7].y = vecs[8].y = vecs[4].y - ((FontGDI->tmAscent / 3) << 16); + vecs[8].x += (TextWidth64 << 10); } - // invert y axis - IntEscapeMatrix(&matEscape, -lfEscapement); - - matWorld.yx = -matWorld.yx; - matWorld.xy = -matWorld.xy; - - // convert vecs - for (i = 0; i < 9; ++i) + if (lfEscapement) { - FT_Vector_Transform(&vecs[i], &matWidth); - FT_Vector_Transform(&vecs[i], &matEscape); - FT_Vector_Transform(&vecs[i], &matWorld); + // invert y axis + IntEscapeMatrix(&matEscape, -lfEscapement); } - vecs[2].x += DeltaX64 << 10; - vecs[2].y += DeltaY64 << 10; // upper right - vecs[3].x += DeltaX64 << 10; - vecs[3].y += DeltaY64 << 10; // lower right - vecs[6].x += DeltaX64 << 10; - vecs[6].y += DeltaY64 << 10; // underline right - vecs[8].x += DeltaX64 << 10; - vecs[8].y += DeltaY64 << 10; // strike through right + // convert vecs + for (i = 0; i < 9; ++i) { - POINT pt; - pt.x = Start.x + (XStart64 >> 6); - pt.y = Start.y + (YStart64 >> 6); - IntLPtoDP(dc, &pt, 1); - - for (i = 0; i < 9; ++i) + if (lfWidth) { - vecs[i].x += pt.x << 16; - vecs[i].y += pt.y << 16; - vecs[i].x >>= 16; - vecs[i].y >>= 16; - vecs[i].x += dc->ptlDCOrig.x; - vecs[i].y += dc->ptlDCOrig.y; + FT_Vector_Transform(&vecs[i], &matWidth); } + if (lfEscapement) + { + FT_Vector_Transform(&vecs[i], &matEscape); + } + vecs[i].x += (XStart64 << 10); + vecs[i].y += (YStart64 << 10); + vecs[i].x >>= 16; + vecs[i].y >>= 16; + IntLPtoDP(dc, &vecs[i], 1); + if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) + { + vecs[i].x -= (DeltaX64 >> 6) / 2; + vecs[i].y -= (DeltaY64 >> 6) / 2; + } + else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT) + { + vecs[i].x -= (DeltaX64 >> 6); + vecs[i].y -= (DeltaY64 >> 6); + } + vecs[i].x += dc->ptlDCOrig.x; + vecs[i].y += dc->ptlDCOrig.y; } if (fuOptions & ETO_OPAQUE) @@ -6042,15 +6048,15 @@ IntExtTextOutW( TextLeft64 = vecs[4].x << 6; TextTop64 = vecs[4].y << 6; previous = 0; + bNeedCache = (!EmuBold && !EmuItalic); for (i = 0; i < Count; ++i) { - BOOL bNeedCache = (!EmuBold && !EmuItalic && - memcmp(&mat, &identityMat, sizeof(mat)) == 0); glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); realglyph = NULL; if (bNeedCache) { realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, + lfWidth, lfEscapement, RenderMode, pmxWorldToDevice); } if (!realglyph) @@ -6067,7 +6073,7 @@ IntExtTextOutW( { realglyph = ftGdiGlyphCacheSet(face, glyph_index, - plf->lfHeight, + plf->lfHeight, lfWidth, lfEscapement, pmxWorldToDevice, glyph, RenderMode);

5 years, 3 months

[reactos] 01/01: [CONSRV] Minor code cleanup.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ca9c9c1388060d5e2f5c… commit 5ca9c9c1388060d5e2f5c1d87abd5768c3048600 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 26 00:00:39 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 26 00:00:39 2019 +0200 [CONSRV] Minor code cleanup. --- win32ss/user/winsrv/consrv/conoutput.c | 2 +- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 2 + .../user/winsrv/consrv/frontends/gui/graphics.c | 17 ++++--- .../user/winsrv/consrv/frontends/gui/guisettings.c | 1 - win32ss/user/winsrv/consrv/frontends/gui/text.c | 52 ++++++++++++---------- win32ss/user/winsrv/consrv/history.c | 4 +- win32ss/user/winsrv/consrv/include/rect.h | 15 +++++-- win32ss/user/winsrv/consrv/lineinput.c | 12 ++--- win32ss/user/winsrv/consrv/popup.c | 24 ++++++---- win32ss/user/winsrv/consrv/popup.h | 17 ++++--- win32ss/user/winsrv/consrv/settings.c | 47 +++++++++---------- 11 files changed, 107 insertions(+), 86 deletions(-) diff --git a/win32ss/user/winsrv/consrv/conoutput.c b/win32ss/user/winsrv/consrv/conoutput.c index 1b0d4e2e4e..765216666e 100644 --- a/win32ss/user/winsrv/consrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/conoutput.c @@ -17,7 +17,7 @@ /* PUBLIC SERVER APIS *********************************************************/ /* - * FIXME: This function MUST be moved fro condrv/conoutput.c because only + * FIXME: This function MUST be moved from condrv/conoutput.c because only * consrv knows how to manipulate VDM screenbuffers. */ NTSTATUS NTAPI diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index 6e3603fa36..0d81e1d58b 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -1017,6 +1017,8 @@ OnPaint(PGUI_CONSOLE_DATA GuiData) PaintSelectionRect(GuiData, &ps); } + // TODO: Move cursor display here! + LeaveCriticalSection(&GuiData->Lock); } EndPaint(GuiData->hWindow, &ps); diff --git a/win32ss/user/winsrv/consrv/frontends/gui/graphics.c b/win32ss/user/winsrv/consrv/frontends/gui/graphics.c index 4b0662f9de..ab0bc69a28 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/graphics.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/graphics.c @@ -129,16 +129,19 @@ GuiPaintGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, PCONSRV_CONSOLE Console = Buffer->Header.Console; // ASSERT(Console == GuiData->Console); - SetRectEmpty(rcFramebuffer); + ConioInitLongRect(rcFramebuffer, 0, 0, 0, 0); - if (Buffer->BitMap == NULL) return; + if (Buffer->BitMap == NULL) + return; - if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) + return; - rcFramebuffer->left = Buffer->ViewOrigin.X * 1 + rcView->left; - rcFramebuffer->top = Buffer->ViewOrigin.Y * 1 + rcView->top; - rcFramebuffer->right = Buffer->ViewOrigin.X * 1 + rcView->right; - rcFramebuffer->bottom = Buffer->ViewOrigin.Y * 1 + rcView->bottom; + ConioInitLongRect(rcFramebuffer, + Buffer->ViewOrigin.Y * 1 + rcView->top, + Buffer->ViewOrigin.X * 1 + rcView->left, + Buffer->ViewOrigin.Y * 1 + rcView->bottom, + Buffer->ViewOrigin.X * 1 + rcView->right); /* Grab the mutex */ NtWaitForSingleObject(Buffer->Mutex, FALSE, NULL); diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c b/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c index 1ccee596be..912bc9d2f4 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c @@ -151,7 +151,6 @@ GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData, else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) { // PGRAPHICS_SCREEN_BUFFER Buffer = (PGRAPHICS_SCREEN_BUFFER)ActiveBuffer; - DPRINT1("GuiConsoleShowConsoleProperties - Graphics buffer\n"); // FIXME: Gather defaults from the registry ? pSharedInfo->ScreenAttributes = DEFAULT_SCREEN_ATTRIB; diff --git a/win32ss/user/winsrv/consrv/frontends/gui/text.c b/win32ss/user/winsrv/consrv/frontends/gui/text.c index 57009fd128..dc77e65801 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/text.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/text.c @@ -358,9 +358,7 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, PRECT rcFramebuffer) { PCONSRV_CONSOLE Console = Buffer->Header.Console; - // ASSERT(Console == GuiData->Console); - - ULONG TopLine, BottomLine, LeftChar, RightChar; + ULONG TopLine, BottomLine, LeftColumn, RightColumn; ULONG Line, Char, Start; PCHAR_INFO From; PWCHAR To; @@ -370,26 +368,33 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, HFONT OldFont, NewFont; BOOLEAN IsUnderline; - SetRectEmpty(rcFramebuffer); + // ASSERT(Console == GuiData->Console); + + ConioInitLongRect(rcFramebuffer, 0, 0, 0, 0); - if (Buffer->Buffer == NULL) return; + if (Buffer->Buffer == NULL) + return; + + if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) + return; - if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return; + ConioInitLongRect(rcFramebuffer, + Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->top, + Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->left, + Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->bottom, + Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->right); - rcFramebuffer->left = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->left; - rcFramebuffer->top = Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->top; - rcFramebuffer->right = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->right; - rcFramebuffer->bottom = Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->bottom; + LeftColumn = rcFramebuffer->left / GuiData->CharWidth; + RightColumn = rcFramebuffer->right / GuiData->CharWidth; + if (RightColumn >= (ULONG)Buffer->ScreenBufferSize.X) + RightColumn = Buffer->ScreenBufferSize.X - 1; - LeftChar = rcFramebuffer->left / GuiData->CharWidth; TopLine = rcFramebuffer->top / GuiData->CharHeight; - RightChar = rcFramebuffer->right / GuiData->CharWidth; BottomLine = rcFramebuffer->bottom / GuiData->CharHeight; + if (BottomLine >= (ULONG)Buffer->ScreenBufferSize.Y) + BottomLine = Buffer->ScreenBufferSize.Y - 1; - if (RightChar >= (ULONG)Buffer->ScreenBufferSize.X) RightChar = Buffer->ScreenBufferSize.X - 1; - if (BottomLine >= (ULONG)Buffer->ScreenBufferSize.Y) BottomLine = Buffer->ScreenBufferSize.Y - 1; - - LastAttribute = ConioCoordToPointer(Buffer, LeftChar, TopLine)->Attributes; + LastAttribute = ConioCoordToPointer(Buffer, LeftColumn, TopLine)->Attributes; SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(LastAttribute))); SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(LastAttribute))); @@ -403,11 +408,11 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, for (Line = TopLine; Line <= BottomLine; Line++) { WCHAR LineBuffer[80]; // Buffer containing a part or all the line to be displayed - From = ConioCoordToPointer(Buffer, LeftChar, Line); // Get the first code of the line - Start = LeftChar; + From = ConioCoordToPointer(Buffer, LeftColumn, Line); // Get the first code of the line + Start = LeftColumn; To = LineBuffer; - for (Char = LeftChar; Char <= RightChar; Char++) + for (Char = LeftColumn; Char <= RightColumn; Char++) { /* * We flush the buffer if the new attribute is different @@ -447,7 +452,7 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, Start * GuiData->CharWidth, Line * GuiData->CharHeight, LineBuffer, - RightChar - Start + 1); + RightColumn - Start + 1); } /* Restore the old font */ @@ -462,13 +467,14 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, { CursorX = Buffer->CursorPosition.X; CursorY = Buffer->CursorPosition.Y; - if (LeftChar <= CursorX && CursorX <= RightChar && - TopLine <= CursorY && CursorY <= BottomLine) + if (LeftColumn <= CursorX && CursorX <= RightColumn && + TopLine <= CursorY && CursorY <= BottomLine) { CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight); Attribute = ConioCoordToPointer(Buffer, Buffer->CursorPosition.X, Buffer->CursorPosition.Y)->Attributes; - if (Attribute == DEFAULT_SCREEN_ATTRIB) Attribute = Buffer->ScreenDefaultAttrib; + if (Attribute == DEFAULT_SCREEN_ATTRIB) + Attribute = Buffer->ScreenDefaultAttrib; CursorBrush = CreateSolidBrush(PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); OldBrush = SelectObject(GuiData->hMemDC, CursorBrush); diff --git a/win32ss/user/winsrv/consrv/history.c b/win32ss/user/winsrv/consrv/history.c index 2b82d832b2..6d2049f08b 100644 --- a/win32ss/user/winsrv/consrv/history.c +++ b/win32ss/user/winsrv/consrv/history.c @@ -271,7 +271,7 @@ PPOPUP_WINDOW HistoryDisplayCurrentHistory(PCONSRV_CONSOLE Console, PUNICODE_STRING ExeName) { - PTEXTMODE_SCREEN_BUFFER ActiveBuffer; + PCONSOLE_SCREEN_BUFFER ActiveBuffer; PPOPUP_WINDOW Popup; SHORT xLeft, yTop; @@ -283,7 +283,7 @@ HistoryDisplayCurrentHistory(PCONSRV_CONSOLE Console, if (Hist->NumEntries == 0) return NULL; if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) return NULL; - ActiveBuffer = (PTEXTMODE_SCREEN_BUFFER)Console->ActiveBuffer; + ActiveBuffer = Console->ActiveBuffer; Width = 40; Height = 10; diff --git a/win32ss/user/winsrv/consrv/include/rect.h b/win32ss/user/winsrv/consrv/include/rect.h index b331eeafdc..97859356ce 100644 --- a/win32ss/user/winsrv/consrv/include/rect.h +++ b/win32ss/user/winsrv/consrv/include/rect.h @@ -9,13 +9,22 @@ #pragma once +#define ConioInitLongRect(Rect, Top, Left, Bottom, Right) \ +do { \ + ((Rect)->top) = Top; \ + ((Rect)->left) = Left; \ + ((Rect)->bottom) = Bottom; \ + ((Rect)->right) = Right; \ +} while (0) + #define ConioInitRect(Rect, top, left, bottom, right) \ do { \ - ((Rect)->Top) = top; \ - ((Rect)->Left) = left; \ + ((Rect)->Top) = top; \ + ((Rect)->Left) = left; \ ((Rect)->Bottom) = bottom; \ - ((Rect)->Right) = right; \ + ((Rect)->Right) = right; \ } while (0) + #define ConioIsRectEmpty(Rect) \ (((Rect)->Left > (Rect)->Right) || ((Rect)->Top > (Rect)->Bottom)) diff --git a/win32ss/user/winsrv/consrv/lineinput.c b/win32ss/user/winsrv/consrv/lineinput.c index 43db724430..20d66c68e1 100644 --- a/win32ss/user/winsrv/consrv/lineinput.c +++ b/win32ss/user/winsrv/consrv/lineinput.c @@ -121,12 +121,12 @@ LineInputEdit(PCONSRV_CONSOLE Console, LineInputSetPos(Console, Pos + NumToInsert); } -#if 0 static VOID LineInputRecallHistory(PCONSRV_CONSOLE Console, PUNICODE_STRING ExeName, INT Offset) { +#if 0 PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console, ExeName); UINT Position = 0; @@ -140,13 +140,9 @@ LineInputRecallHistory(PCONSRV_CONSOLE Console, LineInputEdit(Console, Console->LineSize, Hist->Entries[Hist->Position].Length / sizeof(WCHAR), Hist->Entries[Hist->Position].Buffer); -} + #else -static VOID -LineInputRecallHistory(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName, - INT Offset) -{ + UNICODE_STRING Entry; if (!HistoryRecallHistory(Console, ExeName, Offset, &Entry)) return; @@ -155,8 +151,8 @@ LineInputRecallHistory(PCONSRV_CONSOLE Console, LineInputEdit(Console, Console->LineSize, Entry.Length / sizeof(WCHAR), Entry.Buffer); -} #endif +} // TESTS!! diff --git a/win32ss/user/winsrv/consrv/popup.c b/win32ss/user/winsrv/consrv/popup.c index 559e37fb5b..46d3af5726 100644 --- a/win32ss/user/winsrv/consrv/popup.c +++ b/win32ss/user/winsrv/consrv/popup.c @@ -181,17 +181,24 @@ DrawBox(PTEXTMODE_SCREEN_BUFFER Buffer, /* PUBLIC FUNCTIONS ***********************************************************/ PPOPUP_WINDOW -CreatePopupWindow(PCONSRV_CONSOLE Console, - PTEXTMODE_SCREEN_BUFFER Buffer, - SHORT xLeft, - SHORT yTop, - SHORT Width, - SHORT Height) +CreatePopupWindow( + IN PCONSRV_CONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER ScreenBuffer, + IN SHORT xLeft, + IN SHORT yTop, + IN SHORT Width, + IN SHORT Height) { + PTEXTMODE_SCREEN_BUFFER Buffer; PPOPUP_WINDOW Popup; SMALL_RECT Region; - ASSERT((PCONSOLE)Console == Buffer->Header.Console); + ASSERT((PCONSOLE)Console == ScreenBuffer->Header.Console); + + if (GetType(ScreenBuffer) != TEXTMODE_BUFFER) + return NULL; + + Buffer = (PTEXTMODE_SCREEN_BUFFER)ScreenBuffer; /* Create the popup window */ Popup = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(*Popup)); @@ -234,7 +241,8 @@ CreatePopupWindow(PCONSRV_CONSOLE Console, } VOID -DestroyPopupWindow(PPOPUP_WINDOW Popup) +DestroyPopupWindow( + IN PPOPUP_WINDOW Popup) { SMALL_RECT Region; diff --git a/win32ss/user/winsrv/consrv/popup.h b/win32ss/user/winsrv/consrv/popup.h index a103d15883..1e305f7302 100644 --- a/win32ss/user/winsrv/consrv/popup.h +++ b/win32ss/user/winsrv/consrv/popup.h @@ -27,11 +27,14 @@ typedef struct _POPUP_WINDOW PPOPUP_WINDOW -CreatePopupWindow(PCONSRV_CONSOLE Console, - PTEXTMODE_SCREEN_BUFFER Buffer, - SHORT xLeft, - SHORT yTop, - SHORT Width, - SHORT Height); +CreatePopupWindow( + IN PCONSRV_CONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER ScreenBuffer, + IN SHORT xLeft, + IN SHORT yTop, + IN SHORT Width, + IN SHORT Height); + VOID -DestroyPopupWindow(PPOPUP_WINDOW Popup); +DestroyPopupWindow( + IN PPOPUP_WINDOW Popup); diff --git a/win32ss/user/winsrv/consrv/settings.c b/win32ss/user/winsrv/consrv/settings.c index 83578bf85e..1cfd4d3797 100644 --- a/win32ss/user/winsrv/consrv/settings.c +++ b/win32ss/user/winsrv/consrv/settings.c @@ -66,11 +66,9 @@ ConSrvApplyUserSettings(IN PCONSOLE Console, if (GetType(ActiveBuffer) == TEXTMODE_BUFFER) { - PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)ActiveBuffer; - COORD BufSize; - /* Resize its active screen-buffer */ - BufSize = ConsoleInfo->ScreenBufferSize; + PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)ActiveBuffer; + COORD BufSize = ConsoleInfo->ScreenBufferSize; if (Console->FixedSize) { @@ -79,24 +77,24 @@ ConSrvApplyUserSettings(IN PCONSOLE Console, * at the moment. However, keep those settings somewhere so that * we can try to set them up when we will be allowed to do so. */ - if (ConsoleInfo->WindowSize.X != Buffer->OldViewSize.X || - ConsoleInfo->WindowSize.Y != Buffer->OldViewSize.Y) + if (ConsoleInfo->WindowSize.X != ActiveBuffer->OldViewSize.X || + ConsoleInfo->WindowSize.Y != ActiveBuffer->OldViewSize.Y) { - Buffer->OldViewSize = ConsoleInfo->WindowSize; + ActiveBuffer->OldViewSize = ConsoleInfo->WindowSize; } - /* Buffer size is not allowed to be smaller than the view size */ - if (BufSize.X >= Buffer->OldViewSize.X && BufSize.Y >= Buffer->OldViewSize.Y) + /* The buffer size is not allowed to be smaller than the view size */ + if (BufSize.X >= ActiveBuffer->OldViewSize.X && BufSize.Y >= ActiveBuffer->OldViewSize.Y) { - if (BufSize.X != Buffer->OldScreenBufferSize.X || - BufSize.Y != Buffer->OldScreenBufferSize.Y) + if (BufSize.X != ActiveBuffer->OldScreenBufferSize.X || + BufSize.Y != ActiveBuffer->OldScreenBufferSize.Y) { /* * The console is in fixed-size mode, so we cannot resize anything * at the moment. However, keep those settings somewhere so that * we can try to set them up when we will be allowed to do so. */ - Buffer->OldScreenBufferSize = BufSize; + ActiveBuffer->OldScreenBufferSize = BufSize; } } } @@ -105,16 +103,16 @@ ConSrvApplyUserSettings(IN PCONSOLE Console, BOOL SizeChanged = FALSE; /* Resize the console */ - if (ConsoleInfo->WindowSize.X != Buffer->ViewSize.X || - ConsoleInfo->WindowSize.Y != Buffer->ViewSize.Y) + if (ConsoleInfo->WindowSize.X != ActiveBuffer->ViewSize.X || + ConsoleInfo->WindowSize.Y != ActiveBuffer->ViewSize.Y) { - Buffer->ViewSize = ConsoleInfo->WindowSize; + ActiveBuffer->ViewSize = ConsoleInfo->WindowSize; SizeChanged = TRUE; } /* Resize the screen-buffer */ - if (BufSize.X != Buffer->ScreenBufferSize.X || - BufSize.Y != Buffer->ScreenBufferSize.Y) + if (BufSize.X != ActiveBuffer->ScreenBufferSize.X || + BufSize.Y != ActiveBuffer->ScreenBufferSize.Y) { if (NT_SUCCESS(ConioResizeBuffer(Console, Buffer, BufSize))) SizeChanged = TRUE; @@ -131,14 +129,11 @@ ConSrvApplyUserSettings(IN PCONSOLE Console, } else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) { - PGRAPHICS_SCREEN_BUFFER Buffer = (PGRAPHICS_SCREEN_BUFFER)ActiveBuffer; - /* * In any case we do NOT modify the size of the graphics screen-buffer. * We just allow resizing the view only if the new size is smaller * than the older one. */ - if (Console->FixedSize) { /* @@ -146,19 +141,19 @@ ConSrvApplyUserSettings(IN PCONSOLE Console, * at the moment. However, keep those settings somewhere so that * we can try to set them up when we will be allowed to do so. */ - if (ConsoleInfo->WindowSize.X <= Buffer->ViewSize.X || - ConsoleInfo->WindowSize.Y <= Buffer->ViewSize.Y) + if (ConsoleInfo->WindowSize.X <= ActiveBuffer->ViewSize.X || + ConsoleInfo->WindowSize.Y <= ActiveBuffer->ViewSize.Y) { - Buffer->OldViewSize = ConsoleInfo->WindowSize; + ActiveBuffer->OldViewSize = ConsoleInfo->WindowSize; } } else { /* Resize the view if its size is bigger than the specified size */ - if (ConsoleInfo->WindowSize.X <= Buffer->ViewSize.X || - ConsoleInfo->WindowSize.Y <= Buffer->ViewSize.Y) + if (ConsoleInfo->WindowSize.X <= ActiveBuffer->ViewSize.X || + ConsoleInfo->WindowSize.Y <= ActiveBuffer->ViewSize.Y) { - Buffer->ViewSize = ConsoleInfo->WindowSize; + ActiveBuffer->ViewSize = ConsoleInfo->WindowSize; // SizeChanged = TRUE; } }

5 years, 3 months

[reactos] 01/01: [KERNEL32_APITEST] Add SetComputerNameExW testcase (#1578)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8aeb6a920ac68474a5118… commit 8aeb6a920ac68474a5118b778e7162f53ab17d4e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat May 25 21:15:24 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat May 25 21:15:24 2019 +0900 [KERNEL32_APITEST] Add SetComputerNameExW testcase (#1578) Add testcase of kernel32!SetComputerNameExW function. ROSTESTS-227 --- modules/rostests/apitests/kernel32/CMakeLists.txt | 1 + .../apitests/kernel32/SetComputerNameExW.c | 113 +++++++++++++++++++++ modules/rostests/apitests/kernel32/testlist.c | 3 +- 3 files changed, 116 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 1b8c8314c86..da3ea911884 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -27,6 +27,7 @@ list(APPEND SOURCE Mailslot.c MultiByteToWideChar.c PrivMoveFileIdentityW.c + SetComputerNameExW.c SetConsoleWindowInfo.c SetCurrentDirectory.c SetUnhandledExceptionFilter.c diff --git a/modules/rostests/apitests/kernel32/SetComputerNameExW.c b/modules/rostests/apitests/kernel32/SetComputerNameExW.c new file mode 100644 index 00000000000..658e74e8a44 --- /dev/null +++ b/modules/rostests/apitests/kernel32/SetComputerNameExW.c @@ -0,0 +1,113 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the SetComputerNameExW API + * COPYRIGHT: Victor Martinez Calvo (victor.martinez(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <ndk/rtltypes.h> + +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 +#include <winreg.h> + +static HKEY OpenHostNameKey(void) +{ + static const WCHAR + RegHostNameKey[] = L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters"; + HKEY hKey = NULL; + LONG Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, RegHostNameKey, 0, KEY_ALL_ACCESS, &hKey); + if (!Error) + return hKey; + return NULL; +} + +static HKEY OpenComputerNameKey(void) +{ + static const WCHAR + RegComputerNameKey[] = L"System\\CurrentControlSet\\Control\\ComputerName\\ComputerName"; + HKEY hKey = NULL; + LONG Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, RegComputerNameKey, 0, KEY_ALL_ACCESS, &hKey); + if (!Error) + return hKey; + return NULL; +} + +START_TEST(SetComputerNameExW) +{ + LONG Error; + BOOL ret; + HKEY hKeyHN, hKeyCN; + DWORD cbData; + WCHAR szHostNameOld[MAX_PATH], szHostNameNew[MAX_PATH]; + WCHAR szComputerNameOld[MAX_PATH], szComputerNameNew[MAX_PATH]; + static const WCHAR szNewName[] = L"SRVROSTEST"; + + /* Open keys */ + hKeyHN = OpenHostNameKey(); + hKeyCN = OpenComputerNameKey(); + if (!hKeyHN || !hKeyCN) + { + if (hKeyHN) + RegCloseKey(hKeyHN); + if (hKeyCN) + RegCloseKey(hKeyCN); + skip("Unable to open keys (%p, %p).\n", hKeyHN, hKeyCN); + return; + } + + /* Get Old Hostname */ + szHostNameOld[0] = UNICODE_NULL; + cbData = sizeof(szHostNameOld); + Error = RegQueryValueExW(hKeyHN, L"Hostname", NULL, NULL, (LPBYTE)szHostNameOld, &cbData); + ok_long(Error, ERROR_SUCCESS); + ok(szHostNameOld[0], "szHostNameOld is %S", szHostNameOld); + + /* Get Old Computer Name */ + szComputerNameOld[0] = UNICODE_NULL; + cbData = sizeof(szComputerNameOld); + Error = RegQueryValueExW(hKeyCN, L"ComputerName", NULL, NULL, (LPBYTE)szComputerNameOld, &cbData); + ok_long(Error, ERROR_SUCCESS); + ok(szComputerNameOld[0], "szHostNameOld is %S", szComputerNameOld); + + /* Change the value */ + ret = SetComputerNameExW(ComputerNamePhysicalDnsHostname, szNewName); + ok_int(ret, TRUE); + + /* Get New Hostname */ + szHostNameNew[0] = UNICODE_NULL; + cbData = sizeof(szHostNameNew); + Error = RegQueryValueExW(hKeyHN, L"Hostname", NULL, NULL, (LPBYTE)szHostNameNew, &cbData); + ok_long(Error, ERROR_SUCCESS); + ok(szHostNameNew[0], "szHostNameNew was empty.\n"); + ok(lstrcmpW(szHostNameNew, szHostNameOld) == 0, + "szHostNameNew '%S' should be szHostNameOld '%S'.\n", szHostNameNew, szHostNameOld); + + /* Get New Computer Name */ + szComputerNameNew[0] = UNICODE_NULL; + cbData = sizeof(szComputerNameNew); + Error = RegQueryValueExW(hKeyCN, L"ComputerName", NULL, NULL, (LPBYTE)szComputerNameNew, &cbData); + ok_long(Error, ERROR_SUCCESS); + ok(szComputerNameNew[0], "szComputerNameNew was empty.\n"); + ok(lstrcmpW(szComputerNameNew, szNewName) == 0, + "szComputerNameNew '%S' should be szNewName '%S'.\n", szComputerNameNew, szNewName); + + /* Restore the registry values */ + cbData = (lstrlenW(szHostNameOld) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKeyHN, L"Hostname", 0, REG_SZ, (LPBYTE)szHostNameOld, cbData); + ok_long(Error, ERROR_SUCCESS); + + cbData = (lstrlenW(szComputerNameOld) + 1) * sizeof(WCHAR); + Error = RegSetValueExW(hKeyCN, L"ComputerName", 0, REG_SZ, (LPBYTE)szComputerNameOld, cbData); + ok_long(Error, ERROR_SUCCESS); + + /* Close keys */ + Error = RegCloseKey(hKeyHN); + ok_long(Error, ERROR_SUCCESS); + Error = RegCloseKey(hKeyCN); + ok_long(Error, ERROR_SUCCESS); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 1a15572f98e..19217012a9b 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -26,6 +26,7 @@ extern void func_lstrlen(void); extern void func_Mailslot(void); extern void func_MultiByteToWideChar(void); extern void func_PrivMoveFileIdentityW(void); +extern void func_SetComputerNameExW(void); extern void func_SetConsoleWindowInfo(void); extern void func_SetCurrentDirectory(void); extern void func_SetUnhandledExceptionFilter(void); @@ -59,6 +60,7 @@ const struct test winetest_testlist[] = { "MailslotRead", func_Mailslot }, { "MultiByteToWideChar", func_MultiByteToWideChar }, { "PrivMoveFileIdentityW", func_PrivMoveFileIdentityW }, + { "SetComputerNameExW", func_SetComputerNameExW }, { "SetConsoleWindowInfo", func_SetConsoleWindowInfo }, { "SetCurrentDirectory", func_SetCurrentDirectory }, { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter }, @@ -68,4 +70,3 @@ const struct test winetest_testlist[] = { "WideCharToMultiByte", func_WideCharToMultiByte }, { 0, 0 } }; -

5 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2019