From: Takashi Sawanaka Date: Tue, 22 Jun 2021 13:38:52 +0000 (+0900) Subject: Plugins: Fix a crash on Window XP X-Git-Tag: v2.16.13 X-Git-Url: http://git.osdn.net/view?p=winmerge-jp%2Fwinmerge-jp.git;a=commitdiff_plain;h=refs%2Ftags%2Fv2.16.13 Plugins: Fix a crash on Window XP https://stackoverflow.com/questions/32633398/crash-in-catlstringmgrgetinstance-under-windows-xp/32953859#32953859 --- diff --git a/Plugins/dlls/ARM64/DisplayXMLFiles.dll b/Plugins/dlls/ARM64/DisplayXMLFiles.dll index bf40c15c1..75a6266b5 100644 Binary files a/Plugins/dlls/ARM64/DisplayXMLFiles.dll and b/Plugins/dlls/ARM64/DisplayXMLFiles.dll differ diff --git a/Plugins/dlls/ARM64/IgnoreColumns.dll b/Plugins/dlls/ARM64/IgnoreColumns.dll index a317aa3c9..a23f14973 100644 Binary files a/Plugins/dlls/ARM64/IgnoreColumns.dll and b/Plugins/dlls/ARM64/IgnoreColumns.dll differ diff --git a/Plugins/dlls/ARM64/IgnoreCommentsC.dll b/Plugins/dlls/ARM64/IgnoreCommentsC.dll index 15a3721fe..9b0e75ea1 100644 Binary files a/Plugins/dlls/ARM64/IgnoreCommentsC.dll and b/Plugins/dlls/ARM64/IgnoreCommentsC.dll differ diff --git a/Plugins/dlls/ARM64/IgnoreFieldsComma.dll b/Plugins/dlls/ARM64/IgnoreFieldsComma.dll index 0351790c2..60a97df79 100644 Binary files a/Plugins/dlls/ARM64/IgnoreFieldsComma.dll and b/Plugins/dlls/ARM64/IgnoreFieldsComma.dll differ diff --git a/Plugins/dlls/ARM64/IgnoreFieldsTab.dll b/Plugins/dlls/ARM64/IgnoreFieldsTab.dll index c3374014e..1d5f65ae8 100644 Binary files a/Plugins/dlls/ARM64/IgnoreFieldsTab.dll and b/Plugins/dlls/ARM64/IgnoreFieldsTab.dll differ diff --git a/Plugins/dlls/ARM64/WatchBeginningOfLog.dll b/Plugins/dlls/ARM64/WatchBeginningOfLog.dll index 6ff9ea32b..1c0a32f0d 100644 Binary files a/Plugins/dlls/ARM64/WatchBeginningOfLog.dll and b/Plugins/dlls/ARM64/WatchBeginningOfLog.dll differ diff --git a/Plugins/dlls/ARM64/WatchEndOfLog.dll b/Plugins/dlls/ARM64/WatchEndOfLog.dll index 3bddf9c71..d567c3912 100644 Binary files a/Plugins/dlls/ARM64/WatchEndOfLog.dll and b/Plugins/dlls/ARM64/WatchEndOfLog.dll differ diff --git a/Plugins/dlls/DisplayXMLFiles.dll b/Plugins/dlls/DisplayXMLFiles.dll index 563867165..696c44a77 100644 Binary files a/Plugins/dlls/DisplayXMLFiles.dll and b/Plugins/dlls/DisplayXMLFiles.dll differ diff --git a/Plugins/dlls/IgnoreColumns.dll b/Plugins/dlls/IgnoreColumns.dll index e1a5831ae..d8291b73a 100644 Binary files a/Plugins/dlls/IgnoreColumns.dll and b/Plugins/dlls/IgnoreColumns.dll differ diff --git a/Plugins/dlls/IgnoreCommentsC.dll b/Plugins/dlls/IgnoreCommentsC.dll index ce1304fd9..0a7f40e87 100644 Binary files a/Plugins/dlls/IgnoreCommentsC.dll and b/Plugins/dlls/IgnoreCommentsC.dll differ diff --git a/Plugins/dlls/IgnoreFieldsComma.dll b/Plugins/dlls/IgnoreFieldsComma.dll index 75af8a837..ae3117312 100644 Binary files a/Plugins/dlls/IgnoreFieldsComma.dll and b/Plugins/dlls/IgnoreFieldsComma.dll differ diff --git a/Plugins/dlls/IgnoreFieldsTab.dll b/Plugins/dlls/IgnoreFieldsTab.dll index f28833a0b..cb4d0b2ae 100644 Binary files a/Plugins/dlls/IgnoreFieldsTab.dll and b/Plugins/dlls/IgnoreFieldsTab.dll differ diff --git a/Plugins/dlls/WatchBeginningOfLog.dll b/Plugins/dlls/WatchBeginningOfLog.dll index a5441820f..646b82f73 100644 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 dcf5e2fec..d6558ef74 100644 Binary files a/Plugins/dlls/WatchEndOfLog.dll and b/Plugins/dlls/WatchEndOfLog.dll differ diff --git a/Plugins/dlls/X64/DisplayXMLFiles.dll b/Plugins/dlls/X64/DisplayXMLFiles.dll index 9fba4b3c4..39a4c2626 100644 Binary files a/Plugins/dlls/X64/DisplayXMLFiles.dll and b/Plugins/dlls/X64/DisplayXMLFiles.dll differ diff --git a/Plugins/dlls/X64/IgnoreColumns.dll b/Plugins/dlls/X64/IgnoreColumns.dll index ca98676de..a40630dc7 100644 Binary files a/Plugins/dlls/X64/IgnoreColumns.dll and b/Plugins/dlls/X64/IgnoreColumns.dll differ diff --git a/Plugins/dlls/X64/IgnoreCommentsC.dll b/Plugins/dlls/X64/IgnoreCommentsC.dll index dbb0138c8..fba7ddc63 100644 Binary files a/Plugins/dlls/X64/IgnoreCommentsC.dll and b/Plugins/dlls/X64/IgnoreCommentsC.dll differ diff --git a/Plugins/dlls/X64/IgnoreFieldsComma.dll b/Plugins/dlls/X64/IgnoreFieldsComma.dll index 2102905f8..275526757 100644 Binary files a/Plugins/dlls/X64/IgnoreFieldsComma.dll and b/Plugins/dlls/X64/IgnoreFieldsComma.dll differ diff --git a/Plugins/dlls/X64/IgnoreFieldsTab.dll b/Plugins/dlls/X64/IgnoreFieldsTab.dll index 1335a6eb3..d7f118f30 100644 Binary files a/Plugins/dlls/X64/IgnoreFieldsTab.dll and b/Plugins/dlls/X64/IgnoreFieldsTab.dll differ diff --git a/Plugins/dlls/X64/WatchBeginningOfLog.dll b/Plugins/dlls/X64/WatchBeginningOfLog.dll index d97acf3f4..29c326089 100644 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 b6f97c541..c6ec3e75a 100644 Binary files a/Plugins/dlls/X64/WatchEndOfLog.dll and b/Plugins/dlls/X64/WatchEndOfLog.dll differ diff --git a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj index 638961e43..7ade2c1c1 100644 --- a/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj +++ b/Plugins/src_VCPP/DisplayBinaryFiles/DisplayBinaryFiles.vcxproj @@ -151,6 +151,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -281,6 +282,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -324,6 +326,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -366,6 +369,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj index cb63c9966..cd330447c 100644 --- a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj +++ b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj @@ -162,6 +162,7 @@ EditAndContinue StreamingSIMDExtensions stdcpp17 + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -205,6 +206,7 @@ true ProgramDatabase stdcpp17 + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -247,6 +249,7 @@ true ProgramDatabase stdcpp17 + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -289,6 +292,7 @@ true StreamingSIMDExtensions stdcpp17 + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj b/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj index b433585a6..0ae6fb2eb 100644 --- a/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj +++ b/Plugins/src_VCPP/EditBinaryFiles/EditBinaryFiles.vcxproj @@ -150,6 +150,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -193,6 +194,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -235,6 +237,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -277,6 +280,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj b/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj index 1fa0b806e..a9bb6de29 100644 --- a/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj +++ b/Plugins/src_VCPP/HideFirstLetter/HideFirstLetter.vcxproj @@ -151,6 +151,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -281,6 +282,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -324,6 +326,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -366,6 +369,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj b/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj index d3b65e835..4bd36d7c0 100644 --- a/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj +++ b/Plugins/src_VCPP/IgnoreColumns/IgnoreColumns.vcxproj @@ -151,6 +151,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -281,6 +282,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -324,6 +326,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -366,6 +369,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj b/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj index 7d48fd13d..4d34ea17f 100644 --- a/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj +++ b/Plugins/src_VCPP/IgnoreCommentsC/IgnoreCommentsC.vcxproj @@ -151,6 +151,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -281,6 +282,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -324,6 +326,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -366,6 +369,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj b/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj index 575a0a979..b67137e53 100644 --- a/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj +++ b/Plugins/src_VCPP/IgnoreFieldsComma/IgnoreFieldsComma.vcxproj @@ -150,6 +150,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -280,6 +281,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -323,6 +325,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -365,6 +368,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj b/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj index 32ffb33b5..7fa4d2f20 100644 --- a/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj +++ b/Plugins/src_VCPP/IgnoreFieldsTab/IgnoreFieldsTab.vcxproj @@ -151,6 +151,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -281,6 +282,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -324,6 +326,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -366,6 +369,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj index 05e322bae..bb115a0fb 100644 --- a/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj +++ b/Plugins/src_VCPP/WatchBeginningOfLog/WatchBeginningOfLog.vcxproj @@ -151,6 +151,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -194,6 +195,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -236,6 +238,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -278,6 +281,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj index edda6531a..68de2ae83 100644 --- a/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj +++ b/Plugins/src_VCPP/WatchEndOfLog/WatchEndOfLog.vcxproj @@ -151,6 +151,7 @@ Level3 true StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -281,6 +282,7 @@ true EditAndContinue StreamingSIMDExtensions + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -324,6 +326,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -366,6 +369,7 @@ Level3 true ProgramDatabase + /Zc:threadSafeInit- %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions)