From a8b48f29ddff17cdb1c3e620814bc98dc1b829ea Mon Sep 17 00:00:00 2001 From: "doshimun@gmail.com" Date: Mon, 10 Mar 2008 22:37:07 +0000 Subject: This changelist contains the changes to the configuration of Visual Studio solution and project files that I added in my last check-in for out-of-process dump generation. My last check-in broke the breakpad_client.sln build for non debug builds since for the new project that I added (crash_generation.vcproj) to that solution, I always only changed project properties for debug build. In fact, I didn't have the static-crt build configurations for the new project either. Similar problems existed for the test application I added, windows/test/crash_generation_app). This changelist contains changes to 2 solution files, 2 vcproj files and 1 .cc file. The fixes to .cc file are to avoid warnings on variables used only in debug modes (in asserts) when building in release modes. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@247 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/client/windows/breakpad_client.sln | 8 +- .../crash_generation/crash_generation.vcproj | 131 ++++++++++++++- .../crash_generation/crash_generation_server.cc | 12 +- .../crash_generation_app/crash_generation_app.sln | 6 + .../crash_generation_app.vcproj | 178 +++++++++++++++++++++ src/google_breakpad/common/minidump_format.h | 2 +- 6 files changed, 325 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/client/windows/breakpad_client.sln b/src/client/windows/breakpad_client.sln index 9894954b..441e90d8 100644 --- a/src/client/windows/breakpad_client.sln +++ b/src/client/windows/breakpad_client.sln @@ -33,12 +33,12 @@ Global {9946A048-043B-4F8F-9E07-9297B204714C}.ReleaseStaticCRT|Win32.Build.0 = ReleaseStaticCRT|Win32 {A820AF62-6239-4693-8430-4F516C1838F4}.Debug|Win32.ActiveCfg = Debug|Win32 {A820AF62-6239-4693-8430-4F516C1838F4}.Debug|Win32.Build.0 = Debug|Win32 - {A820AF62-6239-4693-8430-4F516C1838F4}.DebugStaticCRT|Win32.ActiveCfg = Debug|Win32 - {A820AF62-6239-4693-8430-4F516C1838F4}.DebugStaticCRT|Win32.Build.0 = Debug|Win32 + {A820AF62-6239-4693-8430-4F516C1838F4}.DebugStaticCRT|Win32.ActiveCfg = DebugStaticCRT|Win32 + {A820AF62-6239-4693-8430-4F516C1838F4}.DebugStaticCRT|Win32.Build.0 = DebugStaticCRT|Win32 {A820AF62-6239-4693-8430-4F516C1838F4}.Release|Win32.ActiveCfg = Release|Win32 {A820AF62-6239-4693-8430-4F516C1838F4}.Release|Win32.Build.0 = Release|Win32 - {A820AF62-6239-4693-8430-4F516C1838F4}.ReleaseStaticCRT|Win32.ActiveCfg = Release|Win32 - {A820AF62-6239-4693-8430-4F516C1838F4}.ReleaseStaticCRT|Win32.Build.0 = Release|Win32 + {A820AF62-6239-4693-8430-4F516C1838F4}.ReleaseStaticCRT|Win32.ActiveCfg = ReleaseStaticCRT|Win32 + {A820AF62-6239-4693-8430-4F516C1838F4}.ReleaseStaticCRT|Win32.Build.0 = ReleaseStaticCRT|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/client/windows/crash_generation/crash_generation.vcproj b/src/client/windows/crash_generation/crash_generation.vcproj index e84c7aee..615876e9 100644 --- a/src/client/windows/crash_generation/crash_generation.vcproj +++ b/src/client/windows/crash_generation/crash_generation.vcproj @@ -103,10 +103,135 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/windows/crash_generation/crash_generation_server.cc b/src/client/windows/crash_generation/crash_generation_server.cc index dbdf0014..31e0b4ea 100644 --- a/src/client/windows/crash_generation/crash_generation_server.cc +++ b/src/client/windows/crash_generation/crash_generation_server.cc @@ -269,7 +269,8 @@ void CrashGenerationServer::HandleInitialState() { return; } - bool success = ConnectNamedPipe(pipe_, &overlapped_) != FALSE; + bool success; + success = ConnectNamedPipe(pipe_, &overlapped_) != FALSE; // From MSDN, it is not clear that when ConnectNamedPipe is used // in an overlapped mode, will it ever return non-zero value, and @@ -366,7 +367,8 @@ void CrashGenerationServer::HandleReadingState() { return; } - DWORD error_code = GetLastError(); + DWORD error_code; + error_code = GetLastError(); // We should never get an I/O incomplete since we should not execute this // unless the Read has finished and the overlapped event is signaled. If @@ -435,7 +437,8 @@ void CrashGenerationServer::HandleWritingState() { return; } - DWORD error_code = GetLastError(); + DWORD error_code; + error_code = GetLastError(); // We should never get an I/O incomplete since we should not execute this // unless the Write has finished and the overlapped event is signaled. If @@ -490,7 +493,8 @@ void CrashGenerationServer::HandleReadingAckState() { connect_callback_(connect_context_, client_info_); } } else { - DWORD error_code = GetLastError(); + DWORD error_code; + error_code = GetLastError(); // We should never get an I/O incomplete since we should not execute this // unless the Read has finished and the overlapped event is signaled. If diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.sln b/src/client/windows/tests/crash_generation_app/crash_generation_app.sln index 85d06c6d..c691bf2a 100644 --- a/src/client/windows/tests/crash_generation_app/crash_generation_app.sln +++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.sln @@ -6,13 +6,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + DebugStaticCRT|Win32 = DebugStaticCRT|Win32 Release|Win32 = Release|Win32 + ReleaseStaticCRT|Win32 = ReleaseStaticCRT|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.Debug|Win32.ActiveCfg = Debug|Win32 {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.Debug|Win32.Build.0 = Debug|Win32 + {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.DebugStaticCRT|Win32.ActiveCfg = DebugStaticCRT|Win32 + {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.DebugStaticCRT|Win32.Build.0 = DebugStaticCRT|Win32 {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.Release|Win32.ActiveCfg = Release|Win32 {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.Release|Win32.Build.0 = Release|Win32 + {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.ReleaseStaticCRT|Win32.ActiveCfg = ReleaseStaticCRT|Win32 + {A15674ED-713D-4B37-B1D2-0C29C7E533C8}.ReleaseStaticCRT|Win32.Build.0 = ReleaseStaticCRT|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj b/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj index b5aa93c0..597f7e90 100644 --- a/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj +++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.vcproj @@ -119,9 +119,169 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +