Skip to content

Commit d3bc52f

Browse files
pbatardpbatard
committed
[misc] update scripts, compile as C, bump version
1 parent fbdbc3b commit d3bc52f

18 files changed

+153
-39
lines changed

‎_bm.sh‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# Create and upload a Zadig release
33
# !!!THIS SCRIPT IS FOR INTERNAL DEVELOPER USE ONLY!!!
44

5-
zadig_version=2.0.1.160
5+
zadig_version=2.0.1.161
66
target_dir=/e/dailies/libwdi
77

88
type -P git &>/dev/null || { echo "Git not found. Aborting." >&2; exit 1; }
9-
type -P 7zr &>/dev/null || { echo "7-zip (7zr) executable not found. Aborting." >&2; exit 1; }
9+
type -P upx &>/dev/null || { echo "UPX executable not found. Aborting." >&2; exit 1; }
1010

1111
# Build Zadig for Vista and later (KMDF v1.11)
1212
git clean -fdx
@@ -20,6 +20,7 @@ make -j2 zadig.exe
2020
# (NB this only matters for local apps - an app extracted from a 7z will always have SYSTEM access)
2121
# SetACL can be downloaded from http://helgeklein.com/
2222
type -P SetACL &>/dev/null && { SetACL -on ./zadig.exe -ot file -actn ace -ace "n:S-1-5-18;p:read,read_ex;s:y"; }
23+
upx --lzma zadig.exe
2324
cp zadig.exe $target_dir/zadig.exe
2425
cd ..
2526

@@ -32,10 +33,7 @@ make -j2
3233
cd ../examples
3334
make -j2 zadig.exe
3435
type -P SetACL &>/dev/null && { SetACL -on ./zadig.exe -ot file -actn ace -ace "n:S-1-5-18;p:read,read_ex;s:y"; }
36+
upx --lzma zadig.exe
3537
cp zadig.exe $target_dir/zadig_xp.exe
3638
cmd.exe /k zadig_sign.bat "$target_dir/zadig.exe" "$target_dir/zadig_xp.exe"
37-
7zr a $target_dir/zadig_v$zadig_version.7z $target_dir/zadig.exe
38-
7zr a $target_dir/zadig_xp_v$zadig_version.7z $target_dir/zadig_xp.exe
3939
cd ..
40-
41-
#scp {$target_dir/zadig_v$zadig_version.7z,examples/zadig_README.creole} pbatard,[email protected]:/home/pfs/project/l/li/libwdi/zadig

‎examples/.msvc/inf_wizard.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8585
<WarningLevel>Level3</WarningLevel>
8686
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
87+
<CompileAs>CompileAsC</CompileAs>
8788
</ClCompile>
8889
<Link>
8990
<AdditionalDependencies>setupapi.lib;newdev.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -106,6 +107,7 @@
106107
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
107108
<WarningLevel>Level3</WarningLevel>
108109
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
110+
<CompileAs>CompileAsC</CompileAs>
109111
</ClCompile>
110112
<Link>
111113
<AdditionalDependencies>setupapi.lib;newdev.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -125,6 +127,7 @@
125127
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
126128
<WarningLevel>Level3</WarningLevel>
127129
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
130+
<CompileAs>CompileAsC</CompileAs>
128131
</ClCompile>
129132
<Link>
130133
<AdditionalDependencies>setupapi.lib;newdev.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -148,6 +151,7 @@
148151
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149152
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
150153
<WarningLevel>Level3</WarningLevel>
154+
<CompileAs>CompileAsC</CompileAs>
151155
</ClCompile>
152156
<Link>
153157
<AdditionalDependencies>setupapi.lib;newdev.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎examples/.msvc/wdi-simple.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8585
<WarningLevel>Level3</WarningLevel>
8686
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
87+
<CompileAs>CompileAsC</CompileAs>
8788
</ClCompile>
8889
<Link>
8990
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -107,6 +108,7 @@
107108
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
108109
<WarningLevel>Level3</WarningLevel>
109110
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
111+
<CompileAs>CompileAsC</CompileAs>
110112
</ClCompile>
111113
<Link>
112114
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -126,6 +128,7 @@
126128
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127129
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
128130
<WarningLevel>Level3</WarningLevel>
131+
<CompileAs>CompileAsC</CompileAs>
129132
</ClCompile>
130133
<Link>
131134
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -149,6 +152,7 @@
149152
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150153
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
151154
<WarningLevel>Level3</WarningLevel>
155+
<CompileAs>CompileAsC</CompileAs>
152156
</ClCompile>
153157
<Link>
154158
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎examples/.msvc/zadic.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8585
<WarningLevel>Level3</WarningLevel>
8686
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
87+
<CompileAs>CompileAsC</CompileAs>
8788
</ClCompile>
8889
<Link>
8990
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -108,6 +109,7 @@
108109
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
109110
<WarningLevel>Level3</WarningLevel>
110111
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
112+
<CompileAs>CompileAsC</CompileAs>
111113
</ClCompile>
112114
<Link>
113115
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -128,6 +130,7 @@
128130
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
129131
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
130132
<WarningLevel>Level3</WarningLevel>
133+
<CompileAs>CompileAsC</CompileAs>
131134
</ClCompile>
132135
<Link>
133136
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -152,6 +155,7 @@
152155
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153156
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
154157
<WarningLevel>Level3</WarningLevel>
158+
<CompileAs>CompileAsC</CompileAs>
155159
</ClCompile>
156160
<Link>
157161
<AdditionalDependencies>setupapi.lib;newdev.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎examples/.msvc/zadig.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8585
<WarningLevel>Level3</WarningLevel>
8686
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
87+
<CompileAs>CompileAsC</CompileAs>
8788
</ClCompile>
8889
<Link>
8990
<AdditionalDependencies>setupapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -106,6 +107,7 @@
106107
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
107108
<WarningLevel>Level3</WarningLevel>
108109
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
110+
<CompileAs>CompileAsC</CompileAs>
109111
</ClCompile>
110112
<Link>
111113
<AdditionalDependencies>setupapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -125,6 +127,7 @@
125127
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
126128
<WarningLevel>Level3</WarningLevel>
127129
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
130+
<CompileAs>CompileAsC</CompileAs>
128131
</ClCompile>
129132
<Link>
130133
<AdditionalDependencies>setupapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -148,6 +151,7 @@
148151
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149152
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
150153
<WarningLevel>Level3</WarningLevel>
154+
<CompileAs>CompileAsC</CompileAs>
151155
</ClCompile>
152156
<Link>
153157
<AdditionalDependencies>setupapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎examples/getopt/.msvc/getopt.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
8080
<WarningLevel>Level3</WarningLevel>
8181
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
82+
<CompileAs>CompileAsC</CompileAs>
8283
</ClCompile>
8384
<Lib>
8485
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
@@ -93,6 +94,7 @@
9394
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9495
<WarningLevel>Level3</WarningLevel>
9596
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
97+
<CompileAs>CompileAsC</CompileAs>
9698
</ClCompile>
9799
<Lib>
98100
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
@@ -104,6 +106,7 @@
104106
<PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105107
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
106108
<WarningLevel>Level3</WarningLevel>
109+
<CompileAs>CompileAsC</CompileAs>
107110
</ClCompile>
108111
<Lib>
109112
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
@@ -117,6 +120,7 @@
117120
<PreprocessorDefinitions>HAVE_STRING_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118121
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
119122
<WarningLevel>Level3</WarningLevel>
123+
<CompileAs>CompileAsC</CompileAs>
120124
</ClCompile>
121125
<Lib>
122126
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>

‎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,2,160
11-
PRODUCTVERSION 1,2,2,160
10+
FILEVERSION 1,2,2,161
11+
PRODUCTVERSION 1,2,2,161
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.2.160"
28+
VALUE "FileVersion", "1.2.2.161"
2929
VALUE "InternalName", "WDI-Simple"
3030
VALUE "LegalCopyright", "� 2010-2011 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.2.160"
34+
VALUE "ProductVersion", "1.2.2.161"
3535
VALUE "Comments", "http://libwdi.akeo.ie"
3636
END
3737
END

‎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,2,160
60-
PRODUCTVERSION 1,2,2,160
59+
FILEVERSION 1,2,2,161
60+
PRODUCTVERSION 1,2,2,161
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.2.160"
77+
VALUE "FileVersion", "1.2.2.161"
7878
VALUE "InternalName", "Zadic"
7979
VALUE "LegalCopyright", "� 2010-2011 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.2.160"
83+
VALUE "ProductVersion", "1.2.2.161"
8484
VALUE "Comments", "http://libwdi.akeo.ie"
8585
END
8686
END

‎examples/zadig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
#define FIELD_ORANGE RGB(255,240,200)
5454
#define ARROW_GREEN RGB(92,228,65)
5555
#define ARROW_ORANGE RGB(253,143,56)
56-
#define APP_VERSION "Zadig v2.0.1.160"
56+
#define APP_VERSION "Zadig v2.0.1.161"
5757

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

‎examples/zadig.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ BEGIN
174174
DEFPUSHBUTTON "OK",IDOK,231,174,50,16,WS_GROUP
175175
CONTROL "<a href=""http://libwdi.akeo.ie"">http://libwdi.akeo.ie</a>",IDC_ABOUT_LIBWDI_URL,
176176
"SysLink",WS_TABSTOP,46,47,87,9
177-
LTEXT "Version 2.0.1 (Build 160)",IDC_STATIC,46,19,78,8
177+
LTEXT "Version 2.0.1 (Build 161)",IDC_STATIC,46,19,78,8
178178
DEFPUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,174,50,16,WS_GROUP
179179
EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
180180
LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -211,8 +211,8 @@ END
211211
//
212212

213213
VS_VERSION_INFO VERSIONINFO
214-
FILEVERSION 2,0,1,160
215-
PRODUCTVERSION 2,0,1,160
214+
FILEVERSION 2,0,1,161
215+
PRODUCTVERSION 2,0,1,161
216216
FILEFLAGSMASK 0x17L
217217
#ifdef _DEBUG
218218
FILEFLAGS 0x1L
@@ -229,13 +229,13 @@ BEGIN
229229
BEGIN
230230
VALUE "CompanyName", "akeo.ie"
231231
VALUE "FileDescription", "Zadig"
232-
VALUE "FileVersion", "2.0.1.160"
232+
VALUE "FileVersion", "2.0.1.161"
233233
VALUE "InternalName", "Zadig"
234234
VALUE "LegalCopyright", "� 2010-2011 Pete Batard (GPL v3)"
235235
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
236236
VALUE "OriginalFilename", "zadig.exe"
237237
VALUE "ProductName", "Zadig"
238-
VALUE "ProductVersion", "2.0.1.160"
238+
VALUE "ProductVersion", "2.0.1.161"
239239
VALUE "Comments", "http://libwdi.akeo.ie"
240240
END
241241
END

0 commit comments

Comments
 (0)