improve error handling and link msi.lib via pragma instead of project…

… setting git-svn-id: https://poroz/svnad/wfl_mr/branches/dev/jmairboe/trunk/src/tools/CreateEmbedLangTransform@8475 0d26eecb-4107-0410-bdd6-a17e8e2aa929
RISCSoftware · May 22, 2023 · aea85ed · aea85ed
1 parent af67e25
commit aea85ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/CreateEmbedLangTransform/CreateEmbedLangTransform.vcxproj b/CreateEmbedLangTransform/CreateEmbedLangTransform.vcxproj
@@ -58,7 +58,6 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -75,7 +74,6 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/CreateEmbedLangTransform/main.cpp b/CreateEmbedLangTransform/main.cpp
@@ -3,12 +3,22 @@
 #include <MsiQuery.h>
 #include <iostream>
 
+#pragma comment(lib, "msi.lib")
+
 #ifdef _UNICODE
 #define tcerr wcerr
 #else
 #define tcerr cerr
 #endif // _UNICODE
 
+void HandleWindowsError(LPCTSTR func) {
+  DWORD error = GetLastError();
+  LPTSTR errorMessage;
+  FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), reinterpret_cast<LPTSTR>(&errorMessage), 0, NULL);
+  std::tcerr << TEXT("error at ") << func << TEXT(": ") << errorMessage << std::endl;
+  LocalFree(errorMessage);
+}
+
 void HandleMsiError(LPCTSTR func) {
   PMSIHANDLE error = MsiGetLastErrorRecord();
   if (error) {
@@ -24,14 +34,9 @@ void HandleMsiError(LPCTSTR func) {
       delete[] errorMessage;
     }
   }
-}
-
-void HandleWindowsError(LPCTSTR func) {
-  DWORD error = GetLastError();
-  LPTSTR errorMessage;
-  FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), reinterpret_cast<LPTSTR>(&errorMessage), 0, NULL);
-  std::tcerr << TEXT("error at ") << func << TEXT(": ") << errorMessage << std::endl;
-  LocalFree(errorMessage);
+  else {
+    HandleWindowsError(func);
+  }
 }
 
 int _tmain(int argc, TCHAR **argv) {