From 3cab5cc7a72ec216d463cfd7735e11b808a221c7 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 17 Dec 2014 19:25:04 +0000 Subject: mTextControl: changed warning lavel to w4 git-svn-id: http://svn.miranda-ng.org/main/trunk@11489 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/mTextControl/mtextcontrol_12.vcxproj | 8 +- plugins/mTextControl/src/FormattedTextDraw.cpp | 76 ++++++------- plugins/mTextControl/src/FormattedTextDraw.h | 36 +++--- plugins/mTextControl/src/ImageDataObjectHlp.cpp | 142 ++++++++++++------------ plugins/mTextControl/src/dataobject.cpp | 44 ++++---- plugins/mTextControl/src/enumformat.cpp | 14 +-- plugins/mTextControl/src/fancy_rtf.cpp | 14 ++- plugins/mTextControl/src/main.cpp | 10 +- plugins/mTextControl/src/richeditutils.cpp | 18 +-- plugins/mTextControl/src/services.cpp | 25 ++--- plugins/mTextControl/src/services.h | 16 +-- plugins/mTextControl/src/textcontrol.cpp | 2 +- plugins/mTextControl/src/version.h | 12 +- 13 files changed, 209 insertions(+), 208 deletions(-) (limited to 'plugins/mTextControl') diff --git a/plugins/mTextControl/mtextcontrol_12.vcxproj b/plugins/mTextControl/mtextcontrol_12.vcxproj index 2237efb4fc..0b0e175120 100644 --- a/plugins/mTextControl/mtextcontrol_12.vcxproj +++ b/plugins/mTextControl/mtextcontrol_12.vcxproj @@ -83,7 +83,7 @@ MultiThreadedDebugDLL Use headers.h - Level3 + Level4 EditAndContinue false @@ -111,7 +111,7 @@ true Use headers.h - Level3 + Level4 Size false @@ -140,7 +140,7 @@ MultiThreadedDebugDLL Use headers.h - Level3 + Level4 false @@ -166,7 +166,7 @@ true Use headers.h - Level3 + Level4 Size false diff --git a/plugins/mTextControl/src/FormattedTextDraw.cpp b/plugins/mTextControl/src/FormattedTextDraw.cpp index e63da72391..41dc7b5e14 100644 --- a/plugins/mTextControl/src/FormattedTextDraw.cpp +++ b/plugins/mTextControl/src/FormattedTextDraw.cpp @@ -8,25 +8,25 @@ const IID IID_ITextServices = { // 8d33f740-cf58-11ce-a89d-00aa006cadc5 - 0x8d33f740, - 0xcf58, - 0x11ce, - {0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5} - }; + 0x8d33f740, + 0xcf58, + 0x11ce, + { 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5 } +}; const IID IID_ITextHost = { // c5bdd8d0-d26e-11ce-a89e-00aa006cadc5 - 0xc5bdd8d0, - 0xd26e, - 0x11ce, - {0xa8, 0x9e, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5} - }; + 0xc5bdd8d0, + 0xd26e, + 0x11ce, + { 0xa8, 0x9e, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5 } +}; -static const IID IID_ITextDocument = { +const IID IID_ITextDocument = { 0x8CC497C0, 0xA1DF, 0x11CE, - {0x80,0x98,0x00,0xAA,0x00,0x47,0xBE,0x5D} - }; + { 0x80, 0x98, 0x00, 0xAA, 0x00, 0x47, 0xBE, 0x5D } +}; ///////////////////////////////////////////////////////////////////////////// // CallBack functions @@ -73,7 +73,7 @@ HRESULT CFormattedTextDraw::putRTFTextA(char *newVal) editStream.pfnCallback = (EDITSTREAMCALLBACK)EditStreamInCallback; LRESULT lResult = 0; - HRESULT hr = m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&editStream, &lResult); + m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_RTF), (LPARAM)&editStream, &lResult); return S_OK; } @@ -93,7 +93,7 @@ HRESULT CFormattedTextDraw::putRTFTextW(WCHAR *newVal) editStream.pfnCallback = (EDITSTREAMCALLBACK)EditStreamInCallback; LRESULT lResult = 0; - HRESULT hr = m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_RTF | SF_UNICODE), (LPARAM)&editStream, &lResult); + m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_RTF | SF_UNICODE), (LPARAM)&editStream, &lResult); return S_OK; } @@ -114,7 +114,7 @@ HRESULT CFormattedTextDraw::putTextA(char *newVal) editStream.pfnCallback = (EDITSTREAMCALLBACK)EditStreamInCallback; LRESULT lResult = 0; - HRESULT hr = m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_TEXT), (LPARAM)&editStream, &lResult); + m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_TEXT), (LPARAM)&editStream, &lResult); CHARFORMAT cf; cf.cbSize = sizeof(cf); @@ -142,7 +142,7 @@ HRESULT CFormattedTextDraw::putTextW(WCHAR *newVal) editStream.pfnCallback = (EDITSTREAMCALLBACK)EditStreamInCallback; LRESULT lResult = 0; - HRESULT hr = m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_TEXT | SF_UNICODE), (LPARAM)&editStream, &lResult); + m_spTextServices->TxSendMessage(EM_STREAMIN, (WPARAM)(SF_TEXT | SF_UNICODE), (LPARAM)&editStream, &lResult); CHARFORMAT cf; cf.cbSize = sizeof(cf); @@ -237,66 +237,66 @@ HDC CFormattedTextDraw::TxGetDC() return NULL; } -INT CFormattedTextDraw::TxReleaseDC(HDC hdc) +INT CFormattedTextDraw::TxReleaseDC(HDC) { return 1; } -BOOL CFormattedTextDraw::TxShowScrollBar(INT fnBar, BOOL fShow) +BOOL CFormattedTextDraw::TxShowScrollBar(INT, BOOL) { return FALSE; } -BOOL CFormattedTextDraw::TxEnableScrollBar(INT fuSBFlags, INT fuArrowflags) +BOOL CFormattedTextDraw::TxEnableScrollBar(INT, INT) { return FALSE; } -BOOL CFormattedTextDraw::TxSetScrollRange(INT fnBar, LONG nMinPos, INT nMaxPos, BOOL fRedraw) +BOOL CFormattedTextDraw::TxSetScrollRange(INT, LONG, INT, BOOL) { return FALSE; } -BOOL CFormattedTextDraw::TxSetScrollPos(INT fnBar, INT nPos, BOOL fRedraw) +BOOL CFormattedTextDraw::TxSetScrollPos(INT, INT, BOOL) { return FALSE; } -void CFormattedTextDraw::TxInvalidateRect(LPCRECT prc, BOOL fMode) +void CFormattedTextDraw::TxInvalidateRect(LPCRECT, BOOL) {} -void CFormattedTextDraw::TxViewChange(BOOL fUpdate) +void CFormattedTextDraw::TxViewChange(BOOL) {} -BOOL CFormattedTextDraw::TxCreateCaret(HBITMAP hbmp, INT xWidth, INT yHeight) +BOOL CFormattedTextDraw::TxCreateCaret(HBITMAP, INT, INT) { return FALSE; } -BOOL CFormattedTextDraw::TxShowCaret(BOOL fShow) +BOOL CFormattedTextDraw::TxShowCaret(BOOL) { return FALSE; } -BOOL CFormattedTextDraw::TxSetCaretPos(INT x, INT y) +BOOL CFormattedTextDraw::TxSetCaretPos(INT, INT) { return FALSE; } -BOOL CFormattedTextDraw::TxSetTimer(UINT idTimer, UINT uTimeout) +BOOL CFormattedTextDraw::TxSetTimer(UINT, UINT) { return FALSE; } -void CFormattedTextDraw::TxKillTimer(UINT idTimer) +void CFormattedTextDraw::TxKillTimer(UINT) { } -void CFormattedTextDraw::TxScrollWindowEx(INT dx, INT dy, LPCRECT lprcScroll, LPCRECT lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate, UINT fuScroll) +void CFormattedTextDraw::TxScrollWindowEx(INT, INT, LPCRECT, LPCRECT, HRGN, LPRECT, UINT) { } -void CFormattedTextDraw::TxSetCapture(BOOL fCapture) +void CFormattedTextDraw::TxSetCapture(BOOL) { } @@ -327,12 +327,12 @@ BOOL CFormattedTextDraw::TxClientToScreen(LPPOINT lppt) return ClientToScreen(m_hwndParent, lppt); } -HRESULT CFormattedTextDraw::TxActivate(LONG * plOldState) +HRESULT CFormattedTextDraw::TxActivate(LONG *) { return S_OK; } -HRESULT CFormattedTextDraw::TxDeactivate(LONG lNewState) +HRESULT CFormattedTextDraw::TxDeactivate(LONG) { return S_OK; } @@ -384,7 +384,7 @@ HRESULT CFormattedTextDraw::TxGetScrollBars(DWORD *pdwScrollBar) return S_OK; } -HRESULT CFormattedTextDraw::TxGetPasswordChar(TCHAR *pch) +HRESULT CFormattedTextDraw::TxGetPasswordChar(TCHAR *) { return S_FALSE; } @@ -395,7 +395,7 @@ HRESULT CFormattedTextDraw::TxGetAcceleratorPos(LONG *pcp) return S_OK; } -HRESULT CFormattedTextDraw::TxGetExtent(LPSIZEL lpExtent) +HRESULT CFormattedTextDraw::TxGetExtent(LPSIZEL) { return E_NOTIMPL; } @@ -412,13 +412,13 @@ HRESULT CFormattedTextDraw::OnTxParaFormatChange(const PARAFORMAT * ppf) return S_OK; } -HRESULT CFormattedTextDraw::TxGetPropertyBits(DWORD dwMask, DWORD *pdwBits) +HRESULT CFormattedTextDraw::TxGetPropertyBits(DWORD, DWORD *pdwBits) { *pdwBits = m_dwPropertyBits; return S_OK; } -HRESULT CFormattedTextDraw::TxNotify(DWORD iNotify, void *pv) +HRESULT CFormattedTextDraw::TxNotify(DWORD, void *) { return S_OK; } @@ -428,7 +428,7 @@ HIMC CFormattedTextDraw::TxImmGetContext() return NULL; } -void CFormattedTextDraw::TxImmReleaseContext(HIMC himc) +void CFormattedTextDraw::TxImmReleaseContext(HIMC) {} HRESULT CFormattedTextDraw::TxGetSelectionBarWidth(LONG *lSelBarWidth) diff --git a/plugins/mTextControl/src/FormattedTextDraw.h b/plugins/mTextControl/src/FormattedTextDraw.h index bfadbb918f..0eeaa850bb 100644 --- a/plugins/mTextControl/src/FormattedTextDraw.h +++ b/plugins/mTextControl/src/FormattedTextDraw.h @@ -22,7 +22,7 @@ struct COOKIE size_t cbSize, cbCount; }; -extern HRESULT (WINAPI *MyCreateTextServices)(IUnknown *punkOuter, ITextHost *pITextHost, IUnknown **ppUnk); +extern HRESULT(WINAPI *MyCreateTextServices)(IUnknown *punkOuter, ITextHost *pITextHost, IUnknown **ppUnk); ///////////////////////////////////////////////////////////////////////////// // IFormatttedTextDraw @@ -42,15 +42,15 @@ public: virtual ITextDocument *getTextDocument() = 0; virtual void setParentWnd(HWND hwnd, RECT rect) = 0; -// COM-like functions - virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0; - virtual ULONG STDMETHODCALLTYPE Release(void) = 0; + // COM-like functions + virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0; + virtual ULONG STDMETHODCALLTYPE Release(void) = 0; }; ///////////////////////////////////////////////////////////////////////////// // CFormattedTextDraw -class CFormattedTextDraw: +class CFormattedTextDraw : public ITextHost, public IFormattedTextDraw { @@ -67,7 +67,7 @@ public: SetRectEmpty(&m_rcClient); SetRectEmpty(&m_rcViewInset); - m_pCF = (CHARFORMAT2W*) malloc(sizeof(CHARFORMAT2W)); + m_pCF = (CHARFORMAT2W*)malloc(sizeof(CHARFORMAT2W)); InitDefaultCharFormat(); InitDefaultParaFormat(); @@ -88,26 +88,26 @@ public: m_spTextDocument->Release(); } -// Minimal COM functionality - HRESULT STDMETHODCALLTYPE QueryInterface( - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) + // Minimal COM functionality + HRESULT STDMETHODCALLTYPE QueryInterface( + /* [in] */ REFIID, + /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) { *ppvObject = NULL; return S_FALSE; } - - ULONG STDMETHODCALLTYPE AddRef(void) + + ULONG STDMETHODCALLTYPE AddRef(void) { return 0; } - - ULONG STDMETHODCALLTYPE Release(void) + + ULONG STDMETHODCALLTYPE Release(void) { return 0; } -// IFormattedTextDraw + // IFormattedTextDraw public: HRESULT get_NaturalSize(void *hdcDraw, long *Width, long *pVal); HRESULT Create(); @@ -121,7 +121,7 @@ public: ITextDocument *getTextDocument() { return m_spTextDocument; }; virtual void setParentWnd(HWND hwnd, RECT rect) { m_hwndParent = hwnd; m_rcClient = rect; } -// ITextHost + // ITextHost HDC TxGetDC(); INT TxReleaseDC(HDC hdc); BOOL TxShowScrollBar(INT fnBar, BOOL fShow); @@ -162,13 +162,13 @@ public: void TxImmReleaseContext(HIMC himc); HRESULT TxGetSelectionBarWidth(LONG *lSelBarWidth); -// Custom functions + // Custom functions HRESULT CharFormatFromHFONT(CHARFORMAT2W* pCF, HFONT hFont); HRESULT InitDefaultCharFormat(); HRESULT InitDefaultParaFormat(); HRESULT CreateTextServicesObject(); -// Variables + // Variables HWND m_hwndParent; RECT m_rcClient; // Client Rect RECT m_rcViewInset; // view rect inset diff --git a/plugins/mTextControl/src/ImageDataObjectHlp.cpp b/plugins/mTextControl/src/ImageDataObjectHlp.cpp index 7e2747eb44..0ff5b9c479 100644 --- a/plugins/mTextControl/src/ImageDataObjectHlp.cpp +++ b/plugins/mTextControl/src/ImageDataObjectHlp.cpp @@ -114,102 +114,102 @@ HRESULT CreateDataObject(const FORMATETC *fmtetc, const STGMEDIUM *stgmed, UINT //bool InsertBitmap(IRichEditOle* pRichEditOle, HBITMAP hBitmap, HGLOBAL hGlobal) bool InsertBitmap(IRichEditOle* pRichEditOle, HENHMETAFILE hEmf) { - SCODE sc; + SCODE sc; - // Get the image data object - // + // Get the image data object + // static const FORMATETC lc_format[] = - { + { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }//, -// { CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, -// { CF_TEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } + // { CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, + // { CF_TEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }; STGMEDIUM lc_stgmed[] = { { TYMED_ENHMF, { (HBITMAP)hEmf }, 0 }//, -// { TYMED_GDI, { hBitmap }, 0 }, -// { TYMED_HGLOBAL, { (HBITMAP)hGlobal }, 0 } + // { TYMED_GDI, { hBitmap }, 0 }, + // { TYMED_HGLOBAL, { (HBITMAP)hGlobal }, 0 } }; IDataObject *pods; CreateDataObject(lc_format, lc_stgmed, 1, &pods); - // Get the RichEdit container site - // - IOleClientSite *pOleClientSite; - pRichEditOle->GetClientSite(&pOleClientSite); + // Get the RichEdit container site + // + IOleClientSite *pOleClientSite; + pRichEditOle->GetClientSite(&pOleClientSite); - // Initialize a Storage Object - // - LPLOCKBYTES lpLockBytes = NULL; - sc = CreateILockBytesOnHGlobal(NULL, TRUE, &lpLockBytes); - if (sc != S_OK) + // Initialize a Storage Object + // + LPLOCKBYTES lpLockBytes = NULL; + sc = CreateILockBytesOnHGlobal(NULL, TRUE, &lpLockBytes); + if (sc != S_OK) + { + pOleClientSite->Release(); + return false; + } + + IStorage *pStorage; + sc = StgCreateDocfileOnILockBytes(lpLockBytes, + STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, 0, &pStorage); + if (sc != S_OK) { - pOleClientSite->Release(); - return false; - } - - IStorage *pStorage; - sc = StgCreateDocfileOnILockBytes(lpLockBytes, - STGM_SHARE_EXCLUSIVE|STGM_CREATE|STGM_READWRITE, 0, &pStorage); - if (sc != S_OK) - { lpLockBytes->Release(); - pOleClientSite->Release(); - return false; - } - - // The final ole object which will be inserted in the richedit control - // - IOleObject *pOleObject; - sc = OleCreateStaticFromData(pods, IID_IOleObject, OLERENDER_FORMAT, - (LPFORMATETC)lc_format, pOleClientSite, pStorage, (void **)&pOleObject); - if (sc != S_OK) - { - pStorage->Release(); + pOleClientSite->Release(); + return false; + } + + // The final ole object which will be inserted in the richedit control + // + IOleObject *pOleObject; + sc = OleCreateStaticFromData(pods, IID_IOleObject, OLERENDER_FORMAT, + (LPFORMATETC)lc_format, pOleClientSite, pStorage, (void **)&pOleObject); + if (sc != S_OK) + { + pStorage->Release(); lpLockBytes->Release(); - pOleClientSite->Release(); - return false; - } + pOleClientSite->Release(); + return false; + } - // all items are "contained" -- this makes our reference to this object - // weak -- which is needed for links to embedding silent update. - OleSetContainedObject(pOleObject, TRUE); + // all items are "contained" -- this makes our reference to this object + // weak -- which is needed for links to embedding silent update. + OleSetContainedObject(pOleObject, TRUE); - // Now Add the object to the RichEdit - // + // Now Add the object to the RichEdit + // REOBJECT reobject = { 0 }; reobject.cbStruct = sizeof(REOBJECT); - reobject.cp = REO_CP_SELECTION ; - reobject.dvaspect = DVASPECT_CONTENT; - reobject.poleobj = pOleObject; - reobject.polesite = pOleClientSite; - reobject.pstg = pStorage; - reobject.dwFlags = REO_BELOWBASELINE; - - sc = pOleObject->GetUserClassID(&reobject.clsid); - if (sc != S_OK) + reobject.cp = REO_CP_SELECTION; + reobject.dvaspect = DVASPECT_CONTENT; + reobject.poleobj = pOleObject; + reobject.polesite = pOleClientSite; + reobject.pstg = pStorage; + reobject.dwFlags = REO_BELOWBASELINE; + + sc = pOleObject->GetUserClassID(&reobject.clsid); + if (sc != S_OK) { - pOleObject->Release(); - pStorage->Release(); + pOleObject->Release(); + pStorage->Release(); lpLockBytes->Release(); pOleClientSite->Release(); - return false; - } - - // Insert the bitmap at the current location in the richedit control - // - sc = pRichEditOle->InsertObject(&reobject); - - // Release all unnecessary interfaces - // - pOleObject->Release(); - pStorage->Release(); - lpLockBytes->Release(); - pOleClientSite->Release(); - pods->Release(); + return false; + } + + // Insert the bitmap at the current location in the richedit control + // + sc = pRichEditOle->InsertObject(&reobject); + + // Release all unnecessary interfaces + // + pOleObject->Release(); + pStorage->Release(); + lpLockBytes->Release(); + pOleClientSite->Release(); + pods->Release(); return sc == S_OK; } diff --git a/plugins/mTextControl/src/dataobject.cpp b/plugins/mTextControl/src/dataobject.cpp index c8f4f50e8f..b8a7212382 100644 --- a/plugins/mTextControl/src/dataobject.cpp +++ b/plugins/mTextControl/src/dataobject.cpp @@ -22,37 +22,37 @@ public: // // IUnknown members // - HRESULT __stdcall QueryInterface (REFIID iid, void ** ppvObject); - ULONG __stdcall AddRef (void); - ULONG __stdcall Release (void); - + HRESULT __stdcall QueryInterface(REFIID iid, void ** ppvObject); + ULONG __stdcall AddRef(void); + ULONG __stdcall Release(void); + // // IDataObject members // - HRESULT __stdcall GetData (FORMATETC *pFormatEtc, STGMEDIUM *pMedium); - HRESULT __stdcall GetDataHere (FORMATETC *pFormatEtc, STGMEDIUM *pMedium); - HRESULT __stdcall QueryGetData (FORMATETC *pFormatEtc); - HRESULT __stdcall GetCanonicalFormatEtc (FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut); - HRESULT __stdcall SetData (FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease); - HRESULT __stdcall EnumFormatEtc (DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc); - HRESULT __stdcall DAdvise (FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection); - HRESULT __stdcall DUnadvise (DWORD dwConnection); - HRESULT __stdcall EnumDAdvise (IEnumSTATDATA **ppEnumAdvise); + HRESULT __stdcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium); + HRESULT __stdcall GetDataHere(FORMATETC *pFormatEtc, STGMEDIUM *pMedium); + HRESULT __stdcall QueryGetData(FORMATETC *pFormatEtc); + HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut); + HRESULT __stdcall SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease); + HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc); + HRESULT __stdcall DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection); + HRESULT __stdcall DUnadvise(DWORD dwConnection); + HRESULT __stdcall EnumDAdvise(IEnumSTATDATA **ppEnumAdvise); // // Constructor / Destructor // CDataObject(const FORMATETC *fmt, const STGMEDIUM *stgmed, int count); ~CDataObject(); - + private: int LookupFormatEtc(FORMATETC *pFormatEtc); - // + // // any private members and functions // - LONG m_lRefCount; + LONG m_lRefCount; FORMATETC *m_pFormatEtc; STGMEDIUM *m_pStgMedium; @@ -184,7 +184,7 @@ HRESULT __stdcall CDataObject::GetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium // // IDataObject::GetDataHere // -HRESULT __stdcall CDataObject::GetDataHere(FORMATETC *pFormatEtc, STGMEDIUM *pMedium) +HRESULT __stdcall CDataObject::GetDataHere(FORMATETC *, STGMEDIUM *) { // GetDataHere is only required for IStream and IStorage mediums // It is an error to call GetDataHere for things like HGLOBAL and other clipboard formats @@ -207,7 +207,7 @@ HRESULT __stdcall CDataObject::QueryGetData(FORMATETC *pFormatEtc) // // IDataObject::GetCanonicalFormatEtc // -HRESULT __stdcall CDataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut) +HRESULT __stdcall CDataObject::GetCanonicalFormatEtc(FORMATETC *, FORMATETC *pFormatEtcOut) { // Apparently we have to set this field to NULL even though we don't do anything else pFormatEtcOut->ptd = NULL; @@ -217,7 +217,7 @@ HRESULT __stdcall CDataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORM // // IDataObject::SetData // -HRESULT __stdcall CDataObject::SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease) +HRESULT __stdcall CDataObject::SetData(FORMATETC *, STGMEDIUM *, BOOL) { return E_NOTIMPL; } @@ -241,7 +241,7 @@ HRESULT __stdcall CDataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC * // // IDataObject::DAdvise // -HRESULT __stdcall CDataObject::DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) +HRESULT __stdcall CDataObject::DAdvise(FORMATETC *, DWORD, IAdviseSink *, DWORD *) { return OLE_E_ADVISENOTSUPPORTED; } @@ -249,7 +249,7 @@ HRESULT __stdcall CDataObject::DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdvis // // IDataObject::DUnadvise // -HRESULT __stdcall CDataObject::DUnadvise(DWORD dwConnection) +HRESULT __stdcall CDataObject::DUnadvise(DWORD) { return OLE_E_ADVISENOTSUPPORTED; } @@ -257,7 +257,7 @@ HRESULT __stdcall CDataObject::DUnadvise(DWORD dwConnection) // // IDataObject::EnumDAdvise // -HRESULT __stdcall CDataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise) +HRESULT __stdcall CDataObject::EnumDAdvise(IEnumSTATDATA **) { return OLE_E_ADVISENOTSUPPORTED; } diff --git a/plugins/mTextControl/src/enumformat.cpp b/plugins/mTextControl/src/enumformat.cpp index 9aa3895e05..917fe0c584 100644 --- a/plugins/mTextControl/src/enumformat.cpp +++ b/plugins/mTextControl/src/enumformat.cpp @@ -24,17 +24,17 @@ public: // // IUnknown members // - HRESULT __stdcall QueryInterface (REFIID iid, void ** ppvObject); - ULONG __stdcall AddRef (void); - ULONG __stdcall Release (void); + HRESULT __stdcall QueryInterface(REFIID iid, void ** ppvObject); + ULONG __stdcall AddRef(void); + ULONG __stdcall Release(void); // // IEnumFormatEtc members // - HRESULT __stdcall Next (ULONG celt, FORMATETC * rgelt, ULONG * pceltFetched); - HRESULT __stdcall Skip (ULONG celt); - HRESULT __stdcall Reset (void); - HRESULT __stdcall Clone (IEnumFORMATETC ** ppEnumFormatEtc); + HRESULT __stdcall Next(ULONG celt, FORMATETC * rgelt, ULONG * pceltFetched); + HRESULT __stdcall Skip(ULONG celt); + HRESULT __stdcall Reset(void); + HRESULT __stdcall Clone(IEnumFORMATETC ** ppEnumFormatEtc); // // Construction / Destruction diff --git a/plugins/mTextControl/src/fancy_rtf.cpp b/plugins/mTextControl/src/fancy_rtf.cpp index e5325bd706..da5f8971c9 100644 --- a/plugins/mTextControl/src/fancy_rtf.cpp +++ b/plugins/mTextControl/src/fancy_rtf.cpp @@ -4,15 +4,17 @@ struct BBCodeInfo { TCHAR *start; TCHAR *end; - bool (* func)(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt, DWORD cookie); + bool(*func)(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt, DWORD cookie); DWORD cookie; }; -enum { BBS_BOLD_S, BBS_BOLD_E, BBS_ITALIC_S, BBS_ITALIC_E, BBS_UNDERLINE_S, BBS_UNDERLINE_E, +enum { + BBS_BOLD_S, BBS_BOLD_E, BBS_ITALIC_S, BBS_ITALIC_E, BBS_UNDERLINE_S, BBS_UNDERLINE_E, BBS_STRIKEOUT_S, BBS_STRIKEOUT_E, BBS_COLOR_S, BBS_COLOR_E, BBS_URL1, BBS_URL2, - BBS_IMG1, BBS_IMG2 }; + BBS_IMG1, BBS_IMG2 +}; -static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt, DWORD cookie) +static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *, DWORD cookie) { CHARFORMAT cf = { 0 }; cf.cbSize = sizeof(cf); @@ -58,7 +60,7 @@ static bool bbCodeSimpleFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *tx return true; } -static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt, DWORD cookie) +static bool bbCodeImageFunc(IFormattedTextDraw *ftd, CHARRANGE range, TCHAR *txt, DWORD) { ITextServices *ts = ftd->getTextService(); ITextDocument *td = ftd->getTextDocument(); @@ -114,7 +116,7 @@ void bbCodeParse(IFormattedTextDraw *ftd) found = false; CHARRANGE fRange; fRange.cpMin = -1; TCHAR *fText = 0; - BBCodeInfo *fBBCode; + BBCodeInfo *fBBCode = NULL; for (int i = 0; i < bbCodeCount; i++) { CHARRANGE range; diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index 507fb5f684..7a0f350288 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -2,7 +2,7 @@ Miranda Text Control - Plugin for Miranda IM Copyright © 2005 Victor Pavlychko (nullbie@gmail.com), - © 2010 Merlin_de +© 2010 Merlin_de This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -26,7 +26,7 @@ int hLangpack; HMODULE hMsfteditDll = 0; -typedef HRESULT (WINAPI *pfnMyCreateTextServices)(IUnknown *punkOuter, ITextHost *pITextHost, IUnknown **ppUnk); +typedef HRESULT(WINAPI *pfnMyCreateTextServices)(IUnknown *punkOuter, ITextHost *pITextHost, IUnknown **ppUnk); pfnMyCreateTextServices MyCreateTextServices = NULL; PLUGININFOEX pluginInfoEx = @@ -41,16 +41,16 @@ PLUGININFOEX pluginInfoEx = __AUTHORWEB, UNICODE_AWARE, // {69B9443B-DC58-4876-AD39-E3F418A133C5} - {0x69b9443b, 0xdc58, 0x4876, {0xad, 0x39, 0xe3, 0xf4, 0x18, 0xa1, 0x33, 0xc5}} + { 0x69b9443b, 0xdc58, 0x4876, { 0xad, 0x39, 0xe3, 0xf4, 0x18, 0xa1, 0x33, 0xc5 } } }; -extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfoEx; } diff --git a/plugins/mTextControl/src/richeditutils.cpp b/plugins/mTextControl/src/richeditutils.cpp index c0f1a5342a..d83be8c245 100644 --- a/plugins/mTextControl/src/richeditutils.cpp +++ b/plugins/mTextControl/src/richeditutils.cpp @@ -44,32 +44,32 @@ public: return this->refCount; } - HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode) + HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) { return S_OK; } - HRESULT STDMETHODCALLTYPE DeleteObject(LPOLEOBJECT lpoleobj) + HRESULT STDMETHODCALLTYPE DeleteObject(LPOLEOBJECT) { return S_OK; } - HRESULT STDMETHODCALLTYPE GetClipboardData(CHARRANGE * lpchrg, DWORD reco, LPDATAOBJECT * lplpdataobj) + HRESULT STDMETHODCALLTYPE GetClipboardData(CHARRANGE *, DWORD, LPDATAOBJECT *) { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE * lpchrg, HMENU * lphmenu) + HRESULT STDMETHODCALLTYPE GetContextMenu(WORD, LPOLEOBJECT, CHARRANGE *, HMENU *) { return E_INVALIDARG; } - HRESULT STDMETHODCALLTYPE GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect) + HRESULT STDMETHODCALLTYPE GetDragDropEffect(BOOL, DWORD, LPDWORD) { return S_OK; } - HRESULT STDMETHODCALLTYPE GetInPlaceContext(LPOLEINPLACEFRAME * lplpFrame, LPOLEINPLACEUIWINDOW * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo) + HRESULT STDMETHODCALLTYPE GetInPlaceContext(LPOLEINPLACEFRAME *, LPOLEINPLACEUIWINDOW *, LPOLEINPLACEFRAMEINFO) { return E_INVALIDARG; } @@ -85,17 +85,17 @@ public: } - HRESULT STDMETHODCALLTYPE QueryAcceptData(LPDATAOBJECT lpdataobj, CLIPFORMAT * lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict) + HRESULT STDMETHODCALLTYPE QueryAcceptData(LPDATAOBJECT, CLIPFORMAT *, DWORD, BOOL, HGLOBAL) { return S_OK; } - HRESULT STDMETHODCALLTYPE QueryInsertObject(LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp) + HRESULT STDMETHODCALLTYPE QueryInsertObject(LPCLSID, LPSTORAGE, LONG) { return S_OK; } - HRESULT STDMETHODCALLTYPE ShowContainerUI(BOOL fShow) + HRESULT STDMETHODCALLTYPE ShowContainerUI(BOOL) { return S_OK; } diff --git a/plugins/mTextControl/src/services.cpp b/plugins/mTextControl/src/services.cpp index b649d69b00..1ccdfa2401 100644 --- a/plugins/mTextControl/src/services.cpp +++ b/plugins/mTextControl/src/services.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "headers.h" -static HANDLE hService[11] = {0,0,0,0,0,0,0,0,0,0,0}; +static HANDLE hService[11] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; INT_PTR MText_Register(WPARAM, LPARAM); INT_PTR MText_Create(WPARAM, LPARAM); @@ -37,13 +37,13 @@ struct TextObject { DWORD options; IFormattedTextDraw *ftd; - TextObject(): options(0), ftd(0) {} + TextObject() : options(0), ftd(0) {} ~TextObject() { if (ftd) delete ftd; } }; //--------------------------------------------------------------------------- // elper functions -void MText_InitFormatting0(IFormattedTextDraw *ftd, DWORD options) +void MText_InitFormatting0(IFormattedTextDraw *ftd, DWORD) { LRESULT lResult; @@ -150,7 +150,7 @@ INT_PTR MText_CreateW(WPARAM wParam, LPARAM lParam) //--------------------------------------------------------------------------- // allocate text object (advanced) HANDLE DLL_CALLCONV -MTI_MTextCreateEx(HANDLE userHandle, MCONTACT hContact, void *text, DWORD flags) +MTI_MTextCreateEx(HANDLE userHandle, void *text, DWORD flags) { TextObject *result = new TextObject; result->options = TextUserGetOptions(userHandle); @@ -170,7 +170,7 @@ INT_PTR MText_CreateEx(WPARAM wParam, LPARAM lParam) { HANDLE userHandle = (HANDLE)wParam; MTEXTCREATE *textCreate = (MTEXTCREATE *)lParam; - MTI_MTextCreateEx(userHandle, textCreate->hContact, textCreate->text, textCreate->flags); + MTI_MTextCreateEx(userHandle, textCreate->text, textCreate->flags); return 0; } @@ -190,7 +190,7 @@ MTI_MTextMeasure(HDC dc, SIZE *sz, HANDLE text) return 0; } -INT_PTR MText_Measure(WPARAM wParam, LPARAM lParam) +INT_PTR MText_Measure(WPARAM wParam, LPARAM) { LPMTEXTDISPLAY displayInfo = (LPMTEXTDISPLAY)wParam; if (!displayInfo) return 0; @@ -231,7 +231,7 @@ MTI_MTextDisplay(HDC dc, POINT pos, SIZE sz, HANDLE text) return 0; } -INT_PTR MText_Display(WPARAM wParam, LPARAM lParam) +INT_PTR MText_Display(WPARAM wParam, LPARAM) { LPMTEXTDISPLAY displayInfo = (LPMTEXTDISPLAY)wParam; if (!displayInfo) return 0; @@ -250,7 +250,7 @@ MTI_MTextSetParent(HANDLE text, HWND hwnd, RECT rect) return 0; } -INT_PTR MText_SetParent(WPARAM wParam, LPARAM lParam) +INT_PTR MText_SetParent(WPARAM wParam, LPARAM) { LPMTEXTSETPARENT info = (LPMTEXTSETPARENT)wParam; //TextObject *text = (TextObject *)info->text; @@ -278,10 +278,9 @@ MTI_MTextSendMessage(HWND hwnd, HANDLE text, UINT msg, WPARAM wParam, LPARAM lPa return lResult; } -INT_PTR MText_SendMessage(WPARAM wParam, LPARAM lParam) +INT_PTR MText_SendMessage(WPARAM wParam, LPARAM) { LPMTEXTMESSAGE message = (LPMTEXTMESSAGE)wParam; - TextObject *text = (TextObject *)message->text; if (!message->text) return 0; return (INT_PTR)MTI_MTextSendMessage(message->hwnd, message->text, message->msg, message->wParam, message->lParam); } @@ -295,7 +294,7 @@ MTI_MTextCreateProxy(HANDLE text) return CreateProxyWindow(((TextObject *)text)->ftd->getTextService()); } -INT_PTR MText_CreateProxy(WPARAM wParam, LPARAM lParam) +INT_PTR MText_CreateProxy(WPARAM wParam, LPARAM) { if (!wParam) return 0; return (INT_PTR)MTI_MTextCreateProxy((HANDLE)wParam); @@ -312,7 +311,7 @@ MTI_MTextDestroy(HANDLE text) return 0; } -INT_PTR MText_Destroy(WPARAM wParam, LPARAM lParam) +INT_PTR MText_Destroy(WPARAM wParam, LPARAM) { HANDLE textHandle = (HANDLE)wParam; TextObject *text = (TextObject *)textHandle; @@ -322,7 +321,7 @@ INT_PTR MText_Destroy(WPARAM wParam, LPARAM lParam) //--------------------------------------------------------------------------- // populate the interface -INT_PTR MText_GetInterface(WPARAM wParam, LPARAM lParam) +INT_PTR MText_GetInterface(WPARAM, LPARAM lParam) { MTEXT_INTERFACE *MText = (MTEXT_INTERFACE *)lParam; if (MText == NULL) diff --git a/plugins/mTextControl/src/services.h b/plugins/mTextControl/src/services.h index 78a6793d1d..d91b1366b3 100644 --- a/plugins/mTextControl/src/services.h +++ b/plugins/mTextControl/src/services.h @@ -22,13 +22,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA void LoadServices(); -__declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateW (HANDLE userHandle, WCHAR *text); -__declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateEx (HANDLE userHandle, MCONTACT hContact, void *text, DWORD flags); -__declspec(dllexport) int DLL_CALLCONV MTI_MTextMeasure (HDC dc, SIZE *sz, HANDLE text); -__declspec(dllexport) int DLL_CALLCONV MTI_MTextDisplay (HDC dc, POINT pos, SIZE sz, HANDLE text); -__declspec(dllexport) int DLL_CALLCONV MTI_MTextSetParent (HANDLE text, HWND hwnd, RECT rect); -__declspec(dllexport) int DLL_CALLCONV MTI_MTextSendMessage (HWND hwnd, HANDLE text, UINT msg, WPARAM wParam, LPARAM lParam); -__declspec(dllexport) HWND DLL_CALLCONV MTI_MTextCreateProxy (HANDLE text); -__declspec(dllexport) int DLL_CALLCONV MTI_MTextDestroy (HANDLE text); +__declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateW(HANDLE userHandle, WCHAR *text); +__declspec(dllexport) HANDLE DLL_CALLCONV MTI_MTextCreateEx(HANDLE userHandle, void *text, DWORD flags); +__declspec(dllexport) int DLL_CALLCONV MTI_MTextMeasure(HDC dc, SIZE *sz, HANDLE text); +__declspec(dllexport) int DLL_CALLCONV MTI_MTextDisplay(HDC dc, POINT pos, SIZE sz, HANDLE text); +__declspec(dllexport) int DLL_CALLCONV MTI_MTextSetParent(HANDLE text, HWND hwnd, RECT rect); +__declspec(dllexport) int DLL_CALLCONV MTI_MTextSendMessage(HWND hwnd, HANDLE text, UINT msg, WPARAM wParam, LPARAM lParam); +__declspec(dllexport) HWND DLL_CALLCONV MTI_MTextCreateProxy(HANDLE text); +__declspec(dllexport) int DLL_CALLCONV MTI_MTextDestroy(HANDLE text); #endif // __services_h__ diff --git a/plugins/mTextControl/src/textcontrol.cpp b/plugins/mTextControl/src/textcontrol.cpp index 1cbee8c382..f2c0514134 100644 --- a/plugins/mTextControl/src/textcontrol.cpp +++ b/plugins/mTextControl/src/textcontrol.cpp @@ -104,7 +104,7 @@ LRESULT CALLBACK MTextControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM } /// Paint //////////////////////////////////// -LRESULT MTextControl_OnPaint(HWND hwnd, WPARAM wParam, LPARAM lParam) +LRESULT MTextControl_OnPaint(HWND hwnd, WPARAM, LPARAM) { HDC hdc; PAINTSTRUCT ps; diff --git a/plugins/mTextControl/src/version.h b/plugins/mTextControl/src/version.h index 8ba2098982..a7f39ebc83 100644 --- a/plugins/mTextControl/src/version.h +++ b/plugins/mTextControl/src/version.h @@ -1,14 +1,14 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 8 -#define __RELEASE_NUM 0 -#define __BUILD_NUM 1 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 #include #define __PLUGIN_NAME "Miranda text control" #define __FILENAME "mTextControl.dll" -#define __DESCRIPTION "Provides text render API for different plugins." -#define __AUTHOR "Merlin_de, Victor Pavlychko" +#define __DESCRIPTION "Provides text render API for different plugins." +#define __AUTHOR "Merlin_de, Victor Pavlychko" #define __AUTHOREMAIL "" -#define __AUTHORWEB "http://miranda-ng.org/p/mTextControl/" -#define __COPYRIGHT "© 2005-2006 Victor Pavlychko, 2010 Merlin_de" +#define __AUTHORWEB "http://miranda-ng.org/p/mTextControl/" +#define __COPYRIGHT "© 2005-2006 Victor Pavlychko, 2010 Merlin_de" -- cgit v1.2.3