[ros-diffs] [reactos] 01/01: [ROSAUTOTEST] Run tests with current dir set to the test dir
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a9a7391851495a188e3d04ebe8c8aff64d9ffe2 commit 6a9a7391851495a188e3d04ebe8c8aff64d9ffe2 Author: Timo Kreuzer AuthorDate: Tue Jun 29 09:36:46 2021 +0200 Commit: Timo Kreuzer CommitDate: Sat Jul 3 12:54:50 2021 +0200 [ROSAUTOTEST] Run tests with current dir set to the test dir --- modules/rostests/rosautotest/CWineTest.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/rosautotest/CWineTest.cpp b/modules/rostests/rosautotest/CWineTest.cpp index 42442ecb73b..7175f7ec023 100644 --- a/modules/rostests/rosautotest/CWineTest.cpp +++ b/modules/rostests/rosautotest/CWineTest.cpp @@ -298,6 +298,8 @@ CWineTest::RunTest(CTestInfo* TestInfo) ss << "Running Wine Test, Module: " << TestInfo->Module << ", Test: " << TestInfo->Test << endl; StringOut(ss.str()); +SetCurrentDirectoryW(m_TestPath.c_str()); + StartTime = GetTickCount(); try
[ros-diffs] [reactos] 01/02: [RTL/x64] Properly handle UNW_FLAG_CHAININFO
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d24700f82e9c6e670f9dfb759df85a6a2f006b63
commit d24700f82e9c6e670f9dfb759df85a6a2f006b63
Author: Timo Kreuzer
AuthorDate: Tue Jun 15 11:28:02 2021 +0200
Commit: Timo Kreuzer
CommitDate: Sat Jul 3 12:56:48 2021 +0200
[RTL/x64] Properly handle UNW_FLAG_CHAININFO
---
sdk/lib/rtl/amd64/unwind.c | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c
index a0bd12b28fb..af00aeec3bd 100644
--- a/sdk/lib/rtl/amd64/unwind.c
+++ b/sdk/lib/rtl/amd64/unwind.c
@@ -523,16 +523,6 @@ RtlVirtualUnwind(
/* Get a pointer to the unwind info */
UnwindInfo = RVA(ImageBase, FunctionEntry->UnwindData);
-/* Check for chained info */
-if (UnwindInfo->Flags & UNW_FLAG_CHAININFO)
-{
-UNIMPLEMENTED_DBGBREAK();
-
-/* See
https://docs.microsoft.com/en-us/cpp/build/chained-unwind-info-structures */
-FunctionEntry =
(PRUNTIME_FUNCTION)&(UnwindInfo->UnwindCode[(UnwindInfo->CountOfCodes + 1) &
~1]);
-UnwindInfo = RVA(ImageBase, FunctionEntry->UnwindData);
-}
-
/* The language specific handler data follows the unwind info */
LanguageHandler =
ALIGN_UP_POINTER_BY(&UnwindInfo->UnwindCode[UnwindInfo->CountOfCodes],
sizeof(ULONG));
*HandlerData = (LanguageHandler + 1);
@@ -560,6 +550,8 @@ RtlVirtualUnwind(
i += UnwindOpSlots(UnwindInfo->UnwindCode[i]);
}
+RepeatChainedInfo:
+
/* Process the remaining unwind ops */
while (i < UnwindInfo->CountOfCodes)
{
@@ -650,6 +642,16 @@ RtlVirtualUnwind(
}
}
+/* Check for chained info */
+if (UnwindInfo->Flags & UNW_FLAG_CHAININFO)
+{
+/* See
https://docs.microsoft.com/en-us/cpp/build/exception-handling-x64?view=msvc-160#chained-unwind-info-structures
*/
+FunctionEntry =
(PRUNTIME_FUNCTION)&(UnwindInfo->UnwindCode[(UnwindInfo->CountOfCodes + 1) &
~1]);
+UnwindInfo = RVA(ImageBase, FunctionEntry->UnwindData);
+i = 0;
+goto RepeatChainedInfo;
+}
+
/* Unwind is finished, pop new Rip from Stack */
if (Context->Rsp != 0)
{
[ros-diffs] [reactos] 02/02: [NETAPI32] Zero out lpNameBuffer in NetGetJoinInformation
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adc86c2442e646d2d108691a9b30415b9f3a8fc3
commit adc86c2442e646d2d108691a9b30415b9f3a8fc3
Author: Timo Kreuzer
AuthorDate: Tue Jun 15 11:32:29 2021 +0200
Commit: Timo Kreuzer
CommitDate: Sat Jul 3 12:56:48 2021 +0200
[NETAPI32] Zero out lpNameBuffer in NetGetJoinInformation
This is needed, because for some reason, otherwise RPCRT4 will assume that
whatever value is in there is already the buffer and copy the string there.
Fixes exception in Chrome 48.
---
dll/win32/netapi32/wksta_new.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dll/win32/netapi32/wksta_new.c b/dll/win32/netapi32/wksta_new.c
index 29441bb52bc..0ec1d020a6a 100644
--- a/dll/win32/netapi32/wksta_new.c
+++ b/dll/win32/netapi32/wksta_new.c
@@ -327,6 +327,7 @@ NetGetJoinInformation(
if (lpNameBuffer == NULL || BufferType == NULL)
return ERROR_INVALID_PARAMETER;
+*lpNameBuffer = NULL;
RpcTryExcept
{
status = NetrGetJoinInformation((LPWSTR)lpServer,
[ros-diffs] [reactos] 01/01: [RAPPS] Kill 2x EOL white-space in loaddlg.cpp
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae2ad29ad53dd1184e57bdbf8ec5f5456246d04f
commit ae2ad29ad53dd1184e57bdbf8ec5f5456246d04f
Author: Joachim Henze
AuthorDate: Sat Jul 3 13:49:48 2021 +0200
Commit: Joachim Henze
CommitDate: Sat Jul 3 13:49:48 2021 +0200
[RAPPS] Kill 2x EOL white-space in loaddlg.cpp
Both were introduced during 0.4.15-dev'ing
and were not in any earlier rls branches.
They were the only 2 in here btw.
---
base/applications/rapps/loaddlg.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/base/applications/rapps/loaddlg.cpp
b/base/applications/rapps/loaddlg.cpp
index 35383607da8..49538ac1d06 100644
--- a/base/applications/rapps/loaddlg.cpp
+++ b/base/applications/rapps/loaddlg.cpp
@@ -529,7 +529,7 @@ BOOL ShowLastError(
DWORD dwLastError)
{
CLocalPtr lpMsg;
-
+
if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_IGNORE_INSERTS |
(bInetError ? FORMAT_MESSAGE_FROM_HMODULE :
FORMAT_MESSAGE_FROM_SYSTEM),
@@ -622,7 +622,7 @@ unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID
param)
szNewCaption.LoadStringW(IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP);
break;
}
-
+
if (!IsWindow(hDlg)) goto end;
SetWindowTextW(hDlg, szNewCaption.GetString());
[ros-diffs] [reactos] 01/01: [SAMSRV] Older functions should call newer functions
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf05fcbd294a9355e807e90a7baf2310b9d36f63
commit bf05fcbd294a9355e807e90a7baf2310b9d36f63
Author: Eric Kohl
AuthorDate: Sat Jul 3 14:46:32 2021 +0200
Commit: Eric Kohl
CommitDate: Sat Jul 3 14:46:32 2021 +0200
[SAMSRV] Older functions should call newer functions
---
dll/win32/samsrv/samrpc.c | 59 ---
1 file changed, 35 insertions(+), 24 deletions(-)
diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c
index 9e443d00842..518ac75e0b5 100644
--- a/dll/win32/samsrv/samrpc.c
+++ b/dll/win32/samsrv/samrpc.c
@@ -8724,10 +8724,22 @@ SamrQueryDisplayInformation(IN SAMPR_HANDLE
DomainHandle,
OUT unsigned long *TotalReturned,
OUT PSAMPR_DISPLAY_INFO_BUFFER Buffer)
{
-UNIMPLEMENTED;
-return STATUS_NOT_IMPLEMENTED;
+TRACE("SamrQueryDisplayInformation(%p %lu %lu %lu %lu %p %p %p)\n",
+ DomainHandle, DisplayInformationClass, Index,
+ EntryCount, PreferredMaximumLength, TotalAvailable,
+ TotalReturned, Buffer);
+
+return SamrQueryDisplayInformation3(DomainHandle,
+DisplayInformationClass,
+Index,
+EntryCount,
+PreferredMaximumLength,
+TotalAvailable,
+TotalReturned,
+Buffer);
}
+
/* Function 41 */
NTSTATUS
NTAPI
@@ -8736,10 +8748,16 @@ SamrGetDisplayEnumerationIndex(IN SAMPR_HANDLE
DomainHandle,
IN PRPC_UNICODE_STRING Prefix,
OUT unsigned long *Index)
{
-UNIMPLEMENTED;
-return STATUS_NOT_IMPLEMENTED;
+TRACE("SamrGetDisplayEnumerationIndex(%p %lu %p %p)\n",
+ DomainHandle, DisplayInformationClass, Prefix, Index);
+
+return SamrGetDisplayEnumerationIndex2(DomainHandle,
+ DisplayInformationClass,
+ Prefix,
+ Index);
}
+
/* Function 42 */
NTSTATUS
NTAPI
@@ -8749,6 +8767,7 @@ SamrTestPrivateFunctionsDomain(IN SAMPR_HANDLE
DomainHandle)
return STATUS_NOT_IMPLEMENTED;
}
+
/* Function 43 */
NTSTATUS
NTAPI
@@ -8955,14 +8974,14 @@ SamrQueryDisplayInformation2(IN SAMPR_HANDLE
DomainHandle,
EntryCount, PreferredMaximumLength, TotalAvailable,
TotalReturned, Buffer);
-return SamrQueryDisplayInformation(DomainHandle,
- DisplayInformationClass,
- Index,
- EntryCount,
- PreferredMaximumLength,
- TotalAvailable,
- TotalReturned,
- Buffer);
+return SamrQueryDisplayInformation3(DomainHandle,
+DisplayInformationClass,
+Index,
+EntryCount,
+PreferredMaximumLength,
+TotalAvailable,
+TotalReturned,
+Buffer);
}
@@ -8977,10 +8996,8 @@ SamrGetDisplayEnumerationIndex2(IN SAMPR_HANDLE
DomainHandle,
TRACE("SamrGetDisplayEnumerationIndex2(%p %lu %p %p)\n",
DomainHandle, DisplayInformationClass, Prefix, Index);
-return SamrGetDisplayEnumerationIndex(DomainHandle,
- DisplayInformationClass,
- Prefix,
- Index);
+UNIMPLEMENTED;
+return STATUS_NOT_IMPLEMENTED;
}
@@ -9416,14 +9433,8 @@ SamrQueryDisplayInformation3(IN SAMPR_HANDLE
DomainHandle,
EntryCount, PreferredMaximumLength, TotalAvailable,
TotalReturned, Buffer);
-return SamrQueryDisplayInformation(DomainHandle,
- DisplayInformationClass,
- Index,
- EntryCount,
- PreferredMaximumLength,
- TotalAvailable,
- TotalReturned,
- Buffer);
+UNIMPLEMENTED;
+return STATUS_NOT_IMPLEMENTED;
}
[ros-diffs] [reactos] 01/01: [NTOS:SE] Assign the control flag bits to the newly created security descriptor
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c869c4778d2d3df26ce15f821fff181c7be42eb9 commit c869c4778d2d3df26ce15f821fff181c7be42eb9 Author: George Bișoc AuthorDate: Sat Jul 3 17:20:48 2021 +0200 Commit: George Bișoc CommitDate: Sat Jul 3 17:20:48 2021 +0200 [NTOS:SE] Assign the control flag bits to the newly created security descriptor We allocate memory pool for a new security descriptor with specific info filled by the caller but we don't set the control flag bits for the newly allocated descriptor, which is wrong. Originally spotted by Vadim Galyant. CORE-17650 --- ntoskrnl/se/sd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index dca0db419ff..8ede6fbf4ea 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -962,6 +962,7 @@ SeSetSecurityDescriptorInfoEx( Current += SaclLength; } +NewSd->Control |= Control; *ObjectsSecurityDescriptor = NewSd; return STATUS_SUCCESS; }
[ros-diffs] [reactos] 01/01: [NTOS:IO] OpenRegistryHandlesFromSymbolicLink: Use REG_OPTION_NON_VOLATILE Use REG_OPTION_NON_VOLATILE instead of REG_OPTION_VOLATILE in all ZwCreateKey calls of OpenRegis
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94054a5735d427fdfa8dc8abdbbd4dafeb966036
commit 94054a5735d427fdfa8dc8abdbbd4dafeb966036
Author: Oleg Dubinskiy
AuthorDate: Sun Apr 4 20:57:23 2021 +0300
Commit: George Bișoc
CommitDate: Sat Jul 3 21:44:33 2021 +0200
[NTOS:IO] OpenRegistryHandlesFromSymbolicLink: Use REG_OPTION_NON_VOLATILE
Use REG_OPTION_NON_VOLATILE instead of REG_OPTION_VOLATILE in all
ZwCreateKey calls of OpenRegistryHandlesFromSymbolicLink, since the keys
created/opened by this function, should be non-volatile (in other words, be
saved after reboot).
Also Device Parameters subkey that is created in
IoOpenDeviceInterfaceRegistryKey (which uses that routine as well), is
non-volatile too, so the parent keys whose contain it, cannot be volatile.
It will fix an error with status 0xc181 (STATUS_CHILD_MUST_BE_VOLATILE)
occuring during loading kernel mode audio drivers from Windows XP/2003,
especially checked (debug) versions, with my IoGetDeviceInterfaceAlias
implementation. Also it may fix other error cases.
CORE-17361
---
ntoskrnl/io/iomgr/deviface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ntoskrnl/io/iomgr/deviface.c b/ntoskrnl/io/iomgr/deviface.c
index f909d536461..6a57e7d203b 100644
--- a/ntoskrnl/io/iomgr/deviface.c
+++ b/ntoskrnl/io/iomgr/deviface.c
@@ -103,7 +103,7 @@ OpenRegistryHandlesFromSymbolicLink(IN PUNICODE_STRING
SymbolicLinkName,
&ObjectAttributes,
0,
NULL,
- REG_OPTION_VOLATILE,
+ REG_OPTION_NON_VOLATILE,
NULL);
ZwClose(ClassesKey);
if (!NT_SUCCESS(Status))
@@ -154,7 +154,7 @@ OpenRegistryHandlesFromSymbolicLink(IN PUNICODE_STRING
SymbolicLinkName,
&ObjectAttributes,
0,
NULL,
- REG_OPTION_VOLATILE,
+ REG_OPTION_NON_VOLATILE,
NULL);
if (!NT_SUCCESS(Status))
{
@@ -172,7 +172,7 @@ OpenRegistryHandlesFromSymbolicLink(IN PUNICODE_STRING
SymbolicLinkName,
&ObjectAttributes,
0,
NULL,
- REG_OPTION_VOLATILE,
+ REG_OPTION_NON_VOLATILE,
NULL);
if (!NT_SUCCESS(Status))
{
[ros-diffs] [reactos] 01/04: [USETUP] Update Portuguese PT translation
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ccca7fe30e6d88a12d4eb862ab960962656d706
commit 2ccca7fe30e6d88a12d4eb862ab960962656d706
Author: Jose Carlos Jesus
AuthorDate: Mon Jun 21 11:46:28 2021 +0100
Commit: George Bișoc
CommitDate: Sat Jul 3 21:50:13 2021 +0200
[USETUP] Update Portuguese PT translation
---
base/setup/usetup/lang/pt-PT.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index b95b4d97899..6794a3e8c20 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -1545,14 +1545,14 @@ static MUI_ENTRY ptPTBootLoaderInstallPageEntries[] =
{
4,
3,
-" ReactOS " KERNEL_VERSION_STR " Setup ",
+" Instala\207\306o do ReactOS " KERNEL_VERSION_STR " ",
TEXT_STYLE_UNDERLINE,
TEXT_ID_STATIC
},
{
0,
0,
-"Installing the bootloader onto the media, please wait...",
+"A instalar o programa de arranque no disco de instala\207\306o. Por
favor aguarde...",
TEXT_TYPE_STATUS | TEXT_PADDING_BIG,
TEXT_ID_STATIC
},
[ros-diffs] [reactos] 02/04: [MSCUTILS][EVENTVWR] Add Portuguese PT translation
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=217835648b426ad75b9a1c7a3643eb385340f9f9
commit 217835648b426ad75b9a1c7a3643eb385340f9f9
Author: Jose Carlos Jesus
AuthorDate: Mon Jun 21 14:30:10 2021 +0100
Commit: George Bișoc
CommitDate: Sat Jul 3 21:50:13 2021 +0200
[MSCUTILS][EVENTVWR] Add Portuguese PT translation
---
base/applications/mscutils/eventvwr/eventvwr.rc| 3 +
base/applications/mscutils/eventvwr/lang/pt-BR.rc | 2 +-
.../mscutils/eventvwr/lang/{pt-BR.rc => pt-PT.rc} | 156 ++---
3 files changed, 82 insertions(+), 79 deletions(-)
diff --git a/base/applications/mscutils/eventvwr/eventvwr.rc
b/base/applications/mscutils/eventvwr/eventvwr.rc
index f80bb52fe1b..242a99f3689 100644
--- a/base/applications/mscutils/eventvwr/eventvwr.rc
+++ b/base/applications/mscutils/eventvwr/eventvwr.rc
@@ -76,6 +76,9 @@ IDI_COPY ICON "res/copy.ico"
#ifdef LANGUAGE_PT_BR
#include "lang/pt-BR.rc"
#endif
+#ifdef LANGUAGE_PT_PT
+#include "lang/pt-PT.rc"
+#endif
#ifdef LANGUAGE_RO_RO
#include "lang/ro-RO.rc"
#endif
diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc
b/base/applications/mscutils/eventvwr/lang/pt-BR.rc
index a7d963b5efd..470eb9ef43e 100644
--- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc
+++ b/base/applications/mscutils/eventvwr/lang/pt-BR.rc
@@ -1,6 +1,6 @@
/* Portuguese Brazilian translation by Matheus Macabu */
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
IDM_EVENTVWR MENU
BEGIN
diff --git a/base/applications/mscutils/eventvwr/lang/pt-BR.rc
b/base/applications/mscutils/eventvwr/lang/pt-PT.rc
similarity index 50%
copy from base/applications/mscutils/eventvwr/lang/pt-BR.rc
copy to base/applications/mscutils/eventvwr/lang/pt-PT.rc
index a7d963b5efd..e772a447c92 100644
--- a/base/applications/mscutils/eventvwr/lang/pt-BR.rc
+++ b/base/applications/mscutils/eventvwr/lang/pt-PT.rc
@@ -1,36 +1,36 @@
-/* Portuguese Brazilian translation by Matheus Macabu */
+/* Portuguese Portugal translation by Jose Jesus */
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
IDM_EVENTVWR MENU
BEGIN
-POPUP "&Registro"
+POPUP "&Registo"
BEGIN
-MENUITEM "&Open...", IDM_OPEN_EVENTLOG
-MENUITEM "Save &Event Log as...", IDM_SAVE_EVENTLOG
-MENUITEM "&Close", IDM_CLOSE_EVENTLOG
+MENUITEM "&Abrir o ficheiro de registo...", IDM_OPEN_EVENTLOG
+MENUITEM "&Guardar ficheiro de registo como...", IDM_SAVE_EVENTLOG
+MENUITEM "&Fechar", IDM_CLOSE_EVENTLOG
MENUITEM SEPARATOR
-MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS
-MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG
-MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS
+MENUITEM "&Limpar todos os Eventos", IDM_CLEAR_EVENTS
+MENUITEM "&Alterar o nome\tF2", IDM_RENAME_EVENTLOG
+MENUITEM "&Definições...", IDM_EVENTLOG_SETTINGS
MENUITEM SEPARATOR
MENUITEM "&Sair", IDM_EXIT
END
POPUP "&Visualizar"
BEGIN
-MENUITEM "&Newest first", IDM_LIST_NEWEST
-MENUITEM "&Oldest first", IDM_LIST_OLDEST
+MENUITEM "Mais &recente primeiro", IDM_LIST_NEWEST
+MENUITEM "Mais &antigo primeiro", IDM_LIST_OLDEST
MENUITEM SEPARATOR
-MENUITEM "&Details...\tEnter", IDM_EVENT_DETAILS
+MENUITEM "&Detalhes...\tEnter", IDM_EVENT_DETAILS
MENUITEM SEPARATOR
-MENUITEM "&Atualizar\tF5", IDM_REFRESH
+MENUITEM "&Actualizar\tF5", IDM_REFRESH
END
POPUP "&Opções"
BEGIN
-MENUITEM "Event details &view", IDM_EVENT_DETAILS_VIEW
-MENUITEM "&Grid lines", IDM_LIST_GRID_LINES
+MENUITEM "Visualizar &detalhes", IDM_EVENT_DETAILS_VIEW
+MENUITEM "&Linhas de grelha", IDM_LIST_GRID_LINES
MENUITEM SEPARATOR
-MENUITEM "&Save settings on exit", IDM_SAVE_SETTINGS
+MENUITEM "&Guardar definições ao sair", IDM_SAVE_SETTINGS
END
POPUP "&Ajuda"
BEGIN
@@ -64,21 +64,21 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Data:", IDC_STATIC, 8, 5, 31, 8
-EDITTEXT IDC_EVENTDATESTATIC, 46, 5, 47, 8, ES_LEFT | ES_READONLY | NOT
WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-LTEXT "Fonte:", IDC_STATIC, 103, 5, 36, 8
+EDITTEXT IDC_EVENTDATESTATIC, 50, 5, 47, 8, ES_LEFT | ES_READONLY | NOT
WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+LTEXT "Origem:", IDC_STATIC, 103, 5, 36, 8
EDITTEXT IDC_EVENTSOURCESTATIC, 140, 5, 82, 8, ES_LEFT | ES_READONLY | NOT
WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
-LTEXT "Tempo:", IDC_STATIC, 8, 15, 31, 8
-EDITTEXT IDC_EVENTTIMESTATIC, 46, 15, 47, 8, ES_LEFT | ES_READONLY | NOT
WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
+LTEXT "Hora:", IDC_STATIC, 8, 15, 31, 8
+EDITTEXT IDC_EVENTTIMESTATIC, 50, 15, 47, 8, ES_LEFT | ES_READONLY | NOT
WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL
LTEXT "C
[ros-diffs] [reactos] 03/04: [BOOTDATA] Add Portuguese translation to shortcuts.inf
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06e2d82bc390299e8fc50fd87ebe43f4402e007f commit 06e2d82bc390299e8fc50fd87ebe43f4402e007f Author: Jose Carlos Jesus AuthorDate: Mon Jun 21 17:02:44 2021 +0100 Commit: George Bișoc CommitDate: Sat Jul 3 21:50:13 2021 +0200 [BOOTDATA] Add Portuguese translation to shortcuts.inf --- media/inf/shortcuts.inf | 65 + 1 file changed, 65 insertions(+) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index d17db6a6a91..083faa313c9 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1237,6 +1237,70 @@ WINMINE_DESC=WineMine SPIDER_TITLE=Spider Solitaire SPIDER_DESC=Spider Solitaire +; Portuguese - Portugal +[Strings.0816] +ACCESSORIES=Acessórios +SYSTOOLS=Ferramentas de Sistema +ACCESSIBILITY=Acessibilidade +ENTERTAINMENT=Entretenimento +COMMUNICATIONS=Communicações +GAMES=Jogos + +README_TITLE=Leia-Me +README_DESC=Arquivo de informações para o ReactOS + +CMD_TITLE=Linha de Comandos +CMD_DESC=Abrir Linha de comando +EXPLORER_TITLE=Explorador do ReactOS +EXPLORER_DESC=Iniciar Explorador +RAPPS_TITLE=Gestor de Aplicações ReactOS +RAPPS_TITLE_SHORT=Gestor de Aplicações +RAPPS_DESC=Faça o download e instale várias aplicações +SERVMAN_TITLE=Gestor de Serviços +SERVMAN_DESC=Iniciar Gestor de Serviços +DEVMGMT_TITLE=Gestor de Dispositivos +DEVMGMT_DESC=Iniciar Gestor de Dispositivos +EVENTVWR_TITLE=Visualizador de Eventos +EVENTVWR_DESC=Iniciar Visualizador de Eventos +MSCONFIG_TITLE=Configuração do Sistema +MSCONFIG_DESC=Iniciar Software de Configuração do Sistema +CALC_TITLE=Calculadora +CALC_DESC=Iniciar Calculadora +NOTEPAD_TITLE=Bloco de notas +NOTEPAD_DESC=Iniciar Bloco de notas +MSTSC_TITLE=Ligar ao Ambiente de Trabalho Remoto +MSTSC_DESC=Abrir Ligação ao Ambiente de Trabalho Remoto +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Iniciar Editor de Documentos de texto +MSPAINT_TITLE=Paint +MSPAINT_DESC=Iniciar Paint +CHARMAP_TITLE=Character Map +CHARMAP_DESC=Mapa de Caracteres +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer +KBSWITCH_TITLE=Alterar Estilo do Teclado +KBSWITCH_DESC=Alterar Estilo do Teclado +REGEDIT_TITLE=Editor do Registo +REGEDIT_DESC=Iniciar Editor do Registo +DXDIAG_TITLE=Diagnóstico ReactX +DXDIAG_DESC=Iniciar Diagnóstico ReactX +MAGNIFY_TITLE=Lupa +MAGNIFY_DESC=Ampliar +OSK_TITLE=Em Tela Teclado +OSK_DESC=Lançamento em Tela Teclado +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Iniciar Player Multimídia +SNDVOL_TITLE=Control de Volume +SNDVOL_DESC=Iniciar Controle de Volume +SNDREC32_TITLE=Gravador de Som +SNDREC32_DESC=Iniciar Gravador de Som +SOL_TITLE=Solitaire +SOL_DESC=Paciência +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire +SPIDER_DESC=Spider Solitaire + ; Romanian [Strings.0418] ACCESSORIES=Accesorii @@ -1627,3 +1691,4 @@ WINMINE_TITLE=扫雷 WINMINE_DESC=扫雷 SPIDER_TITLE=蜘蛛纸牌 SPIDER_DESC=蜘蛛纸牌 +
[ros-diffs] [reactos] 04/04: [SERVMAN] Add Portuguese (pt-PT) Translation
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=879dd8f207c0185969f92391f9e1330534eeb193 commit 879dd8f207c0185969f92391f9e1330534eeb193 Author: Jose Carlos Jesus AuthorDate: Thu Jun 24 16:44:45 2021 +0100 Commit: George Bișoc CommitDate: Sat Jul 3 21:50:13 2021 +0200 [SERVMAN] Add Portuguese (pt-PT) Translation --- base/applications/mscutils/servman/lang/pt-PT.rc | 337 +++ base/applications/mscutils/servman/servman.rc| 5 +- 2 files changed, 341 insertions(+), 1 deletion(-) diff --git a/base/applications/mscutils/servman/lang/pt-PT.rc b/base/applications/mscutils/servman/lang/pt-PT.rc new file mode 100644 index 000..e3655c5ae15 --- /dev/null +++ b/base/applications/mscutils/servman/lang/pt-PT.rc @@ -0,0 +1,337 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN +POPUP "&Ficheiro" +BEGIN +MENUITEM "&Exportar...", ID_EXPORT +MENUITEM SEPARATOR +MENUITEM "&Sair", ID_EXIT +END +POPUP "&Acção" +BEGIN +MENUITEM "&Ligar a...", ID_CONNECT, GRAYED +MENUITEM SEPARATOR +MENUITEM "&Iniciar", ID_START, GRAYED +MENUITEM "&Parar", ID_STOP, GRAYED +MENUITEM "Pau&sa", ID_PAUSE, GRAYED +MENUITEM "&Retomar", ID_RESUME, GRAYED +MENUITEM "Re&iniciar", ID_RESTART, GRAYED +MENUITEM SEPARATOR +MENUITEM "&Actualizar\tF5", ID_REFRESH +MENUITEM SEPARATOR +MENUITEM "&Editar...", ID_EDIT, GRAYED +MENUITEM "&Criar...", ID_CREATE, GRAYED +MENUITEM "&Apagar...", ID_DELETE, GRAYED +MENUITEM SEPARATOR +MENUITEM "Proprie&dades...", ID_PROP, GRAYED +END +POPUP "&Ver" +BEGIN +MENUITEM "Icones &grandes", ID_VIEW_LARGE +MENUITEM "Icones &pequenos", ID_VIEW_SMALL +MENUITEM "&Lista", ID_VIEW_LIST +MENUITEM "&Detalhes", ID_VIEW_DETAILS +MENUITEM SEPARATOR +MENUITEM "Per&sonalizar...", ID_VIEW_CUST, GRAYED +END +POPUP "&Ajuda" +BEGIN +MENUITEM "&Ajuda", ID_HELP +MENUITEM "A&cerca", ID_ABOUT +END +END + +IDR_POPUP MENU +BEGIN +POPUP "popup" +BEGIN +MENUITEM "&Iniciar", ID_START, GRAYED +MENUITEM "&Parar", ID_STOP, GRAYED +MENUITEM "Pa&usa", ID_PAUSE, GRAYED +MENUITEM "&Retomar", ID_RESUME, GRAYED +MENUITEM "Rei&niciar", ID_RESTART, GRAYED +MENUITEM SEPARATOR +MENUITEM "&Actualizar", ID_REFRESH +MENUITEM SEPARATOR +MENUITEM "&Editar...", ID_EDIT, GRAYED +MENUITEM "Apa&gar...", ID_DELETE, GRAYED +MENUITEM SEPARATOR +MENUITEM "P&ropriedades...", ID_PROP, GRAYED +MENUITEM SEPARATOR +MENUITEM "A&juda...", ID_HELP +END +END + +IDA_SERVMAN ACCELERATORS +BEGIN +VK_F5, ID_REFRESH, VIRTKEY +END + +IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232 +CAPTION "Geral" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN +LTEXT "", IDC_SERV_NAME, 70, 11, 176, 11, WS_CHILD | WS_VISIBLE +EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY +EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY +EDITTEXT IDC_EXEPATH, 6, 86, 239, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY +COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST +PUSHBUTTON "&Iniciar", IDC_START, 6, 155, 54, 15, WS_DISABLED +PUSHBUTTON "&Parar", IDC_STOP, 68, 155, 54, 15, WS_DISABLED +PUSHBUTTON "Pa&usa", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED +PUSHBUTTON "&Retomar", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED +LTEXT "Nome do serviço:", IDC_STATIC, 7, 11, 53, 11 +LTEXT "Mostrar nome:", IDC_STATIC, 7, 29, 53, 11 +LTEXT "Descrição:", IDC_STATIC, 7, 51, 53, 11 +LTEXT "Caminho do executável:", IDC_STATIC, 7, 73, 102, 9 +LTEXT "Tipo de arranque:", IDC_STATIC, 7, 108, 60, 11 +LTEXT "Estado do serviço:", IDC_STATIC, 7, 133, 53, 18 +LTEXT "", IDC_SERV_STATUS, 70, 135, 176, 11, WS_CHILD | WS_VISIBLE +LTEXT "Pode especificar os parâmetros de arranque aplicáveis quando iniciar o serviço a partir daqui.", IDC_STATIC, 7, 177, 240, 15 +LTEXT "Parâmetros de arranque:", IDC_STATIC, 7, 200, 58, 18 +EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +PUSHBUTTON "Editar", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED +END + +IDD_LOGON DIALOGEX 6, 6, 253, 232 +CAPTION "Iniciar sessão" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_GROUP | WS_TABSTOP +BEGIN +LTEXT "Iniciar sessão como:", IDC_STATIC, 7, 7, 238, 8 +AUTORADIOBUTTON "&Conta do sistema local", IDC_LOGON_SYSTEMACCOUNT, 7, 22, 238, 10, BS_TOP | BS_MULTILINE | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP +A
[ros-diffs] [reactos] 01/01: [WORDPAD] Fix icons for toolbar and formatbar (#3792) CORE-5823
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e068c684522ededfb0ffd70e8af736bb14c7b392 commit e068c684522ededfb0ffd70e8af736bb14c7b392 Author: Doug Lyons AuthorDate: Sat Jul 3 15:55:05 2021 -0500 Commit: GitHub CommitDate: Sat Jul 3 22:55:05 2021 +0200 [WORDPAD] Fix icons for toolbar and formatbar (#3792) CORE-5823 * CORE-5823 Fix icons for toolbar and formatbar in Wordpad. which regressed by SVN r47776 == git 5dbfbb5201a915bc65d88f5818afc81cc6f54231 * Add wordpad_ros.diff noting toolbar.bmp and formatbar.bmp are not wine-synced --- base/applications/wordpad/res/formatbar.bmp| Bin 8314 -> 1142 bytes base/applications/wordpad/res/toolbar.bmp | Bin 1146 -> 246 bytes base/applications/wordpad/res/wordpad_ros.diff | 5 + 3 files changed, 5 insertions(+) diff --git a/base/applications/wordpad/res/formatbar.bmp b/base/applications/wordpad/res/formatbar.bmp index e6c6c36b2b9..04726c279d6 100644 Binary files a/base/applications/wordpad/res/formatbar.bmp and b/base/applications/wordpad/res/formatbar.bmp differ diff --git a/base/applications/wordpad/res/toolbar.bmp b/base/applications/wordpad/res/toolbar.bmp index 37f1925ec9d..0580719f1e2 100644 Binary files a/base/applications/wordpad/res/toolbar.bmp and b/base/applications/wordpad/res/toolbar.bmp differ diff --git a/base/applications/wordpad/res/wordpad_ros.diff b/base/applications/wordpad/res/wordpad_ros.diff new file mode 100644 index 000..ff499f04c98 --- /dev/null +++ b/base/applications/wordpad/res/wordpad_ros.diff @@ -0,0 +1,5 @@ +ReactOS uses the following files that are not wine synced, but unique to ReactOS: + +1) wordpad/res/formatbar.bmp +2) wordpad/res/toolbar.bmp +
[ros-diffs] [reactos] 01/01: [IMM32] Rewrite ImmGetDescriptionA/W (#3780)
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89f5f5bb95c6109a6fcea95a45b68cc24ae16cef
commit 89f5f5bb95c6109a6fcea95a45b68cc24ae16cef
Author: Katayama Hirofumi MZ
AuthorDate: Sun Jul 4 08:18:15 2021 +0900
Commit: GitHub
CommitDate: Sun Jul 4 08:18:15 2021 +0900
[IMM32] Rewrite ImmGetDescriptionA/W (#3780)
CORE-11700
---
dll/win32/imm32/imm.c | 36
sdk/include/reactos/imm32_undoc.h | 23 +++
2 files changed, 59 insertions(+)
diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c
index 45be160a528..ca026d473f0 100644
--- a/dll/win32/imm32/imm.c
+++ b/dll/win32/imm32/imm.c
@@ -37,9 +37,12 @@
#include "winreg.h"
#include "wine/list.h"
#ifdef __REACTOS__
+#include
#include
#include
#include "../../../win32ss/include/ntuser.h"
+#include
+#include
#endif
WINE_DEFAULT_DEBUG_CHANNEL(imm);
@@ -1765,6 +1768,22 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd)
UINT WINAPI ImmGetDescriptionA(
HKL hKL, LPSTR lpszDescription, UINT uBufLen)
{
+#ifdef __REACTOS__
+IMEINFOEX info;
+size_t cch;
+
+TRACE("ImmGetDescriptionA(%p,%p,%d)\n", hKL, lpszDescription, uBufLen);
+
+if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) ||
!IS_IME_KBDLAYOUT(hKL))
+return 0;
+
+StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription),
&cch);
+cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeDescription, (INT)cch,
+ lpszDescription, uBufLen, NULL, NULL);
+if (uBufLen)
+lpszDescription[cch] = 0;
+return cch;
+#else
WCHAR *buf;
DWORD len;
@@ -1793,6 +1812,7 @@ UINT WINAPI ImmGetDescriptionA(
return 0;
return len - 1;
+#endif
}
/***
@@ -1800,6 +1820,21 @@ UINT WINAPI ImmGetDescriptionA(
*/
UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen)
{
+#ifdef __REACTOS__
+IMEINFOEX info;
+size_t cch;
+
+TRACE("ImmGetDescriptionW(%p, %p, %d)\n", hKL, lpszDescription, uBufLen);
+
+if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) ||
!IS_IME_KBDLAYOUT(hKL))
+return 0;
+
+if (uBufLen != 0)
+StringCchCopyW(lpszDescription, uBufLen, info.wszImeDescription);
+
+StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription),
&cch);
+return (UINT)cch;
+#else
static const WCHAR name[] = { 'W','i','n','e',' ','X','I','M',0 };
FIXME("(%p, %p, %d): semi stub\n", hKL, lpszDescription, uBufLen);
@@ -1808,6 +1843,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR
lpszDescription, UINT uBufLen)
if (!uBufLen) return lstrlenW( name );
lstrcpynW( lpszDescription, name, uBufLen );
return lstrlenW( lpszDescription );
+#endif
}
/***
diff --git a/sdk/include/reactos/imm32_undoc.h
b/sdk/include/reactos/imm32_undoc.h
new file mode 100644
index 000..32858af1068
--- /dev/null
+++ b/sdk/include/reactos/imm32_undoc.h
@@ -0,0 +1,23 @@
+/*
+ * PROJECT: ReactOS Kernel
+ * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE: Private header for imm32.dll
+ * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ
+ */
+
+#pragma once
+
+#define KBDLAYOUT_MASK 0xF000
+#define KBDLAYOUT_IME 0xE000
+#define IS_IME_KBDLAYOUT(hKL) ((HIWORD(hKL) & KBDLAYOUT_MASK) == KBDLAYOUT_IME)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL WINAPI
+ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID
pvSearchKey);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
