Skip to content

Fix spaces #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanRStevens merged 10 commits into from
Nov 18, 2025
Merged

Fix spaces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85fc3a9
Remove line trailing whitespace in source files
DanRStevens Nov 18, 2025
3a19180
Remove line trailing whitespace in header files
DanRStevens Nov 18, 2025
f172400
Remove line trailing whitespace in IDL file
DanRStevens Nov 18, 2025
3110560
Remove line trailing whitespace in project file custom build `Command`
DanRStevens Nov 18, 2025
735dcb1
Use tabs instead of spaces in `QueryInterface` implementations
DanRStevens Nov 18, 2025
94d2e9d
Use tabs instead of spaces to indent header files
DanRStevens Nov 18, 2025
e8e40d7
Reduce excessive indentation for parameters in headers
DanRStevens Nov 18, 2025
78bb116
Use tabs instead of spaces and reduce indentation of parameters in so…
DanRStevens Nov 18, 2025
05e7933
Use tabs instead of spaces in function implementations
DanRStevens Nov 18, 2025
3cd1154
Use spaces for consistency in `.def` file
DanRStevens Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions CClmReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ ULONG __stdcall CClmReader::Release()

HRESULT __stdcall CClmReader::QueryInterface(REFIID riid, void** ppv)
{
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_ArchiveReader)
*ppv = (ArchiveReader*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_ArchiveReader)
*ppv = (ArchiveReader*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
}


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

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


// Load the Clm info from the stream
if (LoadClm(inStream, bAttachToStream) != 0)
{
Expand Down
28 changes: 14 additions & 14 deletions CClmReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ class CClmReader : public ArchiveReader
public:
// IUnknown
// ********
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);


// ArchiveReader
// *************

// [propget]
HRESULT STDMETHODCALLTYPE get_NumFiles(
/* [retval][out] */ int __RPC_FAR *numFiles);
// [propget]
HRESULT STDMETHODCALLTYPE get_FileName(
/* [in] */ int index,
/* [retval][out] */ BSTR __RPC_FAR *fileName);
HRESULT STDMETHODCALLTYPE OpenStreamRead(
/* [in] */ BSTR filename,
/* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream);
// [propget]
HRESULT STDMETHODCALLTYPE get_NumFiles(
/* [retval][out] */ int __RPC_FAR *numFiles);
// [propget]
HRESULT STDMETHODCALLTYPE get_FileName(
/* [in] */ int index,
/* [retval][out] */ BSTR __RPC_FAR *fileName);

HRESULT STDMETHODCALLTYPE OpenStreamRead(
/* [in] */ BSTR filename,
/* [retval][out] */ StreamReader __RPC_FAR *__RPC_FAR *stream);


// Class specific
Expand Down
26 changes: 13 additions & 13 deletions CClmWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ ULONG __stdcall CClmWriter::Release()

HRESULT __stdcall CClmWriter::QueryInterface(REFIID riid, void** ppv)
{
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_ArchiveWriter)
*ppv = (ArchiveWriter*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_ArchiveWriter)
*ppv = (ArchiveWriter*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
}


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

// Move the node from the source tape to the dest tape
Expand Down
18 changes: 9 additions & 9 deletions CClmWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ class CClmWriter : public ArchiveWriter
public:
// IUnknown
// ********
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);


// ArchiveWriter
// *************

HRESULT STDMETHODCALLTYPE AddToArchive(
/* [in] */ BSTR fileName,
/* [in] */ SeekableStreamReader __RPC_FAR *inStream,
/* [in] */ int reserved);
HRESULT STDMETHODCALLTYPE WriteArchive(
/* [in] */ StreamWriter __RPC_FAR *outStream);
HRESULT STDMETHODCALLTYPE AddToArchive(
/* [in] */ BSTR fileName,
/* [in] */ SeekableStreamReader __RPC_FAR *inStream,
/* [in] */ int reserved);
HRESULT STDMETHODCALLTYPE WriteArchive(
/* [in] */ StreamWriter __RPC_FAR *outStream);


// Class specific
Expand Down
40 changes: 20 additions & 20 deletions CFileStreamReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ ULONG __stdcall CFileStreamReader::Release()

HRESULT __stdcall CFileStreamReader::QueryInterface(REFIID riid, void** ppv)
{
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_StreamReader)
*ppv = (StreamReader*)this;
else if(riid == IID_SeekableStreamReader)
*ppv = (SeekableStreamReader*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_StreamReader)
*ppv = (StreamReader*)this;
else if(riid == IID_SeekableStreamReader)
*ppv = (SeekableStreamReader*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
}


Expand Down Expand Up @@ -116,14 +116,14 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1)
// Initialize class variables
status = 0;

// Open the file
// Open the file
hFile = CreateFileW(fileName, // lpFileName
GENERIC_READ, // dwDesired access
FILE_SHARE_READ,// dwShareMode
NULL, // lpSecurityAttributes
OPEN_EXISTING, // dwCreationDisposition
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
// dwFlagsAndAttributes
NULL // hTemplate
);
Expand All @@ -136,7 +136,7 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1)
if (hFile == 0)
{
// Try to open the file using ANSI version of CreateFile

// Allocate space for a temporary ASCII fileName string
int stringLength = SysStringLen(fileName);
char *tempString = new char[stringLength+1];
Expand All @@ -150,8 +150,8 @@ CFileStreamReader::CFileStreamReader(BSTR fileName) : m_cRef(1)
FILE_SHARE_READ,// dwShareMode
NULL, // lpSecurityAttributes
OPEN_EXISTING, // dwCreationDisposition
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
// dwFlagsAndAttributes
NULL // hTemplate
);
Expand Down
38 changes: 19 additions & 19 deletions CFileStreamReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,38 @@ class CFileStreamReader : public SeekableStreamReader
{
public:

// IUnknown
// IUnknown
// ********

ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);

// StreamReader
// ************

// [local]
HRESULT STDMETHODCALLTYPE Read(
/* [in] */ int numBytes,
/* [in] */ int pBuffer,
/* [retval][out] */ int __RPC_FAR *numBytesRead);
HRESULT STDMETHODCALLTYPE Read(
/* [in] */ int numBytes,
/* [in] */ int pBuffer,
/* [retval][out] */ int __RPC_FAR *numBytesRead);

// [propget]
HRESULT STDMETHODCALLTYPE get_Status(
/* [retval][out] */ int __RPC_FAR *status);
HRESULT STDMETHODCALLTYPE get_Status(
/* [retval][out] */ int __RPC_FAR *status);


// SeekableStreamReader
// ********************

// [propget]
HRESULT STDMETHODCALLTYPE get_ReadOffset(
/* [retval][out] */ int __RPC_FAR *readOffset);
// [propget]
HRESULT STDMETHODCALLTYPE get_StreamSize(
/* [retval][out] */ int __RPC_FAR *streamSize);
HRESULT STDMETHODCALLTYPE Seek(
/* [in] */ int offset);
// [propget]
HRESULT STDMETHODCALLTYPE get_ReadOffset(
/* [retval][out] */ int __RPC_FAR *readOffset);
// [propget]
HRESULT STDMETHODCALLTYPE get_StreamSize(
/* [retval][out] */ int __RPC_FAR *streamSize);
HRESULT STDMETHODCALLTYPE Seek(
/* [in] */ int offset);


// Class specific
Expand Down
36 changes: 18 additions & 18 deletions CFileStreamWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ ULONG __stdcall CFileStreamWriter::Release()

HRESULT __stdcall CFileStreamWriter::QueryInterface(REFIID riid, void** ppv)
{
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_StreamWriter)
*ppv = (StreamWriter*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
if(riid == IID_IUnknown)
*ppv = (IUnknown*)this;
else if(riid == IID_StreamWriter)
*ppv = (StreamWriter*)this;
else
{
*ppv = NULL;
return E_NOINTERFACE;
}
AddRef();

return S_OK;
}


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

// Open the file
// Open the file
hFile = CreateFileW(fileName, // lpFileName
GENERIC_WRITE, // dwDesired access
0, // dwShareMode
NULL, // lpSecurityAttributes
CREATE_ALWAYS, // dwCreationDisposition
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
// dwFlagsAndAttributes
NULL // hTemplate
);
Expand All @@ -66,7 +66,7 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)
if (hFile == 0)
{
// Try to open the file using ANSI version of CreateFile

// Allocate space for a temporary ASCII fileName string
int stringLength = SysStringLen(fileName);
char *tempString = new char[stringLength+1];
Expand All @@ -80,8 +80,8 @@ CFileStreamWriter::CFileStreamWriter(BSTR fileName) : m_cRef(1)
0, // dwShareMode
NULL, // lpSecurityAttributes
CREATE_ALWAYS, // dwCreationDisposition
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN,
// dwFlagsAndAttributes
NULL // hTemplate
);
Expand Down
24 changes: 12 additions & 12 deletions CFileStreamWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ class CFileStreamWriter : public StreamWriter
{
public:
// IUnknown
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);
ULONG __stdcall AddRef();
ULONG __stdcall Release();
HRESULT __stdcall QueryInterface(REFIID riid, void** ppv);

// IFileStreamWriter
// [local]
HRESULT STDMETHODCALLTYPE Write(
/* [in] */ int numBytes,
/* [in] */ int pBuffer,
/* [retval][out] */ int __RPC_FAR *numBytesWritten);
// [propget]
HRESULT STDMETHODCALLTYPE get_Status(
/* [retval][out] */ int __RPC_FAR *status);
// [local]
HRESULT STDMETHODCALLTYPE Write(
/* [in] */ int numBytes,
/* [in] */ int pBuffer,
/* [retval][out] */ int __RPC_FAR *numBytesWritten);

// [propget]
HRESULT STDMETHODCALLTYPE get_Status(
/* [retval][out] */ int __RPC_FAR *status);

// Class specific
CFileStreamWriter(BSTR fileName);
Expand Down
Loading