CVS: seamlessrdp/ServerExe/HookDll hookdll.c,1.34,1.35

Pierre Ossman <[email protected]> Wed, 22 Mar 2006 03:56:48 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10473/ServerExe/HookDll

Modified Files:
	hookdll.c 
Log Message:
Avoid %p since it's implementation defined.


Index: hookdll.c
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll/hookdll.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** hookdll.c	22 Mar 2006 11:52:07 -0000	1.34
--- hookdll.c	22 Mar 2006 11:56:46 -0000	1.35
***************
*** 100,104 ****
  		goto end;
  
! 	vchannel_write("POSITION", "0x%p,%d,%d,%d,%d,0x%x",
  		       hwnd,
  		       rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, 0);
--- 100,104 ----
  		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);
***************
*** 139,143 ****
  		vchannel_write("ACK", "%u", serial);
  	else
! 		vchannel_write("ZCHANGE", "0x%p,0x%p,0x%x", hwnd, behind, 0);
  
  	vchannel_unblock();
--- 139,143 ----
  		vchannel_write("ACK", "%u", serial);
  	else
! 		vchannel_write("ZCHANGE", "0x%08lx,0x%08lx,0x%08x", hwnd, behind, 0);
  
  	vchannel_unblock();
***************
*** 234,238 ****
  					GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
  
! 					vchannel_write("TITLE", "0x%x,%s,0x%x", hwnd,
  						       vchannel_strfilter_unicode(title), 0);
  
--- 234,238 ----
  					GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
  
! 					vchannel_write("TITLE", "0x%08lx,%s,0x%08x", hwnd,
  						       vchannel_strfilter_unicode(title), 0);
  
***************
*** 246,254 ****
  					update_position(hwnd);
  
! 					vchannel_write("STATE", "0x%p,0x%x,0x%x", hwnd, state, 0);
  				}
  
  				if (wp->flags & SWP_HIDEWINDOW)
! 					vchannel_write("DESTROY", "0x%p,0x%x", hwnd, 0);
  
  				if (!(style & WS_VISIBLE) || (style & WS_MINIMIZE))
--- 246,255 ----
  					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))
***************
*** 276,280 ****
  			if (!(style & WS_VISIBLE))
  				break;
! 			vchannel_write("DESTROY", "0x%p,0x%x", hwnd, 0);
  			break;
  
--- 277,281 ----
  			if (!(style & WS_VISIBLE))
  				break;
! 			vchannel_write("DESTROY", "0x%08lx,0x%08x", hwnd, 0);
  			break;
  
***************
*** 338,342 ****
  				   we need unicode. */
  				GetWindowTextW(hwnd, title, sizeof(title) / sizeof(*title));
! 				vchannel_write("TITLE", "0x%p,%s,0x%x", hwnd,
  					       vchannel_strfilter_unicode(title), 0);
  				break;
--- 339,343 ----
  				   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;
***************
*** 399,404 ****
  					vchannel_write("ACK", "%u", serial);
  				else
! 					vchannel_write("STATE", "0x%p,0x%x,0x%x", (HWND) wparam,
! 						       state, 0);
  
  				break;
--- 400,405 ----
  					vchannel_write("ACK", "%u", serial);
  				else
! 					vchannel_write("STATE", "0x%08lx,0x%08x,0x%08x",
! 						       (HWND) wparam, state, 0);
  
  				break;



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642