Fix crash when exiting UnitTest x64 version

diff --git a/Plugins/dlls/IgnoreCommentsC.dll b/Plugins/dlls/IgnoreCommentsC.dll
index 2440728..cb0e9e6 100644 (file)
Binary files a/Plugins/dlls/IgnoreCommentsC.dll and b/Plugins/dlls/IgnoreCommentsC.dll differ

diff --git a/Plugins/dlls/WatchBeginningOfLog.dll b/Plugins/dlls/WatchBeginningOfLog.dll
index 43da08e..a544182 100644 (file)
Binary files a/Plugins/dlls/WatchBeginningOfLog.dll and b/Plugins/dlls/WatchBeginningOfLog.dll differ

diff --git a/Plugins/dlls/WatchEndOfLog.dll b/Plugins/dlls/WatchEndOfLog.dll
index 985cda8..dcf5e2f 100644 (file)
Binary files a/Plugins/dlls/WatchEndOfLog.dll and b/Plugins/dlls/WatchEndOfLog.dll differ

diff --git a/Plugins/dlls/X64/IgnoreCommentsC.dll b/Plugins/dlls/X64/IgnoreCommentsC.dll
index b59a334..4b13c67 100644 (file)
Binary files a/Plugins/dlls/X64/IgnoreCommentsC.dll and b/Plugins/dlls/X64/IgnoreCommentsC.dll differ

diff --git a/Plugins/dlls/X64/WatchBeginningOfLog.dll b/Plugins/dlls/X64/WatchBeginningOfLog.dll
index 1717eac..d97acf3 100644 (file)
Binary files a/Plugins/dlls/X64/WatchBeginningOfLog.dll and b/Plugins/dlls/X64/WatchBeginningOfLog.dll differ

diff --git a/Plugins/dlls/X64/WatchEndOfLog.dll b/Plugins/dlls/X64/WatchEndOfLog.dll
index c25d126..b6f97c5 100644 (file)
Binary files a/Plugins/dlls/X64/WatchEndOfLog.dll and b/Plugins/dlls/X64/WatchEndOfLog.dll differ

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

diff --git a/Plugins/src_VCPP/HideFirstLetter/typeinfoex.h b/Plugins/src_VCPP/HideFirstLetter/typeinfoex.h
index d1843bc..b01ce2a 100644 (file)
--- a/Plugins/src_VCPP/HideFirstLetter/typeinfoex.h
+++ b/Plugins/src_VCPP/HideFirstLetter/typeinfoex.h
@@ -201,8 +201,8 @@ inline HRESULT CComTypeInfoHolderModule<nObtainMethod>::GetTI(LCID lcid)
                }
        }
        LeaveCriticalSection(&_Module.m_csTypeInfoHolder);
-       _Module.AddTermFunc(Cleanup, (DWORD)this);
+       _Module.AddTermFunc(Cleanup, (DWORD_PTR)this);
        return hRes;
 }
 
-#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_
\ No newline at end of file
+#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_

diff --git a/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.rc b/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.rc
index a3c65aa..06e70ed 100644 (file)
--- a/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.rc
+++ b/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,3
- PRODUCTVERSION 1,0,1,3
+ FILEVERSION 1,0,1,4
+ PRODUCTVERSION 1,0,1,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,15 +47,15 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "IgnoreCommentsC Module\0"
-            VALUE "FileVersion", "1, 0, 1, 3\0"
+            VALUE "FileVersion", "1, 0, 1, 4\0"
             VALUE "InternalName", "IgnoreCommentsC\0"
-            VALUE "LegalCopyright", "Copyright 2005-2015\0"
+            VALUE "LegalCopyright", "Copyright 2005-2018\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OLESelfRegister", "\0"
             VALUE "OriginalFilename", "IgnoreCommentsC.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "IgnoreCommentsC Module\0"
-            VALUE "ProductVersion", "1, 0, 1, 3\0"
+            VALUE "ProductVersion", "1, 0, 1, 4\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/Plugins/src_VCPP/IgnoreCommentsC/typeinfoex.h b/Plugins/src_VCPP/IgnoreCommentsC/typeinfoex.h
index 4df9c8d..8b874ae 100644 (file)
--- a/Plugins/src_VCPP/IgnoreCommentsC/typeinfoex.h
+++ b/Plugins/src_VCPP/IgnoreCommentsC/typeinfoex.h
@@ -201,8 +201,8 @@ inline HRESULT CComTypeInfoHolderModule<nObtainMethod>::GetTI(LCID lcid)
                }
        }
        LeaveCriticalSection(&_Module.m_csTypeInfoHolder);
-       _Module.AddTermFunc(Cleanup, (DWORD)this);
+       _Module.AddTermFunc(Cleanup, (DWORD_PTR)this);
        return hRes;
 }
 
-#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_
\ No newline at end of file
+#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_

diff --git a/Plugins/src_VCPP/RCLocalizationHelper/RCLocalizationHelper.rc b/Plugins/src_VCPP/RCLocalizationHelper/RCLocalizationHelper.rc
index 233d9dd..f7a8185 100644 (file)
--- a/Plugins/src_VCPP/RCLocalizationHelper/RCLocalizationHelper.rc
+++ b/Plugins/src_VCPP/RCLocalizationHelper/RCLocalizationHelper.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,2
- PRODUCTVERSION 1,0,4,2
+ FILEVERSION 1,0,4,3
+ PRODUCTVERSION 1,0,4,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,15 +73,15 @@ BEGIN
             VALUE "Comments", "WinMerge plugin\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "RCLocalizationHelper Module\0"
-            VALUE "FileVersion", "1, 0, 4, 2\0"
+            VALUE "FileVersion", "1, 0, 4, 3\0"
             VALUE "InternalName", "RCLocalizationHelper\0"
-            VALUE "LegalCopyright", "Copyright 2003-2015\0"
+            VALUE "LegalCopyright", "Copyright 2003-2018\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OLESelfRegister", "\0"
             VALUE "OriginalFilename", "RCLocalizationHelper.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "RCLocalizationHelper Module\0"
-            VALUE "ProductVersion", "1, 0, 4, 2\0"
+            VALUE "ProductVersion", "1, 0, 4, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/Plugins/src_VCPP/RCLocalizationHelper/typeinfoex.h b/Plugins/src_VCPP/RCLocalizationHelper/typeinfoex.h
index 6cd5bc1..74d3db6 100644 (file)
--- a/Plugins/src_VCPP/RCLocalizationHelper/typeinfoex.h
+++ b/Plugins/src_VCPP/RCLocalizationHelper/typeinfoex.h
@@ -201,8 +201,8 @@ inline HRESULT CComTypeInfoHolderModule<nObtainMethod>::GetTI(LCID lcid)
                }
        }
        LeaveCriticalSection(&_Module.m_csTypeInfoHolder);
-       _Module.AddTermFunc(Cleanup, (DWORD)this);
+       _Module.AddTermFunc(Cleanup, (DWORD_PTR)this);
        return hRes;
 }
 
-#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_
\ No newline at end of file
+#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_

diff --git a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc
index 0394ea7..86c0c7a 100644 (file)
--- a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc
+++ b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,2,2
- PRODUCTVERSION 1,0,2,2
+ FILEVERSION 1,0,2,3
+ PRODUCTVERSION 1,0,2,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,15 +73,15 @@ BEGIN
             VALUE "Comments", "WinMerge plugin\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "WatchBeginningOfLog Module\0"
-            VALUE "FileVersion", "1, 0, 2, 2\0"
+            VALUE "FileVersion", "1, 0, 2, 3\0"
             VALUE "InternalName", "WatchBeginningOfLog\0"
-            VALUE "LegalCopyright", "Copyright 2003-2015\0"
+            VALUE "LegalCopyright", "Copyright 2003-2018\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OLESelfRegister", "\0"
             VALUE "OriginalFilename", "WatchBeginningOfLog.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "WatchBeginningOfLog Module\0"
-            VALUE "ProductVersion", "1, 0, 2, 2\0"
+            VALUE "ProductVersion", "1, 0, 2, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/Plugins/src_VCPP/WatchBeginningOfLog/typeinfoex.h b/Plugins/src_VCPP/WatchBeginningOfLog/typeinfoex.h
index d1843bc..b01ce2a 100644 (file)
--- a/Plugins/src_VCPP/WatchBeginningOfLog/typeinfoex.h
+++ b/Plugins/src_VCPP/WatchBeginningOfLog/typeinfoex.h
@@ -201,8 +201,8 @@ inline HRESULT CComTypeInfoHolderModule<nObtainMethod>::GetTI(LCID lcid)
                }
        }
        LeaveCriticalSection(&_Module.m_csTypeInfoHolder);
-       _Module.AddTermFunc(Cleanup, (DWORD)this);
+       _Module.AddTermFunc(Cleanup, (DWORD_PTR)this);
        return hRes;
 }
 
-#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_
\ No newline at end of file
+#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_

diff --git a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc
index 4e806b1..18e08cb 100644 (file)
--- a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc
+++ b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,2,2
- PRODUCTVERSION 1,0,2,2
+ FILEVERSION 1,0,2,3
+ PRODUCTVERSION 1,0,2,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,15 +73,15 @@ BEGIN
             VALUE "Comments", "WinMerge plugin\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "WatchEndOfLog Module\0"
-            VALUE "FileVersion", "1, 0, 2, 2\0"
+            VALUE "FileVersion", "1, 0, 2, 3\0"
             VALUE "InternalName", "WatchEndOfLog\0"
-            VALUE "LegalCopyright", "Copyright 2003-2015\0"
+            VALUE "LegalCopyright", "Copyright 2003-2018\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OLESelfRegister", "\0"
             VALUE "OriginalFilename", "WatchEndOfLog.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "WatchEndOfLog Module\0"
-            VALUE "ProductVersion", "1, 0, 2, 2\0"
+            VALUE "ProductVersion", "1, 0, 2, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

diff --git a/Plugins/src_VCPP/WatchEndOfLog/typeinfoex.h b/Plugins/src_VCPP/WatchEndOfLog/typeinfoex.h
index d1843bc..b01ce2a 100644 (file)
--- a/Plugins/src_VCPP/WatchEndOfLog/typeinfoex.h
+++ b/Plugins/src_VCPP/WatchEndOfLog/typeinfoex.h
@@ -201,8 +201,8 @@ inline HRESULT CComTypeInfoHolderModule<nObtainMethod>::GetTI(LCID lcid)
                }
        }
        LeaveCriticalSection(&_Module.m_csTypeInfoHolder);
-       _Module.AddTermFunc(Cleanup, (DWORD)this);
+       _Module.AddTermFunc(Cleanup, (DWORD_PTR)this);
        return hRes;
 }
 
-#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_
\ No newline at end of file
+#endif // _NEWOBJECTS_ATL_TYPEINFOEX_H_