mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
fix MinGW-w64 warnings
This commit is contained in:
parent
a472e96e87
commit
6275c5b724
7 changed files with 12 additions and 15 deletions
2
configure
vendored
2
configure
vendored
|
@ -3894,7 +3894,7 @@ fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
CFLAGS="${saved_CFLAGS}"
|
CFLAGS="${saved_CFLAGS}"
|
||||||
|
|
||||||
AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags"
|
AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Werror-implicit-function-declaration $nopointersign_cflags"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
|
||||||
[nopointersign_cflags="-Wno-pointer-sign"], [nopointersign_cflags=""])
|
[nopointersign_cflags="-Wno-pointer-sign"], [nopointersign_cflags=""])
|
||||||
CFLAGS="${saved_CFLAGS}"
|
CFLAGS="${saved_CFLAGS}"
|
||||||
|
|
||||||
AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags"
|
AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Werror-implicit-function-declaration $nopointersign_cflags"
|
||||||
|
|
||||||
AC_SUBST([VISIBILITY_CFLAGS])
|
AC_SUBST([VISIBILITY_CFLAGS])
|
||||||
AC_SUBST([AM_CFLAGS])
|
AC_SUBST([AM_CFLAGS])
|
||||||
|
|
|
@ -479,7 +479,7 @@ static BOOL FormatFAT32(DWORD DriveIndex)
|
||||||
pFAT32BootSect->sJmpBoot[0]=0xEB;
|
pFAT32BootSect->sJmpBoot[0]=0xEB;
|
||||||
pFAT32BootSect->sJmpBoot[1]=0x58; // jmp.s $+0x5a is 0xeb 0x58, not 0xeb 0x5a. Thanks Marco!
|
pFAT32BootSect->sJmpBoot[1]=0x58; // jmp.s $+0x5a is 0xeb 0x58, not 0xeb 0x5a. Thanks Marco!
|
||||||
pFAT32BootSect->sJmpBoot[2]=0x90;
|
pFAT32BootSect->sJmpBoot[2]=0x90;
|
||||||
strncpy((char*)pFAT32BootSect->sOEMName, "MSWIN4.1", 8);
|
memcpy(pFAT32BootSect->sOEMName, "MSWIN4.1", 8);
|
||||||
pFAT32BootSect->wBytsPerSec = (WORD) BytesPerSect;
|
pFAT32BootSect->wBytsPerSec = (WORD) BytesPerSect;
|
||||||
|
|
||||||
ClusterSize = (DWORD)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize));
|
ClusterSize = (DWORD)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize));
|
||||||
|
|
|
@ -71,9 +71,7 @@ extern "C" {
|
||||||
XA_FORM2_FILE = (XA_ATTR_MODE2FORM2 | XA_PERM_ALL_ALL)
|
XA_FORM2_FILE = (XA_ATTR_MODE2FORM2 | XA_PERM_ALL_ALL)
|
||||||
} xa_misc_enum_t;
|
} xa_misc_enum_t;
|
||||||
|
|
||||||
extern const char ISO_XA_MARKER_STRING[sizeof("CD-XA001")-1];
|
extern const char ISO_XA_MARKER_STRING[8];
|
||||||
|
|
||||||
#define ISO_XA_MARKER_STRING "CD-XA001"
|
|
||||||
|
|
||||||
/*! \brief "Extended Architecture" according to the Philips Yellow Book.
|
/*! \brief "Extended Architecture" according to the Philips Yellow Book.
|
||||||
|
|
||||||
|
|
|
@ -632,8 +632,7 @@ iso9660_set_pvd(void *pd,
|
||||||
memset(&ipd,0,sizeof(ipd)); /* paranoia? */
|
memset(&ipd,0,sizeof(ipd)); /* paranoia? */
|
||||||
|
|
||||||
/* magic stuff ... thatis CD XA marker... */
|
/* magic stuff ... thatis CD XA marker... */
|
||||||
strncpy(((char*)&ipd)+ISO_XA_MARKER_OFFSET, ISO_XA_MARKER_STRING,
|
strncpy(((char*)&ipd)+ISO_XA_MARKER_OFFSET, ISO_XA_MARKER_STRING,8);
|
||||||
sizeof(ISO_XA_MARKER_STRING));
|
|
||||||
|
|
||||||
ipd.type = to_711(ISO_VD_PRIMARY);
|
ipd.type = to_711(ISO_VD_PRIMARY);
|
||||||
iso9660_strncpy_pad (ipd.id, ISO_STANDARD_ID, 5, ISO9660_DCHARS);
|
iso9660_strncpy_pad (ipd.id, ISO_STANDARD_ID, 5, ISO9660_DCHARS);
|
||||||
|
|
|
@ -850,9 +850,9 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir,
|
||||||
strncpy(p_stat->filename, rr_fname, i_rr_fname+1);
|
strncpy(p_stat->filename, rr_fname, i_rr_fname+1);
|
||||||
} else {
|
} else {
|
||||||
if ('\0' == p_iso9660_dir->filename.str[1] && 1 == i_fname)
|
if ('\0' == p_iso9660_dir->filename.str[1] && 1 == i_fname)
|
||||||
strncpy (p_stat->filename, ".", sizeof("."));
|
strncpy (p_stat->filename, ".", 2);
|
||||||
else if ('\1' == p_iso9660_dir->filename.str[1] && 1 == i_fname)
|
else if ('\1' == p_iso9660_dir->filename.str[1] && 1 == i_fname)
|
||||||
strncpy (p_stat->filename, "..", sizeof(".."));
|
strncpy (p_stat->filename, "..", 3);
|
||||||
#ifdef HAVE_JOLIET
|
#ifdef HAVE_JOLIET
|
||||||
else if (u_joliet_level) {
|
else if (u_joliet_level) {
|
||||||
int i_inlen = i_fname;
|
int i_inlen = i_fname;
|
||||||
|
|
10
src/rufus.rc
10
src/rufus.rc
|
@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||||
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||||
EXSTYLE WS_EX_ACCEPTFILES
|
EXSTYLE WS_EX_ACCEPTFILES
|
||||||
CAPTION "Rufus 3.2.1388"
|
CAPTION "Rufus 3.2.1389"
|
||||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||||
BEGIN
|
BEGIN
|
||||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||||
|
@ -392,8 +392,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 3,2,1388,0
|
FILEVERSION 3,2,1389,0
|
||||||
PRODUCTVERSION 3,2,1388,0
|
PRODUCTVERSION 3,2,1389,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -411,13 +411,13 @@ BEGIN
|
||||||
VALUE "Comments", "https://akeo.ie"
|
VALUE "Comments", "https://akeo.ie"
|
||||||
VALUE "CompanyName", "Akeo Consulting"
|
VALUE "CompanyName", "Akeo Consulting"
|
||||||
VALUE "FileDescription", "Rufus"
|
VALUE "FileDescription", "Rufus"
|
||||||
VALUE "FileVersion", "3.2.1388"
|
VALUE "FileVersion", "3.2.1389"
|
||||||
VALUE "InternalName", "Rufus"
|
VALUE "InternalName", "Rufus"
|
||||||
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
|
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
|
||||||
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
|
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
|
||||||
VALUE "OriginalFilename", "rufus-3.2.exe"
|
VALUE "OriginalFilename", "rufus-3.2.exe"
|
||||||
VALUE "ProductName", "Rufus"
|
VALUE "ProductName", "Rufus"
|
||||||
VALUE "ProductVersion", "3.2.1388"
|
VALUE "ProductVersion", "3.2.1389"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Loading…
Reference in a new issue