diff --git a/adapters/addon.cpp b/adapters/addon.cpp index 05fd5c681f7b71cbb608df2f450a4931487d745c..f7d70c9c1e28d1bd7d3d119f414155f27e3d7f3f 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 2f7d4d48b8e23468c05903a45640b58ecb5064a5..68ac4b26263d0325883092e538d418c70b0c5f24 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 c6b52cc52cebd6c9675fc9ffb1ed77f3211c2ed2..e98adbb3e1ca7bba2e31bb77208e093d8ab95d98 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 e53abba073e1b3edccd5362263c39405752bef51..399db1cb00af31f768ea7587ab9df425429a0204 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 278f5912ba398a421cd961fc21466498f753c04c..54c464e89d9343048fd40b31c771c6467354b88a 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 f3fac53e834e6096fc9477748e3663d6be0c94fa..aa96cdb60ab3689e59d81ded274be64aa8978ed3 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 25c26fcb0d3e27d14c89f8b56f9483a157e40c2a..bf86a30d9dc10f4dc34c27e29e9dc6f04d096e3b 100644 --- a/include/utilex/thread.hpp +++ b/include/utilex/thread.hpp @@ -8,7 +8,7 @@ class ithread { public: - ithread() { + ithread():thread(NULL){ } virtual ~ithread() {