diff --git a/.gitmodules b/.gitmodules index cc27822d22b6948dbde5bd105976f4219962cb93..998884126a20ce2ddeeed6a3b1e06d8405cd4574 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "3rd/jerryscript"] path = 3rd/jerryscript url = https://gitee.com/ThinkingT/jerryscript.git + +[submodule "3rd/nanomsg"] + path = 3rd/nanomsg + url = https://gitee.com/embedded-lib/nanomsg.git diff --git a/3rd/nanomsg b/3rd/nanomsg new file mode 160000 index 0000000000000000000000000000000000000000..63252794a0a1bec04e46ece82f7a3edf0b527d82 --- /dev/null +++ b/3rd/nanomsg @@ -0,0 +1 @@ +Subproject commit 63252794a0a1bec04e46ece82f7a3edf0b527d82 diff --git a/include/dlcom/objectrun.hpp b/include/dlcom/objectrun.hpp index 24cd8fa7690aac3f5838a83f1c8606654188567f..e95e1ca62ee930a32a852d189a495cfebd4a9789 100644 --- a/include/dlcom/objectrun.hpp +++ b/include/dlcom/objectrun.hpp @@ -116,10 +116,10 @@ public: } HRESULT RegisterComponent( - REFCLSID rid, REFCLSID clsid, LPCSTR progId, IBase* pBase, ULONG Id, LPCSTR Component, UINT type) + REFCLSID rid, REFCLSID clsid, LPCSTR progid, IBase* pBase, ULONG id, LPCSTR plugin, UINT type) { HRESULT hr = S_OK; - rc_assert(progId != NULL, E_FAIL); + rc_assert(progid != NULL, E_FAIL); rc_assert(pBase != NULL, E_FAIL); _lComPtr pIObjectRun; @@ -127,7 +127,7 @@ public: rc_assert(pIObjectRun != NULL, E_FAIL); rc_assert(hr == S_OK, E_FAIL); - return pIObjectRun->AddObject(clsid, progId, pBase, Id, Component, type); + return pIObjectRun->AddObject(clsid, progid, pBase, id, plugin, type); } HRESULT RunContainer(REFCLSID rid, UINT type) diff --git a/license/license.vcxproj b/license/license.vcxproj index 86661227b774512ab15b5f45dfae7e9e0e8b81ac..3e48679206b5e6f69588221deadc1a630286fe97 100644 --- a/license/license.vcxproj +++ b/license/license.vcxproj @@ -11,7 +11,7 @@ - {B3FD08BC-F781-4F73-911A-46FEB2DB34D4} + {E3D77D7F-AF44-4FE2-89B0-0BD37BA3F8D8} Plugin Win32Proj 10.0.16299.0 @@ -78,7 +78,7 @@ Windows $(OutDir)$(TargetName).lib MachineX86 - ws2_32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;Shlwapi.lib;stdcrt.lib;%(AdditionalDependencies) @@ -105,7 +105,7 @@ $(OutDir)$(TargetName).lib MachineX86 UseLinkTimeCodeGeneration - ws2_32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;Shlwapi.lib;stdcrt.lib;%(AdditionalDependencies) @@ -121,20 +121,16 @@ false - + Create Create - - - + - - diff --git a/msgbus/ReadMe.txt b/msgbus/ReadMe.txt index 902220d6f01da3309339d7ae9c955f9b811fc051..dfc43897b6dabfaf6ecf1e690f04293b83555444 100644 --- a/msgbus/ReadMe.txt +++ b/msgbus/ReadMe.txt @@ -39,3 +39,5 @@ AppWizard uses "TODO:" comments to indicate parts of the source code you should add to or customize. ///////////////////////////////////////////////////////////////////////////// + +// \ No newline at end of file diff --git a/runtime/runtime.vcxproj b/runtime/runtime.vcxproj index 86661227b774512ab15b5f45dfae7e9e0e8b81ac..33ac3618285bd27ec5f96694dceba4847187397c 100644 --- a/runtime/runtime.vcxproj +++ b/runtime/runtime.vcxproj @@ -78,7 +78,7 @@ Windows $(OutDir)$(TargetName).lib MachineX86 - ws2_32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;Shlwapi.lib;stdcrt.lib;%(AdditionalDependencies) @@ -105,7 +105,7 @@ $(OutDir)$(TargetName).lib MachineX86 UseLinkTimeCodeGeneration - ws2_32.lib;Shlwapi.lib;%(AdditionalDependencies) + ws2_32.lib;Shlwapi.lib;stdcrt.lib;%(AdditionalDependencies) diff --git a/stdcrt/stdcrt.vcxproj b/stdcrt/stdcrt.vcxproj index 270e8533b5d956d3ea45d2de364823bdd4e9f9bf..7d7f0b1cd67357193217e6bcdffa071c8a11b15b 100644 --- a/stdcrt/stdcrt.vcxproj +++ b/stdcrt/stdcrt.vcxproj @@ -22,7 +22,6 @@ StaticLibrary Unicode true - v141_xp StaticLibrary