Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSCTFIME] Implement ImeConfigure (#6197)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c438e4530fe2e26c4b89… commit 6c438e4530fe2e26c4b8922934660e68cfb79aa4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 19:23:52 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 19 19:23:52 2023 +0900 [MSCTFIME] Implement ImeConfigure (#6197) Add code to CicInputContext and CicBridge classes. Implement ImeConfigure function by using them. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 166 +++++++++++++++++++++++++++++++++++++++++- dll/ime/msctfime/msctfime.h | 2 + 2 files changed, 166 insertions(+), 2 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 8d1d17f364a..1fcdf3363a4 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -83,7 +83,7 @@ IsInteractiveUserLogon(VOID) } /* FIXME */ -class CicInputContext : public IUnknown +class CicInputContext : public ITfContextOwnerCompositionSink { LONG m_cRefs; public: @@ -95,10 +95,16 @@ public: { } + // IUnknown interface STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; STDMETHODIMP_(ULONG) AddRef() override; STDMETHODIMP_(ULONG) Release() override; + // ITfContextOwnerCompositionSink interface + STDMETHODIMP OnStartComposition(ITfCompositionView *pComposition, BOOL *pfOk) override; + STDMETHODIMP OnUpdateComposition(ITfCompositionView *pComposition, ITfRange *pRangeNew) override; + STDMETHODIMP OnEndComposition(ITfCompositionView *pComposition) override; + HRESULT GetGuidAtom( _Inout_ IMCLock& imcLock, @@ -152,6 +158,38 @@ STDMETHODIMP_(ULONG) CicInputContext::Release() return m_cRefs; } +/** + * @unimplemented + */ +STDMETHODIMP +CicInputContext::OnStartComposition( + ITfCompositionView *pComposition, + BOOL *pfOk) +{ + return E_NOTIMPL; +} + +/** + * @unimplemented + */ +STDMETHODIMP +CicInputContext::OnUpdateComposition( + ITfCompositionView *pComposition, + ITfRange *pRangeNew) +{ + return E_NOTIMPL; +} + +/** + * @unimplemented + */ +STDMETHODIMP +CicInputContext::OnEndComposition( + ITfCompositionView *pComposition) +{ + return E_NOTIMPL; +} + /** * @unimplemented */ @@ -291,11 +329,15 @@ public: HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); + + HRESULT ConfigureGeneral(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd); + HRESULT ConfigureRegisterWord(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd, LPVOID lpData); }; /* FIXME */ struct CicProfile : IUnknown { + HRESULT GetActiveLanguageProfile(HKL hKL, REFGUID rguid, TF_LANGUAGEPROFILE *pProfile); }; class TLS @@ -589,6 +631,112 @@ STDMETHODIMP CicBridge::OnSysShellProc(INT, UINT, LONG) return S_OK; } +HRESULT +CicBridge::ConfigureGeneral( + TLS* pTLS, + ITfThreadMgr *pThreadMgr, + HKL hKL, + HWND hWnd) +{ + CicProfile *pProfile = pTLS->m_pProfile; + if (!pProfile) + return E_OUTOFMEMORY; + + TF_LANGUAGEPROFILE profile; + HRESULT hr = pProfile->GetActiveLanguageProfile(hKL, GUID_TFCAT_TIP_KEYBOARD, &profile); + if (FAILED(hr)) + return hr; + + ITfFunctionProvider *pProvider = NULL; + hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); + if (FAILED(hr)) + return hr; + + ITfFnConfigure *pFnConfigure = NULL; + hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigure, (IUnknown**)&pFnConfigure); + if (FAILED(hr)) + { + pProvider->Release(); + return hr; + } + + hr = pFnConfigure->Show(hWnd, profile.langid, profile.guidProfile); + + pFnConfigure->Release(); + pProvider->Release(); + return hr; +} + +HRESULT +CicBridge::ConfigureRegisterWord( + TLS* pTLS, + ITfThreadMgr *pThreadMgr, + HKL hKL, + HWND hWnd, + LPVOID lpData) +{ + CicProfile *pProfile = pTLS->m_pProfile; + if (!pProfile) + return E_OUTOFMEMORY; + + TF_LANGUAGEPROFILE profile; + HRESULT hr = pProfile->GetActiveLanguageProfile(hKL, GUID_TFCAT_TIP_KEYBOARD, &profile); + if (FAILED(hr)) + return hr; + + ITfFunctionProvider *pProvider; + hr = pThreadMgr->GetFunctionProvider(profile.clsid, &pProvider); + if (FAILED(hr)) + return hr; + + ITfFnConfigureRegisterWord *pFunction; + hr = pProvider->GetFunction(GUID_NULL, IID_ITfFnConfigureRegisterWord, (IUnknown**)pFunction); + if (FAILED(hr)) + { + pProvider->Release(); + return hr; + } + + REGISTERWORDW* pRegWord = (REGISTERWORDW*)lpData; + if (pRegWord) + { + if (pRegWord->lpWord) + { + hr = E_OUTOFMEMORY; + BSTR bstrWord = SysAllocString(pRegWord->lpWord); + if (bstrWord) + { + hr = pFunction->Show(hWnd, profile.langid, profile.guidProfile, bstrWord); + SysFreeString(bstrWord); + } + } + else + { + hr = pFunction->Show(hWnd, profile.langid, profile.guidProfile, NULL); + } + } + + pProvider->Release(); + pFunction->Release(); + return hr; +} + +/*********************************************************************** + * CicProfile + */ + +/** + * @unimplemented + */ +HRESULT +CicProfile::GetActiveLanguageProfile( + HKL hKL, + REFGUID rguid, + TF_LANGUAGEPROFILE *pProfile) +{ + return E_NOTIMPL; +} + /*********************************************************************** * ImeInquire (MSCTFIME.@) * @@ -709,7 +857,21 @@ ImeConfigure( _In_ DWORD dwMode, _Inout_opt_ LPVOID lpData) { - FIXME("stub:(%p, %p, %lu, %p)\n", hKL, hWnd, dwMode, lpData); + TRACE("(%p, %p, %lu, %p)\n", hKL, hWnd, dwMode, lpData); + + TLS *pTLS = TLS::GetTLS(); + if (!pTLS || !pTLS->m_pBridge || !pTLS->m_pThreadMgr) + return FALSE; + + CicBridge *pBridge = pTLS->m_pBridge; + ITfThreadMgr *pThreadMgr = pTLS->m_pThreadMgr; + + if (dwMode & 1) + return (pBridge->ConfigureGeneral(pTLS, pThreadMgr, hKL, hWnd) == S_OK); + + if (dwMode & 2) + return (pBridge->ConfigureRegisterWord(pTLS, pThreadMgr, hKL, hWnd, lpData) == S_OK); + return FALSE; } diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 9b962285029..892bd76ef26 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -16,7 +16,9 @@ #include <windows.h> #include <imm.h> #include <ddk/immdev.h> +#include <cguid.h> #include <msctf.h> +#include <ctffunc.h> #include <shlwapi.h> #include <strsafe.h>

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Add TLS::PeekTLS and use it

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfd6d7f32a8073e2746d9… commit dfd6d7f32a8073e2746d9005c303059e943a81df Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 18:34:08 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 19 18:34:08 2023 +0900 [MSCTFIME] Add TLS::PeekTLS and use it Refactoring. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 79472cf2b88..8d1d17f364a 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -344,8 +344,17 @@ public: return InternalAllocateTLS(); } + /** + * @implemented + */ + static TLS* PeekTLS() + { + return (TLS*)::TlsGetValue(TLS::s_dwTlsIndex); + } + static TLS* InternalAllocateTLS(); static BOOL InternalDestroyTLS(); + }; DWORD TLS::s_dwTlsIndex = (DWORD)-1; @@ -355,7 +364,7 @@ DWORD TLS::s_dwTlsIndex = (DWORD)-1; */ TLS* TLS::InternalAllocateTLS() { - TLS *pTLS = (TLS *)::TlsGetValue(TLS::s_dwTlsIndex); + TLS *pTLS = TLS::PeekTLS(); if (pTLS) return pTLS; @@ -382,10 +391,7 @@ TLS* TLS::InternalAllocateTLS() */ BOOL TLS::InternalDestroyTLS() { - if (s_dwTlsIndex == (DWORD)-1) - return FALSE; - - TLS *pTLS = (TLS *)::TlsGetValue(s_dwTlsIndex); + TLS *pTLS = TLS::PeekTLS(); if (!pTLS) return FALSE; @@ -460,7 +466,7 @@ STDMETHODIMP_(ULONG) CicBridge::Release() */ CicBridge::~CicBridge() { - TLS *pTLS = (TLS *)TlsGetValue(TLS::s_dwTlsIndex); + TLS *pTLS = TLS::PeekTLS(); if (!pTLS || !pTLS->m_pThreadMgr) return; @@ -718,7 +724,7 @@ ImeDestroy( { TRACE("(%u)\n", uReserved); - TLS *pTLS = (TLS *)::TlsGetValue(TLS::s_dwTlsIndex); + TLS *pTLS = TLS::PeekTLS(); if (pTLS) return FALSE; @@ -1009,7 +1015,7 @@ CtfImeDestroyThreadMgr(VOID) { TRACE("()\n"); - TLS *pTLS = (TLS *)::TlsGetValue(TLS::s_dwTlsIndex); + TLS *pTLS = TLS::PeekTLS(); if (!pTLS) return E_OUTOFMEMORY; @@ -1051,7 +1057,7 @@ CtfImeDestroyInputContext( { TRACE("(%p)\n", hIMC); - TLS *pTLS = (TLS*)::TlsGetValue(TLS::s_dwTlsIndex); + TLS *pTLS = TLS::PeekTLS(); if (!pTLS || !pTLS->m_pBridge) return E_OUTOFMEMORY;

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Implement CtfImeDestroyInputContext

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0eab48aee832aa9b4d65… commit e0eab48aee832aa9b4d65eaad46f24cc9eafe6ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 16:40:03 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 19 16:40:03 2023 +0900 [MSCTFIME] Implement CtfImeDestroyInputContext CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 128 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 3 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 8550caa2209..79472cf2b88 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -82,16 +82,76 @@ IsInteractiveUserLogon(VOID) return bOK && IsMember; } -class CicInputContext +/* FIXME */ +class CicInputContext : public IUnknown { + LONG m_cRefs; public: + CicInputContext() + { + m_cRefs = 1; + } + virtual ~CicInputContext() + { + } + + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + HRESULT GetGuidAtom( _Inout_ IMCLock& imcLock, _In_ DWORD dwUnknown, _Out_opt_ LPDWORD pdwGuidAtom); + + HRESULT DestroyInputContext(); }; +/** + * @unimplemented + */ +STDMETHODIMP CicInputContext::QueryInterface(REFIID riid, LPVOID* ppvObj) +{ + *ppvObj = NULL; + + if (IsEqualIID(riid, IID_ITfContextOwnerCompositionSink)) + { + *ppvObj = (ITfContextOwnerCompositionSink*)this; + AddRef(); + return S_OK; + } + if (IsEqualIID(riid, IID_IUnknown)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + + return E_NOINTERFACE; +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CicInputContext::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CicInputContext::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + /** * @unimplemented */ @@ -114,6 +174,16 @@ CicInputContext::GetGuidAtom( return hr; } +/** + * @unimplemented + */ +HRESULT +CicInputContext::DestroyInputContext() +{ + // FIXME + return E_NOTIMPL; +} + /** * @implemented */ @@ -220,6 +290,7 @@ public: BOOL UnInitIMMX(TLS *pTLS); HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); + HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); }; /* FIXME */ @@ -397,6 +468,47 @@ CicBridge::~CicBridge() UnInitIMMX(pTLS); } +/** + * @implemented + */ +HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) +{ + IMCLock imcLock(hIMC); + HRESULT hr = imcLock.m_hr; + if (!imcLock) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + hr = E_FAIL; + IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + if (imeContext) + hr = imeContext.m_hr; + + if (SUCCEEDED(hr) && !(imeContext.get().m_dwCicFlags & 1)) + { + imeContext.get().m_dwCicFlags |= 1; + + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + { + imeContext.get().m_pCicIC = NULL; + hr = pCicIC->DestroyInputContext(); + pCicIC->Release(); + imeContext.get().m_pCicIC = NULL; + } + } + + if (imcLock.get().hCtfImeContext) + { + ImmDestroyIMCC(imcLock.get().hCtfImeContext); + imcLock.get().hCtfImeContext = NULL; + hr = S_OK; + } + + return hr; +} + /** * @unimplemented */ @@ -928,12 +1040,22 @@ CtfImeCreateInputContext( return E_NOTIMPL; } +/*********************************************************************** + * CtfImeDestroyInputContext (MSCTFIME.@) + * + * @implemented + */ EXTERN_C HRESULT WINAPI CtfImeDestroyInputContext( _In_ HIMC hIMC) { - FIXME("stub:(%p)\n", hIMC); - return E_NOTIMPL; + TRACE("(%p)\n", hIMC); + + TLS *pTLS = (TLS*)::TlsGetValue(TLS::s_dwTlsIndex); + if (!pTLS || !pTLS->m_pBridge) + return E_OUTOFMEMORY; + + return pTLS->m_pBridge->DestroyInputContext(pTLS, hIMC); } EXTERN_C HRESULT WINAPI

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Refactor on IMC/IMCC locking

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5197d36839a1f8bd21885… commit 5197d36839a1f8bd21885ac9dbdb7c28404a5846 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 16:12:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 19 16:12:12 2023 +0900 [MSCTFIME] Refactor on IMC/IMCC locking - Rename _IMCCLock as IMCCLOCK. - Rename InternalIMCCLock as IMCCLock. - Rename _IMCLock as IMCLOCK. - Add get() pointer accessor of IMCCLock and IMCLOCK. - Protect the pointer of IMCCLOCK and IMCLOCK. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 10 ++++----- sdk/include/reactos/cicero/imclock.h | 42 +++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index f6830f9dc62..8550caa2209 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -101,7 +101,7 @@ CicInputContext::GetGuidAtom( _In_ DWORD dwUnknown, _Out_opt_ LPDWORD pdwGuidAtom) { - InternalIMCCLock<CTFIMECONTEXT> imeContext(imcLock.m_pIC->hCompStr); + IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr); HRESULT hr = imeContext.m_hr; if (!imeContext) @@ -809,17 +809,17 @@ CtfImeGetGuidAtom( if (FAILED(hr)) return hr; - InternalIMCCLock<CTFIMECONTEXT> imccLock(imcLock.m_pIC->hCtfImeContext); + IMCCLock<CTFIMECONTEXT> imccLock(imcLock.get().hCtfImeContext); hr = imccLock.m_hr; if (!imccLock) hr = E_FAIL; if (FAILED(hr)) return hr; - if (!imccLock.m_pIMCC->m_pCicIC) + if (!imccLock.get().m_pCicIC) return E_OUTOFMEMORY; - hr = imccLock.m_pIMCC->m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); + hr = imccLock.get().m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); return hr; } @@ -842,7 +842,7 @@ CtfImeIsGuidMapEnable( if (!imcLock) hr = E_FAIL; if (SUCCEEDED(hr)) - ret = !!(imcLock.m_pIC->fdwInit & INIT_GUIDMAP); + ret = !!(imcLock.get().fdwInit & INIT_GUIDMAP); return ret; } diff --git a/sdk/include/reactos/cicero/imclock.h b/sdk/include/reactos/cicero/imclock.h index 0a2ff2368a8..3392c9a1107 100644 --- a/sdk/include/reactos/cicero/imclock.h +++ b/sdk/include/reactos/cicero/imclock.h @@ -7,20 +7,22 @@ #pragma once -// class _IMCCLock<T_DATA>; -// class InternalIMCCLock<T_DATA>; +// class IMCCLOCK<T_DATA>; +// class IMCCLock<T_DATA>; // class _IMCLock; // class IMCLock; template <typename T_DATA> -class _IMCCLock +class IMCCLOCK { -public: +protected: T_DATA *m_pIMCC; + +public: HIMCC m_hIMCC; HRESULT m_hr; - _IMCCLock(HIMCC hIMCC) + IMCCLOCK(HIMCC hIMCC) { m_pIMCC = NULL; m_hr = S_OK; @@ -29,15 +31,15 @@ public: }; template <typename T_DATA> -class InternalIMCCLock : public _IMCCLock<T_DATA> +class IMCCLock : public IMCCLOCK<T_DATA> { public: - InternalIMCCLock(HIMCC hIMCC) : _IMCCLock<T_DATA>(hIMCC) + IMCCLock(HIMCC hIMCC) : IMCCLOCK<T_DATA>(hIMCC) { if (hIMCC) _LockIMCC(this->m_hIMCC, &this->m_pIMCC); } - ~InternalIMCCLock() + ~IMCCLock() { if (this->m_pIMCC) _UnlockIMCC(this->m_hIMCC); @@ -46,6 +48,10 @@ public: { return this->m_pIMCC; } + T_DATA& get() const + { + return *this->m_pIMCC; + } protected: HRESULT _LockIMCC(HIMCC hIMCC, T_DATA **pptr) @@ -63,15 +69,17 @@ protected: } }; -class _IMCLock +class IMCLOCK { -public: +protected: LPINPUTCONTEXTDX m_pIC; + +public: HIMC m_hIMC; HRESULT m_hr; DWORD m_dw3; - _IMCLock(HIMC hIMC) + IMCLOCK(HIMC hIMC) { m_pIC = NULL; m_hIMC = hIMC; @@ -85,10 +93,10 @@ public: } }; -class IMCLock : public _IMCLock +class IMCLock : public IMCLOCK { public: - IMCLock(HIMC hIMC) : _IMCLock(hIMC) + IMCLock(HIMC hIMC) : IMCLOCK(hIMC) { m_hr = _LockIMC(hIMC, &m_pIC); } @@ -111,11 +119,11 @@ public: if (ImmGetIMCCSize(m_pIC->hCompStr) < sizeof(COMPOSITIONSTRING)) return FALSE; - InternalIMCCLock<COMPOSITIONSTRING> imccLock(m_pIC->hCompStr); + IMCCLock<COMPOSITIONSTRING> imccLock(m_pIC->hCompStr); if (!imccLock) return FALSE; - return imccLock.m_pIMCC->dwCompStrLen > 0; + return imccLock.get().dwCompStrLen > 0; } BOOL UseVerticalCompWindow() const @@ -127,6 +135,10 @@ public: { return m_pIC; } + INPUTCONTEXTDX& get() const + { + return *m_pIC; + } protected: HRESULT _LockIMC(HIMC hIMC, LPINPUTCONTEXTDX *ppIC)

1 year, 6 months

[reactos] 01/01: [MSCTFIME][SDK] Implement CtfImeGuidAtom (#6196)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52bd0c0c18298fe68971a… commit 52bd0c0c18298fe68971a301bae58ba28c72e396 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 15:46:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 19 15:46:13 2023 +0900 [MSCTFIME][SDK] Implement CtfImeGuidAtom (#6196) - Add CTFIMECONTEXT structure. - Add CicInputContext class. - Rename INPUTCONTEXTDX.dwUnknown5 as hCtfImeContext and retype it as HIMCC. - Implement CtfImeGetGuidAtom by using them. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 61 +++++++++++++++++++++++++++++++++++++++++-- dll/ime/msctfime/msctfime.h | 8 ++++++ sdk/include/ddk/immdev.h | 2 +- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 2b6404f4819..f6830f9dc62 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -82,6 +82,38 @@ IsInteractiveUserLogon(VOID) return bOK && IsMember; } +class CicInputContext +{ +public: + HRESULT + GetGuidAtom( + _Inout_ IMCLock& imcLock, + _In_ DWORD dwUnknown, + _Out_opt_ LPDWORD pdwGuidAtom); +}; + +/** + * @unimplemented + */ +HRESULT +CicInputContext::GetGuidAtom( + _Inout_ IMCLock& imcLock, + _In_ DWORD dwUnknown, + _Out_opt_ LPDWORD pdwGuidAtom) +{ + InternalIMCCLock<CTFIMECONTEXT> imeContext(imcLock.m_pIC->hCompStr); + + HRESULT hr = imeContext.m_hr; + if (!imeContext) + hr = E_FAIL; + + if (FAILED(hr)) + return hr; + + // FIXME + return hr; +} + /** * @implemented */ @@ -756,14 +788,39 @@ CtfImeEscapeEx( return 0; } +/*********************************************************************** + * CtfImeGetGuidAtom (MSCTFIME.@) + * + * @implemented + */ EXTERN_C HRESULT WINAPI CtfImeGetGuidAtom( _In_ HIMC hIMC, _In_ DWORD dwUnknown, _Out_opt_ LPDWORD pdwGuidAtom) { - FIXME("stub:(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom); - return E_FAIL; + TRACE("(%p, 0x%lX, %p)\n", hIMC, dwUnknown, pdwGuidAtom); + + IMCLock imcLock(hIMC); + + HRESULT hr = imcLock.m_hr; + if (!imcLock) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + InternalIMCCLock<CTFIMECONTEXT> imccLock(imcLock.m_pIC->hCtfImeContext); + hr = imccLock.m_hr; + if (!imccLock) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + if (!imccLock.m_pIMCC->m_pCicIC) + return E_OUTOFMEMORY; + + hr = imccLock.m_pIMCC->m_pCicIC->GetGuidAtom(imcLock, dwUnknown, pdwGuidAtom); + return hr; } /*********************************************************************** diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 987ccf46d76..9b962285029 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -25,6 +25,14 @@ #include <cicero/CModulePath.h> #include <cicero/imclock.h> +class CicInputContext; + +typedef struct tagCTFIMECONTEXT +{ + CicInputContext *m_pCicIC; + DWORD m_dwCicFlags; +} CTFIMECONTEXT, *PCTFIMECONTEXT; + #include <wine/debug.h> #include "resource.h" diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 5dfb82f3763..2d955dd81c6 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -149,7 +149,7 @@ typedef struct INPUTCONTEXTDX DWORD dwUnknown2; struct IME_STATE *pState; // +0x154 DWORD dwChange; // +0x158 - DWORD dwUnknown5; + HIMCC hCtfImeContext; } INPUTCONTEXTDX, *PINPUTCONTEXTDX, *LPINPUTCONTEXTDX; // bits of fdwInit of INPUTCONTEXT

1 year, 6 months

[reactos] 01/01: [MSCTFIME][SDK] Implement CtfImeIsGuidMapEnable (#6195)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d100d5b291ca1048ad24… commit 6d100d5b291ca1048ad24accee603c718de6cce2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 19 15:23:12 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 19 15:23:12 2023 +0900 [MSCTFIME][SDK] Implement CtfImeIsGuidMapEnable (#6195) - Add link to imm32.dll. - Add <cicero/imclock.h>. - Add INIT_GUIDMAP constant to <immdev.h>. - Implement CtfImeIsGuidMapEnable by using them. CORE-19360 --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/msctfime.cpp | 21 ++++- dll/ime/msctfime/msctfime.h | 1 + sdk/include/ddk/immdev.h | 1 + sdk/include/reactos/cicero/imclock.h | 145 +++++++++++++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 4 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 10f18eab2d0..3dea866e674 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -17,5 +17,5 @@ add_library(msctfime MODULE set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") target_link_libraries(msctfime wine uuid) -add_importlibs(msctfime user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(msctfime imm32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 8bf27f62d61..2b6404f4819 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -766,14 +766,29 @@ CtfImeGetGuidAtom( return E_FAIL; } +/*********************************************************************** + * CtfImeIsGuidMapEnable (MSCTFIME.@) + * + * @implemented + */ EXTERN_C BOOL WINAPI CtfImeIsGuidMapEnable( _In_ HIMC hIMC) { - FIXME("stub:(%p)\n", hIMC); - return FALSE; -} + TRACE("(%p)\n", hIMC); + + BOOL ret = FALSE; + HRESULT hr; + IMCLock imcLock(hIMC); + hr = imcLock.m_hr; + if (!imcLock) + hr = E_FAIL; + if (SUCCEEDED(hr)) + ret = !!(imcLock.m_pIC->fdwInit & INIT_GUIDMAP); + + return ret; +} /*********************************************************************** * CtfImeCreateThreadMgr (MSCTFIME.@) diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 9e492902348..987ccf46d76 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -23,6 +23,7 @@ #include <cicero/cicbase.h> #include <cicero/osinfo.h> #include <cicero/CModulePath.h> +#include <cicero/imclock.h> #include <wine/debug.h> diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 5fb513da443..5dfb82f3763 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -159,6 +159,7 @@ typedef struct INPUTCONTEXTDX #define INIT_LOGFONT 0x00000008 #define INIT_COMPFORM 0x00000010 #define INIT_SOFTKBDPOS 0x00000020 +#define INIT_GUIDMAP 0x00000040 // bits for INPUTCONTEXTDX.dwChange #define INPUTCONTEXTDX_CHANGE_OPEN 0x1 diff --git a/sdk/include/reactos/cicero/imclock.h b/sdk/include/reactos/cicero/imclock.h new file mode 100644 index 00000000000..0a2ff2368a8 --- /dev/null +++ b/sdk/include/reactos/cicero/imclock.h @@ -0,0 +1,145 @@ +/* + * PROJECT: ReactOS Cicero + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Locking and Unlocking IMC and IMCC handles + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +// class _IMCCLock<T_DATA>; +// class InternalIMCCLock<T_DATA>; +// class _IMCLock; +// class IMCLock; + +template <typename T_DATA> +class _IMCCLock +{ +public: + T_DATA *m_pIMCC; + HIMCC m_hIMCC; + HRESULT m_hr; + + _IMCCLock(HIMCC hIMCC) + { + m_pIMCC = NULL; + m_hr = S_OK; + m_hIMCC = hIMCC; + } +}; + +template <typename T_DATA> +class InternalIMCCLock : public _IMCCLock<T_DATA> +{ +public: + InternalIMCCLock(HIMCC hIMCC) : _IMCCLock<T_DATA>(hIMCC) + { + if (hIMCC) + _LockIMCC(this->m_hIMCC, &this->m_pIMCC); + } + ~InternalIMCCLock() + { + if (this->m_pIMCC) + _UnlockIMCC(this->m_hIMCC); + } + operator T_DATA*() const + { + return this->m_pIMCC; + } + +protected: + HRESULT _LockIMCC(HIMCC hIMCC, T_DATA **pptr) + { + if (!hIMCC) + return E_INVALIDARG; + *pptr = (T_DATA*)::ImmLockIMCC(hIMCC); + return (*pptr ? S_OK : E_FAIL); + } + HRESULT _UnlockIMCC(HIMCC hIMCC) + { + if (!::ImmUnlockIMCC(hIMCC)) + return (::GetLastError() ? E_FAIL : S_OK); + return S_OK; + } +}; + +class _IMCLock +{ +public: + LPINPUTCONTEXTDX m_pIC; + HIMC m_hIMC; + HRESULT m_hr; + DWORD m_dw3; + + _IMCLock(HIMC hIMC) + { + m_pIC = NULL; + m_hIMC = hIMC; + m_hr = S_OK; + m_dw3 = 0; + } + + BOOL Invalid() const + { + return (!m_pIC || m_hr != S_OK); + } +}; + +class IMCLock : public _IMCLock +{ +public: + IMCLock(HIMC hIMC) : _IMCLock(hIMC) + { + m_hr = _LockIMC(hIMC, &m_pIC); + } + ~IMCLock() + { + if (m_pIC) + _UnlockIMC(m_hIMC); + } + + void InitContext() + { + if (!(m_pIC->fdwInit & INIT_COMPFORM)) + m_pIC->cfCompForm.dwStyle = 0; + for (UINT i = 0; i < 4; ++i) + m_pIC->cfCandForm[i].dwStyle = 0; + } + + BOOL ValidCompositionString() + { + if (ImmGetIMCCSize(m_pIC->hCompStr) < sizeof(COMPOSITIONSTRING)) + return FALSE; + + InternalIMCCLock<COMPOSITIONSTRING> imccLock(m_pIC->hCompStr); + if (!imccLock) + return FALSE; + + return imccLock.m_pIMCC->dwCompStrLen > 0; + } + + BOOL UseVerticalCompWindow() const + { + return m_pIC->cfCompForm.dwStyle && ((m_pIC->lfFont.A.lfEscapement / 900) % 4 == 3); + } + + operator INPUTCONTEXTDX*() const + { + return m_pIC; + } + +protected: + HRESULT _LockIMC(HIMC hIMC, LPINPUTCONTEXTDX *ppIC) + { + if (!hIMC) + return E_INVALIDARG; + + LPINPUTCONTEXTDX pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + *ppIC = pIC; + return (pIC ? S_OK : E_FAIL); + } + HRESULT _UnlockIMC(HIMC hIMC) + { + return ::ImmUnlockIMC(hIMC) ? S_OK : E_FAIL; + } +};

1 year, 6 months

[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;

1 year, 6 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"

1 year, 6 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

1 year, 6 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')

1 year, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs