Skip to content

Commit 262b7fa

Browse files
pbatardpbatard
committed
[zadig] Zadig 2.1.0
1 parent f0479b6 commit 262b7fa

File tree

16 files changed

+52
-36
lines changed

16 files changed

+52
-36
lines changed

‎_bm.sh‎

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

5-
zadig_version=2.2.0.656
5+
zadig_version=2.1.0.657
66
target_dir=/e/dailies/libwdi
77

88
type -P git &>/dev/null || { echo "Git not found. Aborting." >&2; exit 1; }
99
type -P upx &>/dev/null || { echo "UPX executable not found. Aborting." >&2; exit 1; }
1010

11-
# Build Zadig for Vista and later (KMDF v1.11)
11+
# Build Zadig for XP (KMDF v1.09)
1212
git clean -fdx
13-
./autogen.sh --disable-shared --disable-debug --with-wdfver=1011
13+
./autogen.sh --disable-shared --disable-debug --with-wdfver=1009
1414

1515
cd libwdi
1616
make -j2
@@ -21,19 +21,19 @@ make -j2 zadig.exe
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"; }
2323
upx --lzma zadig.exe
24-
cp zadig.exe $target_dir/zadig.exe
24+
cp zadig.exe $target_dir/zadig_xp.exe
2525
cd ..
2626

27-
# Build Zadig for XP (KMDF v1.09)
27+
# Build Zadig for Vista and later (KMDF v1.11)
2828
git clean -fdx
29-
./autogen.sh --disable-shared --disable-debug --with-wdfver=1009
29+
./autogen.sh --disable-shared --disable-debug --with-wdfver=1011
3030

3131
cd libwdi
3232
make -j2
3333
cd ../examples
3434
make -j2 zadig.exe
3535
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"; }
3636
upx --lzma zadig.exe
37-
cp zadig.exe $target_dir/zadig_xp.exe
38-
cmd.exe /k zadig_sign.bat "$target_dir/zadig.exe" "$target_dir/zadig_xp.exe"
37+
cp zadig.exe $target_dir/zadig.exe
38+
cmd.exe /k zadig_sign.bat "$target_dir/zadig_xp.exe" "$target_dir/zadig.exe"
3939
cd ..

‎_chzver.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ s/^zadig_version=.*\.\(.*\)/zadig_version=@@MAJOR@@.@@MINOR@@.@@MICRO@@.\1/
4646
_EOF
4747
sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" -e "s/@@MICRO@@/$MICRO/g" cmd.sed
4848
sed -i -f cmd.sed _bm.sh
49-
rm cmd.sed
49+
rm cmd.sed

‎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,656
11-
PRODUCTVERSION 1,2,2,656
10+
FILEVERSION 1,2,2,657
11+
PRODUCTVERSION 1,2,2,657
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.656"
28+
VALUE "FileVersion", "1.2.2.657"
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.656"
34+
VALUE "ProductVersion", "1.2.2.657"
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,656
60-
PRODUCTVERSION 1,2,2,656
59+
FILEVERSION 1,2,2,657
60+
PRODUCTVERSION 1,2,2,657
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.656"
77+
VALUE "FileVersion", "1.2.2.657"
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.656"
83+
VALUE "ProductVersion", "1.2.2.657"
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
@@ -46,7 +46,7 @@
4646
#define FIELD_ORANGE RGB(255,240,200)
4747
#define ARROW_GREEN RGB(92,228,65)
4848
#define ARROW_ORANGE RGB(253,143,56)
49-
#define APP_VERSION "Zadig 2.2.0.656"
49+
#define APP_VERSION "Zadig 2.1.0.657"
5050

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

‎examples/zadig.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ END
242242
//
243243

244244
VS_VERSION_INFO VERSIONINFO
245-
FILEVERSION 2,2,0,656
246-
PRODUCTVERSION 2,2,0,656
245+
FILEVERSION 2,1,0,657
246+
PRODUCTVERSION 2,1,0,657
247247
FILEFLAGSMASK 0x17L
248248
#ifdef _DEBUG
249249
FILEFLAGS 0x1L
@@ -260,13 +260,13 @@ BEGIN
260260
BEGIN
261261
VALUE "CompanyName", "akeo.ie"
262262
VALUE "FileDescription", "Zadig"
263-
VALUE "FileVersion", "2.2.0.656"
263+
VALUE "FileVersion", "2.1.0.657"
264264
VALUE "InternalName", "Zadig"
265-
VALUE "LegalCopyright", "� 2010-2013 Pete Batard (GPL v3)"
265+
VALUE "LegalCopyright", "� 2010-2014 Pete Batard (GPL v3)"
266266
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
267267
VALUE "OriginalFilename", "zadig.exe"
268268
VALUE "ProductName", "Zadig"
269-
VALUE "ProductVersion", "2.2.0.656"
269+
VALUE "ProductVersion", "2.1.0.657"
270270
VALUE "Comments", "http://libwdi.akeo.ie"
271271
END
272272
END

‎examples/zadig_README.creole‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
=== v2.1.0 (2014.02.03) ===
2+
* Fix a crash when listing all devices on machines with intel USB 3.0 controllers
3+
* Fix multiple issues with paths containing spaces
4+
* Use the Google Device Interface GUID when an Android device is detected. This allows the use of Zadig to install the debug port driver for adb & fastboot.
5+
* Add auto-update feature
6+
* Update versioning scheme
7+
* embedded drivers: WinUSB v6.1.7600.16385, libusb-win32 v1.2.6.0 & libusbK v3.0.6.0
8+
19
=== v2.0.1.162 (2013.11.20): ===
210
* fix support for devices that have a comma in their description
311
* fix usage of relative directories for driver files

‎examples/zadig_license.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const char* about_blurb_format =
2121
"{\\b\\fs20Zadig - The Automated Driver Installer}\\line\n"
2222
"\\fs18Version %d.%d.%d (Build %d)\\line\n"
2323
"\\line\n"
24-
"Copyright © 2010-2013 Pete Batard / Akeo\\line\n"
24+
"Copyright © 2010-2014 Pete Batard / Akeo\\line\n"
2525
APPLICATION_URL "\\line\n"
2626
"\\line\n"
2727
"Report bugs or request enhancements at:\\line\n"

‎examples/zadig_net.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
489489
// At this stage we can query the server for various update version files.
490490
// We first try to lookup for "<appname>_<os_arch>_<os_version_major>_<os_version_minor>.ver"
491491
// and then remove each each of the <os_> components until we find our match. For instance, we may first
492-
// look for rufus_win_x64_6.2.ver (Win8 x64) but only get a match for rufus_win_x64_6.ver (Vista x64 or later)
492+
// look for <app_name>_win_x64_6.2.ver (Win8 x64) but only get a match for <app_name>_win_x64_6.ver (Vista x64 or later)
493493
// This allows sunsetting OS versions (eg XP) or providing different downloads for different archs/groups.
494494
safe_sprintf(urlpath, sizeof(urlpath), "%s%s%s_%s_%d.%d.ver", APPLICATION_NAME, (k==0)?"":"_",
495495
(k==0)?"":channel[k], archname[is_x64()?1:0], os_version.dwMajorVersion, os_version.dwMinorVersion);
@@ -602,7 +602,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
602602
case 3:
603603
case 4:
604604
print_status(3000, FALSE, found_new_version?"A new version of " APPLICATION_NAME " is available!":
605-
"No new version of" APPLICATION_NAME "was found");
605+
"No new version of " APPLICATION_NAME " was found");
606606
default:
607607
break;
608608
}

‎examples/zadig_parser.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ static __inline char* get_sanitized_token_data_buffer(const char* token, unsigne
208208
}
209209

210210
/*
211-
* Parse an update data file and populates a rufus_update structure.
211+
* Parse an update data file and populates an update structure.
212212
* NB: since this is remote data, and we're running elevated, it *IS* considered
213213
* potentially malicious, even if it comes from a supposedly trusted server.
214214
* len should be the size of the buffer, including the zero terminator

0 commit comments

Comments
 (0)