diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-02-15 23:49:31 +0000 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-02-15 23:49:31 +0000 |
| commit | b16c22266bcd2d97f742e34ecb4fff2d52be2298 (patch) | |
| tree | 18f3419141a291f09a38fd9285ffe631d24a87b0 | |
| parent | adf2a8e3082be13d4324a8b277a99333dc90301d (diff) | |
| download | libusb-b16c22266bcd2d97f742e34ecb4fff2d52be2298.tar.gz | |
fixed a couple issues with driver-install vcproja157
| -rw-r--r-- | driver-install_2008.vcproj | 28 | ||||
| -rw-r--r-- | libusb/os/driver_install.c | 2 |
2 files changed, 18 insertions, 12 deletions
diff --git a/driver-install_2008.vcproj b/driver-install_2008.vcproj index ca2b5e5..b87b03b 100644 --- a/driver-install_2008.vcproj +++ b/driver-install_2008.vcproj @@ -44,9 +44,10 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" DebugInformationFormat="4" /> @@ -79,12 +80,10 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Debug|x64" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\driver-install" ConfigurationType="4" - CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -103,13 +102,9 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - WarningLevel="3" - DebugInformationFormat="3" + PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="1" /> <Tool Name="VCManagedResourceCompilerTool" @@ -140,10 +135,12 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|Win32" OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib" IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\lib\driver-install" ConfigurationType="4" + CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -162,7 +159,14 @@ /> <Tool Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="_WIN32;_LIB;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -216,6 +220,8 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories=".\msvc;.\libusb;.\" + PreprocessorDefinitions="_WIN32;_WIN64;_LIB;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="0" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/libusb/os/driver_install.c b/libusb/os/driver_install.c index 81dd1f1..3af21f2 100644 --- a/libusb/os/driver_install.c +++ b/libusb/os/driver_install.c @@ -266,7 +266,6 @@ int install_device(char* path) r = DriverPackagePreinstall(path, DRIVER_PACKAGE_LEGACY_MODE|DRIVER_PACKAGE_REPAIR); // Will fail if inf not signed, unless DRIVER_PACKAGE_LEGACY_MODE is specified. - // Will fail if no cat file has been created // r = 87 ERROR_INVALID_PARAMETER on path == NULL // r = 2 ERROR_FILE_NOT_FOUND if no inf in path // r = 5 ERROR_ACCESS_DENIED if needs admin elevation @@ -274,6 +273,7 @@ int install_device(char* path) // r = 0xE0000304 ERROR_INVALID_CATALOG_DATA => no cat // r = 0xE0000247 if user decided not to install on warnings // r = 0x800B0100 ERROR_WRONG_INF_STYLE => missing cat entry in inf + // r = 0xB7 => missing DRIVER_PACKAGE_REPAIR flag usbi_dbg("ret = %X", r); return 0; |