added x86 & x64 installers to resource liba171

plus various other improvements

1 files changed, 19 insertions, 122 deletions

diff --git a/msvc/driver_resources.rc b/msvc/driver_resources.rc
index bb4ed33..6e178d6 100644
--- a/msvc/driver_resources.rc
+++ b/msvc/driver_resources.rc
@@ -1,125 +1,22 @@
-// Microsoft Visual C++ generated resource script.
-//
-//#include "resource.h"
+/*
+ * resources for the driver installer library
+ */
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
 
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DLL
-//
+/*
+ * DLLs
+ */
 // Make sure you set the path to your DDK as an include directory for the files below
-AMD64_DLL1              DLL                     "redist\\wdf\\amd64\\WdfCoInstaller01009.dll"
-AMD64_DLL2              DLL                     "redist\\winusb\\amd64\\winusbcoinstaller2.dll"
-X86_DLL1                DLL                     "redist\\wdf\\x86\\WdfCoInstaller01009.dll"
-X86_DLL2                DLL                     "redist\\winusb\\x86\\winusbcoinstaller2.dll"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Ireland) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENI)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_EIRE
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,7,0
- PRODUCTVERSION 1,0,7,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "libusb.org"
-            VALUE "FileDescription", "driver_install"
-            VALUE "FileVersion", "1, 0, 7, 0"
-            VALUE "InternalName", "driver_install"
-            VALUE "LegalCopyright", "See individual source files, GNU LGPL v2.1 or later."
-            VALUE "LegalTrademarks", "http://www.gnu.org/licenses/lgpl-2.1.html"
-            VALUE "OriginalFilename", "driver_install.dll"
-            VALUE "ProductName", "driver_install"
-            VALUE "ProductVersion", "1, 0, 7, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // English (Ireland) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+AMD64_DLL1              BIN                     "redist\\wdf\\amd64\\WdfCoInstaller01009.dll"
+AMD64_DLL2              BIN                     "redist\\winusb\\amd64\\winusbcoinstaller2.dll"
+X86_DLL1                BIN                     "redist\\wdf\\x86\\WdfCoInstaller01009.dll"
+X86_DLL2                BIN                     "redist\\winusb\\x86\\winusbcoinstaller2.dll"
+
+/*
+ * Installer executable requiring UAC elevation
+ */
+// Why do we need two installers? Glad you asked. If you try to run the x86 
+// installer on an x64 system, you will get the annoying "This program might
+// not have installed properly" prompt. So we must ensure 64 bit OS runs 64 bit exe.
+AMD64_INSTALLER         BIN                     "x64\\Release\\lib\\driver-installer.exe"
+X86_INSTALLER           BIN                     "Win32\\Release\\lib\\driver-installer.exe"