diff options
author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-14 00:00:00 +0000 |
---|---|---|
committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2024-05-15 23:55:04 +0500 |
commit | fc662341e6f85da78ada0e443f6116b978f79f22 (patch) | |
tree | 1be1cc402a7a9cbc18d4eeea6b141354c2d559e3 /C/Util/SfxSetup | |
parent | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (diff) | |
download | 7zip-24.05.tar.gz 7zip-24.05.tar.bz2 7zip-24.05.zip |
24.0524.05
Diffstat (limited to 'C/Util/SfxSetup')
-rw-r--r-- | C/Util/SfxSetup/Precomp.h | 13 | ||||
-rw-r--r-- | C/Util/SfxSetup/SfxSetup.c | 17 | ||||
-rw-r--r-- | C/Util/SfxSetup/makefile | 8 |
3 files changed, 21 insertions, 17 deletions
diff --git a/C/Util/SfxSetup/Precomp.h b/C/Util/SfxSetup/Precomp.h index bc8fa21..13a41ef 100644 --- a/C/Util/SfxSetup/Precomp.h +++ b/C/Util/SfxSetup/Precomp.h | |||
@@ -1,14 +1,13 @@ | |||
1 | /* Precomp.h -- StdAfx | 1 | /* Precomp.h -- Precomp |
2 | 2023-03-04 : Igor Pavlov : Public domain */ | 2 | 2024-01-23 : Igor Pavlov : Public domain */ |
3 | 3 | ||
4 | #ifndef ZIP7_INC_PRECOMP_H | 4 | // #ifndef ZIP7_INC_PRECOMP_LOC_H |
5 | #define ZIP7_INC_PRECOMP_H | 5 | // #define ZIP7_INC_PRECOMP_LOC_H |
6 | 6 | ||
7 | #if defined(_MSC_VER) && _MSC_VER >= 1800 | 7 | #if defined(_MSC_VER) && _MSC_VER >= 1800 |
8 | #pragma warning(disable : 4464) // relative include path contains '..' | 8 | #pragma warning(disable : 4464) // relative include path contains '..' |
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #include "../../Compiler.h" | 11 | #include "../../Precomp.h" |
12 | #include "../../7zTypes.h" | ||
13 | 12 | ||
14 | #endif | 13 | // #endif |
diff --git a/C/Util/SfxSetup/SfxSetup.c b/C/Util/SfxSetup/SfxSetup.c index 7304a0b..9b5c1f9 100644 --- a/C/Util/SfxSetup/SfxSetup.c +++ b/C/Util/SfxSetup/SfxSetup.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* SfxSetup.c - 7z SFX Setup | 1 | /* SfxSetup.c - 7z SFX Setup |
2 | 2019-02-02 : Igor Pavlov : Public domain */ | 2 | 2024-01-24 : Igor Pavlov : Public domain */ |
3 | 3 | ||
4 | #include "Precomp.h" | 4 | #include "Precomp.h" |
5 | 5 | ||
@@ -278,10 +278,10 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, | |||
278 | #ifdef _CONSOLE | 278 | #ifdef _CONSOLE |
279 | SetConsoleCtrlHandler(HandlerRoutine, TRUE); | 279 | SetConsoleCtrlHandler(HandlerRoutine, TRUE); |
280 | #else | 280 | #else |
281 | UNUSED_VAR(hInstance); | 281 | UNUSED_VAR(hInstance) |
282 | UNUSED_VAR(hPrevInstance); | 282 | UNUSED_VAR(hPrevInstance) |
283 | UNUSED_VAR(lpCmdLine); | 283 | UNUSED_VAR(lpCmdLine) |
284 | UNUSED_VAR(nCmdShow); | 284 | UNUSED_VAR(nCmdShow) |
285 | #endif | 285 | #endif |
286 | 286 | ||
287 | CrcGenerateTable(); | 287 | CrcGenerateTable(); |
@@ -516,12 +516,13 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, | |||
516 | #endif | 516 | #endif |
517 | 517 | ||
518 | { | 518 | { |
519 | const SRes res2 = File_Close(&outFile); | 519 | const WRes res2 = File_Close(&outFile); |
520 | if (res != SZ_OK) | 520 | if (res != SZ_OK) |
521 | break; | 521 | break; |
522 | if (res2 != SZ_OK) | 522 | if (res2 != 0) |
523 | { | 523 | { |
524 | res = res2; | 524 | errorMessage = "Can't close output file"; |
525 | res = SZ_ERROR_FAIL; | ||
525 | break; | 526 | break; |
526 | } | 527 | } |
527 | } | 528 | } |
diff --git a/C/Util/SfxSetup/makefile b/C/Util/SfxSetup/makefile index bc0cf8b..b3f25a2 100644 --- a/C/Util/SfxSetup/makefile +++ b/C/Util/SfxSetup/makefile | |||
@@ -9,8 +9,6 @@ C_OBJS = \ | |||
9 | $O\7zArcIn.obj \ | 9 | $O\7zArcIn.obj \ |
10 | $O\7zBuf.obj \ | 10 | $O\7zBuf.obj \ |
11 | $O\7zBuf2.obj \ | 11 | $O\7zBuf2.obj \ |
12 | $O\7zCrc.obj \ | ||
13 | $O\7zCrcOpt.obj \ | ||
14 | $O\7zFile.obj \ | 12 | $O\7zFile.obj \ |
15 | $O\7zDec.obj \ | 13 | $O\7zDec.obj \ |
16 | $O\7zStream.obj \ | 14 | $O\7zStream.obj \ |
@@ -27,9 +25,13 @@ C_OBJS = \ | |||
27 | 7Z_OBJS = \ | 25 | 7Z_OBJS = \ |
28 | $O\SfxSetup.obj \ | 26 | $O\SfxSetup.obj \ |
29 | 27 | ||
28 | !include "../../../CPP/7zip/Crc.mak" | ||
29 | # !include "../../../CPP/7zip/LzmaDec.mak" | ||
30 | |||
30 | OBJS = \ | 31 | OBJS = \ |
31 | $(7Z_OBJS) \ | 32 | $(7Z_OBJS) \ |
32 | $(C_OBJS) \ | 33 | $(C_OBJS) \ |
34 | $(ASM_OBJS) \ | ||
33 | $O\resource.res | 35 | $O\resource.res |
34 | 36 | ||
35 | !include "../../../CPP/Build.mak" | 37 | !include "../../../CPP/Build.mak" |
@@ -38,3 +40,5 @@ $(7Z_OBJS): $(*B).c | |||
38 | $(COMPL_O1) | 40 | $(COMPL_O1) |
39 | $(C_OBJS): ../../$(*B).c | 41 | $(C_OBJS): ../../$(*B).c |
40 | $(COMPL_O1) | 42 | $(COMPL_O1) |
43 | |||
44 | !include "../../Asm_c.mak" | ||