CVS: seamlessrdp/ServerExe/HookDll hookdll.c, 1.40, 1.41

Peter Åstrand <[email protected]> Thu, 06 Mar 2008 07:12:29 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17733/ServerExe/HookDll

Modified Files:
	hookdll.c 
Log Message:
Ran indent-all

Index: hookdll.c
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll/hookdll.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** hookdll.c	6 Mar 2008 15:11:53 -0000	1.40
--- hookdll.c	6 Mar 2008 15:12:26 -0000	1.41
***************
*** 76,80 ****
  static HANDLE g_mutex = NULL;
  
! static BOOL is_toplevel(HWND hwnd)
  {
  	BOOL toplevel;
--- 76,81 ----
  static HANDLE g_mutex = NULL;
  
! static BOOL
! is_toplevel(HWND hwnd)
  {
  	BOOL toplevel;
***************
*** 102,116 ****
  	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;
  	}
--- 103,117 ----
  	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;
  	}
***************
*** 374,378 ****
  	style = GetWindowLong(hwnd, GWL_STYLE);
  
! 	if (!is_toplevel(hwnd)) {
  		goto end;
  	}
--- 375,380 ----
  	style = GetWindowLong(hwnd, GWL_STYLE);
  
! 	if (!is_toplevel(hwnd))
! 	{
  		goto end;
  	}
***************
*** 399,404 ****
  
  					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));
--- 401,406 ----
  
  					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));
***************
*** 519,523 ****
  	style = GetWindowLong(hwnd, GWL_STYLE);
  
! 	if (!is_toplevel(hwnd)) {
  		goto end;
  	}
--- 521,526 ----
  	style = GetWindowLong(hwnd, GWL_STYLE);
  
! 	if (!is_toplevel(hwnd))
! 	{
  		goto end;
  	}


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/