summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MSVC/Baltisot - generic/Baltisot - generic.vcproj79
-rw-r--r--MSVC/Tools/Tools.vcproj12
-rw-r--r--MSVC/Tools/master.mak4
-rw-r--r--PE/reinsert-res.h4
-rw-r--r--PE/reinsert.cpp5
-rw-r--r--PE/reinsert.rc10
-rw-r--r--lib/cdutils.cpp2
7 files changed, 106 insertions, 10 deletions
diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index aa9996b..76dc8da 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -193,6 +193,85 @@
RelativePath="..\getopt\getopt1.c">
</File>
</Filter>
+ <Filter
+ Name="Zlib (external)"
+ Filter="">
+ <File
+ RelativePath="..\..\..\zlibsrc\adler32.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\compress.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\crc32.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\deflate.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\deflate.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\gzio.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\infblock.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\infblock.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\infcodes.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\infcodes.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\inffast.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\inffast.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\inffixed.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\inflate.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\inftrees.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\inftrees.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\infutil.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\infutil.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\trees.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\trees.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\uncompr.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\zconf.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\zlib.h">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\zutil.c">
+ </File>
+ <File
+ RelativePath="..\..\..\zlibsrc\zutil.h">
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj
index 84bdbd0..2e2174b 100644
--- a/MSVC/Tools/Tools.vcproj
+++ b/MSVC/Tools/Tools.vcproj
@@ -107,6 +107,9 @@
Name="Parasite Eve tools"
Filter="">
<File
+ RelativePath="..\..\PE\aya.ico">
+ </File>
+ <File
RelativePath="..\..\PE\compil.lex">
</File>
<File
@@ -125,9 +128,18 @@
RelativePath="..\..\PE\nmakefile">
</File>
<File
+ RelativePath="..\..\PE\reinsert-res.h">
+ </File>
+ <File
RelativePath="..\..\PE\reinsert.cpp">
</File>
<File
+ RelativePath="..\..\PE\reinsert.h">
+ </File>
+ <File
+ RelativePath="..\..\PE\reinsert.rc">
+ </File>
+ <File
RelativePath="..\..\PE\table.h">
</File>
</Filter>
diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak
index d855ee8..82a7f16 100644
--- a/MSVC/Tools/master.mak
+++ b/MSVC/Tools/master.mak
@@ -48,9 +48,9 @@ _XSD=xsd.exe
#define our basic link line for managed code
!IFDEF DEBUG
-_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBC
+_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:I386 /NODEFAULTLIB:LIBC
!ELSE
-_LINK=link.exe /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBCD
+_LINK=link.exe /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /MACHINE:I386 /NODEFAULTLIB:LIBCD
!ENDIF
#this is used for compiling C# samples
diff --git a/PE/reinsert-res.h b/PE/reinsert-res.h
index 49a5da7..41773fb 100644
--- a/PE/reinsert-res.h
+++ b/PE/reinsert-res.h
@@ -4,6 +4,8 @@
//
#define IDI_ICON 101
#define IDD_ABOUT 102
+#define IDC_LIST1 1001
+#define IDC_LIST 1001
// Next default values for new objects
//
@@ -11,7 +13,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 103
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_CONTROL_VALUE 1002
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/PE/reinsert.cpp b/PE/reinsert.cpp
index 3a8244b..c44354d 100644
--- a/PE/reinsert.cpp
+++ b/PE/reinsert.cpp
@@ -12,6 +12,7 @@
BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
+ Base::printm(M_INFO, "AboutDlgProc: uMsg = %i (0x%x)\n", uMsg, uMsg);
switch(uMsg)
{
case WM_COMMAND:
@@ -33,10 +34,10 @@ virtual int startup() throw (GeneralException) {
Handle * iw;
cdutils * cd;
- DialogBox(0, MAKEINTRESOURCE(IDD_ABOUT), GetActiveWindow(), AboutDlgProc);
-
verbosity = M_INFO;
+ DialogBox(0, MAKEINTRESOURCE(IDD_ABOUT), GetActiveWindow(), AboutDlgProc);
+
ir = new Input("PE1.bin");
iw = new Output("PE1.bin", 0, 0);
cd = new cdutils(ir, iw);
diff --git a/PE/reinsert.rc b/PE/reinsert.rc
index b6975dc..38e482d 100644
--- a/PE/reinsert.rc
+++ b/PE/reinsert.rc
@@ -113,14 +113,14 @@ END
// Dialog
//
-IDD_ABOUT DIALOGEX 0, 0, 186, 95
+IDD_ABOUT DIALOGEX 0, 0, 335, 223
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK",IDOK,129,7,50,14
- PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
+ DEFPUSHBUTTON "OK",IDOK,278,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,278,24,50,14
END
@@ -135,9 +135,9 @@ BEGIN
IDD_ABOUT, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 179
+ RIGHTMARGIN, 328
TOPMARGIN, 7
- BOTTOMMARGIN, 88
+ BOTTOMMARGIN, 216
END
END
#endif // APSTUDIO_INVOKED
diff --git a/lib/cdutils.cpp b/lib/cdutils.cpp
index 81744e8..85780df 100644
--- a/lib/cdutils.cpp
+++ b/lib/cdutils.cpp
@@ -251,6 +251,8 @@ void cdutils::write_sector(Byte * buffer, int type, int number) {
if (number >= 0) {
sector_seek(number);
+ } else {
+ number = f_iso_r->tell() / 2352;
}
f_iso_r->read(old_sector, 2352);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 05:56:53 +0000