CVS: rdesktop/uiports qtrdesktopbuild.sh,1.1,1.2 qtwin.cpp,1.1,1.2 xxxrdesktopbuild.sh,1.1,1.2 xxxwin.c,1.1,1.2

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

Modified Files:
	qtrdesktopbuild.sh qtwin.cpp xxxrdesktopbuild.sh xxxwin.c 
Log Message:
added new functions and files needed by persistant bitmap caching

Index: qtrdesktopbuild.sh
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtrdesktopbuild.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** qtrdesktopbuild.sh	16 Jun 2004 03:26:05 -0000	1.1
--- qtrdesktopbuild.sh	27 Jun 2004 19:08:34 -0000	1.2
***************
*** 1,28 ****
  #!/bin/sh
! echo deleting
  rm qtrdesktop
  rm *.o
  rm moc_*
! echo compiling
! # rdesktop files
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../tcp.c -o tcp.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../iso.c -o iso.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../mcs.c -o mcs.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../secure.c -o secure.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../rdp.c -o rdp.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../rdp5.c -o rdp5.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../orders.c -o orders.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../cache.c -o cache.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../mppc.c -o mppc.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../licence.c -o licence.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../bitmap.c -o bitmap.o
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -c ../channels.c -o channels.o
  # qt files
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -I/usr/local/qt/include -c qtwin.cpp -o qtwin.o
  # moc stuff
- echo doing moc
  /usr/local/qt/bin/moc qtwin.h > moc_qtwin.cpp
! g++ -DWITH_OPENSSL -DL_ENDIAN -O2 -Wall -I/usr/local/qt/include -c moc_qtwin.cpp -o moc_qtwin.o
! echo linking
! g++ -o qtrdesktop moc_qtwin.o qtwin.o tcp.o iso.o mcs.o secure.o rdp.o rdp5.o orders.o cache.o mppc.o licence.o bitmap.o channels.o -lcrypto -L/usr/local/qt/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
! echo done
--- 1,37 ----
  #!/bin/sh
! # qtrdesktop build script
! 
  rm qtrdesktop
  rm *.o
  rm moc_*
! 
! cc="g++"
! cflags="-DWITH_OPENSSL -DL_ENDIAN -O2 -Wall"
! # uncomment the following line to turn on debug
! #cflags=$cflags+" -DWITH_DEBUG"
! lflags="-lcrypto"
! 
! # rdesktop core files
! $cc $cflags -c ../tcp.c -o tcp.o
! $cc $cflags -c ../iso.c -o iso.o
! $cc $cflags -c ../mcs.c -o mcs.o
! $cc $cflags -c ../secure.c -o secure.o
! $cc $cflags -c ../rdp.c -o rdp.o
! $cc $cflags -c ../rdp5.c -o rdp5.o
! $cc $cflags -c ../orders.c -o orders.o
! $cc $cflags -c ../cache.c -o cache.o
! $cc $cflags -c ../mppc.c -o mppc.o
! $cc $cflags -c ../licence.c -o licence.o
! $cc $cflags -c ../bitmap.c -o bitmap.o
! $cc $cflags -c ../channels.c -o channels.o
! $cc $cflags -c ../pstcache.c -o pstcache.o
! 
  # qt files
! $cc $cflags -I/usr/local/qt/include -c qtwin.cpp -o qtwin.o
! 
  # moc stuff
  /usr/local/qt/bin/moc qtwin.h > moc_qtwin.cpp
! 
! $cc $cflags -I/usr/local/qt/include -c moc_qtwin.cpp -o moc_qtwin.o
! 
! $cc -o qtrdesktop moc_qtwin.o qtwin.o tcp.o iso.o mcs.o secure.o rdp.o rdp5.o orders.o cache.o mppc.o licence.o bitmap.o channels.o pstcache.o -lcrypto -L/usr/local/qt/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm

Index: qtwin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtwin.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** qtwin.cpp	16 Jun 2004 03:27:15 -0000	1.1
--- qtwin.cpp	27 Jun 2004 19:08:35 -0000	1.2
***************
*** 51,54 ****
--- 51,56 ----
  int g_desktop_save =1;
  int g_bitmap_cache = 1;
+ int g_bitmap_cache_persist_enable = False;
+ int g_bitmap_cache_precache = True;
  int g_bitmap_compression = 1;
  int g_rdp5_performanceflags = 0;
***************
*** 1273,1276 ****
--- 1275,1319 ----
  }
  
+ BOOL rd_pstcache_mkdir(void)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ int rd_open_file(char *filename)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ void rd_close_file(int fd)
+ {
+   return;
+ }
+ 
+ /*****************************************************************************/
+ int rd_read_file(int fd, void *ptr, int len)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ int rd_write_file(int fd, void* ptr, int len)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ int rd_lseek_file(int fd, int offset)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ BOOL rd_lock_file(int fd, int start, int len)
+ {
+   return False;
+ }
+ 
  /*****************************************************************************/
  void get_username_and_hostname(void)

Index: xxxrdesktopbuild.sh
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/xxxrdesktopbuild.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xxxrdesktopbuild.sh	19 Jun 2004 00:08:42 -0000	1.1
--- xxxrdesktopbuild.sh	27 Jun 2004 19:08:35 -0000	1.2
***************
*** 22,28 ****
  $cc $cflags -c ../bitmap.c -o bitmap.o
  $cc $cflags -c ../channels.c -o channels.o
  
  # dumby ui file
  $cc $cflags -c xxxwin.c -o xxxwin.o
  
! $cc $lflags -o xxxrdesktop xxxwin.o tcp.o iso.o mcs.o secure.o rdp.o rdp5.o orders.o cache.o mppc.o licence.o bitmap.o channels.o
--- 22,29 ----
  $cc $cflags -c ../bitmap.c -o bitmap.o
  $cc $cflags -c ../channels.c -o channels.o
+ $cc $cflags -c ../pstcache.c -o pstcache.o
  
  # dumby ui file
  $cc $cflags -c xxxwin.c -o xxxwin.o
  
! $cc $lflags -o xxxrdesktop xxxwin.o tcp.o iso.o mcs.o secure.o rdp.o rdp5.o orders.o cache.o mppc.o licence.o bitmap.o channels.o pstcache.o

Index: xxxwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/xxxwin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xxxwin.c	19 Jun 2004 00:09:30 -0000	1.1
--- xxxwin.c	27 Jun 2004 19:08:35 -0000	1.2
***************
*** 12,15 ****
--- 12,17 ----
  int g_desktop_save =1;
  int g_bitmap_cache = 1;
+ int g_bitmap_cache_persist_enable = False;
+ int g_bitmap_cache_precache = True;
  int g_bitmap_compression = 1;
  int g_rdp5_performanceflags = 0;
***************
*** 241,244 ****
--- 243,288 ----
  
  /*****************************************************************************/
+ BOOL rd_pstcache_mkdir(void)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ int rd_open_file(char *filename)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ void rd_close_file(int fd)
+ {
+   return;
+ }
+ 
+ /*****************************************************************************/
+ int rd_read_file(int fd, void *ptr, int len)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ int rd_write_file(int fd, void* ptr, int len)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ int rd_lseek_file(int fd, int offset)
+ {
+   return 0;
+ }
+ 
+ /*****************************************************************************/
+ BOOL rd_lock_file(int fd, int start, int len)
+ {
+   return False;
+ }
+ 
+ /*****************************************************************************/
  int main(int c, char** p)
  {



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