From 0d69cd15a40563b27cfcc0ea6bd263061cd6f94f Mon Sep 17 00:00:00 2001
From: Perry Rapp <elsapo@users.sourceforge.net>
Date: Sat, 21 May 2005 17:28:55 +0000
Subject: [PATCH] 2005-05-21 Perry  PATCH [ 1206215 ] Fix DisplayBinaryFiles
 dll source to compile  BUG [ 1206209 ] DisplayBinaryFiles.dll does not
 compile under MSVC7 (2003)  BUG [ 1205960 ] DisplayBinaryFiles code does not
 compile in debug   Fix compilation for DisplayBinaryFiles, for both MSVC6
 (debug) and MSVC7   DisplayBinaryFiles: DisplayBinaryFiles.dsp typeinfoex.h
 WinMergeScript.cpp    new file ChangeLog.txt

---
 Plugins/readme.txt                                         | 8 ++++++++
 Plugins/src_VCPP/DisplayBinaryFiles/ChangeLog.txt          | 9 +++++++++
 Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp | 6 +++++-
 Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp     | 3 ++-
 Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h           | 2 +-
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 Plugins/src_VCPP/DisplayBinaryFiles/ChangeLog.txt

diff --git a/Plugins/readme.txt b/Plugins/readme.txt
index a79f4c92c..f614834b8 100644
--- a/Plugins/readme.txt
+++ b/Plugins/readme.txt
@@ -1,3 +1,11 @@
+2005-05-21 Perry
+ PATCH [ 1206215 ] Fix DisplayBinaryFiles dll source to compile
+ BUG [ 1206209 ] DisplayBinaryFiles.dll does not compile under MSVC7 (2003)
+ BUG [ 1205960 ] DisplayBinaryFiles code does not compile in debug
+  Fix compilation for DisplayBinaryFiles, for both MSVC6 (debug) and MSVC7
+  DisplayBinaryFiles: DisplayBinaryFiles.dsp typeinfoex.h WinMergeScript.cpp
+   new file ChangeLog.txt
+
 2005-01-27 Kimmo
  PATCH: [ 1109405 ] Binary diff is totally broken (buffer overwrite)
   Submitted by Jim Fougeron
diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/ChangeLog.txt b/Plugins/src_VCPP/DisplayBinaryFiles/ChangeLog.txt
new file mode 100644
index 000000000..fd4e1a91c
--- /dev/null
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/ChangeLog.txt
@@ -0,0 +1,9 @@
+DisplayBinaryFiles\ChangeLog.txt
+
+2005-05-21, Perry Rapp
+ Created ChangeLog.
+ Fixed compilation under MSVC6 by removing global namespace qualifier on InlineIsEqualGUID.
+ Fixed compilation under MSVC7 by change fstream.h to fstream and adding using for std.
+ Added ChangeLog to project.
+ Fixed project link to typeinfoex.h (it is in current directory not parent).
+ Note: Current version is 1.0.0.1.
diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp
index c66467793..1c38bb7cb 100644
--- a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.dsp
@@ -223,7 +223,7 @@ SOURCE=.\StdAfx.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\typeinfoex.h
+SOURCE=.\typeinfoex.h
 # End Source File
 # Begin Source File
 
@@ -238,5 +238,9 @@ SOURCE=.\WinMergeScript.h
 SOURCE=.\WinMergeScript.rgs
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=.\ChangeLog.txt
+# End Source File
 # End Target
 # End Project
diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp b/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp
index d64d4ded7..b757494f1 100644
--- a/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.cpp
@@ -2,7 +2,8 @@
 #include "stdafx.h"
 #include "DisplayBinaryFiles.h"
 #include "WinMergeScript.h"
-#include <fstream.h>
+#include <fstream>
+using namespace std;
 
 /////////////////////////////////////////////////////////////////////////////
 // CWinMergeScript
diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h b/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h
index edac4d1d9..4119891ba 100644
--- a/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/typeinfoex.h
@@ -153,7 +153,7 @@ inline HRESULT CComTypeInfoHolderModule<nObtainMethod>::GetTI(LCID lcid)
     USES_CONVERSION;
 	//If this assert occurs then most likely didn't initialize properly
 	ATLASSERT(m_plibid != NULL && m_pguid != NULL);
-	ATLASSERT(!::InlineIsEqualGUID(*m_plibid, GUID_NULL) && "Did you forget to pass the LIBID to CComModule::Init?");
+	ATLASSERT(!InlineIsEqualGUID(*m_plibid, GUID_NULL) && "Did you forget to pass the LIBID to CComModule::Init?");
 
 	if (m_pInfo != NULL)
 		return S_OK;
-- 
2.11.0