qcap: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/qcap/Makefile.in

@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = qcap.dll
 UNIXLIB   = qcap.so
 IMPORTS   = strmbase strmiids uuid ole32 oleaut32

dlls/qcap/audiorecord.c

@@ -115,7 +115,7 @@ static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBa
     hr = IPropertyBag_Read(pPropBag, L"WaveInID", &var, pErrorLog);
     if (SUCCEEDED(hr))
     {
-        FIXME("FIXME: implement opening waveIn device %d\n", V_I4(&var));
+        FIXME("FIXME: implement opening waveIn device %ld\n", V_I4(&var));
     }
 
     return hr;

dlls/qcap/avico.c

@@ -142,7 +142,7 @@ static HRESULT avi_compressor_init_stream(struct strmbase_filter *iface)
 
     if (filter->source.pAllocator && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator)))
     {
-        ERR("Failed to commit allocator, hr %#x.\n", hr);
+        ERR("Failed to commit allocator, hr %#lx.\n", hr);
         return hr;
     }
 
@@ -216,7 +216,7 @@ static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface,
     V_VT(&v) = VT_BSTR;
     hres = IPropertyBag_Read(pPropBag, L"FccHandler", &v, NULL);
     if(FAILED(hres)) {
-        WARN("Could not read FccHandler: %08x\n", hres);
+        ERR("Failed to read FccHandler value, hr %#lx.\n", hres);
         return hres;
     }
 
@@ -309,7 +309,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia
     BOOL is_preroll;
     BOOL sync_point;
     BYTE *ptr, *buf;
-    DWORD res;
+    LRESULT res;
     HRESULT hres;
 
     TRACE("(%p)->(%p)\n", base, pSample);
@@ -336,7 +336,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia
 
     hres = IMediaSample_GetTime(pSample, &start, &stop);
     if(FAILED(hres)) {
-        WARN("GetTime failed: %08x\n", hres);
+        WARN("Failed to get sample time, hr %#lx.\n", hres);
         return hres;
     }
 
@@ -346,18 +346,18 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia
 
     hres = IMediaSample_GetPointer(pSample, &ptr);
     if(FAILED(hres)) {
-        WARN("GetPointer failed: %08x\n", hres);
+        ERR("Failed to get input buffer pointer, hr %#lx.\n", hres);
         return hres;
     }
 
     if (FAILED(hres = IMemAllocator_GetBuffer(This->source.pAllocator, &out_sample, &start, &stop, 0)))
     {
-        ERR("Failed to get sample, hr %#x.\n", hres);
+        ERR("Failed to get sample, hr %#lx.\n", hres);
         return hres;
     }
 
     if (FAILED(hres = IMediaSample_SetTime(out_sample, &start, &stop)))
-        ERR("Failed to set time, hr %#x.\n", hres);
+        ERR("Failed to set time, hr %#lx.\n", hres);
 
     hres = IMediaSample_GetPointer(out_sample, &buf);
     if(FAILED(hres))
@@ -371,7 +371,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia
     res = ICCompress(This->hic, sync_point ? ICCOMPRESS_KEYFRAME : 0, &This->videoinfo->bmiHeader, buf,
             &src_videoinfo->bmiHeader, ptr, 0, &comp_flags, This->frame_cnt, 0, 0, NULL, NULL);
     if(res != ICERR_OK) {
-        WARN("ICCompress failed: %d\n", res);
+        ERR("Failed to compress frame, error %Id.\n", res);
         IMediaSample_Release(out_sample);
         return E_FAIL;
     }
@@ -388,7 +388,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia
 
     hres = IMemInputPin_Receive(meminput, out_sample);
     if(FAILED(hres))
-        WARN("Deliver failed: %08x\n", hres);
+        WARN("Failed to deliver sample, hr %#lx.\n", hres);
 
     IMediaSample_Release(out_sample);
     This->frame_cnt++;

dlls/qcap/avimux.c

@@ -684,7 +684,7 @@ static ULONG WINAPI ConfigAviMux_Release(IConfigAviMux *iface)
 static HRESULT WINAPI ConfigAviMux_SetMasterStream(IConfigAviMux *iface, LONG iStream)
 {
     AviMux *This = impl_from_IConfigAviMux(iface);
-    FIXME("(%p)->(%d)\n", This, iStream);
+    FIXME("filter %p, index %ld, stub!\n", This, iStream);
     return E_NOTIMPL;
 }
 
@@ -925,7 +925,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG *
         DWORD dwCurrentFlags, LONGLONG *pStop, DWORD dwStopFlags)
 {
     AviMux *This = impl_from_IMediaSeeking(iface);
-    FIXME("(%p)->(%p %x %p %x)\n", This, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
+    FIXME("(%p)->(%p %#lx %p %#lx)\n", This, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
     return E_NOTIMPL;
 }
 
@@ -1180,7 +1180,7 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base,
     if (FAILED(hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL,
             CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc)))
     {
-        ERR("Failed to create allocator, hr %#x.\n", hr);
+        ERR("Failed to create allocator, hr %#lx.\n", hr);
         return hr;
     }
 
@@ -1232,13 +1232,14 @@ static ULONG WINAPI AviMuxOut_QualityControl_Release(IQualityControl *iface)
 }
 
 static HRESULT WINAPI AviMuxOut_QualityControl_Notify(IQualityControl *iface,
-        IBaseFilter *pSelf, Quality q)
+        IBaseFilter *sender, Quality q)
 {
-    AviMux *This = impl_from_out_IQualityControl(iface);
+    AviMux *filter = impl_from_out_IQualityControl(iface);
-    FIXME("(%p)->(%p { 0x%x %u %s %s })\n", This, pSelf,
+
-            q.Type, q.Proportion,
+    FIXME("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s, stub!\n",
-            wine_dbgstr_longlong(q.Late),
+            filter, sender, q.Type, q.Proportion,
-            wine_dbgstr_longlong(q.TimeStamp));
+            wine_dbgstr_longlong(q.Late), wine_dbgstr_longlong(q.TimeStamp));
+
     return E_NOTIMPL;
 }
 
@@ -1518,14 +1519,14 @@ static ULONG WINAPI AviMuxIn_AMStreamControl_Release(IAMStreamControl *iface)
 static HRESULT WINAPI AviMuxIn_AMStreamControl_StartAt(IAMStreamControl *iface,
         const REFERENCE_TIME *start, DWORD cookie)
 {
-    FIXME("iface %p, start %p, cookie %#x, stub!\n", iface, start, cookie);
+    FIXME("iface %p, start %p, cookie %#lx, stub!\n", iface, start, cookie);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI AviMuxIn_AMStreamControl_StopAt(IAMStreamControl *iface,
         const REFERENCE_TIME *stop, BOOL send_extra, DWORD cookie)
 {
-    FIXME("iface %p, stop %p, send_extra %d, cookie %#x, stub!\n", iface, stop, send_extra, cookie);
+    FIXME("iface %p, stop %p, send_extra %d, cookie %#lx, stub!\n", iface, stop, send_extra, cookie);
     return E_NOTIMPL;
 }
 
@@ -1639,7 +1640,7 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveMultiple(IMemInputPin *iface,
     AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface);
     HRESULT hr = S_OK;
 
-    TRACE("pin %p, pSamples %p, nSamples %d, nSamplesProcessed %p.\n",
+    TRACE("pin %p, pSamples %p, nSamples %ld, nSamplesProcessed %p.\n",
             avimuxin, pSamples, nSamples, nSamplesProcessed);
 
     for(*nSamplesProcessed=0; *nSamplesProcessed<nSamples; (*nSamplesProcessed)++)
@@ -1758,7 +1759,7 @@ static ULONG WINAPI AviMuxIn_QualityControl_Release(IQualityControl *iface)
 static HRESULT WINAPI AviMuxIn_QualityControl_Notify(IQualityControl *iface,
         IBaseFilter *filter, Quality q)
 {
-    FIXME("iface %p, filter %p, type %u, proportion %d, late %s, timestamp %s, stub!\n",
+    FIXME("iface %p, filter %p, type %u, proportion %ld, late %s, timestamp %s, stub!\n",
             iface, filter, q.Type, q.Proportion, wine_dbgstr_longlong(q.Late),
             wine_dbgstr_longlong(q.TimeStamp));
     return E_NOTIMPL;

dlls/qcap/capturegraph.c

@@ -104,16 +104,17 @@ fnCaptureGraphBuilder2_AddRef(ICaptureGraphBuilder2 * iface)
     CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface);
     DWORD ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p/%p)->() AddRef from %d\n", This, iface, ref - 1);
+    TRACE("%p increasing refcount to %lu.\n", This, ref);
+
     return ref;
 }
 
 static ULONG WINAPI fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface)
 {
     CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface);
-    DWORD ref = InterlockedDecrement(&This->ref);
+    ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p/%p)->() Release from %d\n", This, iface, ref + 1);
+    TRACE("%p decreasing refcount to %lu.\n", This, ref);
 
     if (!ref)
     {
@@ -224,7 +225,7 @@ static BOOL pin_matches(IPin *pin, PIN_DIRECTION dir, const GUID *category,
     IPin *peer;
 
     if (FAILED(hr = IPin_QueryDirection(pin, &candidate_dir)))
-        ERR("Failed to query direction, hr %#x.\n", hr);
+        ERR("Failed to query direction, hr %#lx.\n", hr);
 
     if (dir != candidate_dir)
         return FALSE;
@@ -272,7 +273,7 @@ static HRESULT find_interface_recurse(PIN_DIRECTION dir, const GUID *category,
 
     if (FAILED(hr = IBaseFilter_EnumPins(filter, &enumpins)))
     {
-        ERR("Failed to enumerate pins, hr %#x.\n", hr);
+        ERR("Failed to enumerate pins, hr %#lx.\n", hr);
         return hr;
     }
 
@@ -442,7 +443,7 @@ static HRESULT match_smart_tee_pin(CaptureGraphImpl *This,
             }
         }
         if (FAILED(hr)) {
-            TRACE("adding SmartTee failed with hr=0x%08x\n", hr);
+            TRACE("adding SmartTee failed with hr=0x%08lx\n", hr);
             hr = E_INVALIDARG;
             goto end;
         }
@@ -467,7 +468,7 @@ end:
         IPin_Release(peer);
     if (smartTee)
         IBaseFilter_Release(smartTee);
-    TRACE("for %s returning hr=0x%08x, *source_out=%p\n", IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE) ? "capture" : "preview", hr, source_out ? *source_out : 0);
+    TRACE("for %s returning hr=0x%08lx, *source_out=%p\n", IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE) ? "capture" : "preview", hr, source_out ? *source_out : 0);
     return hr;
 }
 

dlls/qcap/filewriter.c

@@ -73,21 +73,21 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed
     BYTE *data;
 
     if ((hr = IMediaSample_GetTime(sample, &start, &stop)) != S_OK)
-        ERR("Failed to get sample time, hr %#x.\n", hr);
+        ERR("Failed to get sample time, hr %#lx.\n", hr);
 
     if ((hr = IMediaSample_GetPointer(sample, &data)) != S_OK)
-        ERR("Failed to get sample pointer, hr %#x.\n", hr);
+        ERR("Failed to get sample pointer, hr %#lx.\n", hr);
 
     offset.QuadPart = start;
     if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN)
             || !WriteFile(filter->file, data, stop - start, &size, NULL))
     {
-        ERR("Failed to write file, error %u.\n", GetLastError());
+        ERR("Failed to write file, error %lu.\n", GetLastError());
         return HRESULT_FROM_WIN32(hr);
     }
 
     if (size != stop - start)
-        ERR("Short write, %u/%u.\n", size, (DWORD)(stop - start));
+        ERR("Short write, %lu/%lu.\n", size, (DWORD)(stop - start));
 
     return S_OK;
 }
@@ -175,7 +175,7 @@ static HRESULT file_writer_init_stream(struct strmbase_filter *iface)
     if ((file = CreateFileW(filter->filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
             NULL, CREATE_ALWAYS, 0, NULL)) == INVALID_HANDLE_VALUE)
     {
-        ERR("Failed to create %s, error %u.\n", debugstr_w(filter->filename), GetLastError());
+        ERR("Failed to create %s, error %lu.\n", debugstr_w(filter->filename), GetLastError());
         return HRESULT_FROM_WIN32(GetLastError());
     }
     filter->file = file;

dlls/qcap/v4l.c

@@ -558,8 +558,8 @@ static NTSTATUS v4l_device_create( void *args )
     }
 
     TRACE("Format: %d bpp - %dx%d.\n", device->current_caps->video_info.bmiHeader.biBitCount,
-            device->current_caps->video_info.bmiHeader.biWidth,
+            (int)device->current_caps->video_info.bmiHeader.biWidth,
-            device->current_caps->video_info.bmiHeader.biHeight);
+            (int)device->current_caps->video_info.bmiHeader.biHeight);
 
     *params->device = (ULONG_PTR)device;
     return S_OK;

dlls/qcap/vfwcapture.c

@@ -167,7 +167,7 @@ static DWORD WINAPI stream_thread(void *arg)
 
         if (FAILED(hr = IMemAllocator_GetBuffer(filter->source.pAllocator, &sample, NULL, NULL, 0)))
         {
-            ERR("Failed to get sample, hr %#x.\n", hr);
+            ERR("Failed to get sample, hr %#lx.\n", hr);
             break;
         }
 
@@ -186,7 +186,7 @@ static DWORD WINAPI stream_thread(void *arg)
         IMediaSample_Release(sample);
         if (FAILED(hr))
         {
-            ERR("IMemInputPin::Receive() returned %#x.\n", hr);
+            ERR("IMemInputPin::Receive() returned %#lx.\n", hr);
             break;
         }
     }
@@ -203,7 +203,7 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface)
         return S_OK;
 
     if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator)))
-        ERR("Failed to commit allocator, hr %#x.\n", hr);
+        ERR("Failed to commit allocator, hr %#lx.\n", hr);
 
     EnterCriticalSection(&filter->state_cs);
     filter->state = State_Paused;
@@ -260,7 +260,7 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface)
 
     hr = IMemAllocator_Decommit(filter->source.pAllocator);
     if (hr != S_OK && hr != VFW_E_NOT_COMMITTED)
-        ERR("Failed to decommit allocator, hr %#x.\n", hr);
+        ERR("Failed to decommit allocator, hr %#lx.\n", hr);
 
     return S_OK;
 }
@@ -332,7 +332,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
     if (This->source.pin.peer)
     {
         hr = IPin_QueryAccept(This->source.pin.peer, pmt);
-        TRACE("Would accept: %d\n", hr);
+        TRACE("QueryAccept() returned %#lx.\n", hr);
         if (hr == S_FALSE)
             return VFW_E_INVALIDMEDIATYPE;
     }
@@ -346,7 +346,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
         if (SUCCEEDED(hr))
             TRACE("Reconnection completed, with new media format..\n");
     }
-    TRACE("Returning: %d\n", hr);
+    TRACE("Returning %#lx.\n", hr);
     return hr;
 }
 
@@ -481,7 +481,7 @@ static HRESULT WINAPI AMVideoProcAmp_GetRange(IAMVideoProcAmp *iface, LONG prope
     struct vfw_capture *filter = impl_from_IAMVideoProcAmp(iface);
     struct get_prop_range_params params = { filter->device, property, min, max, step, default_value, flags };
 
-    TRACE("filter %p, property %#x, min %p, max %p, step %p, default_value %p, flags %p.\n",
+    TRACE("filter %p, property %#lx, min %p, max %p, step %p, default_value %p, flags %p.\n",
             filter, property, min, max, step, default_value, flags);
 
     return V4L_CALL( get_prop_range, &params );
@@ -493,7 +493,7 @@ static HRESULT WINAPI AMVideoProcAmp_Set(IAMVideoProcAmp *iface, LONG property,
     struct vfw_capture *filter = impl_from_IAMVideoProcAmp(iface);
     struct set_prop_params params = { filter->device, property, value, flags };
 
-    TRACE("filter %p, property %#x, value %d, flags %#x.\n", filter, property, value, flags);
+    TRACE("filter %p, property %#lx, value %ld, flags %#lx.\n", filter, property, value, flags);
 
     return V4L_CALL( set_prop, &params );
 }
@@ -504,7 +504,7 @@ static HRESULT WINAPI AMVideoProcAmp_Get(IAMVideoProcAmp *iface, LONG property,
     struct vfw_capture *filter = impl_from_IAMVideoProcAmp(iface);
     struct get_prop_params params = { filter->device, property, value, flags };
 
-    TRACE("filter %p, property %#x, value %p, flags %p.\n", filter, property, value, flags);
+    TRACE("filter %p, property %#lx, value %p, flags %p.\n", filter, property, value, flags);
 
     return V4L_CALL( get_prop, &params );
 }
@@ -815,7 +815,7 @@ static HRESULT WINAPI video_control_SetMode(IAMVideoControl *iface, IPin *pin, L
 {
     struct vfw_capture *filter = impl_from_IAMVideoControl(iface);
 
-    FIXME("filter %p, pin %p, mode %d: stub.\n", filter, pin, mode);
+    FIXME("filter %p, pin %p, mode %ld, stub.\n", filter, pin, mode);
 
     return E_NOTIMPL;
 }
@@ -844,7 +844,7 @@ static HRESULT WINAPI video_control_GetMaxAvailableFrameRate(IAMVideoControl *if
 {
     struct vfw_capture *filter = impl_from_IAMVideoControl(iface);
 
-    FIXME("filter %p, pin %p, index %d, dimensions (%dx%d), frame rate %p: stub.\n",
+    FIXME("filter %p, pin %p, index %ld, dimensions (%ldx%ld), frame rate %p, stub.\n",
             filter, pin, index, dimensions.cx, dimensions.cy, frame_rate);
 
     return E_NOTIMPL;
@@ -855,7 +855,7 @@ static HRESULT WINAPI video_control_GetFrameRateList(IAMVideoControl *iface, IPi
 {
     struct vfw_capture *filter = impl_from_IAMVideoControl(iface);
 
-    FIXME("filter %p, pin %p, index %d, dimensions (%dx%d), list size %p, frame rate: %p: stub.\n",
+    FIXME("filter %p, pin %p, index %ld, dimensions (%ldx%ld), list size %p, frame rate %p, stub.\n",
             filter, pin, index, dimensions.cx, dimensions.cy, list_size, frame_rate);
 
     return E_NOTIMPL;