Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSCTFIME][SDK] Half-implement CTextEventSink (#6274)
by Katayama Hirofumi MZ 02 Jan '24

02 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=006bdfa234a834e5b0a24… commit 006bdfa234a834e5b0a2464bdd79f9eeed878156 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 2 19:45:03 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 2 19:45:03 2024 +0900 [MSCTFIME][SDK] Half-implement CTextEventSink (#6274) Supporting TIPs... JIRA issue: CORE-19360 - Add CTextEventSink class. - Add ITfTextLayoutSink interface into "msctf.idl". --- dll/ime/msctfime/msctfime.cpp | 167 +++++++++++++++++++++++++++++++++++++++++- sdk/include/psdk/msctf.idl | 21 ++++++ 2 files changed, 186 insertions(+), 2 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index d0feb2008da..c9f235937bc 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -597,9 +597,166 @@ HRESULT CCompartmentEventSink::_Unadvise() } class CInputContextOwnerCallBack; -class CTextEventSink; class CInputContextOwner; +typedef INT (CALLBACK *FN_ENDEDIT)(INT, LPVOID, LPVOID); +typedef INT (CALLBACK *FN_LAYOUTCHANGE)(UINT nType, FN_ENDEDIT fnEndEdit, ITfContextView *pView); + +class CTextEventSink : public ITfTextEditSink, ITfTextLayoutSink +{ +protected: + LONG m_cRefs; + IUnknown *m_pUnknown; + DWORD m_dwEditSinkCookie; + DWORD m_dwLayoutSinkCookie; + FN_LAYOUTCHANGE m_fnLayoutChange; + FN_ENDEDIT m_fnEndEdit; + LPVOID m_pCallbackPV; + +public: + CTextEventSink(FN_ENDEDIT fnEndEdit, LPVOID pCallbackPV); + virtual ~CTextEventSink(); + + HRESULT _Advise(IUnknown *pUnknown, UINT uFlags); + HRESULT _Unadvise(); + + // IUnknown interface + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + // ITfTextEditSink interface + STDMETHODIMP OnEndEdit( + ITfContext *pic, + TfEditCookie ecReadOnly, + ITfEditRecord *pEditRecord) override; + + // ITfTextLayoutSink interface + STDMETHODIMP + OnLayoutChange( + ITfContext *pContext, + TfLayoutCode lcode, + ITfContextView *pContextView) override; +}; + +/** + * @implemented + */ +CTextEventSink::CTextEventSink(FN_ENDEDIT fnEndEdit, LPVOID pCallbackPV) +{ + m_cRefs = 1; + m_pUnknown = NULL; + m_dwEditSinkCookie = (DWORD)-1; + m_dwLayoutSinkCookie = (DWORD)-1; + m_fnLayoutChange = NULL; + m_fnEndEdit = fnEndEdit; + m_pCallbackPV = pCallbackPV; +} + +/** + * @implemented + */ +CTextEventSink::~CTextEventSink() +{ +} + +/** + * @implemented + */ +STDMETHODIMP CTextEventSink::QueryInterface(REFIID riid, LPVOID* ppvObj) +{ + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfTextEditSink)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + if (IsEqualIID(riid, IID_ITfTextLayoutSink)) + { + *ppvObj = static_cast<ITfTextLayoutSink*>(this); + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CTextEventSink::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CTextEventSink::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +struct TEXT_EVENT_SINK_END_EDIT +{ + TfEditCookie m_ecReadOnly; + ITfEditRecord *m_pEditRecord; + ITfContext *m_pContext; +}; + +/** + * @implemented + */ +STDMETHODIMP CTextEventSink::OnEndEdit( + ITfContext *pic, + TfEditCookie ecReadOnly, + ITfEditRecord *pEditRecord) +{ + TEXT_EVENT_SINK_END_EDIT Data = { ecReadOnly, pEditRecord, pic }; + return m_fnEndEdit(1, m_pCallbackPV, (LPVOID)&Data); +} + +/** + * @implemented + */ +STDMETHODIMP CTextEventSink::OnLayoutChange( + ITfContext *pContext, + TfLayoutCode lcode, + ITfContextView *pContextView) +{ + switch (lcode) + { + case TF_LC_CREATE: + return m_fnLayoutChange(3, m_fnEndEdit, pContextView); + case TF_LC_CHANGE: + return m_fnLayoutChange(2, m_fnEndEdit, pContextView); + case TF_LC_DESTROY: + return m_fnLayoutChange(4, m_fnEndEdit, pContextView); + default: + return E_INVALIDARG; + } +} + +/** + * @unimplemented + */ +HRESULT CTextEventSink::_Advise(IUnknown *pUnknown, UINT uFlags) +{ + return E_NOTIMPL; +} + +/** + * @unimplemented + */ +HRESULT CTextEventSink::_Unadvise() +{ + return E_NOTIMPL; +} + /*********************************************************************** * CicInputContext * @@ -821,7 +978,13 @@ CicInputContext::DestroyInputContext() pSource->UnadviseSingleSink(m_clientId, IID_ITfCleanupContextSink); //FIXME: m_dwUnknown5 - //FIXME: m_pTextEventSink + + if (m_pTextEventSink) + { + m_pTextEventSink->_Unadvise(); + m_pTextEventSink->Release(); + m_pTextEventSink = NULL; + } if (m_pCompEventSink2) { diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index e3d642c651c..60219b328e0 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -109,6 +109,7 @@ interface ITfKeyEventSink; interface ITfPersistentPropertyLoaderACP; interface ITfRangeACP; interface ITfCleanupContextSink; +interface ITfTextLayoutSink; cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; @@ -1919,3 +1920,23 @@ interface ITfTransitoryExtensionSink : IUnknown [in] ITfRange *pCompositionRange, [out] BOOL *pfDeleteResultRange); } + +[ + object, + uuid(2af2d06a-dd5b-4927-a0b4-54f19c91fade), + pointer_default(unique) +] +interface ITfTextLayoutSink : IUnknown +{ + typedef [uuid(603553cf-9edd-4cc1-9ecc-069e4a427734)] enum + { + TF_LC_CREATE = 0, + TF_LC_CHANGE = 1, + TF_LC_DESTROY = 2 + } TfLayoutCode; + + HRESULT OnLayoutChange( + [in] ITfContext *pic, + [in] TfLayoutCode lcode, + [in] ITfContextView *pView); +}

1 0

[reactos] 01/01: [MSCTFIME] Strengthen CicInputContext (#6273)
by Katayama Hirofumi MZ 02 Jan '24

02 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9489f48760fe3823b8d1… commit f9489f48760fe3823b8d135087bb63967b97841f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 2 15:33:37 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 2 15:33:37 2024 +0900 [MSCTFIME] Strengthen CicInputContext (#6273) Supporting Text Input Processors (TIPs)... JIRA issue: CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 112 +++++++++++++++++++++++++++++++++++------- 1 file changed, 93 insertions(+), 19 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 28a1c55d4df..d0feb2008da 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -17,7 +17,8 @@ DWORD g_dwOSInfo = 0; BOOL gfTFInitLib = FALSE; CRITICAL_SECTION g_csLock; -DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); +DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); +DEFINE_GUID(GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0x85A688F7, 0x6DC8, 0x4F17, 0xA8, 0x3A, 0xB1, 0x1C, 0x09, 0xCD, 0xD7, 0xBF); EXTERN_C void __cxa_pure_virtual(void) { @@ -148,6 +149,14 @@ HRESULT InitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) return E_NOTIMPL; } +HIMC GetActiveContext(VOID) +{ + HWND hwndFocus = ::GetFocus(); + if (!hwndFocus) + hwndFocus = ::GetActiveWindow(); + return ::ImmGetContext(hwndFocus); +} + /** * @implemented */ @@ -588,6 +597,8 @@ HRESULT CCompartmentEventSink::_Unadvise() } class CInputContextOwnerCallBack; +class CTextEventSink; +class CInputContextOwner; /*********************************************************************** * CicInputContext @@ -600,29 +611,32 @@ class CicInputContext , public ITfCompositionSink { public: - ITfContextOwnerCompositionSink *m_pContextOwnerCompositionSink; - DWORD m_dwUnknown0; LONG m_cRefs; HIMC m_hIMC; ITfDocumentMgr *m_pDocumentMgr; ITfContext *m_pContext; - DWORD m_dwUnknown1; + IUnknown *m_pUnknown1; CInputContextOwnerCallBack *m_pICOwnerCallback; - LPVOID m_pTextEventSink; + CTextEventSink *m_pTextEventSink; CCompartmentEventSink *m_pCompEventSink1; CCompartmentEventSink *m_pCompEventSink2; - DWORD m_dwUnknown3[4]; + CInputContextOwner *m_pInputContextOwner; + DWORD m_dwUnknown3[3]; DWORD m_dwUnknown4[2]; DWORD m_dwQueryPos; DWORD m_dwUnknown5; GUID m_guid; DWORD m_dwUnknown6[11]; BOOL m_bSelecting; - DWORD m_dwUnknown7[7]; + DWORD m_dwUnknown6_5; + LONG m_cCompLocks; + DWORD m_dwUnknown7[5]; WORD m_cGuidAtoms; WORD m_padding; DWORD m_adwGuidAtoms[256]; - DWORD m_dwUnknown8[19]; + DWORD m_dwUnknown8[17]; + TfClientId m_clientId; + DWORD m_dwUnknown9; public: CicInputContext( @@ -672,7 +686,7 @@ CicInputContext::CicInputContext( } /** - * @unimplemented + * @implemented */ STDMETHODIMP CicInputContext::QueryInterface(REFIID riid, LPVOID* ppvObj) { @@ -680,11 +694,11 @@ STDMETHODIMP CicInputContext::QueryInterface(REFIID riid, LPVOID* ppvObj) if (IsEqualIID(riid, IID_ITfContextOwnerCompositionSink)) { - *ppvObj = (ITfContextOwnerCompositionSink*)this; + *ppvObj = static_cast<ITfContextOwnerCompositionSink*>(this); AddRef(); return S_OK; } - if (IsEqualIID(riid, IID_IUnknown)) + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfCleanupContextSink)) { *ppvObj = this; AddRef(); @@ -716,35 +730,45 @@ STDMETHODIMP_(ULONG) CicInputContext::Release() } /** - * @unimplemented + * @implemented */ STDMETHODIMP CicInputContext::OnStartComposition( ITfCompositionView *pComposition, BOOL *pfOk) { - return E_NOTIMPL; + if ((m_cCompLocks <= 0) || m_dwUnknown6_5) + { + *pfOk = TRUE; + ++m_cCompLocks; + } + else + { + *pfOk = FALSE; + } + return S_OK; } /** - * @unimplemented + * @implemented */ STDMETHODIMP CicInputContext::OnUpdateComposition( ITfCompositionView *pComposition, ITfRange *pRangeNew) { - return E_NOTIMPL; + return S_OK; } /** - * @unimplemented + * @implemented */ STDMETHODIMP CicInputContext::OnEndComposition( ITfCompositionView *pComposition) { - return E_NOTIMPL; + --m_cCompLocks; + return S_OK; } /** @@ -791,8 +815,58 @@ CicInputContext::CreateInputContext( HRESULT CicInputContext::DestroyInputContext() { - // FIXME - return E_NOTIMPL; + ITfSourceSingle *pSource = NULL; + + if (m_pContext && m_pContext->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) + pSource->UnadviseSingleSink(m_clientId, IID_ITfCleanupContextSink); + + //FIXME: m_dwUnknown5 + //FIXME: m_pTextEventSink + + if (m_pCompEventSink2) + { + //FIXME: m_pCompEventSink2->_Unadvise(); + m_pCompEventSink2->Release(); + m_pCompEventSink2 = NULL; + } + + if (m_pCompEventSink1) + { + //FIXME: m_pCompEventSink1->_Unadvise(); + m_pCompEventSink1->Release(); + m_pCompEventSink1 = NULL; + } + + //FIXME: m_pInputContextOwner + + if (m_pDocumentMgr) + m_pDocumentMgr->Pop(1); + + if (m_pContext) + { + ClearCompartment(m_clientId, m_pContext, GUID_COMPARTMENT_CTFIME_CICINPUTCONTEXT, 0); + m_pContext->Release(); + m_pContext = NULL; + } + + if (m_pUnknown1) + { + m_pUnknown1->Release(); + m_pUnknown1 = NULL; + } + + // FIXME: m_pICOwnerCallback + + if (m_pDocumentMgr) + { + m_pDocumentMgr->Release(); + m_pDocumentMgr = NULL; + } + + if (pSource) + pSource->Release(); + + return S_OK; } /**

1 0

[reactos] 01/01: [MSCTFIME][SDK] Implement CFunctionProvider (#6269)
by Katayama Hirofumi MZ 01 Jan '24

01 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88107adc9249bcc7eb691… commit 88107adc9249bcc7eb691a8b3f97a797bb58d5ab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 1 16:36:49 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 1 16:36:49 2024 +0900 [MSCTFIME][SDK] Implement CFunctionProvider (#6269) Supporting TIPs... JIRA issue: CORE-19360 Define CFunctionProviderBase class. Define CFunctionProvider class. Strengthen <cicero/cictf.h>. --- dll/ime/msctfime/msctfime.cpp | 233 +++++++++++++++++++++++++++++++++++-- sdk/include/reactos/cicero/cictf.h | 13 +++ 2 files changed, 235 insertions(+), 11 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index c5bfab1abdb..28a1c55d4df 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -6,6 +6,7 @@ */ #include "msctfime.h" +#include <ndk/ldrfuncs.h> /* for RtlDllShutdownInProgress */ WINE_DEFAULT_DEBUG_CHANNEL(msctfime); @@ -1071,24 +1072,132 @@ HRESULT CThreadMgrEventSink::_Unadvise() return hr; } -/* FIXME */ -class CFunctionProvider : public IUnknown +class CFunctionProviderBase : public ITfFunctionProvider { +protected: + TfClientId m_clientId; + GUID m_guid; + BSTR m_bstr; + LONG m_cRefs; + public: - CFunctionProvider(_In_ TfClientId clientId) - { - } + CFunctionProviderBase(_In_ TfClientId clientId); + virtual ~CFunctionProviderBase(); // IUnknown interface - STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) override; STDMETHODIMP_(ULONG) AddRef() override; STDMETHODIMP_(ULONG) Release() override; + + // ITfFunctionProvider interface + STDMETHODIMP GetType(_Out_ GUID *guid) override; + STDMETHODIMP GetDescription(_Out_ BSTR *desc) override; + //STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) = 0; + + BOOL Init(_In_ REFGUID rguid, _In_ LPCWSTR psz); }; +/** + * @implemented + */ +CFunctionProviderBase::CFunctionProviderBase(_In_ TfClientId clientId) +{ + m_clientId = clientId; + m_guid = GUID_NULL; + m_bstr = NULL; + m_cRefs = 1; +} + +/** + * @implemented + */ +CFunctionProviderBase::~CFunctionProviderBase() +{ + if (!RtlDllShutdownInProgress()) + ::SysFreeString(m_bstr); +} + +/** + * @implemented + */ +BOOL +CFunctionProviderBase::Init( + _In_ REFGUID rguid, + _In_ LPCWSTR psz) +{ + m_bstr = ::SysAllocString(psz); + m_guid = rguid; + return (m_bstr != NULL); +} + +class CFnDocFeed : public IAImmFnDocFeed +{ + LONG m_cRefs; + +public: + CFnDocFeed(); + virtual ~CFnDocFeed(); + + // IUnknown interface + STDMETHODIMP QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; + + // IAImmFnDocFeed interface + STDMETHODIMP DocFeed() override; + STDMETHODIMP ClearDocFeedBuffer() override; + STDMETHODIMP StartReconvert() override; + STDMETHODIMP StartUndoCompositionString() override; +}; + +CFnDocFeed::CFnDocFeed() +{ + m_cRefs = 1; +} + +CFnDocFeed::~CFnDocFeed() +{ +} + +/** + * @implemented + */ +STDMETHODIMP CFnDocFeed::QueryInterface(_In_ REFIID riid, _Out_ LPVOID* ppvObj) +{ + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IAImmFnDocFeed)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CFnDocFeed::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CFnDocFeed::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + /** * @unimplemented */ -STDMETHODIMP CFunctionProvider::QueryInterface(REFIID riid, LPVOID* ppvObj) +STDMETHODIMP CFnDocFeed::DocFeed() { return E_NOTIMPL; } @@ -1096,17 +1205,119 @@ STDMETHODIMP CFunctionProvider::QueryInterface(REFIID riid, LPVOID* ppvObj) /** * @unimplemented */ -STDMETHODIMP_(ULONG) CFunctionProvider::AddRef() +STDMETHODIMP CFnDocFeed::ClearDocFeedBuffer() { - return 1; + return E_NOTIMPL; } /** * @unimplemented */ -STDMETHODIMP_(ULONG) CFunctionProvider::Release() +STDMETHODIMP CFnDocFeed::StartReconvert() { - return 0; + return E_NOTIMPL; +} + +/** + * @unimplemented + */ +STDMETHODIMP CFnDocFeed::StartUndoCompositionString() +{ + return E_NOTIMPL; +} + +/** + * @implemented + */ +STDMETHODIMP +CFunctionProviderBase::QueryInterface( + _In_ REFIID riid, + _Out_ LPVOID* ppvObj) +{ + if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfFunctionProvider)) + { + *ppvObj = this; + AddRef(); + return S_OK; + } + return E_NOINTERFACE; +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CFunctionProviderBase::AddRef() +{ + return ::InterlockedIncrement(&m_cRefs); +} + +/** + * @implemented + */ +STDMETHODIMP_(ULONG) CFunctionProviderBase::Release() +{ + if (::InterlockedDecrement(&m_cRefs) == 0) + { + delete this; + return 0; + } + return m_cRefs; +} + +/** + * @implemented + */ +STDMETHODIMP CFunctionProviderBase::GetType(_Out_ GUID *guid) +{ + *guid = m_guid; + return S_OK; +} + +/** + * @implemented + */ +STDMETHODIMP CFunctionProviderBase::GetDescription(_Out_ BSTR *desc) +{ + *desc = ::SysAllocString(m_bstr); + return (*desc ? S_OK : E_OUTOFMEMORY); +} + +class CFunctionProvider : public CFunctionProviderBase +{ +public: + CFunctionProvider(_In_ TfClientId clientId); + + STDMETHODIMP GetFunction(_In_ REFGUID guid, _In_ REFIID riid, _Out_ IUnknown **func) override; +}; + +/** + * @implemented + */ +CFunctionProvider::CFunctionProvider(_In_ TfClientId clientId) : CFunctionProviderBase(clientId) +{ + Init(CLSID_CAImmLayer, L"MSCTFIME::Function Provider"); +} + +/** + * @implemented + */ +STDMETHODIMP +CFunctionProvider::GetFunction( + _In_ REFGUID guid, + _In_ REFIID riid, + _Out_ IUnknown **func) +{ + *func = NULL; + + if (IsEqualGUID(guid, GUID_NULL) && + IsEqualIID(riid, IID_IAImmFnDocFeed)) + { + *func = new CFnDocFeed(); + if (*func) + return S_OK; + } + + return E_NOINTERFACE; } /* FIXME */ diff --git a/sdk/include/reactos/cicero/cictf.h b/sdk/include/reactos/cicero/cictf.h index e11cebc3154..afc96cdfc14 100644 --- a/sdk/include/reactos/cicero/cictf.h +++ b/sdk/include/reactos/cicero/cictf.h @@ -29,3 +29,16 @@ struct ITfThreadMgr_P : ITfThreadMgr }; DEFINE_GUID(IID_ITfKeystrokeMgr_P, 0x53FA1BEC, 0x5BE1, 0x458E, 0xAE, 0x70, 0xA9, 0xF1, 0xDC, 0x84, 0x3E, 0x81); + +// FIXME: ITfKeystrokeMgr_P + +DEFINE_GUID(IID_IAImmFnDocFeed, 0x6E098993, 0x9577, 0x499A, 0xA8, 0x30, 0x52, 0x34, 0x4F, 0x3E, 0x20, 0x0D); +DEFINE_GUID(CLSID_CAImmLayer, 0xB676DB87, 0x64DC, 0x4651, 0x99, 0xEC, 0x91, 0x07, 0x0E, 0xA4, 0x87, 0x90); + +struct IAImmFnDocFeed : IUnknown +{ + STDMETHOD(DocFeed)() = 0; + STDMETHOD(ClearDocFeedBuffer)() = 0; + STDMETHOD(StartReconvert)() = 0; + STDMETHOD(StartUndoCompositionString)() = 0; +};

1 0

[reactos] 01/01: [MSCTFIME][SDK] Improve human readability (#6240)
by Katayama Hirofumi MZ 01 Jan '24

01 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5548aa5014adee6e608d… commit e5548aa5014adee6e608d9fd1d57a912274a283e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 1 11:05:49 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 1 11:05:49 2024 +0900 [MSCTFIME][SDK] Improve human readability (#6240) Improve code quality. JIRA issue: CORE-19360 - Add some SAL annotations. - Add readable comments more. - Rename some member variables. --- dll/ime/msctfime/msctfime.cpp | 265 ++++++++++++++++++++++-------------- sdk/include/reactos/cicero/cicimc.h | 25 ++-- 2 files changed, 173 insertions(+), 117 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 769b56e6502..c5bfab1abdb 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -37,7 +37,7 @@ UINT WM_MSIME_KEYMAP = 0; /** * @implemented */ -BOOL IsMsImeMessage(UINT uMsg) +BOOL IsMsImeMessage(_In_ UINT uMsg) { return (uMsg == WM_MSIME_SERVICE || uMsg == WM_MSIME_UIREADY || @@ -82,6 +82,9 @@ BOOL RegisterMSIMEMessage(VOID) typedef BOOLEAN (WINAPI *FN_DllShutDownInProgress)(VOID); /** + * This function calls ntdll!RtlDllShutdownInProgress. + * It can detect the system is shutting down or not. + * * @implemented */ EXTERN_C BOOLEAN WINAPI @@ -103,6 +106,8 @@ DllShutDownInProgress(VOID) } /** + * This function checks if the current user logon session is interactive. + * * @implemented */ static BOOL @@ -160,9 +165,11 @@ HRESULT UninitDisplayAttrbuteLib(PCIC_LIBTHREAD pLibThread) } /** + * Gets the charset from a language ID. + * * @implemented */ -BYTE GetCharsetFromLangId(DWORD dwValue) +BYTE GetCharsetFromLangId(_In_ DWORD dwValue) { CHARSETINFO info; if (!::TranslateCharsetInfo((DWORD*)(DWORD_PTR)dwValue, &info, TCI_SRCLOCALE)) @@ -171,10 +178,15 @@ BYTE GetCharsetFromLangId(DWORD dwValue) } /** + * Selects or unselects the input context. + * * @implemented */ HRESULT -InternalSelectEx(HIMC hIMC, BOOL fSelect, LANGID LangID) +InternalSelectEx( + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ LANGID LangID) { CicIMCLock imcLock(hIMC); if (!imcLock) @@ -574,45 +586,49 @@ HRESULT CCompartmentEventSink::_Unadvise() return S_OK; } +class CInputContextOwnerCallBack; + /*********************************************************************** * CicInputContext + * + * The msctfime.ime's input context. */ - -class CInputContextOwnerCallBack; - -/* FIXME */ class CicInputContext : public ITfCleanupContextSink , public ITfContextOwnerCompositionSink , public ITfCompositionSink { public: - DWORD m_dw[2]; + ITfContextOwnerCompositionSink *m_pContextOwnerCompositionSink; + DWORD m_dwUnknown0; LONG m_cRefs; HIMC m_hIMC; ITfDocumentMgr *m_pDocumentMgr; ITfContext *m_pContext; - DWORD m_dw0_0[1]; + DWORD m_dwUnknown1; CInputContextOwnerCallBack *m_pICOwnerCallback; - DWORD m_dw0; + LPVOID m_pTextEventSink; CCompartmentEventSink *m_pCompEventSink1; CCompartmentEventSink *m_pCompEventSink2; - DWORD m_dw0_5[4]; - DWORD m_dw1[2]; + DWORD m_dwUnknown3[4]; + DWORD m_dwUnknown4[2]; DWORD m_dwQueryPos; - DWORD m_dw1_5[1]; + DWORD m_dwUnknown5; GUID m_guid; - DWORD m_dw2[19]; + DWORD m_dwUnknown6[11]; + BOOL m_bSelecting; + DWORD m_dwUnknown7[7]; WORD m_cGuidAtoms; WORD m_padding; DWORD m_adwGuidAtoms[256]; - DWORD m_dw3[19]; + DWORD m_dwUnknown8[19]; public: - CicInputContext(TfClientId cliendId, PCIC_LIBTHREAD pLibThread, HIMC hIMC); - virtual ~CicInputContext() - { - } + CicInputContext( + _In_ TfClientId cliendId, + _Inout_ PCIC_LIBTHREAD pLibThread, + _In_ HIMC hIMC); + virtual ~CicInputContext() { } // IUnknown interface STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; @@ -620,7 +636,7 @@ public: STDMETHODIMP_(ULONG) Release() override; // ITfCleanupContextSink interface - STDMETHODIMP OnCleanupContext(TfEditCookie ecWrite, ITfContext *pic) override; + STDMETHODIMP OnCleanupContext(_In_ TfEditCookie ecWrite, _Inout_ ITfContext *pic) override; // ITfContextOwnerCompositionSink interface STDMETHODIMP OnStartComposition(ITfCompositionView *pComposition, BOOL *pfOk) override; @@ -636,14 +652,17 @@ public: _In_ BYTE iAtom, _Out_opt_ LPDWORD pdwGuidAtom); - HRESULT CreateInputContext(ITfThreadMgr *pThreadMgr, CicIMCLock& imcLock); + HRESULT CreateInputContext(_Inout_ ITfThreadMgr *pThreadMgr, _Inout_ CicIMCLock& imcLock); HRESULT DestroyInputContext(); }; /** * @unimplemented */ -CicInputContext::CicInputContext(TfClientId cliendId, PCIC_LIBTHREAD pLibThread, HIMC hIMC) +CicInputContext::CicInputContext( + _In_ TfClientId cliendId, + _Inout_ PCIC_LIBTHREAD pLibThread, + _In_ HIMC hIMC) { m_hIMC = hIMC; m_guid = GUID_NULL; @@ -757,7 +776,9 @@ CicInputContext::GetGuidAtom( * @unimplemented */ HRESULT -CicInputContext::CreateInputContext(ITfThreadMgr *pThreadMgr, CicIMCLock& imcLock) +CicInputContext::CreateInputContext( + _Inout_ ITfThreadMgr *pThreadMgr, + _Inout_ CicIMCLock& imcLock) { //FIXME return E_NOTIMPL; @@ -783,6 +804,8 @@ CicInputContext::OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *p } /** + * Retrieves the IME information. + * * @implemented */ HRESULT @@ -872,12 +895,12 @@ protected: public: CThreadMgrEventSink( - FN_INITDOCMGR fnInit, - FN_PUSHPOP fnPushPop = NULL, - LPVOID pvCallbackPV = NULL); + _In_ FN_INITDOCMGR fnInit, + _In_ FN_PUSHPOP fnPushPop = NULL, + _Inout_ LPVOID pvCallbackPV = NULL); virtual ~CThreadMgrEventSink() { } - void SetCallbackPV(LPVOID pv); + void SetCallbackPV(_Inout_ LPVOID pv); HRESULT _Advise(ITfThreadMgr *pThreadMgr); HRESULT _Unadvise(); @@ -904,9 +927,9 @@ public: * @implemented */ CThreadMgrEventSink::CThreadMgrEventSink( - FN_INITDOCMGR fnInit, - FN_PUSHPOP fnPushPop, - LPVOID pvCallbackPV) + _In_ FN_INITDOCMGR fnInit, + _In_ FN_PUSHPOP fnPushPop, + _Inout_ LPVOID pvCallbackPV) { m_fnInit = fnInit; m_fnPushPop = fnPushPop; @@ -996,7 +1019,7 @@ STDMETHODIMP CThreadMgrEventSink::OnPopContext(ITfContext *pic) return m_fnPushPop(4, pic, m_pCallbackPV); } -void CThreadMgrEventSink::SetCallbackPV(LPVOID pv) +void CThreadMgrEventSink::SetCallbackPV(_Inout_ LPVOID pv) { if (!m_pCallbackPV) m_pCallbackPV = pv; @@ -1052,7 +1075,7 @@ HRESULT CThreadMgrEventSink::_Unadvise() class CFunctionProvider : public IUnknown { public: - CFunctionProvider(TfClientId clientId) + CFunctionProvider(_In_ TfClientId clientId) { } @@ -1091,8 +1114,8 @@ class CicBridge : public ITfSysHookSink { protected: LONG m_cRefs; - DWORD m_dwImmxInit; - DWORD m_dw[1]; + BOOL m_bImmxInited; + BOOL m_bUnknown1; BOOL m_bDeactivating; DWORD m_cActivateLocks; ITfKeystrokeMgr *m_pKeystrokeMgr; @@ -1100,7 +1123,7 @@ protected: CThreadMgrEventSink *m_pThreadMgrEventSink; TfClientId m_cliendId; CIC_LIBTHREAD m_LibThread; - DWORD m_dw21; + BOOL m_bUnknown2; static BOOL CALLBACK EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam); static BOOL CALLBACK EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam); @@ -1119,32 +1142,41 @@ public: STDMETHODIMP OnSysKeyboardProc(UINT, LONG) override; STDMETHODIMP OnSysShellProc(INT, UINT, LONG) override; - HRESULT InitIMMX(TLS *pTLS); - BOOL UnInitIMMX(TLS *pTLS); - HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr); - HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr); + HRESULT InitIMMX(_Inout_ TLS *pTLS); + BOOL UnInitIMMX(_Inout_ TLS *pTLS); + HRESULT ActivateIMMX(_Inout_ TLS *pTLS, _Inout_ ITfThreadMgr_P *pThreadMgr); + HRESULT DeactivateIMMX(_Inout_ TLS *pTLS, _Inout_ ITfThreadMgr_P *pThreadMgr); HRESULT CreateInputContext(TLS *pTLS, HIMC hIMC); HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); ITfContext *GetInputContext(CicIMCCLock<CTFIMECONTEXT>& imeContext); HRESULT SelectEx( - TLS *pTLS, - ITfThreadMgr_P *pThreadMgr, - HIMC hIMC, - BOOL fSelect, - HKL hKL); + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr, + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ HKL hKL); HRESULT OnSetOpenStatus( TLS *pTLS, ITfThreadMgr_P *pThreadMgr, CicIMCLock& imcLock, CicInputContext *pCicIC); - void PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs); - void GetDocumentManager(CicIMCCLock<CTFIMECONTEXT>& imeContext); + void PostTransMsg(_In_ HWND hWnd, _In_ INT cTransMsgs, _In_ const TRANSMSG *pTransMsgs); + void GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext); - HRESULT ConfigureGeneral(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd); - HRESULT ConfigureRegisterWord(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd, LPVOID lpData); + HRESULT + ConfigureGeneral(_Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd); + HRESULT ConfigureRegisterWord( + _Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd, + _Inout_opt_ LPVOID lpData); }; class CActiveLanguageProfileNotifySink : public ITfActiveLanguageProfileNotifySink @@ -1158,7 +1190,7 @@ protected: LPVOID m_pUserData; public: - CActiveLanguageProfileNotifySink(FN_COMPARE fnCompare, void *pUserData); + CActiveLanguageProfileNotifySink(_In_ FN_COMPARE fnCompare, _Inout_opt_ void *pUserData); virtual ~CActiveLanguageProfileNotifySink(); HRESULT _Advise(ITfThreadMgr *pThreadMgr); @@ -1181,8 +1213,8 @@ public: * @implemented */ CActiveLanguageProfileNotifySink::CActiveLanguageProfileNotifySink( - FN_COMPARE fnCompare, - void *pUserData) + _In_ FN_COMPARE fnCompare, + _Inout_opt_ void *pUserData) { m_dwConnection = (DWORD)-1; m_fnCompare = fnCompare; @@ -1322,7 +1354,7 @@ protected: UINT m_nCodePage; LANGID m_LangID2; WORD m_padding2; - DWORD m_dw3[1]; + DWORD m_dwUnknown1; LONG m_cRefs; static INT CALLBACK @@ -1341,11 +1373,15 @@ public: STDMETHODIMP_(ULONG) AddRef() override; STDMETHODIMP_(ULONG) Release() override; - HRESULT GetActiveLanguageProfile(HKL hKL, REFGUID rguid, TF_LANGUAGEPROFILE *pProfile); - HRESULT GetLangId(LANGID *pLangID); - HRESULT GetCodePageA(UINT *puCodePage); - - HRESULT InitProfileInstance(TLS *pTLS); + HRESULT + GetActiveLanguageProfile( + _In_ HKL hKL, + _In_ REFGUID rguid, + _Out_ TF_LANGUAGEPROFILE *pProfile); + HRESULT GetLangId(_Out_ LANGID *pLangID); + HRESULT GetCodePageA(_Out_ UINT *puCodePage); + + HRESULT InitProfileInstance(_Inout_ TLS *pTLS); }; /** @@ -1360,7 +1396,7 @@ CicProfile::CicProfile() m_LangID1 = 0; m_nCodePage = CP_ACP; m_LangID2 = 0; - m_dw3[0] = 0; + m_dwUnknown1 = 0; } /** @@ -1433,7 +1469,7 @@ CicProfile::ActiveLanguageProfileNotifySinkCallback( /** * @implemented */ -HRESULT CicProfile::GetCodePageA(UINT *puCodePage) +HRESULT CicProfile::GetCodePageA(_Out_ UINT *puCodePage) { if (!puCodePage) return E_INVALIDARG; @@ -1466,7 +1502,7 @@ HRESULT CicProfile::GetCodePageA(UINT *puCodePage) /** * @implemented */ -HRESULT CicProfile::GetLangId(LANGID *pLangID) +HRESULT CicProfile::GetLangId(_Out_ LANGID *pLangID) { *pLangID = 0; @@ -1500,7 +1536,8 @@ public: ITfThreadMgr_P *m_pThreadMgr; DWORD m_dwFlags1; DWORD m_dwFlags2; - DWORD m_dwUnknown2[2]; + DWORD m_dwUnknown2; + BOOL m_bDestroyed; DWORD m_dwNowOpening; DWORD m_NonEAComposition; DWORD m_cWnds; @@ -1574,8 +1611,8 @@ TLS* TLS::InternalAllocateTLS() return NULL; } - pTLS->m_dwUnknown2[0] |= 1; - pTLS->m_dwUnknown2[2] |= 1; + pTLS->m_dwFlags1 |= 1; + pTLS->m_dwUnknown2 |= 1; return pTLS; } @@ -1604,7 +1641,7 @@ BOOL TLS::InternalDestroyTLS() * @implemented */ HRESULT -CicProfile::InitProfileInstance(TLS *pTLS) +CicProfile::InitProfileInstance(_Inout_ TLS *pTLS) { HRESULT hr = TF_CreateInputProcessorProfiles(&m_pIPProfiles); if (FAILED(hr)) @@ -1633,7 +1670,10 @@ CicProfile::InitProfileInstance(TLS *pTLS) /** * @implemented */ -STDMETHODIMP CicInputContext::OnCleanupContext(TfEditCookie ecWrite, ITfContext *pic) +STDMETHODIMP +CicInputContext::OnCleanupContext( + _In_ TfEditCookie ecWrite, + _Inout_ ITfContext *pic) { TLS *pTLS = TLS::PeekTLS(); if (!pTLS || !pTLS->m_pProfile) @@ -1686,10 +1726,10 @@ STDMETHODIMP CicInputContext::OnCleanupContext(TfEditCookie ecWrite, ITfContext CicBridge::CicBridge() { - m_dwImmxInit &= ~1; - m_dw[0] &= ~1; + m_bImmxInited = FALSE; + m_bUnknown1 = FALSE; m_bDeactivating = FALSE; - m_dw21 &= ~1; + m_bUnknown2 = FALSE; m_pKeystrokeMgr = NULL; m_pDocMgr = NULL; m_pThreadMgrEventSink = NULL; @@ -1747,7 +1787,7 @@ CicBridge::~CicBridge() UnInitIMMX(pTLS); } -void CicBridge::GetDocumentManager(CicIMCCLock<CTFIMECONTEXT>& imeContext) +void CicBridge::GetDocumentManager(_Inout_ CicIMCCLock<CTFIMECONTEXT>& imeContext) { CicInputContext *pCicIC = imeContext.get().m_pCicIC; if (pCicIC) @@ -1765,7 +1805,10 @@ void CicBridge::GetDocumentManager(CicIMCCLock<CTFIMECONTEXT>& imeContext) /** * @unimplemented */ -HRESULT CicBridge::CreateInputContext(TLS *pTLS, HIMC hIMC) +HRESULT +CicBridge::CreateInputContext( + _Inout_ TLS *pTLS, + _In_ HIMC hIMC) { CicIMCLock imcLock(hIMC); HRESULT hr = imcLock.m_hr; @@ -1888,15 +1931,16 @@ HRESULT CicBridge::OnSetOpenStatus( } /** + * Selects the IME context. * @implemented */ HRESULT CicBridge::SelectEx( - TLS *pTLS, - ITfThreadMgr_P *pThreadMgr, - HIMC hIMC, - BOOL fSelect, - HKL hKL) + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr, + _In_ HIMC hIMC, + _In_ BOOL fSelect, + _In_ HKL hKL) { CicIMCLock imcLock(hIMC); if (FAILED(imcLock.m_hr)) @@ -1910,12 +1954,12 @@ CicBridge::SelectEx( CicInputContext *pCicIC = imeContext.get().m_pCicIC; if (pCicIC) - pCicIC->m_dw2[11] |= 1; + pCicIC->m_bSelecting = TRUE; if (fSelect) { if (pCicIC) - pCicIC->m_dw2[1] &= ~1; + pCicIC->m_dwUnknown6[1] &= ~1; if (imcLock.get().fOpen) OnSetOpenStatus(pTLS, pThreadMgr, imcLock, pCicIC); } @@ -1924,7 +1968,7 @@ CicBridge::SelectEx( ITfContext *pContext = GetInputContext(imeContext); pThreadMgr->RequestPostponedLock(pContext); if (pCicIC) - pCicIC->m_dw2[11] &= ~1; + pCicIC->m_bSelecting = FALSE; if (pContext) pContext->Release(); } @@ -1932,6 +1976,10 @@ CicBridge::SelectEx( return imeContext.m_hr; } +/** + * Used in CicBridge::EnumCreateInputContextCallback and + * CicBridge::EnumDestroyInputContextCallback. + */ typedef struct ENUM_CREATE_DESTROY_IC { TLS *m_pTLS; @@ -1939,6 +1987,7 @@ typedef struct ENUM_CREATE_DESTROY_IC } ENUM_CREATE_DESTROY_IC, *PENUM_CREATE_DESTROY_IC; /** + * Creates input context for the current thread. * @implemented */ BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam) @@ -1949,6 +1998,7 @@ BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam } /** + * Destroys input context for the current thread. * @implemented */ BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam) @@ -1961,7 +2011,10 @@ BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lPara /** * @implemented */ -HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) +HRESULT +CicBridge::ActivateIMMX( + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr) { HRESULT hr = pThreadMgr->ActivateEx(&m_cliendId, 1); if (hr != S_OK) @@ -2006,7 +2059,7 @@ HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) pThreadMgr->SetSysHookSink(this); hr = S_OK; - if (pTLS->m_dwUnknown2[1] & 1) + if (pTLS->m_bDestroyed) { ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; ImmEnumInputContext(0, CicBridge::EnumCreateInputContextCallback, (LPARAM)&Data); @@ -2023,7 +2076,10 @@ Finish: /** * @implemented */ -HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) +HRESULT +CicBridge::DeactivateIMMX( + _Inout_ TLS *pTLS, + _Inout_ ITfThreadMgr_P *pThreadMgr) { if (m_bDeactivating) return TRUE; @@ -2034,7 +2090,7 @@ HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) { ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; ImmEnumInputContext(0, CicBridge::EnumDestroyInputContextCallback, (LPARAM)&Data); - pTLS->m_dwUnknown2[1] |= 1; + pTLS->m_bDestroyed = TRUE; ITfSourceSingle *pSource = NULL; if (pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) @@ -2068,9 +2124,10 @@ HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr_P *pThreadMgr) /** * @implemented */ -HRESULT CicBridge::InitIMMX(TLS *pTLS) +HRESULT +CicBridge::InitIMMX(_Inout_ TLS *pTLS) { - if (m_dwImmxInit & 1) + if (m_bImmxInited) return S_OK; HRESULT hr = S_OK; @@ -2130,14 +2187,14 @@ HRESULT CicBridge::InitIMMX(TLS *pTLS) return E_FAIL; } - m_dwImmxInit |= 1; + m_bImmxInited = TRUE; return S_OK; } /** * @implemented */ -BOOL CicBridge::UnInitIMMX(TLS *pTLS) +BOOL CicBridge::UnInitIMMX(_Inout_ TLS *pTLS) { UninitDisplayAttrbuteLib(&m_LibThread); TFUninitLib_Thread(&m_LibThread); @@ -2167,7 +2224,7 @@ BOOL CicBridge::UnInitIMMX(TLS *pTLS) pTLS->m_pThreadMgr = NULL; } - m_dwImmxInit &= ~1; + m_bImmxInited = FALSE; return TRUE; } @@ -2198,7 +2255,11 @@ STDMETHODIMP CicBridge::OnSysShellProc(INT, UINT, LONG) /** * @implemented */ -void CicBridge::PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs) +void +CicBridge::PostTransMsg( + _In_ HWND hWnd, + _In_ INT cTransMsgs, + _In_ const TRANSMSG *pTransMsgs) { for (INT i = 0; i < cTransMsgs; ++i, ++pTransMsgs) { @@ -2211,10 +2272,10 @@ void CicBridge::PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs) */ HRESULT CicBridge::ConfigureGeneral( - TLS* pTLS, - ITfThreadMgr *pThreadMgr, - HKL hKL, - HWND hWnd) + _Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd) { CicProfile *pProfile = pTLS->m_pProfile; if (!pProfile) @@ -2250,11 +2311,11 @@ CicBridge::ConfigureGeneral( */ HRESULT CicBridge::ConfigureRegisterWord( - TLS* pTLS, - ITfThreadMgr *pThreadMgr, - HKL hKL, - HWND hWnd, - LPVOID lpData) + _Inout_ TLS* pTLS, + _In_ ITfThreadMgr *pThreadMgr, + _In_ HKL hKL, + _In_ HWND hWnd, + _Inout_opt_ LPVOID lpData) { CicProfile *pProfile = pTLS->m_pProfile; if (!pProfile) @@ -2311,9 +2372,9 @@ CicBridge::ConfigureRegisterWord( */ HRESULT CicProfile::GetActiveLanguageProfile( - HKL hKL, - REFGUID rguid, - TF_LANGUAGEPROFILE *pProfile) + _In_ HKL hKL, + _In_ REFGUID rguid, + _Out_ TF_LANGUAGEPROFILE *pProfile) { return E_NOTIMPL; } @@ -2916,7 +2977,9 @@ CtfImeIsIME( return FALSE; } -/** +/*********************************************************************** + * CtfImeThreadDetach (MSCTFIME.@) + * * @implemented */ EXTERN_C HRESULT WINAPI diff --git a/sdk/include/reactos/cicero/cicimc.h b/sdk/include/reactos/cicero/cicimc.h index dcef56ef687..4f0e6c73e0a 100644 --- a/sdk/include/reactos/cicero/cicimc.h +++ b/sdk/include/reactos/cicero/cicimc.h @@ -184,22 +184,24 @@ protected: } }; +#define CUSTOM_CAND_INFO_SIZE 1964 + inline BOOL CicIMCLock::ClearCand() { HIMCC hNewCandInfo, hCandInfo = m_pIC->hCandInfo; if (hCandInfo) { - hNewCandInfo = ImmReSizeIMCC(hCandInfo, 1964); + hNewCandInfo = ImmReSizeIMCC(hCandInfo, CUSTOM_CAND_INFO_SIZE); if (!hNewCandInfo) { ImmDestroyIMCC(m_pIC->hCandInfo); - m_pIC->hCandInfo = ImmCreateIMCC(1964); + m_pIC->hCandInfo = ImmCreateIMCC(CUSTOM_CAND_INFO_SIZE); return FALSE; } } else { - hNewCandInfo = ImmCreateIMCC(1964u); + hNewCandInfo = ImmCreateIMCC(CUSTOM_CAND_INFO_SIZE); } m_pIC->hCandInfo = hNewCandInfo; @@ -210,24 +212,15 @@ inline BOOL CicIMCLock::ClearCand() if (!candInfo) { ImmDestroyIMCC(m_pIC->hCandInfo); - m_pIC->hCandInfo = ImmCreateIMCC(1964); + m_pIC->hCandInfo = ImmCreateIMCC(CUSTOM_CAND_INFO_SIZE); return FALSE; } - candInfo.get().dwSize = 1964; + candInfo.get().dwSize = CUSTOM_CAND_INFO_SIZE; candInfo.get().dwCount = 0; candInfo.get().dwOffset[0] = sizeof(CANDIDATEINFO); - LPBYTE pb = (LPBYTE)(&candInfo.get()); - pb += sizeof(CANDIDATEINFO); - - LPDWORD pdwUnknown = (LPDWORD)pb; - pdwUnknown[0] = candInfo.get().dwSize - sizeof(CANDIDATEINFO); // +0x0 - pdwUnknown[2] = 0; // +0x08 - pdwUnknown[3] = 0; // +0x0c - pdwUnknown[4] = 0; // +0x10 - pdwUnknown[1] = 1; // +0x04 - pdwUnknown[5] = 9; // +0x14 - pdwUnknown[6] = 1048; // +0x18 + // FIXME: Something is trailing after CANDIDATEINFO... + return TRUE; }

1 0

[reactos] 01/01: [COMCTL32][USER32] RadioButton: Notify BN_CLICKED on WM_SETFOCUS (#6266)
by Katayama Hirofumi MZ 01 Jan '24

01 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6c70f08642cfc414009d… commit d6c70f08642cfc414009d6968d8c722c9b172a8c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 1 11:01:59 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 1 11:01:59 2024 +0900 [COMCTL32][USER32] RadioButton: Notify BN_CLICKED on WM_SETFOCUS (#6266) Based on KRosUser's button_fixnotif.patch. JIRA issue: CORE-6542, CORE-19384 Notify BN_CLICKED to the parent on WM_SETFOCUS message handling if the button type was either BS_RADIOBUTTON or BS_AUTORADIOBUTTON, and if the button was unchecked. --- dll/win32/comctl32/button.c | 7 +++++++ win32ss/user/user32/controls/button.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index d187ca4f1f2..9002697d60c 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1043,6 +1043,13 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L paint_button( infoPtr, btn_type, ODA_FOCUS ); if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); +#ifdef __REACTOS__ + if (((btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON)) && + !(infoPtr->state & BST_CHECKED)) + { + BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); + } +#endif break; case WM_KILLFOCUS: diff --git a/win32ss/user/user32/controls/button.c b/win32ss/user/user32/controls/button.c index 7f220ed450a..95d98e4e9d7 100644 --- a/win32ss/user/user32/controls/button.c +++ b/win32ss/user/user32/controls/button.c @@ -532,6 +532,13 @@ LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, paint_button( hWnd, btn_type, ODA_FOCUS ); if (style & BS_NOTIFY) BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); +#ifdef __REACTOS__ + if (((btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON)) && + !(get_button_state(hWnd) & BST_CHECKED)) + { + BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); + } +#endif break; case WM_KILLFOCUS:

1 0

[reactos] 01/01: [RAPPS] Don't ask for 'remote from registry' when no selection (#6267)
by Katayama Hirofumi MZ 01 Jan '24

01 Jan '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a842a92260f16e4b296e3… commit a842a92260f16e4b296e3c569ac43603408edb8f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 1 10:12:51 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 1 10:12:51 2024 +0900 [RAPPS] Don't ask for 'remote from registry' when no selection (#6267) Based on KRosUser's RAPPS.patch. JIRA issue: CORE-19409 If m_ApplicationView->GetFocusedItemData was NULL, then do not ask for removal. --- base/applications/rapps/gui.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 0c81f789bd1..3283c71ef79 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -270,14 +270,12 @@ CMainWindow::RemoveSelectedAppFromRegistry() if (!szMsgText.LoadStringW(IDS_APP_REG_REMOVE) || !szMsgTitle.LoadStringW(IDS_INFORMATION)) return FALSE; - if (MessageBoxW(szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) - { - CAppInfo *InstalledApp = (CAppInfo *)m_ApplicationView->GetFocusedItemData(); - if (!InstalledApp) - return FALSE; + CAppInfo *InstalledApp = (CAppInfo *)m_ApplicationView->GetFocusedItemData(); + if (!InstalledApp) + return FALSE; + if (MessageBoxW(szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) return m_Db->RemoveInstalledAppFromRegistry(InstalledApp); - } return FALSE; }

1 0

[reactos] 01/01: 🎊 🍾 🥳 Happy New Year 2024 to the ReactOS Community! 🎆 ⚛️ ☢️
by Hermès Bélusca-Maïto 31 Dec '23

31 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a70ce994f0e8a95a20e3e… commit a70ce994f0e8a95a20e3e8d81a3d9bdc61e85719 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 1 00:00:00 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jan 1 00:00:00 2024 +0100 🎊 🍾 🥳 Happy New Year 2024 to the ReactOS Community! 🎆 ⚛️ ☢️ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:.██████╗ ██████╗ ██████╗ ██╗ ██╗ __, ,__) __, ,__) __, ,__) ╚════██╗██╔═████╗╚════██╗██║ ██║ (--|__| _ ,_ ,_ (--|\ | _ (--\ | _ _ ,_ █████╔╝██║██╔██║ █████╔╝███████║ _| |(_||_)|_)(_| _| \|(/_(_|_) \|(/_(_|| ██╔═══╝ ████╔╝██║██╔═══╝ ╚════██║ ( | | ,_| ( (__| ███████╗╚██████╔╝███████╗ ██║ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:.╚══════╝ ╚═════╝ ╚══════╝ ╚═╝ --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/svg/reactos.svg | 2 +- dll/win32/msgina/resources/svg/rosbanner.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/shell32/res/bitmaps/reactosserver.bmp | Bin 89334 -> 89334 bytes .../shell32/res/bitmaps/reactosworkstation.bmp | Bin 89334 -> 89334 bytes dll/win32/syssetup/resources/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 1842 -> 1840 bytes sdk/include/reactos/version.cmake | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index cb134223193..7eb8a6b3d9e 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/svg/reactos.svg b/dll/win32/msgina/resources/svg/reactos.svg index 2bbb5a0cc3d..3daa8299cd4 100644 --- a/dll/win32/msgina/resources/svg/reactos.svg +++ b/dll/win32/msgina/resources/svg/reactos.svg @@ -1928,7 +1928,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2023 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2024 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg index 9def54fcc05..9b410f5ef61 100644 --- a/dll/win32/msgina/resources/svg/rosbanner.svg +++ b/dll/win32/msgina/resources/svg/rosbanner.svg @@ -1727,7 +1727,7 @@ id="tspan196" x="48.681915" y="18.210854" - style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2023 ReactOS Team & Contributors</tspan></text> + style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2024 ReactOS Team & Contributors</tspan></text> </g> <g inkscape:groupmode="layer" diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index cb134223193..7eb8a6b3d9e 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp index 221b71642bc..ac446d9957e 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosserver.bmp and b/dll/win32/shell32/res/bitmaps/reactosserver.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp index c77cd5a89d6..5fde0f3e778 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp and b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp differ diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp index cb134223193..7eb8a6b3d9e 100644 Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index 67600a6c671..8ed8975abfc 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 4de44d13db4..a133fe8c524 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "15") -set(COPYRIGHT_YEAR "2023") +set(COPYRIGHT_YEAR "2024") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [ADVAPI32][IDL][SERVICES] Implement I_ScValidatePnPService
by Eric Kohl 31 Dec '23

31 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5346cbc1b0c08559b77d… commit f5346cbc1b0c08559b77ded0ef76a27a484c20fa Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 31 15:33:19 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 31 15:33:19 2023 +0100 [ADVAPI32][IDL][SERVICES] Implement I_ScValidatePnPService This is actually a Vista+ function, but we need it enable umpnpmgr.dll to notify services of device events. Up until WinXP it was possible to make direct calls to the service manager by umpnpmgr.dll because umpnpmgr.dll was loaded into the service manager process. From Vista onwards umpnpmgr.dll is run as a separate service host process. And since ReactOS always ran umpnpmgr.dll as a separate process, we have to use the Vista RPC functions to notify services. --- base/system/services/rpcserver.c | 41 ++++++++++++++++++++++++++---- dll/win32/advapi32/advapi32.spec | 1 + dll/win32/advapi32/service/scm.c | 52 ++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/idl/svcctl.idl | 6 +++-- 4 files changed, 93 insertions(+), 7 deletions(-) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index cad1f3b0487..c84b67e6b24 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -4,7 +4,7 @@ * FILE: base/system/services/rpcserver.c * PURPOSE: RPC server interface for the advapi32 calls * COPYRIGHT: Copyright 2005-2006 Eric Kohl - * Copyright 2006-2007 Herv� Poussineau <hpoussin(a)reactos.org> + * Copyright 2006-2007 Hervé Poussineau <hpoussin(a)reactos.org> * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> */ @@ -6711,11 +6711,42 @@ RSendPnPMessage( /* Function 53 */ DWORD WINAPI -RValidatePnPService( - handle_t BindingHandle) /* FIXME */ +RI_ScValidatePnPService( + _In_ SC_RPC_HANDLE hSCManager, + _In_ LPWSTR pszServiceName, + _Out_ RPC_SERVICE_STATUS_HANDLE *phServiceStatus) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PMANAGER_HANDLE hManager; + PSERVICE pService; + + DPRINT("RI_ScValidatePnPService(%p %S %p)\n", hSCManager, pszServiceName, phServiceStatus); + + /* Validate handle */ + hManager = ScmGetServiceManagerFromHandle(hSCManager); + if (hManager == NULL) + { + DPRINT1("Invalid handle!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: should check whether client is local */ + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_CONNECT)) + { + DPRINT1("No SC_MANAGER_CONNECT access!\n"); + return ERROR_ACCESS_DENIED; + } + + pService = ScmGetServiceEntryByName(pszServiceName); + DPRINT("pService: %p\n", pService); + if (pService == NULL) + return ERROR_SERVICE_DOES_NOT_EXIST; + + *phServiceStatus = (RPC_SERVICE_STATUS_HANDLE)pService; + + return ERROR_SUCCESS; } diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 3a02c1362ab..e158d6a5c48 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -306,6 +306,7 @@ @ stub I_ScSendTSMessage @ stdcall I_ScSetServiceBitsA(ptr long long long str) @ stdcall I_ScSetServiceBitsW(ptr long long long wstr) +@ stdcall I_ScValidatePnpService(wstr wstr ptr) @ stub IdentifyCodeAuthzLevelW @ stdcall ImpersonateAnonymousToken(ptr) @ stdcall ImpersonateLoggedOnUser(long) diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index 621e5753247..aee23c5750d 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -1897,6 +1897,58 @@ I_ScGetCurrentGroupStateW(SC_HANDLE hSCManager, } +/********************************************************************** + * I_ScValidatePnpService + * + * Undocumented + * + * @implemented + */ +DWORD +WINAPI +I_ScValidatePnpService( + _In_ LPCWSTR pszMachineName, + _In_ LPCWSTR pszServiceName, + _Out_ SERVICE_STATUS_HANDLE *phServiceStatus) +{ + SC_RPC_HANDLE hSCManager = NULL; + SERVICE_STATUS_HANDLE hServiceStatus = NULL; + DWORD dwError; + + TRACE("I_ScValidatePnpService(%S %S %p)\n", + pszMachineName, pszServiceName, phServiceStatus); + + hSCManager = OpenSCManagerW(pszMachineName, + SERVICES_ACTIVE_DATABASEW, + SC_MANAGER_CONNECT); + if (hSCManager == NULL) + { + dwError = GetLastError(); + goto done; + } + + RpcTryExcept + { + dwError = RI_ScValidatePnPService(hSCManager, + (LPWSTR)pszServiceName, + (RPC_SERVICE_STATUS_HANDLE *)&hServiceStatus); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept + + *phServiceStatus = hServiceStatus; + +done: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + + return dwError; +} + + /********************************************************************** * LockServiceDatabase * diff --git a/sdk/include/reactos/idl/svcctl.idl b/sdk/include/reactos/idl/svcctl.idl index fccb3712896..c55eddf2aea 100644 --- a/sdk/include/reactos/idl/svcctl.idl +++ b/sdk/include/reactos/idl/svcctl.idl @@ -882,8 +882,10 @@ interface svcctl /* Function 53 */ DWORD __stdcall - RValidatePnPService( - [in] handle_t BindingHandle); /* FIXME */ + RI_ScValidatePnPService( + [in] SC_RPC_HANDLE hService, + [in, string] LPWSTR pszServiceName, + [out] RPC_SERVICE_STATUS_HANDLE *phServiceStatus); /* Function 54 */ DWORD

1 0

[reactos] 01/01: [HAL] Fix SMP initialization
by Timo Kreuzer 30 Dec '23

30 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10bb50b45673f5e7d9318… commit 10bb50b45673f5e7d9318cf40eda4cef5b9f2fbf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Nov 23 22:20:51 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 30 12:53:18 2023 +0200 [HAL] Fix SMP initialization - Don't use CONFIG_SMP, this isn't handled in (most of) hal - Add a dummy HalpSetupProcessorsTable for UP - Call HalpRegisterKdSupportFunctions only for processor 0 --- hal/halx86/apic/halinit.c | 4 ---- hal/halx86/generic/halinit.c | 7 +++++-- hal/halx86/generic/up.c | 7 +++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hal/halx86/apic/halinit.c b/hal/halx86/apic/halinit.c index 907f0cfd28f..7658f3d5074 100644 --- a/hal/halx86/apic/halinit.c +++ b/hal/halx86/apic/halinit.c @@ -25,16 +25,12 @@ HalpInitProcessor( IN ULONG ProcessorNumber, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { -#ifdef CONFIG_SMP if (ProcessorNumber == 0) { -#endif HalpParseApicTables(LoaderBlock); -#ifdef CONFIG_SMP } HalpSetupProcessorsTable(ProcessorNumber); -#endif /* Initialize the local APIC for this cpu */ ApicInitializeLocalApic(ProcessorNumber); diff --git a/hal/halx86/generic/halinit.c b/hal/halx86/generic/halinit.c index 70822fd5cc5..be32ed7644d 100644 --- a/hal/halx86/generic/halinit.c +++ b/hal/halx86/generic/halinit.c @@ -57,8 +57,11 @@ HalInitializeProcessor( InterlockedBitTestAndSetAffinity(&HalpActiveProcessors, ProcessorNumber); InterlockedBitTestAndSetAffinity(&HalpDefaultInterruptAffinity, ProcessorNumber); - /* Register routines for KDCOM */ - HalpRegisterKdSupportFunctions(); + if (ProcessorNumber == 0) + { + /* Register routines for KDCOM */ + HalpRegisterKdSupportFunctions(); + } } /* diff --git a/hal/halx86/generic/up.c b/hal/halx86/generic/up.c index 377c7e1aaf5..9e42e6f786b 100644 --- a/hal/halx86/generic/up.c +++ b/hal/halx86/generic/up.c @@ -33,6 +33,13 @@ HalStartNextProcessor( return FALSE; } +VOID +HalpSetupProcessorsTable( + _In_ UINT32 NTProcessorNumber) +{ + NOTHING; +} + #ifdef _M_AMD64 VOID

1 0

[reactos] 01/01: [CRT] Sync $I10_OUTPUT and test with wine head
by Timo Kreuzer 30 Dec '23

30 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86b82e4ce7fa684d8bd71… commit 86b82e4ce7fa684d8bd715517d77289a60da47e4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 20 12:06:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Dec 30 12:51:22 2023 +0200 [CRT] Sync $I10_OUTPUT and test with wine head Both were broken on MSVC builds, where a long double is 64 bits and not 80 bits like on GCC. The new code works on MSVC builds, too. --- dll/win32/msvcrt/msvcrt.spec | 4 +- dll/win32/msvcrt20/msvcrt20.spec | 2 +- dll/win32/msvcrt40/msvcrt40.spec | 2 +- modules/rostests/winetests/msvcrt/misc.c | 92 +++++++-------- sdk/lib/crt/misc/i10output.c | 185 ++++++++++++++++++++++++++----- 5 files changed, 206 insertions(+), 79 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 76e7d0b37f3..52437e101fb 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -1,6 +1,6 @@ # msvcrt.dll - MS VC++ Run Time Library -@ cdecl -arch=x86_64 -version=0x502 $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl -arch=x86_64 -version=0x502 $I10_OUTPUT() I10_OUTPUT # **************** x86 C++ functions **************** @ cdecl -arch=i386 -norelay ??0__non_rtti_object@@QAE@ABV0@@Z(ptr) MSVCRT___non_rtti_object_copy_ctor # public: __thiscall __non_rtti_object::__non_rtti_object(class __non_rtti_object const &) @@ -180,7 +180,7 @@ # **************** Common functions **************** -@ cdecl -arch=i386 $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl -arch=i386 $I10_OUTPUT() I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() diff --git a/dll/win32/msvcrt20/msvcrt20.spec b/dll/win32/msvcrt20/msvcrt20.spec index fc5f542ce1a..8ace935a4db 100644 --- a/dll/win32/msvcrt20/msvcrt20.spec +++ b/dll/win32/msvcrt20/msvcrt20.spec @@ -438,7 +438,7 @@ @ stub ?xalloc@ios@@SAHXZ # @ stub ?xsgetn@streambuf@@UAEHPADH@Z # @ stub ?xsputn@streambuf@@UAEHPBDH@Z # -@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl $I10_OUTPUT() I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() diff --git a/dll/win32/msvcrt40/msvcrt40.spec b/dll/win32/msvcrt40/msvcrt40.spec index d1efd557b46..f60e59b6098 100644 --- a/dll/win32/msvcrt40/msvcrt40.spec +++ b/dll/win32/msvcrt40/msvcrt40.spec @@ -482,7 +482,7 @@ @ stub ?xalloc@ios@@SAHXZ @ stub ?xsgetn@streambuf@@UAEHPADH@Z @ stub ?xsputn@streambuf@@UAEHPBDH@Z -@ cdecl $I10_OUTPUT() MSVCRT_I10_OUTPUT +@ cdecl $I10_OUTPUT() I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() diff --git a/modules/rostests/winetests/msvcrt/misc.c b/modules/rostests/winetests/msvcrt/misc.c index 4a0330a2e2c..d82f71e122e 100644 --- a/modules/rostests/winetests/msvcrt/misc.c +++ b/modules/rostests/winetests/msvcrt/misc.c @@ -51,8 +51,11 @@ static inline BOOL almost_equal(double d1, double d2) { return FALSE; } +/* MS' "long double" is an 80 bit FP that takes 12 bytes*/ +struct uld { ULONG lo, hi, exp; }; + static int (__cdecl *prand_s)(unsigned int *); -static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); +static int (__cdecl *pI10_OUTPUT)(struct uld, int, int, void*); static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int); static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); @@ -115,7 +118,7 @@ typedef struct _I10_OUTPUT_data { } I10_OUTPUT_data; typedef struct _I10_OUTPUT_test { - long double d; + struct uld d; int size; int flags; @@ -126,63 +129,62 @@ typedef struct _I10_OUTPUT_test { static const I10_OUTPUT_test I10_OUTPUT_tests[] = { /* arg3 = 0 */ - { 0.0, 10, 0, {0, ' ', 1, "0"}, 1, "" }, - { 1.0, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" }, - { -1.0, 10, 0, {1, '-', 1, "1"}, 1, "000000009" }, - { 1.23, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" }, - { 1e13, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" }, - { 1e30, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" }, - { 1e-13, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" }, - { 0.25, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" }, - { 1.0000001, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" }, + { { 0x00000000, 0x00000000, 0x0000 /* 0.0 */ }, 10, 0, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0x80000000, 0x3fff /* 1.0 */ }, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" }, + { { 0x00000000, 0x80000000, 0xbfff /* -1.0 */ }, 10, 0, {1, '-', 1, "1"}, 1, "000000009" }, + { { 0x0a3d7000, 0x9d70a3d7, 0x3fff /* 1.23 */ }, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" }, + { { 0x00000000, 0x9184e72a, 0x402a /* 1e13 */ }, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" }, + { { 0x04675000, 0xc9f2c9cd, 0x4062 /* 1e30 */ }, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" }, + { { 0x4bb41000, 0xe12e1342, 0x3fd3 /* 1e-13 */ }, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" }, + { { 0x00000000, 0x80000000, 0x3ffd /* 0.25 */ }, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" }, + { { 0xbf94d800, 0x800000d6, 0x3fff /* 1.0000001 */ }, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" }, + { { 0x00000000, 0x80000000, 0x7fff /* +inf */ }, 10, 0, {1, ' ', 5, "1#INF"}, 0, "" }, + { { 0x00000000, 0x80000000, 0xffff /* -inf */ }, 10, 0, {1, '-', 5, "1#INF"}, 0, "" }, + { { 0x00000001, 0x80000000, 0x7fff /* snan */ }, 10, 0, {1, ' ', 6, "1#SNAN"}, 0, "" }, + { { 0x00000001, 0x80000000, 0xffff /* snan */ }, 10, 0, {1, '-', 6, "1#SNAN"}, 0, "" }, + { { 0x00000000, 0xc0000000, 0x7fff /* qnan */ }, 10, 0, {1, ' ', 6, "1#QNAN"}, 0, "" }, + { { 0x00000000, 0x40000000, 0xffff /* qnan */ }, 10, 0, {1, '-', 6, "1#QNAN"}, 0, "" }, /* arg3 = 1 */ - { 0.0, 10, 1, {0, ' ', 1, "0"}, 1, "" }, - { 1.0, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" }, - { -1.0, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" }, - { 1.23, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" }, - { 1e13, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" }, - { 1e30, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" }, - { 1e-13, 10, 1, {0, ' ', 1, "0"}, 1, "" }, - { 1e-7, 10, 1, {-6, ' ', 1, "1"}, 1, "09" }, - { 0.25, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" }, - { 1.0000001, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" }, + { { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 10, 1, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0x80000000, 0x3fff /* 1 */ }, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" }, + { { 0x00000000, 0x80000000, 0xbfff /* -1 */ }, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" }, + { { 0x0a3d7000, 0x9d70a3d7, 0x3fff /* 1.23 */ }, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" }, + { { 0x00000000, 0x9184e72a, 0x402a /* 1e13 */ }, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" }, + { { 0x04675000, 0xc9f2c9cd, 0x4062 /* 1e30 */ }, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" }, + { { 0x4bb41000, 0xe12e1342, 0x3fd3 /* 1e-13 */ }, 10, 1, {0, ' ', 1, "0"}, 1, "" }, + { { 0xe57a4000, 0xd6bf94d5, 0x3fe7 /* 1e-7 */ }, 10, 1, {-6, ' ', 1, "1"}, 1, "09" }, + { { 0x00000000, 0x80000000, 0x3ffd /* 0.25 */ }, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" }, + { { 0xbf94d800, 0x800000d6, 0x3fff /* 1.0000001 */ }, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" }, + { { 0x00000000, 0x80000000, 0x7fff /* +inf */ }, 10, 1, {1, ' ', 5, "1#INF"}, 0, "" }, + { { 0x00000000, 0x80000000, 0xffff /* -inf */ }, 10, 1, {1, '-', 5, "1#INF"}, 0, "" }, + { { 0x00000001, 0x80000000, 0x7fff /* snan */ }, 10, 1, {1, ' ', 6, "1#SNAN"}, 0, "" }, + { { 0x00000000, 0xc0000000, 0x7fff /* qnan */ }, 10, 1, {1, ' ', 6, "1#QNAN"}, 0, "" }, + { { 0x00000000, 0x40000000, 0x7fff /* qnan */ }, 10, 1, {1, ' ', 6, "1#QNAN"}, 0, "" }, /* too small buffer */ - { 0.0, 0, 0, {0, ' ', 1, "0"}, 1, "" }, - { 0.0, 0, 1, {0, ' ', 1, "0"}, 1, "" }, - { 123.0, 2, 0, {3, ' ', 2, "12"}, 1, "" }, - { 123.0, 0, 0, {0, ' ', 1, "0"}, 1, "" }, - { 123.0, 2, 1, {3, ' ', 3, "123"}, 1, "09" }, - { 0.99, 1, 0, {1, ' ', 1, "1"}, 1, "" }, - { 1264567.0, 2, 0, {7, ' ', 2, "13"}, 1, "" }, - { 1264567.0, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" }, - { 1234567891.0, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" } + { { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 0, 0, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 0, 1, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 2, 0, {3, ' ', 2, "12"}, 1, "" }, + { { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 0, 0, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 2, 1, {3, ' ', 3, "123"}, 1, "09" }, + { { 0x0a3d7000, 0xfd70a3d7, 0x3ffe /* 0.99 */ }, 1, 0, {1, ' ', 1, "1"}, 1, "" }, + { { 0x00000000, 0x9a5db800, 0x4013 /* 1264567.0 */ }, 2, 0, {7, ' ', 2, "13"}, 1, "" }, + { { 0x00000000, 0x9a5db800, 0x4013 /* 1264567.0 */ }, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" }, + { { 0x00000000, 0x932c05a6, 0x401d /* 1234567891.0 */ }, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" } }; static void test_I10_OUTPUT(void) { I10_OUTPUT_data out; - int i, j = sizeof(long double), ret; + int i, j, ret; if(!pI10_OUTPUT) { win_skip("I10_OUTPUT not available\n"); return; } - if (j != 12) - trace("sizeof(long double) = %d on this machine\n", j); for(i=0; i<ARRAY_SIZE(I10_OUTPUT_tests); i++) { memset(out.str, '#', sizeof(out.str)); - - if (sizeof(long double) == 12) - ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); - else { - /* MS' "long double" is an 80 bit FP that takes 12 bytes*/ - typedef struct { ULONG x80[3]; } uld; /* same calling convention */ - union { long double ld; uld ld12; } fp80; - int (__cdecl *pI10_OUTPUT12)(uld, int, int, void*) = (void*)pI10_OUTPUT; - fp80.ld = I10_OUTPUT_tests[i].d; - ret = pI10_OUTPUT12(fp80.ld12, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); - } + ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); ok(ret == I10_OUTPUT_tests[i].ret, "%d: ret = %d\n", i, ret); ok(out.pos == I10_OUTPUT_tests[i].out.pos, "%d: out.pos = %hd\n", i, out.pos); ok(out.sign == I10_OUTPUT_tests[i].out.sign, "%d: out.size = %c\n", i, out.sign); @@ -192,7 +194,7 @@ static void test_I10_OUTPUT(void) j = strlen(I10_OUTPUT_tests[i].remain); todo_wine_if(j && I10_OUTPUT_tests[i].remain[j-1]=='9') ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j), - "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); + "%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1); for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++) if(out.str[j] != '#') diff --git a/sdk/lib/crt/misc/i10output.c b/sdk/lib/crt/misc/i10output.c index 85e493594e0..72aeb0363a0 100644 --- a/sdk/lib/crt/misc/i10output.c +++ b/sdk/lib/crt/misc/i10output.c @@ -1,5 +1,140 @@ #include <precomp.h> +// From Wine msvcrt.h +typedef struct {ULONG x80[3];} MSVCRT__LDOUBLE; /* Intel 80 bit FP format has sizeof() 12 */ +enum fpmod { + FP_ROUND_ZERO, /* only used when dropped part contains only zeros */ + FP_ROUND_DOWN, + FP_ROUND_EVEN, + FP_ROUND_UP, + FP_VAL_INFINITY, + FP_VAL_NAN +}; +struct fpnum { + int sign; + int exp; + ULONGLONG m; + enum fpmod mod; +}; + +// From wine bnum.h +#define EXP_BITS 11 +#define MANT_BITS 53 + +int fpnum_double(struct fpnum *fp, double *d) +{ + ULONGLONG bits = 0; + + if (fp->mod == FP_VAL_INFINITY) + { + *d = fp->sign * INFINITY; + return 0; + } + + if (fp->mod == FP_VAL_NAN) + { + bits = ~0; + if (fp->sign == 1) + bits &= ~((ULONGLONG)1 << (MANT_BITS + EXP_BITS - 1)); + *d = *(double*)&bits; + return 0; + } + + TRACE("%c %#I64x *2^%d (round %d)\n", fp->sign == -1 ? '-' : '+', + fp->m, fp->exp, fp->mod); + if (!fp->m) + { + *d = fp->sign * 0.0; + return 0; + } + + /* make sure that we don't overflow modifying exponent */ + if (fp->exp > 1<<EXP_BITS) + { + *d = fp->sign * INFINITY; + return ERANGE; + } + if (fp->exp < -(1<<EXP_BITS)) + { + *d = fp->sign * 0.0; + return ERANGE; + } + fp->exp += MANT_BITS - 1; + + /* normalize mantissa */ + while(fp->m < (ULONGLONG)1 << (MANT_BITS-1)) + { + fp->m <<= 1; + fp->exp--; + } + while(fp->m >= (ULONGLONG)1 << MANT_BITS) + { + if (fp->m & 1 || fp->mod != FP_ROUND_ZERO) + { + if (!(fp->m & 1)) fp->mod = FP_ROUND_DOWN; + else if(fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else fp->mod = FP_ROUND_UP; + } + fp->m >>= 1; + fp->exp++; + } + fp->exp += (1 << (EXP_BITS-1)) - 1; + + /* handle subnormals */ + if (fp->exp <= 0) + { + if (fp->m & 1 && fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else if (fp->m & 1) fp->mod = FP_ROUND_UP; + else if (fp->mod != FP_ROUND_ZERO) fp->mod = FP_ROUND_DOWN; + fp->m >>= 1; + } + while(fp->m && fp->exp<0) + { + if (fp->m & 1 && fp->mod == FP_ROUND_ZERO) fp->mod = FP_ROUND_EVEN; + else if (fp->m & 1) fp->mod = FP_ROUND_UP; + else if (fp->mod != FP_ROUND_ZERO) fp->mod = FP_ROUND_DOWN; + fp->m >>= 1; + fp->exp++; + } + + /* round mantissa */ + if (fp->mod == FP_ROUND_UP || (fp->mod == FP_ROUND_EVEN && fp->m & 1)) + { + fp->m++; + + /* handle subnormal that falls into regular range due to rounding */ + if (fp->m == (ULONGLONG)1 << (MANT_BITS - 1)) + { + fp->exp++; + } + else if (fp->m >= (ULONGLONG)1 << MANT_BITS) + { + fp->exp++; + fp->m >>= 1; + } + } + + if (fp->exp >= (1<<EXP_BITS)-1) + { + *d = fp->sign * INFINITY; + return ERANGE; + } + if (!fp->m || fp->exp < 0) + { + *d = fp->sign * 0.0; + return ERANGE; + } + + if (fp->sign == -1) + bits |= (ULONGLONG)1 << (MANT_BITS + EXP_BITS - 1); + bits |= (ULONGLONG)fp->exp << (MANT_BITS - 1); + bits |= fp->m & (((ULONGLONG)1 << (MANT_BITS - 1)) - 1); + + TRACE("returning %#I64x\n", bits); + *d = *(double*)&bits; + return 0; +} + #define I10_OUTPUT_MAX_PREC 21 /* Internal structure used by $I10_OUTPUT */ struct _I10_OUTPUT_DATA { @@ -24,22 +159,31 @@ struct _I10_OUTPUT_DATA { * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(_LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { - static const char inf_str[] = "1#INF"; - static const char nan_str[] = "1#QNAN"; - - /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. - * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. - * Assume long double uses 80 bit FP, never seen 128 bit FP. */ - long double ld = 0; + struct fpnum num; double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; - memcpy(&ld, &ld80, 10); - d = ld; + if ((ld80.x80[2] & 0x7fff) == 0x7fff) + { + if (ld80.x80[0] == 0 && ld80.x80[1] == 0x80000000) + strcpy( data->str, "1#INF" ); + else + strcpy( data->str, (ld80.x80[1] & 0x40000000) ? "1#QNAN" : "1#SNAN" ); + data->pos = 1; + data->sign = (ld80.x80[2] & 0x8000) ? '-' : ' '; + data->len = (BYTE)strlen(data->str); + return 0; + } + + num.sign = (ld80.x80[2] & 0x8000) ? -1 : 1; + num.exp = (ld80.x80[2] & 0x7fff) - 0x3fff - 63; + num.m = ld80.x80[0] | ((ULONGLONG)ld80.x80[1] << 32); + num.mod = FP_ROUND_EVEN; + fpnum_double( &num, &d ); TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) { @@ -48,24 +192,8 @@ int CDECL MSVCRT_I10_OUTPUT(_LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU } else data->sign = ' '; - if(!_finite(d)) { - data->pos = 1; - data->len = 5; - memcpy(data->str, inf_str, sizeof(inf_str)); - - return 0; - } - - if(_isnan(d)) { - data->pos = 1; - data->len = 6; - memcpy(data->str, nan_str, sizeof(nan_str)); - - return 0; - } - if(flag&1) { - int exp = 1+floor(log10(d)); + int exp = 1 + floor(log10(d)); prec += exp; if(exp < 0) @@ -100,6 +228,3 @@ int CDECL MSVCRT_I10_OUTPUT(_LDOUBLE ld80, int prec, int flag, struct _I10_OUTPU return 1; } #undef I10_OUTPUT_MAX_PREC - - -

1 0

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