BUG: [ 1373233 ] Copy&paste bug in DisplayBinaryFiles

diff --git a/Plugins/Changes.txt b/Plugins/Changes.txt
index cbb3266..519d8c4 100644 (file)
--- a/Plugins/Changes.txt
+++ b/Plugins/Changes.txt
@@ -5,6 +5,10 @@ Add new items to top
 2006-07-31 Kimmo
  BUG: [ 1423769 ] Wrong link path in DisplayXMLFiles in Merge Min Release
   Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
+ BUG: [ 1373233 ] Copy&paste bug in DisplayBinaryFiles
+  Plugins\src_VCPP\DisplayBinaryFiles:
+   DisplayBinaryFiles.idl DisplayBinaryFiles.rc
+  Plugins\dlls: DisplayBinaryFiles.dll (1.0.4.0)
 
 2006-03-06 Perry
  PATCH: [ 1441050 ] Fix RCLocalizationHelper

diff --git a/Plugins/dlls/DisplayBinaryFiles.dll b/Plugins/dlls/DisplayBinaryFiles.dll
index 4f978f1..c6e3f4c 100644 (file)
Binary files a/Plugins/dlls/DisplayBinaryFiles.dll and b/Plugins/dlls/DisplayBinaryFiles.dll differ

diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.cpp b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.cpp
index b7d55b7..ed38b20 100644 (file)
--- a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.cpp
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.cpp
@@ -28,7 +28,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
 {
     if (dwReason == DLL_PROCESS_ATTACH)
     {
-        _Module.Init(ObjectMap, hInstance, &LIBID_HIDEFIRSTLETTERLib);
+        _Module.Init(ObjectMap, hInstance, &LIBID_DisplayBinaryFilesLib);
         DisableThreadLibraryCalls(hInstance);
     }
     else if (dwReason == DLL_PROCESS_DETACH)

diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.idl b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.idl
index 308322e..52373f8 100644 (file)
--- a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.idl
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.idl
@@ -30,7 +30,7 @@ import "ocidl.idl";
        version(1.0),
        helpstring("DisplayBinaryFiles 1.0 Type Library")
 ]
-library HIDEFIRSTLETTERLib
+library DisplayBinaryFilesLib
 {
        importlib("stdole32.tlb");
        importlib("stdole2.tlb");

diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc
index 9e493d8..5724891 100644 (file)
--- a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,3,0
- PRODUCTVERSION 1,0,3,0
+ FILEVERSION 1,0,4,0
+ PRODUCTVERSION 1,0,4,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -72,12 +72,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "DisplayBinaryFiles Module\0"
-            VALUE "FileVersion", "1, 0, 3, 0\0"
+            VALUE "FileVersion", "1, 0, 4, 0\0"
             VALUE "InternalName", "DisplayBinaryFiles\0"
             VALUE "LegalCopyright", "Copyright 2003-2006\0"
             VALUE "OriginalFilename", "DisplayBinaryFiles.DLL\0"
             VALUE "ProductName", "DisplayBinaryFiles Module\0"
-            VALUE "ProductVersion", "1, 0, 3, 0\0"
+            VALUE "ProductVersion", "1, 0, 4, 0\0"
             VALUE "OLESelfRegister", "\0"
         END
     END

diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.h b/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.h
index c93aec8..3584f02 100644 (file)
--- a/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.h
+++ b/Plugins/src_VCPP/DisplayBinaryFiles/WinMergeScript.h
@@ -19,7 +19,7 @@ class ATL_NO_VTABLE CWinMergeScript :
        public CComCoClass<CWinMergeScript, &CLSID_WinMergeScript>,
 // change 3 : insert the text ", 1, 0, CComTypeInfoHolderFileOnly" 
        // public IDispatchImpl<IWinMergeScript, &IID_IWinMergeScript, &LIBID_HIDEFIRSTLETTERLib>
-       public IDispatchImpl<IWinMergeScript, &IID_IWinMergeScript, &LIBID_HIDEFIRSTLETTERLib, 1, 0, CComTypeInfoHolderFileOnly>
+       public IDispatchImpl<IWinMergeScript, &IID_IWinMergeScript, &LIBID_DisplayBinaryFilesLib, 1, 0, CComTypeInfoHolderFileOnly>
 {
 public:
        CWinMergeScript()