[akhaldi] 73984: [WMVCORE] Sync with Wine Staging 2.2. CORE-12823 c4f829c wmvcore: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). 7b70eba wmvcore: Implement WMCreateReaderPriv.

Author: akhaldi
Date: Sun Feb 26 20:30:36 2017
New Revision: 73984

URL: http://svn.reactos.org/svn/reactos?rev=73984&view=rev
Log:
[WMVCORE] Sync with Wine Staging 2.2. CORE-12823

c4f829c wmvcore: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
7b70eba wmvcore: Implement WMCreateReaderPriv.

Modified:
    trunk/reactos/dll/win32/wmvcore/wmvcore.h
    trunk/reactos/dll/win32/wmvcore/wmvcore.spec
    trunk/reactos/dll/win32/wmvcore/wmvcore_main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/wmvcore/wmvcore.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore.…
==============================================================================
--- trunk/reactos/dll/win32/wmvcore/wmvcore.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wmvcore/wmvcore.h	[iso-8859-1] Sun Feb 26 20:30:36 2017
@@ -25,9 +25,9 @@
 #include "windef.h"
 #include "winbase.h"
 
-static inline void *heap_alloc(size_t len)
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
 {
-    return HeapAlloc(GetProcessHeap(), 0, len);
+    return HeapAlloc(GetProcessHeap(), 0, size);
 }
 
 static inline BOOL heap_free(void *mem)

Modified: trunk/reactos/dll/win32/wmvcore/wmvcore.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore.…
==============================================================================
--- trunk/reactos/dll/win32/wmvcore/wmvcore.spec	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wmvcore/wmvcore.spec	[iso-8859-1] Sun Feb 26 20:30:36 2017
@@ -10,7 +10,7 @@
 @ stub WMCreateIndexer
 @ stdcall WMCreateProfileManager(ptr)
 @ stdcall WMCreateReader(ptr long ptr)
-@ stub WMCreateReaderPriv
+@ stdcall WMCreateReaderPriv(ptr)
 @ stdcall WMCreateSyncReader(ptr long ptr)
 @ stdcall WMCreateWriter(ptr ptr)
 @ stub WMCreateWriterFileSink

Modified: trunk/reactos/dll/win32/wmvcore/wmvcore_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmvcore/wmvcore_…
==============================================================================
--- trunk/reactos/dll/win32/wmvcore/wmvcore_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wmvcore/wmvcore_main.c	[iso-8859-1] Sun Feb 26 20:30:36 2017
@@ -667,6 +667,11 @@
     return S_OK;
 }
 
+HRESULT WINAPI WMCreateReaderPriv(IWMReader **ret_reader)
+{
+    return WMCreateReader(NULL, 0, ret_reader);
+}
+
 HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader
**syncreader)
 {
     FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Feb 26 20:30:36 2017
@@ -210,7 +210,7 @@
 reactos/dll/win32/wldap32             # Synced to WineStaging-2.2
 reactos/dll/win32/wmi                 # Synced to WineStaging-1.9.11
 reactos/dll/win32/wmiutils            # Synced to WineStaging-1.9.11
-reactos/dll/win32/wmvcore             # Synced to WineStaging-1.9.11
+reactos/dll/win32/wmvcore             # Synced to WineStaging-2.2
 reactos/dll/win32/wshom.ocx           # Synced to WineStaging-1.9.11
 reactos/dll/win32/wtsapi32            # Synced to WineStaging-1.9.11
 reactos/dll/win32/wuapi               # Synced to WineStaging-1.9.11