Support building with WIN32_LEAN_AND_MEAN (#60)

 - All Windows code now builds with WIN32_LEAN_AND_MEAN by default.
 - Header inclusion is adjusted as needed.
Remove use of UuidToString (#39)
 - Also breaks dependency on RpcStringFree and therefore rpcrt4.lib.
r=bryner

http://groups.google.com/group/airbag-dev/browse_thread/thread/30f844cfc7ccd37f


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@51 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 5 insertions, 10 deletions

diff --git a/src/common/windows/pdb_source_line_writer.cc b/src/common/windows/pdb_source_line_writer.cc
index 91c95922..5f69775a 100644
--- a/src/common/windows/pdb_source_line_writer.cc
+++ b/src/common/windows/pdb_source_line_writer.cc
@@ -27,11 +27,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdio.h>
 #include <atlbase.h>
-#include <dia2.h>
 #include <DbgHelp.h>
+#include <dia2.h>
+#include <stdio.h>
+
 #include "common/windows/pdb_source_line_writer.h"
+#include "common/windows/guid_string.h"
 
 // This constant may be missing from DbgHelp.h.  See the documentation for
 // IDiaSymbol::get_undecoratedNameEx.
@@ -631,14 +633,7 @@ wstring PDBSourceLineWriter::GetModuleGUID() {
     return L"";
   }
 
-  wchar_t guid_buf[37];
-  _snwprintf_s(guid_buf, sizeof(guid_buf)/sizeof(wchar_t), _TRUNCATE,
-               L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
-               guid.Data1, guid.Data2, guid.Data3,
-               guid.Data4[0], guid.Data4[1], guid.Data4[2],
-               guid.Data4[3], guid.Data4[4], guid.Data4[5],
-               guid.Data4[6], guid.Data4[7]);
-  return guid_buf;
+  return GUIDString::GUIDToWString(&guid);
 }
 
 }  // namespace google_airbag