From dacdb9c4c695aa269e689acbe3cf61b2b9bf70aa Mon Sep 17 00:00:00 2001
From: Andreas Mohr <amohr@codeweavers.com>
Date: Wed, 14 Feb 2001 00:29:16 +0000
Subject: [PATCH] Cosmetics.

---
 dlls/kernel/comm.c    |  4 ++--
 dlls/shell32/shres.rc |  2 +-
 dlls/winmm/mmsystem.c |  4 ++--
 dlls/winsock/socket.c | 12 ++++++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index 76606e5ceca..3231597dbe7 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -522,7 +522,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
 			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 @@ INT16 WINAPI GetCommError16(INT16 cid,LPCOMSTAT16 lpStat)
 		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);
 	}
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index b7b293b0284..7d3bb7075c8 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -1,5 +1,5 @@
 /*
- * Top level resource file for Common Dialogs
+ * Top level resource file for shell stuff
  *
  */
 
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index 6a77e53280a..2ad670b03a6 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -3838,7 +3838,7 @@ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID,
     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 @@ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID,
     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, 
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index ee6ee0736d0..ba4ea52e8cf 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -2588,15 +2588,19 @@ WIN_servent* WINAPI WSOCK32_getservbyport(INT port, const char *proto)
  */
 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;
 }