[0.4.9] [WINE DIRECTX] Sledge-hammer-revert to avoid CORE-14534

This commit reverts
dll/directx/wine/* and
sdk/include/reactos/wine/wined3d.h
to the state of 0.4.8rls.

The current state of Ddraw without this revert is totally broken,
so we need this interim solution. I will happily replace it with
a proper fix if someone finds one until release.

Author: JoachimHenze

dll/directx/wine/amstream/CMakeLists.txt

@@ -10,7 +10,7 @@ list(APPEND SOURCE
     main.c
     mediastream.c
     mediastreamfilter.c
-    precomp.h)
+    amstream_private.h)
 
 add_library(amstream SHARED
     ${SOURCE}
@@ -20,5 +20,5 @@ add_library(amstream SHARED
 set_module_type(amstream win32dll)
 target_link_libraries(amstream strmbase strmiids uuid wine)
 add_importlibs(amstream ole32 ddraw user32 msvcrt kernel32 ntdll)
-add_pch(amstream precomp.h SOURCE)
+add_pch(amstream amstream_private.h SOURCE)
 add_cd_file(TARGET amstream DESTINATION reactos/system32 FOR all)

dll/directx/wine/amstream/amstream.c

@@ -19,17 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-
-#define COBJMACROS
-
-#include "winbase.h"
-#include "wingdi.h"
-
 #include "amstream_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
-
 typedef struct {
     IAMMultiMediaStream IAMMultiMediaStream_iface;
     LONG ref;

dll/directx/wine/amstream/amstream_private.h

@@ -21,17 +21,15 @@
 #ifndef __AMSTREAM_PRIVATE_INCLUDED__
 #define __AMSTREAM_PRIVATE_INCLUDED__
 
-#include <stdarg.h>
+#define WIN32_NO_STATUS
+#define WIN32_LEAN_AND_MEAN
+#define COBJMACROS
 
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "dshow.h"
-#include "mmstream.h"
-#include "austream.h"
-#include "amstream.h"
+#include <dshow.h>
+#include <amstream.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(amstream);
 
 HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;

dll/directx/wine/amstream/audiodata.c

@@ -18,15 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "wine/debug.h"
-
-#define COBJMACROS
-
-#include "winbase.h"
 #include "amstream_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
-
 typedef struct {
     IAudioData IAudioData_iface;
     LONG ref;

dll/directx/wine/amstream/main.c

@@ -18,24 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <string.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winerror.h"
-
-#include "ole2.h"
-#include "rpcproxy.h"
-
 #include "amstream_private.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(amstream);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;