diff options
| author | omegadox <omegadox@gmail.com> | 2009-01-24 00:45:46 +0000 |
|---|---|---|
| committer | omegadox <omegadox@gmail.com> | 2009-01-24 00:45:46 +0000 |
| commit | 8f98f0b778dcf600febdc6b2fe6ec9d122406f29 (patch) | |
| tree | b567f2189ab0449c0829fc937d3c627d355425c4 /Source/Core/Common | |
| parent | 70bc8167f8af6aa053b9335209c80f554d8fb597 (diff) | |
Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Common.vcproj | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Src/ChunkFile.h | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Src/ConsoleWindow.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/ExtendedTrace.cpp | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index 8e1c43c000..94f460401e 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="Common"
ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
RootNamespace="Common"
@@ -293,7 +293,7 @@ />
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="wsock32.lib winmm.lib"
+ AdditionalDependencies="winmm.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h index a892f8528b..8aa18ba618 100644 --- a/Source/Core/Common/Src/ChunkFile.h +++ b/Source/Core/Common/Src/ChunkFile.h @@ -172,7 +172,7 @@ public: } // get size - int sz = FileSize - sizeof(SChunkHeader); + int sz = (int)(FileSize - sizeof(SChunkHeader)); if (Header.ExpectedSize != sz) { fclose(pFile); @@ -213,7 +213,7 @@ public: SChunkHeader Header; Header.Compress = 0; Header.Revision = _Revision; - Header.ExpectedSize = sz; + Header.ExpectedSize = (int)sz; fwrite(&Header, sizeof(SChunkHeader), 1, pFile); fwrite(buffer, sz, 1, pFile); diff --git a/Source/Core/Common/Src/ConsoleWindow.cpp b/Source/Core/Common/Src/ConsoleWindow.cpp index 0a921d3686..773a047bf7 100644 --- a/Source/Core/Common/Src/ConsoleWindow.cpp +++ b/Source/Core/Common/Src/ConsoleWindow.cpp @@ -126,7 +126,7 @@ int Print(const char *fmt, ...) // ----------------
if(__hStdOut)
{
- WriteConsole(__hStdOut, s, strlen(s), &cCharsWritten, NULL);
+ WriteConsole(__hStdOut, s, (DWORD)strlen(s), &cCharsWritten, NULL);
}
// ----------------------------------------
diff --git a/Source/Core/Common/Src/ExtendedTrace.cpp b/Source/Core/Common/Src/ExtendedTrace.cpp index 2c119a1d86..ac774a5b42 100644 --- a/Source/Core/Common/Src/ExtendedTrace.cpp +++ b/Source/Core/Common/Src/ExtendedTrace.cpp @@ -325,8 +325,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file ) etfprint(file, "Call stack info: \n"); etfprint(file, lpszMessage); - GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo ); - GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo ); + GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo ); + GetSourceInfoFromAddress( (ULONG)callStack.AddrPC.Offset, srcInfo ); etfprint(file, string(" ") + srcInfo + string(" : ") + symInfo + string("\n")); for( ULONG index = 0; ; index++ ) @@ -348,8 +348,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file ) if( !bResult || callStack.AddrFrame.Offset == 0 ) break; - GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo ); - GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo ); + GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo ); + GetSourceInfoFromAddress( (UINT)callStack.AddrPC.Offset, srcInfo ); etfprint(file, string(" ") + srcInfo + string(" : ") + symInfo + string("\n")); } @@ -386,8 +386,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file, DWORD eip, DWO etfprint(file, "Call stack info: \n"); etfprint(file, lpszMessage); - GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo ); - GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo ); + GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo ); + GetSourceInfoFromAddress( (UINT)callStack.AddrPC.Offset, srcInfo ); etfprint(file, string(" ") + srcInfo + string(" : ") + symInfo + string("\n")); for( ULONG index = 0; ; index++ ) @@ -409,8 +409,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file, DWORD eip, DWO if( !bResult || callStack.AddrFrame.Offset == 0 ) break; - GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo ); - GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo ); + GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo ); + GetSourceInfoFromAddress( (UINT)callStack.AddrPC.Offset, srcInfo ); etfprint(file, string(" ") + srcInfo + string(" : ") + symInfo + string("\n")); } |