From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sat, 29 May 2010 09:05:43 +0000 (+0000)
Subject: [QEDIT]
X-Git-Tag: backups/header-work@57446~11^2~216
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=cdabe0cf2112352bb4314617331057ef5fc05403

[QEDIT]
sync to wine 1.2 RC2

svn path=/trunk/; revision=47400
---

diff --git a/reactos/dll/directx/qedit/mediadet.c b/reactos/dll/directx/qedit/mediadet.c
index 3a13f717bf6..9aeb9c017cc 100644
--- a/reactos/dll/directx/qedit/mediadet.c
+++ b/reactos/dll/directx/qedit/mediadet.c
@@ -38,8 +38,8 @@ typedef struct MediaDetImpl {
     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 @@ static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal)
     return S_OK;
 }
 
-static HRESULT SetCurPin(MediaDetImpl *This, long strm)
+static HRESULT SetCurPin(MediaDetImpl *This, LONG strm)
 {
     IEnumPins *pins;
     IPin *pin;
diff --git a/reactos/dll/directx/qedit/regsvr.c b/reactos/dll/directx/qedit/regsvr.c
index d70c8222ee8..d007311840a 100644
--- a/reactos/dll/directx/qedit/regsvr.c
+++ b/reactos/dll/directx/qedit/regsvr.c
@@ -326,5 +326,5 @@ HRESULT WINAPI DllUnregisterServer(void)
     TRACE("\n");
 
     hr = unregister_coclasses(coclass_list);
-    return S_OK;
+    return hr;
 }
diff --git a/reactos/dll/directx/qedit/samplegrabber.c b/reactos/dll/directx/qedit/samplegrabber.c
index 78a7306e10e..78979fecf28 100644
--- a/reactos/dll/directx/qedit/samplegrabber.c
+++ b/reactos/dll/directx/qedit/samplegrabber.c
@@ -489,7 +489,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
     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 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
         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 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample)
         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;
     }