[ros-diffs] [akhaldi] 72269: [QUARTZ] Sync with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Thu Aug 18 09:50:09 2016
New Revision: 72269

URL: http://svn.reactos.org/svn/reactos?rev=72269&view=rev
Log:
[QUARTZ] Sync with Wine Staging 1.9.16. CORE-11866

Modified:
    trunk/reactos/dll/directx/wine/quartz/avidec.c
    trunk/reactos/dll/directx/wine/quartz/dsoundrender.c
    trunk/reactos/dll/directx/wine/quartz/filtermapper.c
    trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
    trunk/reactos/dll/directx/wine/quartz/videorenderer.c
    trunk/reactos/dll/directx/wine/quartz/vmr9.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/quartz/avidec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/avidec.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/avidec.c	[iso-8859-1] Thu Aug 18 09:50:09 2016
@@ -152,7 +152,7 @@
     if (res != ICERR_OK)
         ERR("Error occurred during the decompression (%x)\n", res);
 
-    /* Drop sample if its intended to be dropped */
+    /* Drop sample if it's intended to be dropped */
     if (flags & ICDECOMPRESS_HURRYUP) {
         hr = S_OK;
         goto error;
@@ -329,11 +329,8 @@
     {
         if (This->hvid)
             ICClose(This->hvid);
-        if (This->pBihIn)
-            CoTaskMemFree(This->pBihIn);
-        if (This->pBihOut)
-            CoTaskMemFree(This->pBihOut);
-
+        CoTaskMemFree(This->pBihIn);
+        CoTaskMemFree(This->pBihOut);
         This->hvid = NULL;
         This->pBihIn = NULL;
         This->pBihOut = NULL;

Modified: trunk/reactos/dll/directx/wine/quartz/dsoundrender.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/ds…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/dsoundrender.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/dsoundrender.c	[iso-8859-1] Thu Aug 18 09:50:09
2016
@@ -1027,7 +1027,7 @@
         }
         else
         {
-            ERR("pInputPin Disconncted\n");
+            ERR("pInputPin Disconnected\n");
             hr = E_FAIL;
         }
         LeaveCriticalSection(&This->renderer.filter.csFilter);

Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/filtermapper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c	[iso-8859-1] Thu Aug 18 09:50:09
2016
@@ -591,8 +591,7 @@
     for (i = 0; i < prf2->u.s2.cPins2; i++)
     {
         UINT j;
-        if (prf2->u.s2.rgPins2[i].clsPinCategory)
-            CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2[i].clsPinCategory);
+        CoTaskMemFree((void*)prf2->u.s2.rgPins2[i].clsPinCategory);
 
         for (j = 0; j < prf2->u.s2.rgPins2[i].nMediaTypes; j++)
         {

Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c	[iso-8859-1] Thu Aug 18 09:50:09
2016
@@ -575,8 +575,7 @@
 
             if (FAILED(hr))
             {
-                if (amt.pbFormat)
-                    CoTaskMemFree(amt.pbFormat);
+                CoTaskMemFree(amt.pbFormat);
                 ERR("Could not create pin for MPEG audio stream (%x)\n", hr);
                 break;
             }

Modified: trunk/reactos/dll/directx/wine/quartz/videorenderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vi…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/videorenderer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/videorenderer.c	[iso-8859-1] Thu Aug 18 09:50:09
2016
@@ -42,6 +42,7 @@
     RECT WindowPos;
     LONG VideoWidth;
     LONG VideoHeight;
+    LONG FullScreenMode;
 } VideoRendererImpl;
 
 static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface)
@@ -870,7 +871,12 @@
 {
     VideoRendererImpl *This = impl_from_IVideoWindow(iface);
 
-    FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, FullScreenMode);
+    TRACE("(%p/%p)->(%p): %d\n", This, iface, FullScreenMode,
This->FullScreenMode);
+
+    if (!FullScreenMode)
+        return E_POINTER;
+
+    *FullScreenMode = This->FullScreenMode;
 
     return S_OK;
 }
@@ -898,6 +904,7 @@
        
SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW);
         This->WindowPos = This->DestRect;
     }
+    This->FullScreenMode = FullScreenMode;
 
     return S_OK;
 }
@@ -1005,6 +1012,7 @@
     ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT));
     ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT));
     ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT));
+    pVideoRenderer->FullScreenMode = OAFALSE;
 
     if (pUnkOuter)
         pVideoRenderer->outer_unk = pUnkOuter;

Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm…
==============================================================================
--- trunk/reactos/dll/directx/wine/quartz/vmr9.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/quartz/vmr9.c	[iso-8859-1] Thu Aug 18 09:50:09 2016
@@ -237,7 +237,17 @@
         return hr;
     }
 
-    if (lock.Pitch != width * bmiHeader->biBitCount / 8)
+    if (height > 0) {
+        /* Bottom up image needs inverting */
+        lock.pBits = (char *)lock.pBits + (height * lock.Pitch);
+        while (height--)
+        {
+            memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8);
+            data = data + width * bmiHeader->biBitCount / 8;
+            lock.pBits = (char *)lock.pBits - lock.Pitch;
+        }
+    }
+    else if (lock.Pitch != width * bmiHeader->biBitCount / 8)
     {
         WARN("Slow path! %u/%u\n", lock.Pitch, width *
bmiHeader->biBitCount/8);
 

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] Thu Aug 18 09:50:09 2016
@@ -39,7 +39,7 @@
 reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.9.11
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.9.11
 reactos/dll/directx/wine/qedit          # Synced to WineStaging-1.9.16
-reactos/dll/directx/wine/quartz         # Synced to WineStaging-1.9.11
+reactos/dll/directx/wine/quartz         # Synced to WineStaging-1.9.16
 reactos/dll/directx/wine/wined3d        # Synced to WineStaging-1.9.4
 
 reactos/dll/win32/activeds            # Synced to WineStaging-1.9.11