Skip to content

Commit 6d96094

Browse files
pbatardpbatard
committed
libwdi 1.2.5
* Also fix MinGW warnings
1 parent 1ecc7ce commit 6d96094

File tree

11 files changed

+72
-52
lines changed

11 files changed

+72
-52
lines changed

‎README

-31
This file was deleted.

‎README.md

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
libwdi: A Windows Driver Installation library for USB devices
2+
=============================================================
3+
4+
Main features
5+
-------------
6+
7+
* Automated inf creation, using reported USB device name
8+
* Automated catalog file creation and signing, using autogenerated certificate
9+
* Automated driver files extraction, for both 32 and 64 bit platforms
10+
* Automated driver installation, including UAC elevation where necessary
11+
* Single library embedding all the required files
12+
* Supports all Windows platform from Windows XP to Windows 10
13+
14+
Additional features
15+
-------------------
16+
17+
* Embedding of WinUSB, libusb0.sys or libusbK.sys, USB Serial (CDC) or your own
18+
USB drivers (eg. WHQL)
19+
* Full locale support with UTF-8 API strings and UTF-16 autogenerated inf files
20+
* Resolution of USB Vendor IDs, based on the data maintained by Stephen J. Gowdy
21+
at http://www.linux-usb.org/usb.ids
22+
* Fully Open Source (LGPL v3), with multiple sample applications
23+
* Supports MinGW32, MinGW-w64, Visual Studio, WDK
24+
25+
Installation and Compilation
26+
----------------------------
27+
28+
See: https://github.com/pbatard/libwdi/wiki/Install
29+
30+
API usage
31+
---------
32+
33+
See: https://github.com/pbatard/libwdi/wiki/Usage
34+
35+
FAQ
36+
---
37+
38+
See: https://github.com/pbatard/libwdi/wiki/FAQ

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_INIT([libwdi], [1.2.5], [[email protected]], [libwdi], [http://libwdi.akeo.ie])
2-
AM_INIT_AUTOMAKE([-Wno-portability 1.11])
2+
AM_INIT_AUTOMAKE([-Wno-portability 1.11 foreign])
33
AC_CONFIG_SRCDIR([libwdi/libwdi.c])
44
AC_CONFIG_MACRO_DIR([m4])
55
AM_CONFIG_HEADER([config.h])

‎examples/wdi-simple.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#endif
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 1,2,5,688
11-
PRODUCTVERSION 1,2,5,688
10+
FILEVERSION 1,2,5,689
11+
PRODUCTVERSION 1,2,5,689
1212
FILEFLAGSMASK 0x17L
1313
#ifdef _DEBUG
1414
FILEFLAGS 0x1L
@@ -25,13 +25,13 @@ BEGIN
2525
BEGIN
2626
VALUE "CompanyName", "akeo.ie"
2727
VALUE "FileDescription", "WDI-Simple"
28-
VALUE "FileVersion", "1.2.5.688"
28+
VALUE "FileVersion", "1.2.5.689"
2929
VALUE "InternalName", "WDI-Simple"
3030
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
3131
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
3232
VALUE "OriginalFilename", "wdi-simple.exe"
3333
VALUE "ProductName", "WDI-Simple"
34-
VALUE "ProductVersion", "1.2.5.688"
34+
VALUE "ProductVersion", "1.2.5.689"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadic.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ END
5656
//
5757

5858
VS_VERSION_INFO VERSIONINFO
59-
FILEVERSION 1,2,5,688
60-
PRODUCTVERSION 1,2,5,688
59+
FILEVERSION 1,2,5,689
60+
PRODUCTVERSION 1,2,5,689
6161
FILEFLAGSMASK 0x17L
6262
#ifdef _DEBUG
6363
FILEFLAGS 0x1L
@@ -74,13 +74,13 @@ BEGIN
7474
BEGIN
7575
VALUE "CompanyName", "akeo.ie"
7676
VALUE "FileDescription", "Zadic"
77-
VALUE "FileVersion", "1.2.5.688"
77+
VALUE "FileVersion", "1.2.5.689"
7878
VALUE "InternalName", "Zadic"
7979
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
8080
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
8181
VALUE "OriginalFilename", "zadic.exe"
8282
VALUE "ProductName", "Zadic"
83-
VALUE "ProductVersion", "1.2.5.688"
83+
VALUE "ProductVersion", "1.2.5.689"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define FIELD_ORANGE RGB(255,240,200)
6060
#define ARROW_GREEN RGB(92,228,65)
6161
#define ARROW_ORANGE RGB(253,143,56)
62-
#define APP_VERSION "Zadig 2.2.688"
62+
#define APP_VERSION "Zadig 2.2.689"
6363

6464
// These are used to flag end users about the driver they are going to replace
6565
enum driver_type {

‎examples/zadig.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ END
248248
//
249249

250250
VS_VERSION_INFO VERSIONINFO
251-
FILEVERSION 2,2,682,688
252-
PRODUCTVERSION 2,2,682,688
251+
FILEVERSION 2,2,682,689
252+
PRODUCTVERSION 2,2,682,689
253253
FILEFLAGSMASK 0x17L
254254
#ifdef _DEBUG
255255
FILEFLAGS 0x1L
@@ -266,13 +266,13 @@ BEGIN
266266
BEGIN
267267
VALUE "CompanyName", "akeo.ie"
268268
VALUE "FileDescription", "Zadig"
269-
VALUE "FileVersion", "2.2.688"
269+
VALUE "FileVersion", "2.2.689"
270270
VALUE "InternalName", "Zadig"
271271
VALUE "LegalCopyright", "� 2010-2016 Pete Batard (GPL v3)"
272272
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
273273
VALUE "OriginalFilename", "zadig.exe"
274274
VALUE "ProductName", "Zadig"
275-
VALUE "ProductVersion", "2.2.688"
275+
VALUE "ProductVersion", "2.2.689"
276276
VALUE "Comments", "http://libwdi.akeo.ie"
277277
END
278278
END

‎examples/zadig_README.creole

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
=== v2.2 (2016.01.22) ===
2+
* Add USB Serial (CDC) support (**EXPERIMENTAL**)
3+
* Use SHA-256 instead of SHA-1 wherever possible
4+
* Fix a possible crash when deleting the private key
5+
* Other improvements
6+
* Embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0, libusbK v3.0.7.0 & usbser (native)
7+
18
=== v2.1.2 (2015.04.30) ===
29
* Fix freezout when listing all devices on some systems
310
* Update version detection for Windows 10

‎libwdi/installer.h

+3
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ typedef RETURN_TYPE CONFIGRET;
138138
#ifndef ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED
139139
#define ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED 0xE0000243
140140
#endif
141+
#ifndef ERROR_FILE_HASH_NOT_IN_CATALOG
142+
#define ERROR_FILE_HASH_NOT_IN_CATALOG 0xE000024B
143+
#endif
141144

142145
typedef enum {
143146
DIFXAPI_SUCCESS,

‎libwdi/libwdi.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 1,2,5,688
54-
PRODUCTVERSION 1,2,5,688
53+
FILEVERSION 1,2,5,689
54+
PRODUCTVERSION 1,2,5,689
5555
FILEFLAGSMASK 0x17L
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L
@@ -68,13 +68,13 @@ BEGIN
6868
BEGIN
6969
VALUE "CompanyName", "akeo.ie"
7070
VALUE "FileDescription", "libwdi: Windows Driver Installer Library"
71-
VALUE "FileVersion", "1.2.5.688"
71+
VALUE "FileVersion", "1.2.5.689"
7272
VALUE "InternalName", "libwdi"
7373
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (LGPL v3)"
7474
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/lesser.html"
7575
VALUE "OriginalFilename", "libwdi"
7676
VALUE "ProductName", "libwdi"
77-
VALUE "ProductVersion", "1.2.5.688"
77+
VALUE "ProductVersion", "1.2.5.689"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/pki.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@
3939
#include "libwdi.h"
4040
#include "logging.h"
4141

42-
#define KEY_CONTAINER L"libwdi key container"
43-
#define PF_ERR wdi_err
42+
#define KEY_CONTAINER L"libwdi key container"
43+
#define PF_ERR wdi_err
4444
#ifndef CERT_STORE_PROV_SYSTEM_A
45-
#define CERT_STORE_PROV_SYSTEM_A ((LPCSTR) 9)
45+
#define CERT_STORE_PROV_SYSTEM_A ((LPCSTR) 9)
46+
#endif
47+
#ifndef szOID_RSA_SHA256RSA
48+
#define szOID_RSA_SHA256RSA "1.2.840.113549.1.1.11"
4649
#endif
4750

4851
/*

0 commit comments

Comments
 (0)