[ros-diffs] [silverblade] 39610: Fix #includes in a few more files to get ReactOS building again.

Author: silverblade
Date: Sun Feb 15 10:08:40 2009
New Revision: 39610

URL: http://svn.reactos.org/svn/reactos?rev=39610&view=rev
Log:
Fix #includes in a few more files to get ReactOS building again.


Modified:
    trunk/reactos/dll/win32/sndblst/sndblst.c
    trunk/reactos/include/reactos/libs/sound/mmebuddy.h
    trunk/reactos/lib/drivers/sound/mmebuddy/thread.c
    trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
    trunk/reactos/lib/drivers/sound/mment4/detect.c
    trunk/reactos/lib/drivers/sound/mment4/registry.c

Modified: trunk/reactos/dll/win32/sndblst/sndblst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.…
==============================================================================
--- trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/sndblst/sndblst.c [iso-8859-1] Sun Feb 15 10:08:40 2009
@@ -14,7 +14,7 @@
 
 #include <windows.h>
 #include <ntddsnd.h>
-#include <reactos/sndtypes.h>
+#include <sndtypes.h>
 #include <mmddk.h>
 #include <mmebuddy.h>
 #include <mment4.h>

Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound…
==============================================================================
--- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Feb 15 10:08:40
2009
@@ -13,7 +13,8 @@
  *
  * NOTES:       MME Buddy was the best name I could come up with...
  *              The structures etc. here should be treated as internal to the
- *              library so should not be directly accessed elsewhere.
+ *              library so should not be directly accessed elsewhere. Perhaps they
+ *              can be moved to an internal header?
 */
 
 #ifndef ROS_AUDIO_MMEBUDDY_H

Modified: trunk/reactos/lib/drivers/sound/mmebuddy/thread.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sun Feb 15 10:08:40
2009
@@ -194,7 +194,10 @@
 DestroySoundThread(
     IN  PSOUND_THREAD Thread)
 {
-    /* TODO: Implement me! */
+    VALIDATE_MMSYS_PARAMETER( Thread );
+    SND_TRACE(L"Terminating sound thread\n");
+    Thread->Running = FALSE;
+    /* TODO: Implement me! Wait for thread to have finished? */
     return MMSYSERR_NOTSUPPORTED;
 }
 

Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sun Feb 15
10:08:40 2009
@@ -155,8 +155,29 @@
     if ( ! FunctionTable->SubmitWaveHeader )
         return MMSYSERR_NOTSUPPORTED;
 
-    return WaveHeaderOperation(FunctionTable->SubmitWaveHeader,
-                               SoundDeviceInstance,
-                               Header);
+    /*
+        A few minor sanity checks - any custom checks should've been carried
+        out during wave header preparation etc.
+    */
+    VALIDATE_MMSYS_PARAMETER( Header->lpData != NULL );
+    VALIDATE_MMSYS_PARAMETER( Header->dwBufferLength > 0 );
+    VALIDATE_MMSYS_PARAMETER( Header->dwFlags & WHDR_PREPARED );
+    VALIDATE_MMSYS_PARAMETER( ! Header->dwFlags & WHDR_INQUEUE );
+
+    /* Clear the "done" flag for the buffer */
+    Header->dwFlags &= ~WHDR_DONE;
+
+    Result =  WaveHeaderOperation(FunctionTable->SubmitWaveHeader,
+                                  SoundDeviceInstance,
+                                  Header);
+
+    if ( ! MMSUCCESS(Result) )
+    {
+        return Result;
+    }
+
+    /* Set the "in queue" flag if everything was OK */
+    Header->dwFlags |= WHDR_INQUEUE;
+
+    return MMSYSERR_NOERROR;
 }
-

Modified: trunk/reactos/lib/drivers/sound/mment4/detect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/d…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mment4/detect.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mment4/detect.c [iso-8859-1] Sun Feb 15 10:08:40 2009
@@ -15,8 +15,8 @@
 #include <mmsystem.h>
 #include <mmddk.h>
 #include <ntddsnd.h>
-#include <reactos/sndnames.h>
-#include <reactos/sndtypes.h>
+#include <sndnames.h>
+#include <sndtypes.h>
 
 #include <mmebuddy.h>
 #include <mment4.h>

Modified: trunk/reactos/lib/drivers/sound/mment4/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mment4/r…
==============================================================================
--- trunk/reactos/lib/drivers/sound/mment4/registry.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mment4/registry.c [iso-8859-1] Sun Feb 15 10:08:40
2009
@@ -13,8 +13,8 @@
 #include <mmddk.h>
 #include <ntddsnd.h>
 
-#include <reactos/sndnames.h>
-#include <reactos/sndtypes.h>
+#include <sndnames.h>
+#include <sndtypes.h>
 
 #include <mmebuddy.h>
 #include <mment4.h>