Skip to content

Commit 93732a5

Browse files
pbatardpbatard
committed
[misc] fix DDK compilation issues
* CALG_SHA_256 requires XP SP3
1 parent 367ef15 commit 93732a5

File tree

8 files changed

+25
-19
lines changed

8 files changed

+25
-19
lines changed

‎examples/wdi-simple.rc‎

Lines changed: 4 additions & 4 deletions
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,692
11-
PRODUCTVERSION 1,2,5,692
10+
FILEVERSION 1,2,5,693
11+
PRODUCTVERSION 1,2,5,693
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.692"
28+
VALUE "FileVersion", "1.2.5.693"
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.692"
34+
VALUE "ProductVersion", "1.2.5.693"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎examples/zadic.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ int __cdecl main(int argc, char *argv[])
6464

6565
static int prompt_flag = 1;
6666
static unsigned char iface = 0;
67-
static int vid = 0;
68-
static unsigned short pid = 0;
67+
static unsigned short vid = 0, pid = 0;
6968
static int verbose_flag = 3;
7069
static char *desc = NULL;
7170
static int use_supplied_inf_flag = 0;

‎examples/zadic.rc‎

Lines changed: 4 additions & 4 deletions
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,692
60-
PRODUCTVERSION 1,2,5,692
59+
FILEVERSION 1,2,5,693
60+
PRODUCTVERSION 1,2,5,693
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.692"
77+
VALUE "FileVersion", "1.2.5.693"
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.692"
83+
VALUE "ProductVersion", "1.2.5.693"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
17561756
BOOL r;
17571757

17581758
// Disable loading system DLLs from the current directory (DLL sideloading mitigation)
1759+
#ifndef DDKBUILD // WDK doesn't know about that one
17591760
SetDllDirectoryA("");
1761+
#endif
17601762

17611763
// Retrieve the current application directory
17621764
GetCurrentDirectoryU(MAX_PATH, app_dir);

‎examples/zadig.h‎

Lines changed: 1 addition & 1 deletion
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.692"
62+
#define APP_VERSION "Zadig 2.2.693"
6363

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

‎examples/zadig.rc‎

Lines changed: 4 additions & 4 deletions
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,692
252-
PRODUCTVERSION 2,2,682,692
251+
FILEVERSION 2,2,682,693
252+
PRODUCTVERSION 2,2,682,693
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.692"
269+
VALUE "FileVersion", "2.2.693"
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.692"
275+
VALUE "ProductVersion", "2.2.693"
276276
VALUE "Comments", "http://libwdi.akeo.ie"
277277
END
278278
END

‎libwdi/libwdi.rc‎

Lines changed: 4 additions & 4 deletions
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,692
54-
PRODUCTVERSION 1,2,5,692
53+
FILEVERSION 1,2,5,693
54+
PRODUCTVERSION 1,2,5,693
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.692"
71+
VALUE "FileVersion", "1.2.5.693"
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.692"
77+
VALUE "ProductVersion", "1.2.5.693"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/pki.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626

2727
#include <windows.h>
2828
#include <setupapi.h>
29+
// CALG_SHA_256 requires XP SP3
30+
#if defined(NTDDI_VERSION) && (NTDDI_VERSION < NTDDI_WINXPSP3)
31+
#undef NTDDI_VERSION
32+
#define NTDDI_VERSION NTDDI_WINXPSP3
33+
#endif
2934
#include <wincrypt.h>
3035
#include <stdio.h>
3136
#include <conio.h>

0 commit comments

Comments
 (0)