CVS: rdesktop scard.h,1.3,1.4 scard.c,1.16,1.17

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

Modified Files:
	scard.h scard.c 
Log Message:
RD_ prefix


Index: scard.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scard.h	1 Nov 2006 21:26:55 -0000	1.3
--- scard.h	4 Jan 2007 14:38:48 -0000	1.4
***************
*** 152,156 ****
  	uint32 device;
  	uint32 id;
! 	NTHANDLE handle;
  	uint32 request;
  	STREAM in;
--- 152,156 ----
  	uint32 device;
  	uint32 id;
! 	RD_NTHANDLE handle;
  	uint32 request;
  	STREAM in;

Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** scard.c	4 Nov 2006 20:02:42 -0000	1.16
--- scard.c	4 Jan 2007 14:38:48 -0000	1.17
***************
*** 80,106 ****
  #ifndef MAKE_PROTO
  
! static NTSTATUS
  scard_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create_disposition,
! 	     uint32 flags_and_attributes, char *filename, NTHANDLE * phandle)
  {
! 	return STATUS_SUCCESS;
  }
  
! static NTSTATUS
! scard_close(NTHANDLE handle)
  {
! 	return STATUS_SUCCESS;
  }
  
! static NTSTATUS
! scard_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
! 	return STATUS_SUCCESS;
  }
  
! static NTSTATUS
! scard_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
! 	return STATUS_SUCCESS;
  }
  #endif /* MAKE_PROTO */
--- 80,106 ----
  #ifndef MAKE_PROTO
  
! static RD_NTSTATUS
  scard_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create_disposition,
! 	     uint32 flags_and_attributes, char *filename, RD_NTHANDLE * phandle)
  {
! 	return RD_STATUS_SUCCESS;
  }
  
! static RD_NTSTATUS
! scard_close(RD_NTHANDLE handle)
  {
! 	return RD_STATUS_SUCCESS;
  }
  
! static RD_NTSTATUS
! scard_read(RD_NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
! 	return RD_STATUS_SUCCESS;
  }
  
! static RD_NTSTATUS
! scard_write(RD_NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
! 	return RD_STATUS_SUCCESS;
  }
  #endif /* MAKE_PROTO */
***************
*** 2168,2173 ****
  
  
! static NTSTATUS
! scard_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	SERVER_DWORD Result = 0x00000000;
--- 2168,2173 ----
  
  
! static RD_NTSTATUS
! scard_device_control(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	SERVER_DWORD Result = 0x00000000;
***************
*** 2369,2373 ****
  	DEBUG_SCARD(("--------------------------------\n"));
  #endif
! 	return STATUS_SUCCESS;
  }
  
--- 2369,2373 ----
  	DEBUG_SCARD(("--------------------------------\n"));
  #endif
! 	return RD_STATUS_SUCCESS;
  }
  
***************
*** 2424,2428 ****
  
  static PSCThreadData
! SC_addToQueue(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	PMEM_HANDLE lcHandle = NULL;
--- 2424,2428 ----
  
  static PSCThreadData
! SC_addToQueue(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	PMEM_HANDLE lcHandle = NULL;
***************
*** 2614,2624 ****
  }
  
! static NTSTATUS
! thread_wrapper(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	if (SC_addToQueue(handle, request, in, out))
! 		return STATUS_PENDING | 0xC0000000;
  	else
! 		return STATUS_NO_SUCH_FILE;
  }
  
--- 2614,2624 ----
  }
  
! static RD_NTSTATUS
! thread_wrapper(RD_NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	if (SC_addToQueue(handle, request, in, out))
! 		return RD_STATUS_PENDING | 0xC0000000;
  	else
! 		return RD_STATUS_NO_SUCH_FILE;
  }
  


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