Index: trunk/src/dsound/OS23DBuffer.cpp
===================================================================
--- trunk/src/dsound/OS23DBuffer.cpp	(revision 3924)
+++ trunk/src/dsound/OS23DBuffer.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: OS23DBuffer.cpp,v 1.2 2000-08-02 15:48:26 bird Exp $ */
 /*
  * DirectSound OS2IDirectSound3DBuffer class
Index: trunk/src/dsound/OS23DListener.cpp
===================================================================
--- trunk/src/dsound/OS23DListener.cpp	(revision 3924)
+++ trunk/src/dsound/OS23DListener.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: OS23DListener.cpp,v 1.2 2000-08-02 15:48:26 bird Exp $ */
 /*
  * DirectSound OS2IDirectSound3DListener class
Index: trunk/src/dsound/OS2NOTIFY.CPP
===================================================================
--- trunk/src/dsound/OS2NOTIFY.CPP	(revision 3924)
+++ trunk/src/dsound/OS2NOTIFY.CPP	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: OS2NOTIFY.CPP,v 1.2 2000-08-02 15:48:26 bird Exp $ */
 /*
  * DirectSound DirectSoundNotify class
Index: trunk/src/dsound/OS2PrimBuff.cpp
===================================================================
--- trunk/src/dsound/OS2PrimBuff.cpp	(revision 3924)
+++ trunk/src/dsound/OS2PrimBuff.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: OS2PrimBuff.cpp,v 1.4 2000-08-02 15:48:26 bird Exp $ */
 /*
  *  DirectSound Primary Buffer
@@ -17,9 +18,9 @@
       that the Win32 program can write to. The GetPosition function will
       determine what buffer is being played, and return the offset to the
-      end of this buffer. 
+      end of this buffer.
 
       The Lock function will call the GetCurrentPosition function to determine
       where the end of the currently playing buffer is and allow the Win32
-      program to lock between that location and 15ms from there 
+      program to lock between that location and 15ms from there
       (15ms should be past the next buffer).
 
@@ -524,5 +525,5 @@
 HRESULT __stdcall PrimBufUnlock(THIS_ LPVOID,DWORD,LPVOID,DWORD )
 {
-   // I don't think we really need any code here.. 
+   // I don't think we really need any code here..
 
    dprintf(("DSOUND-PrimBuff: Unlock"));
Index: trunk/src/dsound/dart.cpp
===================================================================
--- trunk/src/dsound/dart.cpp	(revision 3924)
+++ trunk/src/dsound/dart.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: dart.cpp,v 1.3 2000-08-02 15:48:26 bird Exp $ */
 /*
  *  Dart Interface..
Index: trunk/src/dsound/dsmixer.cpp
===================================================================
--- trunk/src/dsound/dsmixer.cpp	(revision 3924)
+++ trunk/src/dsound/dsmixer.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: dsmixer.cpp,v 1.3 2000-08-02 15:48:27 bird Exp $ */
 /*
  * DirectSound Software Mixer
Index: trunk/src/dsound/genvol.c
===================================================================
--- trunk/src/dsound/genvol.c	(revision 3924)
+++ trunk/src/dsound/genvol.c	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: genvol.c,v 1.2 2000-08-02 15:48:27 bird Exp $ */
 
 /* A quick-n'-dirty DirectSound volume conversion table generator */
Index: trunk/src/msacm32/driver.cpp
===================================================================
--- trunk/src/msacm32/driver.cpp	(revision 3924)
+++ trunk/src/msacm32/driver.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: driver.cpp,v 1.3 2000-08-02 15:49:31 bird Exp $ */
 /*
  *      MSACM32 library
@@ -21,5 +22,5 @@
 
 DEFAULT_DEBUG_CHANNEL(msacm)
-	
+
 /***********************************************************************
  *           acmDriverAddA (MSACM32.2)
@@ -30,24 +31,24 @@
     if (!phadid)
 	return MMSYSERR_INVALPARAM;
-    
+
     /* Check if any unknown flags */
-    if (fdwAdd & 
+    if (fdwAdd &
 	~(ACM_DRIVERADDF_FUNCTION|ACM_DRIVERADDF_NOTIFYHWND|
 	  ACM_DRIVERADDF_GLOBAL))
 	return MMSYSERR_INVALFLAG;
-    
+
     /* Check if any incompatible flags */
-    if ((fdwAdd & ACM_DRIVERADDF_FUNCTION) && 
+    if ((fdwAdd & ACM_DRIVERADDF_FUNCTION) &&
 	(fdwAdd & ACM_DRIVERADDF_NOTIFYHWND))
 	return MMSYSERR_INVALFLAG;
-    
-    /* FIXME: in fact, should GetModuleFileName(hinstModule) and do a 
+
+    /* FIXME: in fact, should GetModuleFileName(hinstModule) and do a
      * LoadDriver on it, to be sure we can call SendDriverMessage on the
      * hDrvr handle.
      */
     *phadid = (HACMDRIVERID) MSACM_RegisterDriver(NULL, NULL, hinstModule);
-    
+
     /* FIXME: lParam, dwPriority and fdwAdd ignored */
-    
+
     return MMSYSERR_NOERROR;
 }
@@ -63,5 +64,5 @@
     dprintf(("(%p, 0x%08x, %ld, %ld, %ld): stub\n",
 	  phadid, hinstModule, lParam, dwPriority, fdwAdd));
-    
+
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
     return MMSYSERR_ERROR;
@@ -75,8 +76,8 @@
     PWINE_ACMDRIVER  p;
     PWINE_ACMDRIVER* tp;
-    
+
     if (fdwClose)
 	return MMSYSERR_INVALFLAG;
-    
+
     p = MSACM_GetDriver(had);
     if (!p)
@@ -89,10 +90,10 @@
 	}
     }
-    
+
     if (p->hDrvr && !p->obj.pACMDriverID->pACMDriverList)
 	CloseDriver(p->hDrvr, 0, 0);
-    
+
     HeapFree(MSACM_hHeap, 0, p);
-    
+
     return MMSYSERR_NOERROR;
 }
@@ -105,18 +106,18 @@
     MMRESULT mmr;
     ACMDRIVERDETAILSW	addw;
-    
+
     addw.cbStruct = sizeof(addw);
     mmr = acmDriverDetailsW(hadid, &addw, fdwDetails);
     if (mmr == 0) {
-	padd->fccType = addw.fccType; 
-	padd->fccComp = addw.fccComp; 
-	padd->wMid = addw.wMid; 
-	padd->wPid = addw.wPid; 
-	padd->vdwACM = addw.vdwACM; 
-	padd->vdwDriver = addw.vdwDriver; 
-	padd->fdwSupport = addw.fdwSupport; 
-	padd->cFormatTags = addw.cFormatTags; 
-	padd->cFilterTags = addw.cFilterTags; 
-	padd->hicon = addw.hicon; 
+	padd->fccType = addw.fccType;
+	padd->fccComp = addw.fccComp;
+	padd->wMid = addw.wMid;
+	padd->wPid = addw.wPid;
+	padd->vdwACM = addw.vdwACM;
+	padd->vdwDriver = addw.vdwDriver;
+	padd->fdwSupport = addw.fdwSupport;
+	padd->cFormatTags = addw.cFormatTags;
+	padd->cFilterTags = addw.cFilterTags;
+	padd->hicon = addw.hicon;
 	lstrcpyWtoA(padd->szShortName, addw.szShortName);
 	lstrcpyWtoA(padd->szLongName, addw.szLongName);
@@ -135,15 +136,15 @@
     HACMDRIVER acmDrvr;
     MMRESULT mmr;
-    
+
     if (fdwDetails)
 	return MMSYSERR_INVALFLAG;
-    
+
     mmr = acmDriverOpen(&acmDrvr, hadid, 0);
     if (mmr == 0) {
 	mmr = (MMRESULT)acmDriverMessage(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM) padd,  0);
-    
+
 	acmDriverClose(acmDrvr, 0);
     }
-    
+
     return mmr;
 }
@@ -160,9 +161,9 @@
 	return MMSYSERR_INVALPARAM;
     }
-    
+
     if (fdwEnum && ~(ACM_DRIVERENUMF_NOLOCAL|ACM_DRIVERENUMF_DISABLED)) {
 	return MMSYSERR_INVALFLAG;
     }
-    
+
     for (p = MSACM_pFirstACMDriverID; p; p = p->pNextACMDriverID) {
 	fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
@@ -175,5 +176,5 @@
 	(*fnCallback)((HACMDRIVERID) p, dwInstance, fdwSupport);
     }
-    
+
     return MMSYSERR_NOERROR;
 }
@@ -185,17 +186,17 @@
 {
     PWINE_ACMOBJ pao;
-    
+
     pao = MSACM_GetObj(hao);
     if (!pao)
 	return MMSYSERR_INVALHANDLE;
-    
+
     if (!phadid)
 	return MMSYSERR_INVALPARAM;
-    
+
     if (fdwDriverID)
 	return MMSYSERR_INVALFLAG;
-    
+
     *phadid = (HACMDRIVERID) pao->pACMDriverID;
-    
+
     return MMSYSERR_NOERROR;
 }
@@ -211,10 +212,10 @@
     if (!pad)
 	return MMSYSERR_INVALPARAM;
-    
+
     /* FIXME: Check if uMsg legal */
-    
+
     if (!SendDriverMessage(pad->hDrvr, uMsg, lParam1, lParam2))
 	return MMSYSERR_NOTSUPPORTED;
-    
+
     return MMSYSERR_NOERROR;
 }
@@ -233,27 +234,27 @@
     if (!phad)
 	return MMSYSERR_INVALPARAM;
-    
-    padid = MSACM_GetDriverID(hadid); 
+
+    padid = MSACM_GetDriverID(hadid);
     if (!padid)
 	return MMSYSERR_INVALHANDLE;
-    
+
     if (fdwOpen)
 	return MMSYSERR_INVALFLAG;
-    
+
     pad = PWINE_ACMDRIVER(HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVER)));
     if (!pad) return MMSYSERR_NOMEM;
 
     pad->obj.pACMDriverID = padid;
-    
+
     if (!padid->hInstModule)
 	pad->hDrvr = OpenDriverA(padid->pszDriverAlias, "drivers32", 0);
     else
 	pad->hDrvr = padid->hInstModule;
-    
+
     if (!pad->hDrvr) {
 	HeapFree(MSACM_hHeap, 0, pad);
 	return MMSYSERR_ERROR;
     }
-    
+
 //    pad->pfnDriverProc = GetProcAddress(pad->hDrvr, "DriverProc");
 
@@ -264,5 +265,5 @@
     /* FIXME: Create a WINE_ACMDRIVER32 */
     *phad = (HACMDRIVER)pad;
-    
+
 //    return MMSYSERR_NOERROR;
     return MMSYSERR_ERROR;
@@ -281,26 +282,26 @@
     HKEY hPriorityKey;
     DWORD dwPriorityCounter;
-    
+
     padid = MSACM_GetDriverID(hadid);
     if (!padid)
 	return MMSYSERR_INVALHANDLE;
-    
+
     /* Check for unknown flags */
-    if (fdwPriority & 
+    if (fdwPriority &
 	~(ACM_DRIVERPRIORITYF_ENABLE|ACM_DRIVERPRIORITYF_DISABLE|
 	  ACM_DRIVERPRIORITYF_BEGIN|ACM_DRIVERPRIORITYF_END))
 	return MMSYSERR_INVALFLAG;
-    
+
     /* Check for incompatible flags */
     if ((fdwPriority & ACM_DRIVERPRIORITYF_ENABLE) &&
 	(fdwPriority & ACM_DRIVERPRIORITYF_DISABLE))
 	return MMSYSERR_INVALFLAG;
-    
+
     /* Check for incompatible flags */
     if ((fdwPriority & ACM_DRIVERPRIORITYF_BEGIN) &&
 	(fdwPriority & ACM_DRIVERPRIORITYF_END))
 	return MMSYSERR_INVALFLAG;
-    
-    lError = RegOpenKeyA(HKEY_CURRENT_USER, 
+
+    lError = RegOpenKeyA(HKEY_CURRENT_USER,
 			 "Software\\Microsoft\\Multimedia\\"
 			 "Audio Compression Manager\\Priority v4.00",
@@ -310,5 +311,5 @@
     if (lError != ERROR_SUCCESS)
 	return MMSYSERR_ERROR;
-    
+
     for (dwPriorityCounter = 1; ; dwPriorityCounter++)	{
 	wsnprintfA(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
@@ -316,12 +317,12 @@
 	if (lError != ERROR_SUCCESS)
 	    break;
-	
-	dprintf(("(0x%08x, %ld, %ld): stub (partial)\n", 
+
+	dprintf(("(0x%08x, %ld, %ld): stub (partial)\n",
 	      hadid, dwPriority, fdwPriority));
 	break;
     }
-    
+
     RegCloseKey(hPriorityKey);
-    
+
     return MMSYSERR_ERROR;
 }
@@ -333,15 +334,15 @@
 {
     PWINE_ACMDRIVERID padid;
-    
+
     padid = MSACM_GetDriverID(hadid);
     if (!padid)
 	return MMSYSERR_INVALHANDLE;
-    
+
     if (fdwRemove)
 	return MMSYSERR_INVALFLAG;
-    
+
     MSACM_UnregisterDriver(padid);
-    
-    return MMSYSERR_NOERROR;
-}
-
+
+    return MMSYSERR_NOERROR;
+}
+
Index: trunk/src/msacm32/filter.cpp
===================================================================
--- trunk/src/msacm32/filter.cpp	(revision 3924)
+++ trunk/src/msacm32/filter.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: filter.cpp,v 1.2 2000-08-02 15:49:31 bird Exp $ */
 /*
  *      MSACM32 library
@@ -72,5 +73,5 @@
  */
 MMRESULT WINAPI acmFilterEnumA(
-  HACMDRIVER had, PACMFILTERDETAILSA pafd, 
+  HACMDRIVER had, PACMFILTERDETAILSA pafd,
   ACMFILTERENUMCBA fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
@@ -86,5 +87,5 @@
  */
 MMRESULT WINAPI acmFilterEnumW(
-  HACMDRIVER had, PACMFILTERDETAILSW pafd, 
+  HACMDRIVER had, PACMFILTERDETAILSW pafd,
   ACMFILTERENUMCBW fnCallback, DWORD dwInstance, DWORD fdwEnum)
 {
@@ -102,5 +103,5 @@
   HACMDRIVER had, PACMFILTERTAGDETAILSA paftd, DWORD fdwDetails)
 {
-  if(fdwDetails & 
+  if(fdwDetails &
      ~(ACM_FILTERTAGDETAILSF_FILTERTAG|
        ACM_FILTERTAGDETAILSF_LARGESTSIZE))
Index: trunk/src/msacm32/format.cpp
===================================================================
--- trunk/src/msacm32/format.cpp	(revision 3924)
+++ trunk/src/msacm32/format.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: format.cpp,v 1.2 2000-08-02 15:49:32 bird Exp $ */
 /*
  *      MSACM32 library
@@ -117,5 +118,5 @@
   HACMDRIVER had, PACMFORMATTAGDETAILSA paftd, DWORD fdwDetails)
 {
-  if(fdwDetails & 
+  if(fdwDetails &
      ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_LARGESTSIZE))
     return MMSYSERR_INVALFLAG;
@@ -152,5 +153,5 @@
   dprintf(("(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, paftd, fnCallback, dwInstance, fdwEnum
-  )); 
+  ));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return MMSYSERR_ERROR;
@@ -166,5 +167,5 @@
   dprintf(("(0x%08x, %p, %p, %ld, %ld): stub\n",
     had, paftd, fnCallback, dwInstance, fdwEnum
-  )); 
+  ));
   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
   return MMSYSERR_ERROR;
Index: trunk/src/msacm32/internal.cpp
===================================================================
--- trunk/src/msacm32/internal.cpp	(revision 3924)
+++ trunk/src/msacm32/internal.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: internal.cpp,v 1.5 2000-08-02 15:49:32 bird Exp $ */
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
 
@@ -22,5 +23,5 @@
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(msacm)	
+DEFAULT_DEBUG_CHANNEL(msacm)
 
 /**********************************************************************/
@@ -31,9 +32,9 @@
 
 /***********************************************************************
- *           MSACM_RegisterDriver32() 
+ *           MSACM_RegisterDriver32()
  */
 PWINE_ACMDRIVERID MSACM_RegisterDriver(LPSTR pszDriverAlias, LPSTR pszFileName,
 				       HINSTANCE hinstModule)
-{ 
+{
     PWINE_ACMDRIVERID padid;
 
@@ -53,10 +54,10 @@
     if (!MSACM_pFirstACMDriverID)
 	MSACM_pFirstACMDriverID = padid;
-    
+
     return padid;
 }
 
 /***********************************************************************
- *           MSACM_RegisterAllDrivers32() 
+ *           MSACM_RegisterAllDrivers32()
  */
 void MSACM_RegisterAllDrivers(void)
@@ -64,6 +65,6 @@
     LPSTR pszBuffer;
     DWORD dwBufferLength;
-    
-    /* FIXME 
+
+    /* FIXME
      *  What if the user edits system.ini while the program is running?
      *  Does Windows handle that?
@@ -71,9 +72,9 @@
     if (MSACM_pFirstACMDriverID)
 	return;
-    
+
     /* FIXME: Do not work! How do I determine the section length? */
     dwBufferLength = 1024;
 /* EPP 	GetPrivateProfileSectionA("drivers32", NULL, 0, "system.ini"); */
-    
+
     pszBuffer = (LPSTR) HeapAlloc(MSACM_hHeap, 0, dwBufferLength);
     if (GetPrivateProfileSectionA("drivers32", pszBuffer, dwBufferLength, "system.ini")) {
@@ -87,9 +88,9 @@
 		    MSACM_RegisterDriver(s, s2, 0);
 		}
-	    }  
+	    }
 	    s += lstrlenA(s) + 1; /* Either next char or \0 */
 	}
     }
-    
+
     HeapFree(MSACM_hHeap, 0, pszBuffer);
 }
@@ -101,13 +102,13 @@
 {
     PWINE_ACMDRIVERID pNextACMDriverID;
-    
+
     if (p->pACMDriverList)
 	acmDriverClose((HACMDRIVER) p->pACMDriverList, 0);
-    
+
     if (p->pszDriverAlias)
 	HeapFree(MSACM_hHeap, 0, p->pszDriverAlias);
     if (p->pszFileName)
 	HeapFree(MSACM_hHeap, 0, p->pszFileName);
-    
+
     if (p == MSACM_pFirstACMDriverID)
 	MSACM_pFirstACMDriverID = p->pNextACMDriverID;
@@ -119,9 +120,9 @@
     if (p->pNextACMDriverID)
 	p->pNextACMDriverID->pPrevACMDriverID = p->pPrevACMDriverID;
-    
+
     pNextACMDriverID = p->pNextACMDriverID;
-    
+
     HeapFree(MSACM_hHeap, 0, p);
-    
+
     return pNextACMDriverID;
 }
@@ -140,5 +141,5 @@
 
 /***********************************************************************
- *           MSACM_GetDriverID32() 
+ *           MSACM_GetDriverID32()
  */
 PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID)
Index: trunk/src/msacm32/msacm32.cpp
===================================================================
--- trunk/src/msacm32/msacm32.cpp	(revision 3924)
+++ trunk/src/msacm32/msacm32.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: msacm32.cpp,v 1.6 2000-08-02 15:49:32 bird Exp $ */
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
 
@@ -19,11 +20,11 @@
 
 DEFAULT_DEBUG_CHANNEL(msacm)
-	
+
 /**********************************************************************/
-	
+
 static DWORD MSACM_dwProcessesAttached = 0;
 
 /***********************************************************************
- *           MSACM_LibMain32 (MSACM32.init) 
+ *           MSACM_LibMain32 (MSACM32.init)
  */
 BOOL WINAPI MSACM32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
@@ -69,5 +70,5 @@
 {
     switch (GetVersion()) {
-    default: 
+    default:
 	dprintf(("Current OS not supported\n"));
     case WIN95:
@@ -95,5 +96,5 @@
 
     dprintf(("(0x%08x, %d, %p): stub\n", hao, uMetric, pMetric));
-    
+
     switch (uMetric) {
     case ACM_METRIC_COUNT_DRIVERS:
@@ -149,5 +150,5 @@
     case ACM_METRIC_COUNT_LOCAL_DISABLED:
 	if (!pao)
-	    return MMSYSERR_INVALHANDLE;  
+	    return MMSYSERR_INVALHANDLE;
 	for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID)
 	    if (!padid->bEnabled /* && (local(padid) || !bLocal) */)
Index: trunk/src/msacm32/stream.cpp
===================================================================
--- trunk/src/msacm32/stream.cpp	(revision 3924)
+++ trunk/src/msacm32/stream.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: stream.cpp,v 1.3 2000-08-02 15:49:32 bird Exp $ */
 /* -*- tab-width: 8; c-basic-offset: 4 -*- */
 
@@ -27,5 +28,5 @@
 
 DEFAULT_DEBUG_CHANNEL(msacm)
-    
+
 static PWINE_ACMSTREAM	ACM_GetStream(HACMSTREAM has)
 {
@@ -40,7 +41,7 @@
     PWINE_ACMSTREAM	was;
     MMRESULT		ret;
-		
+
     dprintf(("(0x%08x, %ld)\n", has, fdwClose));
-    
+
     if ((was = ACM_GetStream(has)) == NULL) {
 	return MMSYSERR_INVALHANDLE;
@@ -49,5 +50,5 @@
     if (ret == MMSYSERR_NOERROR) {
 	if (was->hAcmDriver)
-	    acmDriverClose(was->hAcmDriver, 0L);	
+	    acmDriverClose(was->hAcmDriver, 0L);
 	HeapFree(MSACM_hHeap, 0, was);
     }
@@ -59,5 +60,5 @@
  *           acmStreamConvert (MSACM32.38)
  */
-MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, 
+MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
 				 DWORD fdwConvert)
 {
@@ -67,5 +68,5 @@
 
     dprintf(("(0x%08x, %p, %ld)\n", has, pash, fdwConvert));
-    
+
     if ((was = ACM_GetStream(has)) == NULL)
 	return MMSYSERR_INVALHANDLE;
@@ -88,5 +89,5 @@
 	padsh->cbPreparedDstLength < padsh->cbDstLength) {
 	return MMSYSERR_INVALPARAM;
-    }	
+    }
 
     padsh->fdwConvert = fdwConvert;
@@ -103,5 +104,5 @@
  *           acmStreamMessage (MSACM32.39)
  */
-MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, 
+MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1,
 				 LPARAM lParam2)
 {
@@ -123,14 +124,14 @@
     int			wfxSrcSize;
     int			wfxDstSize;
-    
+
     dprintf(("(%p, 0x%08x, %p, %p, %p, %ld, %ld, %ld)\n",
 	  phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen));
 
-    dprintf(("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", 
-	  pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec, 
+    dprintf(("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+	  pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec,
 	  pwfxSrc->nBlockAlign, pwfxSrc->wBitsPerSample, pwfxSrc->cbSize));
 
-    dprintf(("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", 
-	  pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec, 
+    dprintf(("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+	  pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec,
 	  pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize));
 
@@ -143,5 +144,5 @@
     if (was == NULL)
 	return MMSYSERR_NOMEM;
-    
+
     was->drvInst.cbStruct = sizeof(was->drvInst);
     was->drvInst.pwfxSrc = (PWAVEFORMATEX)((LPSTR)was + sizeof(*was));
@@ -155,11 +156,11 @@
 	was->drvInst.pwfltr = NULL;
     }
-    was->drvInst.dwCallback = dwCallback;    
+    was->drvInst.dwCallback = dwCallback;
     was->drvInst.dwInstance = dwInstance;
     was->drvInst.fdwOpen = fdwOpen;
-    was->drvInst.fdwDriver = 0L;  
-    was->drvInst.dwDriver = 0L;     
+    was->drvInst.fdwDriver = 0L;
+    was->drvInst.dwDriver = 0L;
     was->drvInst.has = (HACMSTREAM)was;
-    
+
     if (had) {
 	if (!(wad = MSACM_GetDriver(had))) {
@@ -167,5 +168,5 @@
 	    goto errCleanUp;
 	}
-	
+
 	was->obj.pACMDriverID = wad->obj.pACMDriverID;
 	was->pDrv = wad;
@@ -177,5 +178,5 @@
     } else {
 	PWINE_ACMDRIVERID wadi;
-	
+
 	ret = ACMERR_NOTPOSSIBLE;
 	for (wadi = MSACM_pFirstACMDriverID; wadi; wadi = wadi->pNextACMDriverID) {
@@ -186,5 +187,5 @@
 		    was->pDrv = wad;
 		    was->hAcmDriver = had;
-		    
+
 		    ret = SendDriverMessage(wad->hDrvr, ACMDM_STREAM_OPEN, (DWORD)&was->drvInst, 0L);
 		    if (ret == MMSYSERR_NOERROR) {
@@ -211,5 +212,5 @@
 	return ret;
     }
-errCleanUp:		
+errCleanUp:
     if (phas)
 	*phas = (HACMSTREAM)0;
@@ -223,5 +224,5 @@
  *           acmStreamPrepareHeader (MSACM32.41)
  */
-MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, 
+MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
 				       DWORD fdwPrepare)
 {
@@ -231,5 +232,5 @@
 
     dprintf(("(0x%08x, %p, %ld)\n", has, pash, fdwPrepare));
-    
+
     if ((was = ACM_GetStream(has)) == NULL)
 	return MMSYSERR_INVALHANDLE;
@@ -306,5 +307,5 @@
  *           acmStreamSize (MSACM32.43)
  */
-MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, 
+MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput,
 			      LPDWORD pdwOutputBytes, DWORD fdwSize)
 {
@@ -312,7 +313,7 @@
     ACMDRVSTREAMSIZE	adss;
     MMRESULT		ret;
-    
+
     dprintf(("(0x%08x, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize));
-    
+
     if ((was = ACM_GetStream(has)) == NULL) {
 	return MMSYSERR_INVALHANDLE;
@@ -323,5 +324,5 @@
 
     *pdwOutputBytes = 0L;
-    
+
     switch (fdwSize & ACM_STREAMSIZEF_QUERYMASK) {
     case ACM_STREAMSIZEF_DESTINATION:
@@ -333,11 +334,11 @@
 	adss.cbDstLength = 0;
 	break;
-    default:	
+    default:
 	return MMSYSERR_INVALFLAG;
     }
-    
+
     adss.cbStruct = sizeof(adss);
     adss.fdwSize = fdwSize;
-    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_SIZE, 
+    ret = SendDriverMessage(was->pDrv->hDrvr, ACMDM_STREAM_SIZE,
 			    (DWORD)&was->drvInst, (DWORD)&adss);
     if (ret == MMSYSERR_NOERROR) {
@@ -358,5 +359,5 @@
  *           acmStreamUnprepareHeader (MSACM32.44)
  */
-MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, 
+MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
 					 DWORD fdwUnprepare)
 {
@@ -366,5 +367,5 @@
 
     dprintf(("(0x%08x, %p, %ld)\n", has, pash, fdwUnprepare));
-    
+
     if ((was = ACM_GetStream(has)) == NULL)
 	return MMSYSERR_INVALHANDLE;
@@ -387,5 +388,5 @@
 	padsh->cbPreparedDstLength < padsh->cbDstLength) {
 	return MMSYSERR_INVALPARAM;
-    }	
+    }
 
     padsh->fdwConvert = fdwUnprepare;
Index: trunk/src/urlmon/umon.cpp
===================================================================
--- trunk/src/urlmon/umon.cpp	(revision 3924)
+++ trunk/src/urlmon/umon.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: umon.cpp,v 1.2 2000-08-02 15:50:41 bird Exp $ */
 /*
  * UrlMon
@@ -12,7 +13,7 @@
 #include "debugtools.h"
 
-#include "urlmon.h" 
+#include "urlmon.h"
 /*
-DEFAULT_DEBUG_CHANNEL(win32); 
+DEFAULT_DEBUG_CHANNEL(win32);
 
 #include <os2win.h>
@@ -32,5 +33,5 @@
  * RETURNS
  *    S_OK 		success
- *    E_OUTOFMEMORY	out of memory 
+ *    E_OUTOFMEMORY	out of memory
  *    MK_E_SYNTAX	not a valid url
  *
Index: trunk/src/urlmon/urlmon.cpp
===================================================================
--- trunk/src/urlmon/urlmon.cpp	(revision 3924)
+++ trunk/src/urlmon/urlmon.cpp	(revision 3925)
@@ -1,2 +1,3 @@
+/* $Id: urlmon.cpp,v 1.2 2000-08-02 15:50:41 bird Exp $ */
 /*
  * UrlMon
Index: trunk/src/wing32/wing32.cpp
===================================================================
--- trunk/src/wing32/wing32.cpp	(revision 3924)
+++ trunk/src/wing32/wing32.cpp	(revision 3925)
@@ -1,3 +1,3 @@
-
+/* $Id: wing32.cpp,v 1.2 2000-08-02 15:51:35 bird Exp $ */
 #include <memory.h>
 #include <wingdi.h>
