Ros-diffs December 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [SDK][UUID] Add ctffunc.idl (#6157)
by Katayama Hirofumi MZ 12 Dec '23

12 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a2c2cbe6031aa1506f28… commit 3a2c2cbe6031aa1506f286ca859bb6e94ff8267c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 13 07:36:20 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 13 07:36:20 2023 +0900 [SDK][UUID] Add ctffunc.idl (#6157) - Add ctffunc.idl to sdk/include/psdk. - Modify uuid. CORE-19362 --- sdk/include/psdk/CMakeLists.txt | 1 + sdk/include/psdk/ctffunc.idl | 480 ++++++++++++++++++++++++++++++++++++++++ sdk/lib/uuid/CMakeLists.txt | 4 +- sdk/lib/uuid/ctffunc_g.c | 29 +++ 4 files changed, 512 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index 36540fa1317..360082e103b 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -29,6 +29,7 @@ list(APPEND SOURCE cor.idl cordebug.idl # crtrow.idl + ctffunc.idl ctxtcall.idl # dbccmd.idl # dbcses.idl diff --git a/sdk/include/psdk/ctffunc.idl b/sdk/include/psdk/ctffunc.idl new file mode 100644 index 00000000000..8bf9b5e2af8 --- /dev/null +++ b/sdk/include/psdk/ctffunc.idl @@ -0,0 +1,480 @@ +#ifndef DO_NO_IMPORTS +import "oaidl.idl"; +import "msctf.idl"; +import "ctfutb.idl"; +#endif + +typedef enum +{ + STYLE_ACTIVE_SELECTION = 0, + STYLE_IMPLIED_SELECTION = 0x1 +} TfIntegratableCandidateListSelectionStyle; + +typedef enum +{ + GETIF_RESMGR = 0, + GETIF_RECOCONTEXT = 0x1, + GETIF_RECOGNIZER = 0x2, + GETIF_VOICE = 0x3, + GETIF_DICTGRAM = 0x4, + GETIF_RECOGNIZERNOINIT = 0x5 +} TfSapiObject; + +typedef struct TF_LMLATTELEMENT +{ + DWORD dwFrameStart; + DWORD dwFrameLen; + DWORD dwFlags; + union { + INT iCost; + }; + BSTR bstrText; +} TF_LMLATTELEMENT; + +cpp_quote("EXTERN_C const CLSID CLSID_SapiLayr;") + +interface IEnumTfCandidates; +interface IEnumTfLatticeElements; +interface ITfCandidateList; +interface ITfCandidateString; +interface ITfFnAdviseText; +interface ITfFnBalloon; +interface ITfFnConfigure; +interface ITfFnConfigureRegisterEudc; +interface ITfFnConfigureRegisterWord; +interface ITfFnGetLinguisticAlternates; +interface ITfFnGetPreferredTouchKeyboardLayout; +interface ITfFnGetSAPIObject; +interface ITfFnLMInternal; +interface ITfFnLMProcessor; +interface ITfFnLangProfileUtil; +interface ITfFnPlayBack; +interface ITfFnPropertyUIStatus; +interface ITfFnReconversion; +interface ITfFnSearchCandidateProvider; +interface ITfFnShowHelp; +interface ITfFunction; +interface ITfIntegratableCandidateListUIElement; +interface ITfLMLattice; +interface IUIManagerEventSink; + +[ + object, + uuid(defb1926-6c80-4ce8-87d4-d6b72b812bde), + pointer_default(unique) +] +interface IEnumTfCandidates : IUnknown +{ + HRESULT Clone( + [out] IEnumTfCandidates **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out] ITfCandidateString **ppCand, + [out] ULONG *pcFetched); + + HRESULT Reset(void); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(56988052-47da-4a05-911a-e3d941f17145), + pointer_default(unique) +] +interface IEnumTfLatticeElements : IUnknown +{ + HRESULT Clone( + [out] IEnumTfLatticeElements **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out] TF_LMLATTELEMENT *rgsElements, + [out] ULONG *pcFetched); + + HRESULT Reset(void); + + HRESULT Skip( + [in] ULONG ulCount); +} + +[ + object, + uuid(a3ad50fb-9bdb-49e3-a843-6c76520fbf5d), + pointer_default(unique) +] +interface ITfCandidateList : IUnknown +{ + typedef enum + { + CAND_FINALIZED = 0, + CAND_SELECTED = 0x1, + CAND_CANCELED = 0x2 + } TfCandidateResult; + + HRESULT EnumCandidates( + [out] IEnumTfCandidates **ppEnum); + + HRESULT GetCandidate( + [in] ULONG nIndex, + [out] ITfCandidateString **ppCand); + + HRESULT GetCandidateNum( + [out] ULONG *pnCnt); + + HRESULT SetResult( + [in] ULONG nIndex, + [in] TfCandidateResult imcr); +} + +[ + object, + uuid(581f317e-fd9d-443f-b972-ed00467c5d40), + pointer_default(unique) +] +interface ITfCandidateString : IUnknown +{ + HRESULT GetString( + [out] BSTR *pbstr); + + HRESULT GetIndex( + [out] ULONG *pnIndex); +} + +[ + object, + uuid(3527268b-7d53-4dd9-92b7-7296ae461249), + pointer_default(unique) +] +interface ITfFnAdviseText : IUnknown +{ + HRESULT OnTextUpdate( + [in] ITfRange *pRange, + [in] const WCHAR *pchText, + [in] LONG cch); + + HRESULT OnLatticeUpdate( + [in] ITfRange *pRange, + [in] ITfLMLattice *pLattice); +} + +[ + object, + uuid(3bab89e4-5fbe-45f4-a5bc-dca36ad225a8), + pointer_default(unique) +] +interface ITfFnBalloon : IUnknown +{ + HRESULT UpdateBalloon( + [in] TfLBBalloonStyle style, + [in] const WCHAR *pch, + [in] ULONG cch); +} + +[ + object, + uuid(88f567c6-1757-49f8-a1b2-89234c1eeff9), + pointer_default(unique) +] +interface ITfFnConfigure : IUnknown +{ + HRESULT Show( + [in] HWND hwndParent, + [in] LANGID langid, + [in] REFGUID rguidProfile); +} + +[ + object, + uuid(b5e26ff5-d7ad-4304-913f-21a2ed95a1b0), + pointer_default(unique) +] +interface ITfFnConfigureRegisterEudc : IUnknown +{ + HRESULT Show( + [in] HWND hwndParent, + [in] LANGID langid, + [in] REFGUID rguidProfile, + BSTR bstrRegistered); +} + +[ + object, + uuid(bb95808a-6d8f-4bca-8400-5390b586aedf), + pointer_default(unique) +] +interface ITfFnConfigureRegisterWord : IUnknown +{ + HRESULT Show( + [in] HWND hwndParent, + [in] LANGID langid, + [in] REFGUID rguidProfile, + [in] BSTR bstrRegistered); +} + +[ + object, + uuid(db593490-098f-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfFunction : IUnknown +{ + HRESULT GetDisplayName( + [out] BSTR *pbstrName); +} + +[ + object, + uuid(ea163ce2-7a65-4506-82a3-c528215da64e), + pointer_default(unique) +] +interface ITfFnGetLinguisticAlternates : ITfFunction +{ + HRESULT GetAlternates( + [in] ITfRange *pRange, + [out] ITfCandidateList **ppCandidateList); +} + +[ + object, + uuid(5f309a41-590a-4acc-a97f-d8efff13fdfc), + pointer_default(unique) +] +interface ITfFnGetPreferredTouchKeyboardLayout : ITfFunction +{ + typedef enum + { + TKBLT_UNDEFINED = 0, + TKBLT_CLASSIC = 1, + TKBLT_OPTIMIZED = 2 + } TKBLayoutType; + + HRESULT GetLayout( + [out] TKBLayoutType *pTKBLayoutType, + [out] WORD *pwPreferredLayoutId); +} + +[ + object, + uuid(5c0ab7ea-167d-4f59-bfb5-4693755e90ca), + pointer_default(unique) +] +interface ITfFnGetSAPIObject : IUnknown +{ + HRESULT Get( + [in] TfSapiObject sObj, + [out] IUnknown **ppunk); +} + +[ + object, + uuid(04b825b1-ac9a-4f7b-b5ad-c7168f1ee445), + pointer_default(unique) +] +interface ITfFnLMInternal : IUnknown +{ + HRESULT ProcessLattice( + [in] ITfRange *pRange); +} + +[ + object, + uuid(7afbf8e7-ac4b-4082-b058-890899d3a010), + pointer_default(unique) +] +interface ITfFnLMProcessor : IUnknown +{ + HRESULT QueryRange( + [in] ITfRange *pRange, + [out] ITfRange **ppNewRange, + [out] BOOL *pfAccepted); + + HRESULT QueryLangID( + [in] LANGID langid, + [out] BOOL *pfAccepted); + + HRESULT GetReconversion( + [in] ITfRange *pRange, + [out] ITfCandidateList **ppCandList); + + HRESULT Reconvert( + [in] ITfRange *pRange); + + HRESULT QueryKey( + [in] BOOL fUp, + [in] WPARAM vKey, + [in] LPARAM lparamKeydata, + [out] BOOL *pfInterested); + + HRESULT InvokeKey( + [in] BOOL fUp, + [in] WPARAM vKey, + [in] LPARAM lparamKeyData); + + HRESULT InvokeFunc( + [in] ITfContext *pic, + [in] REFGUID refguidFunc); +} + +[ + object, + uuid(a87a8574-a6c1-4e15-99f0-3d3965f548eb), + pointer_default(unique) +] +interface ITfFnLangProfileUtil : IUnknown +{ + HRESULT RegisterActiveProfiles(void); + + HRESULT IsProfileAvailableForLang( + [in] LANGID langid, + [out] BOOL *pfAvailable); +} + +[ + object, + uuid(a3a416a4-0f64-11d3-b5b7-00c04fc324a1), + pointer_default(unique) +] +interface ITfFnPlayBack : IUnknown +{ + HRESULT QueryRange( + [in] ITfRange *pRange, + [out] ITfRange **ppNewRange, + [out] BOOL *pfPlayable); + + HRESULT Play( + [in] ITfRange *pRange); +} + +[ + object, + uuid(2338ac6e-2b9d-44c0-a75e-ee64f256b3bd), + pointer_default(unique) +] +interface ITfFnPropertyUIStatus : IUnknown +{ + HRESULT GetStatus( + [in] REFGUID refguidProp, + [out] DWORD *pdw); + + HRESULT SetStatus( + [in] REFGUID refguidProp, + [in] DWORD dw); +} + +[ + object, + uuid(4cea93c0-0a58-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfFnReconversion : IUnknown +{ + HRESULT QueryRange( + [in] ITfRange *pRange, + ITfRange **ppNewRange, + [out] BOOL *pfConvertable); + + HRESULT GetReconversion( + [in] ITfRange *pRange, + [out] ITfCandidateList **ppCandList + ); + + HRESULT Reconvert( + [in] ITfRange *pRange); +} + +[ + object, + uuid(87a2ad8f-f27b-4920-8501-67602280175d), + pointer_default(unique) +] +interface ITfFnSearchCandidateProvider : IUnknown +{ + HRESULT GetSearchCandidates( + [in] BSTR bstrQuery, + [in] BSTR bstrApplicationId, + [out] ITfCandidateList **pplist); + + HRESULT SetResult( + [in] BSTR bstrQuery, + [in] BSTR bstrApplicationID, + [in] BSTR bstrResult); +} + +[ + object, + uuid(5ab1d30c-094d-4c29-8ea5-0bf59be87bf3), + pointer_default(unique) +] +interface ITfFnShowHelp : IUnknown +{ + HRESULT Show( + [in] HWND hwndParent); +} + +[ + object, + uuid(5ab1d30c-094d-4c29-8ea5-0bf59be87bf3), + pointer_default(unique) +] +interface ITfIntegratableCandidateListUIElement : IUnknown +{ + HRESULT SetIntegrationStyle( + [in] GUID guidIntegrationStyle); + + HRESULT GetSelectionStyle( + [out] TfIntegratableCandidateListSelectionStyle *ptfSelectionStyle); + + HRESULT OnKeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT ShowCandidateNumbers( + [out] BOOL *pfShow); + + HRESULT FinalizeExactCompositionString(void); +} + +[ + object, + uuid(d4236675-a5bf-4570-9d42-5d6d7b02d59b), + pointer_default(unique) +] +interface ITfLMLattice : IUnknown +{ + HRESULT QueryType( + [in] REFGUID rguidType, + [out] BOOL *pfSupported); + + HRESULT EnumLatticeElements( + [in] DWORD dwFrameStart, + [in] REFGUID rguidType, + [out] IEnumTfLatticeElements **ppEnum); +} + +[ + object, + uuid(cd91d690-a7e8-4265-9b38-8bb3bbaba7de), + pointer_default(unique) +] +interface IUIManagerEventSink : IUnknown +{ + HRESULT OnWindowOpening( + [in] RECT *prcBounds); + + HRESULT OnWindowOpened( + [in] RECT *prcBounds); + + HRESULT OnWindowUpdating( + [in] RECT *prcUpdatedBounds); + + HRESULT OnWindowUpdated( + [in] RECT *prcUpdatedBounds); + + HRESULT OnWindowClosing(void); + + HRESULT OnWindowClosed(void); +} diff --git a/sdk/lib/uuid/CMakeLists.txt b/sdk/lib/uuid/CMakeLists.txt index d1f1392b256..9ebde406866 100644 --- a/sdk/lib/uuid/CMakeLists.txt +++ b/sdk/lib/uuid/CMakeLists.txt @@ -22,7 +22,7 @@ list(APPEND IDL_SOURCES comcat.idl commoncontrols.idl # confpriv.idl -# ctffunc.idl + ctffunc.idl # ctfbui.idl # ctfspui.idl # ctfutb.idl @@ -200,7 +200,7 @@ list(APPEND SOURCE # bthguid.c # cluscfgguids.c cmdtreeiid.c -# ctffunc_g.c + ctffunc_g.c # ctfspui_g.c # hnclsid.c ieguids.c diff --git a/sdk/lib/uuid/ctffunc_g.c b/sdk/lib/uuid/ctffunc_g.c new file mode 100644 index 00000000000..ca0705b30f8 --- /dev/null +++ b/sdk/lib/uuid/ctffunc_g.c @@ -0,0 +1,29 @@ + +#include <initguid.h> + +DEFINE_GUID(CLSID_SapiLayr, 0xDCBD6FA8, 0x032F, 0x11D3, 0xB5, 0xB1, 0x00, 0xC0, 0x4F, 0xC3, 0x24, 0xA1); + +DEFINE_GUID(IID_IEnumTfCandidates, 0xDEFB1926, 0x6C80, 0x4CE8, 0x87, 0xD4, 0xD6, 0xB7, 0x2B, 0x81, 0x2B, 0xDE); +DEFINE_GUID(IID_IEnumTfLatticeElements, 0x56988052, 0x47DA, 0x4A05, 0x91, 0x1A, 0xE3, 0xD9, 0x41, 0xF1, 0x71, 0x45); +DEFINE_GUID(IID_ITfCandidateList, 0xA3AD50FB, 0x9BDB, 0x49E3, 0xA8, 0x43, 0x6C, 0x76, 0x52, 0x0F, 0xBF, 0x5D); +DEFINE_GUID(IID_ITfCandidateString, 0x581F317E, 0xFD9D, 0x443F, 0xB9, 0x72, 0xED, 0x00, 0x46, 0x7C, 0x5D, 0x40); +DEFINE_GUID(IID_ITfFnAdviseText, 0x3527268B, 0x7D53, 0x4DD9, 0x92, 0xB7, 0x72, 0x96, 0xAE, 0x46, 0x12, 0x49); +DEFINE_GUID(IID_ITfFnBalloon, 0x3BAB89E4, 0x5FBE, 0x45F4, 0xA5, 0xBC, 0xDC, 0xA3, 0x6A, 0xD2, 0x25, 0xA8); +DEFINE_GUID(IID_ITfFnConfigure, 0x88F567C6, 0x1757, 0x49F8, 0xA1, 0xB2, 0x89, 0x23, 0x4C, 0x1E, 0xEF, 0xF9); +DEFINE_GUID(IID_ITfFnConfigureRegisterEudc, 0xB5E26FF5, 0xD7AD, 0x4304, 0x91, 0x3F, 0x21, 0xA2, 0xED, 0x95, 0xA1, 0xB0); +DEFINE_GUID(IID_ITfFnConfigureRegisterWord, 0xBB95808A, 0x6D8F, 0x4BCA, 0x84, 0x00, 0x53, 0x90, 0xB5, 0x86, 0xAE, 0xDF); +DEFINE_GUID(IID_ITfFnGetLinguisticAlternates, 0xEA163CE2, 0x7A65, 0x4506, 0x82, 0xA3, 0xC5, 0x28, 0x21, 0x5D, 0xA6, 0x4E); +DEFINE_GUID(IID_ITfFnGetPreferredTouchKeyboardLayout, 0x5F309A41, 0x590A, 0x4ACC, 0xA9, 0x7F, 0xD8, 0xEF, 0xFF, 0x13, 0xFD, 0xFC); +DEFINE_GUID(IID_ITfFnGetSAPIObject, 0x5C0AB7EA, 0x167D, 0x4F59, 0xBF, 0xB5, 0x46, 0x93, 0x75, 0x5E, 0x90, 0xCA); +DEFINE_GUID(IID_ITfFnLMInternal, 0x04B825B1, 0xAC9A, 0x4F7B, 0xB5, 0xAD, 0xC7, 0x16, 0x8F, 0x1E, 0xE4, 0x45); +DEFINE_GUID(IID_ITfFnLMProcessor, 0x7AFBF8E7, 0xAC4B, 0x4082, 0xB0, 0x58, 0x89, 0x08, 0x99, 0xD3, 0xA0, 0x10); +DEFINE_GUID(IID_ITfFnLangProfileUtil, 0xA87A8574, 0xA6C1, 0x4E15, 0x99, 0xF0, 0x3D, 0x39, 0x65, 0xF5, 0x48, 0xEB); +DEFINE_GUID(IID_ITfFnPlayBack, 0xA3A416A4, 0x0F64, 0x11D3, 0xB5, 0xB7, 0x00, 0xC0, 0x4F, 0xC3, 0x24, 0xA1); +DEFINE_GUID(IID_ITfFnPropertyUIStatus, 0x2338AC6E, 0x2B9D, 0x44C0, 0xA7, 0x5E, 0xEE, 0x64, 0xF2, 0x56, 0xB3, 0xBD); +DEFINE_GUID(IID_ITfFnReconversion, 0x4CEA93C0, 0x0A58, 0x11D3, 0x8D, 0xF0, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(IID_ITfFnSearchCandidateProvider, 0x87A2AD8F, 0xF27B, 0x4920, 0x85, 0x01, 0x67, 0x60, 0x22, 0x80, 0x17, 0x5D); +DEFINE_GUID(IID_ITfFnShowHelp, 0x5AB1D30C, 0x094D, 0x4C29, 0x8E, 0xA5, 0x0B, 0xF5, 0x9B, 0xE8, 0x7B, 0xF3); +DEFINE_GUID(IID_ITfFunction, 0xDB593490, 0x098F, 0x11D3, 0x8D, 0xF0, 0x00, 0x10, 0x5A, 0x27, 0x99, 0xB5); +DEFINE_GUID(IID_ITfIntegratableCandidateListUIElement, 0x5AB1D30C, 0x094D, 0x4C29, 0x8E, 0xA5, 0x0B, 0xF5, 0x9B, 0xE8, 0x7B, 0xF3); +DEFINE_GUID(IID_ITfLMLattice, 0x3527268B, 0x7D53, 0x4DD9, 0x92, 0xB7, 0x72, 0x96, 0xAE, 0x46, 0x12, 0x49); +DEFINE_GUID(IID_IUIManagerEventSink, 0xCD91D690, 0xA7E8, 0x4265, 0x9B, 0x38, 0x8B, 0xB3, 0xBB, 0xAB, 0xA7, 0xDE);

1 0

[reactos] 01/01: [USER32] Skip STATIC controls on arrow keys (#6142)
by Katayama Hirofumi MZ 12 Dec '23

12 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db10ce0f9f1e23e9de8ef… commit db10ce0f9f1e23e9de8ef867cacd0758bd5e0f23 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 13 07:04:52 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 13 07:04:52 2023 +0900 [USER32] Skip STATIC controls on arrow keys (#6142) - Skip DLGC_STATIC controls on array keys. - Avoid infinite loop by using hwndFirst variable. CORE-6127 --- win32ss/user/user32/windows/dialog.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 359cfd150c6..842aeb5b0a3 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -2624,7 +2624,17 @@ IsDialogMessageW( if (!(dlgCode & DLGC_WANTARROWS)) { BOOL fPrevious = (lpMsg->wParam == VK_LEFT || lpMsg->wParam == VK_UP); - HWND hwndNext = GetNextDlgGroupItem( hDlg, lpMsg->hwnd, fPrevious ); + + /* Skip STATIC elements when arrow-moving through a list of controls */ + HWND hwndNext, hwndFirst = lpMsg->hwnd; + for (hwndNext = GetNextDlgGroupItem(hDlg, hwndFirst, fPrevious); + hwndNext && hwndFirst != hwndNext; + hwndNext = GetNextDlgGroupItem(hDlg, hwndNext, fPrevious)) + { + if (!(SendMessageW(hwndNext, WM_GETDLGCODE, 0, 0) & DLGC_STATIC)) + break; + } + if (hwndNext && SendMessageW( hwndNext, WM_GETDLGCODE, lpMsg->wParam, (LPARAM)lpMsg ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) { SetFocus( hwndNext );

1 0

[reactos] 01/01: [MSCTFIME] Implement ImeRegisterWord etc. (#6160)
by Katayama Hirofumi MZ 12 Dec '23

12 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be8e4c691d6987dabd104… commit be8e4c691d6987dabd104cf6431f6dbbe4b9c672 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 12 22:43:36 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 12 22:43:36 2023 +0900 [MSCTFIME] Implement ImeRegisterWord etc. (#6160) - Implement ImeRegisterWord, ImeUnregisterWord, ImeGetRegisterWordStyle, ImeEnumRegisterWord, ImeConversionList, ImeEscape, ImeSelect, and ImeSetActiveContext functions. - These functions in MSCTFIME basically do nothing. CORE-19360 --- dll/ime/msctfime/msctfime.c | 80 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/dll/ime/msctfime/msctfime.c b/dll/ime/msctfime/msctfime.c index 93865f49255..deb6cc92722 100644 --- a/dll/ime/msctfime/msctfime.c +++ b/dll/ime/msctfime/msctfime.c @@ -21,6 +21,14 @@ ImeInquire( return FALSE; } +/*********************************************************************** + * ImeConversionList (MSCTFIME.@) + * + * MSCTFIME's ImeConversionList does nothing. + * + * @implemented + * @see ImmGetConversionListW + */ DWORD WINAPI ImeConversionList( _In_ HIMC hIMC, @@ -29,39 +37,71 @@ ImeConversionList( _In_ DWORD dwBufLen, _In_ UINT uFlag) { - FIXME("stub:(%p, %s, %p, 0x%lX, %u)\n", hIMC, debugstr_w(lpSrc), lpDst, dwBufLen, uFlag); + TRACE("(%p, %s, %p, 0x%lX, %u)\n", hIMC, debugstr_w(lpSrc), lpDst, dwBufLen, uFlag); return 0; } +/*********************************************************************** + * ImeRegisterWord (MSCTFIME.@) + * + * MSCTFIME's ImeRegisterWord does nothing. + * + * @implemented + * @see ImeUnregisterWord + */ BOOL WINAPI ImeRegisterWord( _In_ LPCWSTR lpszReading, _In_ DWORD dwStyle, _In_ LPCWSTR lpszString) { - FIXME("stub:(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); + TRACE("(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); return FALSE; } +/*********************************************************************** + * ImeUnregisterWord (MSCTFIME.@) + * + * MSCTFIME's ImeUnregisterWord does nothing. + * + * @implemented + * @see ImeRegisterWord + */ BOOL WINAPI ImeUnregisterWord( _In_ LPCWSTR lpszReading, _In_ DWORD dwStyle, _In_ LPCWSTR lpszString) { - FIXME("stub:(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); + TRACE("(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); return FALSE; } +/*********************************************************************** + * ImeGetRegisterWordStyle (MSCTFIME.@) + * + * MSCTFIME's ImeGetRegisterWordStyle does nothing. + * + * @implemented + * @see ImeRegisterWord + */ UINT WINAPI ImeGetRegisterWordStyle( _In_ UINT nItem, _Out_ LPSTYLEBUFW lpStyleBuf) { - FIXME("stub:(%u, %p)\n", nItem, lpStyleBuf); + TRACE("(%u, %p)\n", nItem, lpStyleBuf); return 0; } +/*********************************************************************** + * ImeEnumRegisterWord (MSCTFIME.@) + * + * MSCTFIME's ImeEnumRegisterWord does nothing. + * + * @implemented + * @see ImeRegisterWord + */ UINT WINAPI ImeEnumRegisterWord( _In_ REGISTERWORDENUMPROCW lpfnEnumProc, @@ -70,7 +110,7 @@ ImeEnumRegisterWord( _In_opt_ LPCWSTR lpszString, _In_opt_ LPVOID lpData) { - FIXME("stub:(%p, %s, %lu, %s, %p)\n", lpfnEnumProc, debugstr_w(lpszReading), + TRACE("(%p, %s, %lu, %s, %p)\n", lpfnEnumProc, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString), lpData); return 0; } @@ -94,13 +134,21 @@ ImeDestroy( return FALSE; } +/*********************************************************************** + * ImeEscape (MSCTFIME.@) + * + * MSCTFIME's ImeEscape does nothing. + * + * @implemented + * @see CtfImeEscapeEx + */ LRESULT WINAPI ImeEscape( _In_ HIMC hIMC, _In_ UINT uEscape, _Inout_opt_ LPVOID lpData) { - FIXME("stub:(%p, %u, %p)\n", hIMC, uEscape, lpData); + TRACE("(%p, %u, %p)\n", hIMC, uEscape, lpData); return 0; } @@ -115,21 +163,37 @@ ImeProcessKey( return FALSE; } +/*********************************************************************** + * ImeSelect (MSCTFIME.@) + * + * MSCTFIME's ImeSelect does nothing. + * + * @implemented + * @see CtfImeSelectEx + */ BOOL WINAPI ImeSelect( _In_ HIMC hIMC, _In_ BOOL fSelect) { - FIXME("stub:(%p, %u)\n", hIMC, fSelect); + TRACE("(%p, %u)\n", hIMC, fSelect); return FALSE; } +/*********************************************************************** + * ImeSetActiveContext (MSCTFIME.@) + * + * MSCTFIME's ImeSetActiveContext does nothing. + * + * @implemented + * @see CtfImeSetActiveContextAlways + */ BOOL WINAPI ImeSetActiveContext( _In_ HIMC hIMC, _In_ BOOL fFlag) { - FIXME("stub:(%p, %u)\n", hIMC, fFlag); + TRACE("(%p, %u)\n", hIMC, fFlag); return FALSE; }

1 0

[reactos] 01/01: [COMCTL32] Tab control: Use InvalidateRect in TAB_SetItemT update (#6154)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b8a5fc5f0fe5b82e056a… commit 9b8a5fc5f0fe5b82e056adee7255ef7a20c85cff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 12 06:27:46 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 12 06:27:46 2023 +0900 [COMCTL32] Tab control: Use InvalidateRect in TAB_SetItemT update (#6154) Based on KRosUser's tab.patch. - In TAB_SetItemT function, use InvalidateRect instead of TAB_InvalidateTabArea. CORE-11454 --- dll/win32/comctl32/tab.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/tab.c b/dll/win32/comctl32/tab.c index f2fc59fb4b6..125dd91e8c4 100644 --- a/dll/win32/comctl32/tab.c +++ b/dll/win32/comctl32/tab.c @@ -2800,7 +2800,11 @@ TAB_SetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) /* Update and repaint tabs */ TAB_SetItemBounds(infoPtr); +#ifdef __REACTOS__ + InvalidateRect(infoPtr->hwnd, NULL, TRUE); +#else TAB_InvalidateTabArea(infoPtr); +#endif return TRUE; }

1 0

[reactos] 01/01: [MSCTFIME][SDK][USER32] Add msctfime.ime (stub) (#6141)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17617221ce3b488d1c8ec… commit 17617221ce3b488d1c8ec2f24cfd5fc0eabcf627 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 22:37:25 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 22:37:25 2023 +0900 [MSCTFIME][SDK][USER32] Add msctfime.ime (stub) (#6141) ## Overview 1. msctfime.ime is an IME file interface for new-style IMEs a.k.a. "Text Input Processors" (TIPs). 2. msctfime.ime is loaded as old-style IME file at ImmLoadLayout in specific condition. 3. msctfime.ime communicates with the current TIP (This feature is not implemented yet). ## Proposed changes - Add msctfime module at dll/ime/msctfime. - The functions in this module are currently stub. - Move IME file interface declarations from <imm.h> to <ddk/immdev.h>. - Modify ImmNotifyIME, NotifyIME, and ImeProcessKey prototypes for x64 compliance. CORE-19360 --- dll/CMakeLists.txt | 1 + dll/ime/CMakeLists.txt | 2 + dll/ime/msctfime/CMakeLists.txt | 21 ++ dll/ime/msctfime/lang/en-US.rc | 23 +++ dll/ime/msctfime/msctfime.c | 350 +++++++++++++++++++++++++++++++++ dll/ime/msctfime/msctfime.h | 24 +++ dll/ime/msctfime/msctfime.rc | 32 +++ dll/ime/msctfime/msctfime.spec | 30 +++ dll/ime/msctfime/res/down.ico | Bin 0 -> 3438 bytes dll/ime/msctfime/res/unicode.ico | Bin 0 -> 326 bytes dll/ime/msctfime/resource.h | 16 ++ dll/win32/imm32/ime.c | 2 +- dll/win32/imm32/imm32.spec | 4 +- sdk/include/ddk/immdev.h | 109 ++++++++++ sdk/include/psdk/imm.h | 19 +- sdk/include/reactos/imetable.h | 4 +- win32ss/user/user32/include/immtable.h | 2 +- 17 files changed, 615 insertions(+), 24 deletions(-) diff --git a/dll/CMakeLists.txt b/dll/CMakeLists.txt index 08458544df7..7fd670b6b6d 100644 --- a/dll/CMakeLists.txt +++ b/dll/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(apisets) add_subdirectory(appcompat) add_subdirectory(cpl) add_subdirectory(directx) +add_subdirectory(ime) add_subdirectory(keyboard) add_subdirectory(nls) add_subdirectory(np) diff --git a/dll/ime/CMakeLists.txt b/dll/ime/CMakeLists.txt new file mode 100644 index 00000000000..1c5abaad63a --- /dev/null +++ b/dll/ime/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_subdirectory(msctfime) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt new file mode 100644 index 00000000000..3925158f4a3 --- /dev/null +++ b/dll/ime/msctfime/CMakeLists.txt @@ -0,0 +1,21 @@ + +include_directories( + ${REACTOS_SOURCE_DIR}/win32ss/include) + +spec2def(msctfime.ime msctfime.spec) + +list(APPEND SOURCE + msctfime.c) + +file(GLOB msctfime_rc_deps res/*.*) +add_rc_deps(msctfime.rc ${msctfime_rc_deps}) + +add_library(msctfime MODULE + ${SOURCE} + msctfime.rc + ${CMAKE_CURRENT_BINARY_DIR}/msctfime.def) +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_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/lang/en-US.rc b/dll/ime/msctfime/lang/en-US.rc new file mode 100644 index 00000000000..584b75546ee --- /dev/null +++ b/dll/ime/msctfime/lang/en-US.rc @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_OK "OK" + IDS_CANCEL "Cancel" + IDS_ABORT "&Abort" + IDS_RETRY "&Retry" + IDS_IGNORE "&Ignore" + IDS_YES "&Yes" + IDS_NO "&No" + + IDS_ENTER "Enter" + IDS_FINALIZE_STRING "Finalize the string" + IDS_CONVERSION "Conversion" +END diff --git a/dll/ime/msctfime/msctfime.c b/dll/ime/msctfime/msctfime.c new file mode 100644 index 00000000000..93865f49255 --- /dev/null +++ b/dll/ime/msctfime/msctfime.c @@ -0,0 +1,350 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Supporting IME interface of Text Input Processors (TIPs) + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "msctfime.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctfime); + +HINSTANCE g_hInst = NULL; /* The instance of this module */ + +BOOL WINAPI +ImeInquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags) +{ + FIXME("stub:(%p, %p, 0x%lX)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags); + return FALSE; +} + +DWORD WINAPI +ImeConversionList( + _In_ HIMC hIMC, + _In_ LPCWSTR lpSrc, + _Out_ LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag) +{ + FIXME("stub:(%p, %s, %p, 0x%lX, %u)\n", hIMC, debugstr_w(lpSrc), lpDst, dwBufLen, uFlag); + return 0; +} + +BOOL WINAPI +ImeRegisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString) +{ + FIXME("stub:(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); + return FALSE; +} + +BOOL WINAPI +ImeUnregisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString) +{ + FIXME("stub:(%s, 0x%lX, %s)\n", debugstr_w(lpszReading), dwStyle, debugstr_w(lpszString)); + return FALSE; +} + +UINT WINAPI +ImeGetRegisterWordStyle( + _In_ UINT nItem, + _Out_ LPSTYLEBUFW lpStyleBuf) +{ + FIXME("stub:(%u, %p)\n", nItem, lpStyleBuf); + return 0; +} + +UINT WINAPI +ImeEnumRegisterWord( + _In_ REGISTERWORDENUMPROCW lpfnEnumProc, + _In_opt_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_opt_ LPCWSTR lpszString, + _In_opt_ LPVOID lpData) +{ + FIXME("stub:(%p, %s, %lu, %s, %p)\n", lpfnEnumProc, debugstr_w(lpszReading), + dwStyle, debugstr_w(lpszString), lpData); + return 0; +} + +BOOL WINAPI +ImeConfigure( + _In_ HKL hKL, + _In_ HWND hWnd, + _In_ DWORD dwMode, + _Inout_opt_ LPVOID lpData) +{ + FIXME("stub:(%p, %p, %lu, %p)\n", hKL, hWnd, dwMode, lpData); + return FALSE; +} + +BOOL WINAPI +ImeDestroy( + _In_ UINT uReserved) +{ + FIXME("stub:(%u)\n", uReserved); + return FALSE; +} + +LRESULT WINAPI +ImeEscape( + _In_ HIMC hIMC, + _In_ UINT uEscape, + _Inout_opt_ LPVOID lpData) +{ + FIXME("stub:(%p, %u, %p)\n", hIMC, uEscape, lpData); + return 0; +} + +BOOL WINAPI +ImeProcessKey( + _In_ HIMC hIMC, + _In_ UINT uVirKey, + _In_ LPARAM lParam, + _In_ CONST LPBYTE lpbKeyState) +{ + FIXME("stub:(%p, %u, %p, lpbKeyState)\n", hIMC, uVirKey, lParam, lpbKeyState); + return FALSE; +} + +BOOL WINAPI +ImeSelect( + _In_ HIMC hIMC, + _In_ BOOL fSelect) +{ + FIXME("stub:(%p, %u)\n", hIMC, fSelect); + return FALSE; +} + +BOOL WINAPI +ImeSetActiveContext( + _In_ HIMC hIMC, + _In_ BOOL fFlag) +{ + FIXME("stub:(%p, %u)\n", hIMC, fFlag); + return FALSE; +} + +UINT WINAPI +ImeToAsciiEx( + _In_ UINT uVirKey, + _In_ UINT uScanCode, + _In_ CONST LPBYTE lpbKeyState, + _Out_ LPTRANSMSGLIST lpTransMsgList, + _In_ UINT fuState, + _In_ HIMC hIMC) +{ + FIXME("stub:(%u, %u, %p, %p, %u, %p)\n", uVirKey, uScanCode, lpbKeyState, lpTransMsgList, + fuState, hIMC); + return 0; +} + +BOOL WINAPI +NotifyIME( + _In_ HIMC hIMC, + _In_ DWORD dwAction, + _In_ DWORD dwIndex, + _In_ DWORD_PTR dwValue) +{ + FIXME("stub:(%p, 0x%lX, 0x%lX, %p)\n", hIMC, dwAction, dwIndex, dwValue); + return FALSE; +} + +BOOL WINAPI +ImeSetCompositionString( + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _In_opt_ LPCVOID lpComp, + _In_ DWORD dwCompLen, + _In_opt_ LPCVOID lpRead, + _In_ DWORD dwReadLen) +{ + FIXME("stub:(%p, 0x%lX, %p, 0x%lX, %p, 0x%lX)\n", hIMC, dwIndex, lpComp, dwCompLen, + lpRead, dwReadLen); + return FALSE; +} + +DWORD WINAPI +ImeGetImeMenuItems( + _In_ HIMC hIMC, + _In_ DWORD dwFlags, + _In_ DWORD dwType, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu, + _In_ DWORD dwSize) +{ + FIXME("stub:(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", hIMC, dwFlags, dwType, lpImeParentMenu, + lpImeMenu, dwSize); + return 0; +} + +BOOL WINAPI +CtfImeInquireExW( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %p, 0x%lX, %p)\n", lpIMEInfo, lpszWndClass, dwSystemInfoFlags, hKL); + return FALSE; +} + +BOOL WINAPI +CtfImeSelectEx( + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %d, %p)\n", hIMC, fSelect, hKL); + return FALSE; +} + +LRESULT WINAPI +CtfImeEscapeEx( + _In_ HIMC hIMC, + _In_ UINT uSubFunc, + _Inout_opt_ LPVOID lpData, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %u, %p, %p)\n", hIMC, uSubFunc, lpData, hKL); + return 0; +} + +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; +} + +BOOL WINAPI +CtfImeIsGuidMapEnable( + _In_ HIMC hIMC) +{ + FIXME("stub:(%p)\n", hIMC); + return FALSE; +} + +HRESULT WINAPI +CtfImeCreateThreadMgr(VOID) +{ + FIXME("stub:()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeDestroyThreadMgr(VOID) +{ + FIXME("stub:()\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeCreateInputContext( + _In_ HIMC hIMC) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeDestroyInputContext( + _In_ HIMC hIMC) +{ + FIXME("stub:(%p)\n", hIMC); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeSetActiveContextAlways( + _In_ HIMC hIMC, + _In_ BOOL fActive, + _In_ HWND hWnd, + _In_ HKL hKL) +{ + FIXME("stub:(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL); + return E_NOTIMPL; +} + +HRESULT WINAPI +CtfImeProcessCicHotkey( + _In_ HIMC hIMC, + _In_ UINT vKey, + _In_ LPARAM lParam) +{ + FIXME("stub:(%p, %u, %p)\n", hIMC, vKey, lParam); + return E_NOTIMPL; +} + +LRESULT WINAPI +CtfImeDispatchDefImeMessage( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + FIXME("stub:(%p, %u, %p, %p)\n", hWnd, uMsg, wParam, lParam); + return 0; +} + +BOOL WINAPI +CtfImeIsIME( + _In_ HKL hKL) +{ + FIXME("stub:(%p)\n", hKL); + return FALSE; +} + +HRESULT WINAPI +CtfImeThreadDetach(VOID) +{ + ImeDestroy(0); + return S_OK; +} + +LRESULT CALLBACK +UIWndProc( + _In_ HWND hWnd, + _In_ UINT uMsg, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + if (uMsg == WM_CREATE) + { + FIXME("stub\n"); + return -1; + } + return 0; +} + +BOOL WINAPI +DllMain( + _In_ HINSTANCE hinstDLL, + _In_ DWORD dwReason, + _Inout_opt_ LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + { + TRACE("(%p, %lu, %p)\n", hinstDLL, dwReason, lpvReserved); + g_hInst = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + { + break; + } + } + return TRUE; +} diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h new file mode 100644 index 00000000000..bdabd0f2e31 --- /dev/null +++ b/dll/ime/msctfime/msctfime.h @@ -0,0 +1,24 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Supporting IME interface of Text Input Processors (TIPs) + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +#include <stdlib.h> + +#define WIN32_NO_STATUS +#define COBJMACROS + +#include <windows.h> +#include <imm.h> +#include <ddk/immdev.h> +#include <strsafe.h> + +#include <wine/debug.h> + +#include "resource.h" + +extern HINSTANCE g_hInst; diff --git a/dll/ime/msctfime/msctfime.rc b/dll/ime/msctfime/msctfime.rc new file mode 100644 index 00000000000..1f75b36dd37 --- /dev/null +++ b/dll/ime/msctfime/msctfime.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS msctfime.ime + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Resource of msctfime.ime + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include <windef.h> +#include <winuser.rh> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS msctfime.ime" +#define REACTOS_STR_INTERNAL_NAME "msctfime" +#define REACTOS_STR_ORIGINAL_FILENAME "msctfime.ime" +#include <reactos/version.rc> + +#include <reactos/manifest_hosted.rc> + +/* Icons */ +IDI_UNICODE ICON "res/unicode.ico" +IDI_DOWN ICON "res/down.ico" + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/ime/msctfime/msctfime.spec b/dll/ime/msctfime/msctfime.spec new file mode 100644 index 00000000000..2e9b8708e09 --- /dev/null +++ b/dll/ime/msctfime/msctfime.spec @@ -0,0 +1,30 @@ +@ stdcall CtfImeDispatchDefImeMessage(ptr long ptr ptr) +@ stdcall CtfImeCreateInputContext(ptr) +@ stdcall CtfImeCreateThreadMgr() +@ stdcall CtfImeDestroyInputContext(ptr) +@ stdcall CtfImeDestroyThreadMgr() +@ stdcall CtfImeEscapeEx(ptr long ptr ptr) +@ stdcall CtfImeGetGuidAtom(ptr long ptr) +@ stdcall CtfImeInquireExW(ptr ptr long ptr) +@ stdcall CtfImeIsGuidMapEnable(ptr) +@ stdcall CtfImeIsIME(ptr) +@ stdcall CtfImeProcessCicHotkey(ptr long ptr) +@ stdcall CtfImeSelectEx(ptr long ptr) +@ stdcall CtfImeSetActiveContextAlways(ptr long ptr ptr) +@ stdcall CtfImeThreadDetach() +@ stdcall ImeConfigure(ptr ptr long ptr) +@ stdcall ImeConversionList(ptr wstr ptr long long) +@ stdcall ImeDestroy(long) +@ stdcall ImeEnumRegisterWord(ptr wstr long wstr ptr) +@ stdcall ImeEscape(ptr long ptr) +@ stdcall ImeGetRegisterWordStyle(long ptr) +@ stdcall ImeInquire(ptr ptr long) +@ stdcall ImeProcessKey(ptr long long ptr) +@ stdcall ImeRegisterWord(wstr long wstr) +@ stdcall ImeSelect(ptr long) +@ stdcall ImeSetActiveContext(ptr long) +@ stdcall ImeSetCompositionString(ptr long ptr long ptr long) +@ stdcall ImeToAsciiEx(long long ptr ptr long ptr) +@ stdcall ImeUnregisterWord(wstr long wstr) +@ stdcall NotifyIME(ptr long long long) +@ stdcall UIWndProc(ptr long ptr ptr) diff --git a/dll/ime/msctfime/res/down.ico b/dll/ime/msctfime/res/down.ico new file mode 100644 index 00000000000..5aa5db9b758 Binary files /dev/null and b/dll/ime/msctfime/res/down.ico differ diff --git a/dll/ime/msctfime/res/unicode.ico b/dll/ime/msctfime/res/unicode.ico new file mode 100644 index 00000000000..59a1ac7b59a Binary files /dev/null and b/dll/ime/msctfime/res/unicode.ico differ diff --git a/dll/ime/msctfime/resource.h b/dll/ime/msctfime/resource.h new file mode 100644 index 00000000000..dd8cc32caf0 --- /dev/null +++ b/dll/ime/msctfime/resource.h @@ -0,0 +1,16 @@ +#pragma once + +#define IDI_UNICODE 256 +#define IDI_DOWN 257 + +#define IDS_OK 100 +#define IDS_CANCEL 101 +#define IDS_ABORT 102 +#define IDS_RETRY 103 +#define IDS_IGNORE 104 +#define IDS_YES 105 +#define IDS_NO 106 + +#define IDS_ENTER 512 +#define IDS_FINALIZE_STRING 513 +#define IDS_CONVERSION 514 diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index a30b86af31b..f198f7112c1 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -904,7 +904,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) /*********************************************************************** * ImmNotifyIME (IMM32.@) */ -BOOL WINAPI ImmNotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) +BOOL WINAPI ImmNotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue) { HKL hKL; PIMEDPI pImeDpi; diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 3bd4c297f44..03ba666c074 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -93,8 +93,8 @@ @ stdcall ImmLockIMC(ptr) @ stdcall ImmLockIMCC(ptr) @ stdcall ImmLockImeDpi(ptr) -@ stdcall ImmNotifyIME(ptr long long long) -@ stdcall ImmProcessKey(ptr long long long long) +@ stdcall ImmNotifyIME(ptr long long ptr) +@ stdcall ImmProcessKey(ptr long long ptr long) @ stdcall ImmPutImeMenuItemsIntoMappedFile(ptr) @ stdcall ImmReSizeIMCC(ptr long) @ stdcall ImmRegisterClient(ptr ptr) diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index e36ff688666..7dd67cdb013 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -341,6 +341,115 @@ C_ASSERT(sizeof(CLIENTIMC) == 0x34); #define CLIENTIMC_DISABLEIME 0x80 #define CLIENTIMC_UNKNOWN2 0x100 +/* IME file interface */ + +BOOL WINAPI +ImeInquire( + _Out_ LPIMEINFO lpIMEInfo, + _Out_ LPWSTR lpszWndClass, + _In_ DWORD dwSystemInfoFlags); + +DWORD WINAPI +ImeConversionList( + _In_ HIMC hIMC, + _In_ LPCWSTR lpSrc, + _Out_ LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag); + +BOOL WINAPI +ImeRegisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString); + +BOOL WINAPI +ImeUnregisterWord( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszString); + +UINT WINAPI +ImeGetRegisterWordStyle( + _In_ UINT nItem, + _Out_ LPSTYLEBUFW lpStyleBuf); + +UINT WINAPI +ImeEnumRegisterWord( + _In_ REGISTERWORDENUMPROCW lpfnEnumProc, + _In_opt_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_opt_ LPCWSTR lpszString, + _In_opt_ LPVOID lpData); + +BOOL WINAPI +ImeConfigure( + _In_ HKL hKL, + _In_ HWND hWnd, + _In_ DWORD dwMode, + _Inout_opt_ LPVOID lpData); + +BOOL WINAPI +ImeDestroy( + _In_ UINT uReserved); + +LRESULT WINAPI +ImeEscape( + _In_ HIMC hIMC, + _In_ UINT uEscape, + _Inout_opt_ LPVOID lpData); + +BOOL WINAPI +ImeProcessKey( + _In_ HIMC hIMC, + _In_ UINT uVirKey, + _In_ LPARAM lParam, + _In_ CONST LPBYTE lpbKeyState); + +BOOL WINAPI +ImeSelect( + _In_ HIMC hIMC, + _In_ BOOL fSelect); + +BOOL WINAPI +ImeSetActiveContext( + _In_ HIMC hIMC, + _In_ BOOL fFlag); + +UINT WINAPI +ImeToAsciiEx( + _In_ UINT uVirKey, + _In_ UINT uScanCode, + _In_ CONST LPBYTE lpbKeyState, + _Out_ LPTRANSMSGLIST lpTransMsgList, + _In_ UINT fuState, + _In_ HIMC hIMC); + +BOOL WINAPI +NotifyIME( + _In_ HIMC hIMC, + _In_ DWORD dwAction, + _In_ DWORD dwIndex, + _In_ DWORD_PTR dwValue); + +BOOL WINAPI +ImeSetCompositionString( + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _In_opt_ LPCVOID lpComp, + _In_ DWORD dwCompLen, + _In_opt_ LPCVOID lpRead, + _In_ DWORD dwReadLen); + +DWORD WINAPI +ImeGetImeMenuItems( + _In_ HIMC hIMC, + _In_ DWORD dwFlags, + _In_ DWORD dwType, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, + _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu, + _In_ DWORD dwSize); + #ifdef __cplusplus } // extern "C" #endif diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 9ec9e3cfb18..7d63409ad5f 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -270,23 +270,6 @@ BOOL WINAPI ImmDestroySoftKeyboard( _In_ HWND hwndSoftKBD); -BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); -BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); -DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); -BOOL WINAPI ImeDestroy(UINT); -LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID); -BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, CONST LPBYTE); -BOOL WINAPI ImeSelect(HIMC, BOOL); -BOOL WINAPI ImeSetActiveContext(HIMC, BOOL); -UINT WINAPI ImeToAsciiEx(UINT, UINT, CONST LPBYTE, LPDWORD, UINT, HIMC); -BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD); -BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR); -BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR); -UINT WINAPI ImeGetRegisterWordStyle(UINT, LPSTYLEBUFW); -UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); -BOOL WINAPI ImeSetCompositionString(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); -DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); - /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008 @@ -870,7 +853,7 @@ BOOL WINAPI ImmIsUIMessageA(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); BOOL WINAPI ImmIsUIMessageW(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); #define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) -BOOL WINAPI ImmNotifyIME(_In_ HIMC, _In_ DWORD, _In_ DWORD, _In_ DWORD); +BOOL WINAPI ImmNotifyIME(_In_ HIMC, _In_ DWORD, _In_ DWORD, _In_ DWORD_PTR); DWORD WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); diff --git a/sdk/include/reactos/imetable.h b/sdk/include/reactos/imetable.h index d41c5af653d..88f1f59f485 100644 --- a/sdk/include/reactos/imetable.h +++ b/sdk/include/reactos/imetable.h @@ -8,11 +8,11 @@ DEFINE_IME_ENTRY(UINT, ImeEnumRegisterWord, (LPVOID lpfnEnumProc, LPCVOID lpszRe DEFINE_IME_ENTRY(BOOL, ImeConfigure, (HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData), FALSE) DEFINE_IME_ENTRY(BOOL, ImeDestroy, (UINT uReserved), FALSE) DEFINE_IME_ENTRY(LRESULT, ImeEscape, (HIMC hIMC, UINT uEscape, LPVOID lpData), FALSE) -DEFINE_IME_ENTRY(BOOL, ImeProcessKey, (HIMC hIMC, UINT uVirKey, DWORD lParam, CONST LPBYTE lpbKeyState), FALSE) +DEFINE_IME_ENTRY(BOOL, ImeProcessKey, (HIMC hIMC, UINT uVirKey, LPARAM lParam, CONST LPBYTE lpbKeyState), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSelect, (HIMC hIMC, BOOL fSelect), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSetActiveContext, (HIMC hIMC, BOOL fFlag), FALSE) DEFINE_IME_ENTRY(UINT, ImeToAsciiEx, (UINT uVirKey, UINT uScanCode, CONST LPBYTE lpbKeyState, LPTRANSMSGLIST lpTransMsgList, UINT fuState, HIMC hIMC), FALSE) -DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), FALSE) +DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSetCompositionString, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), FALSE) DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), TRUE) DEFINE_IME_ENTRY(BOOL, CtfImeInquireExW, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags, HKL hKL), TRUE) diff --git a/win32ss/user/user32/include/immtable.h b/win32ss/user/user32/include/immtable.h index b9acde65ab7..ad178c8282d 100644 --- a/win32ss/user/user32/include/immtable.h +++ b/win32ss/user/user32/include/immtable.h @@ -25,7 +25,7 @@ DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, N DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC hIMC, LPLOGFONTW plf), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC hIMC, LPLOGFONTA plf), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC hIMC, LPCOMPOSITIONFORM lpCompForm), 0, NONVOID) -DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD_PTR dwValue), 0, NONVOID) DEFINE_IMM_ENTRY(/*PINPUTCONTEXT*/ LPVOID, ImmLockIMC, (HIMC hIMC), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC hIMC), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL hKL), 0, NONVOID)

1 0

[reactos] 01/01: [COMCTL32][USER32] ComboBox: Do default processing on WM_SYSKEYDOWN (#6152)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04b1e8945b6fa1817f565… commit 04b1e8945b6fa1817f565682fbf46ed3327e8032 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 22:04:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 22:04:18 2023 +0900 [COMCTL32][USER32] ComboBox: Do default processing on WM_SYSKEYDOWN (#6152) Based on KRosUser's combo.patch. Enable Alt+F4 on ComboBox. Do default processing on WM_SYSKEYDOWN if necessary. CORE-18231 --- dll/win32/comctl32/combo.c | 7 +++++++ win32ss/user/user32/controls/combo.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dll/win32/comctl32/combo.c b/dll/win32/comctl32/combo.c index 9b694dcbf7b..62c2d4138a2 100644 --- a/dll/win32/comctl32/combo.c +++ b/dll/win32/comctl32/combo.c @@ -1890,8 +1890,15 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam case WM_SYSKEYDOWN: if ( KEYDATA_ALT & HIWORD(lParam) ) if( wParam == VK_UP || wParam == VK_DOWN ) +#ifdef __REACTOS__ + { +#endif COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; +#ifdef __REACTOS__ + } + break; +#endif case WM_KEYDOWN: if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index 8e3d07dc216..b29d5a36efb 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -1989,8 +1989,15 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR if ( KEYDATA_ALT & HIWORD(lParam) ) #endif if( wParam == VK_UP || wParam == VK_DOWN ) +#ifdef __REACTOS__ + { +#endif COMBO_FlipListbox( lphc, FALSE, FALSE ); return 0; +#ifdef __REACTOS__ + } + break; +#endif case WM_KEYDOWN: if ((wParam == VK_RETURN || wParam == VK_ESCAPE) &&

1 0

[reactos] 01/01: [FONTS] Make Arial gender glyphs +66% larger (#6156)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea59e93e31351f17686f8… commit ea59e93e31351f17686f8fdeb85e7efa63622a36 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 20:53:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 20:53:45 2023 +0900 [FONTS] Make Arial gender glyphs +66% larger (#6156) Make U+2642 and U+2640 glyphs +66% larger in ReactOS "Arial" font. - Modify arial.ttf, ariali.ttf, arialbd.ttf, and arialbi.ttf font files by FontForge. - Modify media/fonts/doc/Arial/ChangeLog.txt. - Underline values are hacked to do workaround on FontForge's bug. Copyright text: Digitized data copyright (c) 2010 Google Corporation. Copyright (c) 2012 Red Hat, Inc. Copyright (c) 2019-2023 Katayama Hirofumi MZ. License: SIL Open Font License, Version 1.1 Font File Version: 2.00.1 CORE-19346 --- media/fonts/arial.ttf | Bin 180120 -> 180144 bytes media/fonts/arialbd.ttf | Bin 180000 -> 180028 bytes media/fonts/arialbi.ttf | Bin 187656 -> 187684 bytes media/fonts/ariali.ttf | Bin 188056 -> 188084 bytes media/fonts/doc/Arial/ChangeLog.txt | 17 ++++++++++------- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/media/fonts/arial.ttf b/media/fonts/arial.ttf index 9996deef116..a4b0c31fb23 100644 Binary files a/media/fonts/arial.ttf and b/media/fonts/arial.ttf differ diff --git a/media/fonts/arialbd.ttf b/media/fonts/arialbd.ttf index 1334d0526db..df38e73a289 100644 Binary files a/media/fonts/arialbd.ttf and b/media/fonts/arialbd.ttf differ diff --git a/media/fonts/arialbi.ttf b/media/fonts/arialbi.ttf index 643ddb8d52f..176dad8dace 100644 Binary files a/media/fonts/arialbi.ttf and b/media/fonts/arialbi.ttf differ diff --git a/media/fonts/ariali.ttf b/media/fonts/ariali.ttf index 0b499ce88a8..969c656d991 100644 Binary files a/media/fonts/ariali.ttf and b/media/fonts/ariali.ttf differ diff --git a/media/fonts/doc/Arial/ChangeLog.txt b/media/fonts/doc/Arial/ChangeLog.txt index a78b3a3eadd..f8921228b5f 100644 --- a/media/fonts/doc/Arial/ChangeLog.txt +++ b/media/fonts/doc/Arial/ChangeLog.txt @@ -1,3 +1,10 @@ +* Fri Jul 06 2012 Pravin Satpute <psatpute AT redhat DOT com> +- Initial version of Liberation fonts based on croscore fonts version 1.21.0 +- Converted TTF files into SFD files to be open source. +- Update Copyright and License file +- set fsType bit to 0, Installable Embedding is allowed. +- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. + * Thu Oct 04 2012 Pravin Satpute <psatpute AT redhat DOT com> - Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790 - Resolved #851791, #854601 and #851825 @@ -5,13 +12,6 @@ - Added support for Serbian glyphs for wikipedia #657849 - In Monospace fonts, isFixedPitch bit set via script for getting it recognized as Monospace in putty.exe -* Fri Jul 06 2012 Pravin Satpute <psatpute AT redhat DOT com> -- Initial version of Liberation fonts based on croscore fonts version 1.21.0 -- Converted TTF files into SFD files to be open source. -- Update Copyright and License file -- set fsType bit to 0, Installable Embedding is allowed. -- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. - * Fri Aug 02 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - Renamed filename "LiberationSans-Regular.ttf" as "arial.ttf". - Renamed filename "LiberationSans-Bold.ttf" as "arialbd.ttf". @@ -22,3 +22,6 @@ - Renamed display name "Liberation Sans Bold" as "Arial Bold". - Renamed display name "Liberation Sans Bold Italic" as "Arial Bold Italic". - Renamed display name "Liberation Sans Italic" as "Arial Italic". + +* Mon Dec 11 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> +- Made U+2642 and U+2640 (♂ and ♀) glyphs +66% larger.

1 0

[reactos] 01/01: [SETUP][BOOTDATA][INF] Add font substitute ('Segoe UI Symbol' to 'Arial') (#6155)
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2b1ee9a53d971a884b02… commit e2b1ee9a53d971a884b02ce59266f51f56e618c2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 20:51:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 20:51:04 2023 +0900 [SETUP][BOOTDATA][INF] Add font substitute ('Segoe UI Symbol' to 'Arial') (#6155) Based on CORE-19346 "segoe-ui-symbo.patch". In order to display gender glyphs (U+2642 and U+2640; ♂ and ♀), we add a font substitute from "Segoe UI Symbol" to "Arial". ReactOS Arial has many symbol glyphs, so I think we can use it for "Segoe UI Symbol" font substitute. The glyph size problem will be fixed in #6156. CORE-19346 --- base/setup/lib/muifonts.h | 10 ++++++++++ boot/bootdata/livecd.inf | 1 + media/inf/font.inf | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 72afe0a5083..8a8ef990bdc 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -20,6 +20,7 @@ MUI_SUBFONT LatinFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, { L"Times", L"Times New Roman" }, @@ -51,6 +52,7 @@ MUI_SUBFONT CyrillicFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, { L"Times", L"Times New Roman" }, @@ -82,6 +84,7 @@ MUI_SUBFONT GreekFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, { L"Times", L"Times New Roman" }, @@ -113,6 +116,7 @@ MUI_SUBFONT HebrewFonts[] = { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Courier New" }, { L"Times", L"Times New Roman" }, @@ -154,6 +158,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, { L"NSimSun", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"SimHei", L"Droid Sans Fallback" }, { L"SimSun", L"Droid Sans Fallback" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, @@ -208,6 +213,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Ming Light", L"Droid Sans Fallback" }, { L"MingLiU", L"Droid Sans Fallback" }, { L"PMingLiU", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, @@ -258,6 +264,7 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, @@ -312,6 +319,7 @@ MUI_SUBFONT KoreanFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Segoe UI Symbol", L"Arial" }, { L"Source Sans Pro", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, @@ -349,6 +357,7 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New TUR,162", L"Courier New,162" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helvetica", L"Arial" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Terminal", L"Courier New" }, { L"Times", L"Times New Roman" }, @@ -382,6 +391,7 @@ MUI_SUBFONT HindiFonts[] = { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, { L"Palatino Linotype", L"FreeSans" }, + { L"Segoe UI Symbol", L"Arial" }, { L"System", L"FreeSans" }, { L"Tahoma", L"FreeSans" }, { L"Terminal", L"Lucida Console" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index a9202d068ce..41f2bd38d23 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -54,6 +54,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" diff --git a/media/inf/font.inf b/media/inf/font.inf index 749d673b01c..e6dc0cf8647 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -31,6 +31,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -43,6 +44,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -55,6 +57,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -67,6 +70,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica", HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" @@ -82,6 +86,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dl HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI Gothic",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI Gothic 2",0x00000000,"Droid Sans Fallback" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Source Sans Pro",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console" @@ -93,6 +98,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet M HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman"

1 0

[reactos] 01/01: [SHIMGVW] Destroy window to exit app in Preview_Edit
by Katayama Hirofumi MZ 11 Dec '23

11 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a837138dfcbbcfb2b60c1… commit a837138dfcbbcfb2b60c12eca47f1f7c6d4e62db Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 15:51:55 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 11 15:51:55 2023 +0900 [SHIMGVW] Destroy window to exit app in Preview_Edit CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index fc3bbdbf2ec..cf62ba202ee 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -905,6 +905,14 @@ Preview_Edit(HWND hwnd) if (!g_pCurrentFile) return; + /* Avoid file locking */ + /* FIXME: Our GdipLoadImageFromFile locks the image file */ + if (g_pImage) + { + GdipDisposeImage(g_pImage); + g_pImage = NULL; + } + GetFullPathNameW(g_pCurrentFile->FileName, _countof(szPathName), szPathName, NULL); szPathName[_countof(szPathName) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ @@ -917,6 +925,9 @@ Preview_Edit(HWND hwnd) { DPRINT1("Preview_Edit: ShellExecuteExW() failed with code %ld\n", GetLastError()); } + + // Destroy the window to quit the application + DestroyWindow(hwnd); } static VOID

1 0

[reactos] 01/01: [SHIMGVW] Refactor Part 3 (#6148)
by Katayama Hirofumi MZ 10 Dec '23

10 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2de6e7559ed24dd8d5a3f… commit 2de6e7559ed24dd8d5a3f3eba90efc096aad0740 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 11 07:52:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 11 07:52:18 2023 +0900 [SHIMGVW] Refactor Part 3 (#6148) Improve code flexibility. - Remove g_fnPrevProc, g_hDispWnd, g_hToolBar, and g_Anime global variables. - Declare PREVIEW_DATA structure and use it. - Encapsulate preview window by using user data. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 290 +++++++++++++++++++++++++++----------------- dll/win32/shimgvw/shimgvw.h | 4 - 2 files changed, 177 insertions(+), 117 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 82775a85d55..fc3bbdbf2ec 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -13,16 +13,14 @@ #include <shlobj.h> #include <shellapi.h> +/* Toolbar image size */ +#define TB_IMAGE_WIDTH 16 +#define TB_IMAGE_HEIGHT 16 + HINSTANCE g_hInstance; SHIMGVW_SETTINGS g_Settings; SHIMGVW_FILENODE *g_pCurrentFile; GpImage *g_pImage = NULL; -WNDPROC g_fnPrevProc = NULL; - -HWND g_hDispWnd = NULL; -HWND g_hToolBar = NULL; - -ANIME g_Anime; /* Animation */ /* zooming */ static UINT s_nZoomPercents = 100; @@ -92,31 +90,49 @@ static const TB_BUTTON_CONFIG s_ButtonConfig[] = DEFINE_BTN_CONFIG(HELP_TOC) }; -static VOID UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) +typedef struct tagPREVIEW_DATA +{ + HWND m_hwnd; + HWND m_hwndZoom; + HWND m_hwndToolBar; + INT m_nZoomPercents; + WNDPROC m_fnPrevProc; + ANIME m_Anime; /* Animation */ +} PREVIEW_DATA, *PPREVIEW_DATA; + +PPREVIEW_DATA Preview_GetData(HWND hwnd) +{ + return (PPREVIEW_DATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); +} + +static VOID +Preview_UpdateZoom(PPREVIEW_DATA pData, UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; + HWND hToolBar = pData->m_hwndToolBar; /* If zoom has not been changed, ignore it */ - if (s_nZoomPercents == NewZoom) + if (pData->m_nZoomPercents == NewZoom) return; - s_nZoomPercents = NewZoom; + pData->m_nZoomPercents = NewZoom; /* Check if a zoom button of the toolbar must be grayed */ bEnableZoomIn = (NewZoom < MAX_ZOOM); bEnableZoomOut = (NewZoom > MIN_ZOOM); /* Update toolbar buttons */ - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_OUT, bEnableZoomOut); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_ZOOM_IN, bEnableZoomIn); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); /* Redraw the display window */ - InvalidateRect(g_hDispWnd, NULL, FALSE); + InvalidateRect(pData->m_hwndZoom, NULL, FALSE); } -static VOID ZoomInOrOut(BOOL bZoomIn) +static VOID +Preview_ZoomInOrOut(PPREVIEW_DATA pData, BOOL bZoomIn) { UINT i, NewZoom; @@ -146,10 +162,11 @@ static VOID ZoomInOrOut(BOOL bZoomIn) } /* Update toolbar and refresh screen */ - UpdateZoom(NewZoom, TRUE, TRUE); + Preview_UpdateZoom(pData, NewZoom, TRUE, TRUE); } -static VOID ResetZoom(VOID) +static VOID +Preview_ResetZoom(PPREVIEW_DATA pData) { RECT Rect; UINT ImageWidth, ImageHeight, NewZoom; @@ -158,7 +175,7 @@ static VOID ResetZoom(VOID) return; /* get disp window size and image size */ - GetClientRect(g_hDispWnd, &Rect); + GetClientRect(pData->m_hwndZoom, &Rect); GdipGetImageWidth(g_pImage, &ImageWidth); GdipGetImageHeight(g_pImage, &ImageHeight); @@ -191,12 +208,31 @@ static VOID ResetZoom(VOID) } } - UpdateZoom(NewZoom, FALSE, TRUE); + Preview_UpdateZoom(pData, NewZoom, FALSE, TRUE); +} + +static VOID +Preview_UpdateTitle(PPREVIEW_DATA pData, LPCWSTR FileName) +{ + WCHAR szText[MAX_PATH + 100]; + LPWSTR pchFileTitle; + + LoadStringW(g_hInstance, IDS_APPTITLE, szText, _countof(szText)); + + pchFileTitle = PathFindFileNameW(FileName); + if (pchFileTitle && *pchFileTitle) + { + StringCchCatW(szText, _countof(szText), L" - "); + StringCchCatW(szText, _countof(szText), pchFileTitle); + } + + SetWindowTextW(pData->m_hwnd, szText); } -static VOID pLoadImage(LPCWSTR szOpenFileName) +static VOID +Preview_pLoadImage(PPREVIEW_DATA pData, LPCWSTR szOpenFileName) { - Anime_FreeInfo(&g_Anime); + Anime_FreeInfo(&pData->m_Anime); if (g_pImage) { @@ -208,6 +244,7 @@ static VOID pLoadImage(LPCWSTR szOpenFileName) if (!szOpenFileName || GetFileAttributesW(szOpenFileName) == 0xFFFFFFFF) { DPRINT1("File %s not found!\n", szOpenFileName); + Preview_UpdateTitle(pData, NULL); return; } @@ -216,19 +253,29 @@ static VOID pLoadImage(LPCWSTR szOpenFileName) if (!g_pImage) { DPRINT1("GdipLoadImageFromFile() failed\n"); + Preview_UpdateTitle(pData, NULL); return; } - Anime_LoadInfo(&g_Anime); + Anime_LoadInfo(&pData->m_Anime); if (szOpenFileName && szOpenFileName[0]) SHAddToRecentDocs(SHARD_PATHW, szOpenFileName); /* Reset zoom and redraw display */ - ResetZoom(); + Preview_ResetZoom(pData); + + Preview_UpdateTitle(pData, szOpenFileName); } -static VOID pSaveImageAs(HWND hwnd) +static VOID +Preview_pLoadImageFromNode(PPREVIEW_DATA pData, SHIMGVW_FILENODE *pNode) +{ + Preview_pLoadImage(pData, (pNode ? pNode->FileName : NULL)); +} + +static VOID +Preview_pSaveImageAs(PPREVIEW_DATA pData) { OPENFILENAMEW sfn; ImageCodecInfo *codecInfo; @@ -238,6 +285,7 @@ static VOID pSaveImageAs(HWND hwnd) UINT num, size, j; size_t sizeRemain; WCHAR *c; + HWND hwnd = pData->m_hwnd; if (g_pImage == NULL) return; @@ -306,14 +354,14 @@ static VOID pSaveImageAs(HWND hwnd) if (GetSaveFileNameW(&sfn)) { - Anime_Pause(&g_Anime); + Anime_Pause(&pData->m_Anime); if (GdipSaveImageToFile(g_pImage, szSaveFileName, &codecInfo[sfn.nFilterIndex - 1].Clsid, NULL) != Ok) { DPRINT1("GdipSaveImageToFile() failed\n"); } - Anime_Start(&g_Anime, 0); + Anime_Start(&pData->m_Anime, 0); } QuickFree(szFilterMask); @@ -321,42 +369,18 @@ static VOID pSaveImageAs(HWND hwnd) } static VOID -pPrintImage(HWND hwnd) +Preview_pPrintImage(PPREVIEW_DATA pData) { /* FIXME */ } static VOID -Preview_UpdateUI(HWND hwnd) +Preview_UpdateUI(PPREVIEW_DATA pData) { BOOL bEnable = (g_pImage != NULL); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); - SendMessageW(g_hToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); - InvalidateRect(g_hDispWnd, NULL, FALSE); -} - -static BOOL -pLoadImageFromNode(SHIMGVW_FILENODE *node, HWND hwnd) -{ - WCHAR szText[MAX_PATH + 100]; - LPWSTR pchFileTitle; - - pLoadImage(node ? node->FileName : NULL); - - if (node == NULL) - return FALSE; - - LoadStringW(g_hInstance, IDS_APPTITLE, szText, _countof(szText)); - - pchFileTitle = PathFindFileNameW(node->FileName); - if (pchFileTitle && *pchFileTitle) - { - StringCchCatW(szText, _countof(szText), L" - "); - StringCchCatW(szText, _countof(szText), pchFileTitle); - } - SetWindowTextW(hwnd, szText); - - return g_pImage != NULL; + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_SAVEAS, bEnable); + SendMessageW(pData->m_hwndToolBar, TB_ENABLEBUTTON, IDC_PRINT, bEnable); + InvalidateRect(pData->m_hwndZoom, NULL, FALSE); } static SHIMGVW_FILENODE* @@ -670,43 +694,45 @@ ImageView_SaveSettings(VOID) } static BOOL -Preview_CreateToolBar(HWND hwnd) +Preview_CreateToolBar(PPREVIEW_DATA pData) { - g_hToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, - WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS, - 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); - if (g_hToolBar != NULL) - { - HIMAGELIST hImageList; + HWND hwndToolBar; + HIMAGELIST hImageList, hOldImageList; + const DWORD style = WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | CCS_BOTTOM | TBSTYLE_TOOLTIPS; - SendMessageW(g_hToolBar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); + hwndToolBar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, style, + 0, 0, 0, 0, pData->m_hwnd, NULL, g_hInstance, NULL); + if (!hwndToolBar) + return FALSE; - SendMessageW(g_hToolBar, TB_BUTTONSTRUCTSIZE, sizeof(s_Buttons[0]), 0); + pData->m_hwndToolBar = hwndToolBar; - hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); - if (hImageList == NULL) - return FALSE; + SendMessageW(hwndToolBar, TB_BUTTONSTRUCTSIZE, sizeof(s_Buttons[0]), 0); + SendMessageW(hwndToolBar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS); - for (UINT n = 0; n < _countof(s_ButtonConfig); n++) - { - ImageList_AddMasked(hImageList, LoadImageW(g_hInstance, MAKEINTRESOURCEW(s_ButtonConfig[n].idb), IMAGE_BITMAP, - TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, LR_DEFAULTCOLOR), RGB(255, 255, 255)); - } + hImageList = ImageList_Create(TB_IMAGE_WIDTH, TB_IMAGE_HEIGHT, ILC_MASK | ILC_COLOR24, 1, 1); + if (hImageList == NULL) + return FALSE; - ImageList_Destroy((HIMAGELIST)SendMessageW(g_hToolBar, TB_SETIMAGELIST, - 0, (LPARAM)hImageList)); + for (UINT n = 0; n < _countof(s_ButtonConfig); n++) + { + HBITMAP hBitmap = LoadBitmapW(g_hInstance, MAKEINTRESOURCEW(s_ButtonConfig[n].idb)); + ImageList_AddMasked(hImageList, hBitmap, RGB(255, 255, 255)); + DeleteObject(hBitmap); + } - SendMessageW(g_hToolBar, TB_ADDBUTTONS, _countof(s_Buttons), (LPARAM)s_Buttons); + hOldImageList = (HIMAGELIST)SendMessageW(hwndToolBar, TB_SETIMAGELIST, 0, (LPARAM)hImageList); + ImageList_Destroy(hOldImageList); - return TRUE; - } + SendMessageW(hwndToolBar, TB_ADDBUTTONS, _countof(s_Buttons), (LPARAM)s_Buttons); - return FALSE; + return TRUE; } LRESULT CALLBACK ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + PPREVIEW_DATA pData = (PPREVIEW_DATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_PAINT: @@ -716,12 +742,14 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case WM_TIMER: { - if (Anime_OnTimer(&g_Anime, wParam)) + if (Anime_OnTimer(&pData->m_Anime, wParam)) InvalidateRect(hwnd, NULL, FALSE); break; } default: - return CallWindowProcW(g_fnPrevProc, hwnd, uMsg, wParam, lParam); + { + return CallWindowProcW(pData->m_fnPrevProc, hwnd, uMsg, wParam, lParam); + } } return 0; } @@ -729,17 +757,35 @@ ZoomWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static BOOL Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) { + HWND hwndZoom; + PPREVIEW_DATA pData = QuickAlloc(sizeof(PREVIEW_DATA), TRUE); + pData->m_hwnd = hwnd; + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + DragAcceptFiles(hwnd, TRUE); - g_hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"", - WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); + hwndZoom = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hwnd, NULL, g_hInstance, NULL); + if (!hwndZoom) + { + QuickFree(pData); + return FALSE; + } + + pData->m_hwndZoom = hwndZoom; + SetWindowLongPtrW(hwndZoom, GWLP_USERDATA, (LONG_PTR)pData); - SetClassLongPtr(g_hDispWnd, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); - g_fnPrevProc = (WNDPROC)SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)ZoomWndProc); + SetClassLongPtr(pData->m_hwndZoom, GCL_STYLE, CS_HREDRAW | CS_VREDRAW); + pData->m_fnPrevProc = (WNDPROC)SetWindowLongPtr(pData->m_hwndZoom, + GWLP_WNDPROC, (LPARAM)ZoomWndProc); - Preview_CreateToolBar(hwnd); - Anime_SetTimerWnd(&g_Anime, g_hDispWnd); + if (!Preview_CreateToolBar(pData)) + { + QuickFree(pData); + return FALSE; + } + + Anime_SetTimerWnd(&pData->m_Anime, pData->m_hwndZoom); if (pCS && pCS->lpCreateParams) { @@ -751,8 +797,8 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) PathUnquoteSpacesW(szFile); g_pCurrentFile = pBuildFileList(szFile); - pLoadImageFromNode(g_pCurrentFile, hwnd); - Preview_UpdateUI(hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); } return TRUE; @@ -761,10 +807,11 @@ Preview_OnCreate(HWND hwnd, LPCREATESTRUCT pCS) static VOID Preview_OnMouseWheel(HWND hwnd, INT x, INT y, INT zDelta, UINT fwKeys) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); if (zDelta != 0) { if (GetKeyState(VK_CONTROL) < 0) - ZoomInOrOut(zDelta > 0); + Preview_ZoomInOrOut(pData, zDelta > 0); } } @@ -792,23 +839,26 @@ static VOID Preview_OnSize(HWND hwnd, UINT state, INT cx, INT cy) { RECT rc; + PPREVIEW_DATA pData = Preview_GetData(hwnd); + HWND hToolBar = pData->m_hwndToolBar; - SendMessageW(g_hToolBar, TB_AUTOSIZE, 0, 0); + SendMessageW(hToolBar, TB_AUTOSIZE, 0, 0); - GetWindowRect(g_hToolBar, &rc); + GetWindowRect(hToolBar, &rc); - MoveWindow(g_hDispWnd, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); + MoveWindow(pData->m_hwndZoom, 0, 0, cx, cy - (rc.bottom - rc.top), TRUE); if (!IsIconic(hwnd)) /* Is it not minimized? */ - ResetZoom(); + Preview_ResetZoom(pData); Preview_OnMoveSize(hwnd); } static VOID -Preview_Delete(HWND hwnd) +Preview_Delete(PPREVIEW_DATA pData) { WCHAR szCurFile[MAX_PATH + 1], szNextFile[MAX_PATH]; + HWND hwnd = pData->m_hwnd; SHFILEOPSTRUCTW FileOp = { hwnd, FO_DELETE }; if (!g_pCurrentFile) @@ -836,14 +886,14 @@ Preview_Delete(HWND hwnd) { DPRINT("Preview_Delete: SHFileOperationW() failed or canceled\n"); - pLoadImage(szCurFile); + Preview_pLoadImage(pData, szCurFile); return; } /* Reload the file list and go next file */ pFreeFileList(g_pCurrentFile); g_pCurrentFile = pBuildFileList(szNextFile); - pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); } static VOID @@ -872,14 +922,16 @@ Preview_Edit(HWND hwnd) static VOID Preview_OnCommand(HWND hwnd, UINT nCommandID) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); + switch (nCommandID) { case IDC_PREV_PIC: if (g_pCurrentFile) { g_pCurrentFile = g_pCurrentFile->Prev; - pLoadImageFromNode(g_pCurrentFile, hwnd); - Preview_UpdateUI(hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); } break; @@ -887,17 +939,17 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) if (g_pCurrentFile) { g_pCurrentFile = g_pCurrentFile->Next; - pLoadImageFromNode(g_pCurrentFile, hwnd); - Preview_UpdateUI(hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); + Preview_UpdateUI(pData); } break; case IDC_BEST_FIT: - ResetZoom(); + Preview_ResetZoom(pData); break; case IDC_REAL_SIZE: - UpdateZoom(100, TRUE, FALSE); + Preview_UpdateZoom(pData, 100, TRUE, FALSE); break; case IDC_SLIDE_SHOW: @@ -905,19 +957,19 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_ZOOM_IN: - ZoomInOrOut(TRUE); + Preview_ZoomInOrOut(pData, TRUE); break; case IDC_ZOOM_OUT: - ZoomInOrOut(FALSE); + Preview_ZoomInOrOut(pData, FALSE); break; case IDC_SAVEAS: - pSaveImageAs(hwnd); + Preview_pSaveImageAs(pData); break; case IDC_PRINT: - pPrintImage(hwnd); + Preview_pPrintImage(pData); break; case IDC_ROT_CLOCKW: @@ -937,13 +989,13 @@ Preview_OnCommand(HWND hwnd, UINT nCommandID) break; case IDC_DELETE: - Preview_Delete(hwnd); - Preview_UpdateUI(hwnd); + Preview_Delete(pData); + Preview_UpdateUI(pData); break; case IDC_MODIFY: Preview_Edit(hwnd); - Preview_UpdateUI(hwnd); + Preview_UpdateUI(pData); break; } } @@ -967,6 +1019,8 @@ Preview_OnNotify(HWND hwnd, LPNMHDR pnmhdr) static VOID Preview_OnDestroy(HWND hwnd) { + PPREVIEW_DATA pData = Preview_GetData(hwnd); + pFreeFileList(g_pCurrentFile); g_pCurrentFile = NULL; @@ -976,9 +1030,18 @@ Preview_OnDestroy(HWND hwnd) g_pImage = NULL; } - Anime_FreeInfo(&g_Anime); + Anime_FreeInfo(&pData->m_Anime); + + SetWindowLongPtr(pData->m_hwndZoom, GWLP_WNDPROC, (LPARAM)pData->m_fnPrevProc); + SetWindowLongPtr(pData->m_hwndZoom, GWLP_USERDATA, 0); + DestroyWindow(pData->m_hwndZoom); + pData->m_hwndZoom = NULL; + + DestroyWindow(pData->m_hwndToolBar); + pData->m_hwndToolBar = NULL; + + QuickFree(pData); - SetWindowLongPtr(g_hDispWnd, GWLP_WNDPROC, (LPARAM)g_fnPrevProc); PostQuitMessage(0); } @@ -986,12 +1049,13 @@ static VOID Preview_OnDropFiles(HWND hwnd, HDROP hDrop) { WCHAR szFile[MAX_PATH]; + PPREVIEW_DATA pData = Preview_GetData(hwnd); DragQueryFileW(hDrop, 0, szFile, _countof(szFile)); pFreeFileList(g_pCurrentFile); g_pCurrentFile = pBuildFileList(szFile); - pLoadImageFromNode(g_pCurrentFile, hwnd); + Preview_pLoadImageFromNode(pData, g_pCurrentFile); DragFinish(hDrop); } diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index a9a7b7b8daa..cebbaea06b3 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -29,11 +29,7 @@ #include "resource.h" -#define TB_IMAGE_WIDTH 16 -#define TB_IMAGE_HEIGHT 16 - extern HINSTANCE g_hInstance; -extern HWND g_hDispWnd; extern GpImage *g_pImage; typedef struct

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

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