From: <che...@us...> - 2009-11-13 12:22:01
|
Revision: 3150 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3150&view=rev Author: chef_koch Date: 2009-11-13 12:21:41 +0000 (Fri, 13 Nov 2009) Log Message: ----------- added virtual svn working root moved some interops from config to win32 Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-13 12:04:08 UTC (rev 3149) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/IR Server Configuration.csproj 2009-11-13 12:21:41 UTC (rev 3150) @@ -136,10 +136,12 @@ <ProjectReference Include="..\..\Common\IrssComms\IrssComms.csproj"> <Project>{BCAFDF45-70DD-46FD-8B98-880DDA585AD2}</Project> <Name>IrssComms</Name> + <Private>True</Private> </ProjectReference> <ProjectReference Include="..\..\Common\IrssUtils\IrssUtils.csproj"> <Project>{CA15769C-232E-4CA7-94FD-206A06CA3ABB}</Project> <Name>IrssUtils</Name> + <Private>True</Private> </ProjectReference> <ProjectReference Include="..\..\IR Server Plugins\IR Server Plugin Interface\IR Server Plugin Interface.csproj"> <Project>{D8B3D28F-62CE-4CA7-86CE-B7EAD614A94C}</Project> Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 12:04:08 UTC (rev 3149) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Configuration/Program.cs 2009-11-13 12:21:41 UTC (rev 3150) @@ -119,20 +119,6 @@ #endregion Variables - #region Interops - - [DllImport("user32.dll", EntryPoint = "FindWindow", SetLastError = true)] - internal static extern IntPtr FindWindowByCaption(IntPtr ZeroOnly, string lpWindowName); - [DllImport("user32.dll")] - internal static extern int SendMessage( - IntPtr hWnd, // handle to destination window - uint Msg, // message - long wParam, // first message parameter - long lParam // second message parameter - ); - - #endregion Interops - /// <summary> /// The main entry point for the application. /// </summary> @@ -198,7 +184,7 @@ try { - irsWindow = FindWindowByCaption(IntPtr.Zero, ServerWindowName); + irsWindow = Win32.FindWindowByTitle(ServerWindowName); if (irsWindow != IntPtr.Zero) _irsStatus = IrsStatus.RunningApplication; } @@ -559,7 +545,7 @@ IrssLog.Info("Starting IR Server (application)"); Process IRServer = Process.Start(IRServerFile); waitCount = 0; - while (FindWindowByCaption(IntPtr.Zero, ServerWindowName) == IntPtr.Zero) + while (Win32.FindWindowByTitle(ServerWindowName) == IntPtr.Zero) { waitCount++; if (waitCount > 150) throw new TimeoutException(); @@ -584,10 +570,10 @@ try { IrssLog.Info("Stopping IR Server (application)"); - IntPtr irssWindow = FindWindowByCaption(IntPtr.Zero, ServerWindowName); - int result = SendMessage(irssWindow, 16, 0, 0); + IntPtr irssWindow = Win32.FindWindowByTitle(ServerWindowName); + IntPtr result = Win32.SendWindowsMessage(irssWindow, 16, 0, 0); waitCount = 0; - while (FindWindowByCaption(IntPtr.Zero, ServerWindowName) != IntPtr.Zero) + while (Win32.FindWindowByTitle(ServerWindowName) != IntPtr.Zero) { waitCount++; if (waitCount > 150) throw new TimeoutException(); Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 12:04:08 UTC (rev 3149) +++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server Suite.sln 2009-11-13 12:21:41 UTC (rev 3150) @@ -663,4 +663,7 @@ {106A69D2-670C-4DE5-A81C-A3CD5D3F21EB} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} {D1BAC7A9-FFB6-44BA-825F-32506831DC3D} = {F0D3A774-FE5E-4419-B9B6-C11FF1C4BB50} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + VisualSVNWorkingCopyRoot = .. + EndGlobalSection EndGlobal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |