CVS: rdesktop cache.c,1.15,1.16 rdesktop.c,1.108,1.109 rdp.c,1.65,1.66

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

Modified Files:
	cache.c rdesktop.c rdp.c 
Log Message:
a few fixes for PBC from Jeroen

Index: cache.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/cache.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cache.c	27 Jun 2004 18:53:08 -0000	1.15
--- cache.c	29 Jun 2004 16:22:41 -0000	1.16
***************
*** 33,36 ****
--- 33,37 ----
  /* BITMAP CACHE */
  static BMPCACHEENTRY g_bmpcache[3][0xa00];
+ static HBITMAP g_volatile_bc[3];
  
  /* Remove the least-recently used bitmap from the cache */
***************
*** 76,79 ****
--- 77,84 ----
  		}
  	}
+ 	else if ((cache_id < NUM_ELEMENTS(g_volatile_bc)) && (cache_idx == 0x7fff))
+ 	{
+ 		return g_volatile_bc[cache_id];
+ 	}
  
  	error("get bitmap %d:%d\n", cache_id, cache_idx);
***************
*** 103,106 ****
--- 108,118 ----
  		g_bmpcache[cache_id][cache_idx].usage = stamp;
  	}
+ 	else if ((cache_id < NUM_ELEMENTS(g_volatile_bc)) && (cache_idx == 0x7fff))
+ 	{
+ 		old = g_volatile_bc[cache_id];
+ 		if (old != NULL)
+ 			ui_destroy_bitmap(old);
+ 		g_volatile_bc[cache_id] = bitmap;
+ 	}
  	else
  	{

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** rdesktop.c	27 Jun 2004 17:51:54 -0000	1.108
--- rdesktop.c	29 Jun 2004 16:22:41 -0000	1.109
***************
*** 721,726 ****
  
  	DEBUG(("Disconnecting...\n"));
- 	cache_save_state();
  	rdp_disconnect();
  	ui_deinit();
  
--- 721,726 ----
  
  	DEBUG(("Disconnecting...\n"));
  	rdp_disconnect();
+ 	cache_save_state();
  	ui_deinit();
  

Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** rdp.c	27 Jun 2004 17:51:54 -0000	1.65
--- rdp.c	29 Jun 2004 16:22:41 -0000	1.66
***************
*** 540,544 ****
  	out_uint16_le(s, RDP_CAPLEN_BMPCACHE2);
  
! 	out_uint16_le(s, g_bitmap_cache_persist_enable ? 1 : 0);	/* version */
  
  	out_uint16_le(s, 0x0300);	/* flags? number of caches? */
--- 540,544 ----
  	out_uint16_le(s, RDP_CAPLEN_BMPCACHE2);
  
! 	out_uint16_le(s, g_bitmap_cache_persist_enable ? 2 : 0);	/* version */
  
  	out_uint16_le(s, 0x0300);	/* flags? number of caches? */



-------------------------------------------------------
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