From: <os...@us...> - 2009-10-14 11:44:51
|
Revision: 1513 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1513&view=rev Author: ossman_ Date: 2009-10-14 11:44:41 +0000 (Wed, 14 Oct 2009) Log Message: ----------- Remove old build system files. Removed Paths: ------------- seamlessrdp/trunk/ServerExe/HookDll/hookdll.vcproj seamlessrdp/trunk/ServerExe/clipper.rc seamlessrdp/trunk/ServerExe/clipper.vcproj seamlessrdp/trunk/ServerExe/icon.ico seamlessrdp/trunk/ServerExe/vchannel.vcproj Deleted: seamlessrdp/trunk/ServerExe/HookDll/hookdll.vcproj =================================================================== --- seamlessrdp/trunk/ServerExe/HookDll/hookdll.vcproj 2009-09-17 13:52:04 UTC (rev 1512) +++ seamlessrdp/trunk/ServerExe/HookDll/hookdll.vcproj 2009-10-14 11:44:41 UTC (rev 1513) @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="HookDll" - ProjectGUID="{8B343CDF-D7F6-480A-83B8-7F534675FFE6}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" - ConfigurationType="2" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HOOKDLL_EXPORTS" - MinimalRebuild="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="wtsapi32.lib" - OutputFile="$(OutDir)/seamlessrdp.dll" - LinkIncremental="2" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/hookDll.pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/seamlessrdp.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="copy "$(targetPath)" "$(SolutionDir)\build\""/> - <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> - <Configuration - Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" - ConfigurationType="2" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HOOKDLL_EXPORTS" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="wtsapi32.lib" - OutputFile="$(OutDir)/seamlessrdp.dll" - LinkIncremental="2" - GenerateDebugInformation="TRUE" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/seamlessrdp.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="copy "$(targetPath)" "$(SolutionDir)\build\""/> - <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> - <File - RelativePath="hookdll.c"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Deleted: seamlessrdp/trunk/ServerExe/clipper.rc =================================================================== --- seamlessrdp/trunk/ServerExe/clipper.rc 2009-09-17 13:52:04 UTC (rev 1512) +++ seamlessrdp/trunk/ServerExe/clipper.rc 2009-10-14 11:44:41 UTC (rev 1513) @@ -1,106 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_TRAY ICON "icon.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_TRAY MENU -BEGIN - POPUP "&SeamlessRDP Shell" - BEGIN - MENUITEM "&About", ID_WMABOUT - MENUITEM "&Exit", ID_WMEXIT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUT DIALOGEX 0, 0, 125, 81 -STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | - WS_SYSMENU -CAPTION "About" -FONT 8, "MS Sans Serif", 0, 0, 0x0 -BEGIN - ICON IDI_TRAY,IDC_STATIC,50,4,21,20 - DEFPUSHBUTTON "OK",IDOK,33,56,50,14 - GROUPBOX "",IDC_STATIC,0,0,124,81 - CTEXT " 0.1",IDC_STATIC,18,41,82,8 - CTEXT "seamlessrdp",IDC_STATIC,19,27,82,8 -END - -#endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - Deleted: seamlessrdp/trunk/ServerExe/clipper.vcproj =================================================================== --- seamlessrdp/trunk/ServerExe/clipper.vcproj 2009-09-17 13:52:04 UTC (rev 1512) +++ seamlessrdp/trunk/ServerExe/clipper.vcproj 2009-10-14 11:44:41 UTC (rev 1513) @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="ServerExe" - ProjectGUID="{4C27EA74-3453-4222-BDD2-37C3B90438D2}" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - PrecompiledHeaderFile="Debug/seamlessrdpshell.pch" - AssemblerListingLocation="Debug/" - ObjectFile="Debug/" - ProgramDataBaseFileName="Debug/" - WarningLevel="3" - SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="" - OutputFile="Debug/seamlessrdpshell.exe" - LinkIncremental="2" - SuppressStartupBanner="TRUE" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="Debug/seamlessrdpshell.pdb" - SubSystem="2"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="_DEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName="d:\Debug/seamlessrdpshell.tlb"/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="copy "$(targetPath)" "$(SolutionDir)\build\""/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - Culture="1031"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" - ConfigurationType="1" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - InlineFunctionExpansion="1" - PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\Release/seamlessrdpshell.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" - WarningLevel="3" - SuppressStartupBanner="TRUE"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="wtsapi32.lib" - OutputFile=".\Release/seamlessrdpshell.exe" - LinkIncremental="2" - SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\Release/seamlessrdpshell.pdb" - SubSystem="2"/> - <Tool - Name="VCMIDLTool" - PreprocessorDefinitions="NDEBUG" - MkTypLibCompatible="TRUE" - SuppressStartupBanner="TRUE" - TargetEnvironment="1" - TypeLibraryName=".\Release/seamlessrdpshell.tlb"/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="copy "$(targetPath)" "$(SolutionDir)\build\""/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - Culture="1031"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCXMLDataGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - <Tool - Name="VCManagedWrapperGeneratorTool"/> - <Tool - Name="VCAuxiliaryManagedWrapperGeneratorTool"/> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\clipper.rc"> - </File> - <File - RelativePath=".\icon.ico"> - </File> - <File - RelativePath=".\main.c"> - </File> - <File - RelativePath=".\resource.h"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Deleted: seamlessrdp/trunk/ServerExe/icon.ico =================================================================== (Binary files differ) Deleted: seamlessrdp/trunk/ServerExe/vchannel.vcproj =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.vcproj 2009-09-17 13:52:04 UTC (rev 1512) +++ seamlessrdp/trunk/ServerExe/vchannel.vcproj 2009-10-14 11:44:41 UTC (rev 1513) @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="vchannel" - ProjectGUID="{8B343CDF-D7F6-480A-83B8-7F534675FFE7}" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="Debug" - IntermediateDirectory="Debug" - ConfigurationType="2" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HOOKDLL_EXPORTS" - MinimalRebuild="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="wtsapi32.lib" - OutputFile="$(OutDir)/vchannel.dll" - LinkIncremental="2" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/vchannel.pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/vchannel.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="copy "$(targetPath)" "$(SolutionDir)\build\""/> - <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> - <Configuration - Name="Release|Win32" - OutputDirectory="Release" - IntermediateDirectory="Release" - ConfigurationType="2" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - InlineFunctionExpansion="1" - OmitFramePointers="TRUE" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HOOKDLL_EXPORTS" - StringPooling="TRUE" - RuntimeLibrary="0" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="wtsapi32.lib" - OutputFile="$(OutDir)/vchannel.dll" - LinkIncremental="2" - GenerateDebugInformation="TRUE" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/vchannel.lib" - TargetMachine="1"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool" - CommandLine="copy "$(targetPath)" "$(SolutionDir)\build\""/> - <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> - <File - RelativePath="vchannel.c"> - </File> - <File - RelativePath="vchannel.h"> - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <os...@us...> - 2009-10-14 11:52:39
|
Revision: 1514 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1514&view=rev Author: ossman_ Date: 2009-10-14 11:52:31 +0000 (Wed, 14 Oct 2009) Log Message: ----------- No need for a separate subdirectory for a single file. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/Makefile Added Paths: ----------- seamlessrdp/trunk/ServerExe/hookdll.c Removed Paths: ------------- seamlessrdp/trunk/ServerExe/HookDll/ Modified: seamlessrdp/trunk/ServerExe/Makefile =================================================================== --- seamlessrdp/trunk/ServerExe/Makefile 2009-10-14 11:44:41 UTC (rev 1513) +++ seamlessrdp/trunk/ServerExe/Makefile 2009-10-14 11:52:31 UTC (rev 1514) @@ -20,12 +20,9 @@ vchannel.dll: vchannel.c $(CC) $(CFLAGS) -shared -o $@ $^ -lwtsapi32 -seamlessrdp.dll: HookDll/seamlessrdp.dll - cp $^ $@ - -HookDll/seamlessrdp.dll: HookDll/hookdll.c vchannel.dll +seamlessrdp.dll: hookdll.c vchannel.dll $(CC) $(CFLAGS) -shared -o $@ $^ -lgdi32 clean: - -rm -f *.o HookDll/*.o - -rm -f seamlessrdpshell.exe vchannel.dll HookDll/seamlessrdp.dll seamlessrdp.dll seamlessrdp.zip + -rm -f *.o + -rm -f seamlessrdpshell.exe vchannel.dll seamlessrdp.dll seamlessrdp.zip Copied: seamlessrdp/trunk/ServerExe/hookdll.c (from rev 1512, seamlessrdp/trunk/ServerExe/HookDll/hookdll.c) =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c (rev 0) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2009-10-14 11:52:31 UTC (rev 1514) @@ -0,0 +1,867 @@ +/* -*- c-basic-offset: 8 -*- + rdesktop: A Remote Desktop Protocol client. + Seamless windows - Remote server hook DLL + + Based on code copyright (C) 2004-2005 Martin Wickett + + Copyright 2005-2008 Peter Åstrand <as...@ce...> for Cendio AB + Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include <assert.h> +#include <stdio.h> +#include <stdarg.h> + +#include <windows.h> +#include <winuser.h> + +#include "vchannel.h" + +#define DLL_EXPORT __declspec(dllexport) + +#ifdef __GNUC__ +#define SHARED __attribute__((section ("SHAREDDATA"), shared)) +#else +#define SHARED +#endif + +// Shared DATA +#pragma data_seg ( "SHAREDDATA" ) + +// this is the total number of processes this dll is currently attached to +int g_instance_count SHARED = 0; + +// blocks for locally generated events +HWND g_block_move_hwnd SHARED = NULL; +unsigned int g_block_move_serial SHARED = 0; +RECT g_block_move SHARED = { 0, 0, 0, 0 }; + +unsigned int g_blocked_zchange_serial SHARED = 0; +HWND g_blocked_zchange[2] SHARED = { NULL, NULL }; + +unsigned int g_blocked_focus_serial SHARED = 0; +HWND g_blocked_focus SHARED = NULL; + +unsigned int g_blocked_state_serial SHARED = 0; +HWND g_blocked_state_hwnd SHARED = NULL; +int g_blocked_state SHARED = -1; + +#pragma data_seg () + +#pragma comment(linker, "/section:SHAREDDATA,rws") + +#define FOCUS_MSG_NAME "WM_SEAMLESS_FOCUS" +static UINT g_wm_seamless_focus; + +static HHOOK g_cbt_hook = NULL; +static HHOOK g_wndproc_hook = NULL; +static HHOOK g_wndprocret_hook = NULL; + +static HINSTANCE g_instance = NULL; + +static HANDLE g_mutex = NULL; + +static BOOL +is_toplevel(HWND hwnd) +{ + BOOL toplevel; + HWND parent; + parent = GetAncestor(hwnd, GA_PARENT); + + /* According to MS: "A window that has no parent, or whose + parent is the desktop window, is called a top-level + window." See http://msdn2.microsoft.com/en-us/library/ms632597(VS.85).aspx. */ + toplevel = (!parent || parent == GetDesktopWindow()); + return toplevel; +} + +/* Returns true if a window is a menu window. */ +static BOOL +is_menu(HWND hwnd) +{ + /* Notepad menus have an owner, but Seamonkey menus does not, + so we cannot use the owner in our check. This leaves us with + checking WS_EX_TOOLWINDOW and WS_EX_TOPMOST. */ + + LONG exstyle = GetWindowLong(hwnd, GWL_EXSTYLE); + return (exstyle & (WS_EX_TOOLWINDOW | WS_EX_TOPMOST)); +} + +/* Determine the "parent" field for the CREATE response. */ +static HWND +get_parent(HWND hwnd) +{ + HWND result; + HWND owner; + LONG exstyle; + + /* Use the same logic to determine if the window should be + "transient" (ie have no task icon) as MS uses. This is documented at + http://msdn2.microsoft.com/en-us/library/bb776822.aspx */ + owner = GetWindow(hwnd, GW_OWNER); + exstyle = GetWindowLong(hwnd, GWL_EXSTYLE); + if (!owner && !(exstyle & WS_EX_TOOLWINDOW)) + { + /* display taskbar icon */ + result = NULL; + } + else + { + /* no taskbar icon */ + if (owner) + result = owner; + else + result = (HWND) - 1; + } + + return result; +} + +static void +update_position(HWND hwnd) +{ + RECT rect, blocked; + HWND blocked_hwnd; + unsigned int serial; + + WaitForSingleObject(g_mutex, INFINITE); + blocked_hwnd = g_block_move_hwnd; + serial = g_block_move_serial; + memcpy(&blocked, &g_block_move, sizeof(RECT)); + ReleaseMutex(g_mutex); + + vchannel_block(); + + if (!GetWindowRect(hwnd, &rect)) + { + debug("GetWindowRect failed!\n"); + goto end; + } + + if ((hwnd == blocked_hwnd) && (rect.left == blocked.left) && (rect.top == blocked.top) + && (rect.right == blocked.right) && (rect.bottom == blocked.bottom)) + goto end; + + vchannel_write("POSITION", "0x%08lx,%d,%d,%d,%d,0x%08x", + hwnd, + rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0); + + end: + vchannel_unblock(); +} + +static void +update_zorder(HWND hwnd) +{ + HWND behind; + HWND block_hwnd, block_behind; + unsigned int serial; + + WaitForSingleObject(g_mutex, INFINITE); + serial = g_blocked_zchange_serial; + block_hwnd = g_blocked_zchange[0]; + block_behind = g_blocked_zchange[1]; + ReleaseMutex(g_mutex); + + vchannel_block(); + + behind = GetNextWindow(hwnd, GW_HWNDPREV); + while (behind) + { + LONG style; + + style = GetWindowLong(behind, GWL_STYLE); + + if ((!(style & WS_CHILD) || (style & WS_POPUP)) && (style & WS_VISIBLE)) + break; + + behind = GetNextWindow(behind, GW_HWNDPREV); + } + + if ((hwnd == block_hwnd) && (behind == block_behind)) + vchannel_write("ACK", "%u", serial); + else + { + int flags = 0; + LONG exstyle = GetWindowLong(hwnd, GWL_EXSTYLE); + // handle always on top + if (exstyle & WS_EX_TOPMOST) + flags |= SEAMLESS_CREATE_TOPMOST; + vchannel_write("ZCHANGE", "0x%08lx,0x%08lx,0x%08x", hwnd, behind, flags); + } + + vchannel_unblock(); +} + +static HICON +get_icon(HWND hwnd, int large) +{ + HICON icon; + + if (!SendMessageTimeout(hwnd, WM_GETICON, large ? ICON_BIG : ICON_SMALL, + 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon)) + return NULL; + + if (icon) + return icon; + + /* + * Modern versions of Windows uses the voodoo value of 2 instead of 0 + * for the small icons. + */ + if (!large) + { + if (!SendMessageTimeout(hwnd, WM_GETICON, 2, + 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon)) + return NULL; + } + + if (icon) + return icon; + + icon = (HICON) GetClassLong(hwnd, large ? GCL_HICON : GCL_HICONSM); + + if (icon) + return icon; + + return NULL; +} + +static int +extract_icon(HICON icon, char *buffer, int maxlen) +{ + ICONINFO info; + HDC hdc; + BITMAP mask_bmp, color_bmp; + BITMAPINFO bmi; + int size, i; + char *mask_buf, *color_buf; + char *o, *m, *c; + int ret = -1; + + assert(buffer); + assert(maxlen > 0); + + if (!GetIconInfo(icon, &info)) + goto fail; + + if (!GetObject(info.hbmMask, sizeof(BITMAP), &mask_bmp)) + goto free_bmps; + if (!GetObject(info.hbmColor, sizeof(BITMAP), &color_bmp)) + goto free_bmps; + + if (mask_bmp.bmWidth != color_bmp.bmWidth) + goto free_bmps; + if (mask_bmp.bmHeight != color_bmp.bmHeight) + goto free_bmps; + + if ((mask_bmp.bmWidth * mask_bmp.bmHeight * 4) > maxlen) + goto free_bmps; + + size = (mask_bmp.bmWidth + 3) / 4 * 4; + size *= mask_bmp.bmHeight; + size *= 4; + + mask_buf = malloc(size); + if (!mask_buf) + goto free_bmps; + color_buf = malloc(size); + if (!color_buf) + goto free_mbuf; + + memset(&bmi, 0, sizeof(BITMAPINFO)); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFO); + bmi.bmiHeader.biWidth = mask_bmp.bmWidth; + bmi.bmiHeader.biHeight = -mask_bmp.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = size; + + hdc = CreateCompatibleDC(NULL); + if (!hdc) + goto free_cbuf; + + if (!GetDIBits(hdc, info.hbmMask, 0, mask_bmp.bmHeight, mask_buf, &bmi, DIB_RGB_COLORS)) + goto del_dc; + if (!GetDIBits(hdc, info.hbmColor, 0, color_bmp.bmHeight, color_buf, &bmi, DIB_RGB_COLORS)) + goto del_dc; + + o = buffer; + m = mask_buf; + c = color_buf; + for (i = 0; i < size / 4; i++) + { + o[0] = c[2]; + o[1] = c[1]; + o[2] = c[0]; + + o[3] = ((int) (unsigned char) m[0] + (unsigned char) m[1] + + (unsigned char) m[2]) / 3; + o[3] = 0xff - o[3]; + + o += 4; + m += 4; + c += 4; + } + + ret = size; + + del_dc: + DeleteDC(hdc); + + free_cbuf: + free(color_buf); + free_mbuf: + free(mask_buf); + + free_bmps: + DeleteObject(info.hbmMask); + DeleteObject(info.hbmColor); + + fail: + return ret; +} + +#define ICON_CHUNK 400 + +static void +update_icon(HWND hwnd, HICON icon, int large) +{ + int i, j, size, chunks; + char buf[32 * 32 * 4]; + char asciibuf[ICON_CHUNK * 2 + 1]; + + size = extract_icon(icon, buf, sizeof(buf)); + if (size <= 0) + return; + + if ((!large && size != 16 * 16 * 4) || (large && size != 32 * 32 * 4)) + { + debug("Unexpected icon size."); + return; + } + + chunks = (size + ICON_CHUNK - 1) / ICON_CHUNK; + for (i = 0; i < chunks; i++) + { + for (j = 0; j < ICON_CHUNK; j++) + { + if (i * ICON_CHUNK + j >= size) + break; + sprintf(asciibuf + j * 2, "%02x", + (int) (unsigned char) buf[i * ICON_CHUNK + j]); + } + + vchannel_write("SETICON", "0x%08lx,%d,RGBA,%d,%d,%s", hwnd, i, + large ? 32 : 16, large ? 32 : 16, asciibuf); + } +} + +static LRESULT CALLBACK +wndproc_hook_proc(int code, WPARAM cur_thread, LPARAM details) +{ + HWND hwnd; + UINT msg; + WPARAM wparam; + LPARAM lparam; + + LONG style; + + if (code < 0) + goto end; + + hwnd = ((CWPSTRUCT *) details)->hwnd; + msg = ((CWPSTRUCT *) details)->message; + wparam = ((CWPSTRUCT *) details)->wParam; + lparam = ((CWPSTRUCT *) details)->lParam; + + if (!is_toplevel(hwnd)) + { + goto end; + } + + style = GetWindowLong(hwnd, GWL_STYLE); + + switch (msg) + { + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *wp = (WINDOWPOS *) lparam; + + if (wp->flags & SWP_SHOWWINDOW) + { + unsigned short title[150]; + int state; + DWORD pid; + int flags; + HICON icon; + LONG exstyle; + + exstyle = GetWindowLong(hwnd, GWL_EXSTYLE); + GetWindowThreadProcessId(hwnd, &pid); + + flags = 0; + if (style & DS_MODALFRAME) + flags |= SEAMLESS_CREATE_MODAL; + // handle always on top + if (exstyle & WS_EX_TOPMOST) + flags |= SEAMLESS_CREATE_TOPMOST; + + vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x", + (long) hwnd, (long) pid, + (long) get_parent(hwnd), flags); + + GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title)); + + vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd, + vchannel_strfilter_unicode(title), 0); + + icon = get_icon(hwnd, 1); + if (icon) + { + update_icon(hwnd, icon, 1); + DeleteObject(icon); + } + + icon = get_icon(hwnd, 0); + if (icon) + { + update_icon(hwnd, icon, 0); + DeleteObject(icon); + } + + if (style & WS_MAXIMIZE) + state = 2; + else if (style & WS_MINIMIZE) + state = 1; + else + state = 0; + + update_position(hwnd); + + vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x", hwnd, + state, 0); + } + + if (wp->flags & SWP_HIDEWINDOW) + vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0); + + if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE)) + break; + + if (!(wp->flags & SWP_NOMOVE && wp->flags & SWP_NOSIZE)) + update_position(hwnd); + + break; + } + + case WM_SETICON: + if (!(style & WS_VISIBLE)) + break; + + switch (wparam) + { + case ICON_BIG: + if (lparam) + update_icon(hwnd, (HICON) lparam, 1); + else + vchannel_write("DELICON", "0x%08lx,RGBA,32,32", + hwnd); + break; + case ICON_SMALL: + case 2: + if (lparam) + update_icon(hwnd, (HICON) lparam, 0); + else + vchannel_write("DELICON", "0x%08lx,RGBA,16,16", + hwnd); + break; + default: + debug("Weird icon size %d", (int) wparam); + } + + break; + + case WM_SIZE: + if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE)) + break; + update_position(hwnd); + break; + + case WM_MOVE: + if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE)) + break; + update_position(hwnd); + break; + + case WM_DESTROY: + if (!(style & WS_VISIBLE)) + break; + vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0); + break; + + default: + break; + } + + end: + return CallNextHookEx(g_wndproc_hook, code, cur_thread, details); +} + +static LRESULT CALLBACK +wndprocret_hook_proc(int code, WPARAM cur_thread, LPARAM details) +{ + HWND hwnd; + UINT msg; + WPARAM wparam; + LPARAM lparam; + + LONG style; + + if (code < 0) + goto end; + + hwnd = ((CWPRETSTRUCT *) details)->hwnd; + msg = ((CWPRETSTRUCT *) details)->message; + wparam = ((CWPRETSTRUCT *) details)->wParam; + lparam = ((CWPRETSTRUCT *) details)->lParam; + + if (!is_toplevel(hwnd)) + { + goto end; + } + + style = GetWindowLong(hwnd, GWL_STYLE); + + switch (msg) + { + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *wp = (WINDOWPOS *) lparam; + + if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE)) + break; + + if (!(wp->flags & SWP_NOZORDER)) + update_zorder(hwnd); + + break; + } + + + case WM_SETTEXT: + { + unsigned short title[150]; + if (!(style & WS_VISIBLE)) + break; + /* We cannot use the string in lparam because + we need unicode. */ + GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title)); + vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd, + vchannel_strfilter_unicode(title), 0); + break; + } + + case WM_SETICON: + { + HICON icon; + if (!(style & WS_VISIBLE)) + break; + + /* + * Somehow, we never get WM_SETICON for the small icon. + * So trigger a read of it every time the large one is + * changed. + */ + icon = get_icon(hwnd, 0); + if (icon) + { + update_icon(hwnd, icon, 0); + DeleteObject(icon); + } + } + + default: + break; + } + + if (msg == g_wm_seamless_focus) + { + /* For some reason, SetForegroundWindow() on menus + closes them. Ignore focus requests for menu windows. */ + if ((GetForegroundWindow() != hwnd) && !is_menu(hwnd)) + SetForegroundWindow(hwnd); + + vchannel_write("ACK", "%u", g_blocked_focus_serial); + } + + end: + return CallNextHookEx(g_wndprocret_hook, code, cur_thread, details); +} + +static LRESULT CALLBACK +cbt_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + if (code < 0) + goto end; + + switch (code) + { + case HCBT_MINMAX: + { + int show, state, blocked; + HWND hwnd, blocked_hwnd; + unsigned int serial; + LONG style; + + WaitForSingleObject(g_mutex, INFINITE); + blocked_hwnd = g_blocked_state_hwnd; + serial = g_blocked_state_serial; + blocked = g_blocked_state; + ReleaseMutex(g_mutex); + + hwnd = (HWND) wparam; + + style = GetWindowLong(hwnd, GWL_STYLE); + + if (!(style & WS_VISIBLE)) + break; + + show = LOWORD(lparam); + + if ((show == SW_NORMAL) || (show == SW_SHOWNORMAL) + || (show == SW_RESTORE)) + state = 0; + else if ((show == SW_MINIMIZE) || (show == SW_SHOWMINIMIZED)) + state = 1; + else if ((show == SW_MAXIMIZE) || (show == SW_SHOWMAXIMIZED)) + state = 2; + else + { + debug("Unexpected show: %d", show); + break; + } + + if ((blocked_hwnd == hwnd) && (blocked == state)) + vchannel_write("ACK", "%u", serial); + else + vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x", + hwnd, state, 0); + + break; + } + + default: + break; + } + + end: + return CallNextHookEx(g_cbt_hook, code, wparam, lparam); +} + +DLL_EXPORT void +SetHooks(void) +{ + if (!g_cbt_hook) + g_cbt_hook = SetWindowsHookEx(WH_CBT, cbt_hook_proc, g_instance, 0); + + if (!g_wndproc_hook) + g_wndproc_hook = SetWindowsHookEx(WH_CALLWNDPROC, wndproc_hook_proc, g_instance, 0); + + if (!g_wndprocret_hook) + g_wndprocret_hook = + SetWindowsHookEx(WH_CALLWNDPROCRET, wndprocret_hook_proc, g_instance, 0); +} + +DLL_EXPORT void +RemoveHooks(void) +{ + if (g_cbt_hook) + UnhookWindowsHookEx(g_cbt_hook); + + if (g_wndproc_hook) + UnhookWindowsHookEx(g_wndproc_hook); + + if (g_wndprocret_hook) + UnhookWindowsHookEx(g_wndprocret_hook); +} + +DLL_EXPORT void +SafeMoveWindow(unsigned int serial, HWND hwnd, int x, int y, int width, int height) +{ + RECT rect; + + WaitForSingleObject(g_mutex, INFINITE); + g_block_move_hwnd = hwnd; + g_block_move_serial = serial; + g_block_move.left = x; + g_block_move.top = y; + g_block_move.right = x + width; + g_block_move.bottom = y + height; + ReleaseMutex(g_mutex); + + SetWindowPos(hwnd, NULL, x, y, width, height, SWP_NOACTIVATE | SWP_NOZORDER); + + vchannel_write("ACK", "%u", serial); + + if (!GetWindowRect(hwnd, &rect)) + debug("GetWindowRect failed!\n"); + else if ((rect.left != x) || (rect.top != y) || (rect.right != x + width) + || (rect.bottom != y + height)) + update_position(hwnd); + + WaitForSingleObject(g_mutex, INFINITE); + g_block_move_hwnd = NULL; + memset(&g_block_move, 0, sizeof(RECT)); + ReleaseMutex(g_mutex); +} + +DLL_EXPORT void +SafeZChange(unsigned int serial, HWND hwnd, HWND behind) +{ + WaitForSingleObject(g_mutex, INFINITE); + g_blocked_zchange_serial = serial; + g_blocked_zchange[0] = hwnd; + g_blocked_zchange[1] = behind; + ReleaseMutex(g_mutex); + + if (behind == NULL) + behind = HWND_TOP; + + SetWindowPos(hwnd, behind, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); + + WaitForSingleObject(g_mutex, INFINITE); + g_blocked_zchange[0] = NULL; + g_blocked_zchange[1] = NULL; + ReleaseMutex(g_mutex); +} + +DLL_EXPORT void +SafeFocus(unsigned int serial, HWND hwnd) +{ + WaitForSingleObject(g_mutex, INFINITE); + g_blocked_focus_serial = serial; + g_blocked_focus = hwnd; + ReleaseMutex(g_mutex); + + SendMessage(hwnd, g_wm_seamless_focus, 0, 0); + + WaitForSingleObject(g_mutex, INFINITE); + g_blocked_focus = NULL; + ReleaseMutex(g_mutex); +} + +DLL_EXPORT void +SafeSetState(unsigned int serial, HWND hwnd, int state) +{ + LONG style; + int curstate; + + vchannel_block(); + + style = GetWindowLong(hwnd, GWL_STYLE); + + if (style & WS_MAXIMIZE) + curstate = 2; + else if (style & WS_MINIMIZE) + curstate = 1; + else + curstate = 0; + + if (state == curstate) + { + vchannel_write("ACK", "%u", serial); + vchannel_unblock(); + return; + } + + WaitForSingleObject(g_mutex, INFINITE); + g_blocked_state_hwnd = hwnd; + g_blocked_state_serial = serial; + g_blocked_state = state; + ReleaseMutex(g_mutex); + + vchannel_unblock(); + + if (state == 0) + ShowWindow(hwnd, SW_RESTORE); + else if (state == 1) + ShowWindow(hwnd, SW_MINIMIZE); + else if (state == 2) + ShowWindow(hwnd, SW_MAXIMIZE); + else + debug("Invalid state %d sent.", state); + + WaitForSingleObject(g_mutex, INFINITE); + g_blocked_state_hwnd = NULL; + g_blocked_state = -1; + ReleaseMutex(g_mutex); +} + +DLL_EXPORT int +GetInstanceCount() +{ + return g_instance_count; +} + +BOOL APIENTRY +DllMain(HINSTANCE hinstDLL, DWORD ul_reason_for_call, LPVOID lpReserved) +{ + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + // remember our instance handle + g_instance = hinstDLL; + + g_mutex = CreateMutex(NULL, FALSE, "Local\\SeamlessDLL"); + if (!g_mutex) + return FALSE; + + WaitForSingleObject(g_mutex, INFINITE); + ++g_instance_count; + ReleaseMutex(g_mutex); + + g_wm_seamless_focus = RegisterWindowMessage(FOCUS_MSG_NAME); + + vchannel_open(); + + break; + + case DLL_THREAD_ATTACH: + break; + + case DLL_THREAD_DETACH: + break; + + case DLL_PROCESS_DETACH: + vchannel_write("DESTROYGRP", "0x%08lx, 0x%08lx", GetCurrentProcessId(), 0); + + WaitForSingleObject(g_mutex, INFINITE); + --g_instance_count; + ReleaseMutex(g_mutex); + + vchannel_close(); + + CloseHandle(g_mutex); + + break; + } + + return TRUE; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <os...@us...> - 2009-10-14 11:53:21
|
Revision: 1515 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1515&view=rev Author: ossman_ Date: 2009-10-14 11:53:11 +0000 (Wed, 14 Oct 2009) Log Message: ----------- Remove bad svn:executable attribute from source files. Property Changed: ---------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c Property changes on: seamlessrdp/trunk/ServerExe/hookdll.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: seamlessrdp/trunk/ServerExe/main.c ___________________________________________________________________ Deleted: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <os...@us...> - 2009-10-14 11:54:16
|
Revision: 1516 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1516&view=rev Author: ossman_ Date: 2009-10-14 11:54:08 +0000 (Wed, 14 Oct 2009) Log Message: ----------- Fix up ignored filter. Removed Paths: ------------- seamlessrdp/trunk/ServerExe/.cvsignore Property Changed: ---------------- seamlessrdp/trunk/ServerExe/ Property changes on: seamlessrdp/trunk/ServerExe ___________________________________________________________________ Modified: svn:ignore - Debug Release + *.o vchannel.dll seamlessrdp.dll seamlessrdpshell.exe Deleted: seamlessrdp/trunk/ServerExe/.cvsignore =================================================================== --- seamlessrdp/trunk/ServerExe/.cvsignore 2009-10-14 11:53:11 UTC (rev 1515) +++ seamlessrdp/trunk/ServerExe/.cvsignore 2009-10-14 11:54:08 UTC (rev 1516) @@ -1,2 +0,0 @@ -Debug -Release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <os...@us...> - 2009-10-14 13:47:00
|
Revision: 1517 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1517&view=rev Author: ossman_ Date: 2009-10-14 13:46:52 +0000 (Wed, 14 Oct 2009) Log Message: ----------- Convert build system to autotools as that makes it easier to cross compile the package. Added Paths: ----------- seamlessrdp/trunk/ServerExe/AUTHORS seamlessrdp/trunk/ServerExe/COPYING seamlessrdp/trunk/ServerExe/ChangeLog seamlessrdp/trunk/ServerExe/INSTALL seamlessrdp/trunk/ServerExe/Makefile.am seamlessrdp/trunk/ServerExe/NEWS seamlessrdp/trunk/ServerExe/README seamlessrdp/trunk/ServerExe/autogen.sh seamlessrdp/trunk/ServerExe/configure.ac Removed Paths: ------------- seamlessrdp/trunk/ServerExe/Makefile Property Changed: ---------------- seamlessrdp/trunk/ServerExe/ Property changes on: seamlessrdp/trunk/ServerExe ___________________________________________________________________ Modified: svn:ignore - *.o vchannel.dll seamlessrdp.dll seamlessrdpshell.exe + seamlessrdpshell.exe configure Makefile.in seamlessrdp-*.tar.gz config.log depcomp config.guess config.sub ltmain.sh .deps config.status autom4te.cache libtool missing aclocal.m4 install-sh Added: seamlessrdp/trunk/ServerExe/COPYING =================================================================== --- seamlessrdp/trunk/ServerExe/COPYING (rev 0) +++ seamlessrdp/trunk/ServerExe/COPYING 2009-10-14 13:46:52 UTC (rev 1517) @@ -0,0 +1,346 @@ +This software is released under the GNU General Public License +(reproduced below) with the additional exemption that compiling, +linking, and/or using OpenSSL together with this software is +allowed. + +--- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Added: seamlessrdp/trunk/ServerExe/INSTALL =================================================================== --- seamlessrdp/trunk/ServerExe/INSTALL (rev 0) +++ seamlessrdp/trunk/ServerExe/INSTALL 2009-10-14 13:46:52 UTC (rev 1517) @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + Deleted: seamlessrdp/trunk/ServerExe/Makefile =================================================================== --- seamlessrdp/trunk/ServerExe/Makefile 2009-10-14 11:54:08 UTC (rev 1516) +++ seamlessrdp/trunk/ServerExe/Makefile 2009-10-14 13:46:52 UTC (rev 1517) @@ -1,28 +0,0 @@ - -# -# MinGW makefile -# - -CC=gcc -CFLAGS=-Wall - -.SUFFIXES: - -default: seamlessrdp.zip - -seamlessrdp.zip: seamlessrdpshell.exe seamlessrdp.dll vchannel.dll - -rm $@ - zip $@ $^ - -seamlessrdpshell.exe: main.c vchannel.dll - $(CC) $(CFLAGS) -mwindows -o $@ $^ -lwtsapi32 - -vchannel.dll: vchannel.c - $(CC) $(CFLAGS) -shared -o $@ $^ -lwtsapi32 - -seamlessrdp.dll: hookdll.c vchannel.dll - $(CC) $(CFLAGS) -shared -o $@ $^ -lgdi32 - -clean: - -rm -f *.o - -rm -f seamlessrdpshell.exe vchannel.dll seamlessrdp.dll seamlessrdp.zip Added: seamlessrdp/trunk/ServerExe/Makefile.am =================================================================== --- seamlessrdp/trunk/ServerExe/Makefile.am (rev 0) +++ seamlessrdp/trunk/ServerExe/Makefile.am 2009-10-14 13:46:52 UTC (rev 1517) @@ -0,0 +1,16 @@ +bin_PROGRAMS = seamlessrdpshell + +lib_LTLIBRARIES = \ + vchannel.la \ + seamlessrdp.la + +seamlessrdpshell_SOURCES = main.c +seamlessrdpshell_LDADD = vchannel.la + +vchannel_la_SOURCES = vchannel.c vchannel.h +vchannel_la_LDFLAGS = -avoid-version -module -no-undefined -lwtsapi32 + +seamlessrdp_la_SOURCES = hookdll.c +seamlessrdp_la_LIBADD = vchannel.la +seamlessrdp_la_LDFLAGS = -avoid-version -module -no-undefined -lgdi32 + Added: seamlessrdp/trunk/ServerExe/autogen.sh =================================================================== --- seamlessrdp/trunk/ServerExe/autogen.sh (rev 0) +++ seamlessrdp/trunk/ServerExe/autogen.sh 2009-10-14 13:46:52 UTC (rev 1517) @@ -0,0 +1,4 @@ +#!/bin/sh +libtoolize --force --install +autoreconf --force --install + Property changes on: seamlessrdp/trunk/ServerExe/autogen.sh ___________________________________________________________________ Added: svn:executable + * Added: seamlessrdp/trunk/ServerExe/configure.ac =================================================================== --- seamlessrdp/trunk/ServerExe/configure.ac (rev 0) +++ seamlessrdp/trunk/ServerExe/configure.ac 2009-10-14 13:46:52 UTC (rev 1517) @@ -0,0 +1,13 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT([seamlessrdp], [1.0], [rde...@li...]) +AC_CONFIG_SRCDIR(main.c) + +AM_INIT_AUTOMAKE +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + +AC_PROG_CC +AC_PROG_LIBTOOL + +AC_LIBTOOL_WIN32_DLL + +AC_OUTPUT(Makefile) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <os...@us...> - 2009-12-23 13:50:43
|
Revision: 1522 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1522&view=rev Author: ossman_ Date: 2009-12-23 13:50:33 +0000 (Wed, 23 Dec 2009) Log Message: ----------- Improve robustness of the code by forcing callers to vchannel_open() to pay attention to the return code. This also fixes some if-clauses to avoid unnecessary indentation. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/vchannel.c Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2009-10-25 23:37:26 UTC (rev 1521) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2009-12-23 13:50:33 UTC (rev 1522) @@ -833,14 +833,17 @@ if (!g_mutex) return FALSE; + if (vchannel_open()) { + CloseHandle(g_mutex); + return FALSE; + } + WaitForSingleObject(g_mutex, INFINITE); ++g_instance_count; ReleaseMutex(g_mutex); g_wm_seamless_focus = RegisterWindowMessage(FOCUS_MSG_NAME); - vchannel_open(); - break; case DLL_THREAD_ATTACH: Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2009-10-25 23:37:26 UTC (rev 1521) +++ seamlessrdp/trunk/ServerExe/main.c 2009-12-23 13:50:33 UTC (rev 1522) @@ -355,19 +355,35 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE prev_instance, LPSTR cmdline, int cmdshow) { + int success = 0; + HMODULE hookdll; set_hooks_proc_t set_hooks_fn; remove_hooks_proc_t remove_hooks_fn; get_instance_count_proc_t instance_count_fn; + int check_counter; + g_instance = instance; + if (strlen(cmdline) == 0) + { + message("No command line specified."); + return -1; + } + + if (vchannel_open()) + { + message("Unable to set up the virtual channel."); + return -1; + } + hookdll = LoadLibrary("seamlessrdp.dll"); if (!hookdll) { message("Could not load hook DLL. Unable to continue."); - return -1; + goto close_vchannel; } set_hooks_fn = (set_hooks_proc_t) GetProcAddress(hookdll, "SetHooks"); @@ -381,25 +397,21 @@ if (!set_hooks_fn || !remove_hooks_fn || !instance_count_fn || !g_move_window_fn || !g_zchange_fn || !g_focus_fn || !g_set_state_fn) { - FreeLibrary(hookdll); message("Hook DLL doesn't contain the correct functions. Unable to continue."); - return -1; + goto close_hookdll; } /* Check if the DLL is already loaded */ if (instance_count_fn() != 1) { - FreeLibrary(hookdll); message("Another running instance of Seamless RDP detected."); - return -1; + goto close_hookdll; } ProcessIdToSessionId(GetCurrentProcessId(), &g_session_id); build_startup_procs(); - vchannel_open(); - g_connected = is_connected(); g_desktop_hidden = is_desktop_hidden(); @@ -417,95 +429,91 @@ /* We don't want windows denying requests to activate windows. */ SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); - if (strlen(cmdline) == 0) - { - message("No command line specified."); - return -1; - } - else - { - BOOL result; - PROCESS_INFORMATION proc_info; - STARTUPINFO startup_info; - MSG msg; + BOOL result; + PROCESS_INFORMATION proc_info; + STARTUPINFO startup_info; + MSG msg; - memset(&startup_info, 0, sizeof(STARTUPINFO)); - startup_info.cb = sizeof(STARTUPINFO); + memset(&startup_info, 0, sizeof(STARTUPINFO)); + startup_info.cb = sizeof(STARTUPINFO); - result = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, - NULL, NULL, &startup_info, &proc_info); - // Release handles - CloseHandle(proc_info.hProcess); - CloseHandle(proc_info.hThread); + result = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, + NULL, NULL, &startup_info, &proc_info); + // Release handles + CloseHandle(proc_info.hProcess); + CloseHandle(proc_info.hThread); - if (result) - { - int check_counter; + if (!result) { + // CreateProcess failed. + char msg[256]; + _snprintf(msg, sizeof(msg), + "Unable to launch the requested application:\n%s", cmdline); + message(msg); + goto unhook; + } - check_counter = 5; - while (check_counter-- || !should_terminate()) - { - BOOL connected; + check_counter = 5; + while (check_counter-- || !should_terminate()) + { + BOOL connected; - connected = is_connected(); - if (connected && !g_connected) - { - int flags; - /* These get reset on each reconnect */ - SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, TRUE, NULL, 0); - SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, - 0); - SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); + connected = is_connected(); + if (connected && !g_connected) + { + int flags; + /* These get reset on each reconnect */ + SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, TRUE, NULL, 0); + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, + 0); + SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); - flags = SEAMLESS_HELLO_RECONNECT; - if (g_desktop_hidden) - flags |= SEAMLESS_HELLO_HIDDEN; - vchannel_write("HELLO", "0x%08x", flags); - } + flags = SEAMLESS_HELLO_RECONNECT; + if (g_desktop_hidden) + flags |= SEAMLESS_HELLO_HIDDEN; + vchannel_write("HELLO", "0x%08x", flags); + } - g_connected = connected; + g_connected = connected; - if (check_counter < 0) - { - BOOL hidden; + if (check_counter < 0) + { + BOOL hidden; - hidden = is_desktop_hidden(); - if (hidden && !g_desktop_hidden) - vchannel_write("HIDE", "0x%08x", 0); - else if (!hidden && g_desktop_hidden) - vchannel_write("UNHIDE", "0x%08x", 0); + hidden = is_desktop_hidden(); + if (hidden && !g_desktop_hidden) + vchannel_write("HIDE", "0x%08x", 0); + else if (!hidden && g_desktop_hidden) + vchannel_write("UNHIDE", "0x%08x", 0); - g_desktop_hidden = hidden; + g_desktop_hidden = hidden; - check_counter = 5; - } + check_counter = 5; + } - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - process_cmds(); - Sleep(100); - } - } - else + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - // CreateProcess failed. - char msg[256]; - _snprintf(msg, sizeof(msg), - "Unable to launch the requested application:\n%s", cmdline); - message(msg); + TranslateMessage(&msg); + DispatchMessage(&msg); } + process_cmds(); + Sleep(100); } + success = 1; + +unhook: remove_hooks_fn(); + free_startup_procs(); + +close_hookdll: FreeLibrary(hookdll); +close_vchannel: vchannel_close(); - free_startup_procs(); - - return 1; + if (success) + return 1; + else + return -1; } Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2009-10-25 23:37:26 UTC (rev 1521) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2009-12-23 13:50:33 UTC (rev 1522) @@ -120,10 +120,6 @@ DLL_EXPORT int vchannel_open() { - g_opencount++; - if (g_opencount > 1) - return 0; - g_vchannel = WTSVirtualChannelOpen(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, CHANNELNAME); @@ -138,6 +134,10 @@ return -1; } + g_opencount++; + if (g_opencount > 1) + return 0; + return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-02-18 14:54:56
|
Revision: 1564 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1564&view=rev Author: astrand Date: 2010-02-18 14:54:50 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Rename DLL_EXPORT to EXTERN to avoid clash with libtool. Avoids warnings. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2010-01-27 07:41:14 UTC (rev 1563) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2010-02-18 14:54:50 UTC (rev 1564) @@ -30,7 +30,7 @@ #include "vchannel.h" -#define DLL_EXPORT __declspec(dllexport) +#define EXTERN __declspec(dllexport) #ifdef __GNUC__ #define SHARED __attribute__((section ("SHAREDDATA"), shared)) @@ -674,7 +674,7 @@ return CallNextHookEx(g_cbt_hook, code, wparam, lparam); } -DLL_EXPORT void +EXTERN void SetHooks(void) { if (!g_cbt_hook) @@ -688,7 +688,7 @@ SetWindowsHookEx(WH_CALLWNDPROCRET, wndprocret_hook_proc, g_instance, 0); } -DLL_EXPORT void +EXTERN void RemoveHooks(void) { if (g_cbt_hook) @@ -701,7 +701,7 @@ UnhookWindowsHookEx(g_wndprocret_hook); } -DLL_EXPORT void +EXTERN void SafeMoveWindow(unsigned int serial, HWND hwnd, int x, int y, int width, int height) { RECT rect; @@ -731,7 +731,7 @@ ReleaseMutex(g_mutex); } -DLL_EXPORT void +EXTERN void SafeZChange(unsigned int serial, HWND hwnd, HWND behind) { WaitForSingleObject(g_mutex, INFINITE); @@ -751,7 +751,7 @@ ReleaseMutex(g_mutex); } -DLL_EXPORT void +EXTERN void SafeFocus(unsigned int serial, HWND hwnd) { WaitForSingleObject(g_mutex, INFINITE); @@ -766,7 +766,7 @@ ReleaseMutex(g_mutex); } -DLL_EXPORT void +EXTERN void SafeSetState(unsigned int serial, HWND hwnd, int state) { LONG style; @@ -813,7 +813,7 @@ ReleaseMutex(g_mutex); } -DLL_EXPORT int +EXTERN int GetInstanceCount() { return g_instance_count; Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2010-01-27 07:41:14 UTC (rev 1563) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2010-02-18 14:54:50 UTC (rev 1564) @@ -53,7 +53,7 @@ static HANDLE g_vchannel = NULL; static unsigned int g_opencount = 0; -DLL_EXPORT void +EXTERN void debug(char *format, ...) { va_list argp; @@ -71,7 +71,7 @@ #define CONVERT_BUFFER_SIZE 1024 static char convert_buffer[CONVERT_BUFFER_SIZE]; -DLL_EXPORT const char * +EXTERN const char * unicode_to_utf8(const unsigned short *string) { unsigned char *buf; @@ -116,7 +116,7 @@ return convert_buffer; } -DLL_EXPORT int +EXTERN int vchannel_open() { g_vchannel = WTSVirtualChannelOpen(WTS_CURRENT_SERVER_HANDLE, @@ -140,7 +140,7 @@ return 0; } -DLL_EXPORT void +EXTERN void vchannel_close() { g_opencount--; @@ -157,7 +157,7 @@ g_vchannel = NULL; } -DLL_EXPORT int +EXTERN int vchannel_is_open() { if (g_vchannel == NULL) @@ -166,7 +166,7 @@ return 1; } -DLL_EXPORT int +EXTERN int vchannel_read(char *line, size_t length) { static BOOL overflow_mode = FALSE; @@ -236,7 +236,7 @@ return 0; } -DLL_EXPORT int +EXTERN int vchannel_write(const char *command, const char *format, ...) { BOOL result; @@ -272,19 +272,19 @@ return bytes_written; } -DLL_EXPORT void +EXTERN void vchannel_block() { WaitForSingleObject(g_mutex, INFINITE); } -DLL_EXPORT void +EXTERN void vchannel_unblock() { ReleaseMutex(g_mutex); } -DLL_EXPORT const char * +EXTERN const char * vchannel_strfilter(char *string) { char *c; @@ -298,7 +298,7 @@ return string; } -DLL_EXPORT const char * +EXTERN const char * vchannel_strfilter_unicode(const unsigned short *string) { return vchannel_strfilter((char *) unicode_to_utf8(string)); Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2010-01-27 07:41:14 UTC (rev 1563) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2010-02-18 14:54:50 UTC (rev 1564) @@ -21,7 +21,7 @@ #ifndef __VCHANNEL_H__ #define __VCHANNEL_H__ -#define DLL_EXPORT __declspec(dllexport) +#define EXTERN __declspec(dllexport) #define VCHANNEL_MAX_LINE 1024 @@ -31,23 +31,23 @@ #define SEAMLESS_HELLO_RECONNECT 0x0001 #define SEAMLESS_HELLO_HIDDEN 0x0002 -DLL_EXPORT void debug(char *format, ...); +EXTERN void debug(char *format, ...); -DLL_EXPORT const char *unicode_to_utf8(const unsigned short *string); +EXTERN const char *unicode_to_utf8(const unsigned short *string); -DLL_EXPORT int vchannel_open(); -DLL_EXPORT void vchannel_close(); +EXTERN int vchannel_open(); +EXTERN void vchannel_close(); -DLL_EXPORT int vchannel_is_open(); +EXTERN int vchannel_is_open(); /* read may only be used by a single process. write is completely safe */ -DLL_EXPORT int vchannel_read(char *line, size_t length); -DLL_EXPORT int vchannel_write(const char *command, const char *format, ...); +EXTERN int vchannel_read(char *line, size_t length); +EXTERN int vchannel_write(const char *command, const char *format, ...); -DLL_EXPORT void vchannel_block(); -DLL_EXPORT void vchannel_unblock(); +EXTERN void vchannel_block(); +EXTERN void vchannel_unblock(); -DLL_EXPORT const char *vchannel_strfilter(char *string); -DLL_EXPORT const char *vchannel_strfilter_unicode(const unsigned short *string); +EXTERN const char *vchannel_strfilter(char *string); +EXTERN const char *vchannel_strfilter_unicode(const unsigned short *string); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-03-02 07:53:50
|
Revision: 1566 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1566&view=rev Author: astrand Date: 2010-03-02 07:53:43 +0000 (Tue, 02 Mar 2010) Log Message: ----------- Indented Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2010-03-02 07:51:59 UTC (rev 1565) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2010-03-02 07:53:43 UTC (rev 1566) @@ -832,7 +832,8 @@ if (!g_mutex) return FALSE; - if (vchannel_open()) { + if (vchannel_open()) + { CloseHandle(g_mutex); return FALSE; } Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2010-03-02 07:51:59 UTC (rev 1565) +++ seamlessrdp/trunk/ServerExe/main.c 2010-03-02 07:53:43 UTC (rev 1566) @@ -442,7 +442,8 @@ CloseHandle(proc_info.hProcess); CloseHandle(proc_info.hThread); - if (!result) { + if (!result) + { // CreateProcess failed. char msg[256]; _snprintf(msg, sizeof(msg), @@ -462,8 +463,7 @@ int flags; /* These get reset on each reconnect */ SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, TRUE, NULL, 0); - SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, - 0); + SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); flags = SEAMLESS_HELLO_RECONNECT; @@ -500,19 +500,19 @@ success = 1; -unhook: + unhook: remove_hooks_fn(); free_startup_procs(); -close_hookdll: + close_hookdll: FreeLibrary(hookdll); -close_vchannel: + close_vchannel: vchannel_close(); if (success) - return 1; + return 1; else return -1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-03-02 09:48:00
|
Revision: 1568 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1568&view=rev Author: astrand Date: 2010-03-02 09:47:54 +0000 (Tue, 02 Mar 2010) Log Message: ----------- Eliminate build errors and warnings on win64. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2010-03-02 09:46:44 UTC (rev 1567) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2010-03-02 09:47:54 UTC (rev 1568) @@ -232,7 +232,7 @@ if (icon) return icon; - icon = (HICON) GetClassLong(hwnd, large ? GCL_HICON : GCL_HICONSM); + icon = (HICON) GetClassLongPtr(hwnd, large ? GCLP_HICON : GCLP_HICONSM); if (icon) return icon; @@ -423,8 +423,8 @@ flags |= SEAMLESS_CREATE_TOPMOST; vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x", - (long) hwnd, (long) pid, - (long) get_parent(hwnd), flags); + hwnd_to_long(hwnd), (long) pid, + hwnd_to_long(get_parent(hwnd)), flags); GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title)); Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2010-03-02 09:46:44 UTC (rev 1567) +++ seamlessrdp/trunk/ServerExe/main.c 2010-03-02 09:47:54 UTC (rev 1568) @@ -113,7 +113,7 @@ return TRUE; if (styles & WS_POPUP) - parent = (HWND) GetWindowLong(hwnd, GWL_HWNDPARENT); + parent = (HWND) GetWindowLongPtr(hwnd, GWLP_HWNDPARENT); else parent = NULL; @@ -123,8 +123,8 @@ if (styles & DS_MODALFRAME) flags |= SEAMLESS_CREATE_MODAL; - vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x", (long) hwnd, (long) pid, - (long) parent, flags); + vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x", + hwnd_to_long(hwnd), (long) pid, hwnd_to_long(parent), flags); if (!GetWindowRect(hwnd, &rect)) { @@ -222,20 +222,20 @@ if (strcmp(tok1, "SYNC") == 0) do_sync(); else if (strcmp(tok1, "STATE") == 0) - do_state(strtoul(tok2, NULL, 0), (HWND) strtoul(tok3, NULL, 0), + do_state(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)), strtol(tok4, NULL, 0)); else if (strcmp(tok1, "POSITION") == 0) - do_position(strtoul(tok2, NULL, 0), (HWND) strtoul(tok3, NULL, 0), + do_position(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)), strtol(tok4, NULL, 0), strtol(tok5, NULL, 0), strtol(tok6, NULL, 0), strtol(tok7, NULL, 0)); else if (strcmp(tok1, "ZCHANGE") == 0) - do_zchange(strtoul(tok2, NULL, 0), (HWND) strtoul(tok3, NULL, 0), - (HWND) strtoul(tok4, NULL, 0)); + do_zchange(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0)), + long_to_hwnd(strtoul(tok4, NULL, 0))); else if (strcmp(tok1, "FOCUS") == 0) - do_focus(strtoul(tok2, NULL, 0), (HWND) strtoul(tok3, NULL, 0)); + do_focus(strtoul(tok2, NULL, 0), long_to_hwnd(strtoul(tok3, NULL, 0))); else if (strcmp(tok1, "DESTROY") == 0) - do_destroy((HWND) strtoul(tok3, NULL, 0)); + do_destroy(long_to_hwnd(strtoul(tok3, NULL, 0))); } } Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2010-03-02 09:46:44 UTC (rev 1567) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2010-03-02 09:47:54 UTC (rev 1568) @@ -68,6 +68,27 @@ vchannel_write("DEBUG", buf); } +/* + From http://msdn.microsoft.com/en-us/library/aa384203(VS.85).aspx: + "64-bit versions of Windows use 32-bit handles for interoperability." + */ +long +hwnd_to_long(HWND hwnd) +{ + DWORD_PTR val; + val = (DWORD_PTR) hwnd; + return val; +} + +HWND +long_to_hwnd(long l) +{ + DWORD_PTR val; + val = l; + return (HWND) val; +} + + #define CONVERT_BUFFER_SIZE 1024 static char convert_buffer[CONVERT_BUFFER_SIZE]; Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2010-03-02 09:46:44 UTC (rev 1567) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2010-03-02 09:47:54 UTC (rev 1568) @@ -33,6 +33,9 @@ EXTERN void debug(char *format, ...); +EXTERN long hwnd_to_long(HWND hwnd); +EXTERN HWND long_to_hwnd(long val); + EXTERN const char *unicode_to_utf8(const unsigned short *string); EXTERN int vchannel_open(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-03-04 12:03:49
|
Revision: 1575 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1575&view=rev Author: astrand Date: 2010-03-04 12:03:43 +0000 (Thu, 04 Mar 2010) Log Message: ----------- Update my copyright. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2010-03-03 13:03:07 UTC (rev 1574) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2010-03-04 12:03:43 UTC (rev 1575) @@ -4,7 +4,7 @@ Based on code copyright (C) 2004-2005 Martin Wickett - Copyright 2005-2008 Peter Åstrand <as...@ce...> for Cendio AB + Copyright 2005-2010 Peter Åstrand <as...@ce...> for Cendio AB Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2010-03-03 13:03:07 UTC (rev 1574) +++ seamlessrdp/trunk/ServerExe/main.c 2010-03-04 12:03:43 UTC (rev 1575) @@ -4,7 +4,7 @@ Based on code copyright (C) 2004-2005 Martin Wickett - Copyright (C) Peter Åstrand <as...@ce...> 2005-2006 + Copyright 2005-2010 Peter Åstrand <as...@ce...> for Cendio AB Copyright (C) Pierre Ossman <os...@ce...> 2006 This program is free software: you can redistribute it and/or modify Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2010-03-03 13:03:07 UTC (rev 1574) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2010-03-04 12:03:43 UTC (rev 1575) @@ -3,6 +3,7 @@ Seamless windows - Virtual channel handling Copyright (C) Pierre Ossman <os...@ce...> 2006 + Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2010-03-03 13:03:07 UTC (rev 1574) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2010-03-04 12:03:43 UTC (rev 1575) @@ -3,6 +3,7 @@ Seamless windows - Virtual channel handling Copyright (C) Pierre Ossman <os...@ce...> 2006 + Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-03-10 12:56:36
|
Revision: 1579 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1579&view=rev Author: astrand Date: 2010-03-10 12:56:27 +0000 (Wed, 10 Mar 2010) Log Message: ----------- Support for mixing 32- and 64-bit applications. This requires a few changes: * We must provide both a 32 and 64 bit of the DLL, and Windows requires that the DLL files have different names. seamlessrdpshell.exe has been modified to load the correct DLL depending on its "bitness". * To hook 32 bit apps om a 64 bit system, a separate 32 bit process must be used. seamlessrdpshell.exe has been modified to start and stop such a process. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/Makefile.am seamlessrdp/trunk/ServerExe/configure.ac seamlessrdp/trunk/ServerExe/main.c Added Paths: ----------- seamlessrdp/trunk/ServerExe/seamlessrdphook.c Modified: seamlessrdp/trunk/ServerExe/Makefile.am =================================================================== --- seamlessrdp/trunk/ServerExe/Makefile.am 2010-03-08 08:51:37 UTC (rev 1578) +++ seamlessrdp/trunk/ServerExe/Makefile.am 2010-03-10 12:56:27 UTC (rev 1579) @@ -1,8 +1,5 @@ bin_PROGRAMS = seamlessrdpshell -lib_LTLIBRARIES = \ - seamlessrdp.la - noinst_LTLIBRARIES = libvchannel.la libvchannel_la_SOURCES = vchannel.c libvchannel_la_LIBADD = -lwtsapi32 @@ -11,6 +8,31 @@ seamlessrdpshell_LDADD = libvchannel.la -lwtsapi32 seamlessrdpshell_LDFLAGS = -mwindows -seamlessrdp_la_SOURCES = hookdll.c -seamlessrdp_la_LDFLAGS = -avoid-version -module -no-undefined -seamlessrdp_la_LIBADD = libvchannel.la -lgdi32 +if OS_IS_WIN32 +bin_PROGRAMS += seamlessrdphook32 +seamlessrdphook32_SOURCES = seamlessrdphook.c +seamlessrdphook32_LDADD = +seamlessrdphook32_LDFLAGS = -mwindows +endif + +# seamlessrdphook64 is not used in practice, but built for completeness +if OS_IS_WIN64 +bin_PROGRAMS += seamlessrdphook64 +seamlessrdphook64_SOURCES = seamlessrdphook.c +seamlessrdphook64_LDADD = +seamlessrdphook64_LDFLAGS = -mwindows +endif + +if OS_IS_WIN32 +lib_LTLIBRARIES = seamlessrdp32.la +seamlessrdp32_la_SOURCES = hookdll.c +seamlessrdp32_la_LDFLAGS = -avoid-version -module -no-undefined +seamlessrdp32_la_LIBADD = libvchannel.la -lgdi32 +endif + +if OS_IS_WIN64 +lib_LTLIBRARIES = seamlessrdp64.la +seamlessrdp64_la_SOURCES = hookdll.c +seamlessrdp64_la_LDFLAGS = -avoid-version -module -no-undefined +seamlessrdp64_la_LIBADD = libvchannel.la -lgdi32 +endif Modified: seamlessrdp/trunk/ServerExe/configure.ac =================================================================== --- seamlessrdp/trunk/ServerExe/configure.ac 2010-03-08 08:51:37 UTC (rev 1578) +++ seamlessrdp/trunk/ServerExe/configure.ac 2010-03-10 12:56:27 UTC (rev 1579) @@ -11,6 +11,19 @@ fi AC_PROG_LIBTOOL +os_is_win32=0 +os_is_win64=0 +case "$host" in + i?86-*-mingw*) + os_is_win32=1 + ;; + x86_64-*-mingw*) + os_is_win64=1 + ;; +esac +AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1") +AM_CONDITIONAL(OS_IS_WIN64, test "x$os_is_win64" = "x1") + AC_LIBTOOL_WIN32_DLL AC_OUTPUT(Makefile) Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2010-03-08 08:51:37 UTC (rev 1578) +++ seamlessrdp/trunk/ServerExe/main.c 2010-03-10 12:56:27 UTC (rev 1579) @@ -33,6 +33,7 @@ #include "resource.h" #define APP_NAME "SeamlessRDP Shell" +#define HELPER_TIMEOUT 2000 /* Global data */ static DWORD g_session_id; @@ -349,7 +350,8 @@ return desk == NULL; } -static BOOL +// Returns process handle on success, or NULL on failure +static HANDLE launch_app(LPSTR cmdline) { BOOL result; @@ -362,19 +364,95 @@ result = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup_info, &proc_info); // Release handles - CloseHandle(proc_info.hProcess); CloseHandle(proc_info.hThread); - return result; + if (result) + { + return proc_info.hProcess; + } + else + { + return NULL; + } } +static HANDLE +launch_helper() +{ + HANDLE app = NULL; + SYSTEM_INFO si; + GetSystemInfo(&si); + + /* If we are running on a x64 system, hook 32 bit apps as well + by launching a 32 bit helper process. */ + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + char cmd[] = "seamlessrdphook32.exe"; + app = launch_app(cmd); + if (!app) + { + char msg[256]; + _snprintf(msg, sizeof(msg), + "Unable to launch the requested application:\n%s", cmd); + message(msg); + } + + /* Wait until helper is started, so that it gets included in + the process enum */ + DWORD ret; + ret = WaitForInputIdle(app, HELPER_TIMEOUT); + switch (ret) + { + case 0: + break; + case WAIT_TIMEOUT: + case WAIT_FAILED: + message("Hooking helper failed to start within time limit"); + break; + } + } + return app; +} + + +// Ask process to quit, otherwise kill it +static void +kill_15_9(HANDLE proc, const char *wndname, DWORD timeout) +{ + HWND procwnd; + DWORD ret; + procwnd = FindWindowEx(HWND_MESSAGE, NULL, "Message", wndname); + if (procwnd) + { + PostMessage(procwnd, WM_CLOSE, 0, 0); + } + ret = WaitForSingleObject(proc, timeout); + switch (ret) + { + case WAIT_ABANDONED: + case WAIT_OBJECT_0: + break; + case WAIT_TIMEOUT: + // Still running, kill hard + if (!TerminateProcess(proc, 1)) + { + message("Unable to terminate process"); + } + break; + case WAIT_FAILED: + message("Unable to wait for process"); + break; + } +} + + int WINAPI WinMain(HINSTANCE instance, HINSTANCE prev_instance, LPSTR cmdline, int cmdshow) { int success = 0; + HANDLE helper = NULL; + HMODULE hookdll = NULL; - HMODULE hookdll; - set_hooks_proc_t set_hooks_fn; remove_hooks_proc_t remove_hooks_fn; get_instance_count_proc_t instance_count_fn; @@ -393,7 +471,22 @@ return -1; } - hookdll = LoadLibrary("seamlessrdp.dll"); + SYSTEM_INFO si; + GetSystemInfo(&si); + switch (si.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + hookdll = LoadLibrary("seamlessrdp32.dll"); + break; + case PROCESSOR_ARCHITECTURE_AMD64: + hookdll = LoadLibrary("seamlessrdp64.dll"); + break; + default: + message("Unsupported processor architecture."); + break; + + } + if (!hookdll) { message("Could not load hook DLL. Unable to continue."); @@ -422,6 +515,8 @@ goto close_hookdll; } + helper = launch_helper(); + ProcessIdToSessionId(GetCurrentProcessId(), &g_session_id); build_startup_procs(); @@ -506,6 +601,11 @@ remove_hooks_fn(); free_startup_procs(); + if (helper) + { + // Terminate seamlessrdphook32.exe + kill_15_9(helper, "SeamlessRDPHook", HELPER_TIMEOUT); + } close_hookdll: FreeLibrary(hookdll); Added: seamlessrdp/trunk/ServerExe/seamlessrdphook.c =================================================================== --- seamlessrdp/trunk/ServerExe/seamlessrdphook.c (rev 0) +++ seamlessrdp/trunk/ServerExe/seamlessrdphook.c 2010-03-10 12:56:27 UTC (rev 1579) @@ -0,0 +1,106 @@ +/* -*- c-basic-offset: 8 -*- + + Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#define WINVER 0x0501 + +#include <windows.h> + +#include "resource.h" + +/* Global data */ +typedef void (*set_hooks_proc_t) (); +typedef int (*get_instance_count_proc_t) (); + +static void +message(const char *text) +{ + MessageBox(GetDesktopWindow(), text, "SeamlessRDP hooking", MB_OK); +} + + +int WINAPI +WinMain(HINSTANCE instance, HINSTANCE prev_instance, LPSTR cmdline, int cmdshow) +{ + HMODULE hookdll = NULL; + set_hooks_proc_t set_hooks_fn; + get_instance_count_proc_t instance_count_fn; + + SYSTEM_INFO si; + GetSystemInfo(&si); + switch (si.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + hookdll = LoadLibrary("seamlessrdp32.dll"); + break; + case PROCESSOR_ARCHITECTURE_AMD64: + hookdll = LoadLibrary("seamlessrdp64.dll"); + break; + default: + message("Unsupported processor architecture."); + break; + + } + + if (!hookdll) + { + message("Could not load hook DLL. Unable to continue."); + return 1; + } + + set_hooks_fn = (set_hooks_proc_t) GetProcAddress(hookdll, "SetHooks"); + instance_count_fn = (get_instance_count_proc_t) GetProcAddress(hookdll, "GetInstanceCount"); + + if (!set_hooks_fn || !instance_count_fn) + { + message("Hook DLL doesn't contain the correct functions. Unable to continue."); + goto close_hookdll; + } + + set_hooks_fn(); + + + /* Wait until seamlessrdpshell wants us to terminate. It + cannot use PostThreadMessage, because if we are showing a + dialog, such messages are lost. Instead, we need to create + a "Message-Only Window". */ + CreateWindow("Message", "SeamlessRDPHook", 0, 0, 0, 0, 0, + HWND_MESSAGE, NULL, instance, NULL); + + MSG msg; + while (1) + { + BOOL ret; + ret = GetMessage(&msg, NULL, 0, 0); + if (ret == -1) + { + message("GetMessage failed"); + break; + } + else if (ret == 0) + { + break; + } + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + close_hookdll: + FreeLibrary(hookdll); + + return 0; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-09-28 12:44:37
|
Revision: 1636 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1636&view=rev Author: astrand Date: 2011-09-28 12:44:31 +0000 (Wed, 28 Sep 2011) Log Message: ----------- Fixed formatting of copyright lines. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/resource.h seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2011-09-28 09:36:59 UTC (rev 1635) +++ seamlessrdp/trunk/ServerExe/main.c 2011-09-28 12:44:31 UTC (rev 1636) @@ -5,7 +5,7 @@ Based on code copyright (C) 2004-2005 Martin Wickett Copyright 2005-2010 Peter Åstrand <as...@ce...> for Cendio AB - Copyright (C) Pierre Ossman <os...@ce...> 2006 + Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: seamlessrdp/trunk/ServerExe/resource.h =================================================================== --- seamlessrdp/trunk/ServerExe/resource.h 2011-09-28 09:36:59 UTC (rev 1635) +++ seamlessrdp/trunk/ServerExe/resource.h 2011-09-28 12:44:31 UTC (rev 1636) @@ -4,8 +4,8 @@ Based on code copyright (C) 2004-2005 Martin Wickett - Copyright (C) Peter Åstrand <as...@ce...> 2005-2006 - Copyright (C) Pierre Ossman <os...@ce...> 2006 + Copyright 2005-2006 Peter Åstrand <as...@ce...> for Cendio AB + Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2011-09-28 09:36:59 UTC (rev 1635) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2011-09-28 12:44:31 UTC (rev 1636) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Seamless windows - Virtual channel handling - Copyright (C) Pierre Ossman <os...@ce...> 2006 + Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2011-09-28 09:36:59 UTC (rev 1635) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2011-09-28 12:44:31 UTC (rev 1636) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Seamless windows - Virtual channel handling - Copyright (C) Pierre Ossman <os...@ce...> 2006 + Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2012-09-06 12:38:21
|
Revision: 1668 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1668&view=rev Author: hean01 Date: 2012-09-06 12:38:12 +0000 (Thu, 06 Sep 2012) Log Message: ----------- Running a seamless console window is not supported due to hooks fails to work properly, mainly because of that the window is owned by csrss.exe process and messagepump works different. This commit makes it more aware that running cmd.exe though seamlessshell.exe is not permitted with one exception; when using the /c <command> argument to start a subprocess. Fixed a race on windows 2008r2 where the command window still was hooked and processed that showed a black stale window when application started using cmd /c <app>. On Windows2003 and earlier this wasn't a problem because when SetHooks() was reached the console window was already closed. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2012-07-03 11:50:56 UTC (rev 1667) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2012-09-06 12:38:12 UTC (rev 1668) @@ -392,6 +392,16 @@ style = GetWindowLong(hwnd, GWL_STYLE); + /* cmd.exe console window belongs to CSRSS.exe process which is not + owned by user and therefor hooking into it will fail in several ways, + we do ignore them upon vchannel SYNC command when enumerating windows + but we should also ignore them here if they exists at this point. + */ + char classname[32]; + if (GetClassName(hwnd, classname, sizeof(classname)) + && !strcmp(classname, "ConsoleWindowClass")) + goto end; + switch (msg) { case WM_WINDOWPOSCHANGED: { Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2012-07-03 11:50:56 UTC (rev 1667) +++ seamlessrdp/trunk/ServerExe/main.c 2012-09-06 12:38:12 UTC (rev 1668) @@ -592,6 +592,13 @@ /* We don't want windows denying requests to activate windows. */ SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); + /* Prevent start of a stand alone console window which is not supported. */ + if ( (!strncmp(cmdline,"cmd ",4) || !strncmp(cmdline,"cmd.exe",7)) && + !strstr(cmdline," /c ")) { + message("Running a seamless console window is not supported."); + goto unhook; + } + if (!launch_app(cmdline)) { // CreateProcess failed. char msg[256]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-01-24 13:30:33
|
Revision: 1691 http://sourceforge.net/p/rdesktop/code/1691 Author: hean01 Date: 2013-01-24 13:30:29 +0000 (Thu, 24 Jan 2013) Log Message: ----------- Fix issue with reconnection to seamless session on 2008r2 were communication over virtual channel didnt work. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2013-01-21 13:33:41 UTC (rev 1690) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2013-01-24 13:30:29 UTC (rev 1691) @@ -6,6 +6,7 @@ Copyright 2005-2010 Peter Åstrand <as...@ce...> for Cendio AB Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB + Copyright 2013 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,6 +42,8 @@ static HINSTANCE g_instance = NULL; +static unsigned int g_conn_serial; + /* The data shared between 32 and 64 bit processes contains HWNDs. On win64, HWND is 64 bit but only 32 bits are used. Thus, our @@ -69,6 +72,8 @@ HWND32 blocked_state_hwnd; int blocked_state; + unsigned int conn_serial; + } shared_variables; static HANDLE g_mutex = NULL; @@ -88,6 +93,19 @@ return toplevel; } +/* checks instance connection serial against shared. */ +static void +check_conn_serial() +{ + WaitForSingleObject(g_mutex, INFINITE); + if (g_conn_serial != g_shdata->conn_serial) + { + vchannel_reopen(); + g_conn_serial = g_shdata->conn_serial; + } + ReleaseMutex(g_mutex); +} + /* Returns true if a window is a menu window. */ static BOOL is_menu(HWND hwnd) @@ -140,6 +158,8 @@ memcpy(&blocked, &g_shdata->block_move, sizeof(RECT)); ReleaseMutex(g_mutex); + check_conn_serial(); + vchannel_block(); if (!GetWindowRect(hwnd, &rect)) { @@ -173,6 +193,8 @@ block_behind = long_to_hwnd(g_shdata->blocked_zchange[1]); ReleaseMutex(g_mutex); + check_conn_serial(); + vchannel_block(); behind = GetNextWindow(hwnd, GW_HWNDPREV); @@ -351,6 +373,8 @@ return; } + check_conn_serial(); + chunks = (size + ICON_CHUNK - 1) / ICON_CHUNK; for (i = 0; i < chunks; i++) { for (j = 0; j < ICON_CHUNK; j++) { @@ -375,6 +399,8 @@ LONG style; + check_conn_serial(); + if (!g_wm_seamless_focus) goto end; @@ -537,6 +563,8 @@ if (code < 0) goto end; + check_conn_serial(); + hwnd = ((CWPRETSTRUCT *) details)->hwnd; msg = ((CWPRETSTRUCT *) details)->message; wparam = ((CWPRETSTRUCT *) details)->wParam; @@ -620,6 +648,8 @@ if (code < 0) goto end; + check_conn_serial(); + switch (code) { case HCBT_MINMAX: { @@ -673,6 +703,15 @@ } EXTERN void +IncConnectionSerial(void) +{ + WaitForSingleObject(g_mutex, INFINITE); + g_shdata->conn_serial++; + ReleaseMutex(g_mutex); + +} + +EXTERN void SetHooks(void) { if (!g_cbt_hook) @@ -710,6 +749,8 @@ if (!g_wm_seamless_focus) return; + check_conn_serial(); + WaitForSingleObject(g_mutex, INFINITE); g_shdata->block_move_hwnd = hwnd_to_long(hwnd); g_shdata->block_move_serial = serial; @@ -787,6 +828,8 @@ if (!g_wm_seamless_focus) return; + check_conn_serial(); + vchannel_block(); style = GetWindowLong(hwnd, GWL_STYLE); Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2013-01-21 13:33:41 UTC (rev 1690) +++ seamlessrdp/trunk/ServerExe/main.c 2013-01-24 13:30:29 UTC (rev 1691) @@ -47,6 +47,7 @@ static BOOL g_connected; static BOOL g_desktop_hidden; +typedef void (*inc_conn_serial_t) (); typedef void (*set_hooks_proc_t) (); typedef void (*remove_hooks_proc_t) (); typedef int (*get_instance_count_proc_t) (); @@ -610,6 +611,7 @@ set_hooks_proc_t set_hooks_fn; remove_hooks_proc_t remove_hooks_fn; get_instance_count_proc_t instance_count_fn; + inc_conn_serial_t inc_conn_serial_fn; int check_counter; @@ -643,6 +645,7 @@ goto close_vchannel; } + inc_conn_serial_fn = (inc_conn_serial_t) GetProcAddress(hookdll, "IncConnectionSerial"); set_hooks_fn = (set_hooks_proc_t) GetProcAddress(hookdll, "SetHooks"); remove_hooks_fn = (remove_hooks_proc_t) GetProcAddress(hookdll, "RemoveHooks"); @@ -730,6 +733,9 @@ SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, FALSE, NULL, 0); SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); + inc_conn_serial_fn(); + vchannel_reopen(); + flags = SEAMLESS_HELLO_RECONNECT; if (g_desktop_hidden) flags |= SEAMLESS_HELLO_HIDDEN; Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2013-01-21 13:33:41 UTC (rev 1690) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2013-01-24 13:30:29 UTC (rev 1691) @@ -4,6 +4,7 @@ Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB + Copyright 2013 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -146,6 +147,24 @@ return 0; } +EXTERN int +vchannel_reopen() +{ + vchannel_block(); + if (g_vchannel) + WTSVirtualChannelClose(g_vchannel); + + g_vchannel = WTSVirtualChannelOpen(WTS_CURRENT_SERVER_HANDLE, + WTS_CURRENT_SESSION, CHANNELNAME); + + vchannel_unblock(); + + if (g_vchannel == NULL) + return -1; + + return 0; +} + EXTERN void vchannel_close() { Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2013-01-21 13:33:41 UTC (rev 1690) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2013-01-24 13:30:29 UTC (rev 1691) @@ -4,6 +4,7 @@ Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB + Copyright 2013 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,6 +42,7 @@ EXTERN int vchannel_open(); EXTERN void vchannel_close(); +EXTERN int vchannel_reopen(); EXTERN int vchannel_is_open(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2013-09-19 12:02:44
|
Revision: 1744 http://sourceforge.net/p/rdesktop/code/1744 Author: astrand Date: 2013-09-19 12:02:40 +0000 (Thu, 19 Sep 2013) Log Message: ----------- Fixed indent Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/vchannel.c Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2013-09-19 08:38:07 UTC (rev 1743) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2013-09-19 12:02:40 UTC (rev 1744) @@ -95,11 +95,10 @@ /* checks instance connection serial against shared. */ static void -check_conn_serial() +check_conn_serial() { WaitForSingleObject(g_mutex, INFINITE); - if (g_conn_serial != g_shdata->conn_serial) - { + if (g_conn_serial != g_shdata->conn_serial) { vchannel_reopen(); g_conn_serial = g_shdata->conn_serial; } @@ -708,7 +707,7 @@ WaitForSingleObject(g_mutex, INFINITE); g_shdata->conn_serial++; ReleaseMutex(g_mutex); - + } EXTERN void Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2013-09-19 08:38:07 UTC (rev 1743) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2013-09-19 12:02:40 UTC (rev 1744) @@ -155,7 +155,7 @@ WTSVirtualChannelClose(g_vchannel); g_vchannel = WTSVirtualChannelOpen(WTS_CURRENT_SERVER_HANDLE, - WTS_CURRENT_SESSION, CHANNELNAME); + WTS_CURRENT_SESSION, CHANNELNAME); vchannel_unblock(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-06-23 12:40:20
|
Revision: 1810 http://sourceforge.net/p/rdesktop/code/1810 Author: hean01 Date: 2014-06-23 12:40:14 +0000 (Mon, 23 Jun 2014) Log Message: ----------- Do not export internal helper function unicode_to_utf8() Modified Paths: -------------- seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2014-05-28 07:56:23 UTC (rev 1809) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2014-06-23 12:40:14 UTC (rev 1810) @@ -4,7 +4,7 @@ Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB - Copyright 2013 Henrik Andersson <he...@ce...> for Cendio AB + Copyright 2013-2014 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ #define CONVERT_BUFFER_SIZE 1024 static char convert_buffer[CONVERT_BUFFER_SIZE]; -EXTERN const char * +static const char * unicode_to_utf8(const unsigned short *string) { unsigned char *buf; Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2014-05-28 07:56:23 UTC (rev 1809) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2014-06-23 12:40:14 UTC (rev 1810) @@ -4,7 +4,7 @@ Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2010 Peter Åstrand <as...@ce...> for Cendio AB - Copyright 2013 Henrik Andersson <he...@ce...> for Cendio AB + Copyright 2013-2014 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,6 @@ EXTERN long hwnd_to_long(HWND hwnd); EXTERN HWND long_to_hwnd(long val); -EXTERN const char *unicode_to_utf8(const unsigned short *string); - EXTERN int vchannel_open(); EXTERN void vchannel_close(); EXTERN int vchannel_reopen(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-06-23 13:07:00
|
Revision: 1811 http://sourceforge.net/p/rdesktop/code/1811 Author: hean01 Date: 2014-06-23 13:06:57 +0000 (Mon, 23 Jun 2014) Log Message: ----------- Moved shared helper functions into a library. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/Makefile.am seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Added Paths: ----------- seamlessrdp/trunk/ServerExe/shared.c seamlessrdp/trunk/ServerExe/shared.h Modified: seamlessrdp/trunk/ServerExe/Makefile.am =================================================================== --- seamlessrdp/trunk/ServerExe/Makefile.am 2014-06-23 12:40:14 UTC (rev 1810) +++ seamlessrdp/trunk/ServerExe/Makefile.am 2014-06-23 13:06:57 UTC (rev 1811) @@ -1,11 +1,16 @@ bin_PROGRAMS = seamlessrdpshell -noinst_LTLIBRARIES = libvchannel.la +noinst_LTLIBRARIES = libshared.la libvchannel.la + +libshared_la_SOURCES = shared.c +libshared_la_LIBADD = + libvchannel_la_SOURCES = vchannel.c libvchannel_la_LIBADD = -lwtsapi32 + seamlessrdpshell_SOURCES = main.c -seamlessrdpshell_LDADD = libvchannel.la -lwtsapi32 +seamlessrdpshell_LDADD = libshared.la libvchannel.la -lwtsapi32 seamlessrdpshell_LDFLAGS = -mwindows if OS_IS_WIN32 @@ -27,12 +32,12 @@ lib_LTLIBRARIES = seamlessrdp32.la seamlessrdp32_la_SOURCES = hookdll.c seamlessrdp32_la_LDFLAGS = -avoid-version -module -no-undefined -seamlessrdp32_la_LIBADD = libvchannel.la -lgdi32 +seamlessrdp32_la_LIBADD = libshared.la libvchannel.la -lgdi32 endif if OS_IS_WIN64 lib_LTLIBRARIES = seamlessrdp64.la seamlessrdp64_la_SOURCES = hookdll.c seamlessrdp64_la_LDFLAGS = -avoid-version -module -no-undefined -seamlessrdp64_la_LIBADD = libvchannel.la -lgdi32 +seamlessrdp64_la_LIBADD = libshared.la libvchannel.la -lgdi32 endif Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2014-06-23 12:40:14 UTC (rev 1810) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2014-06-23 13:06:57 UTC (rev 1811) @@ -6,7 +6,7 @@ Copyright 2005-2010 Peter Åstrand <as...@ce...> for Cendio AB Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB - Copyright 2013 Henrik Andersson <he...@ce...> for Cendio AB + Copyright 2013-2014 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #include <windows.h> #include <winuser.h> +#include "shared.h" #include "vchannel.h" #define EXTERN __declspec(dllexport) @@ -223,137 +224,6 @@ vchannel_unblock(); } -static HICON -get_icon(HWND hwnd, int large) -{ - HICON icon; - - if (!SendMessageTimeout(hwnd, WM_GETICON, large ? ICON_BIG : ICON_SMALL, - 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon)) - return NULL; - - if (icon) - return icon; - - /* - * Modern versions of Windows uses the voodoo value of 2 instead of 0 - * for the small icons. - */ - if (!large) { - if (!SendMessageTimeout(hwnd, WM_GETICON, 2, - 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon)) - return NULL; - } - - if (icon) - return icon; - - icon = (HICON) GetClassLongPtr(hwnd, large ? GCLP_HICON : GCLP_HICONSM); - - if (icon) - return icon; - - return NULL; -} - -static int -extract_icon(HICON icon, char *buffer, int maxlen) -{ - ICONINFO info; - HDC hdc; - BITMAP mask_bmp, color_bmp; - BITMAPINFO bmi; - int size, i; - char *mask_buf, *color_buf; - char *o, *m, *c; - int ret = -1; - - assert(buffer); - assert(maxlen > 0); - - if (!GetIconInfo(icon, &info)) - goto fail; - - if (!GetObject(info.hbmMask, sizeof(BITMAP), &mask_bmp)) - goto free_bmps; - if (!GetObject(info.hbmColor, sizeof(BITMAP), &color_bmp)) - goto free_bmps; - - if (mask_bmp.bmWidth != color_bmp.bmWidth) - goto free_bmps; - if (mask_bmp.bmHeight != color_bmp.bmHeight) - goto free_bmps; - - if ((mask_bmp.bmWidth * mask_bmp.bmHeight * 4) > maxlen) - goto free_bmps; - - size = (mask_bmp.bmWidth + 3) / 4 * 4; - size *= mask_bmp.bmHeight; - size *= 4; - - mask_buf = malloc(size); - if (!mask_buf) - goto free_bmps; - color_buf = malloc(size); - if (!color_buf) - goto free_mbuf; - - memset(&bmi, 0, sizeof(BITMAPINFO)); - - bmi.bmiHeader.biSize = sizeof(BITMAPINFO); - bmi.bmiHeader.biWidth = mask_bmp.bmWidth; - bmi.bmiHeader.biHeight = -mask_bmp.bmHeight; - bmi.bmiHeader.biPlanes = 1; - bmi.bmiHeader.biBitCount = 32; - bmi.bmiHeader.biCompression = BI_RGB; - bmi.bmiHeader.biSizeImage = size; - - hdc = CreateCompatibleDC(NULL); - if (!hdc) - goto free_cbuf; - - if (!GetDIBits(hdc, info.hbmMask, 0, mask_bmp.bmHeight, mask_buf, &bmi, - DIB_RGB_COLORS)) - goto del_dc; - if (!GetDIBits(hdc, info.hbmColor, 0, color_bmp.bmHeight, color_buf, &bmi, - DIB_RGB_COLORS)) - goto del_dc; - - o = buffer; - m = mask_buf; - c = color_buf; - for (i = 0; i < size / 4; i++) { - o[0] = c[2]; - o[1] = c[1]; - o[2] = c[0]; - - o[3] = ((int) (unsigned char) m[0] + (unsigned char) m[1] + - (unsigned char) m[2]) / 3; - o[3] = 0xff - o[3]; - - o += 4; - m += 4; - c += 4; - } - - ret = size; - - del_dc: - DeleteDC(hdc); - - free_cbuf: - free(color_buf); - free_mbuf: - free(mask_buf); - - free_bmps: - DeleteObject(info.hbmMask); - DeleteObject(info.hbmColor); - - fail: - return ret; -} - #define ICON_CHUNK 400 static void Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2014-06-23 12:40:14 UTC (rev 1810) +++ seamlessrdp/trunk/ServerExe/main.c 2014-06-23 13:06:57 UTC (rev 1811) @@ -30,6 +30,7 @@ #include <wtsapi32.h> #include <cchannel.h> +#include "shared.h" #include "vchannel.h" #include "resource.h" Added: seamlessrdp/trunk/ServerExe/shared.c =================================================================== --- seamlessrdp/trunk/ServerExe/shared.c (rev 0) +++ seamlessrdp/trunk/ServerExe/shared.c 2014-06-23 13:06:57 UTC (rev 1811) @@ -0,0 +1,178 @@ +/* -*- c-basic-offset: 8 -*- + rdesktop: A Remote Desktop Protocol client. + Seamless windows - Shared helper functions + + Copyright 2014 Henrik Andersson <he...@ce...> for Cendio AB + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <assert.h> +#include <stdio.h> + +#include "shared.h" + +/* + From http://msdn.microsoft.com/en-us/library/aa384203(VS.85).aspx: + "64-bit versions of Windows use 32-bit handles for interoperability." + */ +long +hwnd_to_long(HWND hwnd) +{ + DWORD_PTR val; + val = (DWORD_PTR) hwnd; + return val; +} + + +HWND +long_to_hwnd(long l) +{ + DWORD_PTR val; + val = l; + return (HWND) val; +} + + +HICON +get_icon(HWND hwnd, int large) +{ + HICON icon; + + if (!SendMessageTimeout(hwnd, WM_GETICON, large ? ICON_BIG : ICON_SMALL, + 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon)) + return NULL; + + if (icon) + return icon; + + /* + * Modern versions of Windows uses the voodoo value of 2 instead of 0 + * for the small icons. + */ + if (!large) { + if (!SendMessageTimeout(hwnd, WM_GETICON, 2, + 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR) & icon)) + return NULL; + } + + if (icon) + return icon; + + icon = (HICON) GetClassLongPtr(hwnd, large ? GCLP_HICON : GCLP_HICONSM); + + if (icon) + return icon; + + return NULL; +} + + +int +extract_icon(HICON icon, char *buffer, int maxlen) +{ + ICONINFO info; + HDC hdc; + BITMAP mask_bmp, color_bmp; + BITMAPINFO bmi; + int size, i; + char *mask_buf, *color_buf; + char *o, *m, *c; + int ret = -1; + + assert(buffer); + assert(maxlen > 0); + + if (!GetIconInfo(icon, &info)) + goto fail; + + if (!GetObject(info.hbmMask, sizeof(BITMAP), &mask_bmp)) + goto free_bmps; + if (!GetObject(info.hbmColor, sizeof(BITMAP), &color_bmp)) + goto free_bmps; + + if (mask_bmp.bmWidth != color_bmp.bmWidth) + goto free_bmps; + if (mask_bmp.bmHeight != color_bmp.bmHeight) + goto free_bmps; + + if ((mask_bmp.bmWidth * mask_bmp.bmHeight * 4) > maxlen) + goto free_bmps; + + size = (mask_bmp.bmWidth + 3) / 4 * 4; + size *= mask_bmp.bmHeight; + size *= 4; + + mask_buf = malloc(size); + if (!mask_buf) + goto free_bmps; + color_buf = malloc(size); + if (!color_buf) + goto free_mbuf; + + memset(&bmi, 0, sizeof(BITMAPINFO)); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFO); + bmi.bmiHeader.biWidth = mask_bmp.bmWidth; + bmi.bmiHeader.biHeight = -mask_bmp.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = size; + + hdc = CreateCompatibleDC(NULL); + if (!hdc) + goto free_cbuf; + + if (!GetDIBits(hdc, info.hbmMask, 0, mask_bmp.bmHeight, mask_buf, &bmi, + DIB_RGB_COLORS)) + goto del_dc; + if (!GetDIBits(hdc, info.hbmColor, 0, color_bmp.bmHeight, color_buf, &bmi, + DIB_RGB_COLORS)) + goto del_dc; + + o = buffer; + m = mask_buf; + c = color_buf; + for (i = 0; i < size / 4; i++) { + o[0] = c[2]; + o[1] = c[1]; + o[2] = c[0]; + + o[3] = ((int) (unsigned char) m[0] + (unsigned char) m[1] + + (unsigned char) m[2]) / 3; + o[3] = 0xff - o[3]; + + o += 4; + m += 4; + c += 4; + } + + ret = size; + + del_dc: + DeleteDC(hdc); + + free_cbuf: + free(color_buf); + free_mbuf: + free(mask_buf); + + free_bmps: + DeleteObject(info.hbmMask); + DeleteObject(info.hbmColor); + + fail: + return ret; +} Added: seamlessrdp/trunk/ServerExe/shared.h =================================================================== --- seamlessrdp/trunk/ServerExe/shared.h (rev 0) +++ seamlessrdp/trunk/ServerExe/shared.h 2014-06-23 13:06:57 UTC (rev 1811) @@ -0,0 +1,32 @@ +/* -*- c-basic-offset: 8 -*- + rdesktop: A Remote Desktop Protocol client. + Seamless windows - Shared helper functions + + Copyright 2014 Henrik Andersson <he...@ce...> for Cendio AB + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _SHARED_H +#define _SHARED_H + +#include <windows.h> + +long hwnd_to_long(HWND hwnd); +HWND long_to_hwnd(long val); + +HICON get_icon(HWND hwnd, int large); +int extract_icon(HICON icon, char *buffer, int maxlen); + +#endif /* _SHARED_H */ Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2014-06-23 12:40:14 UTC (rev 1810) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2014-06-23 13:06:57 UTC (rev 1811) @@ -57,27 +57,6 @@ vchannel_write("DEBUG", buf); } -/* - From http://msdn.microsoft.com/en-us/library/aa384203(VS.85).aspx: - "64-bit versions of Windows use 32-bit handles for interoperability." - */ -long -hwnd_to_long(HWND hwnd) -{ - DWORD_PTR val; - val = (DWORD_PTR) hwnd; - return val; -} - -HWND -long_to_hwnd(long l) -{ - DWORD_PTR val; - val = l; - return (HWND) val; -} - - #define CONVERT_BUFFER_SIZE 1024 static char convert_buffer[CONVERT_BUFFER_SIZE]; Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2014-06-23 12:40:14 UTC (rev 1810) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2014-06-23 13:06:57 UTC (rev 1811) @@ -35,9 +35,6 @@ EXTERN void debug(char *format, ...); -EXTERN long hwnd_to_long(HWND hwnd); -EXTERN HWND long_to_hwnd(long val); - EXTERN int vchannel_open(); EXTERN void vchannel_close(); EXTERN int vchannel_reopen(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-06-23 13:10:48
|
Revision: 1812 http://sourceforge.net/p/rdesktop/code/1812 Author: hean01 Date: 2014-06-23 13:10:44 +0000 (Mon, 23 Jun 2014) Log Message: ----------- Renamed debug() to vchannel_debug() Modified Paths: -------------- seamlessrdp/trunk/ServerExe/hookdll.c seamlessrdp/trunk/ServerExe/main.c seamlessrdp/trunk/ServerExe/vchannel.c seamlessrdp/trunk/ServerExe/vchannel.h Modified: seamlessrdp/trunk/ServerExe/hookdll.c =================================================================== --- seamlessrdp/trunk/ServerExe/hookdll.c 2014-06-23 13:06:57 UTC (rev 1811) +++ seamlessrdp/trunk/ServerExe/hookdll.c 2014-06-23 13:10:44 UTC (rev 1812) @@ -163,7 +163,7 @@ vchannel_block(); if (!GetWindowRect(hwnd, &rect)) { - debug("GetWindowRect failed!"); + vchannel_debug("GetWindowRect failed!"); goto end; } @@ -238,7 +238,7 @@ return; if ((!large && size != 16 * 16 * 4) || (large && size != 32 * 32 * 4)) { - debug("Unexpected icon size."); + vchannel_debug("Unexpected icon size."); return; } @@ -385,7 +385,7 @@ vchannel_write("DELICON", "0x%08lx,RGBA,16,16", hwnd); break; default: - debug("Weird icon size %d", (int) wparam); + vchannel_debug("Weird icon size %d", (int) wparam); } break; @@ -550,7 +550,7 @@ else if ((show == SW_MAXIMIZE) || (show == SW_SHOWMAXIMIZED)) state = 2; else { - debug("Unexpected show: %d", show); + vchannel_debug("Unexpected show: %d", show); break; } @@ -635,7 +635,7 @@ vchannel_write("ACK", "%u", serial); if (!GetWindowRect(hwnd, &rect)) - debug("GetWindowRect failed!"); + vchannel_debug("GetWindowRect failed!"); else if ((rect.left != x) || (rect.top != y) || (rect.right != x + width) || (rect.bottom != y + height)) update_position(hwnd); @@ -751,7 +751,7 @@ else if (state == 2) ShowWindow(hwnd, SW_MAXIMIZE); else - debug("Invalid state %d sent.", state); + vchannel_debug("Invalid state %d sent.", state); WaitForSingleObject(g_mutex, INFINITE); g_shdata->blocked_state_hwnd = 0; Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2014-06-23 13:06:57 UTC (rev 1811) +++ seamlessrdp/trunk/ServerExe/main.c 2014-06-23 13:10:44 UTC (rev 1812) @@ -188,7 +188,7 @@ hwnd_to_long(hwnd), (long) pid, hwnd_to_long(parent), flags); if (!GetWindowRect(hwnd, &rect)) { - debug("GetWindowRect failed!"); + vchannel_debug("GetWindowRect failed!"); return TRUE; } Modified: seamlessrdp/trunk/ServerExe/vchannel.c =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.c 2014-06-23 13:06:57 UTC (rev 1811) +++ seamlessrdp/trunk/ServerExe/vchannel.c 2014-06-23 13:10:44 UTC (rev 1812) @@ -43,7 +43,7 @@ static unsigned int g_opencount = 0; EXTERN void -debug(char *format, ...) +vchannel_debug(char *format, ...) { va_list argp; char buf[256]; Modified: seamlessrdp/trunk/ServerExe/vchannel.h =================================================================== --- seamlessrdp/trunk/ServerExe/vchannel.h 2014-06-23 13:06:57 UTC (rev 1811) +++ seamlessrdp/trunk/ServerExe/vchannel.h 2014-06-23 13:10:44 UTC (rev 1812) @@ -33,7 +33,7 @@ #define SEAMLESS_HELLO_RECONNECT 0x0001 #define SEAMLESS_HELLO_HIDDEN 0x0002 -EXTERN void debug(char *format, ...); +EXTERN void vchannel_debug(char *format, ...); EXTERN int vchannel_open(); EXTERN void vchannel_close(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-06-23 14:48:36
|
Revision: 1813 http://sourceforge.net/p/rdesktop/code/1813 Author: hean01 Date: 2014-06-23 14:48:28 +0000 (Mon, 23 Jun 2014) Log Message: ----------- Dont link seamlessrdp with libvchannel to prevent duplicated copies of vchannel. Let the hook dll hold the vchannel singelton and import vchannel functions into executable. Modified Paths: -------------- seamlessrdp/trunk/ServerExe/Makefile.am seamlessrdp/trunk/ServerExe/main.c Modified: seamlessrdp/trunk/ServerExe/Makefile.am =================================================================== --- seamlessrdp/trunk/ServerExe/Makefile.am 2014-06-23 13:10:44 UTC (rev 1812) +++ seamlessrdp/trunk/ServerExe/Makefile.am 2014-06-23 14:48:28 UTC (rev 1813) @@ -10,7 +10,7 @@ seamlessrdpshell_SOURCES = main.c -seamlessrdpshell_LDADD = libshared.la libvchannel.la -lwtsapi32 +seamlessrdpshell_LDADD = libshared.la -lwtsapi32 seamlessrdpshell_LDFLAGS = -mwindows if OS_IS_WIN32 Modified: seamlessrdp/trunk/ServerExe/main.c =================================================================== --- seamlessrdp/trunk/ServerExe/main.c 2014-06-23 13:10:44 UTC (rev 1812) +++ seamlessrdp/trunk/ServerExe/main.c 2014-06-23 14:48:28 UTC (rev 1813) @@ -6,7 +6,7 @@ Copyright 2005-2010 Peter Åstrand <as...@ce...> for Cendio AB Copyright 2006 Pierre Ossman <os...@ce...> for Cendio AB - Copyright 2012-2013 Henrik Andersson <he...@ce...> for Cendio AB + Copyright 2012-2014 Henrik Andersson <he...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +32,6 @@ #include "shared.h" #include "vchannel.h" - #include "resource.h" #define APP_NAME "SeamlessRDP Shell" @@ -62,12 +61,27 @@ typedef void (*zchange_proc_t) (unsigned int serial, HWND hwnd, HWND behind); typedef void (*focus_proc_t) (unsigned int serial, HWND hwnd); typedef void (*set_state_proc_t) (unsigned int serial, HWND hwnd, int state); +typedef int (*vchannel_reopen_t)(); +typedef void (*vchannel_block_t)(); +typedef void (*vchannel_unblock_t)(); +typedef int (*vchannel_write_t)(const char *command, const char *format, ...); +typedef int (*vchannel_read_t)(char *line, size_t length); +typedef const char *(*vchannel_strfilter_unicode_t)(const unsigned short *string); +typedef void (*vchannel_debug_t)(char *format, ...); static move_window_proc_t g_move_window_fn = NULL; static zchange_proc_t g_zchange_fn = NULL; static focus_proc_t g_focus_fn = NULL; static set_state_proc_t g_set_state_fn = NULL; +static vchannel_reopen_t g_vchannel_reopen_fn = NULL; +static vchannel_block_t g_vchannel_block_fn = NULL; +static vchannel_unblock_t g_vchannel_unblock_fn = NULL; +static vchannel_write_t g_vchannel_write_fn = NULL; +static vchannel_read_t g_vchannel_read_fn = NULL; +static vchannel_strfilter_unicode_t g_vchannel_strfilter_unicode_fn = NULL; +static vchannel_debug_t g_vchannel_debug_fn = NULL; + static void messageW(const wchar_t * wtext) { @@ -184,22 +198,22 @@ if (styles & DS_MODALFRAME) flags |= SEAMLESS_CREATE_MODAL; - vchannel_write("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x", + g_vchannel_write_fn("CREATE", "0x%08lx,0x%08lx,0x%08lx,0x%08x", hwnd_to_long(hwnd), (long) pid, hwnd_to_long(parent), flags); if (!GetWindowRect(hwnd, &rect)) { - vchannel_debug("GetWindowRect failed!"); + g_vchannel_debug_fn("GetWindowRect failed!"); return TRUE; } - vchannel_write("POSITION", "0x%08lx,%d,%d,%d,%d,0x%08x", + g_vchannel_write_fn("POSITION", "0x%08lx,%d,%d,%d,%d,0x%08x", hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0); GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title)); - vchannel_write("TITLE", "0x%x,%s,0x%x", hwnd, - vchannel_strfilter_unicode(title), 0); + g_vchannel_write_fn("TITLE", "0x%x,%s,0x%x", hwnd, + g_vchannel_strfilter_unicode_fn(title), 0); if (styles & WS_MAXIMIZE) state = 2; @@ -208,7 +222,7 @@ else state = 0; - vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x", hwnd, state, 0); + g_vchannel_write_fn("STATE", "0x%08lx,0x%08x,0x%08x", hwnd, state, 0); return TRUE; } @@ -262,15 +276,15 @@ static void do_sync(void) { - vchannel_block(); + g_vchannel_block_fn(); - vchannel_write("SYNCBEGIN", "0x0"); + g_vchannel_write_fn("SYNCBEGIN", "0x0"); EnumWindows(enum_cb, 0); - vchannel_write("SYNCEND", "0x0"); + g_vchannel_write_fn("SYNCEND", "0x0"); - vchannel_unblock(); + g_vchannel_unblock_fn(); } static void @@ -338,7 +352,7 @@ char *p, *tok1, *tok2, *tok3, *tok4, *tok5, *tok6, *tok7, *tok8; - while ((size = vchannel_read(line, sizeof(line))) >= 0) { + while ((size = g_vchannel_read_fn(line, sizeof(line))) >= 0) { p = unescape(line); @@ -630,11 +644,6 @@ return -1; } - if (vchannel_open()) { - messageW(L"Unable to set up the virtual channel."); - return -1; - } - SYSTEM_INFO si; GetSystemInfo(&si); switch (si.wProcessorArchitecture) { @@ -652,7 +661,7 @@ if (!hookdll) { messageW(L"Could not load hook DLL. Unable to continue."); - goto close_vchannel; + goto bail_out; } inc_conn_serial_fn = @@ -668,9 +677,20 @@ g_focus_fn = (focus_proc_t) GetProcAddress(hookdll, "SafeFocus"); g_set_state_fn = (set_state_proc_t) GetProcAddress(hookdll, "SafeSetState"); + g_vchannel_reopen_fn = (vchannel_reopen_t) GetProcAddress(hookdll, "vchannel_reopen"); + g_vchannel_block_fn = (vchannel_block_t) GetProcAddress(hookdll, "vchannel_block"); + g_vchannel_unblock_fn = (vchannel_unblock_t) GetProcAddress(hookdll, "vchannel_unblock"); + g_vchannel_write_fn = (vchannel_write_t) GetProcAddress(hookdll, "vchannel_write"); + g_vchannel_read_fn = (vchannel_read_t) GetProcAddress(hookdll, "vchannel_read"); + g_vchannel_strfilter_unicode_fn = (vchannel_strfilter_unicode_t) GetProcAddress(hookdll, "vchannel_strfilter_unicode"); + g_vchannel_debug_fn = (vchannel_debug_t) GetProcAddress(hookdll, "vchannel_debug"); + if (!set_hooks_fn || !remove_hooks_fn || !instance_count_fn - || !g_move_window_fn || !g_zchange_fn || !g_focus_fn - || !g_set_state_fn) { + || !g_move_window_fn || !g_zchange_fn || !g_focus_fn || !g_set_state_fn + || !g_vchannel_reopen_fn || !g_vchannel_block_fn || !g_vchannel_unblock_fn + || !g_vchannel_write_fn || !g_vchannel_read_fn || !g_vchannel_strfilter_unicode_fn + || !g_vchannel_debug_fn) + { messageW (L"Hook DLL doesn't contain the correct functions. Unable to continue."); goto close_hookdll; @@ -700,7 +720,7 @@ g_connected = is_connected(); g_desktop_hidden = is_desktop_hidden(); - vchannel_write("HELLO", "0x%08x", + g_vchannel_write_fn("HELLO", "0x%08x", g_desktop_hidden ? SEAMLESS_HELLO_HIDDEN : 0); set_hooks_fn(); @@ -737,12 +757,12 @@ SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, 0); inc_conn_serial_fn(); - vchannel_reopen(); + g_vchannel_reopen_fn(); flags = SEAMLESS_HELLO_RECONNECT; if (g_desktop_hidden) flags |= SEAMLESS_HELLO_HIDDEN; - vchannel_write("HELLO", "0x%08x", flags); + g_vchannel_write_fn("HELLO", "0x%08x", flags); } g_connected = connected; @@ -752,9 +772,9 @@ hidden = is_desktop_hidden(); if (hidden && !g_desktop_hidden) - vchannel_write("HIDE", "0x%08x", 0); + g_vchannel_write_fn("HIDE", "0x%08x", 0); else if (!hidden && g_desktop_hidden) - vchannel_write("UNHIDE", "0x%08x", 0); + g_vchannel_write_fn("UNHIDE", "0x%08x", 0); g_desktop_hidden = hidden; @@ -784,9 +804,7 @@ close_hookdll: FreeLibrary(hookdll); - close_vchannel: - vchannel_close(); - + bail_out: // Logoff the user. This is necessary because the session may // have started processes that are not included in Microsofts // list of processes to ignore. Typically ieuser.exe. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |