CVS: rdesktop cache.c,1.14,1.15 constants.h,1.35,1.36 orders.c,1.36,1.37

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15814

Modified Files:
	cache.c constants.h orders.c 
Log Message:
Fix compiler error:
"orders.c", line 887: a cast does not yield an lvalue

Fix warnings:
"rdp.c", line 550: warning: integer overflow detected: op "<<"
"cache.c", line 42: warning: initializer does not fit or is out of range: -1


Index: cache.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/cache.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** cache.c	27 Jun 2004 17:51:54 -0000	1.14
--- cache.c	27 Jun 2004 18:53:08 -0000	1.15
***************
*** 40,44 ****
  	int i;
  	uint16 cache_idx = 0;
! 	uint32 m = -1;
  	BMPCACHEENTRY *pbce;
  
--- 40,44 ----
  	int i;
  	uint16 cache_idx = 0;
! 	uint32 m = (uint32)-1;
  	BMPCACHEENTRY *pbce;
  

Index: constants.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/constants.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** constants.h	27 Jun 2004 17:51:54 -0000	1.35
--- constants.h	27 Jun 2004 18:53:08 -0000	1.36
***************
*** 243,247 ****
  #define RDP_CAPSET_BMPCACHE2	19
  #define RDP_CAPLEN_BMPCACHE2	0x28
! #define BMPCACHE2_FLAG_PERSIST	(1<<31)
  
  #define RDP_SOURCE		"MSTSC"
--- 243,247 ----
  #define RDP_CAPSET_BMPCACHE2	19
  #define RDP_CAPLEN_BMPCACHE2	0x28
! #define BMPCACHE2_FLAG_PERSIST	((uint32)1<<31)
  
  #define RDP_SOURCE		"MSTSC"

Index: orders.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/orders.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** orders.c	27 Jun 2004 17:51:54 -0000	1.36
--- orders.c	27 Jun 2004 18:53:08 -0000	1.37
***************
*** 880,893 ****
  	 * For very compact orders the length becomes negative
  	 * so a signed integer must be used. */
! 	sint16 length;
  	uint16 flags;
  	uint8 type;
  	uint8 *next_order;
  
! 	in_uint16_le(s, (uint16) length);
  	in_uint16_le(s, flags);		/* used by bmpcache2 */
  	in_uint8(s, type);
  
! 	next_order = s->p + length + 7;
  
  	switch (type)
--- 880,893 ----
  	 * For very compact orders the length becomes negative
  	 * so a signed integer must be used. */
! 	uint16 length;
  	uint16 flags;
  	uint8 type;
  	uint8 *next_order;
  
! 	in_uint16_le(s, length);
  	in_uint16_le(s, flags);		/* used by bmpcache2 */
  	in_uint8(s, type);
  
! 	next_order = s->p + (sint16)length + 7;
  
  	switch (type)



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com