CVS: rdesktop/uiports makefile_xxx, 1.1, 1.2 xxxwin.c, 1.6, 1.7

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

Modified Files:
	makefile_xxx xxxwin.c 
Log Message:
RD_ prefix

Index: makefile_xxx
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/makefile_xxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile_xxx	13 Mar 2005 07:30:31 -0000	1.1
--- makefile_xxx	17 Jan 2007 20:02:45 -0000	1.2
***************
*** 4,8 ****
  CC = gcc
  CFLAGS = -O2 -Wall
! RESTOBJ = ../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
  LDFLAGS = -lcrypto
  
--- 4,8 ----
  CC = gcc
  CFLAGS = -O2 -Wall
! RESTOBJ = ../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 ../ssl.o
  LDFLAGS = -lcrypto
  

Index: xxxwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/xxxwin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xxxwin.c	23 Mar 2006 01:32:49 -0000	1.6
--- xxxwin.c	17 Jan 2007 20:02:45 -0000	1.7
***************
*** 2,6 ****
     rdesktop: A Remote Desktop Protocol client.
     User interface services - Generic
!    Copyright (C) Jay Sorg 2004-2006
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     rdesktop: A Remote Desktop Protocol client.
     User interface services - Generic
!    Copyright (C) Jay Sorg 2004-2007
  
     This program is free software; you can redistribute it and/or modify
***************
*** 11,14 ****
--- 11,15 ----
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
+    
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
***************
*** 42,46 ****
  int g_keyboard_functionkeys = 0xc; /* Defaults to US keyboard layout */
  /* Session Directory redirection */
! BOOL g_redirect = False;
  char g_redirect_server[64];
  char g_redirect_domain[16];
--- 43,48 ----
  int g_keyboard_functionkeys = 0xc; /* Defaults to US keyboard layout */
  /* Session Directory redirection */
! RD_BOOL g_redirect = False;
! RD_BOOL g_numlock_sync = False;
  char g_redirect_server[64];
  char g_redirect_domain[16];
***************
*** 49,52 ****
--- 51,55 ----
  char g_redirect_cookie[128];
  uint32 g_redirect_flags = 0;
+ char g_codepage[16] = "";
  
  /*****************************************************************************/
***************
*** 104,108 ****
  
  /*****************************************************************************/
! HBITMAP ui_create_bitmap(int width, int height, uint8* data)
  {
    return 0;
--- 107,111 ----
  
  /*****************************************************************************/
! RD_HBITMAP ui_create_bitmap(int width, int height, uint8* data)
  {
    return 0;
***************
*** 126,130 ****
  /*****************************************************************************/
  void ui_triblt(uint8 opcode, int x, int y, int cx, int cy,
!                HBITMAP src, int srcx, int srcy,
                 BRUSH* brush, int bgcolour, int fgcolour)
  {
--- 129,133 ----
  /*****************************************************************************/
  void ui_triblt(uint8 opcode, int x, int y, int cx, int cy,
!                RD_HBITMAP src, int srcx, int srcy,
                 BRUSH* brush, int bgcolour, int fgcolour)
  {
***************
*** 133,137 ****
  /*****************************************************************************/
  void ui_memblt(uint8 opcode, int x, int y, int cx, int cy,
!                HBITMAP src, int srcx, int srcy)
  {
  }
--- 136,140 ----
  /*****************************************************************************/
  void ui_memblt(uint8 opcode, int x, int y, int cx, int cy,
!                RD_HBITMAP src, int srcx, int srcy)
  {
  }
***************
*** 186,197 ****
  
  /*****************************************************************************/
! void ui_set_cursor(HCURSOR cursor)
  {
  }
  
  /*****************************************************************************/
! HCURSOR ui_create_cursor(unsigned int x, unsigned int y,
!                          int width, int height,
!                          uint8* andmask, uint8* xormask)
  {
    return 0;
--- 189,200 ----
  
  /*****************************************************************************/
! void ui_set_cursor(RD_HCURSOR cursor)
  {
  }
  
  /*****************************************************************************/
! RD_HCURSOR ui_create_cursor(unsigned int x, unsigned int y,
!                             int width, int height,
!                             uint8* andmask, uint8* xormask)
  {
    return 0;
***************
*** 226,230 ****
  
  /*****************************************************************************/
! void ui_polygon(uint8 opcode, uint8 fillmode, POINT * point, int npoints,
                  BRUSH * brush, int bgcolour, int fgcolour)
  {
--- 229,233 ----
  
  /*****************************************************************************/
! void ui_polygon(uint8 opcode, uint8 fillmode, RD_POINT * point, int npoints,
                  BRUSH * brush, int bgcolour, int fgcolour)
  {
***************
*** 233,237 ****
  /*****************************************************************************/
  /* todo, use qt function for this (QPainter::drawPolyline) */
! void ui_polyline(uint8 opcode, POINT * points, int npoints, PEN * pen)
  {
    int i, x, y, dx, dy;
--- 236,240 ----
  /*****************************************************************************/
  /* todo, use qt function for this (QPainter::drawPolyline) */
! void ui_polyline(uint8 opcode, RD_POINT * points, int npoints, PEN * pen)
  {
    int i, x, y, dx, dy;
***************
*** 318,322 ****
  
  /*****************************************************************************/
! BOOL rd_pstcache_mkdir(void)
  {
    return 0;
--- 321,325 ----
  
  /*****************************************************************************/
! RD_BOOL rd_pstcache_mkdir(void)
  {
    return 0;
***************
*** 354,358 ****
  
  /*****************************************************************************/
! BOOL rd_lock_file(int fd, int start, int len)
  {
    return False;
--- 357,361 ----
  
  /*****************************************************************************/
! RD_BOOL rd_lock_file(int fd, int start, int len)
  {
    return False;


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV