Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [SHELL32] Update Japanese (ja-JP) tranlation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=294ec1e6f4fc7f03738bf… commit 294ec1e6f4fc7f03738bf632ac9a78f52869199d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 20:21:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 20:21:45 2023 +0900 [SHELL32] Update Japanese (ja-JP) tranlation CORE-18706 --- dll/win32/shell32/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 507c0abc428..4f2281ed0cc 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -805,8 +805,8 @@ BEGIN IDS_MOVEERROR "移動できません '%s': %s" IDS_COPYERROR "コピーできません '%s': %s" - IDS_CREATEFILE_DENIED "Could not create file %1" - IDS_CREATEFILE_CAPTION "Error creating file" + IDS_CREATEFILE_DENIED "ファイル %1 を作成できません" + IDS_CREATEFILE_CAPTION "ファイルの作成エラー" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" IDS_DELETEITEM_CAPTION "ファイル削除の確認"

1 year, 3 months

[reactos] 01/01: [MSGINA] Update Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f23bb1ab76747d5c040c4… commit f23bb1ab76747d5c040c4de9fef9b52ec584889e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 20:16:28 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 20:16:45 2023 +0900 [MSGINA] Update Japanese (ja-JP) translation CORE-18706 --- dll/win32/msgina/lang/ja-JP.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 9373b73e0c5..4224dc976f9 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -239,10 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "あなたのアカウントはこの時間のログオンを妨げる時間制限があります。あとでやり直して下さい。" IDS_INVALIDWORKSTATION "あなたのアカウントはこのコンピュータで使えないように設定されています。他のコンピュータをお使い下さい。" IDS_ACCOUNTRESTRICTION "アカウント制限のため、あなたはログオンできません。" - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYLOGOFFTITLE "ReactOS のログオフ" + IDS_EMERGENCYLOGOFF "すぐにログオフするにはOKをクリックしてください。保存していないデータは失われます。最終手段としてのみお使いください。" + IDS_EMERGENCYRESTARTTITLE "緊急再起動" + IDS_EMERGENCYRESTART "すぐに再起動するにはOKをクリックしてください。保存していないデータは失われます。最終手段としてのみお使いください。" END /* Shutdown Dialog Strings */

1 year, 3 months

[reactos] 01/01: [WINLOGON][MSGINA] Add emergency restart and log off features (#5629)

by Carl J. Bialorucki

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2263547985f05efa6fff4… commit 2263547985f05efa6fff46da5c0d8d38f8c48918 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 31 03:51:54 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 31 11:51:54 2023 +0200 [WINLOGON][MSGINA] Add emergency restart and log off features (#5629) CORE-18958 Introduce an emergency log-off and restart feature, available when holding down the control key and selecting "Log Off" or "Shut down" in the MSGINA Ctrl-Alt-Del security dialog, similar to Windows Server 2003 and newer Windows versions. --- base/system/winlogon/sas.c | 6 +++++- dll/win32/msgina/gui.c | 40 ++++++++++++++++++++++++++++++++++++++-- dll/win32/msgina/lang/bg-BG.rc | 4 ++++ dll/win32/msgina/lang/cs-CZ.rc | 4 ++++ dll/win32/msgina/lang/de-DE.rc | 4 ++++ dll/win32/msgina/lang/en-US.rc | 4 ++++ dll/win32/msgina/lang/es-ES.rc | 4 ++++ dll/win32/msgina/lang/fr-FR.rc | 4 ++++ dll/win32/msgina/lang/he-IL.rc | 4 ++++ dll/win32/msgina/lang/hu-HU.rc | 4 ++++ dll/win32/msgina/lang/id-ID.rc | 4 ++++ dll/win32/msgina/lang/it-IT.rc | 4 ++++ dll/win32/msgina/lang/ja-JP.rc | 4 ++++ dll/win32/msgina/lang/no-NO.rc | 4 ++++ dll/win32/msgina/lang/pl-PL.rc | 4 ++++ dll/win32/msgina/lang/pt-PT.rc | 4 ++++ dll/win32/msgina/lang/ro-RO.rc | 4 ++++ dll/win32/msgina/lang/ru-RU.rc | 4 ++++ dll/win32/msgina/lang/sk-SK.rc | 4 ++++ dll/win32/msgina/lang/sq-AL.rc | 4 ++++ dll/win32/msgina/lang/tr-TR.rc | 4 ++++ dll/win32/msgina/lang/uk-UA.rc | 4 ++++ dll/win32/msgina/lang/zh-CN.rc | 4 ++++ dll/win32/msgina/lang/zh-HK.rc | 4 ++++ dll/win32/msgina/lang/zh-TW.rc | 4 ++++ dll/win32/msgina/resource.h | 6 ++++++ 26 files changed, 141 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index b94663b1c55..c9675ba314d 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1060,13 +1060,17 @@ DoGenericAction( break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ case WLX_SAS_ACTION_SHUTDOWN: /* 0x05 */ + case WLX_SAS_ACTION_FORCE_LOGOFF: /* 0x09 */ case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: /* 0x0a */ case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ if (Session->LogonState != STATE_LOGGED_OFF) { + UINT LogOffFlags = EWX_LOGOFF; + if (wlxAction == WLX_SAS_ACTION_FORCE_LOGOFF) + LogOffFlags |= EWX_FORCE; if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; - if (!NT_SUCCESS(HandleLogoff(Session, EWX_LOGOFF))) + if (!NT_SUCCESS(HandleLogoff(Session, LogOffFlags))) { RemoveStatusMessage(Session); break; diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index d46126d3c25..e48c7175864 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -11,6 +11,8 @@ #include <wingdi.h> #include <winnls.h> #include <winreg.h> +#include <ndk/exfuncs.h> +#include <ndk/setypes.h> typedef struct _DISPLAYSTATUSMSG { @@ -31,6 +33,8 @@ typedef struct _LEGALNOTICEDATA // Timer ID for the animated dialog bar. #define IDT_BAR 1 +#define ISKEYDOWN(x) (GetKeyState(x) & 0x8000) + typedef struct _DLG_DATA { PGINA_CONTEXT pgContext; @@ -985,12 +989,44 @@ SecurityDialogProc( EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); return TRUE; case IDC_SECURITY_LOGOFF: - if (OnLogOff(hwndDlg, pgContext) == IDYES) + if (ISKEYDOWN(VK_CONTROL)) + { + if (ResourceMessageBox(pgContext, + hwndDlg, + MB_OKCANCEL | MB_ICONSTOP, + IDS_EMERGENCYLOGOFFTITLE, + IDS_EMERGENCYLOGOFF) == IDOK) + { + EndDialog(hwndDlg, WLX_SAS_ACTION_FORCE_LOGOFF); + } + } + else if (OnLogOff(hwndDlg, pgContext) == IDYES) + { EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); + } return TRUE; case IDC_SECURITY_SHUTDOWN: - if (OnShutDown(hwndDlg, pgContext) == IDOK) + /* Emergency restart feature */ + if (ISKEYDOWN(VK_CONTROL)) + { + if (ResourceMessageBox(pgContext, + hwndDlg, + MB_OKCANCEL | MB_ICONSTOP, + IDS_EMERGENCYRESTARTTITLE, + IDS_EMERGENCYRESTART) == IDOK) + { + BOOLEAN Old; + + ERR("Emergency restarting NT...\n"); + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); + NtShutdownSystem(ShutdownReboot); + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); + } + } + else if (OnShutDown(hwndDlg, pgContext) == IDOK) + { EndDialog(hwndDlg, pgContext->nShutdownAction); + } return TRUE; case IDC_SECURITY_CHANGEPWD: if (OnChangePassword(hwndDlg, pgContext)) diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 19ec5563b02..8e5a0237010 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Вашия акаунт е временно ограничен в момента. Моля опитайте по-късно." IDS_INVALIDWORKSTATION "Акаунта ви е ограничен на този компютър. Моля използвайте друг компютър." IDS_ACCOUNTRESTRICTION "Не можете да влезете поради ограничение на акаунта." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index 315efc11b06..3d95fe5f051 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -239,6 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index 9f8fe3c47f6..88eb44ed1bb 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Ihr Konto sieht es nicht vor, dass Sie sich zu dieser Zeit anmelden. Bitte versuchen Sie es später noch einmal." IDS_INVALIDWORKSTATION "Ihr Konto sieht es nicht vor, dass Sie sich an diesem Computer anmelden. Bitte melden Sie sich an einem anderen Computer an." IDS_ACCOUNTRESTRICTION "Wegen einer Kontenbeschränkung dürfen Sie sich nicht anmelden." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index f5525052df0..68da6e2a0ff 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -235,6 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 43e75b7739b..8577228c538 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "En este momento, tu cuenta tiene restricciones horarias para acceder. Inténtelo de nuevo más tarde." IDS_INVALIDWORKSTATION "Su cuenta está configurada para no permitirte usar este equipo. Inténtelo en otro equipo." IDS_ACCOUNTRESTRICTION "Es imposible acceder porque tu cuenta tiene restricciones." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 6618e61677f..02280e05a36 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Votre compte a des restrictions temporelles qui vous empêchent de vous connecter à cette heure-ci. Veuillez réessayer ultérieurement." IDS_INVALIDWORKSTATION "Votre compte a été configuré pour que vous n'utilisiez pas cet ordinateur. Veuillez réessayer depuis un autre ordinateur." IDS_ACCOUNTRESTRICTION "Impossible de vous connecter en raison d'une restriction sur votre compte." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index b625be9fcce..2f36d057d49 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/hu-HU.rc b/dll/win32/msgina/lang/hu-HU.rc index 4eaa3e0f614..4d7024a20d8 100644 --- a/dll/win32/msgina/lang/hu-HU.rc +++ b/dll/win32/msgina/lang/hu-HU.rc @@ -235,6 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "A fiókján olyan időkorlátozás van, amely miatt jelenleg nem tud belépni. Kérjük próbálja újra később." IDS_INVALIDWORKSTATION "A fiókja úgy van beállítva hogy nem használhatja ezt a számítógépet. Kérjük próbálkozzon egy másik számítógéppel." IDS_ACCOUNTRESTRICTION "Fiókkorlátozás miatt nem sikerült a bejelentkezés." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 9cdbb0eecf0..fff394be844 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Akun anda memiliki pembatasan waktu sehingga mencegah untuk masuk saat ini. Mohon coba lagi nanti." IDS_INVALIDWORKSTATION "Akun anda disetel untuk mencegah masuk di komputer ini. Mohon coba gunakan komputer lain." IDS_ACCOUNTRESTRICTION "Tidak bisa masuk karena pembatasan akun." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 205b59ef30c..dc7a5621c83 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 65f8a78d4ea..9373b73e0c5 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -239,6 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "あなたのアカウントはこの時間のログオンを妨げる時間制限があります。あとでやり直して下さい。" IDS_INVALIDWORKSTATION "あなたのアカウントはこのコンピュータで使えないように設定されています。他のコンピュータをお使い下さい。" IDS_ACCOUNTRESTRICTION "アカウント制限のため、あなたはログオンできません。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index e78d6db9e91..e8f9d147338 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 2b0e05a6849..9b61dd8189b 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -245,6 +245,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Twoje konto ma ograniczenia czasowe, które uniemożliwiają zalogowanie się w tej chwili. Spróbuj ponownie później." IDS_INVALIDWORKSTATION "Twoje konto zostało skonfigurowane w sposób nie zezwalający na używanie tego komputera. Spróbuj na innym komputerze." IDS_ACCOUNTRESTRICTION "Nie możesz się zalogować z powodu ograniczeń konta." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/pt-PT.rc b/dll/win32/msgina/lang/pt-PT.rc index 52d369e2600..db570360cca 100644 --- a/dll/win32/msgina/lang/pt-PT.rc +++ b/dll/win32/msgina/lang/pt-PT.rc @@ -235,6 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "A sua conta tem restrições de horário que impedem o início de sessão no momento. Por favor, tente novamente mais tarde." IDS_INVALIDWORKSTATION "A sua conta está configurada para impedir que use este computador. Por favor, tente outro computador." IDS_ACCOUNTRESTRICTION "Não é possível iniciar sessão devido a uma restrição de conta." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index 277ff7d38cd..cfbc268afd6 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Contul dumneavoastră are restricții de timp care vă împiedică să vă conectați în acest moment. Încercați mai târziu." IDS_INVALIDWORKSTATION "Contul dumneavoastră este configurat pentru a vă preveni în a folosi acest calculator. Încercați la alt calculator." IDS_ACCOUNTRESTRICTION "Eșec în conectarea dumneavoastră din cauza unei restricții a contului." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 17140ab8746..7db4abd7ad6 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -236,6 +236,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 68ff7b1f6f4..ba9ad960970 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -239,6 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index acad6315c7b..9d5cb36dfcb 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -238,6 +238,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index 4ecb4df264a..88e3ca86df7 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -236,6 +236,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Hesabınızda şu anda oturum açmanızı engelleyen zaman kısıtlamaları var. Lütfen daha sonra tekrar deneyiniz." IDS_INVALIDWORKSTATION "Hesabınız, bu bilgisayarı kullanmanızı engelleyecek şekilde yapılandırıldı. Lütfen başka bir bilgisayar deneyiniz." IDS_ACCOUNTRESTRICTION "Hesap kısıtlaması nedeniyle oturum açılamıyor." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 068edc742c1..d7306e19178 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -242,6 +242,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Ваш профіль має обмеження часу, через що ви не можете зайти зараз. Будь-ласка, спробуйте пізніше." IDS_INVALIDWORKSTATION "Ваш профіль налаштовано так, що ви не можете користуватись цим комп'ютером. Спробуйте інший комп'ютер." IDS_ACCOUNTRESTRICTION "Не вдалось ввійти через обмеження профілю." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 6c94954edfb..023eeb479e7 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "您的账户具有的时间限制阻止您现在登录。请稍后再试。" IDS_INVALIDWORKSTATION "您的账户设置阻止了您在这台计算机登录。请在另一台计算机尝试登录。" IDS_ACCOUNTRESTRICTION "您的账户由于账户限制而不能登录。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-HK.rc b/dll/win32/msgina/lang/zh-HK.rc index a5efae24eb7..19c95103c7e 100644 --- a/dll/win32/msgina/lang/zh-HK.rc +++ b/dll/win32/msgina/lang/zh-HK.rc @@ -242,6 +242,10 @@ BEGIN IDS_INVALIDLOGONHOURS "由於您的帳户有時間限制，因此目前無法讓您登入。請稍候再試一次。" IDS_INVALIDWORKSTATION "您的帳户已設定為不能使用這個電腦登入。請使用其他電腦登入。" IDS_ACCOUNTRESTRICTION "由於您的帳户的限制，因此無法讓您登入。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index d89e8d9d7bc..a5f762c3054 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -242,6 +242,10 @@ BEGIN IDS_INVALIDLOGONHOURS "由於您的帳戶有時間限制，因此目前無法讓您登入。請稍候再試一次。" IDS_INVALIDWORKSTATION "您的帳戶已設定為不能使用這個電腦登入。請使用其他電腦登入。" IDS_ACCOUNTRESTRICTION "由於您的帳戶的限制，因此無法讓您登入。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index 5020c6dfb7d..18fac198638 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -122,3 +122,9 @@ #define IDS_SHUTDOWN_RESTART_DESC 50007 #define IDS_SHUTDOWN_SLEEP_DESC 50008 #define IDS_SHUTDOWN_HIBERNATE_DESC 50009 + +/* Emergency log off and restart */ +#define IDS_EMERGENCYLOGOFFTITLE 50010 +#define IDS_EMERGENCYLOGOFF 50011 +#define IDS_EMERGENCYRESTARTTITLE 50012 +#define IDS_EMERGENCYRESTART 50013

1 year, 3 months

[reactos] 01/01: [SHDOCVW][SDK][COM_APITEST] Implement MRU List for Shell Bag, Part 1 (#5626)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58770200e75bd8f0c4448… commit 58770200e75bd8f0c44485b0281fbd97fa799406 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 09:35:00 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 31 09:35:00 2023 +0900 [SHDOCVW][SDK][COM_APITEST] Implement MRU List for Shell Bag, Part 1 (#5626) - Add mrulist.cpp source file. - Add CMruBase, CMruLongList, CMruNode, and CMruPidlList classes with stub functions. - Add CLSID_MruPidlList and CLSID_MruLongList. - Add IMruDataList interface into <shlobj_undoc.h>. - Add IID_IMruDataList and CLSID_MruLongList definitions into <shlguid_undoc.h>. CORE-9283 --- dll/win32/shdocvw/CMakeLists.txt | 1 + dll/win32/shdocvw/mrulist.cpp | 429 ++++++++++++++++++++++++++++ dll/win32/shdocvw/shdocvw.h | 5 + dll/win32/shdocvw/shdocvw_main.c | 8 + modules/rostests/apitests/com/com_apitest.c | 1 + modules/rostests/apitests/com/com_apitest.h | 1 + modules/rostests/apitests/com/shdocvw.c | 1 + sdk/include/reactos/shlguid_undoc.h | 2 + sdk/include/reactos/shlobj_undoc.h | 41 +++ 9 files changed, 489 insertions(+) diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index ecc274f294f..307fee5ad6e 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -17,6 +17,7 @@ set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT add_library(shdocvw MODULE ${SOURCE} + mrulist.cpp shdocvw.rc ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) diff --git a/dll/win32/shdocvw/mrulist.cpp b/dll/win32/shdocvw/mrulist.cpp new file mode 100644 index 00000000000..564c3d9e9be --- /dev/null +++ b/dll/win32/shdocvw/mrulist.cpp @@ -0,0 +1,429 @@ +/* + * PROJECT: ReactOS shdocvw + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Implement MRU List of shdocvw.dll + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> +#include <oleauto.h> +#include <shlobj.h> +#include <shlobj_undoc.h> +#include <shlguid_undoc.h> +#include <shlwapi.h> +#include "shdocvw.h" + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +extern "C" void __cxa_pure_virtual(void) +{ + ::DebugBreak(); +} + +class CMruBase + : public IMruDataList +{ +protected: + LONG m_cRefs = 1; // Reference count + DWORD m_dwFlags = 0; // The flags + BOOL m_bFlag1 = FALSE; // ??? + BOOL m_bChecked = FALSE; // ??? + HKEY m_hKey = NULL; // A registry key + DWORD m_cSlotRooms = 0; // Rooms for slots + DWORD m_cSlots = 0; // The # of slots + SLOTCOMPARE m_fnCompare = NULL; // The comparison function + SLOTITEMDATA * m_pSlots = NULL; // Slot data + +public: + CMruBase() + { + } + virtual ~CMruBase(); + + // IUnknown methods + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override + { + return ::InterlockedIncrement(&m_cRefs); + } + STDMETHODIMP_(ULONG) Release() override + { + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; + } + + // IMruDataList methods + STDMETHODIMP InitData(UINT cCapacity, UINT flags, HKEY hKey, LPCWSTR pszSubKey, + SLOTCOMPARE fnCompare) override; + STDMETHODIMP AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) override; + STDMETHODIMP FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) override; + STDMETHODIMP GetData(UINT iSlot, BYTE *pbData, DWORD cbData) override; + STDMETHODIMP QueryInfo(UINT iSlot, UINT *puSlot, DWORD *pcbData) override; + STDMETHODIMP Delete(UINT iSlot) override; + + // Non-standard methods + virtual HRESULT _IsEqual(const SLOTITEMDATA *pSlot, LPCITEMIDLIST pidl, UINT cbPidl) const; + virtual HRESULT _DeleteValue(LPCWSTR pszValue); + virtual HRESULT _InitSlots() = 0; + virtual void _SaveSlots() = 0; + virtual UINT _UpdateSlots(UINT iSlot) = 0; + virtual void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) = 0; + virtual HRESULT _GetSlot(UINT iSlot, UINT *puSlot) = 0; + virtual HRESULT _RemoveSlot(UINT iSlot, UINT *uSlot) = 0; + + static void* operator new(size_t size) + { + return ::LocalAlloc(LPTR, size); + } + static void operator delete(void *ptr) + { + ::LocalFree(ptr); + } +}; + +CMruBase::~CMruBase() +{ + if (m_hKey) + { + ::RegCloseKey(m_hKey); + m_hKey = NULL; + } + + if (m_pSlots) + { + for (UINT iSlot = 0; iSlot < m_cSlots; ++iSlot) + { + if (m_pSlots[iSlot].pidl) + { + ::LocalFree(m_pSlots[iSlot].pidl); + m_pSlots[iSlot].pidl = NULL; + } + } + + ::LocalFree(m_pSlots); + m_pSlots = NULL; + } +} + +STDMETHODIMP CMruBase::QueryInterface(REFIID riid, void **ppvObj) +{ + if (!ppvObj) + return E_POINTER; + if (IsEqualGUID(riid, IID_IMruDataList)) + { + *ppvObj = static_cast<IMruDataList*>(this); + AddRef(); + return S_OK; + } + ERR("%s: E_NOINTERFACE\n", debugstr_guid(&riid)); + return E_NOINTERFACE; +} + +STDMETHODIMP +CMruBase::InitData( + UINT cCapacity, + UINT flags, + HKEY hKey, + LPCWSTR pszSubKey, + SLOTCOMPARE fnCompare) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruBase::AddData(const BYTE *pbData, DWORD cbData, UINT *piSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruBase::FindData(const BYTE *pbData, DWORD cbData, UINT *piSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruBase::GetData(UINT iSlot, BYTE *pbData, DWORD cbData) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruBase::QueryInfo(UINT iSlot, UINT *puSlot, DWORD *pcbData) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruBase::Delete(UINT iSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +HRESULT CMruBase::_IsEqual(const SLOTITEMDATA *pSlot, LPCITEMIDLIST pidl, UINT cbPidl) const +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +HRESULT CMruBase::_DeleteValue(LPCWSTR pszValue) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +class CMruLongList + : public CMruBase +{ +protected: + UINT *m_puSlotData = NULL; // The slot data + + void _ImportShortList(); + + HRESULT _InitSlots() override; + void _SaveSlots() override; + UINT _UpdateSlots(UINT iSlot) override; + void _SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) override; + HRESULT _GetSlot(UINT iSlot, UINT *puSlot) override; + HRESULT _RemoveSlot(UINT iSlot, UINT *uSlot) override; + +public: + CMruLongList() + { + } + + ~CMruLongList() override + { + if (m_puSlotData) + { + ::LocalFree(m_puSlotData); + m_puSlotData = NULL; + } + } +}; + +HRESULT CMruLongList::_InitSlots() +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +void CMruLongList::_SaveSlots() +{ + FIXME("Stub\n"); +} + +UINT CMruLongList::_UpdateSlots(UINT iSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +void CMruLongList::_SlotString(DWORD dwSlot, LPWSTR psz, DWORD cch) +{ + FIXME("Stub\n"); +} + +HRESULT CMruLongList::_GetSlot(UINT iSlot, UINT *puSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +HRESULT CMruLongList::_RemoveSlot(UINT iSlot, UINT *uSlot) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +void CMruLongList::_ImportShortList() +{ + FIXME("Stub\n"); +} + +EXTERN_C HRESULT +CMruLongList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3) +{ + UNREFERENCED_PARAMETER(dwUnused1); + UNREFERENCED_PARAMETER(dwUnused3); + + CMruLongList *pMruList = new CMruLongList(); + *ppv = static_cast<IMruDataList*>(pMruList); + return S_OK; +} + +class CMruNode + : public CMruLongList +{ +protected: + UINT m_uSlotData = 0; // The slot data + CMruNode *m_pParent = NULL; // The parent + IShellFolder *m_pShellFolder = NULL; // The shell folder + +public: + CMruNode() { } + CMruNode(CMruNode *pParent, UINT uSlotData); + ~CMruNode() override; + + CMruNode *GetParent(); +}; + +CMruNode::CMruNode(CMruNode *pParent, UINT uSlotData) +{ + m_uSlotData = uSlotData; + m_pParent = pParent; + pParent->AddRef(); +} + +CMruNode::~CMruNode() +{ + if (m_pParent) + { + m_pParent->Release(); + m_pParent = NULL; + } + + if (m_pShellFolder) + { + m_pShellFolder->Release(); + m_pShellFolder = NULL; + } +} + +CMruNode *CMruNode::GetParent() +{ + if (m_pParent) + m_pParent->AddRef(); + return m_pParent; +} + +class CMruPidlList + : public IMruPidlList + , public CMruNode +{ +protected: + LPBYTE m_pbSlots = NULL; // The data + DWORD m_cbSlots = 0; // The data size + HANDLE m_hMutex = NULL; // The mutex (for sync) + + BOOL _LoadNodeSlots() + { + DWORD cbSlots = m_cbSlots; + if (SHGetValueW(m_hKey, NULL, L"NodeSlots", NULL, m_pbSlots, &cbSlots) != ERROR_SUCCESS) + return FALSE; + m_cbSlots = cbSlots; + return TRUE; + } + + void _SaveNodeSlots() + { + SHSetValueW(m_hKey, NULL, L"NodeSlots", REG_BINARY, m_pbSlots, m_cbSlots); + } + +public: + CMruPidlList() + { + } + + virtual ~CMruPidlList() + { + m_pbSlots = (LPBYTE)::LocalFree(m_pbSlots); + if (m_hMutex) + { + ::CloseHandle(m_hMutex); + m_hMutex = NULL; + } + } + + // IUnknown methods + STDMETHODIMP QueryInterface(REFIID riid, void **ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override + { + return CMruBase::AddRef(); + } + STDMETHODIMP_(ULONG) Release() override + { + return CMruBase::Release(); + } + + // IMruPidlList methods + STDMETHODIMP InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszName) override; + STDMETHODIMP UsePidl(LPCITEMIDLIST pidl, UINT *puSlots) override; + STDMETHODIMP QueryPidl( + LPCITEMIDLIST pidl, + UINT cSlots, + UINT *puSlots, + UINT *pcSlots) override; + STDMETHODIMP PruneKids(LPCITEMIDLIST pidl) override; +}; + +STDMETHODIMP CMruPidlList::QueryInterface(REFIID riid, void **ppvObj) +{ + if (!ppvObj) + return E_POINTER; + + if (::IsEqualGUID(riid, IID_IMruPidlList) || ::IsEqualGUID(riid, IID_IUnknown)) + { + *ppvObj = static_cast<IMruPidlList*>(this); + AddRef(); + return S_OK; + } + + ERR("%s: E_NOINTERFACE\n", debugstr_guid(&riid)); + return E_NOINTERFACE; +} + +STDMETHODIMP CMruPidlList::InitList(UINT cMRUSize, HKEY hKey, LPCWSTR pszName) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruPidlList::UsePidl(LPCITEMIDLIST pidl, UINT *puSlots) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruPidlList::QueryPidl( + LPCITEMIDLIST pidl, + UINT cSlots, + UINT *puSlots, + UINT *pcSlots) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP CMruPidlList::PruneKids(LPCITEMIDLIST pidl) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3) +{ + UNREFERENCED_PARAMETER(dwUnused1); + UNREFERENCED_PARAMETER(dwUnused3); + + *ppv = NULL; + + CMruPidlList *pMruList = new CMruPidlList(); + if (pMruList == NULL) + return E_OUTOFMEMORY; + + *ppv = static_cast<IMruPidlList*>(pMruList); + return S_OK; +} diff --git a/dll/win32/shdocvw/shdocvw.h b/dll/win32/shdocvw/shdocvw.h index 568fbadfbd6..1d8f807d8de 100644 --- a/dll/win32/shdocvw/shdocvw.h +++ b/dll/win32/shdocvw/shdocvw.h @@ -50,4 +50,9 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } +#ifdef __REACTOS__ +EXTERN_C HRESULT CMruLongList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3); +EXTERN_C HRESULT CMruPidlList_CreateInstance(DWORD dwUnused1, void **ppv, DWORD dwUnused3); +#endif + #endif /* __WINE_SHDOCVW_H */ diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index d52961909fc..0ca9d5827a5 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -30,6 +30,7 @@ #include "winreg.h" #ifdef __REACTOS__ #include "winnls.h" +#include <shlguid_undoc.h> #endif #include "shlwapi.h" #include "wininet.h" @@ -87,6 +88,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) || IsEqualGUID(&CLSID_TaskbarList, rclsid)) return get_ieframe_object(rclsid, riid, ppv); +#ifdef __REACTOS__ + if (IsEqualGUID(&CLSID_MruLongList, rclsid)) + return CMruLongList_CreateInstance(0, ppv, 0); + if (IsEqualGUID(&CLSID_MruPidlList, rclsid)) + return CMruPidlList_CreateInstance(0, ppv, 0); +#endif + /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); } diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 3200c556c7c..c60ac28d451 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -205,6 +205,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IMenuPopup), TRUE }, { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, + { ID_NAME(IID_IMruDataList) }, { ID_NAME(IID_IMruPidlList) }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index c8c8ad08d12..3bbe9e18475 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -144,6 +144,7 @@ DEFINE_GUID(IID_IHWEventHandler2, 0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xf DEFINE_GUID(IID_IInitializeWithBindCtx, 0x71c0d2bc, 0x726d, 0x45cc, 0xa6, 0xc0, 0x2e, 0x31, 0xc1, 0xdb, 0x21, 0x59); DEFINE_GUID(IID_IItemNameLimits, 0x1df0d7f1, 0xb267, 0x4d28, 0x8b, 0x10, 0x12, 0xe2, 0x32, 0x02, 0xa5, 0xc4); DEFINE_GUID(IID_IMruPidlList, 0x47851649, 0xa2ef, 0x4e67, 0xba, 0xec, 0xc6, 0xa1, 0x53, 0xac, 0x72, 0xec); +DEFINE_GUID(IID_IMruDataList, 0xFE787BCB, 0x0EE8, 0x44FB, 0x8C, 0x89, 0x12, 0xF5, 0x08, 0x91, 0x3C, 0x40); DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_INamespaceWalk, 0x57ced8a7, 0x3f4a, 0x432c, 0x93, 0x50, 0x30, 0xf2, 0x44, 0x83, 0xf7, 0x4f); DEFINE_GUID(IID_INamespaceWalkCB, 0xd92995f8, 0xcf5e, 0x4a76, 0xbf, 0x59, 0xea, 0xd3, 0x9e, 0xa2, 0xb9, 0x7e); diff --git a/modules/rostests/apitests/com/shdocvw.c b/modules/rostests/apitests/com/shdocvw.c index 34ea3efb43d..2839cc9331a 100644 --- a/modules/rostests/apitests/com/shdocvw.c +++ b/modules/rostests/apitests/com/shdocvw.c @@ -85,6 +85,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { ID_NAME(CLSID_MruLongList), { + { 0x0, &IID_IMruDataList }, { 0x0, &IID_IUnknown }, } }, diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index e233df556bd..c6d2295cb30 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -144,6 +144,8 @@ DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8 DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); DEFINE_GUID(CLSID_MruPidlList, 0x42AEDC87, 0x2188, 0x41FD, 0xB9, 0xA3, 0x0C, 0x96, 0x6F, 0xEA, 0xBE, 0xC1); DEFINE_GUID(IID_IMruPidlList, 0x47851649, 0xA2EF, 0x4E67, 0xBA, 0xEC, 0xC6, 0xA1, 0x53, 0xAC, 0x72, 0xEC); +DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC3, 0x71, 0x61, 0xC2, 0xF3, 0xEE, 0x9C); +DEFINE_GUID(IID_IMruDataList, 0xFE787BCB, 0x0EE8, 0x44FB, 0x8C, 0x89, 0x12, 0xF5, 0x08, 0x91, 0x3C, 0x40); /* The following list of interfaces was taken from here: http://www.geoffchappell.com/studies/windows/shell/shell32/interfaces/index… */ DEFINE_GUID(IID_IAggregateFilterCondition, 0x86228AA3, 0xA736, 0x4733, 0xBD, 0x8A, 0x10, 0xA8, 0x3C, 0x69, 0xBF, 0x84); diff --git a/sdk/include/reactos/shlobj_undoc.h b/sdk/include/reactos/shlobj_undoc.h index 3ed3b8a8962..33f911e05c7 100644 --- a/sdk/include/reactos/shlobj_undoc.h +++ b/sdk/include/reactos/shlobj_undoc.h @@ -26,6 +26,15 @@ extern "C" { #endif /* defined(__cplusplus) */ +typedef struct tagSLOTITEMDATA +{ + DWORD dwFlags; + UINT cbPidl; + LPITEMIDLIST pidl; +} SLOTITEMDATA, *PSLOTITEMDATA; + +typedef INT (CALLBACK *SLOTCOMPARE)(LPCITEMIDLIST, LPCITEMIDLIST, UINT); + /***************************************************************************** * New shellstate structure */ @@ -678,6 +687,38 @@ DECLARE_INTERFACE_(IShellBrowserService, IUnknown) #define IShellBrowserService_GetPropertyBag(T,a,b,c) (T)->lpVtbl->GetPropertyBag(T,a,b,c) #endif +/***************************************************************************** + * IMruDataList interface + */ +#define INTERFACE IMruDataList +DECLARE_INTERFACE_(IMruDataList, IUnknown) +{ + /*** IUnknown ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IMruDataList ***/ + STDMETHOD(InitData)(THIS_ UINT, UINT, HKEY, LPCWSTR, SLOTCOMPARE) PURE; + STDMETHOD(AddData)(THIS_ const BYTE *, DWORD, UINT*) PURE; + STDMETHOD(FindData)(THIS_ const BYTE*, DWORD, UINT*) PURE; + STDMETHOD(GetData)(THIS_ UINT, BYTE*, DWORD) PURE; + STDMETHOD(QueryInfo)(THIS_ UINT, UINT*, DWORD*) PURE; + STDMETHOD(Delete)(THIS_ UINT) PURE; +}; +#undef INTERFACE + +#ifdef COBJMACROS +#define IMruDataList_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IMruDataList_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IMruDataList_Release(T) (T)->lpVtbl->Release(T) +#define IMruDataList_InitData(T,a,b,c,d,e) (T)->lpVtbl->InitData(T,a,b,c,d,e) +#define IMruDataList_AddData(T,a,b,c) (T)->lpVtbl->AddData(T,a,b,c) +#define IMruDataList_FindData(T,a,b,c) (T)->lpVtbl->FindData(T,a,b,c) +#define IMruDataList_GetData(T,a,b,c) (T)->lpVtbl->GetData(T,a,b,c) +#define IMruDataList_QueryInfo(T,a,b,c) (T)->lpVtbl->QueryInfo(T,a,b,c) +#define IMruDataList_Delete(T,a) (T)->lpVtbl->Delete(T,a) +#endif + /***************************************************************************** * IMruPidlList interface */

1 year, 3 months

[reactos] 01/01: [COMCTL32] Fix Property Sheet initial position (#5631)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28e771713f7eb533b275c… commit 28e771713f7eb533b275c2f3fa8bfd52edb52739 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 09:32:52 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 31 09:32:52 2023 +0900 [COMCTL32] Fix Property Sheet initial position (#5631) On WM_INITDIALOG handling of the property sheet dialog procedure, move the dialog if necessary. CORE-19141 --- dll/win32/comctl32/propsheet.c | 80 ++++++++++++++++++++++++++++++++---------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/dll/win32/comctl32/propsheet.c b/dll/win32/comctl32/propsheet.c index 543372fbb7f..e58fd467a3d 100644 --- a/dll/win32/comctl32/propsheet.c +++ b/dll/win32/comctl32/propsheet.c @@ -3581,26 +3581,70 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SetFocus(GetDlgItem(hwnd, IDOK)); } #ifdef __REACTOS__ - { /* - try to fit it into the desktop - user32 positions the dialog based on the IDD_PROPSHEET template, - but we've since made it larger by adding controls - */ - RECT rcWork; - RECT rcDlg; - int dx, dy; - - if (GetWindowRect(hwnd, &rcDlg) && SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWork, 0)) - { - dx = rcDlg.right - rcWork.right; - dy = rcDlg.bottom - rcWork.bottom; + /* Move the window position if necessary */ + { + INT dx, dy; + RECT rcInit; + HWND hwndParent = psInfo->ppshheader.hwndParent; + BOOL bMove = FALSE; - if (rcDlg.right > rcWork.right) - rcDlg.left -= dx; - if (rcDlg.bottom > rcWork.bottom) - rcDlg.top -= dy; + GetWindowRect(hwnd, &rcInit); + dx = rcInit.right - rcInit.left; + dy = rcInit.bottom - rcInit.top; + + if (IsWindow(hwndParent)) + { + WINDOWPLACEMENT wndpl = { sizeof(wndpl) }; + bMove = TRUE; + + /* hwndParent can be minimized (See Control_ShowAppletInTaskbar). + Use normal position. */ + GetWindowPlacement(hwndParent, &wndpl); + rcInit = wndpl.rcNormalPosition; + if (IsWindowVisible(hwndParent) && !IsIconic(hwndParent)) + { + /* Is it Right-to-Left layout? */ + if (GetWindowLongPtrW(hwndParent, GWL_EXSTYLE) & WS_EX_RTLREADING) + rcInit.left = rcInit.right - dx - GetSystemMetrics(SM_CXSMICON); + else + rcInit.left += GetSystemMetrics(SM_CXSMICON); + + rcInit.top += GetSystemMetrics(SM_CYSMICON); + } + } + else + { + /* We cannot foresee CW_USEDEFAULT's position without communicating with USER32. + Use a top-level STATIC control to get the proper position. */ + HWND hwndDummy = CreateWindowExW(0, WC_STATICW, NULL, 0, + CW_USEDEFAULT, CW_USEDEFAULT, dx, dy, + NULL, NULL, GetModuleHandleW(NULL), NULL); + if (hwndDummy) + { + bMove = TRUE; + GetWindowRect(hwndDummy, &rcInit); + DestroyWindow(hwndDummy); + } + } - SetWindowPos(hwnd, HWND_TOPMOST, rcDlg.left, rcDlg.top, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW | SWP_NOSIZE); + if (bMove) + { + MONITORINFO mi = { sizeof(mi) }; + HMONITOR hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + if (GetMonitorInfo(hMonitor, &mi)) + { + /* Try to fit it onto the desktop */ + if (mi.rcWork.right < rcInit.left + dx) + rcInit.left = mi.rcWork.right - dx; + if (mi.rcWork.bottom < rcInit.top + dy) + rcInit.top = mi.rcWork.bottom - dy; + if (rcInit.left < mi.rcWork.left) + rcInit.left = mi.rcWork.left; + if (rcInit.top < mi.rcWork.top) + rcInit.top = mi.rcWork.top; + SetWindowPos(hwnd, NULL, rcInit.left, rcInit.top, 0, 0, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } } } #endif

1 year, 3 months

[reactos] 01/01: [REGEDIT] Support exporting registry to text file (#5619)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c16f93c5f39d3f469b3fa… commit c16f93c5f39d3f469b3fa24cbe6afcd12184cacb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 30 21:43:09 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 30 21:43:09 2023 +0900 [REGEDIT] Support exporting registry to text file (#5619) - Add txtproc.c source file. - Add some resource strings. - Add *.txt filter to export on a text file. CORE-16910 --- base/applications/regedit/CMakeLists.txt | 1 + base/applications/regedit/framewnd.c | 58 +++-- base/applications/regedit/lang/bg-BG.rc | 16 ++ base/applications/regedit/lang/cs-CZ.rc | 16 ++ base/applications/regedit/lang/de-DE.rc | 16 ++ base/applications/regedit/lang/el-GR.rc | 16 ++ base/applications/regedit/lang/en-US.rc | 16 ++ base/applications/regedit/lang/es-ES.rc | 16 ++ base/applications/regedit/lang/fr-FR.rc | 16 ++ base/applications/regedit/lang/he-IL.rc | 16 ++ base/applications/regedit/lang/hu-HU.rc | 16 ++ base/applications/regedit/lang/id-ID.rc | 16 ++ base/applications/regedit/lang/it-IT.rc | 16 ++ base/applications/regedit/lang/ja-JP.rc | 16 ++ base/applications/regedit/lang/ko-KR.rc | 16 ++ base/applications/regedit/lang/nl-NL.rc | 16 ++ base/applications/regedit/lang/no-NO.rc | 16 ++ base/applications/regedit/lang/pl-PL.rc | 16 ++ base/applications/regedit/lang/pt-BR.rc | 16 ++ base/applications/regedit/lang/pt-PT.rc | 16 ++ base/applications/regedit/lang/ro-RO.rc | 16 ++ base/applications/regedit/lang/ru-RU.rc | 16 ++ base/applications/regedit/lang/sk-SK.rc | 16 ++ base/applications/regedit/lang/sl-SI.rc | 16 ++ base/applications/regedit/lang/sq-AL.rc | 16 ++ base/applications/regedit/lang/sv-SE.rc | 16 ++ base/applications/regedit/lang/th-TH.rc | 16 ++ base/applications/regedit/lang/tr-TR.rc | 16 ++ base/applications/regedit/lang/uk-UA.rc | 16 ++ base/applications/regedit/lang/zh-CN.rc | 16 ++ base/applications/regedit/lang/zh-HK.rc | 16 ++ base/applications/regedit/lang/zh-TW.rc | 16 ++ base/applications/regedit/main.h | 3 + base/applications/regedit/resource.h | 13 + base/applications/regedit/txtproc.c | 406 +++++++++++++++++++++++++++++++ 35 files changed, 945 insertions(+), 16 deletions(-) diff --git a/base/applications/regedit/CMakeLists.txt b/base/applications/regedit/CMakeLists.txt index 351a4696f11..a1d2ffc7349 100644 --- a/base/applications/regedit/CMakeLists.txt +++ b/base/applications/regedit/CMakeLists.txt @@ -20,6 +20,7 @@ list(APPEND SOURCE security.c settings.c treeview.c + txtproc.c regedit.h) file(GLOB regedit_rc_deps res/*.*) diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index 852d38feb02..6b5b1c28cfb 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -230,8 +230,7 @@ static BOOL CheckCommDlgError(HWND hWnd) return TRUE; } -WCHAR FileNameBuffer[_MAX_PATH]; -WCHAR FileTitleBuffer[_MAX_PATH]; +WCHAR FileNameBuffer[MAX_PATH]; typedef struct { @@ -255,9 +254,9 @@ BuildFilterStrings(WCHAR *Filter, PFILTERPAIR Pairs, int PairCount) Filter[++c] = L'\0'; } -static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn) +static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn, BOOL bSave) { - FILTERPAIR FilterPairs[4]; + FILTERPAIR FilterPairs[5]; static WCHAR Filter[1024]; memset(pofn, 0, sizeof(OPENFILENAME)); @@ -272,17 +271,31 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn) FilterPairs[1].FilterID = IDS_FLT_HIVFILES_FLT; FilterPairs[2].DisplayID = IDS_FLT_REGEDIT4; FilterPairs[2].FilterID = IDS_FLT_REGEDIT4_FLT; - FilterPairs[3].DisplayID = IDS_FLT_ALLFILES; - FilterPairs[3].FilterID = IDS_FLT_ALLFILES_FLT; - BuildFilterStrings(Filter, FilterPairs, ARRAY_SIZE(FilterPairs)); + if (bSave) + { + FilterPairs[3].DisplayID = IDS_FLT_TXTFILES; + FilterPairs[3].FilterID = IDS_FLT_TXTFILES_FLT; + FilterPairs[4].DisplayID = IDS_FLT_ALLFILES; + FilterPairs[4].FilterID = IDS_FLT_ALLFILES_FLT; + } + else + { + FilterPairs[3].DisplayID = IDS_FLT_ALLFILES; + FilterPairs[3].FilterID = IDS_FLT_ALLFILES_FLT; + } + + BuildFilterStrings(Filter, FilterPairs, ARRAY_SIZE(FilterPairs) - !bSave); pofn->lpstrFilter = Filter; pofn->lpstrFile = FileNameBuffer; - pofn->nMaxFile = _MAX_PATH; - pofn->lpstrFileTitle = FileTitleBuffer; - pofn->nMaxFileTitle = _MAX_PATH; + pofn->nMaxFile = _countof(FileNameBuffer); pofn->Flags = OFN_EXPLORER | OFN_HIDEREADONLY; pofn->lpstrDefExt = L"reg"; + if (bSave) + pofn->Flags |= OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST; + else + pofn->Flags |= OFN_FILEMUSTEXIST; + return TRUE; } @@ -354,7 +367,7 @@ static BOOL LoadHive(HWND hWnd) /* get the item key to load the hive in */ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); /* initialize the "open file" dialog */ - InitOpenFileName(hWnd, &ofn); + InitOpenFileName(hWnd, &ofn, FALSE); /* build the "All Files" filter up */ filter.DisplayID = IDS_FLT_ALLFILES; filter.FilterID = IDS_FLT_ALLFILES_FLT; @@ -364,7 +377,7 @@ static BOOL LoadHive(HWND hWnd) LoadStringW(hInst, IDS_LOAD_HIVE, Caption, ARRAY_SIZE(Caption)); ofn.lpstrTitle = Caption; ofn.Flags |= OFN_ENABLESIZING; - /* ofn.lCustData = ;*/ + /* now load the hive */ if (GetOpenFileName(&ofn)) { @@ -442,11 +455,11 @@ static BOOL ImportRegistryFile(HWND hWnd) /* Figure out in which key path we are importing */ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - InitOpenFileName(hWnd, &ofn); + InitOpenFileName(hWnd, &ofn, FALSE); LoadStringW(hInst, IDS_IMPORT_REG_FILE, Caption, ARRAY_SIZE(Caption)); ofn.lpstrTitle = Caption; ofn.Flags |= OFN_ENABLESIZING; - /* ofn.lCustData = ;*/ + if (GetOpenFileName(&ofn)) { /* Look at the extension of the file to determine its type */ @@ -590,7 +603,7 @@ BOOL ExportRegistryFile(HWND hWnd) pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); GetKeyName(ExportKeyPath, ARRAY_SIZE(ExportKeyPath), hKeyRoot, pszKeyPath); - InitOpenFileName(hWnd, &ofn); + InitOpenFileName(hWnd, &ofn, TRUE); LoadStringW(hInst, IDS_EXPORT_REG_FILE, Caption, ARRAY_SIZE(Caption)); ofn.lpstrTitle = Caption; @@ -599,7 +612,7 @@ BOOL ExportRegistryFile(HWND hWnd) { ofn.lCustData = (LPARAM) ExportKeyPath; } - ofn.Flags = OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_ENABLEHOOK | OFN_OVERWRITEPROMPT; + ofn.Flags |= OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCEW(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) @@ -677,6 +690,19 @@ BOOL ExportRegistryFile(HWND hWnd) break; } + + case 4: /* Text File */ + { + bRet = txt_export_registry_key(ofn.lpstrFile, ExportKeyPath); + if (!bRet) + { + /* Error creating the file */ + LoadStringW(hInst, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle)); + LoadStringW(hInst, IDS_EXPORT_ERROR, szText, ARRAY_SIZE(szText)); + InfoMessageBox(hWnd, MB_OK | MB_ICONERROR, szTitle, szText, ofn.lpstrFile); + } + break; + } } } else diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc index d3fb06924a5..6e7395ce1e2 100644 --- a/base/applications/regedit/lang/bg-BG.rc +++ b/base/applications/regedit/lang/bg-BG.rc @@ -426,6 +426,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Всички файлове (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -521,6 +523,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Неизвестен вид интерфейс" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/cs-CZ.rc b/base/applications/regedit/lang/cs-CZ.rc index 477a5e00d9c..b5c1966561b 100644 --- a/base/applications/regedit/lang/cs-CZ.rc +++ b/base/applications/regedit/lang/cs-CZ.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Všechny soubory (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Neznámý typ rozhraní" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index 6394f18e3ae..f097213567b 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Dateien (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unbekannter Schnittstellentyp" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index 5fdb8ff7a26..72b420111ba 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Όλα τα αρχεία (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc index c733468f1fc..2b3cc3137b5 100644 --- a/base/applications/regedit/lang/en-US.rc +++ b/base/applications/regedit/lang/en-US.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc index ab8ed5c0afd..703f821d72d 100644 --- a/base/applications/regedit/lang/es-ES.rc +++ b/base/applications/regedit/lang/es-ES.rc @@ -424,6 +424,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos los archivos (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -519,6 +521,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Tipo de interfaz desconocido" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc index 9db8d8ab118..4c049612b61 100644 --- a/base/applications/regedit/lang/fr-FR.rc +++ b/base/applications/regedit/lang/fr-FR.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tous les fichiers (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/he-IL.rc b/base/applications/regedit/lang/he-IL.rc index 31fbda0e42c..1f1e50a0abd 100644 --- a/base/applications/regedit/lang/he-IL.rc +++ b/base/applications/regedit/lang/he-IL.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "כל הקבצים (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc index 923cf80e9ff..49a5bf8a5ba 100644 --- a/base/applications/regedit/lang/hu-HU.rc +++ b/base/applications/regedit/lang/hu-HU.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc index 0d2ab2c0a1d..0c6c516d995 100644 --- a/base/applications/regedit/lang/id-ID.rc +++ b/base/applications/regedit/lang/id-ID.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Semua Berkas (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 6f7fd072280..5226bad09d8 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tutti i file (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Tipologia interfaccia sconosciuta" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index e49b42a0d00..68f820f9ccb 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "すべてのファイル (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc index d68d0ab9d84..08807796261 100644 --- a/base/applications/regedit/lang/ko-KR.rc +++ b/base/applications/regedit/lang/ko-KR.rc @@ -423,6 +423,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "모든 파일 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -518,6 +520,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/nl-NL.rc b/base/applications/regedit/lang/nl-NL.rc index 455a615b57e..96b94f9227e 100644 --- a/base/applications/regedit/lang/nl-NL.rc +++ b/base/applications/regedit/lang/nl-NL.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc index 4f946548851..94e748de214 100644 --- a/base/applications/regedit/lang/no-NO.rc +++ b/base/applications/regedit/lang/no-NO.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Filer (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc index 456e1abf8ba..23b94db9ede 100644 --- a/base/applications/regedit/lang/pl-PL.rc +++ b/base/applications/regedit/lang/pl-PL.rc @@ -431,6 +431,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Wszystkie pliki (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -526,6 +528,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Nieznany typ interfejsu" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/pt-BR.rc b/base/applications/regedit/lang/pt-BR.rc index 41e9bf0551d..eed2f74ffec 100644 --- a/base/applications/regedit/lang/pt-BR.rc +++ b/base/applications/regedit/lang/pt-BR.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os arquivos (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index fddef2f9c3e..790ef64cb5a 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os ficheiros (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index 3dc4fe0b3be..b3b0899923d 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -431,6 +431,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Orice fișier (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -526,6 +528,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Nespecificat" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index 6a13e2b0577..5e7f89dbca8 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Все файлы (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Неизвестный тип интерфейса" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/sk-SK.rc b/base/applications/regedit/lang/sk-SK.rc index 5f453c80f5c..1b5b3878aeb 100644 --- a/base/applications/regedit/lang/sk-SK.rc +++ b/base/applications/regedit/lang/sk-SK.rc @@ -426,6 +426,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Všetky súbory (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -521,6 +523,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index 345b80f37cc..27862c037e2 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc index 280814c024e..5890b9771f5 100644 --- a/base/applications/regedit/lang/sq-AL.rc +++ b/base/applications/regedit/lang/sq-AL.rc @@ -425,6 +425,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Gjith Dokumentat (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -520,6 +522,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/sv-SE.rc b/base/applications/regedit/lang/sv-SE.rc index 7df2fca17b6..1b573768e40 100644 --- a/base/applications/regedit/lang/sv-SE.rc +++ b/base/applications/regedit/lang/sv-SE.rc @@ -421,6 +421,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alla filer (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -516,6 +518,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/th-TH.rc b/base/applications/regedit/lang/th-TH.rc index 2b7d63f609f..518846fe433 100644 --- a/base/applications/regedit/lang/th-TH.rc +++ b/base/applications/regedit/lang/th-TH.rc @@ -423,6 +423,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -518,6 +520,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc index df6b6ce4e01..d1a63326a99 100644 --- a/base/applications/regedit/lang/tr-TR.rc +++ b/base/applications/regedit/lang/tr-TR.rc @@ -423,6 +423,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tüm Dosyalar (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -518,6 +520,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Bilinmeyen Arayüz Türü" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/uk-UA.rc b/base/applications/regedit/lang/uk-UA.rc index 1ec8de53702..dfcd70543e0 100644 --- a/base/applications/regedit/lang/uk-UA.rc +++ b/base/applications/regedit/lang/uk-UA.rc @@ -423,6 +423,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Усі файли (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -518,6 +520,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/zh-CN.rc b/base/applications/regedit/lang/zh-CN.rc index 3250830dc0e..b3e911b060f 100644 --- a/base/applications/regedit/lang/zh-CN.rc +++ b/base/applications/regedit/lang/zh-CN.rc @@ -431,6 +431,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "所有文件 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -526,6 +528,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "未知的接口类型" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/zh-HK.rc b/base/applications/regedit/lang/zh-HK.rc index 0ec044875ae..ccb5f7385f6 100644 --- a/base/applications/regedit/lang/zh-HK.rc +++ b/base/applications/regedit/lang/zh-HK.rc @@ -429,6 +429,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "所有檔案 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -524,6 +526,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "不明介面類型" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index db2d11e39a5..4b4b3a2d1c7 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -430,6 +430,8 @@ BEGIN IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "所有檔案 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" + IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES_FLT "*.txt" END STRINGTABLE @@ -525,6 +527,20 @@ BEGIN IDS_BUS_UNKNOWNTYPE "不明介面類型" END +STRINGTABLE +BEGIN + IDS_FIELD_KEY_NAME "Key Name:" + IDS_FIELD_CLASS_NAME "Class Name:" + IDS_NO_CLASS_NAME "<NO CLASS>" + IDS_NULL_TIMESTAMP "<NULL>" + IDS_FIELD_NAME " Name:" + IDS_FIELD_TYPE " Type:" + IDS_FIELD_DATA " Data:" + IDS_FIELD_LASTWRITE "Last Write Time:" + IDS_UNKNOWN "<UNKNOWN>" + IDS_VALUE_INDEX "Value %d" +END + /*****************************************************************/ /* Dialogs */ diff --git a/base/applications/regedit/main.h b/base/applications/regedit/main.h index bb257e792cc..bb3a07dbd27 100644 --- a/base/applications/regedit/main.h +++ b/base/applications/regedit/main.h @@ -163,4 +163,7 @@ void DestroyTreeView(HWND hwndTV); void DestroyListView(HWND hwndLV); void DestroyMainMenu(void); +/* txtproc.c */ +BOOL txt_export_registry_key(LPCWSTR file_name, LPCWSTR path); + /* EOF */ diff --git a/base/applications/regedit/resource.h b/base/applications/regedit/resource.h index 933a8a03420..c4cc3955273 100644 --- a/base/applications/regedit/resource.h +++ b/base/applications/regedit/resource.h @@ -168,6 +168,8 @@ #define IDS_FLT_REGEDIT4_FLT 31006 #define IDS_FLT_ALLFILES 31007 #define IDS_FLT_ALLFILES_FLT 31008 +#define IDS_FLT_TXTFILES 31009 +#define IDS_FLT_TXTFILES_FLT 31010 #define IDS_ACCESS_FULLCONTROL 31100 #define IDS_ACCESS_READ 31101 @@ -244,6 +246,17 @@ #define IDS_BUS_PNPBUS 31546 #define IDS_BUS_UNKNOWNTYPE 31547 +#define IDS_FIELD_KEY_NAME 31600 +#define IDS_FIELD_CLASS_NAME 31601 +#define IDS_NO_CLASS_NAME 31602 +#define IDS_NULL_TIMESTAMP 31603 +#define IDS_FIELD_NAME 31604 +#define IDS_FIELD_TYPE 31605 +#define IDS_FIELD_DATA 31606 +#define IDS_FIELD_LASTWRITE 31607 +#define IDS_UNKNOWN 31608 +#define IDS_VALUE_INDEX 31609 + #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001 #define IDC_VALUE_DATA 2002 diff --git a/base/applications/regedit/txtproc.c b/base/applications/regedit/txtproc.c new file mode 100644 index 00000000000..f5e3ea041c2 --- /dev/null +++ b/base/applications/regedit/txtproc.c @@ -0,0 +1,406 @@ +/* + * PROJECT: ReactOS Registry Editor + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Exporting registry data to a text file + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "regedit.h" + +static HKEY reg_class_keys[] = +{ + HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, + HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA +}; + +static LPWSTR load_str(INT id) +{ + /* Use rotation buffer */ + static WCHAR s_asz[3][MAX_PATH]; + static INT s_index = 0; + LPWSTR psz; + LoadStringW(hInst, id, s_asz[s_index], MAX_PATH); + psz = s_asz[s_index]; + s_index = (s_index + 1) % _countof(s_asz); + return psz; +} + +static void txt_fputs(FILE *fp, LPCWSTR str) +{ + fwrite(str, lstrlenW(str) * sizeof(WCHAR), 1, fp); +} + +static void txt_newline(FILE *fp) +{ + txt_fputs(fp, L"\r\n"); +} + +static void txt_fprintf(FILE *fp, LPCWSTR format, ...) +{ + WCHAR line[1024]; + va_list va; + va_start(va, format); + StringCchVPrintfW(line, _countof(line), format, va); + txt_fputs(fp, line); + va_end(va); +} + +static HKEY txt_parse_key_name(LPCWSTR key_name, WCHAR **key_path) +{ + unsigned int i; + + if (!key_name) return 0; + + *key_path = wcschr(key_name, '\\'); + if (*key_path) + (*key_path)++; + + for (i = 0; i < _countof(reg_class_keys); i++) + { + int len = lstrlenW(reg_class_namesW[i]); + if (!_wcsnicmp(key_name, reg_class_namesW[i], len) && + (key_name[len] == 0 || key_name[len] == '\\')) + { + return reg_class_keys[i]; + } + } + + return 0; +} + +static void txt_export_binary(FILE *fp, const void *data, size_t size) +{ + const BYTE *pb = data; + for (DWORD addr = 0; addr < size; addr += 0x10) + { + txt_fprintf(fp, L"%08X ", addr); + for (size_t column = 0; column < 16; ++column) + { + if (addr + column >= size) + { + if (column == 8) + txt_fputs(fp, L" "); + txt_fputs(fp, L" "); + } + else + { + if (column == 8) + txt_fputs(fp, L" -"); + txt_fprintf(fp, L" %02x", (pb[addr + column] & 0xFF)); + } + } + txt_fputs(fp, L" "); + for (size_t column = 0; column < 16; ++column) + { + if (addr + column >= size) + { + break; + } + else + { + BYTE b = pb[addr + column]; + if (isprint(b) || IsCharAlphaNumericW(b)) + txt_fprintf(fp, L"%c", b); + else + txt_fputs(fp, L"."); + } + } + txt_newline(fp); + } +} + +static void txt_export_field(FILE *fp, LPCWSTR label, LPCWSTR value) +{ + txt_fprintf(fp, L"%-19s%s\r\n", label, value); +} + +static void txt_export_multi_sz(FILE *fp, const void *data, size_t size) +{ + LPCWSTR pch; + for (pch = data; *pch; pch += lstrlenW(pch) + 1) + { + if (pch == data) + txt_export_field(fp, load_str(IDS_FIELD_DATA), pch); + else + txt_export_field(fp, L"", pch); + } +} + +static void txt_export_type(FILE *fp, LPCWSTR type) +{ + txt_export_field(fp, load_str(IDS_FIELD_TYPE), type); +} + +static void txt_export_name(FILE *fp, LPCWSTR name) +{ + txt_export_field(fp, load_str(IDS_FIELD_NAME), name); +} + +static void +txt_export_data(FILE *fp, INT i, LPCWSTR value_name, DWORD value_len, DWORD type, + const void *data, size_t size) +{ + LPCWSTR pszType; + + txt_fprintf(fp, load_str(IDS_VALUE_INDEX), i); + txt_newline(fp); + txt_export_name(fp, value_name); + + switch (type) + { + case REG_SZ: + txt_export_type(fp, L"REG_SZ"); + txt_export_field(fp, load_str(IDS_FIELD_DATA), data); + break; + + case REG_DWORD: + txt_export_type(fp, L"REG_DWORD"); + txt_fprintf(fp, L"%-19s0x%lx\r\n", load_str(IDS_FIELD_DATA), *(DWORD*)data); + break; + + case REG_EXPAND_SZ: + txt_export_type(fp, L"REG_EXPAND_SZ"); + txt_export_field(fp, load_str(IDS_FIELD_DATA), data); + break; + + case REG_MULTI_SZ: + txt_export_type(fp, L"REG_MULTI_SZ"); + txt_export_multi_sz(fp, data, size); + break; + + case REG_BINARY: + case REG_QWORD: + case REG_NONE: + default: + if (type == REG_BINARY) + pszType = L"REG_BINARY"; + else if (type == REG_QWORD) + pszType = L"REG_QWORD"; + else if (type == REG_NONE) + pszType = L"REG_NONE"; + else + pszType = load_str(IDS_UNKNOWN); + + txt_export_type(fp, pszType); + txt_export_field(fp, load_str(IDS_FIELD_DATA), L""); + txt_export_binary(fp, data, size); + break; + } + + txt_newline(fp); +} + +static WCHAR * +txt_build_subkey_path(LPCWSTR path, DWORD path_len, LPCWSTR subkey_name, DWORD subkey_len) +{ + WCHAR *subkey_path; + subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); + swprintf(subkey_path, L"%s\\%s", path, subkey_name); + return subkey_path; +} + +static void txt_export_key_name(FILE *fp, LPCWSTR name) +{ + txt_export_field(fp, load_str(IDS_FIELD_KEY_NAME), name); +} + +static void txt_export_class_and_last_write(FILE *fp, HKEY key) +{ + WCHAR szClassName[MAX_PATH]; + DWORD cchClassName = _countof(szClassName); + FILETIME ftLastWrite, ftLocal, ftNull = { 0 }; + SYSTEMTIME stLastWrite; + WCHAR sz1[64], sz2[64]; + LONG error; + + error = RegQueryInfoKeyW(key, szClassName, &cchClassName, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, &ftLastWrite); + if (error != ERROR_SUCCESS) + { + cchClassName = 0; + ftLastWrite = ftNull; + } + + szClassName[_countof(szClassName) - 1] = UNICODE_NULL; + + if (cchClassName > 0) + txt_export_field(fp, load_str(IDS_FIELD_CLASS_NAME), szClassName); + else + txt_export_field(fp, load_str(IDS_FIELD_CLASS_NAME), load_str(IDS_NO_CLASS_NAME)); + + if (memcmp(&ftLastWrite, &ftNull, sizeof(ftNull)) == 0) + { + txt_export_field(fp, load_str(IDS_FIELD_LASTWRITE), load_str(IDS_NULL_TIMESTAMP)); + return; + } + + FileTimeToLocalFileTime(&ftLastWrite, &ftLocal); + FileTimeToSystemTime(&ftLocal, &stLastWrite); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &stLastWrite, NULL, sz1, _countof(sz1)); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &stLastWrite, NULL, sz2, _countof(sz2)); + txt_fprintf(fp, L"%-19s%s - %s\r\n", load_str(IDS_FIELD_LASTWRITE), sz1, sz2); +} + +static void txt_export_registry_data(FILE *fp, HKEY key, LPCWSTR path) +{ + LONG rc; + DWORD max_value_len = MAX_PATH, value_len; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; + DWORD i, type, path_len; + WCHAR *value_name, *subkey_name, *subkey_path; + BYTE *data; + HKEY subkey; + + txt_export_key_name(fp, path); + txt_export_class_and_last_write(fp, key); + + value_name = malloc(max_value_len * sizeof(WCHAR)); + data = malloc(max_data_bytes); + + i = 0; + for (;;) + { + value_len = max_value_len; + data_size = max_data_bytes; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); + if (rc == ERROR_SUCCESS) + { + txt_export_data(fp, i, value_name, value_len, type, data, data_size); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = realloc(data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = realloc(value_name, max_value_len * sizeof(WCHAR)); + } + } + else break; + } + + free(data); + free(value_name); + + subkey_name = malloc(MAX_PATH * sizeof(WCHAR)); + + path_len = lstrlenW(path); + + i = 0; + for (;;) + { + subkey_len = MAX_PATH; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + if (i == 0) + txt_newline(fp); + + subkey_path = txt_build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + txt_newline(fp); + txt_export_registry_data(fp, subkey, subkey_path); + RegCloseKey(subkey); + } + free(subkey_path); + i++; + } + else break; + } + + free(subkey_name); +} + +static FILE *txt_open_export_file(LPCWSTR file_name) +{ + FILE *file = _wfopen(file_name, L"wb"); + if (file) + fwrite("\xFF\xFE", 2, 1, file); + return file; +} + +static HKEY txt_open_export_key(HKEY key_class, LPCWSTR subkey, LPCWSTR path) +{ + HKEY key; + + if (RegOpenKeyExW(key_class, subkey, 0, KEY_READ, &key) != ERROR_SUCCESS) + return NULL; + + return key; +} + +static BOOL txt_export_key(LPCWSTR file_name, LPCWSTR path) +{ + HKEY key_class, key; + WCHAR *subkey; + FILE *fp; + + if (!(key_class = txt_parse_key_name(path, &subkey))) + { + if (subkey) *(subkey - 1) = 0; + return FALSE; + } + + if (!(key = txt_open_export_key(key_class, subkey, path))) + return FALSE; + + fp = txt_open_export_file(file_name); + if (fp) + { + txt_export_registry_data(fp, key, path); + txt_newline(fp); + fclose(fp); + } + + RegCloseKey(key); + return fp != NULL; +} + +static BOOL txt_export_all(LPCWSTR file_name, LPCWSTR path) +{ + FILE *fp; + int i; + HKEY classes[] = {HKEY_LOCAL_MACHINE, HKEY_USERS}, key; + WCHAR *class_name; + + fp = txt_open_export_file(file_name); + if (!fp) + return FALSE; + + for (i = 0; i < _countof(classes); i++) + { + if (!(key = txt_open_export_key(classes[i], NULL, path))) + { + fclose(fp); + return FALSE; + } + + class_name = malloc((lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); + lstrcpyW(class_name, reg_class_namesW[i]); + + txt_export_registry_data(fp, classes[i], class_name); + + free(class_name); + RegCloseKey(key); + } + + txt_newline(fp); + fclose(fp); + + return TRUE; +} + +BOOL txt_export_registry_key(LPCWSTR file_name, LPCWSTR path) +{ + if (path && *path) + return txt_export_key(file_name, path); + else + return txt_export_all(file_name, path); +}

1 year, 3 months

[reactos] 01/01: [NTOS:KDBG] Temporarily HACK-remove the duplicated kdb:> when displaying the interactive KDBG prompt.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c0c2e2be7c93b0e6ce98… commit 8c0c2e2be7c93b0e6ce9879dcb6aaa557b5b92d3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 29 22:32:29 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 30 12:24:36 2023 +0200 [NTOS:KDBG] Temporarily HACK-remove the duplicated kdb:> when displaying the interactive KDBG prompt. --- ntoskrnl/kdbg/kdb_cli.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index cc7aece3d9e..50d484accd1 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3299,7 +3299,8 @@ KdbpCliMainLoop( * Repeat the last one if the user pressed Enter. * This reduces the risk of RSI when single-stepping! */ - CmdLen = KdbPrompt(KdbPromptStr.Buffer, Command, sizeof(Command)); + // TEMP HACK! Issue an empty string instead of duplicating "kdb:>" + CmdLen = KdbPrompt(/*KdbPromptStr.Buffer*/"", Command, sizeof(Command)); if (CmdLen == 0) { /* Nothing received but the user didn't press Enter, retry */

1 year, 3 months

[reactos] 04/04: [NTOS:MM/PS] Remove code duplication between LookupEntryPoint/MiLocateExportName/MiFindExportedRoutineByName. (#4918)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86e0d5e9b8ddbb620213f… commit 86e0d5e9b8ddbb620213f2adcdb131727af379bb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 29 00:49:33 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 29 17:26:57 2023 +0200 [NTOS:MM/PS] Remove code duplication between LookupEntryPoint/MiLocateExportName/MiFindExportedRoutineByName. (#4918) As it turns out, those three functions were duplicating the same code between each other. Reimplement these in terms of a common helper, RtlFindExportedRoutineByName(). Indeed: MiFindExportedRoutineByName() was just MiLocateExportName() but taking a PANSI_STRING instead of a NULL-terminated string. A similar state of affairs also existed in Windows <= 2003, and the MS guys also noticed it. Both routines have been then merged and renamed to MiFindExportedRoutineByName() on Windows 8 (taking a PCSTR instead), and finally renamed and exported as RtlFindExportedRoutineByName() on Windows 10. --- ntoskrnl/include/internal/mm.h | 24 ++++- ntoskrnl/include/internal/ps.h | 6 -- ntoskrnl/mm/ARM3/sysldr.c | 221 +++++++++++++++++++++++++---------------- ntoskrnl/ps/psmgr.c | 80 ++------------- 4 files changed, 168 insertions(+), 163 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index 0d97244a7c9..f637014794a 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1490,16 +1490,15 @@ VOID NTAPI MmFreeSectionSegments(PFILE_OBJECT FileObject); -/* Exported from NT 6.2 Onward. We keep it internal. */ +/* Exported from NT 6.2 onward. We keep it internal. */ NTSTATUS NTAPI -MmMapViewInSystemSpaceEx ( +MmMapViewInSystemSpaceEx( _In_ PVOID Section, _Outptr_result_bytebuffer_ (*ViewSize) PVOID *MappedBase, _Inout_ PSIZE_T ViewSize, _Inout_ PLARGE_INTEGER SectionOffset, - _In_ ULONG_PTR Flags - ); + _In_ ULONG_PTR Flags); BOOLEAN NTAPI @@ -1661,6 +1660,23 @@ NTAPI MmFreeDriverInitialization( IN PLDR_DATA_TABLE_ENTRY LdrEntry); +/* ReactOS-only, used by psmgr.c PspLookupSystemDllEntryPoint() as well */ +NTSTATUS +NTAPI +RtlpFindExportedRoutineByName( + _In_ PVOID ImageBase, + _In_ PCSTR ExportName, + _Out_ PVOID* Function, + _Out_opt_ PBOOLEAN IsForwarder, + _In_ NTSTATUS NotFoundStatus); + +/* Exported from NT 10.0 onward. We keep it internal. */ +PVOID +NTAPI +RtlFindExportedRoutineByName( + _In_ PVOID ImageBase, + _In_ PCSTR ExportName); + /* procsup.c *****************************************************************/ NTSTATUS diff --git a/ntoskrnl/include/internal/ps.h b/ntoskrnl/include/internal/ps.h index 7f55554f890..5be13cfc632 100644 --- a/ntoskrnl/include/internal/ps.h +++ b/ntoskrnl/include/internal/ps.h @@ -134,12 +134,6 @@ PsLocateSystemDll( VOID ); -NTSTATUS -NTAPI -PspGetSystemDllEntryPoints( - VOID -); - VOID NTAPI PsChangeQuantumTable( diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index c5f42ca582d..9a39b66d7ce 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -267,60 +267,163 @@ NameToOrdinal( return OrdinalTable[Mid]; } -PVOID +/** + * @brief + * ReactOS-only helper routine for RtlFindExportedRoutineByName(), + * that provides a finer granularity regarding the nature of the + * export, and the failure reasons. + * + * @param[in] ImageBase + * The base address of the loaded image. + * + * @param[in] ExportName + * The name of the export, given as an ANSI NULL-terminated string. + * + * @param[out] Function + * The address of the named exported routine, or NULL if not found. + * If the export is a forwarder (see @p IsForwarder below), this + * address points to the forwarder name. + * + * @param[out] IsForwarder + * An optional pointer to a BOOLEAN variable, that is set to TRUE + * if the found export is a forwarder, and FALSE otherwise. + * + * @param[in] NotFoundStatus + * The status code to return in case the export could not be found + * (examples: STATUS_ENTRYPOINT_NOT_FOUND, STATUS_PROCEDURE_NOT_FOUND). + * + * @return + * A status code as follows: + * - STATUS_SUCCESS if the named exported routine is found; + * - The custom @p NotFoundStatus if the export could not be found; + * - STATUS_INVALID_PARAMETER if the image is invalid or does not + * contain an Export Directory. + * + * @note + * See RtlFindExportedRoutineByName() for more remarks. + * Used by psmgr.c PspLookupSystemDllEntryPoint() as well. + **/ +NTSTATUS NTAPI -MiLocateExportName(IN PVOID DllBase, - IN PCHAR ExportName) +RtlpFindExportedRoutineByName( + _In_ PVOID ImageBase, + _In_ PCSTR ExportName, + _Out_ PVOID* Function, + _Out_opt_ PBOOLEAN IsForwarder, + _In_ NTSTATUS NotFoundStatus) { + PIMAGE_EXPORT_DIRECTORY ExportDirectory; PULONG NameTable; PUSHORT OrdinalTable; - PIMAGE_EXPORT_DIRECTORY ExportDirectory; - USHORT Ordinal; - PVOID Function; ULONG ExportSize; + USHORT Ordinal; PULONG ExportTable; + ULONG_PTR FunctionAddress; + PAGED_CODE(); /* Get the export directory */ - ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + ExportDirectory = RtlImageDirectoryEntryToData(ImageBase, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &ExportSize); - if (!ExportDirectory) return NULL; + if (!ExportDirectory) + return STATUS_INVALID_PARAMETER; /* Setup name tables */ - NameTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNames); - OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNameOrdinals); + NameTable = (PULONG)RVA(ImageBase, ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)RVA(ImageBase, ExportDirectory->AddressOfNameOrdinals); /* Get the ordinal */ Ordinal = NameToOrdinal(ExportName, - DllBase, + ImageBase, ExportDirectory->NumberOfNames, NameTable, OrdinalTable); /* Check if we couldn't find it */ - if (Ordinal == -1) return NULL; + if (Ordinal == -1) + return NotFoundStatus; /* Validate the ordinal */ - if (Ordinal >= ExportDirectory->NumberOfFunctions) return NULL; + if (Ordinal >= ExportDirectory->NumberOfFunctions) + return NotFoundStatus; - /* Resolve the address and write it */ - ExportTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfFunctions); - Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + /* Resolve the function's address */ + ExportTable = (PULONG)RVA(ImageBase, ExportDirectory->AddressOfFunctions); + FunctionAddress = (ULONG_PTR)RVA(ImageBase, ExportTable[Ordinal]); /* Check if the function is actually a forwarder */ - if (((ULONG_PTR)Function > (ULONG_PTR)ExportDirectory) && - ((ULONG_PTR)Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + if (IsForwarder) { - /* It is, fail */ + *IsForwarder = FALSE; + if ((FunctionAddress > (ULONG_PTR)ExportDirectory) && + (FunctionAddress < (ULONG_PTR)ExportDirectory + ExportSize)) + { + /* It is, and points to the forwarder name */ + *IsForwarder = TRUE; + } + } + + /* We've found it */ + *Function = (PVOID)FunctionAddress; + return STATUS_SUCCESS; +} + +/** + * @brief + * Finds the address of a given named exported routine in a loaded image. + * Note that this function does not support forwarders. + * + * @param[in] ImageBase + * The base address of the loaded image. + * + * @param[in] ExportName + * The name of the export, given as an ANSI NULL-terminated string. + * + * @return + * The address of the named exported routine, or NULL if not found. + * If the export is a forwarder, this function returns NULL as well. + * + * @note + * This routine was originally named MiLocateExportName(), with a separate + * duplicated MiFindExportedRoutineByName() one (taking a PANSI_STRING) + * on Windows <= 2003. Both routines have been then merged and renamed + * to MiFindExportedRoutineByName() on Windows 8 (taking a PCSTR instead), + * and finally renamed and exported as RtlFindExportedRoutineByName() on + * Windows 10. + * + * @see https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/mm/sysload/mm… + **/ +PVOID +NTAPI +RtlFindExportedRoutineByName( + _In_ PVOID ImageBase, + _In_ PCSTR ExportName) +{ + NTSTATUS Status; + BOOLEAN IsForwarder = FALSE; + PVOID Function; + + PAGED_CODE(); + + /* Call the internal API */ + Status = RtlpFindExportedRoutineByName(ImageBase, + ExportName, + &Function, + &IsForwarder, + STATUS_ENTRYPOINT_NOT_FOUND); + if (!NT_SUCCESS(Status)) + return NULL; + + /* If the export is actually a forwarder, log the error and fail */ + if (IsForwarder) + { + DPRINT1("RtlFindExportedRoutineByName does not support forwarders!\n", FALSE); return NULL; } - /* We found it */ + /* We've found the export */ return Function; } @@ -340,8 +443,8 @@ MmCallDllInitialize( PAGED_CODE(); /* Try to see if the image exports a DllInitialize routine */ - DllInit = (PMM_DLL_INITIALIZE)MiLocateExportName(LdrEntry->DllBase, - "DllInitialize"); + DllInit = (PMM_DLL_INITIALIZE) + RtlFindExportedRoutineByName(LdrEntry->DllBase, "DllInitialize"); if (!DllInit) return STATUS_SUCCESS; @@ -399,7 +502,8 @@ MiCallDllUnloadAndUnloadDll( PAGED_CODE(); /* Retrieve the DllUnload routine */ - DllUnload = (PMM_DLL_UNLOAD)MiLocateExportName(LdrEntry->DllBase, "DllUnload"); + DllUnload = (PMM_DLL_UNLOAD) + RtlFindExportedRoutineByName(LdrEntry->DllBase, "DllUnload"); if (!DllUnload) return FALSE; @@ -512,58 +616,6 @@ MiClearImports(IN PLDR_DATA_TABLE_ENTRY LdrEntry) LdrEntry->LoadedImports = MM_SYSLDR_BOOT_LOADED; } -PVOID -NTAPI -MiFindExportedRoutineByName(IN PVOID DllBase, - IN PANSI_STRING ExportName) -{ - PULONG NameTable; - PUSHORT OrdinalTable; - PIMAGE_EXPORT_DIRECTORY ExportDirectory; - USHORT Ordinal; - PVOID Function; - ULONG ExportSize; - PULONG ExportTable; - PAGED_CODE(); - - /* Get the export directory */ - ExportDirectory = RtlImageDirectoryEntryToData(DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); - if (!ExportDirectory) return NULL; - - /* Setup name tables */ - NameTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNames); - OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNameOrdinals); - - /* Get the ordinal */ - Ordinal = NameToOrdinal(ExportName->Buffer, - DllBase, - ExportDirectory->NumberOfNames, - NameTable, - OrdinalTable); - - /* Check if we couldn't find it */ - if (Ordinal == -1) return NULL; - - /* Validate the ordinal */ - if (Ordinal >= ExportDirectory->NumberOfFunctions) return NULL; - - /* Resolve the address and write it */ - ExportTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfFunctions); - Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); - - /* We found it! */ - ASSERT((Function < (PVOID)ExportDirectory) || - (Function > (PVOID)((ULONG_PTR)ExportDirectory + ExportSize))); - - return Function; -} - VOID NTAPI MiProcessLoaderEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry, @@ -720,6 +772,7 @@ MiSnapThunk(IN PVOID DllBase, PIMAGE_IMPORT_BY_NAME ForwardName; SIZE_T ForwardLength; IMAGE_THUNK_DATA ForwardThunk; + PAGED_CODE(); /* Check if this is an ordinal */ @@ -740,7 +793,7 @@ MiSnapThunk(IN PVOID DllBase, /* Copy the procedure name */ RtlStringCbCopyA(*MissingApi, MAXIMUM_FILENAME_LENGTH, - (PCHAR)&NameImport->Name[0]); + (PCHAR)NameImport->Name); /* Setup name tables */ DPRINT("Import name: %s\n", NameImport->Name); @@ -775,10 +828,10 @@ MiSnapThunk(IN PVOID DllBase, } } - /* Check if the ordinal is invalid */ + /* Check if the ordinal is valid */ if (Ordinal >= ExportDirectory->NumberOfFunctions) { - /* Fail */ + /* It's not, fail */ Status = STATUS_DRIVER_ORDINAL_NOT_FOUND; } else @@ -796,7 +849,7 @@ MiSnapThunk(IN PVOID DllBase, /* Check if the function is actually a forwarder */ if ((Address->u1.Function > (ULONG_PTR)ExportDirectory) && - (Address->u1.Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + (Address->u1.Function < (ULONG_PTR)ExportDirectory + ExportSize)) { /* Now assume failure in case the forwarder doesn't exist */ Status = STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; @@ -3594,8 +3647,8 @@ MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) if (Found) { /* Find the procedure name */ - ProcAddress = MiFindExportedRoutineByName(LdrEntry->DllBase, - &AnsiRoutineName); + ProcAddress = RtlFindExportedRoutineByName(LdrEntry->DllBase, + AnsiRoutineName.Buffer); /* Break out if we found it or if we already tried both modules */ if (ProcAddress) break; diff --git a/ntoskrnl/ps/psmgr.c b/ntoskrnl/ps/psmgr.c index ad02cdfd82a..bd642375a88 100644 --- a/ntoskrnl/ps/psmgr.c +++ b/ntoskrnl/ps/psmgr.c @@ -62,80 +62,22 @@ BOOLEAN PspDoingGiveBacks; /* PRIVATE FUNCTIONS *********************************************************/ -USHORT -NTAPI -NameToOrdinal( - _In_ PCSTR ExportName, - _In_ PVOID ImageBase, - _In_ ULONG NumberOfNames, - _In_ PULONG NameTable, - _In_ PUSHORT OrdinalTable); - -CODE_SEG("INIT") +static CODE_SEG("INIT") NTSTATUS -NTAPI -LookupEntryPoint(IN PVOID DllBase, - IN PCHAR Name, - OUT PVOID *EntryPoint) +PspLookupSystemDllEntryPoint( + _In_ PCSTR Name, + _Out_ PVOID* EntryPoint) { - PULONG NameTable; - PUSHORT OrdinalTable; - PIMAGE_EXPORT_DIRECTORY ExportDirectory; - ULONG ExportSize; - CHAR Buffer[64]; - USHORT Ordinal; - PULONG ExportTable; - - /* Get the export directory */ - ExportDirectory = RtlImageDirectoryEntryToData(DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); - - /* Validate the name and copy it */ - if (strlen(Name) > sizeof(Buffer) - 2) return STATUS_INVALID_PARAMETER; - strcpy(Buffer, Name); - - /* Setup name tables */ - NameTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNames); - OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNameOrdinals); - - /* Get the ordinal */ - Ordinal = NameToOrdinal(Buffer, - DllBase, - ExportDirectory->NumberOfNames, - NameTable, - OrdinalTable); - - /* Make sure the ordinal is valid */ - if (Ordinal >= ExportDirectory->NumberOfFunctions) - { - /* It's not, fail */ - return STATUS_PROCEDURE_NOT_FOUND; - } - - /* Resolve the address and write it */ - ExportTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfFunctions); - *EntryPoint = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); - return STATUS_SUCCESS; + /* Call the internal API */ + return RtlpFindExportedRoutineByName(PspSystemDllBase, + Name, + EntryPoint, + NULL, + STATUS_PROCEDURE_NOT_FOUND); } -CODE_SEG("INIT") +static CODE_SEG("INIT") NTSTATUS -NTAPI -PspLookupSystemDllEntryPoint(IN PCHAR Name, - IN PVOID *EntryPoint) -{ - /* Call the LDR Routine */ - return LookupEntryPoint(PspSystemDllBase, Name, EntryPoint); -} - -CODE_SEG("INIT") -NTSTATUS -NTAPI PspLookupKernelUserEntryPoints(VOID) { NTSTATUS Status;

1 year, 3 months

[reactos] 03/04: [NTOS:MM] Add missing validation of Ordinal in MiLocateExportName (#4918)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8695eee1e92a7f2bdcdb… commit d8695eee1e92a7f2bdcdbc638d1372fcb8fe1a5e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 22 20:41:02 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 29 17:26:57 2023 +0200 [NTOS:MM] Add missing validation of Ordinal in MiLocateExportName (#4918) --- ntoskrnl/mm/ARM3/sysldr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 89f394bddb5..c5f42ca582d 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -304,6 +304,9 @@ MiLocateExportName(IN PVOID DllBase, /* Check if we couldn't find it */ if (Ordinal == -1) return NULL; + /* Validate the ordinal */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) return NULL; + /* Resolve the address and write it */ ExportTable = (PULONG)((ULONG_PTR)DllBase + ExportDirectory->AddressOfFunctions);

1 year, 3 months

[reactos] 02/04: [NTOS:MM/PS] De-duplicate export name-to-ordinal functionality (#4918)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e55236662c75dff342d0… commit 4e55236662c75dff342d04d47227fc686bd8f2a5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Aug 22 19:06:34 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 29 17:26:56 2023 +0200 [NTOS:MM/PS] De-duplicate export name-to-ordinal functionality (#4918) It was implemented in psmgr.c but in a recursive way. That implementation is replaced, in the NameToOrdinal() helper, by the better non-recursive one found in the MiLocateExportName() and MiFindExportedRoutineByName() functions. This NameToOrdinal() helper is then called in lieu of the duplicated code in MiLocateExportName() and MiFindExportedRoutineByName(). In addition, one block of code in MiSnapThunk() is simplified in a similar manner. --- ntoskrnl/mm/ARM3/sysldr.c | 160 +++++++++++++++++++++------------------------- ntoskrnl/ps/psmgr.c | 46 ++----------- 2 files changed, 78 insertions(+), 128 deletions(-) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index b17a53b82eb..89f394bddb5 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -213,43 +213,35 @@ MiLoadImageSection(_Inout_ PSECTION *SectionPtr, return Status; } -PVOID +#ifndef RVA +#define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) +#endif + +USHORT NTAPI -MiLocateExportName(IN PVOID DllBase, - IN PCHAR ExportName) +NameToOrdinal( + _In_ PCSTR ExportName, + _In_ PVOID ImageBase, + _In_ ULONG NumberOfNames, + _In_ PULONG NameTable, + _In_ PUSHORT OrdinalTable) { - PULONG NameTable; - PUSHORT OrdinalTable; - PIMAGE_EXPORT_DIRECTORY ExportDirectory; - LONG Low = 0, Mid = 0, High, Ret; - USHORT Ordinal; - PVOID Function; - ULONG ExportSize; - PULONG ExportTable; - PAGED_CODE(); + LONG Low, Mid, High, Ret; - /* Get the export directory */ - ExportDirectory = RtlImageDirectoryEntryToData(DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportSize); - if (!ExportDirectory) return NULL; - - /* Setup name tables */ - NameTable = (PULONG)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNames); - OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + - ExportDirectory->AddressOfNameOrdinals); + /* Fail if no names */ + if (!NumberOfNames) + return -1; /* Do a binary search */ - High = ExportDirectory->NumberOfNames - 1; + Low = Mid = 0; + High = NumberOfNames - 1; while (High >= Low) { /* Get new middle value */ Mid = (Low + High) >> 1; /* Compare name */ - Ret = strcmp(ExportName, (PCHAR)DllBase + NameTable[Mid]); + Ret = strcmp(ExportName, (PCHAR)RVA(ImageBase, NameTable[Mid])); if (Ret < 0) { /* Update high */ @@ -268,10 +260,49 @@ MiLocateExportName(IN PVOID DllBase, } /* Check if we couldn't find it */ - if (High < Low) return NULL; + if (High < Low) + return -1; /* Otherwise, this is the ordinal */ - Ordinal = OrdinalTable[Mid]; + return OrdinalTable[Mid]; +} + +PVOID +NTAPI +MiLocateExportName(IN PVOID DllBase, + IN PCHAR ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Get the ordinal */ + Ordinal = NameToOrdinal(ExportName, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); + + /* Check if we couldn't find it */ + if (Ordinal == -1) return NULL; /* Resolve the address and write it */ ExportTable = (PULONG)((ULONG_PTR)DllBase + @@ -486,7 +517,6 @@ MiFindExportedRoutineByName(IN PVOID DllBase, PULONG NameTable; PUSHORT OrdinalTable; PIMAGE_EXPORT_DIRECTORY ExportDirectory; - LONG Low = 0, Mid = 0, High, Ret; USHORT Ordinal; PVOID Function; ULONG ExportSize; @@ -506,37 +536,15 @@ MiFindExportedRoutineByName(IN PVOID DllBase, OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + ExportDirectory->AddressOfNameOrdinals); - /* Do a binary search */ - High = ExportDirectory->NumberOfNames - 1; - while (High >= Low) - { - /* Get new middle value */ - Mid = (Low + High) >> 1; - - /* Compare name */ - Ret = strcmp(ExportName->Buffer, (PCHAR)DllBase + NameTable[Mid]); - if (Ret < 0) - { - /* Update high */ - High = Mid - 1; - } - else if (Ret > 0) - { - /* Update low */ - Low = Mid + 1; - } - else - { - /* We got it */ - break; - } - } + /* Get the ordinal */ + Ordinal = NameToOrdinal(ExportName->Buffer, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); /* Check if we couldn't find it */ - if (High < Low) return NULL; - - /* Otherwise, this is the ordinal */ - Ordinal = OrdinalTable[Mid]; + if (Ordinal == -1) return NULL; /* Validate the ordinal */ if (Ordinal >= ExportDirectory->NumberOfFunctions) return NULL; @@ -696,8 +704,6 @@ MiSnapThunk(IN PVOID DllBase, PUSHORT OrdinalTable; PIMAGE_IMPORT_BY_NAME NameImport; USHORT Hint; - ULONG Low = 0, Mid = 0, High; - LONG Ret; NTSTATUS Status; PCHAR MissingForwarder; CHAR NameBuffer[MAXIMUM_FILENAME_LENGTH]; @@ -751,40 +757,18 @@ MiSnapThunk(IN PVOID DllBase, else { /* Do a binary search */ - High = ExportDirectory->NumberOfNames - 1; - while (High >= Low) - { - /* Get new middle value */ - Mid = (Low + High) >> 1; - - /* Compare name */ - Ret = strcmp((PCHAR)NameImport->Name, (PCHAR)DllBase + NameTable[Mid]); - if (Ret < 0) - { - /* Update high */ - High = Mid - 1; - } - else if (Ret > 0) - { - /* Update low */ - Low = Mid + 1; - } - else - { - /* We got it */ - break; - } - } + Ordinal = NameToOrdinal((PCHAR)NameImport->Name, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); /* Check if we couldn't find it */ - if (High < Low) + if (Ordinal == -1) { DPRINT1("Warning: Driver failed to load, %s not found\n", NameImport->Name); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } - - /* Otherwise, this is the ordinal */ - Ordinal = OrdinalTable[Mid]; } } diff --git a/ntoskrnl/ps/psmgr.c b/ntoskrnl/ps/psmgr.c index 80d9a964b3f..ad02cdfd82a 100644 --- a/ntoskrnl/ps/psmgr.c +++ b/ntoskrnl/ps/psmgr.c @@ -62,48 +62,14 @@ BOOLEAN PspDoingGiveBacks; /* PRIVATE FUNCTIONS *********************************************************/ -CODE_SEG("INIT") USHORT NTAPI -NameToOrdinal(IN PCHAR Name, - IN PVOID DllBase, - IN ULONG NumberOfNames, - IN PULONG NameTable, - IN PUSHORT OrdinalTable) -{ - ULONG Mid; - LONG Ret; - - /* Fail if no names */ - if (!NumberOfNames) return -1; - - /* Do binary search */ - Mid = NumberOfNames >> 1; - Ret = strcmp(Name, (PCHAR)((ULONG_PTR)DllBase + NameTable[Mid])); - - /* Check if we found it */ - if (!Ret) return OrdinalTable[Mid]; - - /* We didn't. Check if we only had one name to check */ - if (NumberOfNames == 1) return -1; - - /* Check if we should look up or down */ - if (Ret < 0) - { - /* Loop down */ - NumberOfNames = Mid; - } - else - { - /* Look up, update tables */ - NameTable = &NameTable[Mid + 1]; - OrdinalTable = &OrdinalTable[Mid + 1]; - NumberOfNames -= (Mid - 1); - } - - /* Call us recursively */ - return NameToOrdinal(Name, DllBase, NumberOfNames, NameTable, OrdinalTable); -} +NameToOrdinal( + _In_ PCSTR ExportName, + _In_ PVOID ImageBase, + _In_ ULONG NumberOfNames, + _In_ PULONG NameTable, + _In_ PUSHORT OrdinalTable); CODE_SEG("INIT") NTSTATUS

1 year, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023