Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 01/01: [NTOS:KE] Fix copy paste bug in exception helper routine for ARM (#4005)
by Rafał Mikrut 07 Oct '21

07 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54d5ad753346429248b51… commit 54d5ad753346429248b516eaf8fbf534d2fed113 Author: Rafał Mikrut <mikrutrafal(a)protonmail.com> AuthorDate: Thu Oct 7 19:45:21 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 7 23:04:19 2021 +0300 [NTOS:KE] Fix copy paste bug in exception helper routine for ARM (#4005) --- ntoskrnl/ke/arm/exp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ke/arm/exp.c b/ntoskrnl/ke/arm/exp.c index 1f2c7036f57..7febe920614 100644 --- a/ntoskrnl/ke/arm/exp.c +++ b/ntoskrnl/ke/arm/exp.c @@ -134,7 +134,7 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, Context->R6 = ExceptionFrame->R6; Context->R7 = ExceptionFrame->R7; Context->R8 = ExceptionFrame->R8; - Context->R0 = ExceptionFrame->R9; + Context->R9 = ExceptionFrame->R9; Context->R10 = ExceptionFrame->R10; Context->R11 = ExceptionFrame->R11; Context->R12 = TrapFrame->R12;

1 0

[reactos] 01/01: [ZIPFLDR] Show error when compression method is not supported
by Stanislav Motylkov 07 Oct '21

07 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e3a7a0e84bb8cdff4ad3… commit 7e3a7a0e84bb8cdff4ad32cbd1a26d026ae2db1f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Oct 6 01:04:50 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 7 14:54:47 2021 +0300 [ZIPFLDR] Show error when compression method is not supported CORE-17255 --- dll/shellext/zipfldr/CZipExtract.cpp | 23 ++++++++++++++++++++--- dll/shellext/zipfldr/lang/de-DE.rc | 1 + dll/shellext/zipfldr/lang/en-US.rc | 1 + dll/shellext/zipfldr/lang/et-EE.rc | 1 + dll/shellext/zipfldr/lang/fr-FR.rc | 1 + dll/shellext/zipfldr/lang/hi-IN.rc | 1 + dll/shellext/zipfldr/lang/it-IT.rc | 1 + dll/shellext/zipfldr/lang/ja-JP.rc | 1 + dll/shellext/zipfldr/lang/pl-PL.rc | 1 + dll/shellext/zipfldr/lang/pt-PT.rc | 1 + dll/shellext/zipfldr/lang/ro-RO.rc | 1 + dll/shellext/zipfldr/lang/ru-RU.rc | 1 + dll/shellext/zipfldr/lang/sv-SE.rc | 1 + dll/shellext/zipfldr/lang/zh-CN.rc | 1 + dll/shellext/zipfldr/lang/zh-TW.rc | 1 + dll/shellext/zipfldr/resource.h | 3 ++- 16 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 47be6caa5df..8f9381e9f83 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -590,7 +590,6 @@ public: break; case eExtractAbort: - case eOpenError: case eUnpackError: { Close(); @@ -627,6 +626,20 @@ public: } break; } + + case eOpenError: + { + if (err == UNZ_BADZIPFILE && + Info.compression_method != 0 && + Info.compression_method != Z_DEFLATED && + Info.compression_method != Z_BZIP2ED) + { + if (ShowExtractError(hDlg, FullPath, Info.compression_method, eOpenError) == IDYES) + break; + } + Close(); + return false; + } } if (Result == eNoError && is_dir) continue; @@ -643,7 +656,7 @@ public: CStringA strErr, strText; PSTR Win32ErrorString; - if (ErrorType == eFileError) + if (ErrorType == eFileError || ErrorType == eOpenError) strText.LoadString(IDS_CANTEXTRACTFILE); else strText.LoadString(GetModuleHandleA("shell32.dll"), 128); // IDS_CREATEFOLDER_DENIED @@ -660,7 +673,9 @@ public: LocalFree(Win32ErrorString); } } - if (strErr.GetLength() == 0) + if (ErrorType == eOpenError) + strErr.Format(IDS_DECOMPRESSERROR, Error); + else if (strErr.GetLength() == 0) strErr.Format(IDS_UNKNOWNERROR, Error); strText.Append("\r\n\r\n" + strErr); @@ -670,6 +685,8 @@ public: mbFlags |= MB_RETRYCANCEL; else if (ErrorType == eFileError) mbFlags |= MB_ABORTRETRYIGNORE; + else if (ErrorType == eOpenError) + mbFlags |= MB_YESNO; return MessageBoxA(hDlg, strText, strTitle, mbFlags); } diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 19bb69ad39b..50f7cc681f7 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Datei '%s' konnte nicht gelesen werden." IDS_EXTRACTING "Extrahieren..." IDS_CANTEXTRACTFILE "Datei '%1' konnte nicht extrahiert werden." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unbekannter Fehler 0x%08x." IDS_WIZ_TITLE "Extrahier-Assistent" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index e885f59a3f3..85286aa3a66 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extracting..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extraction Wizard" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index 61bd7947e67..b36d05b7f71 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Ekstraktimine..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Ekstraktimise visard" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 217dca2d08b..9b47d0c7147 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extraction..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Assistant d'extraction" diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index 9b972305b39..1c7f17c7e69 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -64,6 +64,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extracting..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 6b75ce72126..a3ebbf1b386 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Estrazione..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Estrazione Guidata" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 8132f95d611..072a4937160 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "ファイル '%s' が読めません。" IDS_EXTRACTING "展開中..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "展開ウィザード" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index 166312bb90a..a9ef3c0a94a 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -78,6 +78,7 @@ BEGIN IDS_CANTREADFILE "Błąd podczas czytania pliku '%s'." IDS_EXTRACTING "Trwa wyodrębnianie..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Kreator wyodrębniania" diff --git a/dll/shellext/zipfldr/lang/pt-PT.rc b/dll/shellext/zipfldr/lang/pt-PT.rc index 53bd82c5e7e..c43183dff83 100644 --- a/dll/shellext/zipfldr/lang/pt-PT.rc +++ b/dll/shellext/zipfldr/lang/pt-PT.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Não é possível ler o arquivo '%s'." IDS_EXTRACTING "A extrair..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Assistente de extração" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index 021bf033732..ab05fc60e1f 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extragere..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Asistent de extracție" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index e8b9c21b046..adfd8416be2 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Не удалось прочитать файл '%s'." IDS_EXTRACTING "Извлечение..." IDS_CANTEXTRACTFILE "Не удалось извлечь файл '%1'." + IDS_DECOMPRESSERROR "Неизвестный метод компрессии %d. Продолжить?" IDS_UNKNOWNERROR "Неизвестная ошибка 0x%08x." IDS_WIZ_TITLE "Мастер извлечения архивов" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 90d2676e9a5..e5da27b41a7 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extraherar..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extraheringsguiden" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index f899a8e218b..3cc125f21b6 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -77,6 +77,7 @@ BEGIN IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "正在解压..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "解压向导" diff --git a/dll/shellext/zipfldr/lang/zh-TW.rc b/dll/shellext/zipfldr/lang/zh-TW.rc index c982d9a64c9..b2183286c27 100644 --- a/dll/shellext/zipfldr/lang/zh-TW.rc +++ b/dll/shellext/zipfldr/lang/zh-TW.rc @@ -80,6 +80,7 @@ BEGIN IDS_CANTREADFILE "無法讀取檔案 '%s'." IDS_EXTRACTING "正在解壓縮..." IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_DECOMPRESSERROR "Unsupported compression method %d. Do you want to continue?" IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "解壓縮精靈" diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index c7e021c63f4..7a9566e1f47 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -48,7 +48,8 @@ #define IDS_CANTREADFILE 113 #define IDS_EXTRACTING 114 #define IDS_CANTEXTRACTFILE 115 -#define IDS_UNKNOWNERROR 116 +#define IDS_DECOMPRESSERROR 116 +#define IDS_UNKNOWNERROR 117 /* Wizard titles */ #define IDS_WIZ_TITLE 8000

1 0

[reactos] 01/01: [SHELL32] Don't smartass-renaming on folders (#3993)
by Katayama Hirofumi MZ 06 Oct '21

06 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5da934e34dfc257b5fb37… commit 5da934e34dfc257b5fb37f172713ccd8d0269ad5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Oct 7 08:16:35 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 7 08:16:35 2021 +0900 [SHELL32] Don't smartass-renaming on folders (#3993) Selection on renaming folders shouldn't select the extension-like part of filename. CORE-17793 --- dll/win32/shell32/CDefView.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 0c3f865febc..03a639a9026 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -2093,9 +2093,11 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl HWND hEdit = reinterpret_cast<HWND>(m_ListView.SendMessage(LVM_GETEDITCONTROL)); SHLimitInputEdit(hEdit, m_pSFParent); - if (!(dwAttr & SFGAO_LINK) && (lpdi->item.mask & LVIF_TEXT) && !SelectExtOnRename()) + LPWSTR pszText = lpdi->item.pszText; + if (!(dwAttr & (SFGAO_LINK | SFGAO_FOLDER)) && (dwAttr & SFGAO_FILESYSTEM) && + (lpdi->item.mask & LVIF_TEXT) && + !SelectExtOnRename() && !SHELL_FS_HideExtension(pszText)) { - LPWSTR pszText = lpdi->item.pszText; LPWSTR pchDotExt = PathFindExtensionW(pszText); ::PostMessageW(hEdit, EM_SETSEL, 0, pchDotExt - pszText); ::PostMessageW(hEdit, EM_SCROLLCARET, 0, 0);

1 0

[reactos] 01/01: [ZIPFLDR] Update de-DE.rc in context of CORE-17796
by Joachim Henze 06 Oct '21

06 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db7295f864ff4553021c9… commit db7295f864ff4553021c9881bf2fdfda50db3deb Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Oct 6 20:17:13 2021 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Oct 6 20:17:13 2021 +0200 [ZIPFLDR] Update de-DE.rc in context of CORE-17796 --- dll/shellext/zipfldr/lang/de-DE.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index ce1f7280e4f..19bb69ad39b 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -76,8 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Fehler beim Erstellen des Archivs '%s' (Fehler Code: %d)." IDS_CANTREADFILE "Datei '%s' konnte nicht gelesen werden." IDS_EXTRACTING "Extrahieren..." - IDS_CANTEXTRACTFILE "Cannot extract file '%1'." - IDS_UNKNOWNERROR "Unknown error 0x%08x." + IDS_CANTEXTRACTFILE "Datei '%1' konnte nicht extrahiert werden." + IDS_UNKNOWNERROR "Unbekannter Fehler 0x%08x." IDS_WIZ_TITLE "Extrahier-Assistent" IDS_WIZ_DEST_TITLE "Ziel auswählen"

1 0

[reactos] 02/02: [ZIPFLDR] Improve error reporting
by Stanislav Motylkov 06 Oct '21

06 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e27acff64907a6fcabd11… commit e27acff64907a6fcabd11b80aa2dbf2d9cede258 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Oct 6 02:48:03 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Oct 6 14:38:25 2021 +0300 [ZIPFLDR] Improve error reporting - Restore status text on failure - Show errors on folder and file creation failures - Allow to retry extraction attempt CORE-17796 --- dll/shellext/zipfldr/CZipExtract.cpp | 82 +++++++++++++++++++++++++++++++++++- dll/shellext/zipfldr/lang/de-DE.rc | 2 + dll/shellext/zipfldr/lang/en-US.rc | 2 + dll/shellext/zipfldr/lang/et-EE.rc | 2 + dll/shellext/zipfldr/lang/fr-FR.rc | 2 + dll/shellext/zipfldr/lang/hi-IN.rc | 2 + dll/shellext/zipfldr/lang/it-IT.rc | 2 + dll/shellext/zipfldr/lang/ja-JP.rc | 2 + dll/shellext/zipfldr/lang/pl-PL.rc | 2 + dll/shellext/zipfldr/lang/pt-PT.rc | 2 + dll/shellext/zipfldr/lang/ro-RO.rc | 2 + dll/shellext/zipfldr/lang/ru-RU.rc | 2 + dll/shellext/zipfldr/lang/sv-SE.rc | 2 + dll/shellext/zipfldr/lang/zh-CN.rc | 2 + dll/shellext/zipfldr/lang/zh-TW.rc | 2 + dll/shellext/zipfldr/resource.h | 2 + 16 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 8e2b9fa3bb4..47be6caa5df 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -75,6 +75,7 @@ public: CZipExtract* m_pExtract; CStringA* m_pPassword; + CStringW m_OldStatus; public: CExtractSettingsPage(CZipExtract* extract, CStringA* password) @@ -127,6 +128,8 @@ public: ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); SetWizardButtons(0); + ::GetWindowTextW(GetDlgItem(IDC_STATUSTEXT), m_OldStatus.GetBuffer(MAX_PATH), MAX_PATH); + m_OldStatus.ReleaseBuffer(); CStringW strExtracting(MAKEINTRESOURCEW(IDS_EXTRACTING)); SetDlgItemTextW(IDC_STATUSTEXT, strExtracting); @@ -156,6 +159,11 @@ public: return TRUE; } + void WizardReset() + { + SetDlgItemTextW(IDC_STATUSTEXT, m_OldStatus); + } + static DWORD WINAPI ExtractEntry(LPVOID lpParam) { CExtractSettingsPage* pPage = (CExtractSettingsPage*)lpParam; @@ -175,6 +183,7 @@ public: CWindow Progress(pPage->GetDlgItem(IDC_PROGRESS)); Progress.SendMessage(PBM_SETRANGE32, 0, 1); Progress.SendMessage(PBM_SETPOS, 0, 0); + pPage->WizardReset(); } SendMessageCallback(pPage->GetParent().m_hWnd, PSM_PRESSBUTTON, PSBTN_NEXT, 0, NULL, NULL); @@ -571,6 +580,7 @@ public: PathCombineA(CombinedPath, BaseDirectory, Name); CStringA FullPath = CombinedPath; FullPath.Replace('/', '\\'); /* SHPathPrepareForWriteA does not handle '/' */ + Retry: eZipExtractError Result = ExtractSingle(hDlg, FullPath, is_dir, &Info, Name, Password, &bOverwriteAll, bCancel, &err); if (Result != eDirectoryError) CurrentFile++; @@ -580,12 +590,43 @@ public: break; case eExtractAbort: - case eDirectoryError: - case eFileError: case eOpenError: case eUnpackError: + { + Close(); + return false; + } + + case eDirectoryError: + { + char StrippedPath[MAX_PATH] = { 0 }; + + StrCpyNA(StrippedPath, FullPath, _countof(StrippedPath)); + if (!is_dir) + PathRemoveFileSpecA(StrippedPath); + PathStripPathA(StrippedPath); + if (ShowExtractError(hDlg, (LPCSTR)&StrippedPath, err, eDirectoryError) == IDRETRY) + goto Retry; Close(); return false; + } + + case eFileError: + { + int Result = ShowExtractError(hDlg, FullPath, err, eFileError); + switch (Result) + { + case IDABORT: + Close(); + return false; + case IDRETRY: + CurrentFile--; + goto Retry; + case IDIGNORE: + break; + } + break; + } } if (Result == eNoError && is_dir) continue; @@ -595,6 +636,43 @@ public: Close(); return true; } + + int ShowExtractError(HWND hDlg, LPCSTR path, int Error, eZipExtractError ErrorType) + { + CStringA strTitle(MAKEINTRESOURCEW(IDS_ERRORTITLE)); + CStringA strErr, strText; + PSTR Win32ErrorString; + + if (ErrorType == eFileError) + strText.LoadString(IDS_CANTEXTRACTFILE); + else + strText.LoadString(GetModuleHandleA("shell32.dll"), 128); // IDS_CREATEFOLDER_DENIED + + strText.FormatMessage(strText.GetString(), path); + + if (ErrorType == eFileError || HRESULT_FACILITY(Error) == FACILITY_WIN32) + { + if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, ErrorType == eFileError ? Error : HRESULT_CODE(Error), 0, + (PSTR)&Win32ErrorString, 0, NULL) != 0) + { + strErr.SetString(Win32ErrorString); + LocalFree(Win32ErrorString); + } + } + if (strErr.GetLength() == 0) + strErr.Format(IDS_UNKNOWNERROR, Error); + + strText.Append("\r\n\r\n" + strErr); + + UINT mbFlags = MB_ICONWARNING; + if (ErrorType == eDirectoryError) + mbFlags |= MB_RETRYCANCEL; + else if (ErrorType == eFileError) + mbFlags |= MB_ABORTRETRYIGNORE; + + return MessageBoxA(hDlg, strText, strTitle, mbFlags); + } }; diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 44587bdc045..ce1f7280e4f 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Fehler beim Erstellen des Archivs '%s' (Fehler Code: %d)." IDS_CANTREADFILE "Datei '%s' konnte nicht gelesen werden." IDS_EXTRACTING "Extrahieren..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extrahier-Assistent" IDS_WIZ_DEST_TITLE "Ziel auswählen" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index 18713a6e39e..e885f59a3f3 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extracting..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extraction Wizard" IDS_WIZ_DEST_TITLE "Select a Destination" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index b828f152c32..61bd7947e67 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Ekstraktimine..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Ekstraktimise visard" IDS_WIZ_DEST_TITLE "Vali sihtkoht" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 6b69c26a7d8..217dca2d08b 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extraction..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Assistant d'extraction" IDS_WIZ_DEST_TITLE "Choisir une destination" diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index ddf53be90a2..9b972305b39 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -63,6 +63,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extracting..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" IDS_WIZ_DEST_TITLE "एक गंतव्य चुनें" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index 2067eadde54..6b75ce72126 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Estrazione..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Estrazione Guidata" IDS_WIZ_DEST_TITLE "Seleziona una Destinazione" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index aaa0f3d9bd0..8132f95d611 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "圧縮フォルダ '%s' を作るのに失敗しました (エラーコード: %d) 。" IDS_CANTREADFILE "ファイル '%s' が読めません。" IDS_EXTRACTING "展開中..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "展開ウィザード" IDS_WIZ_DEST_TITLE "展開先を選んで下さい" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index a9f2ae9d2a6..166312bb90a 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -77,6 +77,8 @@ BEGIN IDS_CANTCREATEZIP "Nie można utworzyć folderu skompresowanego '%s' (kod błędu: %d)." IDS_CANTREADFILE "Błąd podczas czytania pliku '%s'." IDS_EXTRACTING "Trwa wyodrębnianie..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Kreator wyodrębniania" IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe" diff --git a/dll/shellext/zipfldr/lang/pt-PT.rc b/dll/shellext/zipfldr/lang/pt-PT.rc index 5eb72e4a875..53bd82c5e7e 100644 --- a/dll/shellext/zipfldr/lang/pt-PT.rc +++ b/dll/shellext/zipfldr/lang/pt-PT.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Falha ao criar a pasta compactada '%s' (Erro: %d)." IDS_CANTREADFILE "Não é possível ler o arquivo '%s'." IDS_EXTRACTING "A extrair..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Assistente de extração" IDS_WIZ_DEST_TITLE "Seleccione um destino" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index 18a5bce6577..021bf033732 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extragere..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Asistent de extracție" IDS_WIZ_DEST_TITLE "Selectați o Destinație" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 1cdd7e70d4d..e8b9c21b046 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Не удалось создать сжатую папку '%s' (код ошибки: %d)." IDS_CANTREADFILE "Не удалось прочитать файл '%s'." IDS_EXTRACTING "Извлечение..." + IDS_CANTEXTRACTFILE "Не удалось извлечь файл '%1'." + IDS_UNKNOWNERROR "Неизвестная ошибка 0x%08x." IDS_WIZ_TITLE "Мастер извлечения архивов" IDS_WIZ_DEST_TITLE "Укажите путь" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 85fb4ed9006..90d2676e9a5 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "Extraherar..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "Extraheringsguiden" IDS_WIZ_DEST_TITLE "Välj ett mål" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index 8f8d947fd21..f899a8e218b 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -76,6 +76,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." IDS_EXTRACTING "正在解压..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "解压向导" IDS_WIZ_DEST_TITLE "选择一个目标文件夹" diff --git a/dll/shellext/zipfldr/lang/zh-TW.rc b/dll/shellext/zipfldr/lang/zh-TW.rc index b6a8d684620..c982d9a64c9 100644 --- a/dll/shellext/zipfldr/lang/zh-TW.rc +++ b/dll/shellext/zipfldr/lang/zh-TW.rc @@ -79,6 +79,8 @@ BEGIN IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "無法讀取檔案 '%s'." IDS_EXTRACTING "正在解壓縮..." + IDS_CANTEXTRACTFILE "Cannot extract file '%1'." + IDS_UNKNOWNERROR "Unknown error 0x%08x." IDS_WIZ_TITLE "解壓縮精靈" IDS_WIZ_DEST_TITLE "選擇一個目標資料夾" diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index f2f453afdee..c7e021c63f4 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -47,6 +47,8 @@ #define IDS_CANTCREATEZIP 112 #define IDS_CANTREADFILE 113 #define IDS_EXTRACTING 114 +#define IDS_CANTEXTRACTFILE 115 +#define IDS_UNKNOWNERROR 116 /* Wizard titles */ #define IDS_WIZ_TITLE 8000

1 0

[reactos] 01/02: [ZIPFLDR] Refactor extraction function
by Stanislav Motylkov 06 Oct '21

06 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd441aaae722db784b1f5… commit fd441aaae722db784b1f55dd3e0f1faf1d8bcf70 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Oct 5 21:54:39 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Oct 6 14:36:48 2021 +0300 [ZIPFLDR] Refactor extraction function Add separate function for a single file extraction. CORE-17796 --- dll/shellext/zipfldr/CZipExtract.cpp | 362 +++++++++++++++++++---------------- dll/shellext/zipfldr/precomp.h | 10 + 2 files changed, 206 insertions(+), 166 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index bd7dbb7f005..8e2b9fa3bb4 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -344,6 +344,189 @@ public: PropertySheetW(&psh); } + eZipExtractError ExtractSingle( + HWND hDlg, + LPCSTR FullPath, + bool is_dir, + unz_file_info64* Info, + CStringA Name, + CStringA Password, + bool* bOverwriteAll, + const bool* bCancel, + int* ErrorCode + ) + { + int err; + BYTE Buffer[2048]; + DWORD dwFlags = SHPPFW_DIRCREATE | (is_dir ? SHPPFW_NONE : SHPPFW_IGNOREFILENAME); + HRESULT hr = SHPathPrepareForWriteA(hDlg, NULL, FullPath, dwFlags); + if (FAILED_UNEXPECTEDLY(hr)) + { + *ErrorCode = hr; + return eDirectoryError; + } + if (is_dir) + return eNoError; + + if (Info->flag & MINIZIP_PASSWORD_FLAG) + { + eZipPasswordResponse Response = eAccept; + do + { + /* If there is a password set, try it */ + if (!Password.IsEmpty()) + { + err = unzOpenCurrentFilePassword(uf, Password); + if (err == UNZ_OK) + { + /* Try to read some bytes, because unzOpenCurrentFilePassword does not return failure */ + char Buf[10]; + err = unzReadCurrentFile(uf, Buf, sizeof(Buf)); + unzCloseCurrentFile(uf); + if (err >= UNZ_OK) + { + /* 're'-open the file so that we can begin to extract */ + err = unzOpenCurrentFilePassword(uf, Password); + break; + } + } + } + Response = _CZipAskPassword(hDlg, Name, Password); + } while (Response == eAccept); + + if (Response == eSkip) + { + return eNoError; + } + else if (Response == eAbort) + { + return eExtractAbort; + } + } + else + { + err = unzOpenCurrentFile(uf); + } + + if (err != UNZ_OK) + { + DPRINT1("ERROR, unzOpenCurrentFilePassword: 0x%x\n", err); + *ErrorCode = err; + return eOpenError; + } + + HANDLE hFile = CreateFileA(FullPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + DWORD dwErr = GetLastError(); + if (dwErr == ERROR_FILE_EXISTS) + { + bool bOverwrite = *bOverwriteAll; + if (!*bOverwriteAll) + { + eZipConfirmResponse Result = _CZipAskReplace(hDlg, FullPath); + switch (Result) + { + case eYesToAll: + *bOverwriteAll = true; + /* fall through */ + case eYes: + bOverwrite = true; + break; + case eNo: + break; + case eCancel: + unzCloseCurrentFile(uf); + return eExtractAbort; + } + } + + if (bOverwrite) + { + hFile = CreateFileA(FullPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + dwErr = GetLastError(); + } + } + else + { + unzCloseCurrentFile(uf); + return eNoError; + } + } + if (hFile == INVALID_HANDLE_VALUE) + { + unzCloseCurrentFile(uf); + DPRINT1("ERROR, CreateFileA: 0x%x (%s)\n", dwErr, *bOverwriteAll ? "Y" : "N"); + *ErrorCode = dwErr; + return eFileError; + } + } + + do + { + if (*bCancel) + { + CloseHandle(hFile); + BOOL deleteResult = DeleteFileA(FullPath); + if (!deleteResult) + DPRINT1("ERROR, DeleteFileA: 0x%x\n", GetLastError()); + return eExtractAbort; + } + + err = unzReadCurrentFile(uf, Buffer, sizeof(Buffer)); + + if (err < 0) + { + DPRINT1("ERROR, unzReadCurrentFile: 0x%x\n", err); + break; + } + else if (err > 0) + { + DWORD dwWritten; + if (!WriteFile(hFile, Buffer, err, &dwWritten, NULL)) + { + DPRINT1("ERROR, WriteFile: 0x%x\n", GetLastError()); + break; + } + if (dwWritten != (DWORD)err) + { + DPRINT1("ERROR, WriteFile: dwWritten:%d err:%d\n", dwWritten, err); + break; + } + } + + } while (err > 0); + + /* Update Filetime */ + FILETIME LocalFileTime; + DosDateTimeToFileTime((WORD)(Info->dosDate >> 16), (WORD)Info->dosDate, &LocalFileTime); + FILETIME FileTime; + LocalFileTimeToFileTime(&LocalFileTime, &FileTime); + SetFileTime(hFile, &FileTime, &FileTime, &FileTime); + + /* Done */ + CloseHandle(hFile); + + if (err) + { + unzCloseCurrentFile(uf); + DPRINT1("ERROR, unzReadCurrentFile2: 0x%x\n", err); + *ErrorCode = err; + return eUnpackError; + } + else + { + err = unzCloseCurrentFile(uf); + if (err != UNZ_OK) + { + DPRINT1("ERROR(non-fatal), unzCloseCurrentFile: 0x%x\n", err); + } + } + return eNoError; + } + bool Extract(HWND hDlg, HWND hProgress, const bool* bCancel) { unz_global_info64 gi; @@ -368,7 +551,6 @@ public: Progress.SendMessage(PBM_SETRANGE32, 0, gi.number_entry); Progress.SendMessage(PBM_SETPOS, 0, 0); - BYTE Buffer[2048]; CStringA BaseDirectory = m_Directory; CStringA Name; CStringA Password = m_Password; @@ -389,176 +571,24 @@ public: PathCombineA(CombinedPath, BaseDirectory, Name); CStringA FullPath = CombinedPath; FullPath.Replace('/', '\\'); /* SHPathPrepareForWriteA does not handle '/' */ - DWORD dwFlags = SHPPFW_DIRCREATE | (is_dir ? SHPPFW_NONE : SHPPFW_IGNOREFILENAME); - HRESULT hr = SHPathPrepareForWriteA(hDlg, NULL, FullPath, dwFlags); - if (FAILED_UNEXPECTEDLY(hr)) + eZipExtractError Result = ExtractSingle(hDlg, FullPath, is_dir, &Info, Name, Password, &bOverwriteAll, bCancel, &err); + if (Result != eDirectoryError) + CurrentFile++; + switch (Result) { - Close(); - return false; - } - CurrentFile++; - if (is_dir) - continue; - - if (Info.flag & MINIZIP_PASSWORD_FLAG) - { - eZipPasswordResponse Response = eAccept; - do - { - /* If there is a password set, try it */ - if (!Password.IsEmpty()) - { - err = unzOpenCurrentFilePassword(uf, Password); - if (err == UNZ_OK) - { - /* Try to read some bytes, because unzOpenCurrentFilePassword does not return failure */ - char Buf[10]; - err = unzReadCurrentFile(uf, Buf, sizeof(Buf)); - unzCloseCurrentFile(uf); - if (err >= UNZ_OK) - { - /* 're'-open the file so that we can begin to extract */ - err = unzOpenCurrentFilePassword(uf, Password); - break; - } - } - } - Response = _CZipAskPassword(hDlg, Name, Password); - } while (Response == eAccept); - - if (Response == eSkip) - { - Progress.SendMessage(PBM_SETPOS, CurrentFile, 0); - continue; - } - else if (Response == eAbort) - { - Close(); - return false; - } - } - else - { - err = unzOpenCurrentFile(uf); - } - - if (err != UNZ_OK) - { - DPRINT1("ERROR, unzOpenCurrentFilePassword: 0x%x\n", err); - Close(); - return false; - } - - HANDLE hFile = CreateFileA(FullPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) - { - DWORD dwErr = GetLastError(); - if (dwErr == ERROR_FILE_EXISTS) - { - bool bOverwrite = bOverwriteAll; - if (!bOverwriteAll) - { - eZipConfirmResponse Result = _CZipAskReplace(hDlg, FullPath); - switch (Result) - { - case eYesToAll: - bOverwriteAll = true; - case eYes: - bOverwrite = true; - break; - case eNo: - break; - case eCancel: - unzCloseCurrentFile(uf); - Close(); - return false; - } - } - - if (bOverwrite) - { - hFile = CreateFileA(FullPath, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) - { - dwErr = GetLastError(); - } - } - else - { - unzCloseCurrentFile(uf); - continue; - } - } - if (hFile == INVALID_HANDLE_VALUE) - { - unzCloseCurrentFile(uf); - DPRINT1("ERROR, CreateFileA: 0x%x (%s)\n", dwErr, bOverwriteAll ? "Y" : "N"); - Close(); - return false; - } - } + case eNoError: + break; - do - { - if (*bCancel) - { - CloseHandle(hFile); - BOOL deleteResult = DeleteFileA(FullPath); - if (deleteResult == 0) - DPRINT1("ERROR, DeleteFileA: 0x%x\n", GetLastError()); + case eExtractAbort: + case eDirectoryError: + case eFileError: + case eOpenError: + case eUnpackError: Close(); return false; - } - - err = unzReadCurrentFile(uf, Buffer, sizeof(Buffer)); - - if (err < 0) - { - DPRINT1("ERROR, unzReadCurrentFile: 0x%x\n", err); - break; - } - else if (err > 0) - { - DWORD dwWritten; - if (!WriteFile(hFile, Buffer, err, &dwWritten, NULL)) - { - DPRINT1("ERROR, WriteFile: 0x%x\n", GetLastError()); - break; - } - if (dwWritten != (DWORD)err) - { - DPRINT1("ERROR, WriteFile: dwWritten:%d err:%d\n", dwWritten, err); - break; - } - } - - } while (err > 0); - - /* Update Filetime */ - FILETIME LocalFileTime; - DosDateTimeToFileTime((WORD)(Info.dosDate >> 16), (WORD)Info.dosDate, &LocalFileTime); - FILETIME FileTime; - LocalFileTimeToFileTime(&LocalFileTime, &FileTime); - SetFileTime(hFile, &FileTime, &FileTime, &FileTime); - - /* Done */ - CloseHandle(hFile); - - if (err) - { - unzCloseCurrentFile(uf); - DPRINT1("ERROR, unzReadCurrentFile2: 0x%x\n", err); - Close(); - return false; - } - else - { - err = unzCloseCurrentFile(uf); - if (err != UNZ_OK) - { - DPRINT1("ERROR(non-fatal), unzCloseCurrentFile: 0x%x\n", err); - } } + if (Result == eNoError && is_dir) + continue; Progress.SendMessage(PBM_SETPOS, CurrentFile, 0); } diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index b228624b8dc..f21ce4873d5 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -76,6 +76,16 @@ enum eZipConfirmResponse eZipConfirmResponse _CZipAskReplace(HWND hDlg, const char* FullPath); +enum eZipExtractError +{ + eNoError, + eExtractAbort, + eDirectoryError, + eFileError, + eOpenError, + eUnpackError, +}; + #include "CZipEnumerator.hpp" #include "CZipFolder.hpp" #include "CZipCreator.hpp"

1 0

[reactos] 01/01: [IMM32] Implement ImmSystemHandler (#3998)
by Katayama Hirofumi MZ 05 Oct '21

05 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6fd41d07802715d99d62… commit e6fd41d07802715d99d623a4e62f22e71fedc65b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 5 21:31:53 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 5 21:31:53 2021 +0900 [IMM32] Implement ImmSystemHandler (#3998) - Implement ImmSystemHandler function. - Add Imm32UnknownProcess1 and Imm32SendChange helper functions. CORE-11700 --- dll/win32/imm32/imm32.spec | 2 +- dll/win32/imm32/keymsg.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 1ee3a2c8cb0..09ca424fdc0 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -106,7 +106,7 @@ @ stdcall ImmSetStatusWindowPos(ptr ptr) @ stdcall ImmShowSoftKeyboard(ptr long) @ stdcall ImmSimulateHotKey(ptr long) -@ stdcall -stub ImmSystemHandler(ptr long long) +@ stdcall ImmSystemHandler(ptr ptr ptr) @ stdcall ImmTranslateMessage(ptr long ptr ptr) @ stdcall ImmUnlockClientImc(ptr) @ stdcall ImmUnlockIMC(ptr) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 6e35ae685f6..c8dc8670158 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -260,6 +260,95 @@ ImmIsUIMessageAW(HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAns return TRUE; } +typedef struct IMM_UNKNOWN_PROCESS1 +{ + HWND hWnd; + BOOL fFlag; +} IMM_UNKNOWN_PROCESS1, *PIMM_UNKNOWN_PROCESS1; + +static DWORD WINAPI Imm32UnknownProcess1Proc(LPVOID arg) +{ + HWND hwndDefIME; + UINT uValue; + DWORD_PTR lResult; + PIMM_UNKNOWN_PROCESS1 pUnknown = arg; + + Sleep(3000); + hwndDefIME = ImmGetDefaultIMEWnd(pUnknown->hWnd); + if (hwndDefIME) + { + uValue = (pUnknown->fFlag ? 0x23 : 0x24); + SendMessageTimeoutW(hwndDefIME, WM_IME_SYSTEM, uValue, (LPARAM)pUnknown->hWnd, + SMTO_BLOCK | SMTO_ABORTIFHUNG, 5000, &lResult); + } + Imm32HeapFree(pUnknown); + return FALSE; +} + +LRESULT APIENTRY Imm32UnknownProcess1(HWND hWnd, BOOL fFlag) +{ + HANDLE hThread; + PWND pWnd = NULL; + PIMM_UNKNOWN_PROCESS1 pUnknown1; + DWORD_PTR lResult = 0; + + if (hWnd && g_psi) + pWnd = ValidateHwndNoErr(hWnd); + + if (!pWnd) + return 0; + + if (pWnd->state2 & WNDS2_WMCREATEMSGPROCESSED) + { + SendMessageTimeoutW(hWnd, 0x505, 0, fFlag, 3, 5000, &lResult); + return lResult; + } + + pUnknown1 = Imm32HeapAlloc(0, sizeof(IMM_UNKNOWN_PROCESS1)); + if (!pUnknown1) + return 0; + + pUnknown1->hWnd = hWnd; + pUnknown1->fFlag = fFlag; + + hThread = CreateThread(NULL, 0, Imm32UnknownProcess1Proc, pUnknown1, 0, NULL); + if (hThread) + CloseHandle(hThread); + return 0; +} + +static BOOL CALLBACK Imm32SendChangeProc(HIMC hIMC, LPARAM lParam) +{ + HWND hWnd; + LPINPUTCONTEXTDX pIC; + + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (!pIC) + return TRUE; + + hWnd = pIC->hWnd; + if (!IsWindow(hWnd)) + goto Quit; + + if (pIC->dwChange & INPUTCONTEXTDX_CHANGE_OPEN) + SendMessageW(hWnd, WM_IME_NOTIFY, IMN_SETOPENSTATUS, 0); + if (pIC->dwChange & INPUTCONTEXTDX_CHANGE_CONVERSION) + SendMessageW(hWnd, WM_IME_NOTIFY, IMN_SETCONVERSIONMODE, 0); + if (pIC->dwChange & (INPUTCONTEXTDX_CHANGE_OPEN | INPUTCONTEXTDX_CHANGE_CONVERSION)) + NtUserNotifyIMEStatus(hWnd, pIC->fOpen, pIC->fdwConversion); + if (pIC->dwChange & INPUTCONTEXTDX_CHANGE_SENTENCE) + SendMessageW(hWnd, WM_IME_NOTIFY, IMN_SETSENTENCEMODE, 0); +Quit: + pIC->dwChange = 0; + ImmUnlockIMC(hIMC); // ??? Windows doesn't unlock here + return TRUE; +} + +BOOL APIENTRY Imm32SendChange(BOOL bProcess) +{ + return ImmEnumInputContext((bProcess ? -1 : 0), Imm32SendChangeProc, 0); +} + /*********************************************************************** * ImmIsUIMessageA (IMM32.@) */ @@ -425,6 +514,31 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) return ret; } +/*********************************************************************** + * ImmSystemHandler(IMM32.@) + */ +LRESULT WINAPI ImmSystemHandler(HIMC hIMC, WPARAM wParam, LPARAM lParam) +{ + TRACE("(%p, %p, %p)\n", hIMC, wParam, lParam); + + switch (wParam) + { + case 0x1f: + Imm32SendChange((BOOL)lParam); + return 0; + + case 0x20: + ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); + return 0; + + case 0x23: case 0x24: + return Imm32UnknownProcess1((HWND)lParam, (wParam == 0x23)); + + default: + return 0; + } +} + /*********************************************************************** * ImmGenerateMessage(IMM32.@) */

1 0

[reactos] 01/01: [IMM32] Add IMP stub functions (#3989)
by Katayama Hirofumi MZ 05 Oct '21

05 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f006ec74b2d06561c411… commit 4f006ec74b2d06561c4112af878e2d9fb4a29354 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 5 14:07:58 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Oct 5 14:07:58 2021 +0900 [IMM32] Add IMP stub functions (#3989) - Add IMP (Input Method Profiler) stub functions (ImmIMPGetIMEA/W, ImmIMPQueryIMEA/W, ImmIMPSetIMEA/W). - Add ImmSendIMEMessageExA/W stub functions. - Rename nt3.c as win3.c. The prototypes can be obtained from: https://doxygen.reactos.org/dc/d20/winnls32_8h.html . The Japanese article of IMP is available: http://www7a.biglobe.ne.jp/~tsuneoka/win32tech/7.html CORE-11700 --- dll/win32/imm32/CMakeLists.txt | 2 +- dll/win32/imm32/imm32.spec | 16 ++++++------ dll/win32/imm32/keymsg.c | 6 ++--- dll/win32/imm32/precomp.h | 1 + dll/win32/imm32/utils.c | 54 +++++++++++++++++++++++++++++++++++++++ dll/win32/imm32/{nt3.c => win3.c} | 28 ++++++++++++++++---- 6 files changed, 90 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index bb50a71ab63..3597068bdbc 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -13,9 +13,9 @@ list(APPEND SOURCE ime.c imm.c keymsg.c - nt3.c regword.c utils.c + win3.c ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 162d3d0c4ff..1ee3a2c8cb0 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -61,12 +61,12 @@ @ stdcall ImmGetRegisterWordStyleW(long long ptr) @ stdcall ImmGetStatusWindowPos(ptr ptr) @ stdcall ImmGetVirtualKey(ptr) -@ stdcall -stub ImmIMPGetIMEA(ptr ptr) -@ stdcall -stub ImmIMPGetIMEW(ptr ptr) -@ stdcall -stub ImmIMPQueryIMEA(ptr) -@ stdcall -stub ImmIMPQueryIMEW(ptr) -@ stdcall -stub ImmIMPSetIMEA(ptr ptr) -@ stdcall -stub ImmIMPSetIMEW(ptr ptr) +@ stdcall ImmIMPGetIMEA(ptr ptr) +@ stdcall ImmIMPGetIMEW(ptr ptr) +@ stdcall ImmIMPQueryIMEA(ptr) +@ stdcall ImmIMPQueryIMEW(ptr) +@ stdcall ImmIMPSetIMEA(ptr ptr) +@ stdcall ImmIMPSetIMEW(ptr ptr) @ stdcall ImmInstallIMEA(str str) @ stdcall ImmInstallIMEW(wstr wstr) @ stdcall ImmIsIME(long) @@ -89,8 +89,8 @@ @ stdcall ImmReleaseContext(ptr ptr) @ stdcall ImmRequestMessageA(ptr long long) @ stdcall ImmRequestMessageW(ptr long long) -@ stdcall -stub ImmSendIMEMessageExA(ptr long) -@ stdcall -stub ImmSendIMEMessageExW(ptr long) +@ stdcall ImmSendIMEMessageExA(ptr ptr) +@ stdcall ImmSendIMEMessageExW(ptr ptr) @ stub ImmSendMessageToActiveDefImeWndW @ stdcall ImmSetActiveContext(ptr ptr long) @ stdcall ImmSetActiveContextConsoleIME(ptr long) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 6fe90bd26a2..6e35ae685f6 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -470,7 +470,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) RtlCopyMemory(pTrans, pMsgs, cbTrans); -#ifdef IMM_NT3_SUPPORT +#ifdef IMM_WIN3_SUPPORT if (GetWin32ClientInfo()->dwExpWinVer < _WIN32_WINNT_NT4) /* old version (3.x)? */ { LANGID LangID = LANGIDFROMLCID(GetSystemDefaultLCID()); @@ -520,7 +520,7 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg) bAnsi = !(pClientImc->dwFlags & CLIENTIMC_WIDE); ImmUnlockClientImc(pClientImc); -#ifdef IMM_NT3_SUPPORT +#ifdef IMM_WIN3_SUPPORT if (GetWin32ClientInfo()->dwExpWinVer < _WIN32_WINNT_NT4) /* old version (3.x)? */ { LANGID LangID = LANGIDFROMLCID(GetSystemDefaultLCID()); @@ -555,7 +555,7 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg) PostMessageW(hwnd, pItem->message, pItem->wParam, pItem->lParam); } -#ifdef IMM_NT3_SUPPORT +#ifdef IMM_WIN3_SUPPORT if (pNewTransMsg != lpTransMsg) Imm32HeapFree(pNewTransMsg); #endif diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index caaf30c1c09..4ca77e11fbf 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -23,6 +23,7 @@ #include <winuser.h> #include <winnls.h> #include <winreg.h> +#include <winnls32.h> #include <imm.h> #include <ddk/imm.h> diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 74c234a0eae..7024ec8f19f 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -425,3 +425,57 @@ DWORD WINAPI ImmGetIMCLockCount(HIMC hIMC) ImmUnlockClientImc(pClientImc); return ret; } + +/*********************************************************************** + * ImmIMPGetIMEA(IMM32.@) + */ +BOOL WINAPI ImmIMPGetIMEA(HWND hWnd, LPIMEPROA pImePro) +{ + FIXME("(%p, %p)\n", hWnd, pImePro); + return FALSE; +} + +/*********************************************************************** + * ImmIMPGetIMEW(IMM32.@) + */ +BOOL WINAPI ImmIMPGetIMEW(HWND hWnd, LPIMEPROW pImePro) +{ + FIXME("(%p, %p)\n", hWnd, pImePro); + return FALSE; +} + +/*********************************************************************** + * ImmIMPQueryIMEA(IMM32.@) + */ +BOOL WINAPI ImmIMPQueryIMEA(LPIMEPROA pImePro) +{ + FIXME("(%p)\n", pImePro); + return FALSE; +} + +/*********************************************************************** + * ImmIMPQueryIMEW(IMM32.@) + */ +BOOL WINAPI ImmIMPQueryIMEW(LPIMEPROW pImePro) +{ + FIXME("(%p)\n", pImePro); + return FALSE; +} + +/*********************************************************************** + * ImmIMPSetIMEA(IMM32.@) + */ +BOOL WINAPI ImmIMPSetIMEA(HWND hWnd, LPIMEPROA pImePro) +{ + FIXME("(%p, %p)\n", hWnd, pImePro); + return FALSE; +} + +/*********************************************************************** + * ImmIMPSetIMEW(IMM32.@) + */ +BOOL WINAPI ImmIMPSetIMEW(HWND hWnd, LPIMEPROW pImePro) +{ + FIXME("(%p, %p)\n", hWnd, pImePro); + return FALSE; +} diff --git a/dll/win32/imm32/nt3.c b/dll/win32/imm32/win3.c similarity index 90% rename from dll/win32/imm32/nt3.c rename to dll/win32/imm32/win3.c index e1e8b263311..bce492c9cb1 100644 --- a/dll/win32/imm32/nt3.c +++ b/dll/win32/imm32/win3.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS IMM32 * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Implementing IMM32 NT3 compatibility + * PURPOSE: Implementing IMM32 Win3.x compatibility * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -9,7 +9,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -#ifdef IMM_NT3_SUPPORT /* 3.x support */ +#ifdef IMM_WIN3_SUPPORT /* 3.x support */ DWORD APIENTRY ImmNt3JTransCompA(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, @@ -170,14 +170,14 @@ DoDefault: return ret; } -static DWORD APIENTRY +DWORD APIENTRY ImmNt3KTrans(DWORD dwCount, LPTRANSMSG pEntries, LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, BOOL bAnsi) { return dwCount; // FIXME } -static DWORD APIENTRY +DWORD APIENTRY ImmNt3Trans(DWORD dwCount, LPTRANSMSG pEntries, HIMC hIMC, BOOL bAnsi, WORD wLang) { BOOL ret = FALSE; @@ -202,4 +202,22 @@ ImmNt3Trans(DWORD dwCount, LPTRANSMSG pEntries, HIMC hIMC, BOOL bAnsi, WORD wLan return ret; } -#endif /* IMM_NT3_SUPPORT */ +#endif /* IMM_WIN3_SUPPORT */ + +/*********************************************************************** + * ImmSendIMEMessageExA(IMM32.@) + */ +WORD WINAPI ImmSendIMEMessageExA(HWND hWnd, LPARAM lParam) +{ + FIXME("(%p, %p)\n", hWnd, lParam); + return 0; +} + +/*********************************************************************** + * ImmSendIMEMessageExW(IMM32.@) + */ +WORD WINAPI ImmSendIMEMessageExW(HWND hWnd, LPARAM lParam) +{ + FIXME("(%p, %p)\n", hWnd, lParam); + return 0; +}

1 0

[reactos] 01/01: [IMM32] s/4/sizeof(DWORD)/
by Katayama Hirofumi MZ 04 Oct '21

04 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0d66e68c17a118d26691… commit b0d66e68c17a118d26691a040c26d61e418b9168 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Oct 5 07:57:14 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Oct 5 07:57:14 2021 +0900 [IMM32] s/4/sizeof(DWORD)/ CORE-11700 --- dll/win32/imm32/ime.c | 2 +- dll/win32/imm32/imm.c | 8 ++++---- dll/win32/imm32/utils.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 02b47bd1b88..9ae6115fe49 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -70,7 +70,7 @@ BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) szUIClass[_countof(szUIClass) - 1] = 0; if (pImeInfo->dwPrivateDataSize == 0) - pImeInfo->dwPrivateDataSize = 4; + pImeInfo->dwPrivateDataSize = sizeof(DWORD); #define VALID_IME_PROP (IME_PROP_AT_CARET | \ IME_PROP_SPECIAL_UI | \ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index c840cdf3ee7..db537ad9bf0 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -202,14 +202,14 @@ VOID APIENTRY Imm32SelectLayout(HKL hNewKL, HKL hOldKL, HIMC hIMC) pClientImc->uCodePage = CP_ACP; } - if (cbNewPrivate < 4) - cbNewPrivate = 4; + if (cbNewPrivate < sizeof(DWORD)) + cbNewPrivate = sizeof(DWORD); if (pOldImeDpi) cbOldPrivate = pOldImeDpi->ImeInfo.dwPrivateDataSize; - if (cbOldPrivate < 4) - cbOldPrivate = 4; + if (cbOldPrivate < sizeof(DWORD)) + cbOldPrivate = sizeof(DWORD); if (pClientImc->hKL == hOldKL) { diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 5be74913595..74c234a0eae 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -341,8 +341,8 @@ BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) */ HIMCC WINAPI ImmCreateIMCC(DWORD size) { - if (size < 4) - size = 4; + if (size < sizeof(DWORD)) + size = sizeof(DWORD); return LocalAlloc(LHND, size); }

1 0

[reactos] 01/01: [RAPPS] Update German translation
by Robert Naumann 04 Oct '21

04 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b5ffa7a794e172cb1184… commit 6b5ffa7a794e172cb11843d249813a1c87f0469d Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Sun Oct 3 22:55:15 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Oct 4 18:48:47 2021 +0200 [RAPPS] Update German translation --- base/applications/rapps/lang/de-DE.rc | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/base/applications/rapps/lang/de-DE.rc b/base/applications/rapps/lang/de-DE.rc index 8e6a9e60374..93ebd353bf0 100644 --- a/base/applications/rapps/lang/de-DE.rc +++ b/base/applications/rapps/lang/de-DE.rc @@ -66,9 +66,9 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Wählen", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Installer nach Programminstallation löschen", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - CONTROL "Use default", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 74, 10 - CONTROL "Specified source", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 + GROUPBOX "Softwarequelle", -1, 4, 118, 240, 46 + CONTROL "Vorgabe benutzen", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 74, 10 + CONTROL "Spezifische Quelle", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Proxy", -1, 4, 166, 240, 76 CONTROL "Proxy Einstellungen des Systems verwenden", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 @@ -194,14 +194,14 @@ BEGIN IDS_APPLICATIONS "Anwendungen" IDS_CHOOSE_FOLDER_TEXT "Wählen Sie ein Verzeichnis aus, das zum Herunterladen verwendet werden soll:" IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Die von Ihnen angegebene URL ist ungültig oder wird nicht unterstützt. Bitte korrigieren Sie sie!" IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?" IDS_INFORMATION "Informationen" - IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!" + IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Adresse wurde nicht gefunden!" IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! Prüfen Sie Ihre Internetverbindung!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!" IDS_UNABLE_TO_INSTALL "Paket konnte nicht installiert werden!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" + IDS_UNABLE_TO_QUERY_CERT "Zertifikatsinformationen können nicht abgerufen werden.\n\nMöchten Sie trotzdem fortfahren?" IDS_INTEG_CHECK_TITLE "Integritätsprüfung…" IDS_INTEG_CHECK_FAIL "Das Paket hat die Integritätsprüfung nicht bestanden. Mögliche Ursachen sind Übertragungsfehler, Datenbankfehler oder Manipulation durch einen Angreifer. Sie sollten die Software nicht ausführen." IDS_INTERRUPTED_DOWNLOAD "Übertragung unterbrochen. Prüfen Sie Ihre Internetverbindung!" @@ -209,11 +209,11 @@ BEGIN IDS_SELECT_ALL "Alle/Keine" IDS_INSTALL_SELECTED "Ausgewählte Installieren" IDS_SELECTEDFORINST "Zur Installation ausgewählt" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" - IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_MISMATCH_CERT_INFO "Das verwendete Zertifikat ist unbekannt:\nTitel: %s\nAussteller: %s\nMöchten Sie trotzdem fortfahren?" + IDS_UNABLE_PATH "Falsches Pfadformat" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "Liste" + IDS_APP_DISPLAY_TILE "Kacheln" END STRINGTABLE @@ -230,9 +230,9 @@ END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Open Source" + IDS_LICENSE_OPENSOURCE "quelloffen" IDS_LICENSE_FREEWARE "Freeware" - IDS_LICENSE_TRIAL "Trial/Demo" + IDS_LICENSE_TRIAL "Test-/Demoversion" END STRINGTABLE @@ -249,17 +249,17 @@ STRINGTABLE BEGIN IDS_DL_DIALOG_DB_DISP "Anwendungsdatenbank" IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Datenbank-Aktualisierung…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Datenbank-Aktualisierung… (Unoffizielle Quelle)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Benutzung: " + IDS_CMD_NEED_PACKAGE_NAME "Fehler: Option %1 erwartet einen oder mehrere Paketnamen.\n" + IDS_CMD_NEED_FILE_NAME "Fehler: Option %1 erwartet einen Dateinamen.\n" + IDS_CMD_NEED_PARAMS "Fehler: Option %1 erwartet einen oder mehrere Parameter.\n" + IDS_CMD_INVALID_OPTION "Fehler: Unbekannte oder ungültige Kommandozeilenargumente angegeben.\n" + IDS_CMD_FIND_RESULT_FOR "Suchergebnis für %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Paket %1 konnte nicht gefunden werden.\n" + IDS_CMD_PACKAGE_INFO "Informationen über das Paket %1:\n" END

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2021