Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 01/01: [KERNEL32] FatalAppExitW: Add an 'UNREFERENCED_LOCAL_VARIABLE(Status)' (#2883)
by Serge Gautherie 04 Jun '20

04 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81402039400d9ab349dbc… commit 81402039400d9ab349dbcddc06d52c7c908a23ab Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 4 22:35:54 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 4 23:35:54 2020 +0300 [KERNEL32] FatalAppExitW: Add an 'UNREFERENCED_LOCAL_VARIABLE(Status)' (#2883) Addendum to 21d2accad37825f47e3caa78ff36153751652238 (r71793). --- dll/win32/kernel32/client/proc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index b44624c381b..9b680eb5330 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -1609,6 +1609,8 @@ FatalAppExitW(IN UINT uAction, #if DBG /* Give the user a chance to abort */ if ((NT_SUCCESS(Status)) && (Response == ResponseCancel)) return; +#else + UNREFERENCED_LOCAL_VARIABLE(Status); #endif /* Otherwise kill the process */

1 0

[reactos] 01/01: [IPHLPAPI] getNumInterfacesInt(): Remove 'if()' redundant condition (#2884)
by Serge Gautherie 04 Jun '20

04 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=450425028cd82948dce67… commit 450425028cd82948dce67977416aef69ba5a1411 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 4 22:26:28 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 4 23:26:28 2020 +0300 [IPHLPAPI] getNumInterfacesInt(): Remove 'if()' redundant condition (#2884) No impact. Detected by Cppcheck: redundantCondition. Addendum to 1fe3a2d6c307a1ec11d7728a9493360a5808e1ac (r9788). --- dll/win32/iphlpapi/ifenum_reactos.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/ifenum_reactos.c b/dll/win32/iphlpapi/ifenum_reactos.c index 41958ea1361..77fe4cf73d3 100644 --- a/dll/win32/iphlpapi/ifenum_reactos.c +++ b/dll/win32/iphlpapi/ifenum_reactos.c @@ -246,8 +246,7 @@ static DWORD getNumInterfacesInt(BOOL onlyNonLoopback) for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && - (!onlyNonLoopback || - (onlyNonLoopback && !isLoopback( tcpFile, &entitySet[i] ))) ) + (!onlyNonLoopback || !isLoopback( tcpFile, &entitySet[i] )) ) numInterfaces++; }

1 0

[reactos] 01/01: [HALXBOX] Fix clock drift (#2889)
by Dmitry Borisov 02 Jun '20

02 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17c5fb8866b012ec4011c… commit 17c5fb8866b012ec4011c0acbf089d041c33cda5 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Jun 3 05:14:16 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 3 02:14:16 2020 +0300 [HALXBOX] Fix clock drift (#2889) Add a new rollover table for Original Xbox (base frequency is 1.125000 MHz). This fixes potential time issues in kernel and drivers. CORE-16216 --- hal/halx86/generic/clock.c | 32 ++++++++++++++++++++++++++++++++ hal/halx86/generic/timer.c | 28 ++++------------------------ hal/halx86/include/halp.h | 6 ++++++ hal/halx86/minihal/CMakeLists.txt | 1 + hal/halx86/pic.cmake | 1 + hal/halx86/xbox.cmake | 1 + hal/halx86/xbox/clock.c | 31 +++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+), 24 deletions(-) diff --git a/hal/halx86/generic/clock.c b/hal/halx86/generic/clock.c new file mode 100644 index 00000000000..e7b970a18c8 --- /dev/null +++ b/hal/halx86/generic/clock.c @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PIT rollover table + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> + +/* GLOBALS *******************************************************************/ + +HALP_ROLLOVER HalpRolloverTable[15] = +{ + {1197, 10032}, /* 1 ms */ + {2394, 20064}, + {3591, 30096}, + {4767, 39952}, + {5964, 49984}, + {7161, 60016}, + {8358, 70048}, + {9555, 80080}, + {10731, 89936}, + {11949, 100144}, + {13125, 110000}, + {14322, 120032}, + {15519, 130064}, + {16695, 139920}, + {17892, 149952} /* 15 ms */ +}; diff --git a/hal/halx86/generic/timer.c b/hal/halx86/generic/timer.c index 35606b96ece..c9fe80c16e2 100644 --- a/hal/halx86/generic/timer.c +++ b/hal/halx86/generic/timer.c @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include <hal.h> + #define NDEBUG #include <debug.h> @@ -21,6 +22,8 @@ #define PIT_LATCH 0x00 +extern HALP_ROLLOVER HalpRolloverTable[15]; + LARGE_INTEGER HalpLastPerfCounter; LARGE_INTEGER HalpPerfCounter; ULONG HalpPerfCounterCutoff; @@ -30,29 +33,6 @@ ULONG HalpCurrentRollOver; ULONG HalpNextMSRate = 14; ULONG HalpLargestClockMS = 15; -static struct _HALP_ROLLOVER -{ - ULONG RollOver; - ULONG Increment; -} HalpRolloverTable[15] = -{ - {1197, 10032}, - {2394, 20064}, - {3591, 30096}, - {4767, 39952}, - {5964, 49984}, - {7161, 60016}, - {8358, 70048}, - {9555, 80080}, - {10731, 89936}, - {11949, 100144}, - {13125, 110000}, - {14322, 120032}, - {15519, 130064}, - {16695, 139920}, - {17892, 149952} -}; - /* PRIVATE FUNCTIONS *********************************************************/ FORCEINLINE @@ -88,7 +68,7 @@ HalpSetTimerRollOver(USHORT RollOver) TimerControl.BcdMode = FALSE; /* - * Program the PIT to generate a normal rate wave (Mode 3) on channel 0. + * Program the PIT to generate a normal rate wave (Mode 2) on channel 0. * Channel 0 is used for the IRQ0 clock interval timer, and channel * 1 is used for DRAM refresh. * diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 52b275e40df..cb6f6e58809 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -223,6 +223,12 @@ INIT_FUNCTION VOID NTAPI HalpInitializeClock(VOID); VOID __cdecl HalpClockInterrupt(VOID); VOID __cdecl HalpProfileInterrupt(VOID); +typedef struct _HALP_ROLLOVER +{ + ULONG RollOver; + ULONG Increment; +} HALP_ROLLOVER, *PHALP_ROLLOVER; + VOID NTAPI HalpCalibrateStallExecution(VOID); diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index eb80a8ea0a1..84bdf8fee25 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND MINI_HAL_SOURCE ../legacy/bussupp.c ../generic/beep.c ../generic/bios.c + ../generic/clock.c ../generic/cmos.c ../generic/dma.c ../generic/display.c diff --git a/hal/halx86/pic.cmake b/hal/halx86/pic.cmake index 30737d20da9..40312d2273f 100644 --- a/hal/halx86/pic.cmake +++ b/hal/halx86/pic.cmake @@ -5,6 +5,7 @@ list(APPEND HAL_PIC_ASM_SOURCE up/pic.S) list(APPEND HAL_PIC_SOURCE + generic/clock.c generic/profil.c generic/timer.c up/halinit_up.c diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index 4d16aaa4834..98f1d1d3d8a 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -31,6 +31,7 @@ list(APPEND HAL_XBOX_SOURCE legacy/halpcat.c generic/profil.c generic/timer.c + xbox/clock.c xbox/part_xbox.c xbox/halinit_xbox.c xbox/reboot.c diff --git a/hal/halx86/xbox/clock.c b/hal/halx86/xbox/clock.c new file mode 100644 index 00000000000..f8ebb97b121 --- /dev/null +++ b/hal/halx86/xbox/clock.c @@ -0,0 +1,31 @@ +/* + * PROJECT: Xbox HAL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PIT rollover table + * COPYRIGHT: Copyright 2020 Dmitry Borisov (di.sean(a)protonmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <hal.h> + +/* GLOBALS *******************************************************************/ + +HALP_ROLLOVER HalpRolloverTable[15] = +{ + {1125, 10000}, /* 1 ms */ + {2250, 20000}, + {3375, 30000}, + {4500, 40000}, + {5625, 50000}, + {6750, 60000}, + {7875, 70000}, + {9000, 80000}, + {10125, 90000}, + {11250, 100000}, + {12375, 110000}, + {13500, 120000}, + {14625, 130000}, + {15750, 140000}, + {16875, 150000} /* 15 ms */ +};

1 0

[reactos] 01/01: [FREELDR] Fix register offset
by Stanislav Motylkov 02 Jun '20

02 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=092bc78a4231602f4dfde… commit 092bc78a4231602f4dfdeb760c92109ba2b2c20b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jun 3 02:04:07 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jun 3 02:04:07 2020 +0300 [FREELDR] Fix register offset Addendum to 10e52f6. --- boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c index 29e1382be18..57a88ecf4a8 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c @@ -61,7 +61,7 @@ XboxMemInit(VOID) PVOID MembaseLow = (PVOID)0; WRITE_REGISTER_ULONG((PULONG)NV2A_FB_CFG0, 0x03070103); - WRITE_REGISTER_ULONG((PULONG)NV2A_FB_CFG0 + 4, 0x11448000); + WRITE_REGISTER_ULONG((PULONG)(NV2A_FB_CFG0 + 4), 0x11448000); /* Prep hardware for 128 Mb */ WRITE_PORT_ULONG((PULONG)0xCF8, CONFIG_CMD(0, 0, 0x84));

1 0

[reactos] 01/01: [TRANSLATION] Add/update Portuguese translation (#2850)
by Jose Carlos Jesus 01 Jun '20

01 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dad100ea4773f51a73a6… commit 3dad100ea4773f51a73a683d2b9270f56690b60a Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Mon Jun 1 19:48:58 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 1 20:48:58 2020 +0200 [TRANSLATION] Add/update Portuguese translation (#2850) - Add translation for: iernonce, modmui. - Update translation for: jscript, msports, shell32. --- dll/win32/iernonce/iernonce.rc | 3 + dll/win32/iernonce/lang/pt-PT.rc | 27 ++ dll/win32/jscript/lang/jscript_Pt.rc | 58 ++-- dll/win32/modemui/lang/pt-PT.rc | 613 +++++++++++++++++++++++++++++++++++ dll/win32/modemui/modemui.rc | 3 + dll/win32/msports/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- 7 files changed, 677 insertions(+), 31 deletions(-) diff --git a/dll/win32/iernonce/iernonce.rc b/dll/win32/iernonce/iernonce.rc index 0dbd2385280..afd6357e5da 100644 --- a/dll/win32/iernonce/iernonce.rc +++ b/dll/win32/iernonce/iernonce.rc @@ -26,6 +26,9 @@ IDI_ICON ICON "res/setup.ico" #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/iernonce/lang/pt-PT.rc b/dll/win32/iernonce/lang/pt-PT.rc new file mode 100644 index 00000000000..c0073b22470 --- /dev/null +++ b/dll/win32/iernonce/lang/pt-PT.rc @@ -0,0 +1,27 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INVALIDFORMAT "O formato da entrada %1 RunEx ou RunOnceEx era inválido. Uma barra vertical ('|') é necessária após o nome da função e a função precisa suportar os parâmetros WinMain ()." + IDS_LOADERROR "Ocorreu um erro ao carregar %1. O arquivo pode não ter sido instalado ou está corrompido." + IDS_CALLERROR "Ocorreu um erro ou excepção ao chamar a função %1 em %2." + IDS_INCORRECTFORMAT "O formato do seguinte comando RunEx ou RunOnceEx está incorrecto: %1. O comando de execução do shell deve começar com ||." + IDS_NOEXPORT "Não foi possível chamar a função% 1 no arquivo% 2 porque essa função não existe ou não foi exportada." + IDS_EXECUTEERROR "Ocorreu um erro ou excepção ao executar %1." + IDS_NOFUNCTION "Não foi possível encontrar a função %1 no arquivo %2." + IDS_NODEPENDENCY "Não foi possível carregar o arquivo de dependência %1." + IDS_SETUPERROR "Ocorreu um erro ao configurar %1. Este erro foi registado, a instalação continuará" + IDS_INCOMPLETE "A instalação anterior de um aplicativo não foi concluída. \n \nInicie sessão com uma conta de administrador para concluir a instalação." + IDS_SETUP "Configuração do ReactOS" + IDS_SERVICEERROR "Alguns serviços não puderam ser iniciados. A instalação precisa reiniciar o sistema para iniciar os serviços." +END + +IDD_DIALOG DIALOGEX 0, 0, 206, 166 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Configuração do ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "O ReactOS está a configurar os seguintes itens:", -1, 36, 13, 163, 11 + LISTBOX IDC_LB_ITEMS, 36, 32, 163, 127, LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_VSCROLL | WS_TABSTOP + ICON IDI_ICON, -1, 7, 7, 20, 20 +END diff --git a/dll/win32/jscript/lang/jscript_Pt.rc b/dll/win32/jscript/lang/jscript_Pt.rc index 38293294e2c..26ce7ff9834 100644 --- a/dll/win32/jscript/lang/jscript_Pt.rc +++ b/dll/win32/jscript/lang/jscript_Pt.rc @@ -75,48 +75,48 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { IDS_TO_PRIMITIVE "Erro ao converter objecto em tipo primitivo" - IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválida" - IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript out of range" - IDS_OBJECT_REQUIRED "Object required" + IDS_INVALID_CALL_ARG "Argumento ou chamada de procedimento inválido" + IDS_SUBSCRIPT_OUT_OF_RANGE "Inscrito fora do intervalo" + IDS_OBJECT_REQUIRED "Objecto necessário" IDS_CREATE_OBJ_ERROR "O servidor de automação não conseguiu criar o objecto" IDS_NO_PROPERTY "O objecto não suporta esta propriedade ou método" - IDS_UNSUPPORTED_ACTION "Object doesn't support this action" + IDS_UNSUPPORTED_ACTION "O objecto não suporta esta acção" IDS_ARG_NOT_OPT "Argumento não opcional" IDS_SYNTAX_ERROR "Erro de sintaxe" IDS_SEMICOLON "';' esperado" IDS_LBRACKET "'(' esperado" IDS_RBRACKET "')' esperado" - IDS_EXPECTED_IDENTIFIER "Expected identifier" - IDS_EXPECTED_ASSIGN "Expected '='" - IDS_INVALID_CHAR "Invalid character" - IDS_UNTERMINATED_STR "Constante de string não terminada" - IDS_MISPLACED_RETURN "'return' statement outside of function" - IDS_INVALID_BREAK "Can't have 'break' outside of loop" - IDS_INVALID_CONTINUE "Can't have 'continue' outside of loop" - IDS_LABEL_REDEFINED "Label redefined" - IDS_LABEL_NOT_FOUND "Label not found" - IDS_EXPECTED_CCEND "Expected '@end'" - IDS_DISABLED_CC "Conditional compilation is turned off" - IDS_EXPECTED_AT "Expected '@'" - IDS_NOT_FUNC "Função esperada" - IDS_NOT_DATE "'[object]' não é um objecto de data" + IDS_EXPECTED_IDENTIFIER "Identificador esperado" + IDS_EXPECTED_ASSIGN "Esperado '='" + IDS_INVALID_CHAR "Caractere inválido" + IDS_UNTERMINATED_STR "Constante de sequência não terminada" + IDS_MISPLACED_RETURN "instrucção 'return' fora da função" + IDS_INVALID_BREAK "Não é possível 'quebrar' fora do loop" + IDS_INVALID_CONTINUE "Não é possível 'continuar' fora do loop" + IDS_LABEL_REDEFINED "Etiqueta redefinida" + IDS_LABEL_NOT_FOUND "Rótulo não encontrado" + IDS_EXPECTED_CCEND "Esperado '@end'" + IDS_DISABLED_CC "Compilação condicional desactivada" + IDS_EXPECTED_AT "Esperado '@'" + IDS_NOT_FUNC " Função esperada" + IDS_NOT_DATE "'[objecto]' não é um objecto de dados" IDS_NOT_NUM "Número esperado" IDS_OBJECT_EXPECTED "Objecto esperado" IDS_ILLEGAL_ASSIGN "Atribuição ilegal" IDS_UNDEFINED "'|' é indefinido" IDS_NOT_BOOL "Objecto boleano esperado" - IDS_INVALID_DELETE "Cannot delete '|'" - IDS_NOT_VBARRAY "VBArray object expected" + IDS_INVALID_DELETE "Não é possível excluir '|'" + IDS_NOT_VBARRAY "Objecto VBArray esperado" IDS_JSCRIPT_EXPECTED "Objecto JScript esperado" IDS_REGEXP_SYNTAX_ERROR "Erro de sintaxe na expressão regular" - IDS_URI_INVALID_CODING "URI to be decoded is incorrect" - IDS_URI_INVALID_CHAR "URI a ser codificado contém caracteres inválidos" - IDS_FRACTION_DIGITS_OUT_OF_RANGE "Number of fraction digits is out of range" - IDS_PRECISION_OUT_OF_RANGE "Precision is out of range" - IDS_INVALID_LENGTH "Tamanho do vector tem de ser um inteiro finito positivo" + IDS_URI_INVALID_CODING "O URI a ser decodificado está incorrecto" + IDS_URI_INVALID_CHAR "O URI a ser codificado contém caracteres inválidos" + IDS_FRACTION_DIGITS_OUT_OF_RANGE "O número de dígitos da fracção está fora do intervalo" + IDS_PRECISION_OUT_OF_RANGE "A precisão está fora do alcance" + IDS_INVALID_LENGTH "Tamanho do vector deverá ser um número inteiro positivo" IDS_ARRAY_EXPECTED "Objecto Array esperado" - IDS_INVALID_WRITABLE_PROP_DESC "'writable' attribute on the property descriptor cannot be set to 'true' on this object" - IDS_NONCONFIGURABLE_REDEFINED "Cannot redefine non-configurable property '|'" - IDS_NONWRITABLE_MODIFIED "Cannot modify non-writable property '|'" - IDS_PROP_DESC_MISMATCH "Property cannot have both accessors and a value" + IDS_INVALID_WRITABLE_PROP_DESC "O atributo 'gravável' no descritor de propriedades não pode ser definido como 'true' neste objecto" + IDS_NONCONFIGURABLE_REDEFINED "Não é possível redefinir a propriedade não configurável '|'" + IDS_NONWRITABLE_MODIFIED "Não é possível modificar a propriedade não gravável '|'" + IDS_PROP_DESC_MISMATCH "A propriedade não pode ter acessadores e um valor" } diff --git a/dll/win32/modemui/lang/pt-PT.rc b/dll/win32/modemui/lang/pt-PT.rc new file mode 100644 index 00000000000..6a2b511fe34 --- /dev/null +++ b/dll/win32/modemui/lang/pt-PT.rc @@ -0,0 +1,613 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDM_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Duplicar...", 0 + MENUITEM "R&emover", 1 + MENUITEM "&Ver registo", 2 + MENUITEM SEPARATOR + MENUITEM "P&ropriedades", 3 + MENUITEM "C&opiar propriedades", 4 + MENUITEM "A&plicar propriedades", 5 + END +END + +IDD_ADVANCED DIALOGEX 17, 12, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Avançado" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Definições extra", 1018, 6, 6, 225, 70 + LTEXT "Comandos de inicialização extra:", 1011, 16, 20, 143, 8 + EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL + LTEXT "&Aguarde o tom do cartão de crédito:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP + CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 + LTEXT "segundos", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "&Seleccionar País/Região", 1012, 6, 80, 225, 75 + COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + PUSHBUTTON "&Definição da porta avançadas...", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "Alterar definições predefinidas...", 3, 107, 188, 125, 14 +END + +IDD_GENERAL DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Porta:", 1018, 9, 8, 32, 10 + LTEXT "Porta Com", 1095, 48, 8, 181, 10 + GROUPBOX "&Volume do altifalante", 1029, 10, 21, 218, 48 + CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 + RTEXT "Desligado", 1045, 56, 40, 22, 8 + LTEXT "Alta", 1001, 155, 40, 25, 11 + GROUPBOX "Velocidade máxima da porta", 1031, 10, 78, 218, 46 + COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Controle de discagem", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "Aguarde o tom de &discagem antes de discar", 1003, 27, 157, 174, 10 +END + +IDD_DISTINCTIVE_RING DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Toque Distintivo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 145 + AUTOCHECKBOX "Esta linha telefónica possui serviços de &toque diferenciado", 1069, 20, 7, 184, 10 + CTEXT "Toque padrão", -1, 84, 21, 70, 8 + CTEXT "Tipo de chamada", -1, 159, 21, 63, 8 + LTEXT "&Endereço primário:", 1070, 20, 41, 62, 8 + COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Endereço &1:", 1071, 20, 59, 62, 8 + COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Endereço &2:", 1072, 20, 77, 62, 8 + COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Endereço &3:", 1076, 20, 95, 62, 8 + COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Numeros prioritários:", 1078, 20, 112, 62, 8 + COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Retribuir:", 1080, 20, 131, 62, 8 + COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DISTINCTIVE_RING_2 DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Toque Distintivo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 87 + AUTOCHECKBOX "&Esta linha telefónica possui serviços de &toque diferenciado", 1069, 19, 7, 177, 10 + CTEXT "Toque padrão", -1, 20, 21, 74, 8 + CTEXT "Tipo de chamada", -1, 96, 21, 65, 8 + LTEXT "Toque único:", 1088, 20, 37, 53, 8 + COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Toque duplo:", 1089, 20, 57, 53, 8 + COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Toque triplo:", 1090, 20, 76, 53, 8 + COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DIAGNOSTICS DIALOGEX 0, 0, 238, 215 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Diagnóstico" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 + CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 + PUSHBUTTON "&Consultar modem", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "Gravar e registar", 1020, 18, 187, 98, 10 + PUSHBUTTON "&Ver registo", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Informações do modem", 1047, 10, 6, 217, 164 + GROUPBOX "Início de sessão", -1, 10, 173, 217, 32 +END + +IDD_PLEASE_WAIT DIALOGEX 0, 0, 195, 72 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Por favor aguarde..." +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Comunicação com o modem. Isso pode demorar alguns segundos.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "Cancelar", 2, 72, 52, 50, 14 +END + +IDD_GENERAL_2 DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Discagem (&manual) assistida pelo operador", 1002, 19, 22, 150, 10 + AUTOCHECKBOX "&Desligar uma chamada se estiver ociosa por mais de", 1042, 19, 38, 143, 10 + EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "&Cancelar a chamada se não obtiver ligação em", -1, 19, 56, 147, 10 + EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + RTEXT "&Velocidade da porta:", 1034, 16, 102, 93, 8 + COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Protocolo de dados:", 1032, 16, 122, 93, 8 + COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Comp&ressão:", 1035, 16, 139, 93, 8 + COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Controle de fluxo:", 1027, 16, 157, 93, 8 + COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Preferências de chamada", 1060, 11, 7, 217, 66 + LTEXT "mins", 1044, 195, 38, 22, 8 + LTEXT "secs", 1041, 194, 56, 22, 8 + GROUPBOX "Preferências de ligação de dados", -1, 11, 82, 217, 94 +END + +IDD_ADVANCED_2 DIALOGEX 17, 12, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Avançadas" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Bring up terminal window &before dialing", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "Bring up terminal window a&fter dialing", 1001, 20, 38, 200, 10 + RTEXT "&Data bits:", 1024, 18, 79, 93, 8 + COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Paridade:", 1026, 18, 97, 93, 8 + COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Bits de paragem:", 1029, 18, 115, 93, 8 + COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Modulação:", 1045, 18, 133, 93, 8 + COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Terminal", 1004, 10, 7, 217, 49 + GROUPBOX "Definições de Hardware", 1005, 10, 64, 217, 89 +END + +IDD_ISDN DIALOGEX 0, 0, 238, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tipo de comutação", -1, 11, 6, 217, 39 + COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "&Primeiro número", -1, 11, 50, 217, 50 + EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 + EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "&Segundo número", -1, 11, 105, 217, 49 + EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 + EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_PLEASE_WAIT_2 DIALOGEX 0, 0, 195, 72 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Por favor aguarde" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "A enviar informações de país / região para o modem.", -1, 42, 7, 146, 28 +END + +IDD_WARNING DIALOGEX 0, 0, 360, 105 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Warning" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Não mostrar esta mensagem novamente", 1109, 17, 73, 118, 10 + DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14 + LTEXT "Alguns modems não tratam adequadamente as sequências de inicialização desse tamanho.", -1, 50, 27, 304, 8 + LTEXT "Informações sobre essa limitação podem ser obtidas com o fabricante do modem.", -1, 50, 41, 304, 8 + ICON 5100, -1, 15, 14, 20, 20 + LTEXT "Inseriu uma seqüência de inicialização do modem com mais de 57 caracteres.", -1, 50, 14, 304, 8 +END + +IDD_MODEMS DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Modems" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, 1057, 6, 7, 20, 20 + LTEXT "Os seguintes &modems estão instalados:", -1, 44, 12, 203, 9 + CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dicionar...", 110, 56, 198, 60, 14 + PUSHBUTTON "&Remover", 112, 121, 198, 60, 14 + PUSHBUTTON "&Propriedades", 109, 185, 198, 60, 14 +END + +IDD_PLEASE_WAIT_3 DIALOGEX 0, 0, 195, 72 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Por favor aguarde..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Parar", 2, 74, 53, 50, 14 + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Remover", -1, 40, 8, 151, 8 + LTEXT "Modem", 1005, 40, 16, 151, 25 +END + +STRINGTABLE +BEGIN + 180 "Porta série RS-232" + 181 "Modem exterior" + 182 "Modem interior" + 183 "Modem PCMCIA" + 184 "Modem paralelo" + 185 "Porta Paralela" + 200 "110" + 201 "1200" + 202 "2400" + 203 "4800" + 204 "9600" + 206 "19200" + 207 "38400" + 210 "115200" + 211 "57600" + 216 "300" + 220 "230400" + 221 "460800" + 222 "921600" + 240 "4" + 241 "5" + 242 "6" + 243 "7" + 244 "8" + 250 "Par" + 251 "Ìmpar" + 252 "Nenhum" + 253 "Marca" + 254 "Espaço" + 255 "1" + 256 "1.5" + 257 "2" + 260 "Xon / Xoff" + 261 "Hardware" + 262 "Nenhum" + 263 "On" + 264 "Low" + 265 "V.23 (Minitel)" + 266 "Standard" + 267 "Non-standard (Bell, HST)" + 270 "Adicionar ao &registo" + 300 "Não especificado" + 301 "Dados" + 302 "Fax" + 303 "Voz" + 304 "Nenhum" + 320 "Configuração de país/região actualizada" + 340 "Modem" + 341 "Definições do Modem" + 342 "Endereço do Modem" + 400 "Configuração de país/região não actualizada" + 401 "Alguns modems não aceitam comandos de inicialização do utilizador com mais de 57 caracteres. \n \nInformações sobre essa limitação podem ser obtidas no fabricante do modem" + 402 "Aviso" + 460 "Não há memória suficiente para exibir a caixa de diálogo Geral. \nFeche alguns arquivos ou programas e tente novamente." + 461 "Não há memória suficiente para exibir a caixa de diálogo Configurações do modem. \nFeche alguns arquivos ou programas e tente novamente." + 463 "Cada endereço de chamada deve ser definido como 'Automático' ou com um padrão de toque exclusivo. \n \nAltere o padrão de toque duplicado, para outro." + 465 "Standard EC" + 466 "Forced EC" + 467 "Cellular" + 468 "Disabled" + 469 "Enabled" + 470 "Disabled" + 480 "AUTO (1 Ch.)" + 481 "AUTO (2 Ch.)" + 482 "PPP (56K)" + 483 "PPP (64K)" + 484 "PPP (112K)" + 485 "PPP (112K,PAP)" + 486 "PPP (112K,CHAP)" + 487 "PPP (112K,MSCHAP)" + 488 "PPP (128K)" + 489 "PPP (128K,PAP)" + 490 "PPP (128K,CHAP)" + 491 "PPP (128K,MSCHAP)" + 500 "V.120 (64K)" + 501 "V.120 (56K)" + 502 "V.120 (112K)" + 503 "V.120 (128K)" + 504 "X.75 (64K)" + 505 "X.75 (128K)" + 506 "X.75 (T.70)" + 507 "X.75 (BTX)" + 508 "V.110 (1.2K)" + 509 "V.110 (2.4K)" + 510 "V.110 (4.8K)" + 511 "V.110 (9.6K)" + 512 "V.110 (12.0K)" + 513 "V.110 (14.4K)" + 514 "V.110 (19.2K)" + 515 "V.110 (28.8K)" + 516 "V.110 (38.4K)" + 517 "V.110 (57.6K)" + 518 "Analog (V.34/V.90)" + 550 "ESS5 (AT&T) (North America)" + 551 "AT&T Point to Multipoint" + 552 "National ISDN 1 (NI-1)" + 553 "Northern Telecom DMS 100 (NT1)" + 554 "NTT INS64 (Japan)" + 555 "European ISDN (DSS1)" + 556 "German National (1TR6) (rarely used)" + 557 "French National (VN3) (rarely used)" + 558 "Belgium National (rarely used)" + 559 "Australian National (rarely used)" + 560 "Unknown switch" + 570 "The ISDN Configuration for this modem\nis not complete.\n\nPlease fill out the information in the\nISDN Tab before using this modem." + 600 "PPP (56K,GSM)" + 601 "PPP (64K,GSM)" + 602 "V.120 (64K,GSM)" + 604 "V.110 (1.2K,GSM)" + 605 "V.110 (2.4K,GSM)" + 606 "V.110 (4.8K,GSM)" + 607 "V.110 (9.6K,GSM)" + 608 "V.110 (12.0K,GSM)" + 609 "V.110 (14.4K,GSM)" + 610 "V.110 (19.2K,GSM)" + 611 "V.110 (28.8K,GSM)" + 612 "V.110 (38.4K,GSM)" + 613 "V.110 (57.6K,GSM)" + 614 "Analog RLP" + 615 "Analog NRLP" + 616 "GPRS" + 617 "PIAFS - incoming" + 618 "PIAFS - outgoing" + 700 "Utilizar o actual TAPI" + 2006 "Anexado a" + 2007 "Não presente" + 2008 "Não funcional" + 2009 "Precisa de reiniciar" + 2010 "#Para concluir a configuração do modem, deve reiniciar o computador.\n\nDeseja reiniciar o computador agora?" + 2011 "Modem não instalado correctamente" + 2012 "Porta desconhecida" + 3000 "Configuração do modem" + 3018 "Modems" + 3019 "Instala um novo modem e altera as propriedades do modem." + 3053 "As propriedades do modem não podem ser exibidas porque o modem não está disponível.\n\nReinicie o sistema e tente novamente." + 3054 "Propriedades para modems" + 3060 "Tem certeza que deseja remover o(s) modem(s) selecionado(s) do seu sistema?" + 3061 "O ReactOS não conseguiu remover o modem '%1' de %2." + 3062 "Modem" + 3069 "Não há memória suficiente para abrir o painel de controle do modem.\n\nFeche alguns programas e tente novamente." + 3073 "Deve ser um administrador do sistema para instalar um modem." + 3074 "Nenhum modem está instalado. Deve ser um administrador do sistema para instalar um modem." + 3076 "Deve desligar e reiniciar o computador para que as novas configurações entrem em vigor.\n\n Deseja reiniciar o computador agora?" + 3077 "Alteração das configurações de rede" + 3200 "300 Baud" + 3201 "1200 Baud" + 3202 "2400 Baud" + 3203 "9600 Baud" + 3204 "19.2K Baud" + 3205 "38.4K Baud" + 3206 "57.6K Baud" + 3207 "No response" + 3212 "Command" + 3213 "Response" + 3214 "A porta onde o modem está ligado não pode ser aberta. Isso pode ser o resultado de um conflito de hardware. Verifique o gerenciador de dispositivos para verificar se todos os dispositivos estão a funcionar." + 3215 "A porta que o modem pretende usar, está actualmente aberta por outro aplicativo. Encerre qualquer aplicativo que esteja a utilizar esta porta actualmente." + 3218 "OpenComm" + 3221 "115K Baud" + 3222 "A actualizar" + 3223 "Erro" + 3233 "Sucesso" + 3236 "O modem falhou ao responder. Verifique se está ligado correctamente. Se for um modem interno, verifique se a interrupção da porta está definida correctamente." + 3237 "COMANDO NÃO SUPORTADO" + 3238 "Campo" + 3239 "Valor" + 3240 " Preferências padrão" + 3241 " Preferências da ligação" + 6144 "Japan" + 6145 "Albania" + 6146 "Algeria" + 6147 "American Samoa" + 6148 "Germany (Country/region code 04)" + 6149 "Anguilla" + 6150 "Antigua and Barbuda" + 6151 "Argentina" + 6152 "Ascension Island" + 6153 "Australia" + 6154 "Austria" + 6155 "Bahamas" + 6156 "Bahrain" + 6157 "Bangladesh" + 6158 "Barbados" + 6159 "Belgium" + 6160 "Belize" + 6161 "Benin" + 6162 "Bermuda" + 6163 "Bhutan" + 6164 "Bolivia" + 6165 "Botswana" + 6166 "Brazil" + 6167 "Country/region code (23)" + 6168 "British Indian Ocean Territory" + 6169 "British Virgin Islands" + 6170 "Brunei" + 6171 "Bulgaria" + 6172 "Myanmar" + 6173 "Burundi" + 6174 "Belarus" + 6175 "Cameroon" + 6176 "Canada" + 6177 "Cape Verde" + 6178 "Cayman Islands" + 6179 "Central African Republic" + 6180 "Chad" + 6181 "Chile" + 6182 "China" + 6183 "Colombia" + 6184 "Comoros" + 6185 "Congo" + 6186 "Cook Islands" + 6187 "Costa Rica" + 6188 "Cuba" + 6189 "Cyprus" + 6190 "Czech Republic" + 6191 "Cambodia" + 6192 "North Korea" + 6193 "Denmark" + 6194 "Djibouti" + 6195 "Dominican Republic" + 6196 "Dominica" + 6197 "Ecuador" + 6198 "Egypt" + 6199 "El Salvador" + 6200 "Equatorial Guinea" + 6201 "Ethiopia" + 6202 "Falkland Islands (Islas Malvinas)" + 6203 "Fiji Islands" + 6204 "Finland" + 6205 "France" + 6206 "French Polynesia" + 6207 "Country/region code (63)" + 6208 "Gabon" + 6209 "Gambia" + 6210 "Germany (Country/region code 66)" + 6211 "Angola" + 6212 "Ghana" + 6213 "Gibraltar" + 6214 "Greece" + 6215 "Grenada" + 6216 "Guam" + 6217 "Guatemala" + 6218 "Guernsey" + 6219 "Guinea" + 6220 "Guinea-Bissau" + 6221 "Guyana" + 6222 "Haiti" + 6223 "Honduras" + 6224 "Hong Kong SAR" + 6225 "Hungary" + 6226 "Iceland" + 6227 "India" + 6228 "Indonesia" + 6229 "Iran" + 6230 "Iraq" + 6231 "Ireland" + 6232 "Israel" + 6233 "Italy" + 6234 "Cote d'Ivoire" + 6235 "Jamaica" + 6236 "Afghanistan" + 6237 "Jersey" + 6238 "Jordan" + 6239 "Kenya" + 6240 "Kiribati" + 6241 "Korea" + 6242 "Kuwait" + 6243 "Laos" + 6244 "Lebanon" + 6245 "Lesotho" + 6246 "Liberia" + 6247 "Libya" + 6248 "Liechtenstein" + 6249 "Luxembourg" + 6250 "Macau SAR" + 6251 "Madagascar" + 6252 "Malaysia" + 6253 "Malawi" + 6254 "Maldives" + 6255 "Mali" + 6256 "Malta" + 6257 "Mauritania" + 6258 "Mauritius" + 6259 "Mexico" + 6260 "Monaco" + 6261 "Mongolia" + 6262 "Montserrat" + 6263 "Morocco" + 6264 "Mozambique" + 6265 "Nauru" + 6266 "Nepal" + 6267 "Netherlands" + 6268 "Netherlands Antilles" + 6269 "New Caledonia" + 6270 "New Zealand" + 6271 "Nicaragua" + 6272 "Niger" + 6273 "Nigeria" + 6274 "Norway" + 6275 "Oman" + 6276 "Pakistan" + 6277 "Panama" + 6278 "Papua New Guinea" + 6279 "Paraguay" + 6280 "Peru" + 6281 "Philippines" + 6282 "Poland" + 6283 "Portugal" + 6284 "Puerto Rico" + 6285 "Qatar" + 6286 "Romania" + 6287 "Rwanda" + 6288 "St. Kitts and Nevis" + 6289 "Country/region code (145)" + 6290 "St. Helena" + 6291 "St. Lucia" + 6292 "San Marino" + 6293 "Country/region code (148)" + 6294 "Sao Tome and Principe" + 6295 "St. Vincent and the Grenadines" + 6296 "Saudi Arabia" + 6297 "Senegal" + 6298 "Seychelles" + 6299 "Sierra Leone" + 6300 "Singapore" + 6301 "Solomon Islands" + 6302 "Somalia" + 6303 "South Africa" + 6304 "Spain" + 6305 "Sri Lanka" + 6306 "Sudan" + 6307 "Suriname" + 6308 "Swaziland" + 6309 "Sweden" + 6310 "Switzerland" + 6311 "Syria" + 6312 "Tanzania" + 6313 "Thailand" + 6314 "Togo" + 6315 "Tonga" + 6316 "Trinidad and Tobago" + 6317 "Tunisia" + 6318 "Turkey" + 6319 "Turks and Caicos Islands" + 6320 "Tuvalu" + 6321 "Uganda" + 6322 "Ukraine" + 6323 "United Arab Emirates" + 6324 "United Kingdom" + 6325 "United States" + 6326 "Burkina Faso" + 6327 "Uruguay" + 6328 "Country/region code (184)" + 6329 "Vanuatu" + 6330 "Vatican City" + 6331 "Venezuela" + 6332 "Vietnam" + 6333 "Wallis and Futuna" + 6334 "Samoa" + 6335 "Yemen" + 6336 "Yemen" + 6337 "Country/region code (193)" + 6338 "Congo (DRC)" + 6339 "Zambia" + 6340 "Zimbabwe" + 6501 "Moldova" + 6502 "Estonia" + 6503 "Lithuania" + 6504 "Armenia" + 6505 "Georgia" + 6506 "Azerbaijan" + 6507 "Turkmenistan" + 6508 "Uzbekistan" + 6509 "Kazakhstan" + 6510 "Tajikistan" + 6511 "Kyrgyzstan" + 6512 "Latvia" + 6513 "Russia" + 6600 "Croatia" + 6601 "Slovenia" + 6602 "Macedonia, FYRO" + 6603 "Bosnia and Herzegovina" + 6604 "Yugoslavia" + 20013 "Hardware ID" +END diff --git a/dll/win32/modemui/modemui.rc b/dll/win32/modemui/modemui.rc index 281521f5018..ff348bedba8 100644 --- a/dll/win32/modemui/modemui.rc +++ b/dll/win32/modemui/modemui.rc @@ -38,6 +38,9 @@ IDI_703 ICON "res/703.ico" #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/msports/lang/pt-PT.rc b/dll/win32/msports/lang/pt-PT.rc index 5880c075816..dc5af3b9c70 100644 --- a/dll/win32/msports/lang/pt-PT.rc +++ b/dll/win32/msports/lang/pt-PT.rc @@ -13,7 +13,7 @@ BEGIN COMBOBOX IDC_SERIAL_PARITY, 139, 59, 106, 62, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL RTEXT "Bits de &paragem:", -1, 6, 82, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_STOPBITS, 139, 80, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL - RTEXT "&Controlo de fluxo:", -1, 6, 102, 130, 8, WS_GROUP + RTEXT "&Controle de fluxo:", -1, 6, 102, 130, 8, WS_GROUP COMBOBOX IDC_SERIAL_FLOWCONTROL, 139, 100, 106, 54, CBS_DROPDOWNLIST | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "&Avançado...", IDC_SERIAL_ADVANCED, 71, 130, 85, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Predefinições", IDC_SERIAL_RESTORE, 160, 130, 85, 14, WS_GROUP | WS_TABSTOP diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index bc225294c1a..359bb4c79bd 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -738,7 +738,7 @@ BEGIN IDS_DESKTOP "Ambiente de trabalho" IDS_MYCOMPUTER "O Meu Computador" IDS_RECYCLEBIN_FOLDER_NAME "Reciclagem" - IDS_CONTROLPANEL "Painel de Controlo" + IDS_CONTROLPANEL "Painel de Controle" IDS_ADMINISTRATIVETOOLS "Ferramentas Administrativas" /* special folders descriptions */

1 0

[reactos] 01/01: [CSRSRV] CsrUnhandledExceptionFilter: Check RtlAdjustPrivilege() result (#2864)
by Serge Gautherie 01 Jun '20

01 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5af1eb44a29025055c09… commit b5af1eb44a29025055c092066bc711bc4348bd3c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Jun 1 20:20:31 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 1 20:20:31 2020 +0200 [CSRSRV] CsrUnhandledExceptionFilter: Check RtlAdjustPrivilege() result (#2864) And remove unused NtRaiseHardError() Status assignment. Detected by Cppcheck: redundantAssignment. Related to commit d221bdfb (r55647). --- subsystems/win32/csrsrv/server.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/subsystems/win32/csrsrv/server.c b/subsystems/win32/csrsrv/server.c index 4fa35367927..3fce78b7fc5 100644 --- a/subsystems/win32/csrsrv/server.c +++ b/subsystems/win32/csrsrv/server.c @@ -659,6 +659,11 @@ CsrUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) FALSE, &OldValue); } + if (!NT_SUCCESS(Status)) + { + DPRINT1("CsrUnhandledExceptionFilter(): RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE) failed, Status = 0x%08lx\n", Status); + goto NoPrivilege; + } /* Initialize our Name String */ RtlInitUnicodeString(&ErrorSource, L"Windows SubSystem"); @@ -670,14 +675,15 @@ CsrUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) ErrorParameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord; /* Bugcheck */ - Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, - 4, - 1, - ErrorParameters, - OptionShutdownSystem, - &Response); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, + 4, + 1, + ErrorParameters, + OptionShutdownSystem, + &Response); } +NoPrivilege: /* Just terminate us */ NtTerminateProcess(NtCurrentProcess(), ExceptionInfo->ExceptionRecord->ExceptionCode);

1 0

[reactos] 01/01: [APISETS] Fix some functions that are NT10(v1607)+ (#2738)
by Serge Gautherie 01 Jun '20

01 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7094297b7a5a108ec1867… commit 7094297b7a5a108ec186726c520b503508bc7c38 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Jun 1 19:04:32 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 1 20:04:32 2020 +0300 [APISETS] Fix some functions that are NT10(v1607)+ (#2738) - *_onexit_*() are NT10(v1607)+ - *_seh_filter_*() are NT10(v1607)+ actually CORE-16700 --- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 10 +++++----- dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index 7cdd75c7979..a0e1b339a8f 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -229,7 +229,7 @@ @ stub _o__eof @ stub _o__errno @ stub _o__except1 -@ stub _o__execute_onexit_table +@ stub -version=0xA00+ _o__execute_onexit_table @ stub _o__execv @ stub _o__execve @ stub _o__execvp @@ -348,7 +348,7 @@ @ stub _o__i64toa_s @ stub _o__i64tow @ stub _o__i64tow_s -@ stub _o__initialize_onexit_table +@ stub -version=0xA00+ _o__initialize_onexit_table @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -633,7 +633,7 @@ @ stub _o__read @ stub _o__realloc_base @ stub _o__recalloc -@ stub _o__register_onexit_function +@ stub -version=0xA00+ _o__register_onexit_function @ stub _o__resetstkoflw @ stub _o__rmdir @ stub _o__rmtmp @@ -641,8 +641,8 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s -@ cdecl -version=0x600+ _o__seh_filter_dll() msvcrt.__CppXcptFilter -@ cdecl -version=0x600+ _o__seh_filter_exe() msvcrt._XcptFilter +@ cdecl -version=0xA00+ _o__seh_filter_dll() msvcrt.__CppXcptFilter +@ cdecl -version=0xA00+ _o__seh_filter_exe() msvcrt._XcptFilter @ stub _o__set_abort_behavior @ stub _o__set_doserrno @ stub _o__set_errno diff --git a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec index 261d49ff79c..35bdbf3ace5 100644 --- a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec @@ -37,7 +37,7 @@ @ stdcall _endthread() msvcrt._endthread @ stdcall _endthreadex() msvcrt._endthreadex @ stdcall _errno() msvcrt._errno -@ stub _execute_onexit_table +@ stub -version=0xA00+ _execute_onexit_table @ stdcall _exit() msvcrt._exit @ stdcall _fpieee_flt() msvcrt._fpieee_flt @ stdcall _fpreset() msvcrt._fpreset @@ -55,7 +55,7 @@ @ stdcall _getdllprocaddr() msvcrt._getdllprocaddr @ stdcall _getpid() msvcrt._getpid @ stub _initialize_narrow_environment -@ stub _initialize_onexit_table +@ stub -version=0xA00+ _initialize_onexit_table @ stub _initialize_wide_environment @ stdcall _initterm() msvcrt._initterm @ stub _initterm_e @@ -63,11 +63,11 @@ @ stub _invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ stub _query_app_type -@ stub _register_onexit_function +@ stub -version=0xA00+ _register_onexit_function @ stub _register_thread_local_exe_atexit_callback @ stdcall _resetstkoflw() msvcrt._resetstkoflw -@ cdecl -version=0x600+ _seh_filter_dll() msvcrt.__CppXcptFilter -@ cdecl -version=0x600+ _seh_filter_exe() msvcrt._XcptFilter +@ cdecl -version=0xA00+ _seh_filter_dll() msvcrt.__CppXcptFilter +@ cdecl -version=0xA00+ _seh_filter_exe() msvcrt._XcptFilter @ stub _set_abort_behavior @ stub _set_app_type @ stub _set_controlfp

1 0

[reactos] 01/01: [RAPPS] Update Chinese (Taiwan) translation (#2873)
by He Yang 01 Jun '20

01 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5886f862f6ed4f799f0c… commit e5886f862f6ed4f799f0c3cb8bfab80e31132cad Author: He Yang <1160386205(a)qq.com> AuthorDate: Mon Jun 1 19:30:53 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 1 14:30:53 2020 +0300 [RAPPS] Update Chinese (Taiwan) translation (#2873) --- base/applications/rapps/lang/zh-TW.rc | 64 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/base/applications/rapps/lang/zh-TW.rc b/base/applications/rapps/lang/zh-TW.rc index 17933f5d1d6..a3482a73631 100644 --- a/base/applications/rapps/lang/zh-TW.rc +++ b/base/applications/rapps/lang/zh-TW.rc @@ -148,7 +148,7 @@ END STRINGTABLE BEGIN IDS_AINFO_VERSION "\n版本:" - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\n可用版本: " IDS_AINFO_DESCRIPTION "\n描述:" IDS_AINFO_SIZE "\n大小:" IDS_AINFO_URLSITE "\n主頁:" @@ -174,7 +174,7 @@ BEGIN IDS_CAT_SCIENCE "科學" IDS_CAT_TOOLS "工具" IDS_CAT_VIDEO "視訊" - IDS_CAT_THEMES "Themes" + IDS_CAT_THEMES "主題" END STRINGTABLE @@ -185,7 +185,7 @@ BEGIN IDS_INSTALL "安裝" IDS_UNINSTALL "解除安裝" IDS_MODIFY "修改" - IDS_APPS_COUNT "程式個數:%d; Selected: %d" + IDS_APPS_COUNT "程式個數：%d；已選: %d" IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理員！\n\n" IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站:" IDS_WELCOME_URL "https://reactos.org/" @@ -195,57 +195,57 @@ BEGIN IDS_APPLICATIONS "應用程式" IDS_CHOOSE_FOLDER_TEXT "請選擇用來儲存下載檔案的資料夾:" IDS_CHOOSE_FOLDER_ERROR "您選擇的資料夾不存在。創建嗎？" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "您指定的URL無效或不支持。請更正！" IDS_APP_REG_REMOVE "您確定要從登錄檔刪除該程式的資料嗎？" IDS_INFORMATION "資訊" IDS_UNABLE_TO_DOWNLOAD "無法下載包!找不到的位址!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD2 "無法下載包!請檢查網絡連接!" IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料！" - IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" + IDS_UNABLE_TO_INSTALL "無法打開安裝程式!" + IDS_UNABLE_TO_QUERY_CERT "無法獲取證書資訊。\n\n您是否仍然想繼續？" IDS_INTEG_CHECK_TITLE "驗證套裝軟體的完整性…" IDS_INTEG_CHECK_FAIL "包沒有通過完整性檢查，它可能已損壞，或者在下載過程中篡改。建議您不要運行該軟體。" - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" - IDS_INSTALL_SELECTED "Install Selected" - IDS_SELECTEDFORINST "Selected for installation" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" - IDS_UNABLE_PATH "Incorrect path format." + IDS_INTERRUPTED_DOWNLOAD "下載中斷。請檢查網絡連接。" + IDS_UNABLE_TO_WRITE "無法寫入存儲裝置。存儲裝置可能已滿。" + IDS_SELECT_ALL "全選/全反選" + IDS_INSTALL_SELECTED "安裝已選中的" + IDS_SELECTEDFORINST "選中以安裝" + IDS_MISMATCH_CERT_INFO "所使用的證書未知：\n主題：%s\n發行方：%s\n您是否仍然想繼續？" + IDS_UNABLE_PATH "不正確的URL格式。" END STRINGTABLE BEGIN - IDS_STATUS_INSTALLED "Installed" - IDS_STATUS_NOTINSTALLED "Not installed" - IDS_STATUS_DOWNLOADED "Downloaded" - IDS_STATUS_UPDATE_AVAILABLE "Update available" - IDS_STATUS_DOWNLOADING "Downloading…" - IDS_STATUS_INSTALLING "Installing…" - IDS_STATUS_WAITING "Waiting to install…" - IDS_STATUS_FINISHED "Finished" + IDS_STATUS_INSTALLED "已安裝" + IDS_STATUS_NOTINSTALLED "未安裝" + IDS_STATUS_DOWNLOADED "下載" + IDS_STATUS_UPDATE_AVAILABLE "可用更新" + IDS_STATUS_DOWNLOADING "正在下載…" + IDS_STATUS_INSTALLING "正在安裝…" + IDS_STATUS_WAITING "正在等待安裝…" + IDS_STATUS_FINISHED "完成" END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Open Source" - IDS_LICENSE_FREEWARE "Freeware" - IDS_LICENSE_TRIAL "Trial/Demo" + IDS_LICENSE_OPENSOURCE "開源軟件" + IDS_LICENSE_FREEWARE "免費軟件" + IDS_LICENSE_TRIAL "試用版/演示版" END STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" - IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" - IDS_LANGUAGE_SINGLE "Single language" - IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" - IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "支持您的語言" + IDS_LANGUAGE_NO_TRANSLATION "支持其他語言" + IDS_LANGUAGE_ENGLISH_TRANSLATION "支持英語" + IDS_LANGUAGE_SINGLE "單語言" + IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d 及更多)" + IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d 可用)" END STRINGTABLE BEGIN IDS_DL_DIALOG_DB_DISP "應用程式資料庫" IDS_DL_DIALOG_DB_DOWNLOAD_DISP "更新資料庫…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "正在更新資料庫… (非官方源)" END

1 0

[reactos] 01/01: [CSRSRV] CsrSetProcessSecurity(): Check 1st NtQueryInformationToken() result (#2862)
by Serge Gautherie 01 Jun '20

01 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4425bd8db392a50eb1d07… commit 4425bd8db392a50eb1d0734bb3e7ab33927b4885 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Jun 1 13:17:29 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 1 14:17:29 2020 +0300 [CSRSRV] CsrSetProcessSecurity(): Check 1st NtQueryInformationToken() result (#2862) Also: * Add 1 NtClose(hToken), in an error case. * Do not call RtlFreeHeap(..., ..., NULL). Follow-up to #2857. --- subsystems/win32/csrsrv/init.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/subsystems/win32/csrsrv/init.c b/subsystems/win32/csrsrv/init.c index 49df131a862..69e9cfdea00 100644 --- a/subsystems/win32/csrsrv/init.c +++ b/subsystems/win32/csrsrv/init.c @@ -74,12 +74,18 @@ CsrSetProcessSecurity(VOID) if (!NT_SUCCESS(Status)) goto Quickie; /* Get the Token User Length */ - NtQueryInformationToken(hToken, TokenUser, NULL, 0, &Length); + Status = NtQueryInformationToken(hToken, TokenUser, NULL, 0, &Length); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + NtClose(hToken); + goto Quickie; + } /* Allocate space for it */ TokenInfo = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, Length); if (!TokenInfo) { + NtClose(hToken); Status = STATUS_NO_MEMORY; goto Quickie; } @@ -153,7 +159,7 @@ CsrSetProcessSecurity(VOID) /* Free the memory and return */ Quickie: if (ProcSd) RtlFreeHeap(CsrHeap, 0, ProcSd); - RtlFreeHeap(CsrHeap, 0, TokenInfo); + if (TokenInfo) RtlFreeHeap(CsrHeap, 0, TokenInfo); return Status; }

1 0

[reactos] 01/01: [MSGINA] gui: Improve DlgData_LoadBitmaps() (#2520)
by Serge Gautherie 01 Jun '20

01 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64fea1dbd0fc9cceee1dc… commit 64fea1dbd0fc9cceee1dc90eb5ac9277a34283e6 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Jun 1 11:26:53 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 1 12:26:53 2020 +0300 [MSGINA] gui: Improve DlgData_LoadBitmaps() (#2520) And let bar timer depend on the bar image only. Addendum to 623dd26ccea5e79001aee769c230fb4f8e304fc8. --- dll/win32/msgina/gui.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index 6301a19d955..3cb30bb638f 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -56,28 +56,34 @@ DlgData_Create(HWND hwndDlg, PGINA_CONTEXT pgContext) return pDlgData; } -static BOOL -DlgData_LoadBitmaps(PDLG_DATA pDlgData) +static VOID +DlgData_LoadBitmaps(_Inout_ PDLG_DATA pDlgData) { BITMAP bm; if (!pDlgData) - return FALSE; + { + return; + } pDlgData->hLogoBitmap = LoadImageW(pDlgData->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - GetObject(pDlgData->hLogoBitmap, sizeof(bm), &bm); - pDlgData->LogoWidth = bm.bmWidth; - pDlgData->LogoHeight = bm.bmHeight; + if (pDlgData->hLogoBitmap) + { + GetObject(pDlgData->hLogoBitmap, sizeof(bm), &bm); + pDlgData->LogoWidth = bm.bmWidth; + pDlgData->LogoHeight = bm.bmHeight; + } pDlgData->hBarBitmap = LoadImageW(hDllInstance, MAKEINTRESOURCEW(IDI_BAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - GetObject(pDlgData->hBarBitmap, sizeof(bm), &bm); - pDlgData->BarWidth = bm.bmWidth; - pDlgData->BarHeight = bm.bmHeight; - - return (pDlgData->hLogoBitmap != NULL && pDlgData->hBarBitmap != NULL); + if (pDlgData->hBarBitmap) + { + GetObject(pDlgData->hBarBitmap, sizeof(bm), &bm); + pDlgData->BarWidth = bm.bmWidth; + pDlgData->BarHeight = bm.bmHeight; + } } static void @@ -192,15 +198,18 @@ StatusDialogProc( if (pDlgData == NULL) return FALSE; - if (DlgData_LoadBitmaps(pDlgData)) + DlgData_LoadBitmaps(pDlgData); + if (pDlgData->hBarBitmap) { if (SetTimer(hwndDlg, IDT_BAR, 20, NULL) == 0) { ERR("SetTimer(IDT_BAR) failed: %d\n", GetLastError()); } - - /* Get the animation bar control */ - pDlgData->hWndBarCtrl = GetDlgItem(hwndDlg, IDC_BAR); + else + { + /* Get the animation bar control */ + pDlgData->hWndBarCtrl = GetDlgItem(hwndDlg, IDC_BAR); + } } return TRUE; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020