Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [MSCTFIME] Implement CtfImeDispatchDefImeMessage (#6193)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64378a88ba36e0ec0513d… commit 64378a88ba36e0ec0513dfa9472fc295e85ceccc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 14:24:48 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 19 14:24:48 2023 +0900 [MSCTFIME] Implement CtfImeDispatchDefImeMessage (#6193) and add IsMsImeMessage helper funciton. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 44 +++++++++++++++++++++++++++++++++++++++++-- dll/ime/msctfime/msctfime.h | 2 ++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index d5354b23bdc..8bf27f62d61 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -26,6 +26,20 @@ UINT WM_MSIME_SHOWIMEPAD = 0; UINT WM_MSIME_MOUSE = 0; UINT WM_MSIME_KEYMAP = 0; +BOOL IsMsImeMessage(UINT uMsg) +{ + return (uMsg == WM_MSIME_SERVICE || + uMsg == WM_MSIME_UIREADY || + uMsg == WM_MSIME_RECONVERTREQUEST || + uMsg == WM_MSIME_RECONVERT || + uMsg == WM_MSIME_DOCUMENTFEED || + uMsg == WM_MSIME_QUERYPOSITION || + uMsg == WM_MSIME_MODEBIAS || + uMsg == WM_MSIME_SHOWIMEPAD || + uMsg == WM_MSIME_MOUSE || + uMsg == WM_MSIME_KEYMAP); +} + typedef BOOLEAN (WINAPI *FN_DllShutDownInProgress)(VOID); EXTERN_C BOOLEAN WINAPI @@ -871,6 +885,11 @@ CtfImeProcessCicHotkey( return E_NOTIMPL; } +/*********************************************************************** + * CtfImeDispatchDefImeMessage (MSCTFIME.@) + * + * @implemented + */ EXTERN_C LRESULT WINAPI CtfImeDispatchDefImeMessage( _In_ HWND hWnd, @@ -878,8 +897,29 @@ CtfImeDispatchDefImeMessage( _In_ WPARAM wParam, _In_ LPARAM lParam) { - FIXME("stub:(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); - return 0; + TRACE("(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); + + TLS *pTLS = TLS::GetTLS(); + if (pTLS) + { + if (uMsg == WM_CREATE) + ++pTLS->m_cWnds; + else if (uMsg == WM_DESTROY) + --pTLS->m_cWnds; + } + + if (!IsMsImeMessage(uMsg)) + return 0; + + HKL hKL = GetKeyboardLayout(0); + if (IS_IME_HKL(hKL)) + return 0; + + HWND hImeWnd = (HWND)SendMessageW(hWnd, WM_IME_NOTIFY, 0x17, 0); + if (!IsWindow(hImeWnd)) + return 0; + + return SendMessageW(hImeWnd, uMsg, wParam, lParam); } EXTERN_C BOOL WINAPI diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index e227b5b8d7e..9e492902348 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -28,4 +28,6 @@ #include "resource.h" +#define IS_IME_HKL(hKL) ((((ULONG_PTR)(hKL)) & 0xF0000000) == 0xE0000000) + extern HINSTANCE g_hInst;

10 months

[reactos] 01/01: [SHIMGVW] Add 'rotate and save image' buttons (#6186)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=084fae1eb480ac9ee4d36… commit 084fae1eb480ac9ee4d360708e0b74ec16e44a6d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 13:22:53 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 19 13:22:53 2023 +0900 [SHIMGVW] Add 'rotate and save image' buttons (#6186) - Add IDC_ROT_CWSAVE and IDC_ROT_CCWSAVE buttons. - Add Preview_pSaveImage helper function. - Use it in IDC_ROT_CWSAVE and IDC_ROT_CCWSAVE command handling. CORE-19358, CORE-19387 --- dll/win32/shimgvw/lang/bg-BG.rc | 2 + dll/win32/shimgvw/lang/cs-CZ.rc | 2 + dll/win32/shimgvw/lang/de-DE.rc | 2 + dll/win32/shimgvw/lang/en-US.rc | 2 + dll/win32/shimgvw/lang/es-ES.rc | 2 + dll/win32/shimgvw/lang/fr-FR.rc | 2 + dll/win32/shimgvw/lang/he-IL.rc | 2 + dll/win32/shimgvw/lang/it-IT.rc | 2 + dll/win32/shimgvw/lang/ja-JP.rc | 2 + dll/win32/shimgvw/lang/lt-LT.rc | 2 + dll/win32/shimgvw/lang/no-NO.rc | 2 + dll/win32/shimgvw/lang/pl-PL.rc | 2 + dll/win32/shimgvw/lang/pt-PT.rc | 2 + dll/win32/shimgvw/lang/ro-RO.rc | 2 + dll/win32/shimgvw/lang/ru-RU.rc | 2 + dll/win32/shimgvw/lang/sk-SK.rc | 2 + dll/win32/shimgvw/lang/sq-AL.rc | 2 + dll/win32/shimgvw/lang/tr-TR.rc | 2 + dll/win32/shimgvw/lang/uk-UA.rc | 2 + dll/win32/shimgvw/lang/zh-CN.rc | 2 + dll/win32/shimgvw/lang/zh-HK.rc | 2 + dll/win32/shimgvw/lang/zh-TW.rc | 2 + dll/win32/shimgvw/res/rot1save.bmp | Bin 0 -> 822 bytes dll/win32/shimgvw/res/rot2save.bmp | Bin 0 -> 822 bytes dll/win32/shimgvw/resource.h | 40 +++++++------ dll/win32/shimgvw/shimgvw.c | 115 +++++++++++++++++++++++++++++-------- dll/win32/shimgvw/shimgvw.rc | 2 + 27 files changed, 162 insertions(+), 39 deletions(-) diff --git a/dll/win32/shimgvw/lang/bg-BG.rc b/dll/win32/shimgvw/lang/bg-BG.rc index 279db8f0148..871a1f1140d 100644 --- a/dll/win32/shimgvw/lang/bg-BG.rc +++ b/dll/win32/shimgvw/lang/bg-BG.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Намаляване (-)" IDS_TOOLTIP_ROT_CLOCKW "Завъртане по часовника (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Завъртане срещу часовника (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Разпечатване (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Записване като... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/cs-CZ.rc b/dll/win32/shimgvw/lang/cs-CZ.rc index 4a4c67ab0e7..a8dd4804e63 100644 --- a/dll/win32/shimgvw/lang/cs-CZ.rc +++ b/dll/win32/shimgvw/lang/cs-CZ.rc @@ -21,6 +21,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Oddálit (-)" IDS_TOOLTIP_ROT_CLOCKW "Otočit po směru hodinových ručiček (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Otočit proti směru hodinových ručiček (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Odstranit (DEL)" IDS_TOOLTIP_PRINT "Tisk (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Uložit jako... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/de-DE.rc b/dll/win32/shimgvw/lang/de-DE.rc index 59215804a46..359029da600 100644 --- a/dll/win32/shimgvw/lang/de-DE.rc +++ b/dll/win32/shimgvw/lang/de-DE.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Verkleinern (-)" IDS_TOOLTIP_ROT_CLOCKW "Drehen im Uhrzeigersinn (Strg+K)" IDS_TOOLTIP_ROT_COUNCW "Drehen gegen den Uhrzeigersinn (Strg+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Löschen (Entf)" IDS_TOOLTIP_PRINT "Drucken (Strg+P)" IDS_TOOLTIP_SAVEAS "Speichern unter... (Strg+S)" diff --git a/dll/win32/shimgvw/lang/en-US.rc b/dll/win32/shimgvw/lang/en-US.rc index d2712a552da..ff2d63091b8 100644 --- a/dll/win32/shimgvw/lang/en-US.rc +++ b/dll/win32/shimgvw/lang/en-US.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Zoom Out (-)" IDS_TOOLTIP_ROT_CLOCKW "Rotate Clockwise (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Rotate Counterclockwise (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Print (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Save As... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/es-ES.rc b/dll/win32/shimgvw/lang/es-ES.rc index 08bc0059e85..ebaad903bd7 100644 --- a/dll/win32/shimgvw/lang/es-ES.rc +++ b/dll/win32/shimgvw/lang/es-ES.rc @@ -18,6 +18,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Alejar (-)" IDS_TOOLTIP_ROT_CLOCKW "Rotar en el sentido de las agujas del reloj (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Rotar en el sentido opuesto a las agujas del reloj (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Imprimir (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Guardar como... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/fr-FR.rc b/dll/win32/shimgvw/lang/fr-FR.rc index d6fcf5fb11e..26bf2eaab06 100644 --- a/dll/win32/shimgvw/lang/fr-FR.rc +++ b/dll/win32/shimgvw/lang/fr-FR.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Diminuer (-)" IDS_TOOLTIP_ROT_CLOCKW "Tourner dans le sens des aiguilles d'une montre (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Tourner dans le sens opposé des aiguilles d'une montre (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Supprimer (Suppr)" IDS_TOOLTIP_PRINT "Imprimer (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Enregistrer sous... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/he-IL.rc b/dll/win32/shimgvw/lang/he-IL.rc index 6d000b52fb0..5952655ad71 100644 --- a/dll/win32/shimgvw/lang/he-IL.rc +++ b/dll/win32/shimgvw/lang/he-IL.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "הרחקה (-)" IDS_TOOLTIP_ROT_CLOCKW "סובב עם כיוון השעון (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "סובב כנגד כיוון השעון (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "הדפס (Ctrl+P)" IDS_TOOLTIP_SAVEAS "שמירה בשם... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/it-IT.rc b/dll/win32/shimgvw/lang/it-IT.rc index 6b7f5af5289..fba8f6d3d97 100644 --- a/dll/win32/shimgvw/lang/it-IT.rc +++ b/dll/win32/shimgvw/lang/it-IT.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Riduci (-)" IDS_TOOLTIP_ROT_CLOCKW "Ruota in senso orario (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Ruota in senso antiorario (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Elimina (CANC)" IDS_TOOLTIP_PRINT "Stampa (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Salva come... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/ja-JP.rc b/dll/win32/shimgvw/lang/ja-JP.rc index 5f3cd2dbc45..c8140066311 100644 --- a/dll/win32/shimgvw/lang/ja-JP.rc +++ b/dll/win32/shimgvw/lang/ja-JP.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "ズームアウト (-)" IDS_TOOLTIP_ROT_CLOCKW "時計回りに回転 (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "反時計回りに回転 (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "印刷 (Ctrl+P)" IDS_TOOLTIP_SAVEAS "名前を付けて保存... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/lt-LT.rc b/dll/win32/shimgvw/lang/lt-LT.rc index b4ab0c2729d..fa496a2f53e 100644 --- a/dll/win32/shimgvw/lang/lt-LT.rc +++ b/dll/win32/shimgvw/lang/lt-LT.rc @@ -18,6 +18,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Mažinti (-)" IDS_TOOLTIP_ROT_CLOCKW "Pasukti pagal laikrodžio rodyklę (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Pasukti prieš laikrodžio rodyklę (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Spausdinti (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Įrašyti kaip... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/no-NO.rc b/dll/win32/shimgvw/lang/no-NO.rc index 233b27bffb3..5b321da2dac 100644 --- a/dll/win32/shimgvw/lang/no-NO.rc +++ b/dll/win32/shimgvw/lang/no-NO.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Forminske (-)" IDS_TOOLTIP_ROT_CLOCKW "Med urviseren (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Dreie mot urviseren (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Skriv ut (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Lagre som... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/pl-PL.rc b/dll/win32/shimgvw/lang/pl-PL.rc index d8ed33829b5..a68329e9a90 100644 --- a/dll/win32/shimgvw/lang/pl-PL.rc +++ b/dll/win32/shimgvw/lang/pl-PL.rc @@ -21,6 +21,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Pomniejsz (-)" IDS_TOOLTIP_ROT_CLOCKW "Obróć zgodnie z ruchem wskazówek zegara (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Obróć przeciwnie do ruchu wskazówek zegara (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Usuń (Delete)" IDS_TOOLTIP_PRINT "Drukuj (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Zapisz jako... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/pt-PT.rc b/dll/win32/shimgvw/lang/pt-PT.rc index 0d4b4b9fa4a..d51396c5018 100644 --- a/dll/win32/shimgvw/lang/pt-PT.rc +++ b/dll/win32/shimgvw/lang/pt-PT.rc @@ -21,6 +21,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Zoom (-)" IDS_TOOLTIP_ROT_CLOCKW "Girar no sentido dos ponteiros do relógio(Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Girar no sentido anti-horário (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Imprimir (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Guardar como... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/ro-RO.rc b/dll/win32/shimgvw/lang/ro-RO.rc index 1cd6f1e2301..42efd6c54d0 100644 --- a/dll/win32/shimgvw/lang/ro-RO.rc +++ b/dll/win32/shimgvw/lang/ro-RO.rc @@ -24,6 +24,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Micșorare (-)" IDS_TOOLTIP_ROT_CLOCKW "Rotește în sens orar (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Rotește în sens antiorar (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Șterge (DEL)" IDS_TOOLTIP_PRINT "Imprimă (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Salvează ca… (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/ru-RU.rc b/dll/win32/shimgvw/lang/ru-RU.rc index 05fe4508973..2b42a6f364e 100644 --- a/dll/win32/shimgvw/lang/ru-RU.rc +++ b/dll/win32/shimgvw/lang/ru-RU.rc @@ -16,6 +16,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Уменьшить (-)" IDS_TOOLTIP_ROT_CLOCKW "Повернуть по часовой стрелке (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Повернуть против часовой стрелки (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Печать (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Сохранить как... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/sk-SK.rc b/dll/win32/shimgvw/lang/sk-SK.rc index 8c802a0da57..d3948c52b54 100644 --- a/dll/win32/shimgvw/lang/sk-SK.rc +++ b/dll/win32/shimgvw/lang/sk-SK.rc @@ -20,6 +20,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Vzdialiť (-)" IDS_TOOLTIP_ROT_CLOCKW "Otočiť v smere hodinových ručičiek (Ctrl+K)" // Otočiť vpravo IDS_TOOLTIP_ROT_COUNCW "Otočiť proti smeru hodinových ručičiek (Ctrl+L)" // Otočiť vľavo + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Vytlačiť (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Uložiť ako... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/sq-AL.rc b/dll/win32/shimgvw/lang/sq-AL.rc index 4bb22218a2b..c04f9bf07ca 100644 --- a/dll/win32/shimgvw/lang/sq-AL.rc +++ b/dll/win32/shimgvw/lang/sq-AL.rc @@ -20,6 +20,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Zoom Jashtë (-)" IDS_TOOLTIP_ROT_CLOCKW "Rrotullo KrahAkrepave (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Rrotullo kundërKrahAkrepave (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Printo (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Ruaj Si... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/tr-TR.rc b/dll/win32/shimgvw/lang/tr-TR.rc index 3f0cbc238df..ee2f2c1b629 100644 --- a/dll/win32/shimgvw/lang/tr-TR.rc +++ b/dll/win32/shimgvw/lang/tr-TR.rc @@ -18,6 +18,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Uzaklaştır (-)" IDS_TOOLTIP_ROT_CLOCKW "Saat Yönünde Döndür (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Saat Yönünün Tersi Yönünde Döndür (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Sil (DEL)" IDS_TOOLTIP_PRINT "Yazdır (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Farklı Kaydet... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/uk-UA.rc b/dll/win32/shimgvw/lang/uk-UA.rc index cfce26019ab..ebe569ba7ca 100644 --- a/dll/win32/shimgvw/lang/uk-UA.rc +++ b/dll/win32/shimgvw/lang/uk-UA.rc @@ -24,6 +24,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "Зменшити (-)" IDS_TOOLTIP_ROT_CLOCKW "Повернути за годинниковою стрілкою (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "Повернути проти годинникової стрілки (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "Delete (DEL)" IDS_TOOLTIP_PRINT "Друк (Ctrl+P)" IDS_TOOLTIP_SAVEAS "Зберегти як... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/zh-CN.rc b/dll/win32/shimgvw/lang/zh-CN.rc index a988f7a17c4..632673d5a3a 100644 --- a/dll/win32/shimgvw/lang/zh-CN.rc +++ b/dll/win32/shimgvw/lang/zh-CN.rc @@ -25,6 +25,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "缩小 (-)" IDS_TOOLTIP_ROT_CLOCKW "顺时针旋转 (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "逆时针旋转 (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "删除 (DEL)" IDS_TOOLTIP_PRINT "打印 (Ctrl+P)" IDS_TOOLTIP_SAVEAS "另存为...(Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/zh-HK.rc b/dll/win32/shimgvw/lang/zh-HK.rc index c0ecabe2b7e..17ff1b7d87f 100644 --- a/dll/win32/shimgvw/lang/zh-HK.rc +++ b/dll/win32/shimgvw/lang/zh-HK.rc @@ -24,6 +24,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "縮小 (-)" IDS_TOOLTIP_ROT_CLOCKW "順時針旋轉 (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "逆時針旋轉 (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "刪除 (DEL)" IDS_TOOLTIP_PRINT "列印 (Ctrl+P)" IDS_TOOLTIP_SAVEAS "另存新檔... (Ctrl+S)" diff --git a/dll/win32/shimgvw/lang/zh-TW.rc b/dll/win32/shimgvw/lang/zh-TW.rc index 7b1e05ad0a5..98f820e674d 100644 --- a/dll/win32/shimgvw/lang/zh-TW.rc +++ b/dll/win32/shimgvw/lang/zh-TW.rc @@ -24,6 +24,8 @@ BEGIN IDS_TOOLTIP_ZOOM_OUT "縮小 (-)" IDS_TOOLTIP_ROT_CLOCKW "順時針旋轉 (Ctrl+K)" IDS_TOOLTIP_ROT_COUNCW "逆時針旋轉 (Ctrl+L)" + IDS_TOOLTIP_ROT_CWSAVE "Rotate Clockwise and Save (Lossy)" + IDS_TOOLTIP_ROT_CCWSAVE "Rotate Counterclockwise and Save (Lossy)" IDS_TOOLTIP_DELETE "刪除 (DEL)" IDS_TOOLTIP_PRINT "列印 (Ctrl+P)" IDS_TOOLTIP_SAVEAS "另存新檔... (Ctrl+S)" diff --git a/dll/win32/shimgvw/res/rot1save.bmp b/dll/win32/shimgvw/res/rot1save.bmp new file mode 100644 index 00000000000..cca0a4bbf83 Binary files /dev/null and b/dll/win32/shimgvw/res/rot1save.bmp differ diff --git a/dll/win32/shimgvw/res/rot2save.bmp b/dll/win32/shimgvw/res/rot2save.bmp new file mode 100644 index 00000000000..efdd3209850 Binary files /dev/null and b/dll/win32/shimgvw/res/rot2save.bmp differ diff --git a/dll/win32/shimgvw/resource.h b/dll/win32/shimgvw/resource.h index 96da8e444cf..ec2fbf116bd 100644 --- a/dll/win32/shimgvw/resource.h +++ b/dll/win32/shimgvw/resource.h @@ -20,11 +20,13 @@ #define IDB_ZOOM_OUT 56 #define IDB_ROT_CLOCKW 57 #define IDB_ROT_COUNCW 58 -#define IDB_DELETE 59 -#define IDB_PRINT 60 -#define IDB_SAVEAS 61 -#define IDB_MODIFY 62 -#define IDB_HELP_TOC 63 +#define IDB_ROT_CWSAVE 59 +#define IDB_ROT_CCWSAVE 60 +#define IDB_DELETE 61 +#define IDB_PRINT 62 +#define IDB_SAVEAS 63 +#define IDB_MODIFY 64 +#define IDB_HELP_TOC 65 /* ToolBar buttons */ #define IDC_TOOL_BASE 500 @@ -38,12 +40,14 @@ #define IDC_ZOOM_OUT (IDC_TOOL_BASE + 6) #define IDC_ROT_CLOCKW (IDC_TOOL_BASE + 7) #define IDC_ROT_COUNCW (IDC_TOOL_BASE + 8) -#define IDC_DELETE (IDC_TOOL_BASE + 9) -#define IDC_PRINT (IDC_TOOL_BASE + 10) -#define IDC_SAVEAS (IDC_TOOL_BASE + 11) -#define IDC_MODIFY (IDC_TOOL_BASE + 12) -#define IDC_HELP_TOC (IDC_TOOL_BASE + 13) -#define IDC_ENDSLIDESHOW (IDC_TOOL_BASE + 14) +#define IDC_ROT_CWSAVE (IDC_TOOL_BASE + 9) +#define IDC_ROT_CCWSAVE (IDC_TOOL_BASE + 10) +#define IDC_DELETE (IDC_TOOL_BASE + 11) +#define IDC_PRINT (IDC_TOOL_BASE + 12) +#define IDC_SAVEAS (IDC_TOOL_BASE + 13) +#define IDC_MODIFY (IDC_TOOL_BASE + 14) +#define IDC_HELP_TOC (IDC_TOOL_BASE + 15) +#define IDC_ENDSLIDESHOW (IDC_TOOL_BASE + 16) #define TBICON_PREV_PIC 0 #define TBICON_NEXT_PIC 1 @@ -54,11 +58,13 @@ #define TBICON_ZOOM_OUT 6 #define TBICON_ROT_CLOCKW 7 #define TBICON_ROT_COUNCW 8 -#define TBICON_DELETE 9 -#define TBICON_PRINT 10 -#define TBICON_SAVEAS 11 -#define TBICON_MODIFY 12 -#define TBICON_HELP_TOC 13 +#define TBICON_ROT_CWSAVE 9 +#define TBICON_ROT_CCWSAVE 10 +#define TBICON_DELETE 11 +#define TBICON_PRINT 12 +#define TBICON_SAVEAS 13 +#define TBICON_MODIFY 14 +#define TBICON_HELP_TOC 15 /* Strings */ #define IDS_APPTITLE 100 @@ -90,6 +96,8 @@ #define IDS_TOOLTIP_SAVEAS 411 #define IDS_TOOLTIP_MODIFY 412 #define IDS_TOOLTIP_HELP_TOC 413 +#define IDS_TOOLTIP_ROT_CWSAVE 414 +#define IDS_TOOLTIP_ROT_CCWSAVE 415 /* Keyboard accelerators */ #define IDR_ACCELERATOR 600 diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 7cedfc1afde..693b499761f 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -59,6 +59,9 @@ static const TBBUTTON s_Buttons[] = DEFINE_BTN_INFO(ROT_CLOCKW), DEFINE_BTN_INFO(ROT_COUNCW), DEFINE_BTN_SEPARATOR, + DEFINE_BTN_INFO(ROT_CWSAVE), + DEFINE_BTN_INFO(ROT_CCWSAVE), + DEFINE_BTN_SEPARATOR, DEFINE_BTN_INFO(DELETE), DEFINE_BTN_INFO(PRINT), DEFINE_BTN_INFO(SAVEAS), @@ -87,11 +90,13 @@ static const TB_BUTTON_CONFIG s_ButtonConfig[] = DEFINE_BTN_CONFIG(ZOOM_OUT), DEFINE_BTN_CONFIG(ROT_CLOCKW), DEFINE_BTN_CONFIG(ROT_COUNCW), + DEFINE_BTN_CONFIG(ROT_CWSAVE), + DEFINE_BTN_CONFIG(ROT_CCWSAVE), DEFINE_BTN_CONFIG(DELETE), DEFINE_BTN_CONFIG(PRINT), DEFINE_BTN_CONFIG(SAVEAS), DEFINE_BTN_CONFIG(MODIFY), - DEFINE_BTN_CONFIG(HELP_TOC) + DEFINE_BTN_CONFIG(HELP_TOC), }; typedef struct tagPREVIEW_DATA @@ -106,6 +111,7 @@ typedef struct tagPREVIEW_DATA UINT m_nMouseDownMsg; POINT m_ptOrigin; IStream *m_pMemStream; + WCHAR m_szFile[MAX_PATH]; } PREVIEW_DATA, *PPREVIEW_DATA; static inline PPREVIEW_DATA @@ -344,6 +350,8 @@ Preview_pFreeImage(PPREVIEW_DATA pData) pData->m_pMemStream->lpVtbl->Release(pData->m_pMemStream); pData->m_pMemStream = NULL; } + + pData->m_szFile[0] = UNICODE_NULL; } IStream* MemStreamFromFile(LPCWSTR pszFileName) @@ -384,14 +392,6 @@ Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) { Preview_pFreeImage(pData); - /* check file presence */ - if (!szOpenFileName || GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) - { - DPRINT1("File %s not found!\n", szOpenFileName); - Preview_UpdateTitle(pData, NULL); - return; - } - pData->m_pMemStream = MemStreamFromFile(szOpenFileName); if (!pData->m_pMemStream) { @@ -413,8 +413,8 @@ Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) Anime_LoadInfo(&pData->m_Anime); - if (szOpenFileName && szOpenFileName[0]) - SHAddToRecentDocs(SHARD_PATHW, szOpenFileName); + SHAddToRecentDocs(SHARD_PATHW, szOpenFileName); + GetFullPathNameW(szOpenFileName, _countof(pData->m_szFile), pData->m_szFile, NULL); /* Reset zoom and redraw display */ Preview_ResetZoom(pData); @@ -428,6 +428,53 @@ Preview_pLoadImageFromNode(PPREVIEW_DATA pData, SHIMGVW_FILENODE *pNode) Preview_pLoadImage(pData, (pNode ? pNode->FileName : NULL)); } +static BOOL +Preview_pSaveImage(PPREVIEW_DATA pData, LPCWSTR pszFile) +{ + ImageCodecInfo *codecInfo; + GUID rawFormat; + UINT j, num, nFilterIndex, size; + BOOL ret = FALSE; + + if (g_pImage == NULL) + return FALSE; + + GdipGetImageEncodersSize(&num, &size); + codecInfo = QuickAlloc(size, FALSE); + if (!codecInfo) + { + DPRINT1("QuickAlloc() failed in pSaveImage()\n"); + return FALSE; + } + GdipGetImageEncoders(num, size, codecInfo); + + GdipGetImageRawFormat(g_pImage, &rawFormat); + if (IsEqualGUID(&rawFormat, &ImageFormatMemoryBMP)) + rawFormat = ImageFormatBMP; + + nFilterIndex = 0; + for (j = 0; j < num; ++j) + { + if (IsEqualGUID(&rawFormat, &codecInfo[j].FormatID)) + { + nFilterIndex = j + 1; + break; + } + } + + Anime_Pause(&pData->m_Anime); + + ret = (nFilterIndex > 0) && + (GdipSaveImageToFile(g_pImage, pszFile, &codecInfo[nFilterIndex - 1].Clsid, NULL) == Ok); + if (!ret) + DPRINT1("GdipSaveImageToFile() failed\n"); + + Anime_Start(&pData->m_Anime, 0); + + QuickFree(codecInfo); + return ret; +} + static VOID Preview_pSaveImageAs(PPREVIEW_DATA pData) { @@ -453,7 +500,10 @@ Preview_pSaveImageAs(PPREVIEW_DATA pData) } GdipGetImageEncoders(num, size, codecInfo); + GdipGetImageRawFormat(g_pImage, &rawFormat); + if (IsEqualGUID(&rawFormat, &ImageFormatMemoryBMP)) + rawFormat = ImageFormatBMP; sizeRemain = 0; for (j = 0; j < num; ++j) @@ -500,13 +550,13 @@ Preview_pSaveImageAs(PPREVIEW_DATA pData) c++; sizeRemain -= sizeof(*c); - if (IsEqualGUID(&rawFormat, &codecInfo[j].FormatID) != FALSE) + if (IsEqualGUID(&rawFormat, &codecInfo[j].FormatID)) { sfn.nFilterIndex = j + 1; } } - if (GetSaveFileNameW(&sfn)) + if (GetSaveFileNameW(&sfn) && sfn.nFilterIndex > 0) { Anime_Pause(&pData->m_Anime); @@ -1266,16 +1316,20 @@ Preview_Delete(PPREVIEW_DATA pData) HWND hwnd = pData->m_hwnd; SHFILEOPSTRUCTW FileOp = { hwnd, FO_DELETE }; - if (!g_pCurrentFile) + if (!pData->m_szFile[0]) return; /* FileOp.pFrom must be double-null-terminated */ - GetFullPathNameW(g_pCurrentFile->FileName, _countof(szCurFile) - 1, szCurFile, NULL); + GetFullPathNameW(pData->m_szFile, _countof(szCurFile) - 1, szCurFile, NULL); szCurFile[_countof(szCurFile) - 2] = UNICODE_NULL; /* Avoid buffer overrun */ szCurFile[lstrlenW(szCurFile) + 1] = UNICODE_NULL; - GetFullPathNameW(g_pCurrentFile->Next->FileName, _countof(szNextFile), szNextFile, NULL); - szNextFile[_countof(szNextFile) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + szNextFile[0] = UNICODE_NULL; + if (g_pCurrentFile) + { + GetFullPathNameW(g_pCurrentFile->Next->FileName, _countof(szNextFile), szNextFile, NULL); + szNextFile[_countof(szNextFile) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + } /* Confirm file deletion and delete if allowed */ FileOp.pFrom = szCurFile; @@ -1295,19 +1349,16 @@ Preview_Delete(PPREVIEW_DATA pData) static VOID Preview_Edit(HWND hwnd) { - WCHAR szPathName[MAX_PATH]; SHELLEXECUTEINFOW sei; + PPREVIEW_DATA pData = Preview_GetData(hwnd); - if (!g_pCurrentFile) + if (!pData->m_szFile[0]) return; - GetFullPathNameW(g_pCurrentFile->FileName, _countof(szPathName), szPathName, NULL); - szPathName[_countof(szPathName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ - ZeroMemory(&sei, sizeof(sei)); sei.cbSize = sizeof(sei); sei.lpVerb = L"edit"; - sei.lpFile = szPathName; + sei.lpFile = pData->m_szFile; sei.nShow = SW_SHOWNORMAL; if (!ShellExecuteExW(&sei)) { @@ -1435,6 +1486,24 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) } break; + case IDC_ROT_CWSAVE: + if (g_pImage) + { + GdipImageRotateFlip(g_pImage, Rotate270FlipNone); + Preview_pSaveImage(pData, pData->m_szFile); + Preview_UpdateImage(pData); + } + break; + + case IDC_ROT_CCWSAVE: + if (g_pImage) + { + GdipImageRotateFlip(g_pImage, Rotate90FlipNone); + Preview_pSaveImage(pData, pData->m_szFile); + Preview_UpdateImage(pData); + } + break; + case IDC_DELETE: Preview_Delete(pData); Preview_UpdateImage(pData); diff --git a/dll/win32/shimgvw/shimgvw.rc b/dll/win32/shimgvw/shimgvw.rc index f42c29154cd..bfd63fcb4dd 100644 --- a/dll/win32/shimgvw/shimgvw.rc +++ b/dll/win32/shimgvw/shimgvw.rc @@ -28,6 +28,8 @@ IDB_ZOOM_IN BITMAP "res/zoomp.bmp" IDB_ZOOM_OUT BITMAP "res/zoomm.bmp" IDB_ROT_CLOCKW BITMAP "res/rot1.bmp" IDB_ROT_COUNCW BITMAP "res/rot2.bmp" +IDB_ROT_CWSAVE BITMAP "res/rot1save.bmp" +IDB_ROT_CCWSAVE BITMAP "res/rot2save.bmp" IDB_DELETE BITMAP "res/delete.bmp" IDB_PRINT BITMAP "res/print.bmp" IDB_SAVEAS BITMAP "res/save.bmp"

10 months

[reactos] 09/09: [WINESYNC] Support improvements for staging patches (#5898)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53cc92613fbfc315409c7… commit 53cc92613fbfc315409c7d93cc8f5fab83e47a34 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 15 16:15:26 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:41 2023 +0100 [WINESYNC] Support improvements for staging patches (#5898) - Simplify patch directory usage; - Fix the path shown in the warning message. The staging patch path in the warning message didn't show the correct sub-directory where the patch resides. --- sdk/tools/winesync/winesync.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 72860f98ce1..36646086217 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -137,7 +137,8 @@ class wine_sync: if in_staging: # see if we already applied this patch patch_file_name = f'{staging_patch_index:04}-{string_to_valid_file_name(wine_commit.message.splitlines()[0])}.diff' - patch_path = os.path.join(self.reactos_src, self.staged_patch_dir, patch_file_name) + patch_dir = os.path.join(self.reactos_src, self.staged_patch_dir) + patch_path = os.path.join(patch_dir, patch_file_name) if os.path.isfile(patch_path): print(f'Skipping patch as {patch_path} already exists') return True, '' @@ -234,8 +235,8 @@ class wine_sync: else: # Add the staging patch # do not save the wine commit ID in <module>.cfg, as it's a local one for staging patches - if not os.path.isdir(os.path.join(self.reactos_src, self.staged_patch_dir)): - os.mkdir(os.path.join(self.reactos_src, self.staged_patch_dir)) + if not os.path.isdir(patch_dir): + os.mkdir(patch_dir) with open(patch_path, 'w') as file_output: file_output.write(complete_patch) self.reactos_index.add(posixpath.join(self.staged_patch_dir, patch_file_name)) @@ -264,11 +265,12 @@ class wine_sync: f'You can see the details of the wine commit here:\n' \ f' https://source.winehq.org/git/wine.git/commit/{str(wine_commit.id)}\n' else: + patch_file_path = posixpath.join(self.staged_patch_dir, patch_file_name) warning_message += f'\n' \ f'Do not forget to run\n' \ - f' git diff HEAD^ \':(exclude)sdk/tools/winesync/{patch_file_name}\' > sdk/tools/winesync/{patch_file_name}\n' \ + f' git diff HEAD^ \':(exclude){patch_file_path}\' > {patch_file_path}\n' \ f'after your correction and then\n' \ - f' git add sdk/tools/winesync/{patch_file_name}\n' \ + f' git add {patch_file_path}\n' \ f'before running "git commit --amend"' return True, warning_message

10 months

[reactos] 08/09: [WINESYNC] When initially reverting wine-staging patches, ignore whitespace.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32b81a91575619e8d1371… commit 32b81a91575619e8d13714c1d172f6d1d56845d4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 12 17:24:59 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:40 2023 +0100 [WINESYNC] When initially reverting wine-staging patches, ignore whitespace. This fixes in particular problems when reverting created new files (i.e. they are deleted). I suspect this is due to an endline-format "expectation" from the git apply command. --- sdk/tools/winesync/winesync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 7335a8a37ac..72860f98ce1 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -290,7 +290,7 @@ class wine_sync: with open(patch_path, 'rb') as patch_file: try: - subprocess.run(['git', '-C', self.reactos_src, 'apply', '-R', '--reject'], stdin=patch_file, check=True) + subprocess.run(['git', '-C', self.reactos_src, 'apply', '-R', '--ignore-whitespace', '--reject'], stdin=patch_file, check=True) except subprocess.CalledProcessError as err: print(f'Error while reverting patch {patch_file_name}') print('Please check, remove the offending patch with git rm, and relaunch this script')

10 months

[reactos] 07/09: [WINESYNC] Use the same 'winesync' author as for all the other commits the script generates.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d92196d2afbe210328e1… commit 1d92196d2afbe210328e1147229da62b121ccb5f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 12 13:21:36 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:39 2023 +0100 [WINESYNC] Use the same 'winesync' author as for all the other commits the script generates. This now correctly sets the commit author as 'winesync' (before it was the committer's developer name) for the following types of commits: `[WINESYNC]: revert wine-staging patchset for <MODULE_NAME>` and `[WINESYNC]: <MODULE_NAME> is now in sync with wine-staging <WINE_TAG>` --- sdk/tools/winesync/winesync.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 63cafd60a2b..7335a8a37ac 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -46,6 +46,9 @@ class wine_sync: self.wine_staging_repo = pygit2.Repository(self.wine_staging_src) self.reactos_repo = pygit2.Repository(self.reactos_src) + # the standard author signature we will use + self.winesync_author_signature = pygit2.Signature('winesync', 'ros-dev(a)reactos.org') + # read the index from the reactos tree self.reactos_index = self.reactos_repo.index self.reactos_index.read() @@ -245,8 +248,9 @@ class wine_sync: else: commit_msg += f'wine commit id {str(wine_commit.id)} by {wine_commit.author.name} <{wine_commit.author.email}>' - self.reactos_repo.create_commit('HEAD', - pygit2.Signature('winesync', 'ros-dev(a)reactos.org'), + self.reactos_repo.create_commit( + 'HEAD', + self.winesync_author_signature, self.reactos_repo.default_signature, commit_msg, self.reactos_index.write_tree(), @@ -310,7 +314,7 @@ class wine_sync: self.reactos_repo.create_commit( 'HEAD', - self.reactos_repo.default_signature, + self.winesync_author_signature, self.reactos_repo.default_signature, f'[WINESYNC]: revert wine-staging patchset for {self.module}', self.reactos_index.write_tree(), @@ -376,7 +380,7 @@ class wine_sync: self.reactos_index.write() self.reactos_repo.create_commit( 'HEAD', - self.reactos_repo.default_signature, + self.winesync_author_signature, self.reactos_repo.default_signature, f'[WINESYNC]: {self.module} is now in sync with wine-staging {wine_tag}', self.reactos_index.write_tree(),

10 months

[reactos] 06/09: [WINESYNC] Make the wine-staging tag optional, in which case Wine-Staging is not used.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8569465ce3979f3ab47b… commit f8569465ce3979f3ab47b46fe50de7b6ffa0de1e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Sep 6 12:57:15 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:38 2023 +0100 [WINESYNC] Make the wine-staging tag optional, in which case Wine-Staging is not used. --- sdk/tools/winesync/winesync.py | 49 ++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 2e769afaf49..63cafd60a2b 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -58,7 +58,11 @@ class wine_sync: self.staged_patch_dir = posixpath.join('sdk', 'tools', 'winesync', self.module + '_staging') def create_or_checkout_wine_branch(self, wine_tag, wine_staging_tag): - wine_branch_name = 'winesync-' + wine_tag + '-' + wine_staging_tag + # build the wine branch name + wine_branch_name = 'winesync-' + wine_tag + if wine_staging_tag: + wine_branch_name += '-' + wine_staging_tag + branch = self.wine_repo.lookup_branch(wine_branch_name) if branch is None: # get our target commits @@ -68,29 +72,32 @@ class wine_sync: if isinstance(wine_target_commit, pygit2.Commit): wine_target_commit = wine_target_commit.id - wine_staging_target_commit = self.wine_staging_repo.revparse_single(wine_staging_tag) - if isinstance(wine_staging_target_commit, pygit2.Tag): - wine_staging_target_commit = wine_staging_target_commit.target - if isinstance(wine_staging_target_commit, pygit2.Commit): - wine_staging_target_commit = wine_staging_target_commit.id + # do the same for the wine-staging tree + if wine_staging_tag: + wine_staging_target_commit = self.wine_staging_repo.revparse_single(wine_staging_tag) + if isinstance(wine_staging_target_commit, pygit2.Tag): + wine_staging_target_commit = wine_staging_target_commit.target + if isinstance(wine_staging_target_commit, pygit2.Commit): + wine_staging_target_commit = wine_staging_target_commit.id self.wine_repo.branches.local.create(wine_branch_name, self.wine_repo.revparse_single('HEAD')) self.wine_repo.checkout(self.wine_repo.lookup_branch(wine_branch_name)) self.wine_repo.reset(wine_target_commit, pygit2.GIT_RESET_HARD) # do the same for the wine-staging tree - self.wine_staging_repo.branches.local.create(wine_branch_name, self.wine_staging_repo.revparse_single('HEAD')) - self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch(wine_branch_name)) - self.wine_staging_repo.reset(wine_staging_target_commit, pygit2.GIT_RESET_HARD) - - # run the wine-staging script - if subprocess.call(['python', self.wine_staging_src + '/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all', '--backend=git-am']): - # the new script failed (it doesn't exist?), try the old one - subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) - - # delete the branch we created - self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master')) - self.wine_staging_repo.branches.delete(wine_branch_name) + if wine_staging_tag: + self.wine_staging_repo.branches.local.create(wine_branch_name, self.wine_staging_repo.revparse_single('HEAD')) + self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch(wine_branch_name)) + self.wine_staging_repo.reset(wine_staging_target_commit, pygit2.GIT_RESET_HARD) + + # run the wine-staging script + if subprocess.call(['python', self.wine_staging_src + '/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all', '--backend=git-am']): + # the new script failed (it doesn't exist?), try the old one + subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) + + # delete the branch we created + self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master')) + self.wine_staging_repo.branches.delete(wine_branch_name) else: self.wine_repo.checkout(self.wine_repo.lookup_branch(wine_branch_name)) @@ -379,9 +386,9 @@ class wine_sync: def main(): parser = argparse.ArgumentParser() - parser.add_argument('module', help='The module you want to sync. <module>.cfg must exist in the current directory') - parser.add_argument('wine_tag', help='The wine tag or commit id to sync to') - parser.add_argument('wine_staging_tag', help='The wine staging tag or commit id to pick wine staged patches from') + parser.add_argument('module', help='The module you want to sync. <module>.cfg must exist in the current directory.') + parser.add_argument('wine_tag', help='The wine tag or commit id to sync to.') + parser.add_argument('wine_staging_tag', nargs='?', default=None, help='The optional wine staging tag or commit id to pick wine staged patches from.') args = parser.parse_args()

10 months

[reactos] 05/09: [WINESYNC] Elegantly handle empty 'files' and 'directories' lists.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f8d2d14b76807b0d4231… commit 7f8d2d14b76807b0d42311283f44098e41733504 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 5 22:06:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:37 2023 +0100 [WINESYNC] Elegantly handle empty 'files' and 'directories' lists. Expand on Timo's commit 4b5a55516. We may encounter cases where either the 'directories' or 'files' lists in the .cfg YAML files are empty, and we don't want the script to throw an exception in that case. Furthermore, explicitly check for such empty lists when calling PyGit2 index.add_all(...) function, because if it's called on a None or empty list, _all_ untracked files in the selected git repository get added, which is not what we want there. --- sdk/tools/winesync/winesync.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 680b4cfc4d6..2e769afaf49 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -99,7 +99,7 @@ class wine_sync: # Helper function for resolving wine tree path to reactos one # Note: it doesn't care about the fact that the file actually exists or not def wine_to_reactos_path(self, wine_path): - if wine_path in self.module_cfg['files']: + if self.module_cfg['files'] and (wine_path in self.module_cfg['files']): # we have a direct mapping return self.module_cfg['files'][wine_path] @@ -107,11 +107,8 @@ class wine_sync: # root files should have a direct mapping return None - if self.module_cfg['directories'] is None: - return None - wine_dir, wine_file = os.path.split(wine_path) - if wine_dir in self.module_cfg['directories']: + if self.module_cfg['directories'] and (wine_dir in self.module_cfg['directories']): # we have a mapping for the directory return posixpath.join(self.module_cfg['directories'][wine_dir], wine_file) @@ -295,8 +292,13 @@ class wine_sync: if not has_patches: return True - self.reactos_index.add_all([f for f in self.module_cfg['files'].values()]) - self.reactos_index.add_all([f'{d}/*.*' for d in self.module_cfg['directories'].values()]) + # Note: these path lists may be empty or None, in which case + # we should not call index.add_all(), otherwise we would add + # any untracked file present in the repository. + if self.module_cfg['files']: + self.reactos_index.add_all([f for f in self.module_cfg['files'].values()]) + if self.module_cfg['directories']: + self.reactos_index.add_all([f'{d}/*.*' for d in self.module_cfg['directories'].values()]) self.reactos_index.write() self.reactos_repo.create_commit(

10 months

[reactos] 04/09: [WINESYNC] Allow using the "new" Wine-Staging patchinstall.py script.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67ca439d06a8ad7f00cb4… commit 67ca439d06a8ad7f00cb42ea839c3cadcbec0ea1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 5 17:59:33 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:36 2023 +0100 [WINESYNC] Allow using the "new" Wine-Staging patchinstall.py script. Wine-Staging switched to staging/patchinstall.py , removing the deprecated patches/patchinstall.sh in Feb.16, 2023 commit https://github.com/wine-staging/wine-staging/commit/c1b4af92f74d7bd330003d3… just before the v8.2 release. In order to maintain interoperability between older and newer Wine-Staging versions, try to run first the new script; if it fails, fall back to the older script. --- sdk/tools/winesync/winesync.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 652e4233e23..680b4cfc4d6 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -84,7 +84,9 @@ class wine_sync: self.wine_staging_repo.reset(wine_staging_target_commit, pygit2.GIT_RESET_HARD) # run the wine-staging script - subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) + if subprocess.call(['python', self.wine_staging_src + '/staging/patchinstall.py', 'DESTDIR=' + self.wine_src, '--all', '--backend=git-am']): + # the new script failed (it doesn't exist?), try the old one + subprocess.call(['bash', '-c', self.wine_staging_src + '/patches/patchinstall.sh DESTDIR=' + self.wine_src + ' --all --backend=git-am']) # delete the branch we created self.wine_staging_repo.checkout(self.wine_staging_repo.lookup_branch('master'))

10 months

[reactos] 03/09: [WINESYNC] Explicitly use posix paths for git file manipulations.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=454901ab0b485b4d28aee… commit 454901ab0b485b4d28aee169cacd2762e8e1324a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 7 18:09:32 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:35 2023 +0100 [WINESYNC] Explicitly use posix paths for git file manipulations. Whenever using git, be it on Windows CMD, git-bash on Windows, or in *nix systems, git appears to always use posix-like paths internally. So, enforce them with posixpath when building/concatenating paths that are going to be passed to pygit2 functions. Otherwise, exceptions like the following one happens: ``` File "./winesync.py", line 296, in revert_staged_patchset self.reactos_index.remove(os.path.join(self.staged_patch_dir, patch_file_name)) [... skipped ...] OSError: index does not contain sdk\tools\winesync\setupapi_staging\0002-wine-staging-4.0-setupapi_winetest.patch at stage 0 ``` (The git index actually contains the specified path, but in "posix" form with slash-separators.) On *nix platforms, these changes should not matter. --- sdk/tools/winesync/winesync.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index a517fa6bb12..652e4233e23 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -2,6 +2,7 @@ import sys import os +import posixpath import string import argparse import subprocess @@ -54,7 +55,7 @@ class wine_sync: with open(module + '.cfg', 'r') as file_input: self.module_cfg = yaml.safe_load(file_input) - self.staged_patch_dir = os.path.join('sdk', 'tools', 'winesync', self.module + '_staging') + self.staged_patch_dir = posixpath.join('sdk', 'tools', 'winesync', self.module + '_staging') def create_or_checkout_wine_branch(self, wine_tag, wine_staging_tag): wine_branch_name = 'winesync-' + wine_tag + '-' + wine_staging_tag @@ -110,7 +111,7 @@ class wine_sync: wine_dir, wine_file = os.path.split(wine_path) if wine_dir in self.module_cfg['directories']: # we have a mapping for the directory - return os.path.join(self.module_cfg['directories'][wine_dir], wine_file) + return posixpath.join(self.module_cfg['directories'][wine_dir], wine_file) # no match return None @@ -228,7 +229,7 @@ class wine_sync: os.mkdir(os.path.join(self.reactos_src, self.staged_patch_dir)) with open(patch_path, 'w') as file_output: file_output.write(complete_patch) - self.reactos_index.add(os.path.join(self.staged_patch_dir, patch_file_name)) + self.reactos_index.add(posixpath.join(self.staged_patch_dir, patch_file_name)) self.reactos_index.write() @@ -264,7 +265,7 @@ class wine_sync: def revert_staged_patchset(self): # revert all of this in one commit - staged_patch_dir_path = os.path.join(self.reactos_src, self.staged_patch_dir) + staged_patch_dir_path = posixpath.join(self.reactos_src, self.staged_patch_dir) if not os.path.isdir(staged_patch_dir_path): return True @@ -285,7 +286,7 @@ class wine_sync: print('Please check, remove the offending patch with git rm, and relaunch this script') return False - self.reactos_index.remove(os.path.join(self.staged_patch_dir, patch_file_name)) + self.reactos_index.remove(posixpath.join(self.staged_patch_dir, patch_file_name)) self.reactos_index.write() os.remove(patch_path)

10 months

[reactos] 02/09: [WINESYNC] Fix some apparent problems with commits manipulation with pygit2.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e638ff59d1f1aafd70395… commit e638ff59d1f1aafd7039569fe2f94c625d01989e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 3 23:44:23 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 18 22:21:34 2023 +0100 [WINESYNC] Fix some apparent problems with commits manipulation with pygit2. --- sdk/tools/winesync/winesync.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index d221e600bfd..a517fa6bb12 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -64,10 +64,14 @@ class wine_sync: wine_target_commit = self.wine_repo.revparse_single(wine_tag) if isinstance(wine_target_commit, pygit2.Tag): wine_target_commit = wine_target_commit.target + if isinstance(wine_target_commit, pygit2.Commit): + wine_target_commit = wine_target_commit.id wine_staging_target_commit = self.wine_staging_repo.revparse_single(wine_staging_tag) if isinstance(wine_staging_target_commit, pygit2.Tag): wine_staging_target_commit = wine_staging_target_commit.target + if isinstance(wine_staging_target_commit, pygit2.Commit): + wine_staging_target_commit = wine_staging_target_commit.id self.wine_repo.branches.local.create(wine_branch_name, self.wine_repo.revparse_single('HEAD')) self.wine_repo.checkout(self.wine_repo.lookup_branch(wine_branch_name)) @@ -306,16 +310,18 @@ class wine_sync: wine_target_commit = self.wine_repo.revparse_single(wine_tag) if isinstance(wine_target_commit, pygit2.Tag): wine_target_commit = wine_target_commit.target + if isinstance(wine_target_commit, pygit2.Commit): + wine_target_commit = wine_target_commit.id # print(f'wine target commit is {wine_target_commit}') # get the wine commit id where we left in_staging = False wine_last_sync = self.wine_repo.revparse_single(self.module_cfg['tags']['wine']) - if (isinstance(wine_last_sync, pygit2.Tag)): + if isinstance(wine_last_sync, pygit2.Tag): if not self.revert_staged_patchset(): return wine_last_sync = wine_last_sync.target - if (isinstance(wine_last_sync, pygit2.Commit)): + if isinstance(wine_last_sync, pygit2.Commit): wine_last_sync = wine_last_sync.id # create a branch to keep things clean

10 months

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

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 December 2023