From 0defc28b09a9cf7c2d0ef3ba428c7f9ea483dfd0 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sun, 21 Jul 2013 20:56:20 +0100 Subject: [PATCH] [wdk] fix _fseeki64 could not be located in msvcrt.dll on XP * Closes #162 * Also remove unwanted SetThreadLocale() in rufus.c --- src/libcdio/config.h | 22 +++++++++++++++------- src/rufus.c | 2 -- src/rufus.rc | 10 +++++----- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/libcdio/config.h b/src/libcdio/config.h index 6bad847e..974b7886 100644 --- a/src/libcdio/config.h +++ b/src/libcdio/config.h @@ -29,13 +29,26 @@ /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 +/* Define to 1 if you have the `lseek64' function. */ +#define HAVE_LSEEK64 1 +/* The equivalent of lseek64 on MSVC is _lseeki64 */ +#define lseek64 _lseeki64 + /* Define to 1 if you have the `fseeko' function. */ /* #undef HAVE_FSEEKO */ /* Define to 1 if you have the `fseeko64' function. */ #define HAVE_FSEEKO64 1 -/* The equivalent of fseeko64 for MSVC is _fseeki64 */ -#if defined(_MSC_VER) +/* The equivalent of fseeko64 for MSVC is _fseeki64, however this */ +/* is not available on XP when build with WDK (but _lseeki64 is) */ +#if defined(DDKBUILD) +#include +#include +#include +static __inline int fseeko64(FILE *stream, __int64 offset, int origin) { + return (lseek64(_fileno(stream), offset, origin) == -1L)?-1:0; +} +#else #define fseeko64 _fseeki64 #endif @@ -58,11 +71,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 -/* Define to 1 if you have the `lseek64' function. */ -#define HAVE_LSEEK64 1 -/* The equivalent of lseek64 on MSVC is _lseeki64 */ -#define lseek64 _lseeki64 - /* Define to 1 if you have the `lstat' function. */ /* #undef HAVE_LSTAT */ diff --git a/src/rufus.c b/src/rufus.c index 3d0d3da0..44512988 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1930,8 +1930,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine uprintf("*** " APPLICATION_NAME " init ***\n"); - SetThreadLocale(MAKELCID(LANG_FRENCH, SUBLANG_FRENCH)); - // Reattach the console, if we were started from commandline if (AttachConsole(ATTACH_PARENT_PROCESS) != 0) { attached_console = TRUE; diff --git a/src/rufus.rc b/src/rufus.rc index 57654333..8d0071b5 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.3.4.272" +CAPTION "Rufus v1.3.4.273" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -278,8 +278,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,4,272 - PRODUCTVERSION 1,3,4,272 + FILEVERSION 1,3,4,273 + PRODUCTVERSION 1,3,4,273 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -296,13 +296,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.3.4.272" + VALUE "FileVersion", "1.3.4.273" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2013 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.4.272" + VALUE "ProductVersion", "1.3.4.273" END END BLOCK "VarFileInfo"