Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

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

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5765c5be26d5fdba2833b… commit 5765c5be26d5fdba2833b5a915b1df5654660707 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 1 10:34:36 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri May 1 10:34:36 2020 +0900 [UTILMAN] Add Japanese translation --- base/applications/utilman/lang/ja-JP.rc | 7 +++++++ base/applications/utilman/utilman.rc | 3 +++ 2 files changed, 10 insertions(+) diff --git a/base/applications/utilman/lang/ja-JP.rc b/base/applications/utilman/lang/ja-JP.rc new file mode 100644 index 00000000000..f4dda5a2dfa --- /dev/null +++ b/base/applications/utilman/lang/ja-JP.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_FAIL_INIT "ユーティリティマネージャライブラリの初期化に失敗しました。エラーコードは %lu です。" + IDS_FAIL_INIT_TITLE "初期化に失敗しました" +END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index 5d8fcf2e18d..f5cca256629 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -31,6 +31,9 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

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

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fda2f97535b1eeddb1cb… commit 4fda2f97535b1eeddb1cbfe41f4be01b3440669d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 1 10:31:11 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri May 1 10:31:11 2020 +0900 [CMDUTILS][LABEL] Improve Japanese translation --- base/applications/cmdutils/label/lang/ja-JP.rc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/base/applications/cmdutils/label/lang/ja-JP.rc b/base/applications/cmdutils/label/lang/ja-JP.rc index 5182180384d..3dcf005b924 100644 --- a/base/applications/cmdutils/label/lang/ja-JP.rc +++ b/base/applications/cmdutils/label/lang/ja-JP.rc @@ -2,17 +2,16 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN -// STRING_LABEL_HELP "ディスクのボリュームラベルを表示または変更します。\n\nLABEL [ドライブ:][ラベル]\n" - STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ -LABEL [drive:][label]\n\n\ - drive: Specifies the drive letter of a drive.\n\ - label Specifies the label of the drive." + STRING_LABEL_HELP "ディスクのボリュームラベルを作成、変更または削除します。\n\n\ +LABEL [ドライブ:][ラベル]\n\n\ + ドライブ: ドライブのドライブ文字を指定します。\n\ + ラベルドライブのラベルを指定します。" STRING_LABEL_TEXT1 "ドライブ %c: のボリュームラベルは %s です\n" STRING_LABEL_TEXT2 "ドライブ %c: にはボリュームラベルがありませんl\n" STRING_LABEL_TEXT3 "ボリュームシリアル番号は %04X-%04X\n です" STRING_LABEL_TEXT4 "ボリュームラベルを 32 文字以内で入力してください。\n必要なければ Enter キーを押してください: " - STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " + STRING_LABEL_PROMPT "現在のボリュームラベルを削除しますか (はい:Y / いいえ:N)? " STRING_LABEL_OPTIONS "YN" STRING_ERROR_INVALID_DRIVE "無効なドライブ指定です。\n" - STRING_ERROR_INVALID_LABEL "Invalid volume label\n" + STRING_ERROR_INVALID_LABEL "無効なボリュームラベルです。\n" END

1 0

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

01 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7812c537de7f1616d97c8… commit 7812c537de7f1616d97c8372810abb8f1b5e5770 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 1 10:25:47 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri May 1 10:25:47 2020 +0900 [MYDOCS] Add Japanese translation --- dll/shellext/mydocs/lang/ja-JP.rc | 6 ++++++ dll/shellext/mydocs/mydocs.rc | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dll/shellext/mydocs/lang/ja-JP.rc b/dll/shellext/mydocs/lang/ja-JP.rc new file mode 100644 index 00000000000..41d72bcfe66 --- /dev/null +++ b/dll/shellext/mydocs/lang/ja-JP.rc @@ -0,0 +1,6 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NOSRCFILEFOUND "ファイルまたはフォルダ '%ls' は見つかりません。" +} diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc index 35bbe8f9a84..9f6f11aad4c 100644 --- a/dll/shellext/mydocs/mydocs.rc +++ b/dll/shellext/mydocs/mydocs.rc @@ -21,6 +21,9 @@ IDR_MYDOCS REGISTRY "res/mydocs.rgs" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif

1 0

[reactos] 01/01: [CMAKE] Support file lists in add_cd_file for all cases Addendum to 6b48d54
by Victor Perevertkin 30 Apr '20

30 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4e37f936347fef84ff2d… commit f4e37f936347fef84ff2df4599892bc5ad14402d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri May 1 02:39:59 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 1 02:39:59 2020 +0300 [CMAKE] Support file lists in add_cd_file for all cases Addendum to 6b48d54 --- sdk/cmake/CMakeMacros.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 9107de4645d..1f3043667f0 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -363,15 +363,19 @@ function(add_cd_file) add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() - # add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n") + foreach(item ${_CD_FILE}) + # add it in reactos.cab + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n") + + # manage dependency - file level + set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item}) + endforeach() + # manage dependency - target level if(_CD_TARGET) add_dependencies(reactos_cab_inf ${_CD_TARGET}) endif() - # manage dependency - file level - set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${_CD_FILE}) endif() endif() #end bootcd

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