- bin/PocoMsg.dll file

- project files - EventLogChannel modifications to search for PocoMsg.dll first
2025-01-18 00:15:27 +01:00 · 2008-02-19 18:13:08 +00:00 · 2008-02-19 18:13:08 +00:00 · 7a59e4eb48
commit 7a59e4eb48
parent 19d738c67f
7 changed files with 320 additions and 10 deletions
--- a/Foundation/Foundation_vs71.sln
+++ b/Foundation/Foundation_vs71.sln
@ -18,6 +18,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestAp
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoMsg", "PocoMsg_vs71.vcproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		debug_shared = debug_shared
@ -25,6 +29,8 @@ Global
 		release_shared = release_shared
 		release_static = release_static
 	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared.ActiveCfg = debug_shared|Win32
 		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared.Build.0 = debug_shared|Win32
@ -58,6 +64,14 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared.Build.0 = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static.ActiveCfg = release_static|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static.Build.0 = release_static|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared.ActiveCfg = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_shared.Build.0 = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static.ActiveCfg = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.debug_static.Build.0 = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared.ActiveCfg = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_shared.Build.0 = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static.ActiveCfg = release_shared|Win32
+		{8164D41D-B053-405B-826C-CF37AC0EF176}.release_static.Build.0 = release_shared|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
--- a/Foundation/Foundation_vs80.sln
+++ b/Foundation/Foundation_vs80.sln
@ -16,6 +16,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\Te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs80.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoMsg", "PocoMsg_vs80.vcproj", "{AA986945-F3B6-4381-94BB-14DD49202B40}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Win32 = debug_shared|Win32
@ -56,6 +58,14 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.ActiveCfg = release_static|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.Build.0 = release_static|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_shared|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_shared|Win32.Build.0 = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_static|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_static|Win32.Build.0 = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_shared|Win32.Build.0 = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_static|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_static|Win32.Build.0 = release_shared|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Foundation/Foundation_vs90.sln
+++ b/Foundation/Foundation_vs90.sln
@ -16,6 +16,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLibrary", "testsuite\Te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestApp", "testsuite\TestApp_vs90.vcproj", "{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PocoMsg", "PocoMsg_vs90.vcproj", "{AA986945-F3B6-4381-94BB-14DD49202B40}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_shared|Win32 = debug_shared|Win32
@ -56,6 +58,14 @@ Global
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_shared|Win32.Build.0 = release_shared|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.ActiveCfg = release_static|Win32
 		{6C41E55D-C0FC-4E01-AA8D-B7DA40E31D3A}.release_static|Win32.Build.0 = release_static|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_shared|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_shared|Win32.Build.0 = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_static|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.debug_static|Win32.Build.0 = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_shared|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_shared|Win32.Build.0 = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_static|Win32.ActiveCfg = release_shared|Win32
+		{AA986945-F3B6-4381-94BB-14DD49202B40}.release_static|Win32.Build.0 = release_shared|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Foundation/PocoMsg_vs71.vcproj
+++ b/Foundation/PocoMsg_vs71.vcproj
@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="PocoMsg"
+	ProjectGUID="{8164D41D-B053-405B-826C-CF37AC0EF176}"
+	RootNamespace="Foundation"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
+				OptimizeForProcessor="3"
+				AdditionalIncludeDirectories=".\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				GeneratePreprocessedFile="0"
+				KeepComments="FALSE"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="FALSE"
+				TreatWChar_tAsBuiltInType="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				OutputFile="bin\PocoMsg.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="FALSE"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				OptimizeForWindows98="0"
+				ResourceOnlyDLL="TRUE"
+				ImportLibrary=""
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Message Files"
+			Filter="">
+			<File
+				RelativePath=".\src\pocomsg.mc">
+				<FileConfiguration
+					Name="release_shared|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="mc -h $(InputDir) -r $(InputDir) $(InputPath)
+"
+						Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="">
+			<File
+				RelativePath=".\src\pocomsg.rc">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/PocoMsg_vs80.vcproj
+++ b/Foundation/PocoMsg_vs80.vcproj
@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="PocoMsg"
+	ProjectGUID="{AA986945-F3B6-4381-94BB-14DD49202B40}"
+	RootNamespace="Foundation"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="release_shared|Win32"
+			OutputDirectory="obj\release_shared"
+			IntermediateDirectory="obj\release_shared"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories=".\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				GeneratePreprocessedFile="0"
+				KeepComments="false"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				TreatWChar_tAsBuiltInType="true"
+				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="0"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies=""
+				OutputFile="bin\PocoMsg.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile=""
+				SubSystem="1"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				OptimizeForWindows98="0"
+				ResourceOnlyDLL="true"
+				ImportLibrary=""
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Message Files"
+			>
+			<File
+				RelativePath=".\src\pocomsg.mc"
+				>
+				<FileConfiguration
+					Name="release_shared|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="mc -h $(InputDir) -r $(InputDir) $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(InputDir)\pocomsg.rc;$(InputDir)\pocomsg.h;"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			>
+			<File
+				RelativePath=".\src\pocomsg.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/Foundation/bin/PocoMsg.dll
+++ b/Foundation/bin/PocoMsg.dll
--- a/Foundation/src/EventLogChannel.cpp
+++ b/Foundation/src/EventLogChannel.cpp
@ -236,28 +236,38 @@ void EventLogChannel::setUpRegistry() const
 	{
 #if defined(POCO_WIN32_UTF8)
 		std::wstring path;
+		std::wstring libName = L"PocoMsg.dll";
+		path = findLibrary(libName.c_str());
+
+		if (path.empty())
+		{
 		#if defined(POCO_DLL)
 			#if defined(_DEBUG)
-				path = findLibrary(L"PocoFoundationd.dll");
+				libName = L"PocoFoundationd.dll";
+				path = findLibrary(libName.c_str());
 			#else
-				path = findLibrary(L"PocoFoundation.dll");
+				libName = L"PocoFoundation.dll";
+				path = findLibrary(libName.c_str());
 			#endif
 		#endif
-		
-		if (path.empty())
-			path = findLibrary(L"PocoMsg.dll");
+		}	
 #else
 		std::string path;
+		std::string libName = "PocoMsg.dll";
+		path = findLibrary(libName.c_str());
+
+		if (path.empty())
+		{
 		#if defined(POCO_DLL)
 			#if defined(_DEBUG)
-				path = findLibrary("PocoFoundationd.dll");
+				libName = "PocoFoundationd.dll";
+				path = findLibrary(libName.c_str());
 			#else
-				path = findLibrary("PocoFoundation.dll");
+				libName = "PocoFoundation.dll";
+				path = findLibrary(libName.c_str());
 			#endif
 		#endif
-		
-		if (path.empty())
-			path = findLibrary("PocoMsg.dll");
+		}	
 #endif
 		
 		if (!path.empty())
@ -274,6 +284,16 @@ void EventLogChannel::setUpRegistry() const
 			RegSetValueEx(hKey, "EventMessageFile", 0, REG_SZ, (const BYTE*) path.c_str(), (DWORD) path.size() + 1);
 			RegSetValueEx(hKey, "CategoryCount", 0, REG_DWORD, (const BYTE*) &count, (DWORD) sizeof(count));
 			RegSetValueEx(hKey, "TypesSupported", 0, REG_DWORD, (const BYTE*) &types, (DWORD) sizeof(types));
+#endif
+		}
+		else
+		{
+			std::string uLibName;
+#if defined(POCO_WIN32_UTF8)
+			UnicodeConverter::toUTF8(libName, uLibName);
+			throw NotFoundException(uLibName);
+#else
+			throw NotFoundException(libName);
 #endif
 		}
 	}