cleanup patch

[Andreas Mohr]

Hi all,

trying to clean my tree.

- fix broken WSOCK32_gethostname() TRACEing
- give both --winver nt40 and win31 for VxD warning, as some programs
  work with win31

Andreas Mohr
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at wine.codeweavers.com:/home/cvs/wine
Index: dlls/kernel/comm.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/kernel/comm.c,v
retrieving revision 1.13
diff -u -r1.13 comm.c
--- dlls/kernel/comm.c	2001/02/12 03:49:57	1.13
+++ dlls/kernel/comm.c	2001/02/13 19:44:03
@@ -522,7 +522,7 @@
 			COM[port].xmit = -1;
 			/* allocate buffers */
 			COM[port].ibuf_size = cbInQueue;
-			COM[port].ibuf_head = COM[port].ibuf_tail= 0;
+			COM[port].ibuf_head = COM[port].ibuf_tail = 0;
 			COM[port].obuf_size = cbOutQueue;
 			COM[port].obuf_head = COM[port].obuf_tail = 0;
 
@@ -807,7 +807,7 @@
 		lpStat->cbOutQue = comm_outbuf(ptr);
 		lpStat->cbInQue = comm_inbuf(ptr);
 
-    		TRACE("cid %d, error %d, lpStat %d %d %d stol %x\n",
+    		TRACE("cid %d, error %d, stat %d in %d out %d, stol %x\n",
 			     cid, ptr->commerror, lpStat->status, lpStat->cbInQue, 
 			     lpStat->cbOutQue, *stol);
 	}
Index: dlls/shell32/shres.rc
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shres.rc,v
retrieving revision 1.17
diff -u -r1.17 shres.rc
--- dlls/shell32/shres.rc	2000/10/31 01:00:00	1.17
+++ dlls/shell32/shres.rc	2001/02/13 19:44:03
@@ -1,5 +1,5 @@
 /*
- * Top level resource file for Common Dialogs
+ * Top level resource file for shell stuff
  *
  */
 
Index: dlls/winmm/mmsystem.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/mmsystem.c,v
retrieving revision 1.34
diff -u -r1.34 mmsystem.c
--- dlls/winmm/mmsystem.c	2001/02/12 03:51:05	1.34
+++ dlls/winmm/mmsystem.c	2001/02/13 19:44:03
@@ -3838,7 +3838,7 @@
     HWAVEOUT		hWaveOut;
     UINT		ret;
 
-    /* since layout of WAVEOFORMATEX is the same for 16/32 bits, we directly
+    /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly
      * call the 32 bit version
      */
     ret = MMSYSTEM_waveOpen(&hWaveOut, uDeviceID, MMDRV_WAVEOUT, lpFormat, 
@@ -4479,7 +4479,7 @@
     HWAVEIN		hWaveIn;
     UINT		ret;
 
-    /* since layout of WAVEOFORMATEX is the same for 16/32 bits, we directly
+    /* since layout of WAVEFORMATEX is the same for 16/32 bits, we directly
      * call the 32 bit version
      */
     ret = MMSYSTEM_waveOpen(&hWaveIn, uDeviceID, MMDRV_WAVEIN, lpFormat, 
Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.43
diff -u -r1.43 socket.c
--- dlls/winsock/socket.c	2001/01/17 20:19:14	1.43
+++ dlls/winsock/socket.c	2001/02/13 19:44:03
@@ -2588,15 +2588,19 @@
  */
 INT WINAPI WSOCK32_gethostname(char *name, INT namelen)
 {
-    LPWSINFO              pwsi = WINSOCK_GetIData();
+    LPWSINFO pwsi = WINSOCK_GetIData();
 
-    TRACE("(%08x): name %s, len %d\n",
-                          (unsigned)pwsi, (name)?name:NULL_STRING, namelen);
+    TRACE("(%08x): name %p, len %d\n", (unsigned)pwsi, name, namelen);
     if( pwsi )
     {
-	if (gethostname(name, namelen) == 0) return 0;
+	if (gethostname(name, namelen) == 0)
+	{
+	    TRACE("<- '%s'\n", name);
+	    return 0;
+	}
 	SetLastError((errno == EINVAL) ? WSAEFAULT : wsaErrno());
     }
+    TRACE("<- ERROR !\n");
     return SOCKET_ERROR;
 }
 
Index: win32/device.c
===================================================================
RCS file: /home/cvs/wine/wine/win32/device.c,v
retrieving revision 1.44
diff -u -r1.44 device.c
--- win32/device.c	2001/01/05 04:08:09	1.44
+++ win32/device.c	2001/02/13 19:44:03
@@ -329,7 +329,7 @@
         if (!strncasecmp( info->name, filename, strlen(info->name) ))
             return FILE_CreateDevice( info->id | 0x10000, access, sa );
 
-    FIXME( "Unknown VxD %s. Try --winver nt40 !\n", filename);
+    FIXME( "Unknown VxD %s. Try --winver nt40 or win31 !\n", filename);
     SetLastError( ERROR_FILE_NOT_FOUND );
     return 0;
 }