[ros-diffs] 01/01: [AMSTREAM] Sync with Wine Staging 3.9. CORE-14656

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5f73f6c864767302bd1b…

commit a5f73f6c864767302bd1b81889f5a691e0ccf501
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sun May 27 03:50:07 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sun May 27 03:50:07 2018 +0100

    [AMSTREAM] Sync with Wine Staging 3.9. CORE-14656
---
 dll/directx/wine/amstream/mediastream.c | 5 ++---
 media/doc/README.WINE                   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dll/directx/wine/amstream/mediastream.c
b/dll/directx/wine/amstream/mediastream.c
index 4c14b631d1..2bad1f3c90 100644
--- a/dll/directx/wine/amstream/mediastream.c
+++ b/dll/directx/wine/amstream/mediastream.c
@@ -20,7 +20,6 @@
 
 #ifndef __REACTOS__
 #define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #endif
 #define COBJMACROS
 
@@ -505,7 +504,7 @@ static const IPinVtbl DirectDrawMediaStreamInputPin_IPin_Vtbl =
     BasePinImpl_QueryPinInfo,
     BasePinImpl_QueryDirection,
     BasePinImpl_QueryId,
-    BaseInputPinImpl_QueryAccept,
+    BasePinImpl_QueryAccept,
     BasePinImpl_EnumMediaTypes,
     BasePinImpl_QueryInternalConnections,
     BaseInputPinImpl_EndOfStream,
@@ -1074,7 +1073,7 @@ static const IPinVtbl AudioMediaStreamInputPin_IPin_Vtbl =
     BasePinImpl_QueryPinInfo,
     BasePinImpl_QueryDirection,
     BasePinImpl_QueryId,
-    BaseInputPinImpl_QueryAccept,
+    BasePinImpl_QueryAccept,
     BasePinImpl_EnumMediaTypes,
     BasePinImpl_QueryInternalConnections,
     BaseInputPinImpl_EndOfStream,
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index db5c232c42..08e647976b 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -21,7 +21,7 @@ reactos/sdk/tools/wpp                   # Synced to WineStaging-2.9
 
 The following libraries are shared with Wine.
 
-reactos/dll/directx/wine/amstream       # Synced to WineStaging-3.3
+reactos/dll/directx/wine/amstream       # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-3.3
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-3.3
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3