Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark various OLE helper functions as DLL exported so they can be used from other libraries.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-12-22 19:08:43 +00:00
parent 6041f69ca7
commit d04002224e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/ole/oleutils.h
View File

@@ -82,7 +82,7 @@ inline void ReleaseInterface(IUnknown *pIUnk)
#define RELEASE_AND_NULL(p) if ( (p) != NULL ) { p->Release(); p = NULL; }; #define RELEASE_AND_NULL(p) if ( (p) != NULL ) { p->Release(); p = NULL; };
// return true if the iid is in the array // return true if the iid is in the array
extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount); WXDLLIMPEXP_CORE extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
// ============================================================================ // ============================================================================
// IUnknown implementation helpers // IUnknown implementation helpers
@@ -197,11 +197,11 @@ private:
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// tries to translate riid into a symbolic name, if possible // tries to translate riid into a symbolic name, if possible
void wxLogQueryInterface(const wxChar *szInterface, REFIID riid); WXDLLIMPEXP_CORE void wxLogQueryInterface(const wxChar *szInterface, REFIID riid);
// these functions print out the new value of reference counter // these functions print out the new value of reference counter
void wxLogAddRef (const wxChar *szInterface, ULONG cRef); WXDLLIMPEXP_CORE void wxLogAddRef (const wxChar *szInterface, ULONG cRef);
void wxLogRelease(const wxChar *szInterface, ULONG cRef); WXDLLIMPEXP_CORE void wxLogRelease(const wxChar *szInterface, ULONG cRef);
#else //!__WXDEBUG__ #else //!__WXDEBUG__
#define wxLogQueryInterface(szInterface, riid) #define wxLogQueryInterface(szInterface, riid)

8
src/msw/ole/oleutils.cpp
View File

@@ -58,7 +58,7 @@
// ============================================================================ // ============================================================================
// return true if the iid is in the array // return true if the iid is in the array
bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount) WXDLLEXPORT bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
{ {
for ( size_t i = 0; i < nCount; i++ ) { for ( size_t i = 0; i < nCount; i++ ) {
if ( riid == *aIids[i] ) if ( riid == *aIids[i] )
@@ -512,18 +512,18 @@ static wxString GetIidName(REFIID riid)
#endif #endif
} }
void wxLogQueryInterface(const wxChar *szInterface, REFIID riid) WXDLLEXPORT void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
{ {
wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"), wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
szInterface, GetIidName(riid).c_str()); szInterface, GetIidName(riid).c_str());
} }
void wxLogAddRef(const wxChar *szInterface, ULONG cRef) WXDLLEXPORT void wxLogAddRef(const wxChar *szInterface, ULONG cRef)
{ {
wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1); wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1);
} }
void wxLogRelease(const wxChar *szInterface, ULONG cRef) WXDLLEXPORT void wxLogRelease(const wxChar *szInterface, ULONG cRef)
{ {
wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1); wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
} }