Skip to content

Commit 8c3843f

Browse files
DanRStevensDanRStevens
authored
Merge pull request #5 from OutpostUniverse/fixSpaces
Fix spaces
2 parents 820f67b + 3cd1154 commit 8c3843f

33 files changed

Lines changed: 926 additions & 926 deletions

‎CClmReader.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ ULONG __stdcall CClmReader::Release()
2626

2727
HRESULT __stdcall CClmReader::QueryInterface(REFIID riid, void** ppv)
2828
{
29-
if(riid == IID_IUnknown)
30-
*ppv = (IUnknown*)this;
31-
else if(riid == IID_ArchiveReader)
32-
*ppv = (ArchiveReader*)this;
33-
else
34-
{
35-
*ppv = NULL;
36-
return E_NOINTERFACE;
37-
}
38-
AddRef();
39-
40-
return S_OK;
29+
if(riid == IID_IUnknown)
30+
*ppv = (IUnknown*)this;
31+
else if(riid == IID_ArchiveReader)
32+
*ppv = (ArchiveReader*)this;
33+
else
34+
{
35+
*ppv = NULL;
36+
return E_NOINTERFACE;
37+
}
38+
AddRef();
39+
40+
return S_OK;
4141
}
4242

4343

@@ -114,7 +114,7 @@ HRESULT CClmReader::OpenStreamRead(BSTR fileName, StreamReader **stream)
114114
// CLM file much less memory intensive.
115115

116116
// Create a memory stream reading with the file contents
117-
memStream = new CMemoryStreamReader(indexTable[fileIndex].size,
117+
memStream = new CMemoryStreamReader(indexTable[fileIndex].size,
118118
(char*)(dataBuffer[fileIndex]),
119119
bAttachToBuffer);
120120
if (memStream == NULL)
@@ -162,7 +162,7 @@ CClmReader::CClmReader(SeekableStreamReader *inStream, int bAttachToStream) : m_
162162
inStream->AddRef();
163163
}
164164

165-
165+
166166
// Load the Clm info from the stream
167167
if (LoadClm(inStream, bAttachToStream) != 0)
168168
{

‎CClmReader.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ class CClmReader : public ArchiveReader
77
public:
88
// IUnknown
99
// ********
10-
ULONG __stdcall AddRef();
11-
ULONG __stdcall Release();
12-
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
10+
ULONG __stdcall AddRef();
11+
ULONG __stdcall Release();
12+
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
1313

1414

1515
// ArchiveReader
1616
// *************
1717

18-
// [propget]
19-
HRESULT STDMETHODCALLTYPE get_NumFiles(
20-
/* [retval][out] */ int __RPC_FAR *numFiles);
21-
// [propget]
22-
HRESULT STDMETHODCALLTYPE get_FileName(
23-
/* [in] */ int index,
24-
/* [retval][out] */ BSTR __RPC_FAR *fileName);
25-
26-
HRESULT STDMETHODCALLTYPE OpenStreamRead(
27-
/* [in] */ BSTR filename,
28-
/* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream);
18+
// [propget]
19+
HRESULT STDMETHODCALLTYPE get_NumFiles(
20+
/* [retval][out] */ int __RPC_FAR *numFiles);
21+
// [propget]
22+
HRESULT STDMETHODCALLTYPE get_FileName(
23+
/* [in] */ int index,
24+
/* [retval][out] */ BSTR __RPC_FAR *fileName);
25+
26+
HRESULT STDMETHODCALLTYPE OpenStreamRead(
27+
/* [in] */ BSTR filename,
28+
/* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream);
2929

3030

3131
// Class specific

‎CClmWriter.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ ULONG __stdcall CClmWriter::Release()
2424

2525
HRESULT __stdcall CClmWriter::QueryInterface(REFIID riid, void** ppv)
2626
{
27-
if(riid == IID_IUnknown)
28-
*ppv = (IUnknown*)this;
29-
else if(riid == IID_ArchiveWriter)
30-
*ppv = (ArchiveWriter*)this;
31-
else
32-
{
33-
*ppv = NULL;
34-
return E_NOINTERFACE;
35-
}
36-
AddRef();
37-
38-
return S_OK;
27+
if(riid == IID_IUnknown)
28+
*ppv = (IUnknown*)this;
29+
else if(riid == IID_ArchiveWriter)
30+
*ppv = (ArchiveWriter*)this;
31+
else
32+
{
33+
*ppv = NULL;
34+
return E_NOINTERFACE;
35+
}
36+
AddRef();
37+
38+
return S_OK;
3939
}
4040

4141

@@ -269,7 +269,7 @@ CClmWriter::LinkedListNode* CClmWriter::SortIndex(LinkedListNode *list)
269269
// Check for proper sorted order
270270
else if (strcmp(tape[0].head->indexEntry.fileName, tape[1].head->indexEntry.fileName) < 0)
271271
sourceTape = 0; // Node on tape[0] comes before
272-
else
272+
else
273273
sourceTape = 1; // Node on tape[1] comes before
274274

275275
// Move the node from the source tape to the dest tape

‎CClmWriter.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ class CClmWriter : public ArchiveWriter
77
public:
88
// IUnknown
99
// ********
10-
ULONG __stdcall AddRef();
11-
ULONG __stdcall Release();
12-
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
10+
ULONG __stdcall AddRef();
11+
ULONG __stdcall Release();
12+
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
1313

1414

1515
// ArchiveWriter
1616
// *************
1717

18-
HRESULT STDMETHODCALLTYPE AddToArchive(
19-
/* [in] */ BSTR fileName,
20-
/* [in] */ SeekableStreamReader __RPC_FAR *inStream,
21-
/* [in] */ int reserved);
22-
HRESULT STDMETHODCALLTYPE WriteArchive(
23-
/* [in] */ StreamWriter __RPC_FAR *outStream);
18+
HRESULT STDMETHODCALLTYPE AddToArchive(
19+
/* [in] */ BSTR fileName,
20+
/* [in] */ SeekableStreamReader __RPC_FAR *inStream,
21+
/* [in] */ int reserved);
22+
HRESULT STDMETHODCALLTYPE WriteArchive(
23+
/* [in] */ StreamWriter __RPC_FAR *outStream);
2424

2525

2626
// Class specific

‎CFileStreamReader.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ ULONG __stdcall CFileStreamReader::Release()
2424

2525
HRESULT __stdcall CFileStreamReader::QueryInterface(REFIID riid, void** ppv)
2626
{
27-
if(riid == IID_IUnknown)
28-
*ppv = (IUnknown*)this;
29-
else if(riid == IID_StreamReader)
30-
*ppv = (StreamReader*)this;
31-
else if(riid == IID_SeekableStreamReader)
32-
*ppv = (SeekableStreamReader*)this;
33-
else
34-
{
35-
*ppv = NULL;
36-
return E_NOINTERFACE;
37-
}
38-
AddRef();
39-
40-
return S_OK;
27+
if(riid == IID_IUnknown)
28+
*ppv = (IUnknown*)this;
29+
else if(riid == IID_StreamReader)
30+
*ppv = (StreamReader*)this;
31+
else if(riid == IID_SeekableStreamReader)
32+
*ppv = (SeekableStreamReader*)this;
33+
else
34+
{
35+
*ppv = NULL;
36+
return E_NOINTERFACE;
37+
}
38+
AddRef();
39+
40+
return S_OK;
4141
}
4242

4343

@@ -116,14 +116,14 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1)
116116
// Initialize class variables
117117
status = 0;
118118

119-
// Open the file
119+
// Open the file
120120
hFile = CreateFileW(fileName, // lpFileName
121121
GENERIC_READ, // dwDesired access
122122
FILE_SHARE_READ,// dwShareMode
123123
NULL, // lpSecurityAttributes
124124
OPEN_EXISTING, // dwCreationDisposition
125-
FILE_ATTRIBUTE_NORMAL |
126-
FILE_FLAG_SEQUENTIAL_SCAN,
125+
FILE_ATTRIBUTE_NORMAL |
126+
FILE_FLAG_SEQUENTIAL_SCAN,
127127
// dwFlagsAndAttributes
128128
NULL // hTemplate
129129
);
@@ -136,7 +136,7 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1)
136136
if (hFile == 0)
137137
{
138138
// Try to open the file using ANSI version of CreateFile
139-
139+
140140
// Allocate space for a temporary ASCII fileName string
141141
int stringLength = SysStringLen(fileName);
142142
char *tempString = new char[stringLength+1];
@@ -150,8 +150,8 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1)
150150
FILE_SHARE_READ,// dwShareMode
151151
NULL, // lpSecurityAttributes
152152
OPEN_EXISTING, // dwCreationDisposition
153-
FILE_ATTRIBUTE_NORMAL |
154-
FILE_FLAG_SEQUENTIAL_SCAN,
153+
FILE_ATTRIBUTE_NORMAL |
154+
FILE_FLAG_SEQUENTIAL_SCAN,
155155
// dwFlagsAndAttributes
156156
NULL // hTemplate
157157
);

‎CFileStreamReader.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@ class CFileStreamReader : public SeekableStreamReader
66
{
77
public:
88

9-
// IUnknown
9+
// IUnknown
1010
// ********
1111

12-
ULONG __stdcall AddRef();
13-
ULONG __stdcall Release();
14-
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
12+
ULONG __stdcall AddRef();
13+
ULONG __stdcall Release();
14+
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
1515

1616
// StreamReader
1717
// ************
18-
18+
1919
// [local]
20-
HRESULT STDMETHODCALLTYPE Read(
21-
/* [in] */ int numBytes,
22-
/* [in] */ int pBuffer,
23-
/* [retval][out] */ int __RPC_FAR *numBytesRead);
20+
HRESULT STDMETHODCALLTYPE Read(
21+
/* [in] */ int numBytes,
22+
/* [in] */ int pBuffer,
23+
/* [retval][out] */ int __RPC_FAR *numBytesRead);
2424

2525
// [propget]
26-
HRESULT STDMETHODCALLTYPE get_Status(
27-
/* [retval][out] */ int __RPC_FAR *status);
26+
HRESULT STDMETHODCALLTYPE get_Status(
27+
/* [retval][out] */ int __RPC_FAR *status);
2828

2929

3030
// SeekableStreamReader
3131
// ********************
3232

33-
// [propget]
34-
HRESULT STDMETHODCALLTYPE get_ReadOffset(
35-
/* [retval][out] */ int __RPC_FAR *readOffset);
36-
// [propget]
37-
HRESULT STDMETHODCALLTYPE get_StreamSize(
38-
/* [retval][out] */ int __RPC_FAR *streamSize);
39-
HRESULT STDMETHODCALLTYPE Seek(
40-
/* [in] */ int offset);
33+
// [propget]
34+
HRESULT STDMETHODCALLTYPE get_ReadOffset(
35+
/* [retval][out] */ int __RPC_FAR *readOffset);
36+
// [propget]
37+
HRESULT STDMETHODCALLTYPE get_StreamSize(
38+
/* [retval][out] */ int __RPC_FAR *streamSize);
39+
HRESULT STDMETHODCALLTYPE Seek(
40+
/* [in] */ int offset);
4141

4242

4343
// Class specific

‎CFileStreamWriter.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ ULONG __stdcall CFileStreamWriter::Release()
2424

2525
HRESULT __stdcall CFileStreamWriter::QueryInterface(REFIID riid, void** ppv)
2626
{
27-
if(riid == IID_IUnknown)
28-
*ppv = (IUnknown*)this;
29-
else if(riid == IID_StreamWriter)
30-
*ppv = (StreamWriter*)this;
31-
else
32-
{
33-
*ppv = NULL;
34-
return E_NOINTERFACE;
35-
}
36-
AddRef();
37-
38-
return S_OK;
27+
if(riid == IID_IUnknown)
28+
*ppv = (IUnknown*)this;
29+
else if(riid == IID_StreamWriter)
30+
*ppv = (StreamWriter*)this;
31+
else
32+
{
33+
*ppv = NULL;
34+
return E_NOINTERFACE;
35+
}
36+
AddRef();
37+
38+
return S_OK;
3939
}
4040

4141

@@ -46,14 +46,14 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)
4646
// Initialize class variables
4747
status = 0;
4848

49-
// Open the file
49+
// Open the file
5050
hFile = CreateFileW(fileName, // lpFileName
5151
GENERIC_WRITE, // dwDesired access
5252
0, // dwShareMode
5353
NULL, // lpSecurityAttributes
5454
CREATE_ALWAYS, // dwCreationDisposition
55-
FILE_ATTRIBUTE_NORMAL |
56-
FILE_FLAG_SEQUENTIAL_SCAN,
55+
FILE_ATTRIBUTE_NORMAL |
56+
FILE_FLAG_SEQUENTIAL_SCAN,
5757
// dwFlagsAndAttributes
5858
NULL // hTemplate
5959
);
@@ -66,7 +66,7 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)
6666
if (hFile == 0)
6767
{
6868
// Try to open the file using ANSI version of CreateFile
69-
69+
7070
// Allocate space for a temporary ASCII fileName string
7171
int stringLength = SysStringLen(fileName);
7272
char *tempString = new char[stringLength+1];
@@ -80,8 +80,8 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)
8080
0, // dwShareMode
8181
NULL, // lpSecurityAttributes
8282
CREATE_ALWAYS, // dwCreationDisposition
83-
FILE_ATTRIBUTE_NORMAL |
84-
FILE_FLAG_SEQUENTIAL_SCAN,
83+
FILE_ATTRIBUTE_NORMAL |
84+
FILE_FLAG_SEQUENTIAL_SCAN,
8585
// dwFlagsAndAttributes
8686
NULL // hTemplate
8787
);

‎CFileStreamWriter.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ class CFileStreamWriter : public StreamWriter
66
{
77
public:
88
// IUnknown
9-
ULONG __stdcall AddRef();
10-
ULONG __stdcall Release();
11-
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
9+
ULONG __stdcall AddRef();
10+
ULONG __stdcall Release();
11+
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
1212

1313
// IFileStreamWriter
14-
// [local]
15-
HRESULT STDMETHODCALLTYPE Write(
16-
/* [in] */ int numBytes,
17-
/* [in] */ int pBuffer,
18-
/* [retval][out] */ int __RPC_FAR *numBytesWritten);
19-
20-
// [propget]
21-
HRESULT STDMETHODCALLTYPE get_Status(
22-
/* [retval][out] */ int __RPC_FAR *status);
14+
// [local]
15+
HRESULT STDMETHODCALLTYPE Write(
16+
/* [in] */ int numBytes,
17+
/* [in] */ int pBuffer,
18+
/* [retval][out] */ int __RPC_FAR *numBytesWritten);
19+
20+
// [propget]
21+
HRESULT STDMETHODCALLTYPE get_Status(
22+
/* [retval][out] */ int __RPC_FAR *status);
2323

2424
// Class specific
2525
CFileStreamWriter(BSTR fileName);

0 commit comments

Comments
 (0)