[Olsr-cvs] olsrd-current/gui/win32/Shim Shim.vcproj, NONE, 1.1 shim.c, 1.4, 1.5 Shim.dsp, 1.1, NONE

Thomas Lopatic (spam-protected)
Tue Mar 27 05:01:11 CEST 2007 

Update of /cvsroot/olsrd/olsrd-current/gui/win32/Shim
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27684/Shim

Modified Files:
	shim.c 
Added Files:
	Shim.vcproj 
Removed Files:
	Shim.dsp 
Log Message:
Use Visual Studio .NET 2005.

--- Shim.dsp DELETED ---

Index: shim.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/gui/win32/Shim/shim.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shim.c	21 Nov 2004 01:21:10 -0000	1.4
--- shim.c	27 Mar 2007 03:01:08 -0000	1.5
***************
*** 1,134 ****
! /*
!  * The olsr.org Optimized Link-State Routing daemon (olsrd)
!  * Copyright (c) 2004, Thomas Lopatic ((spam-protected))
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without 
!  * modification, are permitted provided that the following conditions 
!  * are met:
!  *
!  * * Redistributions of source code must retain the above copyright 
!  *   notice, this list of conditions and the following disclaimer.
!  * * Redistributions in binary form must reproduce the above copyright 
!  *   notice, this list of conditions and the following disclaimer in 
!  *   the documentation and/or other materials provided with the 
!  *   distribution.
!  * * Neither the name of olsr.org, olsrd nor the names of its 
!  *   contributors may be used to endorse or promote products derived 
!  *   from this software without specific prior written permission.
!  *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
!  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
!  * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
!  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
!  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
!  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
!  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
!  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
!  * POSSIBILITY OF SUCH DAMAGE.
!  *
!  * Visit http://www.olsr.org for more information.
!  *
!  * If you find this software useful feel free to make a donation
!  * to the project. For more information see the website or contact
!  * the copyright holders.
!  *
!  * $Id$
!  */
! 
! #include <windows.h>
! 
! void EntryPoint(void)
! {
! 	STARTUPINFO StartInfo;
! 	PROCESS_INFORMATION ProcInfo;
! 	int i;
! 	char *CmdLine;
! 	char *Walker;
! 	char NewCmdLine[MAX_PATH + 500];
! 	HANDLE Handles[2];
! 	unsigned long Res;
! 	int Quotes;
! 
! 	Handles[0] = OpenEvent(EVENT_ALL_ACCESS, FALSE, "TheOlsrdShimEvent");
! 
! 	if (Handles[0] == NULL)
! 	{
! 		MessageBox(NULL, "Cannot open event.", "Shim Error", MB_ICONERROR | MB_OK);
! 		ExitProcess(1);
! 	}
! 
! 	CmdLine = GetCommandLine();
! 
! 	Quotes = 0;
! 	
! 	while (*CmdLine != 0)
! 	{
! 		if (*CmdLine == '"')
! 			Quotes = !Quotes;
! 
! 		else if (*CmdLine == ' ' && !Quotes)
! 			break;
! 
! 		CmdLine++;
! 	}
! 
! 	if (*CmdLine == 0)
! 	{
! 		MessageBox(NULL, "Missing arguments.", "Shim Error", MB_ICONERROR | MB_OK);
! 		ExitProcess(1);
! 	}
! 
! 	GetModuleFileName(NULL, NewCmdLine, MAX_PATH);
! 
! 	for (Walker = NewCmdLine; *Walker != 0; Walker++);
! 
! 	while (*Walker != '\\')
! 		Walker--;
! 
! 	Walker[1] = 'o';
! 	Walker[2] = 'l';
! 	Walker[3] = 's';
! 	Walker[4] = 'r';
! 	Walker[5] = 'd';
! 	Walker[6] = '.';
! 	Walker[7] = 'e';
! 	Walker[8] = 'x';
! 	Walker[9] = 'e';
! 
! 	Walker[10] = ' ';
! 
! 	Walker += 11;
! 
! 	while ((*Walker++ = *CmdLine++) != 0);
! 
! 	for (i = 0; i < sizeof (STARTUPINFO); i++)
! 		((char *)&StartInfo)[i] = 0;
! 
! 	StartInfo.cb = sizeof (STARTUPINFO);
! 
! 	if (!CreateProcess(NULL, NewCmdLine, NULL, NULL, TRUE,
! 		CREATE_NEW_PROCESS_GROUP, NULL, NULL, &StartInfo, &ProcInfo))
! 	{
! 		MessageBox(NULL, "Cannot execute OLSR server.", "Shim Error", MB_ICONERROR | MB_OK);
! 		ExitProcess(1);
! 	}
! 
! 	Handles[1] = ProcInfo.hProcess;
! 
! 	Res = WaitForMultipleObjects(2, Handles, FALSE, INFINITE);
! 
! 	if (Res == WAIT_OBJECT_0)
! 	{
! 		GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, ProcInfo.dwProcessId);
! 		WaitForSingleObject(ProcInfo.hProcess, INFINITE);
! 	}
! 	
! 	CloseHandle(ProcInfo.hThread);
! 	CloseHandle(ProcInfo.hProcess);
! 
! 	ExitProcess(0);
! }
--- 1,134 ----
! /*
!  * The olsr.org Optimized Link-State Routing daemon (olsrd)
!  * Copyright (c) 2004, Thomas Lopatic ((spam-protected))
!  * All rights reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without 
!  * modification, are permitted provided that the following conditions 
!  * are met:
!  *
!  * * Redistributions of source code must retain the above copyright 
!  *   notice, this list of conditions and the following disclaimer.
!  * * Redistributions in binary form must reproduce the above copyright 
!  *   notice, this list of conditions and the following disclaimer in 
!  *   the documentation and/or other materials provided with the 
!  *   distribution.
!  * * Neither the name of olsr.org, olsrd nor the names of its 
!  *   contributors may be used to endorse or promote products derived 
!  *   from this software without specific prior written permission.
!  *
!  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
!  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
!  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
!  * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
!  * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
!  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
!  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
!  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
!  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
!  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
!  * POSSIBILITY OF SUCH DAMAGE.
!  *
!  * Visit http://www.olsr.org for more information.
!  *
!  * If you find this software useful feel free to make a donation
!  * to the project. For more information see the website or contact
!  * the copyright holders.
!  *
!  * $Id$
!  */
! 
! #include <windows.h>
! 
! void EntryPoint(void)
! {
! 	STARTUPINFO StartInfo;
! 	PROCESS_INFORMATION ProcInfo;
! 	int i;
! 	char *CmdLine;
! 	char *Walker;
! 	char NewCmdLine[MAX_PATH + 500];
! 	HANDLE Handles[2];
! 	unsigned long Res;
! 	int Quotes;
! 
! 	Handles[0] = OpenEvent(EVENT_ALL_ACCESS, FALSE, "TheOlsrdShimEvent");
! 
! 	if (Handles[0] == NULL)
! 	{
! 		MessageBox(NULL, "Cannot open event.", "Shim Error", MB_ICONERROR | MB_OK);
! 		ExitProcess(1);
! 	}
! 
! 	CmdLine = GetCommandLine();
! 
! 	Quotes = 0;
! 	
! 	while (*CmdLine != 0)
! 	{
! 		if (*CmdLine == '"')
! 			Quotes = !Quotes;
! 
! 		else if (*CmdLine == ' ' && !Quotes)
! 			break;
! 
! 		CmdLine++;
! 	}
! 
! 	if (*CmdLine == 0)
! 	{
! 		MessageBox(NULL, "Missing arguments.", "Shim Error", MB_ICONERROR | MB_OK);
! 		ExitProcess(1);
! 	}
! 
! 	GetModuleFileName(NULL, NewCmdLine, MAX_PATH);
! 
! 	for (Walker = NewCmdLine; *Walker != 0; Walker++);
! 
! 	while (*Walker != '\\')
! 		Walker--;
! 
! 	Walker[1] = 'o';
! 	Walker[2] = 'l';
! 	Walker[3] = 's';
! 	Walker[4] = 'r';
! 	Walker[5] = 'd';
! 	Walker[6] = '.';
! 	Walker[7] = 'e';
! 	Walker[8] = 'x';
! 	Walker[9] = 'e';
! 
! 	Walker[10] = ' ';
! 
! 	Walker += 11;
! 
! 	while ((*Walker++ = *CmdLine++) != 0);
! 
! 	for (i = 0; i < sizeof (STARTUPINFO); i++)
! 		((char *)&StartInfo)[i] = 0;
! 
! 	StartInfo.cb = sizeof (STARTUPINFO);
! 
! 	if (!CreateProcess(NULL, NewCmdLine, NULL, NULL, TRUE,
! 		CREATE_NEW_PROCESS_GROUP, NULL, NULL, &StartInfo, &ProcInfo))
! 	{
! 		MessageBox(NULL, "Cannot execute OLSR server.", "Shim Error", MB_ICONERROR | MB_OK);
! 		ExitProcess(1);
! 	}
! 
! 	Handles[1] = ProcInfo.hProcess;
! 
! 	Res = WaitForMultipleObjects(2, Handles, FALSE, INFINITE);
! 
! 	if (Res == WAIT_OBJECT_0)
! 	{
! 		GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, ProcInfo.dwProcessId);
! 		WaitForSingleObject(ProcInfo.hProcess, INFINITE);
! 	}
! 	
! 	CloseHandle(ProcInfo.hThread);
! 	CloseHandle(ProcInfo.hProcess);
! 
! 	ExitProcess(0);
! }

--- NEW FILE: Shim.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8.00"
	Name="Shim"
	ProjectGUID="{C09B8925-0F9C-4F88-9BAE-7D5EAD8159D3}"
	RootNamespace="Shim"
	Keyword="Win32Proj"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="1"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
				MinimalRebuild="true"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				LinkIncremental="2"
				GenerateDebugInformation="true"
				SubSystem="1"
				EntryPointSymbol="EntryPoint"
				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>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
			IntermediateDirectory="$(ConfigurationName)"
			ConfigurationType="1"
			CharacterSet="2"
			WholeProgramOptimization="1"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
			/>
			<Tool
				Name="VCCLCompilerTool"
				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
				RuntimeLibrary="2"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="true"
				DebugInformationFormat="3"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				LinkIncremental="1"
				GenerateDebugInformation="true"
				SubSystem="1"
				OptimizeReferences="2"
				EnableCOMDATFolding="2"
				EntryPointSymbol="EntryPoint"
				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="Source Files"
			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
			>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
			>
			<File
				RelativePath=".\shim.c"
				>
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			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>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

More information about the Olsr-cvs mailing list