[ros-diffs] [cwittich] 47400: [QEDIT] sync to wine 1.2 RC2

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat May 29 11:05:43 2010
New Revision: 47400

URL: http://svn.reactos.org/svn/reactos?rev=47400&view=rev
Log:
[QEDIT]
sync to wine 1.2 RC2

Modified:
    trunk/reactos/dll/directx/qedit/mediadet.c
    trunk/reactos/dll/directx/qedit/regsvr.c
    trunk/reactos/dll/directx/qedit/samplegrabber.c

Modified: trunk/reactos/dll/directx/qedit/mediadet.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/mediadet.c?rev=47400&r1=47399&r2=47400&view=diff
==============================================================================
--- trunk/reactos/dll/directx/qedit/mediadet.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/qedit/mediadet.c [iso-8859-1] Sat May 29 11:05:43 2010
@@ -38,8 +38,8 @@
     IGraphBuilder *graph;
     IBaseFilter *source;
     IBaseFilter *splitter;
-    long num_streams;
-    long cur_stream;
+    LONG num_streams;
+    LONG cur_stream;
     IPin *cur_pin;
 } MediaDetImpl;
 
@@ -168,7 +168,7 @@
     return S_OK;
 }
 
-static HRESULT SetCurPin(MediaDetImpl *This, long strm)
+static HRESULT SetCurPin(MediaDetImpl *This, LONG strm)
 {
     IEnumPins *pins;
     IPin *pin;

Modified: trunk/reactos/dll/directx/qedit/regsvr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/regsvr.c?rev=47400&r1=47399&r2=47400&view=diff
==============================================================================
--- trunk/reactos/dll/directx/qedit/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/qedit/regsvr.c [iso-8859-1] Sat May 29 11:05:43 2010
@@ -326,5 +326,5 @@
     TRACE("\n");
 
     hr = unregister_coclasses(coclass_list);
-    return S_OK;
-}
+    return hr;
+}

Modified: trunk/reactos/dll/directx/qedit/samplegrabber.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/samplegrabber.c?rev=47400&r1=47399&r2=47400&view=diff
==============================================================================
--- trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] Sat May 29 11:05:43 2010
@@ -489,7 +489,7 @@
     REFERENCE_TIME tStart, tEnd;
     if (This->bufferLen >= 0) {
         BYTE *data = 0;
-        long size = IMediaSample_GetActualDataLength(sample);
+        LONG size = IMediaSample_GetActualDataLength(sample);
         if (size >= 0 && SUCCEEDED(IMediaSample_GetPointer(sample, &data))) {
             if (!data)
                 size = 0;
@@ -527,7 +527,7 @@
         case 1:
             {
                 BYTE *data = 0;
-                long size = IMediaSample_GetActualDataLength(sample);
+                LONG size = IMediaSample_GetActualDataLength(sample);
                 if (size && SUCCEEDED(IMediaSample_GetPointer(sample, &data)) && data)
                     ISampleGrabberCB_BufferCB(This->grabberIface, time, data, size);
             }
@@ -535,7 +535,7 @@
         case -1:
             break;
         default:
-            FIXME("unsupported method %ld\n", (long int)This->grabberMethod);
+            FIXME("unsupported method %d\n", This->grabberMethod);
             /* do not bother us again */
             This->grabberMethod = -1;
     }