CVS: rdesktop disk.c,1.33,1.34 parallel.c,1.11,1.12 printer.c,1.13,1.14 proto.h,1.67,1.68 rdpdr.c,1.36,1.37 serial.c,1.18,1.19 types.h,1.20,1.21

Jay Sorg <[email protected]>
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]> 
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20041

Modified Files:
	disk.c parallel.c printer.c proto.h rdpdr.c serial.c types.h 
Log Message:
change HANDLE to NTHANDLE to avoid conflics

Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** disk.c	25 Aug 2004 15:42:42 -0000	1.33
--- disk.c	2 Oct 2004 01:30:32 -0000	1.34
***************
*** 170,176 ****
  static NTSTATUS
  disk_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create_disposition,
! 	    uint32 flags_and_attributes, char *filename, HANDLE * phandle)
  {
! 	HANDLE handle;
  	DIR *dirp;
  	int flags, mode;
--- 170,176 ----
  static NTSTATUS
  disk_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create_disposition,
! 	    uint32 flags_and_attributes, char *filename, NTHANDLE * phandle)
  {
! 	NTHANDLE handle;
  	DIR *dirp;
  	int flags, mode;
***************
*** 326,330 ****
  
  static NTSTATUS
! disk_close(HANDLE handle)
  {
  	struct fileinfo *pfinfo;
--- 326,330 ----
  
  static NTSTATUS
! disk_close(NTHANDLE handle)
  {
  	struct fileinfo *pfinfo;
***************
*** 346,350 ****
  
  static NTSTATUS
! disk_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	int n;
--- 346,350 ----
  
  static NTSTATUS
! disk_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	int n;
***************
*** 383,387 ****
  
  static NTSTATUS
! disk_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	int n;
--- 383,387 ----
  
  static NTSTATUS
! disk_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	int n;
***************
*** 410,414 ****
  
  NTSTATUS
! disk_query_information(HANDLE handle, uint32 info_class, STREAM out)
  {
  	uint32 file_attributes, ft_high, ft_low;
--- 410,414 ----
  
  NTSTATUS
! disk_query_information(NTHANDLE handle, uint32 info_class, STREAM out)
  {
  	uint32 file_attributes, ft_high, ft_low;
***************
*** 491,495 ****
  
  NTSTATUS
! disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out)
  {
  	uint32 device_id, length, file_attributes, ft_high, ft_low;
--- 491,495 ----
  
  NTSTATUS
! disk_set_information(NTHANDLE handle, uint32 info_class, STREAM in, STREAM out)
  {
  	uint32 device_id, length, file_attributes, ft_high, ft_low;
***************
*** 745,749 ****
  
  NTSTATUS
! disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out)
  {
  	struct STATFS_T stat_fs;
--- 745,749 ----
  
  NTSTATUS
! disk_query_volume_information(NTHANDLE handle, uint32 info_class, STREAM out)
  {
  	struct STATFS_T stat_fs;
***************
*** 810,814 ****
  
  NTSTATUS
! disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out)
  {
  	uint32 file_attributes, ft_low, ft_high;
--- 810,814 ----
  
  NTSTATUS
! disk_query_directory(NTHANDLE handle, uint32 info_class, char *pattern, STREAM out)
  {
  	uint32 file_attributes, ft_low, ft_high;
***************
*** 920,924 ****
  
  static NTSTATUS
! disk_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	uint32 result;
--- 920,924 ----
  
  static NTSTATUS
! disk_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	uint32 result;

Index: parallel.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/parallel.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** parallel.c	17 Apr 2004 07:12:33 -0000	1.11
--- parallel.c	2 Oct 2004 01:30:32 -0000	1.12
***************
*** 20,24 ****
  
  static PARALLEL_DEVICE *
! get_parallel_data(HANDLE handle)
  {
  	int index;
--- 20,24 ----
  
  static PARALLEL_DEVICE *
! get_parallel_data(NTHANDLE handle)
  {
  	int index;
***************
*** 75,79 ****
  static NTSTATUS
  parallel_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition,
! 		uint32 flags, char *filename, HANDLE * handle)
  {
  	int parallel_fd;
--- 75,79 ----
  static NTSTATUS
  parallel_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition,
! 		uint32 flags, char *filename, NTHANDLE * handle)
  {
  	int parallel_fd;
***************
*** 103,107 ****
  
  static NTSTATUS
! parallel_close(HANDLE handle)
  {
  	int i = get_device_index(handle);
--- 103,107 ----
  
  static NTSTATUS
! parallel_close(NTHANDLE handle)
  {
  	int i = get_device_index(handle);
***************
*** 113,117 ****
  
  static NTSTATUS
! parallel_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	*result = read(handle, data, length);
--- 113,117 ----
  
  static NTSTATUS
! parallel_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	*result = read(handle, data, length);
***************
*** 120,124 ****
  
  static NTSTATUS
! parallel_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	int rc = STATUS_SUCCESS;
--- 120,124 ----
  
  static NTSTATUS
! parallel_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	int rc = STATUS_SUCCESS;
***************
*** 154,158 ****
  
  static NTSTATUS
! parallel_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	if ((request >> 16) != FILE_DEVICE_PARALLEL)
--- 154,158 ----
  
  static NTSTATUS
! parallel_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  	if ((request >> 16) != FILE_DEVICE_PARALLEL)

Index: printer.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/printer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** printer.c	17 Apr 2004 07:28:30 -0000	1.13
--- printer.c	2 Oct 2004 01:30:32 -0000	1.14
***************
*** 4,8 ****
  
  static PRINTER *
! get_printer_data(HANDLE handle)
  {
  	int index;
--- 4,8 ----
  
  static PRINTER *
! get_printer_data(NTHANDLE handle)
  {
  	int index;
***************
*** 84,88 ****
  static NTSTATUS
  printer_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition, uint32 flags,
! 	       char *filename, HANDLE * handle)
  {
  	char cmd[256];
--- 84,88 ----
  static NTSTATUS
  printer_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition, uint32 flags,
! 	       char *filename, NTHANDLE * handle)
  {
  	char cmd[256];
***************
*** 108,112 ****
  
  static NTSTATUS
! printer_close(HANDLE handle)
  {
  	int i = get_device_index(handle);
--- 108,112 ----
  
  static NTSTATUS
! printer_close(NTHANDLE handle)
  {
  	int i = get_device_index(handle);
***************
*** 122,126 ****
  
  static NTSTATUS
! printer_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	PRINTER *pprinter_data;
--- 122,126 ----
  
  static NTSTATUS
! printer_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	PRINTER *pprinter_data;

Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** proto.h	12 Jul 2004 21:07:39 -0000	1.67
--- proto.h	2 Oct 2004 01:30:32 -0000	1.68
***************
*** 29,36 ****
  /* disk.c */
  int disk_enum_devices(uint32 * id, char *optarg);
! NTSTATUS disk_query_information(HANDLE handle, uint32 info_class, STREAM out);
! NTSTATUS disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out);
! NTSTATUS disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out);
! NTSTATUS disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out);
  /* mppc.c */
  int mppc_expand(uint8 * data, uint32 clen, uint8 ctype, uint32 * roff, uint32 * rlen);
--- 29,36 ----
  /* disk.c */
  int disk_enum_devices(uint32 * id, char *optarg);
! NTSTATUS disk_query_information(NTHANDLE handle, uint32 info_class, STREAM out);
! NTSTATUS disk_set_information(NTHANDLE handle, uint32 info_class, STREAM in, STREAM out);
! NTSTATUS disk_query_volume_information(NTHANDLE handle, uint32 info_class, STREAM out);
! NTSTATUS disk_query_directory(NTHANDLE handle, uint32 info_class, char *pattern, STREAM out);
  /* mppc.c */
  int mppc_expand(uint8 * data, uint32 clen, uint8 ctype, uint32 * roff, uint32 * rlen);
***************
*** 109,113 ****
  void rdp_disconnect(void);
  /* rdpdr.c */
! int get_device_index(HANDLE handle);
  void convert_to_unix_filename(char *filename);
  BOOL rdpdr_init(void);
--- 109,113 ----
  void rdp_disconnect(void);
  /* rdpdr.c */
! int get_device_index(NTHANDLE handle);
  void convert_to_unix_filename(char *filename);
  BOOL rdpdr_init(void);
***************
*** 144,148 ****
  /* serial.c */
  int serial_enum_devices(uint32 * id, char *optarg);
! BOOL serial_get_timeout(HANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
  /* tcp.c */
  STREAM tcp_init(uint32 maxlen);
--- 144,148 ----
  /* serial.c */
  int serial_enum_devices(uint32 * id, char *optarg);
! BOOL serial_get_timeout(NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
  /* tcp.c */
  STREAM tcp_init(uint32 maxlen);

Index: rdpdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpdr.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** rdpdr.c	24 Aug 2004 21:37:24 -0000	1.36
--- rdpdr.c	2 Oct 2004 01:30:32 -0000	1.37
***************
*** 66,70 ****
  
  /* If select() times out, the request for the device with handle g_min_timeout_fd is aborted */
! HANDLE g_min_timeout_fd;
  uint32 g_num_devices;
  
--- 66,70 ----
  
  /* If select() times out, the request for the device with handle g_min_timeout_fd is aborted */
! NTHANDLE g_min_timeout_fd;
  uint32 g_num_devices;
  
***************
*** 91,95 ****
  /* Return device_id for a given handle */
  int
! get_device_index(HANDLE handle)
  {
  	int i;
--- 91,95 ----
  /* Return device_id for a given handle */
  int
! get_device_index(NTHANDLE handle)
  {
  	int i;

Index: serial.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/serial.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** serial.c	25 Aug 2004 15:42:42 -0000	1.18
--- serial.c	2 Oct 2004 01:30:32 -0000	1.19
***************
*** 89,93 ****
  
  static SERIAL_DEVICE *
! get_serial_info(HANDLE handle)
  {
  	int index;
--- 89,93 ----
  
  static SERIAL_DEVICE *
! get_serial_info(NTHANDLE handle)
  {
  	int index;
***************
*** 102,106 ****
  
  static BOOL
! get_termios(SERIAL_DEVICE * pser_inf, HANDLE serial_fd)
  {
  	speed_t speed;
--- 102,106 ----
  
  static BOOL
! get_termios(SERIAL_DEVICE * pser_inf, NTHANDLE serial_fd)
  {
  	speed_t speed;
***************
*** 225,229 ****
  
  static void
! set_termios(SERIAL_DEVICE * pser_inf, HANDLE serial_fd)
  {
  	speed_t speed;
--- 225,229 ----
  
  static void
! set_termios(SERIAL_DEVICE * pser_inf, NTHANDLE serial_fd)
  {
  	speed_t speed;
***************
*** 408,414 ****
  static NTSTATUS
  serial_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition,
! 	      uint32 flags_and_attributes, char *filename, HANDLE * handle)
  {
! 	HANDLE serial_fd;
  	SERIAL_DEVICE *pser_inf;
  	struct termios *ptermios;
--- 408,414 ----
  static NTSTATUS
  serial_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition,
! 	      uint32 flags_and_attributes, char *filename, NTHANDLE * handle)
  {
! 	NTHANDLE serial_fd;
  	SERIAL_DEVICE *pser_inf;
  	struct termios *ptermios;
***************
*** 463,467 ****
  
  static NTSTATUS
! serial_close(HANDLE handle)
  {
  	int i = get_device_index(handle);
--- 463,467 ----
  
  static NTSTATUS
! serial_close(NTHANDLE handle)
  {
  	int i = get_device_index(handle);
***************
*** 473,477 ****
  
  static NTSTATUS
! serial_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	long timeout;
--- 473,477 ----
  
  static NTSTATUS
! serial_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	long timeout;
***************
*** 520,524 ****
  
  static NTSTATUS
! serial_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	*result = write(handle, data, length);
--- 520,524 ----
  
  static NTSTATUS
! serial_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
  {
  	*result = write(handle, data, length);
***************
*** 527,531 ****
  
  static NTSTATUS
! serial_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  #if 0
--- 527,531 ----
  
  static NTSTATUS
! serial_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
  {
  #if 0
***************
*** 685,689 ****
  /* Read timeout for a given file descripter (device) when adding fd's to select() */
  BOOL
! serial_get_timeout(HANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout)
  {
  	int index;
--- 685,689 ----
  /* Read timeout for a given file descripter (device) when adding fd's to select() */
  BOOL
! serial_get_timeout(NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout)
  {
  	int index;

Index: types.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/types.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** types.h	27 Jun 2004 17:51:54 -0000	1.20
--- types.h	2 Oct 2004 01:30:32 -0000	1.21
***************
*** 167,171 ****
  /* RDPDR */
  typedef uint32 NTSTATUS;
! typedef uint32 HANDLE;
  
  typedef struct _DEVICE_FNS
--- 167,171 ----
  /* RDPDR */
  typedef uint32 NTSTATUS;
! typedef uint32 NTHANDLE;
  
  typedef struct _DEVICE_FNS
***************
*** 173,183 ****
  	NTSTATUS(*create) (uint32 device, uint32 desired_access, uint32 share_mode,
  			   uint32 create_disposition, uint32 flags_and_attributes, char *filename,
! 			   HANDLE * handle);
! 	NTSTATUS(*close) (HANDLE handle);
! 	NTSTATUS(*read) (HANDLE handle, uint8 * data, uint32 length, uint32 offset,
  			 uint32 * result);
! 	NTSTATUS(*write) (HANDLE handle, uint8 * data, uint32 length, uint32 offset,
  			  uint32 * result);
! 	NTSTATUS(*device_control) (HANDLE handle, uint32 request, STREAM in, STREAM out);
  }
  DEVICE_FNS;
--- 173,183 ----
  	NTSTATUS(*create) (uint32 device, uint32 desired_access, uint32 share_mode,
  			   uint32 create_disposition, uint32 flags_and_attributes, char *filename,
! 			   NTHANDLE * handle);
! 	NTSTATUS(*close) (NTHANDLE handle);
! 	NTSTATUS(*read) (NTHANDLE handle, uint8 * data, uint32 length, uint32 offset,
  			 uint32 * result);
! 	NTSTATUS(*write) (NTHANDLE handle, uint8 * data, uint32 length, uint32 offset,
  			  uint32 * result);
! 	NTSTATUS(*device_control) (NTHANDLE handle, uint32 request, STREAM in, STREAM out);
  }
  DEVICE_FNS;
***************
*** 187,191 ****
  {
  	uint32 device_type;
! 	HANDLE handle;
  	char name[8];
  	char *local_path;
--- 187,191 ----
  {
  	uint32 device_type;
! 	NTHANDLE handle;
  	char name[8];
  	char *local_path;



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.