Skip to content

Commit a5b36b4

Browse files
pbatardpbatard
committed
[misc] fix various MinGW warnings
* Also use prefer static variables in libwdi_i.h
1 parent b4a47ba commit a5b36b4

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎examples/wdi-simple.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ int __cdecl main(int argc, char** argv)
190190
log_level = WDI_LOG_LEVEL_NONE;
191191
break;
192192
case 'b':
193-
oid.hWnd = (optarg)?(HWND)strtol(optarg, NULL, 0):GetConsoleHwnd();
193+
oid.hWnd = (optarg)?(HWND)(uintptr_t)strtol(optarg, NULL, 0):GetConsoleHwnd();
194194
oic.hWnd = oid.hWnd;
195195
break;
196196
case 'l':

‎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,3,713,0
11-
PRODUCTVERSION 1,3,713,0
10+
FILEVERSION 1,3,714,0
11+
PRODUCTVERSION 1,3,714,0
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.3.713"
28+
VALUE "FileVersion", "1.3.714"
2929
VALUE "InternalName", "WDI-Simple"
3030
VALUE "LegalCopyright", "� 2010-2017 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.3.713"
34+
VALUE "ProductVersion", "1.3.714"
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,3,713,0
60-
PRODUCTVERSION 1,3,713,0
59+
FILEVERSION 1,3,714,0
60+
PRODUCTVERSION 1,3,714,0
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.3.713"
77+
VALUE "FileVersion", "1.3.714"
7878
VALUE "InternalName", "Zadic"
7979
VALUE "LegalCopyright", "� 2010-2017 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.3.713"
83+
VALUE "ProductVersion", "1.3.714"
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
@@ -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.3.713"
62+
#define APP_VERSION "Zadig 2.3.714"
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
@@ -246,8 +246,8 @@ END
246246
//
247247

248248
VS_VERSION_INFO VERSIONINFO
249-
FILEVERSION 2,3,713,0
250-
PRODUCTVERSION 2,3,713,0
249+
FILEVERSION 2,3,714,0
250+
PRODUCTVERSION 2,3,714,0
251251
FILEFLAGSMASK 0x17L
252252
#ifdef _DEBUG
253253
FILEFLAGS 0x1L
@@ -264,13 +264,13 @@ BEGIN
264264
BEGIN
265265
VALUE "CompanyName", "akeo.ie"
266266
VALUE "FileDescription", "Zadig"
267-
VALUE "FileVersion", "2.3.713"
267+
VALUE "FileVersion", "2.3.714"
268268
VALUE "InternalName", "Zadig"
269269
VALUE "LegalCopyright", "� 2010-2017 Pete Batard (GPL v3)"
270270
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
271271
VALUE "OriginalFilename", "zadig.exe"
272272
VALUE "ProductName", "Zadig"
273-
VALUE "ProductVersion", "2.3.713"
273+
VALUE "ProductVersion", "2.3.714"
274274
VALUE "Comments", "http://libwdi.akeo.ie"
275275
END
276276
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,3,713,0
54-
PRODUCTVERSION 1,3,713,0
53+
FILEVERSION 1,3,714,0
54+
PRODUCTVERSION 1,3,714,0
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.3.713"
71+
VALUE "FileVersion", "1.3.714"
7272
VALUE "InternalName", "libwdi"
7373
VALUE "LegalCopyright", "� 2010-2017 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.3.713"
77+
VALUE "ProductVersion", "1.3.714"
7878
VALUE "Comments", "http://libwdi.akeo.ie"
7979
END
8080
END

‎libwdi/libwdi_i.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ enum INF_TAGS
8989
LK_EQ_X64,
9090
};
9191

92-
token_entity_t inf_entities[]=
92+
static token_entity_t inf_entities[]=
9393
{
9494
{"INF_FILENAME",""},
9595
{"CAT_FILENAME",""},
@@ -120,8 +120,8 @@ token_entity_t inf_entities[]=
120120
* installed automatically, which will only leave the driverless debug interface to pick
121121
* a driver for.
122122
*/
123-
const char* android_device_guid = "{f72fe0d4-cbcb-407d-8814-9ed673d0dd6b}";
124-
const struct {uint16_t vid; uint16_t pid;} android_device[] = {
123+
static const char* android_device_guid = "{f72fe0d4-cbcb-407d-8814-9ed673d0dd6b}";
124+
static const struct {uint16_t vid; uint16_t pid;} android_device[] = {
125125
{0x0451, 0xD022},
126126
{0x0451, 0xD101},
127127
{0x0489, 0xC001},

‎libwdi/pki.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ char* winpki_error_str(uint32_t retval)
442442
case CRYPT_E_NO_TRUSTED_SIGNER:
443443
return "None of the signers of the cryptographic message or certificate trust list is trusted.";
444444
default:
445-
static_sprintf(error_string, "Unknown PKI error 0x%08lX", error_code);
445+
static_sprintf(error_string, "Unknown PKI error 0x%08X", error_code);
446446
return error_string;
447447
}
448448
}

0 commit comments

Comments
 (0)