[ros-diffs] [akhaldi] 72268: [QEDIT] Sync with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Thu Aug 18 09:48:26 2016
New Revision: 72268

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

Modified:
    trunk/reactos/dll/directx/wine/qedit/samplegrabber.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c	[iso-8859-1] Thu Aug 18 09:48:26
2016
@@ -77,8 +77,7 @@
     TRACE("(%p) new ref = %u\n", This, refCount);
     if (refCount == 0)
     {
-        if (This->mtype.pbFormat)
-            CoTaskMemFree(This->mtype.pbFormat);
+        CoTaskMemFree(This->mtype.pbFormat);
         CoTaskMemFree(This);
     }
     return refCount;
@@ -264,10 +263,8 @@
         IMemInputPin_Release(This->memOutput);
     if (This->grabberIface)
         ISampleGrabberCB_Release(This->grabberIface);
-    if (This->mtype.pbFormat)
-        CoTaskMemFree(This->mtype.pbFormat);
-    if (This->bufferData)
-        CoTaskMemFree(This->bufferData);
+    CoTaskMemFree(This->mtype.pbFormat);
+    CoTaskMemFree(This->bufferData);
     if(This->seekthru_unk)
         IUnknown_Release(This->seekthru_unk);
 }
@@ -372,8 +369,7 @@
                 size = 0;
             EnterCriticalSection(&This->filter.csFilter);
             if (This->bufferLen != size) {
-                if (This->bufferData)
-                    CoTaskMemFree(This->bufferData);
+                CoTaskMemFree(This->bufferData);
                 This->bufferData = size ? CoTaskMemAlloc(size) : NULL;
                 This->bufferLen = size;
             }
@@ -574,8 +570,7 @@
 	debugstr_guid(&type->majortype), debugstr_guid(&type->subtype),
 	type->lSampleSize,
 	debugstr_guid(&type->formattype), type->cbFormat);
-    if (This->mtype.pbFormat)
-        CoTaskMemFree(This->mtype.pbFormat);
+    CoTaskMemFree(This->mtype.pbFormat);
     This->mtype = *type;
     This->mtype.pUnk = NULL;
     if (type->cbFormat) {
@@ -924,8 +919,7 @@
 	    !IsEqualGUID(&This->sg->mtype.formattype,&FORMAT_None) &&
 	    !IsEqualGUID(&This->sg->mtype.formattype,&type->formattype))
 	    return VFW_E_TYPE_NOT_ACCEPTED;
-        if (This->sg->mtype.pbFormat)
-            CoTaskMemFree(This->sg->mtype.pbFormat);
+        CoTaskMemFree(This->sg->mtype.pbFormat);
         This->sg->mtype = *type;
         This->sg->mtype.pUnk = NULL;
         if (type->cbFormat) {
@@ -1288,7 +1282,8 @@
     else
         obj->outer_unk = &obj->IUnknown_inner;
 
-    hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj,
CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk);
+    hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner,
CLSCTX_INPROC_SERVER,
+                          &IID_IUnknown, (void**)&obj->seekthru_unk);
     if(hr)
         return hr;
     IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru,
(void**)&passthru);

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:48:26 2016
@@ -38,7 +38,7 @@
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
 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.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/wined3d        # Synced to WineStaging-1.9.4