OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 016fe52)
DisplayXMLFiles plugin: Upgrade project file to VS2017 and fix #71
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 20 Sep 2017 21:48:47 +0000 (06:48 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 20 Sep 2017 21:48:47 +0000 (06:48 +0900)
Plugins/dlls/DisplayXMLFiles.dll patch | blob | history
Plugins/dlls/X64/DisplayXMLFiles.dll patch | blob | history
Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc patch | blob | history
Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.sln patch | blob | history
Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj patch | blob | history
Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp patch | blob | history

diff --git a/Plugins/dlls/DisplayXMLFiles.dll b/Plugins/dlls/DisplayXMLFiles.dll
index c0bf003..5638671 100644 (file)
Binary files a/Plugins/dlls/DisplayXMLFiles.dll and b/Plugins/dlls/DisplayXMLFiles.dll differ
diff --git a/Plugins/dlls/X64/DisplayXMLFiles.dll b/Plugins/dlls/X64/DisplayXMLFiles.dll
index 513712d..9fba4b3 100644 (file)
Binary files a/Plugins/dlls/X64/DisplayXMLFiles.dll and b/Plugins/dlls/X64/DisplayXMLFiles.dll differ
diff --git a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc
index c30d59e..e8cb51f 100644 (file)
--- a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc
+++ b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.rc
@@ -54,8 +54,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,2,2
- PRODUCTVERSION 1,1,2,2
+ FILEVERSION 1,1,2,3
+ PRODUCTVERSION 1,1,2,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,15 +73,15 @@ BEGIN
             VALUE "Comments", "WinMerge plugin\0"
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "DisplayXMLFiles Module\0"
-            VALUE "FileVersion", "1, 1, 2, 2\0"
+            VALUE "FileVersion", "1, 1, 2, 3\0"
             VALUE "InternalName", "DisplayXMLFiles\0"
-            VALUE "LegalCopyright", "Copyright 2003-2015\0"
+            VALUE "LegalCopyright", "Copyright 2003-2017\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OLESelfRegister", "\0"
             VALUE "OriginalFilename", "DisplayXMLFiles.DLL\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "DisplayXMLFiles Module\0"
-            VALUE "ProductVersion", "1, 1, 2, 2\0"
+            VALUE "ProductVersion", "1, 1, 2, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.sln b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.sln
index 937681c..e744194 100644 (file)
--- a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.sln
+++ b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.sln
@@ -1,38 +1,59 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DisplayXMLFiles", "DisplayXMLFiles.vcproj", "{39A01D56-5BAA-489F-93D4-AB32082B297F}"
-       ProjectSection(ProjectDependencies) = postProject
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfiguration) = preSolution
-               Debug = Debug
-               Release = Release
-               Release MinDependency = Release MinDependency
-               Release MinSize = Release MinSize
-               Unicode Debug = Unicode Debug
-               Unicode Release MinDependency = Unicode Release MinDependency
-               Unicode Release MinSize = Unicode Release MinSize
-       EndGlobalSection
-       GlobalSection(ProjectDependencies) = postSolution
-       EndGlobalSection
-       GlobalSection(ProjectConfiguration) = postSolution
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Debug.ActiveCfg = Debug|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Debug.Build.0 = Debug|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Release.ActiveCfg = Unicode Release MinSize|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Release.Build.0 = Unicode Release MinSize|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Release MinDependency.ActiveCfg = Release MinDependency|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Release MinDependency.Build.0 = Release MinDependency|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Release MinSize.ActiveCfg = Release MinSize|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Release MinSize.Build.0 = Release MinSize|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Unicode Debug.ActiveCfg = Unicode Debug|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Unicode Debug.Build.0 = Unicode Debug|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Unicode Release MinDependency.ActiveCfg = Unicode Release MinDependency|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Unicode Release MinDependency.Build.0 = Unicode Release MinDependency|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Unicode Release MinSize.ActiveCfg = Unicode Release MinSize|Win32
-               {39A01D56-5BAA-489F-93D4-AB32082B297F}.Unicode Release MinSize.Build.0 = Unicode Release MinSize|Win32
-       EndGlobalSection
-       GlobalSection(ExtensibilityGlobals) = postSolution
-       EndGlobalSection
-       GlobalSection(ExtensibilityAddIns) = postSolution
-       EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.26730.15\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DisplayXMLFiles", "DisplayXMLFiles.vcxproj", "{BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|x64 = Debug|x64\r
+               Debug|x86 = Debug|x86\r
+               Release MinDependency|x64 = Release MinDependency|x64\r
+               Release MinDependency|x86 = Release MinDependency|x86\r
+               Release MinSize|x64 = Release MinSize|x64\r
+               Release MinSize|x86 = Release MinSize|x86\r
+               Release|x64 = Release|x64\r
+               Release|x86 = Release|x86\r
+               Unicode Debug|x64 = Unicode Debug|x64\r
+               Unicode Debug|x86 = Unicode Debug|x86\r
+               Unicode Release MinDependency|x64 = Unicode Release MinDependency|x64\r
+               Unicode Release MinDependency|x86 = Unicode Release MinDependency|x86\r
+               Unicode Release MinSize|x64 = Unicode Release MinSize|x64\r
+               Unicode Release MinSize|x86 = Unicode Release MinSize|x86\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Debug|x64.ActiveCfg = Debug|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Debug|x64.Build.0 = Debug|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinDependency|x64.ActiveCfg = Release MinDependency|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinDependency|x64.Build.0 = Release MinDependency|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinDependency|x86.ActiveCfg = Release MinDependency|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinDependency|x86.Build.0 = Release MinDependency|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinSize|x64.ActiveCfg = Release MinSize|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinSize|x64.Build.0 = Release MinSize|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinSize|x86.ActiveCfg = Release MinSize|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release MinSize|x86.Build.0 = Release MinSize|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release|x64.ActiveCfg = Unicode Release MinDependency|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release|x64.Build.0 = Unicode Release MinDependency|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release|x86.ActiveCfg = Unicode Release MinDependency|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release|x86.Build.0 = Unicode Release MinDependency|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Debug|x64.Build.0 = Unicode Debug|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Debug|x86.ActiveCfg = Unicode Debug|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Debug|x86.Build.0 = Unicode Debug|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinDependency|x64.ActiveCfg = Unicode Release MinDependency|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinDependency|x64.Build.0 = Unicode Release MinDependency|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinDependency|x86.ActiveCfg = Unicode Release MinDependency|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinDependency|x86.Build.0 = Unicode Release MinDependency|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinSize|x64.ActiveCfg = Unicode Release MinSize|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinSize|x64.Build.0 = Unicode Release MinSize|x64\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinSize|x86.ActiveCfg = Unicode Release MinSize|Win32\r
+               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Unicode Release MinSize|x86.Build.0 = Unicode Release MinSize|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(ExtensibilityGlobals) = postSolution\r
+               SolutionGuid = {C8047016-4019-42A3-BE1E-08A94EB62E0A}\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj
index 1079e3e..63a7fa5 100644 (file)
--- a/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj
+++ b/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcxproj
@@ -54,6 +54,7 @@
     <ProjectName>DisplayXMLFiles</ProjectName>\r
     <ProjectGuid>{BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}</ProjectGuid>\r
     <RootNamespace>DisplayXMLFiles</RootNamespace>\r
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|Win32'" Label="Configuration">\r
@@ -61,78 +62,78 @@
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MinSize|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
     <CharacterSet>Unicode</CharacterSet>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MinSize|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <UseOfAtl>Static</UseOfAtl>\r
-    <PlatformToolset>v120_xp</PlatformToolset>\r
+    <PlatformToolset>v141_xp</PlatformToolset>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
@@ -188,40 +189,28 @@
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|Win32'">$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|x64'">$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release MinDependency|x64'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release MinSize|Win32'">$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release MinSize|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release MinSize|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release MinSize|x64'">$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release MinSize|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release MinSize|x64'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'">$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|Win32'">$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|Win32'">$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|x64'">$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinSize|x64'">false</LinkIncremental>\r
   </PropertyGroup>\r
@@ -239,9 +228,6 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\DebugU/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
@@ -253,12 +239,10 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeDebugStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -286,9 +270,6 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\DebugU/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
@@ -299,12 +280,10 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeDebugStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -332,9 +311,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinDependency/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
@@ -345,11 +321,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -378,9 +352,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinDependency/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
@@ -390,11 +361,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -421,9 +390,6 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\Debug/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
@@ -436,12 +402,10 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeDebugStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -469,9 +433,6 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\Debug/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
@@ -483,12 +444,10 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeDebugStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -516,9 +475,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinSize/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
@@ -529,11 +485,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -562,9 +516,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseMinSize/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
@@ -574,11 +525,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -606,9 +555,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinDependency/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
@@ -619,11 +565,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -652,9 +596,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
@@ -664,11 +605,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -696,9 +635,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinSize/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
@@ -709,11 +645,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -742,9 +676,6 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>\r
-      <AssemblerListingLocation>.\..\..\..\BuildTmp\DisplayXMLFiles\ReleaseUMinSize/</AssemblerListingLocation>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>\r
       <WarningLevel>Level3</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
     </ClCompile>\r
@@ -754,11 +685,9 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\Build\MergeReleaseStatic;..\..\..\Build\expat;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>.\DisplayXMLFiles.def</ModuleDefinitionFile>\r
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>\r
       <SubSystem>Windows</SubSystem>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
diff --git a/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp b/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp
index b20de73..c6e053c 100644 (file)
--- a/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp
+++ b/Plugins/src_VCPP/DisplayXMLFiles/WinMergeScript.cpp
@@ -316,12 +316,12 @@ STDMETHODIMP CWinMergeScript::UnpackFile(BSTR fileSrc, BSTR fileDst, VARIANT_BOO
        {
                // There was an error
                // Give a warning and return without converting anything
-               TCHAR sError[1024];
-               _stprintf(sError, _T("%s at line %d\n"),
+               char sError[1024];
+               sprintf(sError, "%s at line %d\n",
                        XML_ErrorString(XML_GetErrorCode(parser)),
                        XML_GetCurrentLineNumber(parser));
                
-               ::MessageBox(NULL, sError, _T("The xml has an error"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
+               ::MessageBoxA(NULL, sError, "The xml has an error", MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
                XML_ParserFree(parser);
                delete [] buf;
                fclose(pInput);
About OSDN
Find Software
Develop Software
Help