Ros-diffs May 2020

ros-diffs@reactos.org

28 participants
193 discussions

[reactos] 01/01: [SYSSETUP] Improve SetupQueryRegisteredOsComponent export (#2702)
by Oleg Dubinskiy 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0e995728a12f20b5d4c8… commit b0e995728a12f20b5d4c8243f1d53f478e625510 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri May 1 13:45:19 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 13:45:19 2020 +0300 [SYSSETUP] Improve SetupQueryRegisteredOsComponent export (#2702) CORE-16784 Co-authored-by: Mark Jansen <mark.jansen(a)reactos.org> --- dll/win32/syssetup/syssetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/syssetup.spec b/dll/win32/syssetup/syssetup.spec index 1416a967471..65a48624cbc 100644 --- a/dll/win32/syssetup/syssetup.spec +++ b/dll/win32/syssetup/syssetup.spec @@ -62,7 +62,7 @@ @ stub SetupOobeInitPostServices @ stub SetupOobeInitPreServices @ stub SetupPidGen3 -@ stub SetupQueryRegisteredOsComponent +@ stdcall -stub SetupQueryRegisteredOsComponent(ptr ptr ptr) @ stub SetupQueryRegisteredOsComponentsOrder @ stub SetupReadPhoneList @ stub SetupSetAdminPassword

1 0

[reactos] 01/01: [ACPICA] Update to version 20190430. CORE-16998
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=baa3380649dfe1b9d0238… commit baa3380649dfe1b9d0238019d5b46f3546bc54e5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 1 12:18:11 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:18:48 2020 +0200 [ACPICA] Update to version 20190430. CORE-16998 --- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 24 +++++++++++++++++++----- drivers/bus/acpi/acpica/executer/exfield.c | 2 +- drivers/bus/acpi/acpica/include/acglobal.h | 1 + drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/acpredef.h | 4 ++-- media/doc/3rd Party Files.txt | 2 +- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index b2a29c969a8..e2a08bb0a24 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -233,7 +233,12 @@ AcpiDsCreateBufferField ( Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String, ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1, Flags, WalkState, &Node); - if (ACPI_FAILURE (Status)) + if ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) && + Status == AE_ALREADY_EXISTS) + { + Status = AE_OK; + } + else if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo, Arg->Common.Value.String, Status); @@ -574,12 +579,21 @@ AcpiDsCreateField ( Info.RegionNode = RegionNode; Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); - if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM && - !(RegionNode->Object->Field.InternalPccBuffer - = ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length))) + if (ACPI_FAILURE (Status)) { - return_ACPI_STATUS (AE_NO_MEMORY); + return_ACPI_STATUS (Status); } + + if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM) + { + RegionNode->Object->Field.InternalPccBuffer = + ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length); + if (!RegionNode->Object->Field.InternalPccBuffer) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } + } + return_ACPI_STATUS (Status); } diff --git a/drivers/bus/acpi/acpica/executer/exfield.c b/drivers/bus/acpi/acpica/executer/exfield.c index e20645698b3..3f7c560d286 100644 --- a/drivers/bus/acpi/acpica/executer/exfield.c +++ b/drivers/bus/acpi/acpica/executer/exfield.c @@ -59,7 +59,7 @@ #define ACPI_INVALID_PROTOCOL_ID 0x80 #define ACPI_MAX_PROTOCOL_ID 0x0F -const UINT8 AcpiProtocolLengths[] = +static const UINT8 AcpiProtocolLengths[] = { ACPI_INVALID_PROTOCOL_ID, /* 0 - reserved */ ACPI_INVALID_PROTOCOL_ID, /* 1 - reserved */ diff --git a/drivers/bus/acpi/acpica/include/acglobal.h b/drivers/bus/acpi/acpica/include/acglobal.h index 37a95b1557c..806fa43d990 100644 --- a/drivers/bus/acpi/acpica/include/acglobal.h +++ b/drivers/bus/acpi/acpica/include/acglobal.h @@ -328,6 +328,7 @@ ACPI_GLOBAL (ACPI_EXTERNAL_FILE *, AcpiGbl_ExternalFileList); #ifdef ACPI_DEBUGGER ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_AbortMethod, FALSE); ACPI_INIT_GLOBAL (ACPI_THREAD_ID, AcpiGbl_DbThreadId, ACPI_INVALID_THREAD_ID); +ACPI_INIT_GLOBAL (UINT32, AcpiGbl_NextCmdNum, 1); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DbOpt_NoIniMethods); ACPI_GLOBAL (BOOLEAN, AcpiGbl_DbOpt_NoRegionSupport); diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index d3503841c27..c371ccd8ad8 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20200326 +#define ACPI_CA_VERSION 0x20200430 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/acpredef.h b/drivers/bus/acpi/acpica/include/acpredef.h index d6dd67926ea..2b6173d6c9f 100644 --- a/drivers/bus/acpi/acpica/include/acpredef.h +++ b/drivers/bus/acpi/acpica/include/acpredef.h @@ -661,10 +661,10 @@ const ACPI_PREDEFINED_INFO AcpiGbl_PredefinedMethods[] = {{"_NIC", METHOD_0ARGS, /* ACPI 6.3 */ METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, - {{"_NIG", METHOD_1ARGS (ACPI_TYPE_BUFFER), /* ACPI 6.3 */ + {{"_NIG", METHOD_0ARGS, /* ACPI 6.3 */ METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, - {{"_NIH", METHOD_0ARGS, /* ACPI 6.3 */ + {{"_NIH", METHOD_1ARGS (ACPI_TYPE_BUFFER), /* ACPI 6.3 */ METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, {{"_NTT", METHOD_0ARGS, diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 6404f8a77ef..cdf713041c8 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -92,7 +92,7 @@ Used Version: 1.6.37 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20200326 +Used Version: 20200430 Website: https://acpica.org/ Title: Schily Tools, mkisofs

1 0

[reactos] 04/04: [USBCCGP] Ignore IRP_MN_REMOVE_DEVICE return status and don't wait for it to complete.
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71a4462ad5dce284d47bc… commit 71a4462ad5dce284d47bc307a4b86638f990e56a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 8 15:49:22 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:05:12 2020 +0200 [USBCCGP] Ignore IRP_MN_REMOVE_DEVICE return status and don't wait for it to complete. --- drivers/usb/usbccgp/fdo.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/usb/usbccgp/fdo.c b/drivers/usb/usbccgp/fdo.c index f3b3c6ec41a..abcaeb017f3 100644 --- a/drivers/usb/usbccgp/fdo.c +++ b/drivers/usb/usbccgp/fdo.c @@ -397,16 +397,15 @@ FDO_HandlePnp( FDO_CloseConfiguration(DeviceObject); /* Send the IRP down the stack */ - Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, - Irp); - if (NT_SUCCESS(Status)) - { - /* Detach from the device stack */ - IoDetachDevice(FDODeviceExtension->NextDeviceObject); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); - /* Delete the device object */ - IoDeleteDevice(DeviceObject); - } + /* Detach from the device stack */ + IoDetachDevice(FDODeviceExtension->NextDeviceObject); + + /* Delete the device object */ + IoDeleteDevice(DeviceObject); /* Request completed */ break;

1 0

[reactos] 03/04: [USBCCGP] Don't handle IRP_MN_QUERY_DEVICE_TEXT requests other than device description.
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823101274a30783015a22… commit 823101274a30783015a228d9b44a624beb105259 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 14:58:46 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:05:11 2020 +0200 [USBCCGP] Don't handle IRP_MN_QUERY_DEVICE_TEXT requests other than device description. --- drivers/usb/usbccgp/pdo.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/usb/usbccgp/pdo.c b/drivers/usb/usbccgp/pdo.c index 40072ace311..1ea62bdf0e2 100644 --- a/drivers/usb/usbccgp/pdo.c +++ b/drivers/usb/usbccgp/pdo.c @@ -21,14 +21,32 @@ USBCCGP_PdoHandleQueryDeviceText( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp) { + PIO_STACK_LOCATION IoStack; LPWSTR Buffer; PPDO_DEVICE_EXTENSION PDODeviceExtension; LPWSTR GenericString = L"Composite USB Device"; + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + // // get device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + // + // check if type is description + // + if (IoStack->Parameters.QueryDeviceText.DeviceTextType != DeviceTextDescription) + { + // + // we only handle description + // + return Irp->IoStatus.Status; + } + // // is there a device description //

1 0

[reactos] 02/04: [USBCCGP] Correctly stub PDO power IRP handling.
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d15b2a3cb8375646ccc5… commit 0d15b2a3cb8375646ccc582f74945f8b9c8bbe83 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 14:57:58 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:05:11 2020 +0200 [USBCCGP] Correctly stub PDO power IRP handling. --- drivers/usb/usbccgp/pdo.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/usb/usbccgp/pdo.c b/drivers/usb/usbccgp/pdo.c index bcd0acb075a..40072ace311 100644 --- a/drivers/usb/usbccgp/pdo.c +++ b/drivers/usb/usbccgp/pdo.c @@ -1070,6 +1070,30 @@ PDO_HandleInternalDeviceControl( return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +PDO_HandlePower( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch (IoStack->MinorFunction) + { + case IRP_MN_SET_POWER: + case IRP_MN_QUERY_POWER: + Irp->IoStatus.Status = STATUS_SUCCESS; + break; + } + + Status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + NTSTATUS PDO_Dispatch( @@ -1089,10 +1113,7 @@ PDO_Dispatch( case IRP_MJ_INTERNAL_DEVICE_CONTROL: return PDO_HandleInternalDeviceControl(DeviceObject, Irp); case IRP_MJ_POWER: - PoStartNextPowerIrp(Irp); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return PDO_HandlePower(DeviceObject, Irp); default: DPRINT1("PDO_Dispatch Function %x not implemented\n", IoStack->MajorFunction); Status = Irp->IoStatus.Status;

1 0

[reactos] 01/04: [USBCCGP] Always forward device relations IRPs.
by Thomas Faber 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c3a10c55a6a2f93f5b87… commit 6c3a10c55a6a2f93f5b87e4930dde22f0099c9a8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 6 14:57:01 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri May 1 12:05:06 2020 +0200 [USBCCGP] Always forward device relations IRPs. --- drivers/usb/usbccgp/fdo.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbccgp/fdo.c b/drivers/usb/usbccgp/fdo.c index 927d19ef0f9..f3b3c6ec41a 100644 --- a/drivers/usb/usbccgp/fdo.c +++ b/drivers/usb/usbccgp/fdo.c @@ -119,7 +119,7 @@ FDO_DeviceRelations( if (IoStack->Parameters.QueryDeviceRelations.Type != BusRelations) { /* FDO always only handles bus relations */ - return USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + return STATUS_SUCCESS; } /* Go through array and count device objects */ @@ -159,6 +159,7 @@ FDO_DeviceRelations( /* Store result */ Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + Irp->IoStatus.Status = STATUS_SUCCESS; /* Request completed successfully */ return STATUS_SUCCESS; @@ -420,7 +421,14 @@ FDO_HandlePnp( { /* Handle device relations */ Status = FDO_DeviceRelations(DeviceObject, Irp); - break; + if (!NT_SUCCESS(Status)) + { + break; + } + + /* Forward irp to next device object */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); } case IRP_MN_QUERY_CAPABILITIES: {

1 0

[reactos] 01/01: [NET][MC] Replace the last string resource by a message from netmsg.dll.
by Eric Kohl 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16d136a63e9b63a2353b7… commit 16d136a63e9b63a2353b75e8914f83a38e0600a6 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri May 1 09:40:37 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri May 1 10:27:26 2020 +0200 [NET][MC] Replace the last string resource by a message from netmsg.dll. - Move translations to netmsg.dll. - Keep italian translation as a comment because netmsg.dll does not have an italian translation yet. - Remove obsolete resource files. --- base/applications/network/net/cmdUse.c | 2 +- base/applications/network/net/lang/en-US.rc | 6 ------ base/applications/network/net/lang/es-ES.rc | 9 -------- base/applications/network/net/lang/it-IT.rc | 6 ------ base/applications/network/net/lang/pl-PL.rc | 5 ----- base/applications/network/net/lang/ro-RO.rc | 12 ----------- base/applications/network/net/lang/ru-RU.rc | 8 ------- base/applications/network/net/lang/tr-TR.rc | 8 ------- base/applications/network/net/lang/zh-CN.rc | 8 ------- base/applications/network/net/lang/zh-TW.rc | 8 ------- base/applications/network/net/net.h | 1 - base/applications/network/net/net.rc | 33 ----------------------------- base/applications/network/net/resource.h | 3 --- sdk/include/reactos/mc/netmsgmsg.mc | 14 +++++++----- 14 files changed, 10 insertions(+), 113 deletions(-) diff --git a/base/applications/network/net/cmdUse.c b/base/applications/network/net/cmdUse.c index 71c03803c7a..2219df44086 100644 --- a/base/applications/network/net/cmdUse.c +++ b/base/applications/network/net/cmdUse.c @@ -232,7 +232,7 @@ cmdUse( Status = WNetUseConnection(NULL, &lpNet, NULL, NULL, CONNECT_REDIRECT | (Persist ? CONNECT_UPDATE_PROFILE : 0), Access, &Size, &OutFlags); if (argv[2][0] == L'*' && Status == NO_ERROR && OutFlags == CONNECT_LOCALDRIVE) - ConResPrintf(StdOut, IDS_USE_NOW_CONNECTED, argv[3], Access); + PrintMessageStringV(3919, argv[3], Access); else if (Status != NO_ERROR) PrintError(Status); diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc deleted file mode 100644 index 38ae6cab44b..00000000000 --- a/base/applications/network/net/lang/en-US.rc +++ /dev/null @@ -1,6 +0,0 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" -END diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc deleted file mode 100644 index dbafe64de68..00000000000 --- a/base/applications/network/net/lang/es-ES.rc +++ /dev/null @@ -1,9 +0,0 @@ -/* Spanish Language resource file. - * Translated by: Ismael Ferreras Morezuelas <2014-11-07> */ - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" -END diff --git a/base/applications/network/net/lang/it-IT.rc b/base/applications/network/net/lang/it-IT.rc deleted file mode 100644 index 75895b3de2a..00000000000 --- a/base/applications/network/net/lang/it-IT.rc +++ /dev/null @@ -1,6 +0,0 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s è ora connesso con %s\n" -END diff --git a/base/applications/network/net/lang/pl-PL.rc b/base/applications/network/net/lang/pl-PL.rc deleted file mode 100644 index 8a09e17ef98..00000000000 --- a/base/applications/network/net/lang/pl-PL.rc +++ /dev/null @@ -1,5 +0,0 @@ -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s jest obecnie podłączony do %s\n" -END diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc deleted file mode 100644 index 094ecb1fece..00000000000 --- a/base/applications/network/net/lang/ro-RO.rc +++ /dev/null @@ -1,12 +0,0 @@ -/* - * FILE: base/applications/network/net/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot com) - */ - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "Conectarea %s la %s a fost realizată.\n" -END diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc deleted file mode 100644 index 453eade937d..00000000000 --- a/base/applications/network/net/lang/ru-RU.rc +++ /dev/null @@ -1,8 +0,0 @@ -/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s сейчас подключен к %s\n" -END diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc deleted file mode 100644 index d2e8689ca12..00000000000 --- a/base/applications/network/net/lang/tr-TR.rc +++ /dev/null @@ -1,8 +0,0 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ - -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s şuna bağlandı: %s\n" -END diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc deleted file mode 100644 index 7b04b492c62..00000000000 --- a/base/applications/network/net/lang/zh-CN.rc +++ /dev/null @@ -1,8 +0,0 @@ -/* Simplified Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s 现在连接到 %s\n" -END diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc deleted file mode 100644 index 51fddd57f96..00000000000 --- a/base/applications/network/net/lang/zh-TW.rc +++ /dev/null @@ -1,8 +0,0 @@ -/* Traditional Chinese translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -STRINGTABLE -BEGIN - IDS_USE_NOW_CONNECTED "%s is now connected to %s\n" -END diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index b5d53e32657..96f1d24b60d 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -25,7 +25,6 @@ #include <conutils.h> #include <net_msg.h> -#include "resource.h" extern HMODULE hModuleNetMsg; diff --git a/base/applications/network/net/net.rc b/base/applications/network/net/net.rc index d026529c233..725ae3c5fe6 100644 --- a/base/applications/network/net/net.rc +++ b/base/applications/network/net/net.rc @@ -1,7 +1,5 @@ #include <windef.h> -#include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Net Command" @@ -10,34 +8,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include <reactos/version.rc> #include <net_msg.rc> - -/* UTF-8 */ -#pragma code_page(65001) - -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.rc" -#endif -#ifdef LANGUAGE_ZH_TW - #include "lang/zh-TW.rc" -#endif diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h deleted file mode 100644 index 6ce68808356..00000000000 --- a/base/applications/network/net/resource.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define IDS_USE_NOW_CONNECTED 500 diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 3a90d20850b..1c39aa3001d 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -20272,27 +20272,31 @@ Language=English Drive %1 is now connected to %2. . Language=Polish -Drive %1 is now connected to %2. +%1 jest obecnie podłączony do %2. . Language=Romanian -Drive %1 is now connected to %2. +Conectarea %1 la %2 a fost realizată. . Language=Russian -Drive %1 is now connected to %2. +%1 сейчас подключен к %2. . Language=Spanish Drive %1 is now connected to %2. . Language=Turkish -Drive %1 is now connected to %2. +%1 şuna bağlandı: %2 . Language=Chinese -Drive %1 is now connected to %2. +%1 现在连接到 %2. . Language=Taiwanese Drive %1 is now connected to %2. . +; Language=Italian +; %1 è ora connesso con %2. +; . + MessageId=3920 Severity=Success Facility=System

1 0

[reactos] 01/01: [SHELL32] Delete IDM_RECENTMENUHEAD resource menu (#2705)
by Katayama Hirofumi MZ 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77b8505393069f6a11a15… commit 77b8505393069f6a11a1524705d8838e06ace89a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 1 15:58:58 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 1 15:58:58 2020 +0900 [SHELL32] Delete IDM_RECENTMENUHEAD resource menu (#2705) Follow-up of #2648. Reduce translation cost and resource data. CORE-3588, CORE-11483 --- dll/win32/shell32/lang/bg-BG.rc | 10 ----- dll/win32/shell32/lang/ca-ES.rc | 10 ----- dll/win32/shell32/lang/cs-CZ.rc | 10 ----- dll/win32/shell32/lang/da-DK.rc | 10 ----- dll/win32/shell32/lang/de-DE.rc | 10 ----- dll/win32/shell32/lang/el-GR.rc | 10 ----- dll/win32/shell32/lang/en-GB.rc | 10 ----- dll/win32/shell32/lang/en-US.rc | 10 ----- dll/win32/shell32/lang/es-ES.rc | 10 ----- dll/win32/shell32/lang/et-EE.rc | 10 ----- dll/win32/shell32/lang/fi-FI.rc | 10 ----- dll/win32/shell32/lang/fr-FR.rc | 10 ----- dll/win32/shell32/lang/he-IL.rc | 10 ----- dll/win32/shell32/lang/hi-IN.rc | 10 ----- dll/win32/shell32/lang/hu-HU.rc | 10 ----- dll/win32/shell32/lang/id-ID.rc | 10 ----- dll/win32/shell32/lang/it-IT.rc | 10 ----- dll/win32/shell32/lang/ja-JP.rc | 10 ----- dll/win32/shell32/lang/ko-KR.rc | 10 ----- dll/win32/shell32/lang/nl-NL.rc | 10 ----- dll/win32/shell32/lang/no-NO.rc | 10 ----- dll/win32/shell32/lang/pl-PL.rc | 10 ----- dll/win32/shell32/lang/pt-BR.rc | 10 ----- dll/win32/shell32/lang/pt-PT.rc | 10 ----- dll/win32/shell32/lang/ro-RO.rc | 10 ----- dll/win32/shell32/lang/ru-RU.rc | 10 ----- dll/win32/shell32/lang/sk-SK.rc | 10 ----- dll/win32/shell32/lang/sl-SI.rc | 10 ----- dll/win32/shell32/lang/sq-AL.rc | 10 ----- dll/win32/shell32/lang/sv-SE.rc | 10 ----- dll/win32/shell32/lang/tr-TR.rc | 10 ----- dll/win32/shell32/lang/uk-UA.rc | 10 ----- dll/win32/shell32/lang/zh-CN.rc | 10 ----- dll/win32/shell32/lang/zh-TW.rc | 10 ----- dll/win32/shell32/shellmenu/CStartMenu.cpp | 68 +++++++++++------------------- dll/win32/shell32/shresdef.h | 1 - 36 files changed, 25 insertions(+), 384 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index be31a2a5fa8..60dfdef12b6 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -89,16 +89,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Търсене на папка" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 4ff2d225cb5..eaa4ef533fa 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 3a376f7cee2..eb22e09d24d 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -94,16 +94,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procházet..." diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 090a4fc746e..44024aa74a9 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -94,16 +94,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Søg efter Mappe" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 1161df3b3cf..83e925a1c97 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Verzeichnis auswählen" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 363fac9c214..c1aa53d59bd 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Αναζήτηση φακέλου" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 6ba9876c71f..4d22e4619a0 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index b2916a320cd..59e73d761b3 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index b3901213946..480f3485d0b 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -97,16 +97,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Explorar carpeta" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index ac80fae969d..6216de12c16 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -95,16 +95,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Vali kaust" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 43581eadaa6..06a1f29be93 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Valitse Kansio" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 73c689127cc..a6278672fa2 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Parcourir" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index bfcefecc97f..0efa91a6fd9 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -90,16 +90,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "בחירת תיקיה" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 83f6132d795..091a130073a 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "फोल्डर खोंजे" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 0b0d475dac0..0af2780e621 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Mappák böngészése" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 8cb23ff593a..98263fe8e29 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Jelajah Folder" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index a2eca5662f2..2434c653566 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Sfoglia Cartella" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 443bb981d88..fbbaab06efb 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "フォルダの参照" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index bf28de47ffa..443dc3a49a7 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index f663fc09504..aec45c77f48 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 75763afc44c..1fa6e372702 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bla etter mappe" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 42e6da56d2d..86e87f196ad 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -94,16 +94,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "Moje dokumenty", IDM_MYDOCUMENTS - MENUITEM "Moje obrazy", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Wybierz folder" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 92e5083e343..8cee41dbe22 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pasta" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index b435f9e3933..bc225294c1a 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Procurar pastas" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index e6acbd58c2b..42c613287fd 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -90,16 +90,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Specificare dosar" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 27e5ef0c1ec..de203d29dc8 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -95,16 +95,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Обзор" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index bd7365ad04f..a84187e4eb3 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 400bb4a583b..55ba4f299c6 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Browse for Folder" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index c4ad1c21d2e..8bccc16665a 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -92,16 +92,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Shfleto për Dosje" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index b76b26c1683..51bac8cb790 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Bläddra efter mapp" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 1891bbed366..5980461b725 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -90,16 +90,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dizin İçin Göz At" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 8a6679163c8..94405fdcd52 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -88,16 +88,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Огляд папок" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index e465aa01a66..d280cb26a3f 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -98,16 +98,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "浏览文件夹" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index e8446a8fb3a..292a780ebda 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -97,16 +97,6 @@ BEGIN END END -IDM_RECENTMENUHEAD MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "My Documents", IDM_MYDOCUMENTS - MENUITEM "My Pictures", IDM_MYPICTURES - MENUITEM SEPARATOR - END -END - IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "瀏覽資料夾" diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp index 105be22c5dc..8831ab860b5 100644 --- a/dll/win32/shell32/shellmenu/CStartMenu.cpp +++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp @@ -69,7 +69,6 @@ private: CComPtr<IShellFolder> m_psfPrograms; LPITEMIDLIST m_pidlPrograms; - HMENU m_hRecentMenu; HRESULT OnInitMenu() { @@ -95,12 +94,6 @@ private: if (FAILED_UNEXPECTEDLY(hr)) return hr; - m_hRecentMenu = ::LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(IDM_RECENTMENUHEAD)); - if (m_hRecentMenu == NULL) - { - ERR("m_hRecentMenu == NULL\n"); - } - return hr; } @@ -157,51 +150,38 @@ private: return S_OK; } - HMENU CreateRecentMenu(BOOL bExpandMyDocuments, BOOL bExpandMyPictures) const + void InsertRecentItem(HMENU hMenu, UINT nID, INT csidl, BOOL bExpand) const { - HMENU hMenu = ::CreateMenu(); - if (hMenu == NULL) + WCHAR szPath[MAX_PATH]; + if (!SHGetSpecialFolderPathW(NULL, szPath, csidl, FALSE)) { - ERR("HMenu == NULL\n"); - return NULL; + ERR("SHGetSpecialFolderPathW failed\n"); + return; } - HMENU hSubMenu = ::GetSubMenu(m_hRecentMenu, 0); - if (hSubMenu == NULL) + LPWSTR pszText = PathFindFileNameW(szPath); + if (bExpand) { - ERR("hSubMenu == NULL\n"); - return NULL; + MENUITEMINFOW mii = { sizeof(mii), MIIM_TYPE | MIIM_ID | MIIM_SUBMENU }; + mii.fType = MFT_STRING; + mii.wID = nID; + mii.hSubMenu = ::CreatePopupMenu(); + mii.dwTypeData = pszText; + mii.cch = lstrlenW(pszText); + InsertMenuItemW(hMenu, GetMenuItemCount(hMenu), TRUE, &mii); } - - WCHAR szText[128]; - UINT i, nCount = GetMenuItemCount(hSubMenu); - for (i = 0; i < nCount; ++i) + else { - UINT nID = GetMenuItemID(hSubMenu, i); - if (GetMenuString(hSubMenu, i, szText, _countof(szText), MF_BYPOSITION)) - { - if ((nID == IDM_MYDOCUMENTS && bExpandMyDocuments) || - (nID == IDM_MYPICTURES && bExpandMyPictures)) - { - MENUITEMINFOW mii = { sizeof(mii), MIIM_TYPE | MIIM_ID | MIIM_SUBMENU }; - mii.fType = MFT_STRING; - mii.wID = nID; - mii.hSubMenu = ::CreatePopupMenu(); - mii.dwTypeData = szText; - mii.cch = lstrlenW(szText); - InsertMenuItemW(hMenu, i, TRUE, &mii); - } - else - { - AppendMenuW(hMenu, MF_STRING | MF_ENABLED, nID, szText); - } - } - else - { - AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); - } + AppendMenuW(hMenu, MF_STRING | MF_ENABLED, nID, pszText); } + } + HMENU CreateRecentMenu(BOOL bExpandMyDocuments, BOOL bExpandMyPictures) const + { + HMENU hMenu = ::CreateMenu(); + InsertRecentItem(hMenu, IDM_MYDOCUMENTS, CSIDL_MYDOCUMENTS, bExpandMyDocuments); + InsertRecentItem(hMenu, IDM_MYPICTURES, CSIDL_MYPICTURES, bExpandMyPictures); + AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); return hMenu; } @@ -244,6 +224,8 @@ private: BOOL bExpandMyDocuments = FALSE; /* FIXME: Get value from registry */ BOOL bExpandMyPictures = FALSE; /* FIXME: Get value from registry */ HMENU hMenu = CreateRecentMenu(bExpandMyDocuments, bExpandMyPictures); + if (hMenu == NULL) + ERR("CreateRecentMenu failed\n"); hr = pShellMenu->SetMenu(hMenu, NULL, SMSET_BOTTOM); if (FAILED_UNEXPECTEDLY(hr)) diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index f9efb726a3c..21c498e9ed7 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -794,7 +794,6 @@ #define IDM_COPYHERE 0x7 #define IDM_MOVEHERE 0x8 #define IDM_LINKHERE 0xB -#define IDM_RECENTMENUHEAD 401 #define IDM_MYDOCUMENTS 516 #define IDM_MYPICTURES 518

1 0

[reactos] 01/01: [CPL][HOTPLUG] Add Japanese translation
by Katayama Hirofumi MZ 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d62b1a9ce54ed21690f5d… commit d62b1a9ce54ed21690f5d5d9cbe9cd549b6c816a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 1 10:52:19 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri May 1 10:52:19 2020 +0900 [CPL][HOTPLUG] Add Japanese translation --- dll/cpl/hotplug/hotplug.rc | 3 +++ dll/cpl/hotplug/lang/ja-JP.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index d8d0d822a57..bd08067678f 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -36,6 +36,9 @@ IDI_HOTPLUG ICON "resources/1.ico" #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PT_PT #include "lang/pt-PT.rc" #endif diff --git a/dll/cpl/hotplug/lang/ja-JP.rc b/dll/cpl/hotplug/lang/ja-JP.rc new file mode 100644 index 00000000000..3bc80c5bb2e --- /dev/null +++ b/dll/cpl/hotplug/lang/ja-JP.rc @@ -0,0 +1,30 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "安全なハードウェアの取り外し" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "取り外したいデバイスを選択して停止をクリックして下さい。デバイスが安全に取り外せるようになったら ReactOS があなたに通知します。", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ハードウェアデバイス(&H):", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "プロパティ(&P)", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "停止(&S)", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "デバイスコンポーネントを表示(&D)", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 140, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "閉じる(&C)", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + + +/* Menus */ + +IDM_POPUP_DEVICE_TREE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "停止", IDM_STOP + MENUITEM "プロパティ", IDM_PROPERTIES + END +END

1 0

[reactos] 01/01: [TIMEDATA] Improve Japanese translation
by Katayama Hirofumi MZ 01 May '20

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bf4cc43044e2f146a1e4… commit 0bf4cc43044e2f146a1e44ca84e29e8f8dcc773d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 1 10:37:46 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri May 1 10:37:46 2020 +0900 [TIMEDATA] Improve Japanese translation --- dll/cpl/timedate/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/timedate/lang/ja-JP.rc b/dll/cpl/timedate/lang/ja-JP.rc index 17e19ad38f1..b0e673241ad 100644 --- a/dll/cpl/timedate/lang/ja-JP.rc +++ b/dll/cpl/timedate/lang/ja-JP.rc @@ -54,6 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "次回の同期: %s %s" IDS_INETTIMESYNCING "ReactOSが %s と同期する間、お待ちください" IDS_INETTIMEERROR "ReactOSが %s と同期中にエラーが発生しました" - IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "時刻を同期するための NTP サーバ名を入力して下さい" + IDS_INETTIMEWELCOME "コンピュータの時刻を同期するための NTP サーバをリストから選択するか、NTP サーバ名を入力して下さい" END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2020