From fc7a1f50378529f4dc11ace0c361aeae76ca2616 Mon Sep 17 00:00:00 2001 From: Thinking Date: Thu, 15 Aug 2019 15:17:30 +0800 Subject: [PATCH] add --- adapters/addon.cpp | 4 ---- asynio/asynframeimpl.cpp | 5 ++--- asynio/ioimpl/implfile.cpp | 1 + include/dlcom/byguidstring.hpp | 4 ++-- include/dlcom/calldll.hpp | 9 +++++---- include/dlcom/loadcom.hpp | 29 +++++++++++++++-------------- include/utilex/thread.hpp | 2 +- 7 files changed, 26 insertions(+), 28 deletions(-) diff --git a/adapters/addon.cpp b/adapters/addon.cpp index 05fd5c68..f7d70c9c 100644 --- a/adapters/addon.cpp +++ b/adapters/addon.cpp @@ -19,10 +19,6 @@ using v8::Value; - - - - /* void Method(const FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); diff --git a/asynio/asynframeimpl.cpp b/asynio/asynframeimpl.cpp index 2f7d4d48..68ac4b26 100644 --- a/asynio/asynframeimpl.cpp +++ b/asynio/asynframeimpl.cpp @@ -9,10 +9,9 @@ uvNameSpace -CAsynFrameImpl::CAsynFrameImpl(void) +CAsynFrameImpl::CAsynFrameImpl(void):m_asynframe_sem(NULL), m_pThreadPool(NULL) { - m_asynframe_sem; - + } CAsynFrameImpl::~CAsynFrameImpl(void) diff --git a/asynio/ioimpl/implfile.cpp b/asynio/ioimpl/implfile.cpp index c6b52cc5..e98adbb3 100644 --- a/asynio/ioimpl/implfile.cpp +++ b/asynio/ioimpl/implfile.cpp @@ -1,5 +1,6 @@ #include "implfile.h" + #ifdef _MSC_VER os_fd_t os_file_open(const TCHAR *filepath, int flags, int mode) { diff --git a/include/dlcom/byguidstring.hpp b/include/dlcom/byguidstring.hpp index e53abba0..399db1cb 100644 --- a/include/dlcom/byguidstring.hpp +++ b/include/dlcom/byguidstring.hpp @@ -22,7 +22,7 @@ inline static GUID S2GUIDA(const char* lpString, bool bHaveBracket = true) unsigned int Data234[10] = {0x00}; unsigned int Data12[2] = {0x00}; - sscanf(szTemp,bHaveBracket?"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}" : "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", + int x = sscanf(szTemp,bHaveBracket?"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}" : "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", (unsigned int*)(&guid.Data1), (unsigned int*)(Data12 + 0), (unsigned int*)(Data12 + 1), @@ -61,7 +61,7 @@ inline static GUID S2GUIDW(wchar_t* lpString, bool bHaveBracket = true) unsigned int Data234[10] = {0x00}; unsigned int Data12[2] = {0x00}; - swscanf(szTemp,bHaveBracket?L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}" : L"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", + int x = swscanf(szTemp,bHaveBracket?L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}" : L"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", (unsigned int*)(&guid.Data1), (unsigned int*)(Data12 + 0), (unsigned int*)(Data12 + 1), diff --git a/include/dlcom/calldll.hpp b/include/dlcom/calldll.hpp index 278f5912..54c464e8 100644 --- a/include/dlcom/calldll.hpp +++ b/include/dlcom/calldll.hpp @@ -18,9 +18,6 @@ size_t uOffFun; }; public: - - TCHAR m_szModuleName[MAX_PATH]; - HMODULE m_hMod; virtual void InitIAT() { STFunDesc *pFunDesc=GetFunDefs(); @@ -32,7 +29,7 @@ public: IImpModuleBase(const TCHAR *pModuleName):m_hMod(NULL) { - + //memset(, 0, sizeof(m_szModuleName)); } virtual ~IImpModuleBase() { @@ -83,6 +80,10 @@ } virtual STFunDesc *GetFunDefs() = 0; virtual bool setfuncaddress(int i,void *p) = 0; + + protected: + TCHAR m_szModuleName[MAX_PATH] = {0x00}; + HMODULE m_hMod; }; diff --git a/include/dlcom/loadcom.hpp b/include/dlcom/loadcom.hpp index f3fac53e..aa96cdb6 100644 --- a/include/dlcom/loadcom.hpp +++ b/include/dlcom/loadcom.hpp @@ -7,7 +7,7 @@ -MD_EXPORTS DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID* ppv); +//MD_EXPORTS DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID* ppv); @@ -21,12 +21,12 @@ typedef HRESULT (OS_STDCALL *DefineDllUnregisterServer)(void); class CComLoader : protected IImpModuleBase { public: - DefineDllGetClassObject DllGetClassObject; - DefineDllCanUnloadNow DllCanUnloadNow; - DefineDllRegisterServer DllRegisterServer; - DefineDllUnregisterServer DllUnregisterServer; + DefineDllGetClassObject m_pFuncDllGetClassObject; + DefineDllCanUnloadNow m_pFuncDllCanUnloadNow; + DefineDllRegisterServer m_pFuncDllRegisterServer; + DefineDllUnregisterServer m_pFuncDllUnregisterServer; public: - inline CComLoader() : IImpModuleBase(_T("modulecom")) + CComLoader() : IImpModuleBase(_T("modulecom")) { } @@ -39,7 +39,6 @@ public: { (char *)"DllRegisterServer",2}, { (char *)"DllUnregisterServer",3}, { (char *)"null",4} - }; return s_FunDefs; } @@ -50,16 +49,16 @@ public: switch(i) { case 0: - this->DllGetClassObject = (DefineDllGetClassObject)(p); + this->m_pFuncDllGetClassObject = (DefineDllGetClassObject)(p); break; case 1: - this->DllCanUnloadNow = (DefineDllCanUnloadNow)(p); + this->m_pFuncDllCanUnloadNow = (DefineDllCanUnloadNow)(p); break; case 2: - this->DllRegisterServer = (DefineDllRegisterServer)(p); + this->m_pFuncDllRegisterServer = (DefineDllRegisterServer)(p); break; case 3: - this->DllUnregisterServer = (DefineDllUnregisterServer)(p); + this->m_pFuncDllUnregisterServer = (DefineDllUnregisterServer)(p); break; default: break; @@ -75,6 +74,8 @@ public: BOOL LoadCom(const TCHAR* pModPathName) { + HRESULT hr = S_OK; + iosprintf("CComLoader->LoadCom") memset(m_szModuleName,0,MAX_PATH); tstring_strcpy(m_szModuleName,pModPathName); @@ -95,8 +96,8 @@ public: } - DllGetClassObject(CLSID_MDClassFactory, _uuidof(IComObjectFrameworkClassFactory), (void**)&m_pClassFactory); - if(m_pClassFactory) + hr = DllGetClassObject(CLSID_MDClassFactory, _uuidof(IComObjectFrameworkClassFactory), (void**)&m_pClassFactory); + if(hr == S_OK && m_pClassFactory) { return TRUE; } @@ -117,7 +118,7 @@ public: retrtpv(IsLoaded(), E_FAIL); _lComPtr pClassFactory; - if(SUCCEEDED(DllGetClassObject(rclsid, _uuidof(IClassFactory__), (void**)&pClassFactory)) && pClassFactory) + if(SUCCEEDED(m_pFuncDllGetClassObject(rclsid, _uuidof(IClassFactory__), (void**)&pClassFactory)) && pClassFactory) { _lComPtr pOFClassFactory = pClassFactory; if (pOFClassFactory) { diff --git a/include/utilex/thread.hpp b/include/utilex/thread.hpp index 25c26fcb..bf86a30d 100644 --- a/include/utilex/thread.hpp +++ b/include/utilex/thread.hpp @@ -8,7 +8,7 @@ class ithread { public: - ithread() { + ithread():thread(NULL){ } virtual ~ithread() { -- Gitee