소스 검색

全部使用lib静态链接方式。

Jeff 6 년 전
부모
커밋
4c494278d6

+ 5 - 5
source/hook/WeChats.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WeChats", "WeChats\WeChats.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WxService", "WxService\WxService.vcproj", "{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WxAdoInterface", "WxAdoInterface\WxAdoInterface.vcproj", "{C9691ACA-CDE0-4709-A295-533DFB148A37}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WxAdoInterface", "WxAdoInterface\WxAdoInterface.vcproj", "{3DA33328-6F2A-4673-9A30-BB8791A88171}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,10 +27,10 @@ Global
 		{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}.Debug|Win32.Build.0 = Debug|Win32
 		{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}.Release|Win32.ActiveCfg = Release|Win32
 		{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}.Release|Win32.Build.0 = Release|Win32
-		{C9691ACA-CDE0-4709-A295-533DFB148A37}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C9691ACA-CDE0-4709-A295-533DFB148A37}.Debug|Win32.Build.0 = Debug|Win32
-		{C9691ACA-CDE0-4709-A295-533DFB148A37}.Release|Win32.ActiveCfg = Release|Win32
-		{C9691ACA-CDE0-4709-A295-533DFB148A37}.Release|Win32.Build.0 = Release|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Debug|Win32.Build.0 = Debug|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Release|Win32.ActiveCfg = Release|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 7 - 9
source/hook/WeChats2017.sln

@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WeChats", "WeChats\WeChats.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WxService", "WxService\WxService.vcxproj", "{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WxAdoInterface", "WxAdoInterface\WxAdoInterface.vcxproj", "{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WxAdoInterface", "WxAdoInterface\WxAdoInterface.vcxproj", "{3DA33328-6F2A-4673-9A30-BB8791A88171}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,14 +37,12 @@ Global
 		{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}.Release|Win32.ActiveCfg = Release|Win32
 		{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}.Release|Win32.Build.0 = Release|Win32
 		{F6D9B47B-95FF-4A7D-BA72-F33A0506BE21}.Release|x64.ActiveCfg = Release|Win32
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Debug|Win32.Build.0 = Debug|Win32
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Debug|x64.ActiveCfg = Debug|x64
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Debug|x64.Build.0 = Debug|x64
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Release|Win32.ActiveCfg = Release|Win32
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Release|Win32.Build.0 = Release|Win32
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Release|x64.ActiveCfg = Release|x64
-		{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}.Release|x64.Build.0 = Release|x64
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Debug|Win32.Build.0 = Debug|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Debug|x64.ActiveCfg = Debug|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Release|Win32.ActiveCfg = Release|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Release|Win32.Build.0 = Release|Win32
+		{3DA33328-6F2A-4673-9A30-BB8791A88171}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 28 - 0
source/hook/WxAdoInterface/ReadMe.txt

@@ -0,0 +1,28 @@
+========================================================================
+    静态库:WxAdoInterface 项目概述
+========================================================================
+
+应用程序向导已为您创建了此 WxAdoInterface 库项目。
+
+本文件概要介绍组成 WxAdoInterface 应用程序的每个文件的内容。
+
+
+WxAdoInterface.vcproj
+    这是使用应用程序向导生成的 VC++ 项目的主项目文件,
+    其中包含生成该文件的 Visual C++ 的版本信息,以及有关使用应用程序向导选择的平台、配置和项目功能的信息。
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+StdAfx.h, StdAfx.cpp
+    这些文件用于生成名为 WxAdoInterface.pch 的预编译头 (PCH) 文件和名为 StdAfx.obj 的预编译类型文件。
+
+/////////////////////////////////////////////////////////////////////////////
+编译器和链接器开关已经过修改,可以支持 MFC。在此项目中使用 MFC 类向导需要将几个文件添加到项目中,其中包括“resource.h”、“WxAdoInterface.rc”以及含有 resource.h 的“WxAdoInterface.h”。如果将 rc 文件添加到静态库,可能会遇到一些困难,因为 Dll 或 Exe 中只允许有一个 rc 文件。可以通过将库的 .rc 文件包含到父项目的 .rc 文件来解决此问题。
+
+/////////////////////////////////////////////////////////////////////////////
+其他注释:
+
+应用程序向导使用“TODO:”注释来指示应添加或自定义的源代码部分。
+
+/////////////////////////////////////////////////////////////////////////////

+ 62 - 64
source/hook/WxAdoInterface/WxAdoInterface.vcproj

@@ -3,9 +3,9 @@
 	ProjectType="Visual C++"
 	Version="9.00"
 	Name="WxAdoInterface"
-	ProjectGUID="{C9691ACA-CDE0-4709-A295-533DFB148A37}"
+	ProjectGUID="{3DA33328-6F2A-4673-9A30-BB8791A88171}"
 	RootNamespace="WxAdoInterface"
-	Keyword="MFCDLLProj"
+	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
@@ -20,9 +20,9 @@
 			Name="Debug|Win32"
 			OutputDirectory="..\..\..\..\bin\$(SolutionName)"
 			IntermediateDirectory="$(OutDir)\$(ProjectName)\$(ConfigurationName)\"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			UseOfMFC="2"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -38,13 +38,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_AFXEXT"
+				AdditionalIncludeDirectories="..\Include;..\pb"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -57,27 +56,18 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2052"
-				AdditionalIncludeDirectories="$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				ModuleDefinitionFile=".\WxAdoInterface.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				AdditionalDependencies="libprotobufd.lib libprotobuf-lited.lib libprotocd.lib"
+				AdditionalLibraryDirectories="..\lib;"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -87,21 +77,17 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy $(TargetDir)$(ProjectName).lib $(SolutionDir)WxService\ /Y /A"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\..\..\..\bin\$(SolutionName)"
 			IntermediateDirectory="$(OutDir)\$(ProjectName)\$(ConfigurationName)\"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			UseOfMFC="2"
-			CharacterSet="2"
+			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -118,14 +104,13 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFXEXT"
+				AdditionalIncludeDirectories="..\Include;..\pb"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
@@ -137,29 +122,18 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2052"
-				AdditionalIncludeDirectories="$(IntDir)"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				ModuleDefinitionFile=".\WxAdoInterface.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
+				AdditionalDependencies="libprotobuf.lib libprotobuf-lite.lib libprotoc.lib"
+				AdditionalLibraryDirectories="..\lib;"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -169,12 +143,8 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy $(TargetDir)$(ProjectName).lib $(SolutionDir)WxService\ /Y /A"
 			/>
 		</Configuration>
 	</Configurations>
@@ -214,14 +184,6 @@
 				RelativePath=".\WxAdoImpl.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\WxAdoInterface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\WxAdoInterface.def"
-				>
-			</File>
 			<File
 				RelativePath=".\WxAdoPool.cpp"
 				>
@@ -244,10 +206,6 @@
 				RelativePath=".\IWxAdoInterface.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
 			<File
 				RelativePath=".\SafeList.h"
 				>
@@ -264,10 +222,6 @@
 				RelativePath=".\WxAdoImpl.h"
 				>
 			</File>
-			<File
-				RelativePath=".\WxAdoInterface.h"
-				>
-			</File>
 			<File
 				RelativePath=".\WxAdoPool.h"
 				>
@@ -278,12 +232,56 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+		</Filter>
+		<Filter
+			Name="pb"
+			>
 			<File
-				RelativePath=".\WxAdoInterface.rc"
+				RelativePath="..\pb\msg.pb.cc"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\pb\msg.pb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\pb\table.pb.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\res\WxAdoInterface.rc2"
+				RelativePath="..\pb\table.pb.h"
 				>
 			</File>
 		</Filter>

+ 52 - 163
source/hook/WxAdoInterface/WxAdoInterface.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -9,236 +9,125 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{B3C0BF00-C99D-4CC1-BABE-842914F0D9D6}</ProjectGuid>
-    <Keyword>MFCDLLProj</Keyword>
+    <ProjectGuid>{3DA33328-6F2A-4673-9A30-BB8791A88171}</ProjectGuid>
     <RootNamespace>WxAdoInterface</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>16.0.28320.50</_ProjectFileVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
     <OutDir>..\..\..\..\bin\$(SolutionName)\</OutDir>
     <IntDir>$(OutDir)$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
     <OutDir>..\..\..\..\bin\$(SolutionName)\</OutDir>
     <IntDir>$(OutDir)$(ProjectName)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\Include;..\pb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\Include;..\pb;</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4018;4065;4146;4244;4251;4267;4305;4307;4309;4334;4355;4506;4800;4996</DisableSpecificWarnings>
-      <CompileAs>Default</CompileAs>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>..\lib;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libprotobufd.lib;libprotobuf-lited.lib;libprotocd.lib;gmock_main.lib;gmock.lib;msvcprtd.lib;mfcs140d.lib</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>mfcs140d.lib;msvcprtd.lib</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0804</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>libprotobufd.lib;libprotobuf-lited.lib;libprotocd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
     <PostBuildEvent>
       <Command>xcopy $(TargetDir)$(ProjectName).lib $(SolutionDir)WxService\ /Y /A</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
-    </Link>
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0804</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_AFXEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\Include;..\pb;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Include;..\pb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4018;4065;4146;4244;4251;4267;4305;4307;4309;4334;4355;4506;4800;4996</DisableSpecificWarnings>
     </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>..\lib;</AdditionalLibraryDirectories>
-      <AdditionalDependencies>msvcprt.lib;mfcs140.lib;libprotobuf.lib;libprotobuf-lite.lib;libprotoc.lib;</AdditionalDependencies>
-      <IgnoreSpecificDefaultLibraries>mfcs140.lib;msvcprt.lib</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0804</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
+    <Lib>
+      <AdditionalDependencies>libprotobuf.lib;libprotobuf-lite.lib;libprotoc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
     <PostBuildEvent>
       <Command>xcopy $(TargetDir)$(ProjectName).lib $(SolutionDir)WxService\ /Y /A</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>.\WxAdoInterface.def</ModuleDefinitionFile>
-    </Link>
-    <Midl>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0804</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\pb\msg.pb.cc">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\pb\table.pb.cc">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="WxAdoImpl.cpp" />
-    <ClCompile Include="WxAdoPool.cpp" />
     <ClCompile Include="Global.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="WxAdoInterface.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\WxAdoInterface.rc2" />
-    <None Include="WxAdoInterface.def" />
+    <ClCompile Include="WxAdoImpl.cpp" />
+    <ClCompile Include="WxAdoPool.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\pb\msg.pb.h" />
     <ClInclude Include="..\pb\table.pb.h" />
     <ClInclude Include="CritSection.h" />
-    <ClInclude Include="WxAdoImpl.h" />
-    <ClInclude Include="WxAdoPool.h" />
     <ClInclude Include="Global.h" />
     <ClInclude Include="IWxAdoInterface.h" />
-    <ClInclude Include="Resource.h" />
     <ClInclude Include="SafeList.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
-    <ClInclude Include="WxAdoInterface.h" />
+    <ClInclude Include="WxAdoImpl.h" />
+    <ClInclude Include="WxAdoPool.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="WxAdoInterface.rc" />
+    <Text Include="ReadMe.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

+ 17 - 30
source/hook/WxAdoInterface/WxAdoInterface.vcxproj.filters

@@ -7,82 +7,69 @@
     </Filter>
     <Filter Include="头文件">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
     <Filter Include="资源文件">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
     <Filter Include="pb">
-      <UniqueIdentifier>{f4d1c9bf-1bc3-426d-82e2-303d865b93cf}</UniqueIdentifier>
+      <UniqueIdentifier>{2a83eb66-2cdc-4ca6-8075-7c6f599d48e3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="WxAdoInterface.cpp">
+    <ClCompile Include="Global.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="Global.cpp">
+    <ClCompile Include="WxAdoImpl.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="WxAdoPool.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="WxAdoImpl.cpp">
-      <Filter>源文件</Filter>
+    <ClCompile Include="..\pb\msg.pb.cc">
+      <Filter>pb</Filter>
     </ClCompile>
     <ClCompile Include="..\pb\table.pb.cc">
       <Filter>pb</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="WxAdoInterface.def">
-      <Filter>源文件</Filter>
-    </None>
-    <None Include="res\WxAdoInterface.rc2">
-      <Filter>资源文件</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
+    <ClInclude Include="CritSection.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="Resource.h">
+    <ClInclude Include="Global.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="WxAdoInterface.h">
+    <ClInclude Include="IWxAdoInterface.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="CritSection.h">
+    <ClInclude Include="SafeList.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="Global.h">
+    <ClInclude Include="stdafx.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="SafeList.h">
+    <ClInclude Include="targetver.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="IWxAdoInterface.h">
+    <ClInclude Include="WxAdoImpl.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="WxAdoPool.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="WxAdoImpl.h">
-      <Filter>头文件</Filter>
+    <ClInclude Include="..\pb\msg.pb.h">
+      <Filter>pb</Filter>
     </ClInclude>
     <ClInclude Include="..\pb\table.pb.h">
       <Filter>pb</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="WxAdoInterface.rc">
-      <Filter>资源文件</Filter>
-    </ResourceCompile>
+    <Text Include="ReadMe.txt" />
   </ItemGroup>
 </Project>

+ 5 - 4
source/hook/WxAdoInterface/stdafx.cpp

@@ -1,7 +1,8 @@
-锘�// stdafx.cpp : 鍙�寘鎷�爣鍑嗗寘鍚�枃浠剁殑婧愭枃浠�
-// WxAdoInterface.pch 灏嗕綔涓洪�缂栬瘧鏍囧ご
-// stdafx.obj 灏嗗寘鍚��缂栬瘧绫诲瀷淇℃伅
+// stdafx.cpp : 只包括标准包含文件的源文件
+// WxAdoInterface.pch 将作为预编译头
+// stdafx.obj 将包含预编译类型信息
 
 #include "stdafx.h"
 
-
+// TODO: 在 STDAFX.H 中
+// 引用任何所需的附加头文件,而不是在此文件中引用

+ 26 - 22
source/hook/WxAdoInterface/stdafx.h

@@ -1,47 +1,51 @@
-锘�// stdafx.h : 鏍囧噯绯荤粺鍖呭惈鏂囦欢鐨勫寘鍚�枃浠讹紝
-// 鎴栨槸缁忓父浣跨敤浣嗕笉甯告洿鏀圭殑
-// 鐗瑰畾浜庨」鐩�殑鍖呭惈鏂囦欢
+// stdafx.h : 标准系统包含文件的包含文件,
+// 或是经常使用但不常更改的
+// 特定于项目的包含文件
+//
 
 #pragma once
 
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN            // 浠� Windows 澶翠腑鎺掗櫎鏋佸皯浣跨敤鐨勮祫鏂�
-#endif
-
 #include "targetver.h"
 
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // 鏌愪簺 CString 鏋勯€犲嚱鏁板皢鏄�樉寮忕殑
+#define WIN32_LEAN_AND_MEAN             // 从 Windows 头中排除极少使用的资料
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS      // 某些 CString 构造函数将是显式的
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN            // 从 Windows 头中排除极少使用的资料
+#endif
 
-#include <afxwin.h>         // MFC 鏍稿績缁勪欢鍜屾爣鍑嗙粍浠�
-#include <afxext.h>         // MFC 鎵╁睍
+#include <afx.h>
+#include <afxwin.h>         // MFC 核心组件和标准组件
+#include <afxext.h>         // MFC 扩展
 
 #ifndef _AFX_NO_OLE_SUPPORT
-#include <afxole.h>         // MFC OLE 绫�
-#include <afxodlgs.h>       // MFC OLE 瀵硅瘽妗嗙被
-#include <afxdisp.h>        // MFC 鑷�姩鍖栫被
+#include <afxole.h>         // MFC OLE 
+#include <afxodlgs.h>       // MFC OLE 对话框类
+#include <afxdisp.h>        // MFC 自动化类
 #endif // _AFX_NO_OLE_SUPPORT
 
-#ifndef _AFX_NO_DB_SUPPORT
-#include <afxdb.h>                      // MFC ODBC 鏁版嵁搴撶被
-#endif // _AFX_NO_DB_SUPPORT
-
+/*#include <ATLComTime.h>*/
 #ifndef _AFX_NO_DAO_SUPPORT
-#include <afxdao.h>                     // MFC DAO 鏁版嵁搴撶被
+#include <afxdao.h>                     // MFC DAO 数据库类
 #endif // _AFX_NO_DAO_SUPPORT
 
 #ifndef _AFX_NO_OLE_SUPPORT
-#include <afxdtctl.h>           // MFC 瀵� Internet Explorer 4 鍏�叡鎺т欢鐨勬敮鎸�
+#include <afxdtctl.h>           // MFC 对 Internet Explorer 4 公共控件的支持
 #endif
 #ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>                     // MFC 瀵� Windows 鍏�叡鎺т欢鐨勬敮鎸�
+#include <afxcmn.h>                     // MFC 对 Windows 公共控件的支持
 #endif // _AFX_NO_AFXCMN_SUPPORT
 
+
+
+// TODO: 在此处引用程序需要的其他头文件
+
 #include "table.pb.h"
 
-// Ado//鐢变簬MFC灏佽�鐨凮DBC涓嶅お濂界敤;
+// Ado//由于MFC封装的ODBC不太好用;
 #import "C:\Program Files\Common Files\System\ado\msado15.dll" rename_namespace("ADOCG") rename("EOF", "adoEOF")
 //#import "..\ado\msado15.dll" rename_namespace("ADOCG") rename("EOF", "adoEOF")
-#pragma warning (default: 4146)  // 寰�蒋寤鸿�涓嶈�鐞嗕細杩欎釜閿欒�;
+#pragma warning (default: 4146)  // 微软建议不要理会这个错误;
 using namespace ADOCG;
 
 typedef struct __ADO__

+ 21 - 5
source/hook/WxAdoInterface/targetver.h

@@ -1,8 +1,24 @@
-锘�#pragma once
+#pragma once
 
-// 鍖呮嫭 SDKDDKVer.h 灏嗗畾涔夊彲鐢ㄧ殑鏈€楂樼増鏈�殑 Windows 骞冲彴銆�
+// 以下宏定义要求的最低平台。要求的最低平台
+// 是具有运行应用程序所需功能的 Windows、Internet Explorer 等产品的
+// 最早版本。通过在指定版本及更低版本的平台上启用所有可用的功能,宏可以
+// 正常工作。
 
-// 濡傛灉瑕佷负浠ュ墠鐨� Windows 骞冲彴鐢熸垚搴旂敤绋嬪簭锛岃�鍖呮嫭 WinSDKVer.h锛屽苟灏�
-// 灏� _WIN32_WINNT 瀹忚�缃�负瑕佹敮鎸佺殑骞冲彴锛岀劧鍚庡啀鍖呮嫭 SDKDDKVer.h銆�
+// 如果必须要针对低于以下指定版本的平台,请修改下列定义。
+// 有关不同平台对应值的最新信息,请参考 MSDN。
+#ifndef WINVER                          // 指定要求的最低平台是 Windows Vista。
+#define WINVER 0x0600           // 将此值更改为相应的值,以适用于 Windows 的其他版本。
+#endif
 
-#include <SDKDDKVer.h>
+#ifndef _WIN32_WINNT            // 指定要求的最低平台是 Windows Vista。
+#define _WIN32_WINNT 0x0600     // 将此值更改为相应的值,以适用于 Windows 的其他版本。
+#endif
+
+#ifndef _WIN32_WINDOWS          // 指定要求的最低平台是 Windows 98。
+#define _WIN32_WINDOWS 0x0410 // 将此值更改为适当的值,以适用于 Windows Me 或更高版本。
+#endif
+
+#ifndef _WIN32_IE                       // 指定要求的最低平台是 Internet Explorer 7.0。
+#define _WIN32_IE 0x0700        // 将此值更改为相应的值,以适用于 IE 的其他版本。
+#endif

+ 0 - 26
source/hook/WxService/stdafx.cpp

@@ -11,41 +11,15 @@ IWxAdoInterface* g_pAdoPool = NULL;
 typedef IWxAdoInterface* (*CREATEINSTANCE)();
 BOOL CreatePoolInstance()
 {   
-#ifdef _DLL_
-	//¼ÓÔØ¶¯Ì¬¿â
-	g_hpool = (HMODULE)LoadLibrary(_T("WxAdoInterface.dll"));
-	if (g_hpool == NULL)
-	{
-		CString strError = _T("");
-		strError.Format(_T("error = %d"), GetLastError());
-		return FALSE;
-	}
-
-	CREATEINSTANCE CreaetInstance = (CREATEINSTANCE)GetProcAddress(g_hpool, "CreateWxAdoPoolInstance");
-	g_pAdoPool = CreaetInstance();
-#else
 	g_pAdoPool = CWxAdoImpl::GetInstance();
-#endif
 	return (g_pAdoPool == NULL) ? FALSE : TRUE;
 }
 
 void FreelyfzodbcLibrary()
 {
-#ifdef _DLL_
-	if (g_hpool)
-	{
-		g_pAdoPool->ReleasePool();
-		g_pAdoPool->Release();
-		FreeLibrary(g_hpool);
-	}
-
-	g_hpool = NULL;
-	g_pAdoPool = NULL;
-#else
 	if (g_pAdoPool)
 	{
 		g_pAdoPool->ReleasePool();
 		g_pAdoPool->Release();
 	}
-#endif
 }