-

DoubangoTelecom · Aug 10, 2020 · d26bb76 · d26bb76
1 parent a08dfd3
commit d26bb76
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/base/compv_sharedlib.cxx b/base/compv_sharedlib.cxx
@@ -13,6 +13,8 @@
 #	include <dlfcn.h>
 #endif
 
+#define COMPV_THIS_CLASSNAME "CompVSharedLib"
+
 COMPV_NAMESPACE_BEGIN()
 
 CompVSharedLib::CompVSharedLib(void* pHandle COMPV_DEFAULT(NULL))
@@ -62,7 +64,12 @@ COMPV_ERROR_CODE CompVSharedLib::open(const char* filePath, void** handle, bool
 		if (quiet) {
 			return COMPV_ERROR_CODE_E_NOT_FOUND;
 		}
-        COMPV_DEBUG_ERROR("Failed to load library with path=%s", filePath);
+#if COMPV_OS_WINDOWS
+		const DWORD error = GetLastError();
+#else
+		const long error = -1;
+#endif
+        COMPV_DEBUG_ERROR_EX(COMPV_THIS_CLASSNAME, "Failed to load library with path=%s, Error: %x", filePath, error);
         COMPV_CHECK_CODE_RETURN(COMPV_ERROR_CODE_E_NOT_FOUND);
     }
 
@@ -111,7 +118,7 @@ COMPV_ERROR_CODE CompVSharedLib::newObj(CompVSharedLibPtrPtr sharedlib, const ch
 	}
 	COMPV_CHECK_CODE_BAIL(err);
     COMPV_CHECK_CODE_BAIL(err = CompVSharedLib::newObj(sharedlib, handle_));
-    COMPV_DEBUG_INFO("Loaded shared lib: %s", filePath);
+    COMPV_DEBUG_INFO_EX(COMPV_THIS_CLASSNAME, "Loaded shared lib: %s", filePath);
 bail:
     if (COMPV_ERROR_CODE_IS_NOK(err)) {
         COMPV_CHECK_CODE_ASSERT(CompVSharedLib::close(handle_));

diff --git a/plugin_mfoundation/CompVPluginMFoundation.vcxproj b/plugin_mfoundation/CompVPluginMFoundation.vcxproj
@@ -449,14 +449,6 @@
     <ClCompile Include="compv_mf_guidname.cxx" />
     <ClCompile Include="compv_mf_utils.cxx" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\compv\mf\compv_mf_camera.h" />
-    <ClInclude Include="include\compv\mf\compv_mf_config.h" />
-    <ClInclude Include="include\compv\mf\compv_mf_devices.h" />
-    <ClInclude Include="include\compv\mf\compv_mf_grabber.h" />
-    <ClInclude Include="include\compv\mf\compv_mf_guidname.h" />
-    <ClInclude Include="include\compv\mf\compv_mf_utils.h" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\base\CompVBase.vcxproj">
       <Project>{52028a97-e6d7-4c48-82e9-3789fd42bc56}</Project>
@@ -465,6 +457,14 @@
       <Project>{d5bd00ca-0ee0-4bc2-9b0e-011f0eac5d68}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="include\compv\mf\compv_mf_camera.h" />
+    <ClInclude Include="include\compv\mf\compv_mf_config.h" />
+    <ClInclude Include="include\compv\mf\compv_mf_devices.h" />
+    <ClInclude Include="include\compv\mf\compv_mf_grabber.h" />
+    <ClInclude Include="include\compv\mf\compv_mf_guidname.h" />
+    <ClInclude Include="include\compv\mf\compv_mf_utils.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/plugin_mfoundation/CompVPluginMFoundation.vcxproj.filters b/plugin_mfoundation/CompVPluginMFoundation.vcxproj.filters
@@ -31,22 +31,22 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\compv\mf\compv_mf_config.h">
+    <ClInclude Include="include\compv\mf\compv_mf_camera.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\compv\mf\compv_mf_camera.h">
+    <ClInclude Include="include\compv\mf\compv_mf_config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\compv\mf\compv_mf_utils.h">
+    <ClInclude Include="include\compv\mf\compv_mf_devices.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\compv\mf\compv_mf_guidname.h">
+    <ClInclude Include="include\compv\mf\compv_mf_grabber.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\compv\mf\compv_mf_devices.h">
+    <ClInclude Include="include\compv\mf\compv_mf_guidname.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="include\compv\mf\compv_mf_grabber.h">
+    <ClInclude Include="include\compv\mf\compv_mf_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>