Rename strutil library to more generic winsane-util

mback2k · Feb 19, 2017 · 266eb77 · 266eb77
1 parent 046fd3a
commit 266eb77
Show file tree

Hide file tree

Showing 29 changed files with 78 additions and 78 deletions.
diff --git a/coisane/coisane.cpp b/coisane/coisane.cpp
@@ -28,7 +28,7 @@
 #include "coisane_util.h"
 #include "coisane_prop.h"
 #include "coisane_wizard.h"
-#include "strutil_dbg.h"
+#include "winsane-util_dbg.h"
 
 
 DWORD CALLBACK CoInstaller(_In_ DI_FUNCTION InstallFunction, _In_ HDEVINFO hDeviceInfoSet, _In_ PSP_DEVINFO_DATA pDeviceInfoData, OPTIONAL _Inout_ PCOINSTALLER_CONTEXT_DATA Context)

diff --git a/coisane/coisane.vcxproj b/coisane/coisane.vcxproj
@@ -69,7 +69,7 @@
       <Culture>0x0009</Culture>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)strutil;$(SolutionDir)winsane;%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)winsane-util;$(SolutionDir)winsane;%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -81,8 +81,8 @@
     </Midl>
     <Link>
       <ModuleDefinitionFile>coisane.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)strutil\$(OutDir);$(SolutionDir)winsane\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;difxapi.lib;comctl32.lib;version.lib;strutil.lib;winsane.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)winsane-util\$(OutDir);$(SolutionDir)winsane\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;difxapi.lib;comctl32.lib;version.lib;winsane-util.lib;winsane.lib</AdditionalDependencies>
       <GenerateDebugInformation>True</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -128,7 +128,7 @@
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\strutil\strutil.vcxproj">
+    <ProjectReference Include="..\winsane-util\winsane-util.vcxproj">
       <Project>{abe9a9db-5ba2-4c99-99f0-cf120ea3cf44}</Project>
     </ProjectReference>
     <ProjectReference Include="..\winsane\winsane.vcxproj">

diff --git a/coisane/coisane_prop.cpp b/coisane/coisane_prop.cpp
@@ -26,10 +26,10 @@
 
 #include "dllmain.h"
 #include "resource.h"
-#include "strutil.h"
-#include "strutil_dbg.h"
-#include "strutil_mem.h"
-#include "strutil_res.h"
+#include "winsane-util_str.h"
+#include "winsane-util_dbg.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_res.h"
 #include "coisane_util.h"
 
 

diff --git a/coisane/coisane_util.cpp b/coisane/coisane_util.cpp
@@ -26,10 +26,10 @@
 
 #include "dllmain.h"
 #include "resource.h"
-#include "strutil.h"
-#include "strutil_reg.h"
-#include "strutil_mem.h"
-#include "strutil_dbg.h"
+#include "winsane-util_str.h"
+#include "winsane-util_reg.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_dbg.h"
 
 _Success_(return == ERROR_SUCCESS)
 DWORD WINAPI GetDlgItemAText(_In_ HANDLE hHeap, _In_ HWND hDlg, _In_ int nIDDlgItem, _Outptr_result_nullonfailure_ LPTSTR *plpszText, _Out_opt_ size_t *pcchLength)

diff --git a/coisane/coisane_wizard.cpp b/coisane/coisane_wizard.cpp
@@ -28,10 +28,10 @@
 
 #include "dllmain.h"
 #include "resource.h"
-#include "strutil.h"
-#include "strutil_dbg.h"
-#include "strutil_mem.h"
-#include "strutil_res.h"
+#include "winsane-util_str.h"
+#include "winsane-util_dbg.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_res.h"
 #include "coisane_util.h"
 
 

diff --git a/devsane/devsane.vcxproj b/devsane/devsane.vcxproj
@@ -69,7 +69,7 @@
       <Culture>0x0009</Culture>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)strutil;%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)winsane-util;%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -81,8 +81,8 @@
     </Midl>
     <Link>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)strutil\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;difxapi.lib;newdev.lib;version.lib;strutil.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)winsane-util\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);setupapi.lib;difxapi.lib;newdev.lib;version.lib;winsane-util.lib</AdditionalDependencies>
       <GenerateDebugInformation>True</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -123,7 +123,7 @@
     <FilesToPackage Include="$(TargetPath)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\strutil\strutil.vcxproj">
+    <ProjectReference Include="..\winsane-util\winsane-util.vcxproj">
       <Project>{abe9a9db-5ba2-4c99-99f0-cf120ea3cf44}</Project>
     </ProjectReference>
     <ProjectReference Include="..\winsane\winsane.vcxproj">

diff --git a/devsane/devsane_device.cpp b/devsane/devsane_device.cpp
@@ -24,9 +24,9 @@
 #include <difxapi.h>
 #include <newdev.h>
 
-#include "strutil.h"
-#include "strutil_mem.h"
-#include "strutil_dbg.h"
+#include "winsane-util_str.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_dbg.h"
 #include "devsane_util.h"
 
 

diff --git a/devsane/devsane_driver.cpp b/devsane/devsane_driver.cpp
@@ -23,9 +23,9 @@
 #include <setupapi.h>
 #include <difxapi.h>
 
-#include "strutil.h"
-#include "strutil_mem.h"
-#include "strutil_dbg.h"
+#include "winsane-util_str.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_dbg.h"
 #include "devsane_util.h"
 
 

diff --git a/devsane/devsane_util.cpp b/devsane/devsane_util.cpp
@@ -29,9 +29,9 @@
 #include <malloc.h>
 
 #include "resource.h"
-#include "strutil.h"
-#include "strutil_mem.h"
-#include "strutil_dbg.h"
+#include "winsane-util_str.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_dbg.h"
 
 
 DWORD CreateInstallInfo(_In_ HANDLE hHeap, _Out_ PINSTALLERINFO pInstallerInfo, _Outptr_result_maybenull_ LPVOID *plpData)

diff --git a/wiasane.sln b/wiasane.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strutil", "strutil\strutil.vcxproj", "{ABE9A9DB-5BA2-4C99-99F0-CF120EA3CF44}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsane-util", "winsane-util\winsane-util.vcxproj", "{ABE9A9DB-5BA2-4C99-99F0-CF120EA3CF44}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsane", "winsane\winsane.vcxproj", "{B210E114-BF47-442F-8A8E-6719B6359EB8}"
 	ProjectSection(ProjectDependencies) = postProject

diff --git a/wiasane/wiasane.cpp b/wiasane/wiasane.cpp
@@ -36,9 +36,9 @@
 #include "wiasane_def.h"
 #include "wiasane_scan.h"
 #include "wiasane_util.h"
-#include "strutil_dbg.h"
-#include "strutil_mem.h"
-#include "strutil.h"
+#include "winsane-util_dbg.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_str.h"
 
 
 WIAMICRO_API HRESULT MicroEntry(LONG lCommand, _Inout_ PVAL pValue)

diff --git a/wiasane/wiasane.vcxproj b/wiasane/wiasane.vcxproj
@@ -77,7 +77,7 @@
       <Culture>0x0009</Culture>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)strutil;$(SolutionDir)winsane;%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)winsane-util;$(SolutionDir)winsane;%(AdditionalIncludeDirectories);$(DDK_INC_PATH)</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <SDLCheck>True</SDLCheck>
@@ -88,8 +88,8 @@
     </Midl>
     <Link>
       <ModuleDefinitionFile>wiasane.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)strutil\$(OutDir);$(SolutionDir)winsane\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);strutil.lib;winsane.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)winsane-util\$(OutDir);$(SolutionDir)winsane\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);winsane-util.lib;winsane.lib</AdditionalDependencies>
       <GenerateDebugInformation>True</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>

diff --git a/wiasane/wiasane_def.cpp b/wiasane/wiasane_def.cpp
@@ -25,10 +25,10 @@
 
 #include "wiasane_opt.h"
 #include "wiasane_scan.h"
-#include "strutil_dbg.h"
-#include "strutil_mem.h"
-#include "strutil_reg.h"
-#include "strutil.h"
+#include "winsane-util_dbg.h"
+#include "winsane-util_mem.h"
+#include "winsane-util_reg.h"
+#include "winsane-util_str.h"
 
 HRESULT ReadRegistryInformation(_Inout_ PSCANINFO pScanInfo, _Inout_ PWIASANE_Context pContext)
 {

diff --git a/wiasane/wiasane_scan.cpp b/wiasane/wiasane_scan.cpp
@@ -24,7 +24,7 @@
 #include <wia.h>
 
 #include "wiasane_opt.h"
-#include "strutil_dbg.h"
+#include "winsane-util_dbg.h"
 
 HRESULT FetchScannerParams(_Inout_ PSCANINFO pScanInfo, _Inout_ PWIASANE_Context pContext)
 {

diff --git a/strutil/strutil.vcxproj → winsane-util/winsane-util.vcxproj b/strutil/strutil.vcxproj → winsane-util/winsane-util.vcxproj
@@ -27,7 +27,7 @@
     <DebuggerFlavor Condition="'$(IsKernelModeToolset)'=='True'">DbgengKernelDebugger</DebuggerFlavor>
     <DebuggerFlavor Condition="'$(IsUserModeToolset)'=='True'">DbgengRemoteDebugger</DebuggerFlavor>
     <ProjectGuid>{ABE9A9DB-5BA2-4C99-99F0-CF120EA3CF44}</ProjectGuid>
-    <ProjectName>strutil</ProjectName>
+    <ProjectName>winsane-util</ProjectName>
     <RootNamespace>$(MSBuildProjectName)</RootNamespace>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
@@ -74,18 +74,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="strutil.cpp" />
-    <ClCompile Include="strutil_dbg.cpp" />
-    <ClCompile Include="strutil_mem.cpp" />
-    <ClCompile Include="strutil_reg.cpp" />
-    <ClCompile Include="strutil_res.cpp" />
+    <ClCompile Include="winsane-util_str.cpp" />
+    <ClCompile Include="winsane-util_dbg.cpp" />
+    <ClCompile Include="winsane-util_mem.cpp" />
+    <ClCompile Include="winsane-util_reg.cpp" />
+    <ClCompile Include="winsane-util_res.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="strutil.h" />
-    <ClInclude Include="strutil_dbg.h" />
-    <ClInclude Include="strutil_mem.h" />
-    <ClInclude Include="strutil_reg.h" />
-    <ClInclude Include="strutil_res.h" />
+    <ClInclude Include="winsane-util_str.h" />
+    <ClInclude Include="winsane-util_dbg.h" />
+    <ClInclude Include="winsane-util_mem.h" />
+    <ClInclude Include="winsane-util_reg.h" />
+    <ClInclude Include="winsane-util_res.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
diff --git a/strutil/strutil.vcxproj.filters → winsane-util/winsane-util.vcxproj.filters b/strutil/strutil.vcxproj.filters → winsane-util/winsane-util.vcxproj.filters
@@ -15,36 +15,36 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="strutil.cpp">
+    <ClCompile Include="winsane-util_str.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strutil_res.cpp">
+    <ClCompile Include="winsane-util_res.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strutil_dbg.cpp">
+    <ClCompile Include="winsane-util_dbg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strutil_reg.cpp">
+    <ClCompile Include="winsane-util_reg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="strutil_mem.cpp">
+    <ClCompile Include="winsane-util_mem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="strutil.h">
+    <ClInclude Include="winsane-util_str.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="strutil_res.h">
+    <ClInclude Include="winsane-util_res.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="strutil_dbg.h">
+    <ClInclude Include="winsane-util_dbg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="strutil_reg.h">
+    <ClInclude Include="winsane-util_reg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="strutil_mem.h">
+    <ClInclude Include="winsane-util_mem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/strutil/strutil_dbg.cpp → winsane-util/winsane-util_dbg.cpp b/strutil/strutil_dbg.cpp → winsane-util/winsane-util_dbg.cpp
@@ -18,7 +18,7 @@
  *
  ***************************************************************************/
 
-#include "strutil_dbg.h"
+#include "winsane-util_dbg.h"
 
 #ifdef _DEBUG
 
@@ -27,8 +27,8 @@
 #include <strsafe.h>
 #include <malloc.h>
 
-#include "strutil.h"
-#include "strutil_mem.h"
+#include "winsane-util_str.h"
+#include "winsane-util_mem.h"
 
 VOID Trace_(_In_ LPCTSTR lpszPrefix, _In_ LPCTSTR lpszFormat, ...)
 {

diff --git a/strutil/strutil_dbg.h → winsane-util/winsane-util_dbg.h b/strutil/strutil_dbg.h → winsane-util/winsane-util_dbg.h
diff --git a/strutil/strutil_mem.cpp → winsane-util/winsane-util_mem.cpp b/strutil/strutil_mem.cpp → winsane-util/winsane-util_mem.cpp
@@ -18,7 +18,7 @@
  *
  ***************************************************************************/
 
-#include "strutil_mem.h"
+#include "winsane-util_mem.h"
 
 BOOL WINAPI HeapSafeFree(_Inout_ HANDLE hHeap, _In_ DWORD dwFlags, _In_opt_ _Post_ptr_invalid_ LPVOID lpMem)
 {

diff --git a/strutil/strutil_mem.h → winsane-util/winsane-util_mem.h b/strutil/strutil_mem.h → winsane-util/winsane-util_mem.h
diff --git a/strutil/strutil_reg.cpp → winsane-util/winsane-util_reg.cpp b/strutil/strutil_reg.cpp → winsane-util/winsane-util_reg.cpp
@@ -18,9 +18,9 @@
  *
  ***************************************************************************/
 
-#include "strutil_reg.h"
+#include "winsane-util_reg.h"
 
-#include "strutil_mem.h"
+#include "winsane-util_mem.h"
 
 _Success_(return == ERROR_SUCCESS)
 LONG WINAPI ReadRegistryLong(_In_ HANDLE hHeap, _In_ HKEY hKey, _In_opt_ LPCTSTR lpcszValueName, _Out_ DWORD *pdwValue)

diff --git a/strutil/strutil_reg.h → winsane-util/winsane-util_reg.h b/strutil/strutil_reg.h → winsane-util/winsane-util_reg.h
diff --git a/strutil/strutil_res.cpp → winsane-util/winsane-util_res.cpp b/strutil/strutil_res.cpp → winsane-util/winsane-util_res.cpp
@@ -18,9 +18,9 @@
  *
  ***************************************************************************/
 
-#include "strutil_res.h"
+#include "winsane-util_res.h"
 
-#include "strutil_mem.h"
+#include "winsane-util_mem.h"
 
 _Success_(return)
 BOOL WINAPI LoadAString(_In_ HANDLE hHeap, _In_opt_ HINSTANCE hInstance, _In_ UINT uID, _Outptr_result_nullonfailure_ LPTSTR *plpszString, _Out_opt_ int *piLength)

diff --git a/strutil/strutil_res.h → winsane-util/winsane-util_res.h b/strutil/strutil_res.h → winsane-util/winsane-util_res.h
diff --git a/strutil/strutil.cpp → winsane-util/winsane-util_str.cpp b/strutil/strutil.cpp → winsane-util/winsane-util_str.cpp
@@ -18,12 +18,12 @@
  *
  ***************************************************************************/
 
-#include "strutil.h"
+#include "winsane-util_str.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "strutil_mem.h"
+#include "winsane-util_mem.h"
 
 _Success_(return != NULL)
 LPSTR WINAPI StringDupA(_In_ HANDLE hHeap, _In_ LPCSTR lpszString)

diff --git a/strutil/strutil.h → winsane-util/winsane-util_str.h b/strutil/strutil.h → winsane-util/winsane-util_str.h
diff --git a/winsane/winsane.vcxproj b/winsane/winsane.vcxproj
@@ -68,16 +68,16 @@
       <Culture>0x0009</Culture>
     </ResourceCompile>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)strutil</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)winsane-util</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <SDLCheck>True</SDLCheck>
       <AssemblerOutput>All</AssemblerOutput>
       <PreprocessorDefinitions>WINSANE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)strutil\$(OutDir)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies);ws2_32.lib;strutil.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)winsane-util\$(OutDir)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies);ws2_32.lib;winsane-util.lib</AdditionalDependencies>
       <GenerateDebugInformation>True</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>

diff --git a/winsane/winsane_device.cpp b/winsane/winsane_device.cpp
@@ -21,7 +21,7 @@
 #include "winsane_device.h"
 #include "winsane_internal.h"
 
-#include "strutil.h"
+#include "winsane-util_str.h"
 
 #define INVALID_SANE_HANDLE ((SANE_Handle)-1)