[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

win32 diffs

To: penguinplay@sunsite.auc.dk
Subject: win32 diffs
From: Peter Burns <pcburns@zipworld.com.au>
Date: Fri, 03 Mar 2000 09:18:45 +0000
Reply-To: penguinplay@sunsite.auc.dk

I have attached the diffs that I made for the win32 changes.

Peter Burns

Only in penguinplay/src/PenguinFile: .deps
Only in penguinplay/src/PenguinFile: .libs
Only in penguinplay/src/PenguinFile: CVS
Only in win32pp/src/PenguinFile: Debug
diff win32pp/src/PenguinFile/Directory.h penguinplay/src/PenguinFile/Directory.h
654c654
< #if _MSC_VER < 1200
---
> #ifdef _MSC_VER
diff win32pp/src/PenguinFile/EmptyFSEntityContainer.h penguinplay/src/PenguinFile/EmptyFSEntityContainer.h
204c204
< #if _MSC_VER < 1200
---
> #ifdef _MSC_VER
diff win32pp/src/PenguinFile/FSEntityContainer.h penguinplay/src/PenguinFile/FSEntityContainer.h
202,216c202
< /*
<    Compiler                           _MSC_VER value
<    --------                           --------------
<    C Compiler version 6.0                  600
<    C/C++ compiler version 7.0              700
<    Visual C++, Windows, version 1.0        800
<    Visual C++, 32-bit, version 1.0         800
<    Visual C++, Windows, version 2.0        900
<    Visual C++, 32-bit, version 2.x         900
<    Visual C++, 32-bit, version 4.0         1000
<    Visual C++, 32-bit, version 5.0         1100
<    Visual C++, 32-bit, version 6.0         1200
< */
< 
< #if _MSC_VER < 1200
---
> #ifdef _MSC_VER
diff win32pp/src/PenguinFile/FileGlobalData.cpp penguinplay/src/PenguinFile/FileGlobalData.cpp
44c44
< FileGlobalData *FileGlobalData::m_instance = 0;
---
> FileGlobalData *FileGlobalData::instance = 0;
55d54
< :  m_current_vfs_wd(0)
59,61c58,60
< 		m_mounted_fs      [i] = 0;
< 		m_fs_urls         [i] = 0;
< 		m_fs_mount_points [i] = 0;
---
> 		mounted_fs      [i] = 0;
> 		fs_urls         [i] = 0;
> 		fs_mount_points [i] = 0;
67,68c66,67
< 		m_dir_tree = new GenericDir ("/", 1);
< 		m_dir_tree->MakeTopDir();
---
> 		dir_tree = new GenericDir ("/", 1);
> 		dir_tree->MakeTopDir();
75c74
< 	m_mount_count = 0;
---
> 	mount_count = 0;
92c91
< 			if (m_mounted_fs [i] != 0)
---
> 			if (mounted_fs [i] != 0)
94c93
< 				if (Umount (*(m_fs_urls [i]), ppfMF_force) == 0)
---
> 				if (Umount (*(fs_urls [i]), ppfMF_force) == 0)
101c100
< 		if (m_mounted_fs [i] != 0) // one didn't umount
---
> 		if (mounted_fs [i] != 0) // one didn't umount
103c102
< 					 "cleanup", m_fs_urls [i]->GetPath ());
---
> 					 "cleanup", fs_urls [i]->GetPath ());
105,106c104,105
< 	delete m_dir_tree;
< 	m_dir_tree = 0;
---
> 	delete dir_tree;
> 	dir_tree = 0;
115c114
< 	if (m_instance == 0)
---
> 	if (instance == 0)
118c117
< 			m_instance = new FileGlobalData ();
---
> 			instance = new FileGlobalData ();
124c123
< 	return *m_instance;
---
> 	return *instance;
134c133
< /**
---
> /*
177c176
< 	int i=0; while (m_mounted_fs [i] != 0) i++;
---
> 	int i=0; while (mounted_fs [i] != 0) i++;
186c185
< 	m_mounted_fs [i] = TheFS;
---
> 	mounted_fs [i] = TheFS;
189,195c188,194
< 		m_fs_urls        [i] = new URLInfo (What);
< 		m_fs_urls        [i]->ToAbsolute ();
< 		m_fs_urls        [i]->Freeze ();
< 
< 		m_fs_mount_points [i] = new URLInfo (Where);
< 		m_fs_mount_points [i]->ToAbsolute ();
< 		m_fs_mount_points [i]->Freeze ();
---
> 		fs_urls        [i] = new URLInfo (What);
> 		fs_urls        [i]->ToAbsolute ();
> 		fs_urls        [i]->Freeze ();
> 
> 		fs_mount_points [i] = new URLInfo (Where);
> 		fs_mount_points [i]->ToAbsolute ();
> 		fs_mount_points [i]->Freeze ();
209c208
< 	m_mount_count++;
---
> 	mount_count++;
225c224
< 		if (m_mounted_fs [i] != 0)
---
> 		if (mounted_fs [i] != 0)
227,228c226,227
< 			if ((*(m_fs_urls         [i]) == UInfo) ||
< 			    (*(m_fs_mount_points [i]) == UInfo))
---
> 			if ((*(fs_urls         [i]) == UInfo) ||
> 			    (*(fs_mount_points [i]) == UInfo))
230c229
< 				if (m_mounted_fs [i]->Umount (Flags) == false)
---
> 				if (mounted_fs [i]->Umount (Flags) == false)
236,243c235,242
< 				delete m_mounted_fs     [i];
< 				delete m_fs_urls        [i];
< 				delete m_fs_mount_points [i];
< 
< 				m_mounted_fs     [i] = 0;
< 				m_fs_urls        [i] = 0;
< 				m_fs_mount_points [i] = 0;
< 				m_mount_count--;
---
> 				delete mounted_fs     [i];
> 				delete fs_urls        [i];
> 				delete fs_mount_points [i];
> 
> 				mounted_fs     [i] = 0;
> 				fs_urls        [i] = 0;
> 				fs_mount_points [i] = 0;
> 				mount_count--;
262c261
< 	RetVal = SetCWD (WDPath, true);
---
> 	RetVal = SetCWD (WDPath);
270c269
< int FileGlobalData::SetCWD (const char *Path, bool IsNative) throw ()
---
> int FileGlobalData::SetCWD (const char *Path) throw ()
277,279c276,278
< 		m_current_wd_path.Init (Path, IsNative);
< 		m_current_wd_path.ToVirt ();
< 		m_current_wd_path.Freeze ();
---
> 		current_wd_path.Init (Path);
> 		current_wd_path.ToVirt ();
> 		current_wd_path.Freeze ();
284c283
< 	TmpDir = CreateSubDir (m_current_wd_path);
---
> 	TmpDir = CreateSubDir (current_wd_path);
289c288
< 		m_cwd_is_valid_for_virt = false;
---
> 		cwd_is_valid_for_virt = false;
293c292
< 		m_cwd_is_valid_for_virt = true;
---
> 		cwd_is_valid_for_virt = true;
296c295
< 	m_current_vfs_wd = TmpDir;
---
> 	current_vfs_wd = TmpDir;
301c300
< 		NativePath.Init (Path, IsNative);
---
> 		NativePath.Init (Path);
308c307
< 		m_cwd_is_valid_for_native = true;
---
> 		cwd_is_valid_for_native = true;
310c309
< 		m_cwd_is_valid_for_native = false;
---
> 		cwd_is_valid_for_native = false;
331c330
< 		TmpDirP = m_dir_tree;   // Path is absolute
---
> 		TmpDirP = dir_tree;   // Path is absolute
333c332
< 		TmpDirP = m_current_vfs_wd; // Path is relative to current WD
---
> 		TmpDirP = current_vfs_wd; // Path is relative to current WD
diff win32pp/src/PenguinFile/FileGlobalData.h penguinplay/src/PenguinFile/FileGlobalData.h
67c67
< 	int               SetCWD (const char *Path, bool IsNative = false) throw ();
---
> 	int               SetCWD (const char *Path) throw ();
70c70
< 	{ return m_current_vfs_wd; }
---
> 	{ return current_vfs_wd; }
73c73
< 	{ return m_current_wd_path; }
---
> 	{ return current_wd_path; }
76c76
< 	{ return m_cwd_is_valid_for_native; }
---
> 	{ return cwd_is_valid_for_native; }
79c79
< 	{ return m_cwd_is_valid_for_virt; }
---
> 	{ return cwd_is_valid_for_virt; }
82c82
< 	{ return *m_dir_tree; }
---
> 	{ return *dir_tree; }
94c94
< 	static FileGlobalData *m_instance;
---
> 	static FileGlobalData *instance;
97c97
< 	VFSInterface  *m_mounted_fs      [PPF_MAX_MOUNT_COUNT + 1];
---
> 	VFSInterface  *mounted_fs      [PPF_MAX_MOUNT_COUNT + 1];
100c100
< 	URLInfo       *m_fs_urls         [PPF_MAX_MOUNT_COUNT + 1];
---
> 	URLInfo       *fs_urls         [PPF_MAX_MOUNT_COUNT + 1];
103c103
< 	URLInfo       *m_fs_mount_points [PPF_MAX_MOUNT_COUNT + 1];
---
> 	URLInfo       *fs_mount_points [PPF_MAX_MOUNT_COUNT + 1];
106c106
< 	int            m_mount_count;
---
> 	int            mount_count;
109c109
< 	Directory  *m_dir_tree;
---
> 	Directory  *dir_tree;
129,132c129,132
< 	Directory *m_current_vfs_wd;
< 	URLInfo    m_current_wd_path;
< 	bool       m_cwd_is_valid_for_native;
< 	bool       m_cwd_is_valid_for_virt;
---
> 	Directory *current_vfs_wd;
> 	URLInfo    current_wd_path;
> 	bool       cwd_is_valid_for_native;
> 	bool       cwd_is_valid_for_virt;
diff win32pp/src/PenguinFile/GenFSEntityContainer.h penguinplay/src/PenguinFile/GenFSEntityContainer.h
414c414
< #if _MSC_VER < 1200
---
> #ifdef _MSC_VER
Only in penguinplay/src/PenguinFile: Makefile
diff win32pp/src/PenguinFile/PakHashTable.h penguinplay/src/PenguinFile/PakHashTable.h
467c467
< #if _MSC_VER < 1200
---
> #ifdef _MSC_VER
Only in win32pp/src/PenguinFile: PenguinFile.def
diff win32pp/src/PenguinFile/PenguinFile.dsp penguinplay/src/PenguinFile/PenguinFile.dsp
2c2
< # Microsoft Developer Studio Generated Build File, Format Version 6.00
---
> # Microsoft Developer Studio Generated Build File, Format Version 5.00
20,21c20,23
< !MESSAGE "PenguinFile - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
< !MESSAGE "PenguinFile - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
---
> !MESSAGE "PenguinFile - Win32 Release" (based on\
>  "Win32 (x86) Dynamic-Link Library")
> !MESSAGE "PenguinFile - Win32 Debug" (based on\
>  "Win32 (x86) Dynamic-Link Library")
25d26
< # PROP AllowPerConfigDependencies 0
48,49c49,50
< # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
< # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
---
> # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
> # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
73c74
< # ADD CPP /nologo /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PP_DEBUG" /FD /c
---
> # ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PP_DEBUG" /FD /c
75,76c76,77
< # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
< # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
---
> # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
> # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
Only in win32pp/src/PenguinFile: StaticPe
diff win32pp/src/PenguinFile/StaticPenguinFile.dsp penguinplay/src/PenguinFile/StaticPenguinFile.dsp
2c2
< # Microsoft Developer Studio Generated Build File, Format Version 6.00
---
> # Microsoft Developer Studio Generated Build File, Format Version 5.00
20,21c20,23
< !MESSAGE "StaticPenguinFile - Win32 Release" (based on "Win32 (x86) Static Library")
< !MESSAGE "StaticPenguinFile - Win32 Debug" (based on "Win32 (x86) Static Library")
---
> !MESSAGE "StaticPenguinFile - Win32 Release" (based on\
>  "Win32 (x86) Static Library")
> !MESSAGE "StaticPenguinFile - Win32 Debug" (based on\
>  "Win32 (x86) Static Library")
25d26
< # PROP AllowPerConfigDependencies 0
29d29
< RSC=rc.exe
44c44
< # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
---
> # ADD CPP /nologo /W3 /GR- /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
46,47d45
< # ADD BASE RSC /l 0xc09
< # ADD RSC /l 0xc09
53c51
< # ADD LIB32 /nologo /out:"..\Release\StaticPenguinFile.lib"
---
> # ADD LIB32 /nologo
68c66
< # ADD CPP /nologo /MTd /W3 /GR /GX /Z7 /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
---
> # ADD CPP /nologo /W3 /GR /GX /Z7 /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
70,71d67
< # ADD BASE RSC /l 0xc09
< # ADD RSC /l 0xc09
77c73
< # ADD LIB32 /nologo /out:"../Debug/StaticPenguinFile.lib"
---
> # ADD LIB32 /nologo
261,264d256
< # Begin Source File
< 
< SOURCE=.\PenguinFile.def
< # End Source File
diff win32pp/src/PenguinFile/URLInfo.cpp penguinplay/src/PenguinFile/URLInfo.cpp
382d381
< 
421,423c420,421
< 		ModCWDLen = CWDLen + 1;      
< 		delete TmpUInfo; // the TmpUInfo allocated above
<       CWD = 0;
---
> 		ModCWDLen = CWDLen + 1;
> 		delete CWD; // the TmpUInfo allocated above
723a722
> 
diff win32pp/src/PenguinFile/URLInfo.h penguinplay/src/PenguinFile/URLInfo.h
100c100
< 			delete [] copied_path;
---
> 			delete[] copied_path;
diff win32pp/src/PenguinFile/Win32.cpp penguinplay/src/PenguinFile/Win32.cpp
322,323c322
< 	pDirE->FS      = ppfFS_plain;
<    
---
> 	pDirE->FS      = ppfFS_plain;;
330d328
<       {
332,333d329
<       pDirE->Type    = ppfFT_file;
<       }
335d330
<       {
337,338d331
<       pDirE->Type    = ppfFT_directory;
<       }
340d332
<       {
342,343d333
<       pDirE->Type    = ppfFT_undefined;
<       }
466c456
< #if 0
---
> 
481d470
< 
483,485c472
< #else
<    char* pRetVal = Strdup(pBuffer);   
< #endif
---
>

Prev by Date: pfile_pak runs successfully under win32
Next by Date: Re: win32 diffs
Prev by thread: Re: pfile_pak runs successfully under win32
Next by thread: Re: win32 diffs
Index(es):
- Date
- Thread