From de5167a304b5e3b2db7462329334ac01d492d72c Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 1 Apr 2004 04:35:55 +0000 Subject: - Fixes all round - Uncontiguous FAT - Move to C (instead of C++) - Preparing for porting --- win32/win32.dsp | 86 ++++++++++++++++++++++++++++++++++++--------------------- win32/win32.dsw | 2 +- 2 files changed, 56 insertions(+), 32 deletions(-) (limited to 'win32') diff --git a/win32/win32.dsp b/win32/win32.dsp index dbb5213..91efad7 100644 --- a/win32/win32.dsp +++ b/win32/win32.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="Scrounge" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="win32" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=Scrounge - Win32 Debug +CFG=win32 - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "Scrounge.mak". +!MESSAGE NMAKE /f "win32.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "Scrounge.mak" CFG="Scrounge - Win32 Debug" +!MESSAGE NMAKE /f "win32.mak" CFG="win32 - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "Scrounge - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Scrounge - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "win32 - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "win32 - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=Scrounge - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "Scrounge - Win32 Release" +!IF "$(CFG)" == "win32 - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -41,8 +41,8 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "UNICODE" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -50,10 +50,10 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /opt:nowin98 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/scrounge-ntfs.exe" /opt:nowin98 # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "Scrounge - Win32 Debug" +!ELSEIF "$(CFG)" == "win32 - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -66,8 +66,8 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "UNICODE" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -75,44 +75,52 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/scrounge-ntfs.exe" /pdbtype:sept !ENDIF # Begin Target -# Name "Scrounge - Win32 Release" -# Name "Scrounge - Win32 Debug" +# Name "win32 - Win32 Release" +# Name "win32 - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\drive.cpp -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\src\compat.c # End Source File # Begin Source File -SOURCE=.\memref.cpp -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\src\list.c # End Source File # Begin Source File -SOURCE=.\ntfs.cpp -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=..\src\main.c # End Source File # Begin Source File -SOURCE=.\ntfsx.cpp +SOURCE=..\src\misc.c # End Source File # Begin Source File -SOURCE=.\Scrounge.cpp +SOURCE=..\src\ntfs.c # End Source File # Begin Source File -SOURCE=.\StdAfx.cpp -# ADD CPP /Yc"stdafx.h" +SOURCE=..\src\ntfsx.c +# End Source File +# Begin Source File + +SOURCE=..\src\scrounge.c +# End Source File +# Begin Source File + +SOURCE=..\src\search.c +# End Source File +# Begin Source File + +SOURCE=..\src\win32.c # End Source File # End Group # Begin Group "Header Files" @@ -120,23 +128,39 @@ SOURCE=.\StdAfx.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=.\drive.h +SOURCE=..\src\compat.h +# End Source File +# Begin Source File + +SOURCE=..\src\debug.h +# End Source File +# Begin Source File + +SOURCE=..\src\drive.h +# End Source File +# Begin Source File + +SOURCE=..\src\locks.h +# End Source File +# Begin Source File + +SOURCE=..\src\memref.h # End Source File # Begin Source File -SOURCE=.\ntfs.h +SOURCE=..\src\ntfs.h # End Source File # Begin Source File -SOURCE=.\ntfsx.h +SOURCE=..\src\ntfsx.h # End Source File # Begin Source File -SOURCE=.\scrounge.h +SOURCE=..\src\scrounge.h # End Source File # Begin Source File -SOURCE=.\StdAfx.h +SOURCE=..\src\usuals.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/win32/win32.dsw b/win32/win32.dsw index b27fd20..5c8ab56 100644 --- a/win32/win32.dsw +++ b/win32/win32.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "Scrounge"=.\Scrounge.dsp - Package Owner=<4> +Project: "win32"=".\win32.dsp" - Package Owner=<4> Package=<5> {{{ -- cgit v1.2.3