[DSOUND_WINETEST] Add a PCH.

modules/rostests/winetests/dsound/CMakeLists.txt

@@ -7,10 +7,11 @@ list(APPEND SOURCE
     dsound.c
     duplex.c
     propset.c
-    testlist.c)
+    dsound_test.h)
 
-add_executable(dsound_winetest ${SOURCE})
+add_executable(dsound_winetest ${SOURCE} testlist.c)
 target_link_libraries(dsound_winetest uuid dxguid)
 set_module_type(dsound_winetest win32cui)
 add_importlibs(dsound_winetest ole32 user32 msvcrt kernel32)
+add_pch(dsound_winetest dsound_test.h SOURCE)
 add_rostests_file(TARGET dsound_winetest)

modules/rostests/winetests/dsound/capture.c

@@ -19,23 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "dsound_test.h"
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#define COBJMACROS
-
-#include <wine/test.h>
 
 #include <stdio.h>
-//#include "initguid.h"
-//#include "windows.h"
-#include <wingdi.h>
-#include <mmsystem.h>
-#include <dsound.h>
-#include <mmreg.h>
-#include <dsconf.h>
-
-#include "dsound_test.h"
 
 #define NOTIFICATIONS    5
 

modules/rostests/winetests/dsound/ds3d.c

@@ -23,21 +23,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <wine/test.h>
-
-//#include <windows.h>
-
-#include <math.h>
-#include <wingdi.h>
-#include <mmsystem.h>
-#include <dsound.h>
-#include <mmreg.h>
-#include "ks.h"
-#include "ksmedia.h"
 #include "dsound_test.h"
 
 #define PI 3.14159265358979323846

modules/rostests/winetests/dsound/ds3d8.c

@@ -23,20 +23,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <windows.h>
-
-#include <math.h>
-
-#include <wine/test.h>
-#include <wingdi.h>
-#include <mmreg.h>
-#include <dsound.h>
-#include <ks.h>
-#include <ksmedia.h>
 #include "dsound_test.h"
 
 static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL;

modules/rostests/winetests/dsound/dsound.c

@@ -26,21 +26,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <windows.h>
-
-#include <wine/test.h>
-#include <wingdi.h>
-#include <mmreg.h>
-#include <dsound.h>
-#include <dsconf.h>
-//#include "initguid.h"
-#include <ks.h>
-#include <ksmedia.h>
-
 #include "dsound_test.h"
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

modules/rostests/winetests/dsound/dsound8.c

@@ -25,29 +25,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include "dsound_test.h"
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
 
-#define COBJMACROS
-#define NONAMELESSUNION
-//#include <windows.h>
-//#include <stdio.h>
-
-#include <wine/test.h>
-#include <wingdi.h>
-#include <mmreg.h>
-#include <dsound.h>
-#include <dsconf.h>
-#include <ks.h>
-#include <ksmedia.h>
 #include <initguid.h>
 #include <mmdeviceapi.h>
-//#include "audioclient.h"
-//#include "propkey.h"
-//#include "devpkey.h"
-
-#include "dsound_test.h"
 
 static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL;
 static HRESULT (WINAPI *pDirectSoundCreate8)(LPCGUID,LPDIRECTSOUND8*,LPUNKNOWN)=NULL;
@@ -1112,7 +1093,7 @@ static void test_first_device(void)
     hr = IPropertyStore_GetValue(ps, &PKEY_AudioEndpoint_GUID, &pv);
     ok(hr == S_OK, "GetValue failed: %08x\n", hr);
 
-    CLSIDFromString(pv.u.pwszVal, &default_info.guid);
+    CLSIDFromString(pv.pwszVal, &default_info.guid);
 
     PropVariantClear(&pv);
     IPropertyStore_Release(ps);

modules/rostests/winetests/dsound/dsound_test.h

@@ -18,9 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef _DSOUND_TEST_H_
+#define _DSOUND_TEST_H_
+
+#include <math.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#define COBJMACROS
+
+#include <wine/test.h>
+
 #include <wingdi.h>
 #include <mmreg.h>
 #include <mmsystem.h>
+#include <dsound.h>
+#include <dsconf.h>
+#include <ks.h>
+#include <ksmedia.h>
 
 static const unsigned int formats[][4]={
     { 8000,  8, 1, 0 },
@@ -93,3 +109,5 @@ extern void test_buffer8(LPDIRECTSOUND8,LPDIRECTSOUNDBUFFER*,
 extern const char * getDSBCAPS(DWORD xmask);
 extern int align(int length, int align);
 extern const char * format_string(const WAVEFORMATEX* wfx);
+
+#endif /* !_DSOUND_TEST_H_ */

modules/rostests/winetests/dsound/duplex.c

@@ -18,20 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-//#include <windows.h>
-//#include <stdio.h>
-
-#include <wine/test.h>
-#include <wingdi.h>
-#include <mmreg.h>
-#include <dsound.h>
-#include <dsconf.h>
-
 #include "dsound_test.h"
 
 static HRESULT (WINAPI *pDirectSoundFullDuplexCreate)(LPCGUID, LPCGUID,

modules/rostests/winetests/dsound/propset.c

@@ -19,28 +19,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-//#include <windows.h>
-
-#include <wine/test.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <mmreg.h>
-#include <dsound.h>
-#include <dsconf.h>
-
 #include "dsound_test.h"
 
+#include <winnls.h>
+
 #ifndef DSBCAPS_CTRLDEFAULT
 #define DSBCAPS_CTRLDEFAULT \
         DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLPAN|DSBCAPS_CTRLVOLUME
 #endif
 
-#include "initguid.h"
+#include <initguid.h>
 
 DEFINE_GUID(DSPROPSETID_VoiceManager,
             0x62A69BAE,0xDF9D,0x11D1,0x99,0xA6,0x00,0xC0,0x4F,0xC9,0x9D,0x46);