[Winmerge-svn] SF.net SVN: winmerge: [3900] branches/R2_6/Src

[<ki...@us...>]

Revision: 3900
          http://svn.sourceforge.net/winmerge/?rev=3900&view=rev
Author:   kimmov
Date:     2006-12-04 08:29:45 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
PATCH: [ 1607823 ] Remove manifest loading from lang dlls

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
    branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
    branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
    branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
    branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
    branches/R2_6/Src/Languages/Czech/MergeCzech.rc
    branches/R2_6/Src/Languages/Danish/MergeDanish.rc
    branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
    branches/R2_6/Src/Languages/French/MergeFrench.rc
    branches/R2_6/Src/Languages/German/MergeGerman.rc
    branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
    branches/R2_6/Src/Languages/Italian/MergeItalian.rc
    branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
    branches/R2_6/Src/Languages/Korean/MergeKorean.rc
    branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
    branches/R2_6/Src/Languages/Polish/MergePolish.rc
    branches/R2_6/Src/Languages/Russian/MergeRussian.rc
    branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
    branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
    branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
    branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Changes.txt	2006-12-04 16:29:45 UTC (rev 3900)
@@ -5,6 +5,8 @@
 2006-12-04 Kimmo
  PATCH: [ 1512881 ] Fix memleak from charsets.c
   Src: charsets.cp charsets.h Merge.cpp
+ PATCH: [ 1607823 ] Remove manifest loading from lang dlls
+  Src/Languages/*: Merge*.rc
 
 2006-12-03 Kimmo
  PATCH: [ 1607343 ] Fix filefilter regexp uppercasing for 2.6 branch

Modified: branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Brazilian/MergeBrazilian.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Bulgarian/MergeBulgarian.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -61,16 +61,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- branches/R2_6/Src/Languages/Czech/MergeCzech.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Czech/MergeCzech.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Danish/MergeDanish.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Danish/MergeDanish.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- branches/R2_6/Src/Languages/Dutch/MergeDutch.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Dutch/MergeDutch.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/French/MergeFrench.rc
===================================================================
--- branches/R2_6/Src/Languages/French/MergeFrench.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/French/MergeFrench.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/German/MergeGerman.rc
===================================================================
--- branches/R2_6/Src/Languages/German/MergeGerman.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/German/MergeGerman.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Hungarian/MergeHungarian.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- branches/R2_6/Src/Languages/Italian/MergeItalian.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Italian/MergeItalian.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Japanese/MergeJapanese.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- branches/R2_6/Src/Languages/Korean/MergeKorean.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Korean/MergeKorean.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Norwegian/MergeNorwegian.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Polish/MergePolish.rc
===================================================================
--- branches/R2_6/Src/Languages/Polish/MergePolish.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Polish/MergePolish.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- branches/R2_6/Src/Languages/Russian/MergeRussian.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Russian/MergeRussian.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Slovak/MergeSlovak.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Spanish/MergeSpanish.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Swedish/MergeSwedish.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

Modified: branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc	2006-12-04 16:24:25 UTC (rev 3899)
+++ branches/R2_6/Src/Languages/Turkish/MergeTurkish.rc	2006-12-04 16:29:45 UTC (rev 3900)
@@ -59,16 +59,6 @@
 
 #endif    // APSTUDIO_INVOKED
 
-
-// Include the manifest file for VC6 and VS2003.Net
-#if _MSC_VER < 1400
-  #ifdef UNICODE
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMergeU.exe.manifest"
-  #else
-    CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\\..\\res\\WinMerge.exe.manifest"
-  #endif
-#endif // MSC_VER
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.