Skip to content

Commit fe9b137

Browse files
committed
[wue] forward wrapper parameters to original setup.exe
* Also fix MinGW builds from outside of root directory * Closes #2751 * Closes #2752
1 parent 688f011 commit fe9b137

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.mingw/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ all: crypt32-delaylib.lib dwmapi-delaylib.lib setupapi-delaylib.lib version-dela
2929
$(AM_V_DLLTOOL) --input-def $< --output-delaylib $@ --dllname $(basename $<).dll
3030

3131
clean:
32-
$(RM) -rf *.lib
32+
$(RM) -f $(CURDIR)/*.lib

.mingw/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ all: crypt32-delaylib.lib dwmapi-delaylib.lib setupapi-delaylib.lib version-dela
377377
$(AM_V_DLLTOOL) --input-def $< --output-delaylib $@ --dllname $(basename $<).dll
378378

379379
clean:
380-
$(RM) -rf *.lib
380+
$(RM) -f $(CURDIR)/*.lib
381381

382382
# Tell versions [3.59,3.63) of GNU make to not export all variables.
383383
# Otherwise a system limit (for SysV at least) may be exceeded.

res/setup/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
118118
si.cb = sizeof(si);
119119
si.dwFlags = STARTF_USESHOWWINDOW;
120120
si.wShowWindow = SW_SHOWNORMAL;
121-
CreateProcessA("setup.dll", NULL, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi);
121+
CreateProcessA("setup.dll", lpCmdLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi);
122122
CloseHandle(pi.hProcess);
123123
CloseHandle(pi.hThread);
124124

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ rufus_SOURCES = badblocks.c dev.c dos.c dos_locale.c drive.c format.c format_ext
1919
localization.c net.c parser.c pki.c process.c re.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c ui.c vhd.c wue.c xml.c
2020
rufus_CFLAGS = -I$(srcdir)/ms-sys/inc -I$(srcdir)/syslinux/libfat -I$(srcdir)/syslinux/libinstaller -I$(srcdir)/syslinux/win -I$(srcdir)/libcdio -I$(srcdir)/wimlib -I$(srcdir)/../res $(AM_CFLAGS) \
2121
-DEXT2_FLAT_INCLUDES=0 -D_RUFUS -DSOLUTION=rufus
22-
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows -L $(srcdir)/../.mingw
22+
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows -L../.mingw
2323
rufus_LDADD = rufus_rc.o bled/libbled.a ext2fs/libext2fs.a ms-sys/libmssys.a syslinux/libfat/libfat.a syslinux/libinstaller/libinstaller.a syslinux/win/libwin.a \
2424
libcdio/iso9660/libiso9660.a libcdio/udf/libudf.a libcdio/driver/libdriver.a wimlib/libwim.a $(NONVULNERABLE_LIBS) $(VULNERABLE_LIBS)

src/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ rufus_SOURCES = badblocks.c dev.c dos.c dos_locale.c drive.c format.c format_ext
289289
rufus_CFLAGS = -I$(srcdir)/ms-sys/inc -I$(srcdir)/syslinux/libfat -I$(srcdir)/syslinux/libinstaller -I$(srcdir)/syslinux/win -I$(srcdir)/libcdio -I$(srcdir)/wimlib -I$(srcdir)/../res $(AM_CFLAGS) \
290290
-DEXT2_FLAT_INCLUDES=0 -D_RUFUS -DSOLUTION=rufus
291291

292-
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows -L $(srcdir)/../.mingw
292+
rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows -L../.mingw
293293
rufus_LDADD = rufus_rc.o bled/libbled.a ext2fs/libext2fs.a ms-sys/libmssys.a syslinux/libfat/libfat.a syslinux/libinstaller/libinstaller.a syslinux/win/libwin.a \
294294
libcdio/iso9660/libiso9660.a libcdio/udf/libudf.a libcdio/driver/libdriver.a wimlib/libwim.a $(NONVULNERABLE_LIBS) $(VULNERABLE_LIBS)
295295

src/rufus.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
3333
IDD_DIALOG DIALOGEX 12, 12, 232, 326
3434
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
3535
EXSTYLE WS_EX_ACCEPTFILES
36-
CAPTION "Rufus 4.8.2250"
36+
CAPTION "Rufus 4.8.2251"
3737
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
3838
BEGIN
3939
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -407,8 +407,8 @@ END
407407
//
408408

409409
VS_VERSION_INFO VERSIONINFO
410-
FILEVERSION 4,8,2250,0
411-
PRODUCTVERSION 4,8,2250,0
410+
FILEVERSION 4,8,2251,0
411+
PRODUCTVERSION 4,8,2251,0
412412
FILEFLAGSMASK 0x3fL
413413
#ifdef _DEBUG
414414
FILEFLAGS 0x1L
@@ -426,13 +426,13 @@ BEGIN
426426
VALUE "Comments", "https://rufus.ie"
427427
VALUE "CompanyName", "Akeo Consulting"
428428
VALUE "FileDescription", "Rufus"
429-
VALUE "FileVersion", "4.8.2250"
429+
VALUE "FileVersion", "4.8.2251"
430430
VALUE "InternalName", "Rufus"
431431
VALUE "LegalCopyright", "� 2011-2025 Pete Batard (GPL v3)"
432432
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
433433
VALUE "OriginalFilename", "rufus-4.8.exe"
434434
VALUE "ProductName", "Rufus"
435-
VALUE "ProductVersion", "4.8.2250"
435+
VALUE "ProductVersion", "4.8.2251"
436436
END
437437
END
438438
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)