Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/qasf/Makefile.in | 1 - dlls/qasf/dmowrapper.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index d82abfeea7d..ee8fd0451e1 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qasf.dll IMPORTS = strmbase dmoguids strmiids uuid ole32 oleaut32
diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 54581b48bee..95e12e860ae 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -86,7 +86,7 @@ static HRESULT WINAPI buffer_SetLength(IMediaBuffer *iface, DWORD len) { struct buffer *buffer = impl_from_IMediaBuffer(iface);
- TRACE("iface %p, len %u.\n", iface, len); + TRACE("iface %p, len %lu.\n", iface, len);
return IMediaSample_SetActualDataLength(buffer->sample, len); } @@ -216,7 +216,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator, &filter->sources[i].buffer.sample, NULL, NULL, 0))) { - ERR("Failed to get sample, hr %#x.\n", hr); + ERR("Failed to get sample, hr %#lx.\n", hr); goto out; } buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface; @@ -263,7 +263,7 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) { if (FAILED(hr = IMemInputPin_Receive(filter->sources[i].pin.pMemInputPin, sample))) { - WARN("Downstream sink returned %#x.\n", hr); + WARN("Downstream sink returned %#lx.\n", hr); goto out; } IMediaSample_SetActualDataLength(sample, 0); @@ -300,7 +300,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed { if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) { - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr); goto out; }
@@ -324,7 +324,7 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed if (FAILED(hr = IMediaObject_ProcessInput(dmo, index, &filter->input_buffer.IMediaBuffer_iface, flags, start, stop - start))) { - ERR("ProcessInput() failed, hr %#x.\n", hr); + ERR("ProcessInput() failed, hr %#lx.\n", hr); goto out; }
@@ -346,11 +346,11 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo);
if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) - ERR("Discontinuity() failed, hr %#x.\n", hr); + ERR("Discontinuity() failed, hr %#lx.\n", hr);
process_output(filter, dmo); if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr);
for (i = 0; i < filter->source_count; ++i) { @@ -372,7 +372,7 @@ static HRESULT dmo_wrapper_end_flush(struct strmbase_sink *iface) IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo);
if (FAILED(hr = IMediaObject_Flush(dmo))) - ERR("Flush() failed, hr %#x.\n", hr); + ERR("Flush() failed, hr %#lx.\n", hr);
for (i = 0; i < filter->source_count; ++i) {
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/qcap/Makefile.in | 1 - dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 18 +++++++++--------- dlls/qcap/avimux.c | 27 ++++++++++++++------------- dlls/qcap/capturegraph.c | 15 ++++++++------- dlls/qcap/filewriter.c | 10 +++++----- dlls/qcap/v4l.c | 4 ++-- dlls/qcap/vfwcapture.c | 24 ++++++++++++------------ 8 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 634bcca2ff4..b61a4a05ab2 100644 --- a/dlls/qcap/Makefile.in +++ b/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 diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 7f759fce5f1..a6f27cf4f26 100644 --- a/dlls/qcap/audiorecord.c +++ b/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; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index b56a051d67b..71d00c4e4ef 100644 --- a/dlls/qcap/avico.c +++ b/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++; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 45b995cc2ff..2e8c2a96681 100644 --- a/dlls/qcap/avimux.c +++ b/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); - FIXME("(%p)->(%p { 0x%x %u %s %s })\n", This, pSelf, - q.Type, q.Proportion, - wine_dbgstr_longlong(q.Late), - wine_dbgstr_longlong(q.TimeStamp)); + AviMux *filter = impl_from_out_IQualityControl(iface); + + FIXME("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s, stub!\n", + filter, sender, q.Type, q.Proportion, + 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; diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 157cfc6178d..45cef802ba2 100644 --- a/dlls/qcap/capturegraph.c +++ b/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; }
diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index e49e6039604..43f6274ea8d 100644 --- a/dlls/qcap/filewriter.c +++ b/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; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ae663389d14..577cc829329 100644 --- a/dlls/qcap/v4l.c +++ b/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, - device->current_caps->video_info.bmiHeader.biHeight); + (int)device->current_caps->video_info.bmiHeader.biWidth, + (int)device->current_caps->video_info.bmiHeader.biHeight);
*params->device = (ULONG_PTR)device; return S_OK; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 84d6c093cc6..d842117e9a5 100644 --- a/dlls/qcap/vfwcapture.c +++ b/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, ¶ms ); @@ -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, ¶ms ); } @@ -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, ¶ms ); } @@ -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;
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/qdvd/Makefile.in | 1 - dlls/qdvd/graph.c | 6 +-- dlls/qdvd/navigator.c | 92 +++++++++++++++++++++---------------------- 3 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in index 826d5dbe639..4c2266d633a 100644 --- a/dlls/qdvd/Makefile.in +++ b/dlls/qdvd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qdvd.dll IMPORTS = strmbase strmiids uuid ole32
diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c index 0e806313e00..ab9ea856fee 100644 --- a/dlls/qdvd/graph.c +++ b/dlls/qdvd/graph.c @@ -40,7 +40,7 @@ static ULONG WINAPI inner_AddRef(IUnknown *iface) { struct graph_builder *builder = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&builder->refcount); - TRACE("%p increasing refcount to %u.\n", builder, refcount); + TRACE("%p increasing refcount to %lu.\n", builder, refcount); return refcount; }
@@ -48,7 +48,7 @@ static ULONG WINAPI inner_Release(IUnknown *iface) { struct graph_builder *builder = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&builder->refcount); - TRACE("%p decreasing refcount to %u.\n", builder, refcount); + TRACE("%p decreasing refcount to %lu.\n", builder, refcount); if (!refcount) free(builder); return refcount; @@ -119,7 +119,7 @@ static HRESULT WINAPI graph_builder_GetDvdInterface(IDvdGraphBuilder *iface, REF
static HRESULT WINAPI graph_builder_RenderDvdVideoVolume(IDvdGraphBuilder *iface, const WCHAR *path, DWORD flags, AM_DVD_RENDERSTATUS *status) { - FIXME("iface %p, path %s, flags %#x, status %p, stub!\n", iface, debugstr_w(path), flags, status); + FIXME("iface %p, path %s, flags %#lx, status %p, stub!\n", iface, debugstr_w(path), flags, status); return E_NOTIMPL; }
diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c index 2a0d013018b..4ce11e2c1b2 100644 --- a/dlls/qdvd/navigator.c +++ b/dlls/qdvd/navigator.c @@ -97,7 +97,7 @@ static HRESULT WINAPI dvd_control2_PlayTitle(IDvdControl2 *iface, ULONG title, D { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, title %u, flags %#x, cmd %p.\n", filter, title, flags, cmd); + FIXME("filter %p, title %lu, flags %#lx, cmd %p.\n", filter, title, flags, cmd);
return E_NOTIMPL; } @@ -107,7 +107,7 @@ static HRESULT WINAPI dvd_control2_PlayChapterInTitle(IDvdControl2 *iface, ULONG { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, title %u, chapter %u, flags %#x, cmd %p.\n", filter, title, chapter, flags, cmd); + FIXME("filter %p, title %lu, chapter %lu, flags %#lx, cmd %p.\n", filter, title, chapter, flags, cmd);
return E_NOTIMPL; } @@ -117,7 +117,7 @@ static HRESULT WINAPI dvd_control2_PlayTimeInTitle(IDvdControl2 *iface, ULONG ti { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, title %u, time %p, flags %#x, cmd %p.\n", filter, title, time, flags, cmd); + FIXME("filter %p, title %lu, time %p, flags %#lx, cmd %p.\n", filter, title, time, flags, cmd);
return E_NOTIMPL; } @@ -135,7 +135,7 @@ static HRESULT WINAPI dvd_control2_ReturnFromSubmenu(IDvdControl2 *iface, DWORD { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, flags %#x, cmd %p.\n", filter, flags, cmd); + FIXME("filter %p, flags %#lx, cmd %p.\n", filter, flags, cmd);
return E_NOTIMPL; } @@ -144,7 +144,7 @@ static HRESULT WINAPI dvd_control2_PlayAtTime(IDvdControl2 *iface, DVD_HMSF_TIME { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, time %p, flags %#x, cmd %p.\n", filter, time, flags, cmd); + FIXME("filter %p, time %p, flags %#lx, cmd %p.\n", filter, time, flags, cmd);
return E_NOTIMPL; } @@ -153,7 +153,7 @@ static HRESULT WINAPI dvd_control2_PlayChapter(IDvdControl2 *iface, ULONG chapte { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, chapter %u, flags %#x, cmd %p.\n", filter, chapter, flags, cmd); + FIXME("filter %p, chapter %lu, flags %#lx, cmd %p.\n", filter, chapter, flags, cmd);
return E_NOTIMPL; } @@ -162,7 +162,7 @@ static HRESULT WINAPI dvd_control2_PlayPrevChapter(IDvdControl2 *iface, DWORD fl { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, flags %#x, cmd %p.\n", filter, flags, cmd); + FIXME("filter %p, flags %#lx, cmd %p.\n", filter, flags, cmd);
return E_NOTIMPL; } @@ -171,7 +171,7 @@ static HRESULT WINAPI dvd_control2_ReplayChapter(IDvdControl2 *iface, DWORD flag { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, flags %#x, cmd %p.\n", filter, flags, cmd); + FIXME("filter %p, flags %#lx, cmd %p.\n", filter, flags, cmd);
return E_NOTIMPL; } @@ -180,7 +180,7 @@ static HRESULT WINAPI dvd_control2_PlayNextChapter(IDvdControl2 *iface, DWORD fl { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, flags %#x, cmd %p.\n", filter, flags, cmd); + FIXME("filter %p, flags %#lx, cmd %p.\n", filter, flags, cmd);
return E_NOTIMPL; } @@ -189,7 +189,7 @@ static HRESULT WINAPI dvd_control2_PlayForwards(IDvdControl2 *iface, double spee { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, speed %f, flags %#x, cmd %p.\n", filter, speed, flags, cmd); + FIXME("filter %p, speed %.16e, flags %#lx, cmd %p.\n", filter, speed, flags, cmd);
return E_NOTIMPL; } @@ -198,7 +198,7 @@ static HRESULT WINAPI dvd_control2_PlayBackwards(IDvdControl2 *iface, double spe { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, speed %f, flags %#x, cmd %p.\n", filter, speed, flags, cmd); + FIXME("filter %p, speed %.16e, flags %#lx, cmd %p.\n", filter, speed, flags, cmd);
return E_NOTIMPL; } @@ -207,7 +207,7 @@ static HRESULT WINAPI dvd_control2_ShowMenu(IDvdControl2 *iface, DVD_MENU_ID id, { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, id %d, flags %#x, cmd %p.\n", filter, id, flags, cmd); + FIXME("filter %p, id %d, flags %#lx, cmd %p.\n", filter, id, flags, cmd);
return E_NOTIMPL; } @@ -216,7 +216,7 @@ static HRESULT WINAPI dvd_control2_Resume(IDvdControl2 *iface, DWORD flags, IDvd { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, flags %#x, cmd %p.\n", filter, flags, cmd); + FIXME("filter %p, flags %#lx, cmd %p.\n", filter, flags, cmd);
return E_NOTIMPL; } @@ -243,7 +243,7 @@ static HRESULT WINAPI dvd_control2_SelectButton(IDvdControl2 *iface, ULONG butto { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, button %u.\n", filter, button); + FIXME("filter %p, button %lu.\n", filter, button);
return E_NOTIMPL; } @@ -252,7 +252,7 @@ static HRESULT WINAPI dvd_control2_SelectAndActivateButton(IDvdControl2 *iface, { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, button %u.\n", filter, button); + FIXME("filter %p, button %lu.\n", filter, button);
return E_NOTIMPL; } @@ -279,7 +279,7 @@ static HRESULT WINAPI dvd_control2_SelectAudioStream(IDvdControl2 *iface, ULONG { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, stream %u, flags %#x, cmd %p.\n", filter, stream, flags, cmd); + FIXME("filter %p, stream %lu, flags %#lx, cmd %p.\n", filter, stream, flags, cmd);
return E_NOTIMPL; } @@ -288,7 +288,7 @@ static HRESULT WINAPI dvd_control2_SelectSubpictureStream(IDvdControl2 *iface, U { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, stream %u, flags %#x, cmd %p.\n", filter, stream, flags, cmd); + FIXME("filter %p, stream %lu, flags %#lx, cmd %p.\n", filter, stream, flags, cmd);
return E_NOTIMPL; } @@ -297,7 +297,7 @@ static HRESULT WINAPI dvd_control2_SetSubpictureState(IDvdControl2 *iface, BOOL { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, enable %d, flags %#x, cmd %p.\n", filter, enable, flags, cmd); + FIXME("filter %p, enable %d, flags %#lx, cmd %p.\n", filter, enable, flags, cmd);
return E_NOTIMPL; } @@ -306,7 +306,7 @@ static HRESULT WINAPI dvd_control2_SelectAngle(IDvdControl2 *iface, ULONG angle, { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, angle %u, flags %#x, cmd %p.\n", filter, angle, flags, cmd); + FIXME("filter %p, angle %lu, flags %#lx, cmd %p.\n", filter, angle, flags, cmd);
return E_NOTIMPL; } @@ -315,7 +315,7 @@ static HRESULT WINAPI dvd_control2_SelectParentalLevel(IDvdControl2 *iface, ULON { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, level %u.\n", filter, level); + FIXME("filter %p, level %lu.\n", filter, level);
return E_NOTIMPL; } @@ -333,7 +333,7 @@ static HRESULT WINAPI dvd_control2_SelectKaraokeAudioPresentationMode(IDvdContro { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, mode %u.\n", filter, mode); + FIXME("filter %p, mode %lu.\n", filter, mode);
return E_NOTIMPL; } @@ -342,7 +342,7 @@ static HRESULT WINAPI dvd_control2_SelectVideoModePreference(IDvdControl2 *iface { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, mode %u.\n", filter, mode); + FIXME("filter %p, mode %lu.\n", filter, mode);
return E_NOTIMPL; } @@ -379,7 +379,7 @@ static HRESULT WINAPI dvd_control2_PlayChaptersAutoStop(IDvdControl2 *iface, ULO { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, title %u, chapter %u, count %u, flags %#x, cmd %p.\n", filter, title, chapter, count, flags, cmd); + FIXME("filter %p, title %lu, chapter %lu, count %lu, flags %#lx, cmd %p.\n", filter, title, chapter, count, flags, cmd);
return E_NOTIMPL; } @@ -406,7 +406,7 @@ static HRESULT WINAPI dvd_control2_SetState(IDvdControl2 *iface, IDvdState *stat { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, state %p, flags %#x, cmd %p.\n", filter, state, flags, cmd); + FIXME("filter %p, state %p, flags %#lx, cmd %p.\n", filter, state, flags, cmd);
return E_NOTIMPL; } @@ -416,7 +416,7 @@ static HRESULT WINAPI dvd_control2_PlayPeriodInTitleAutoStop(IDvdControl2 *iface { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, title %u, start_time %p, end_time %p, flags %#x, cmd %p.\n", + FIXME("filter %p, title %lu, start_time %p, end_time %p, flags %#lx, cmd %p.\n", filter, title, start_time, end_time, flags, cmd);
return E_NOTIMPL; @@ -426,7 +426,7 @@ static HRESULT WINAPI dvd_control2_SetGRPM(IDvdControl2 *iface, ULONG index, WOR { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, index %u, value %i, flags %#x, cmd %p.\n", filter, index, value, flags, cmd); + FIXME("filter %p, index %lu, value %d, flags %#lx, cmd %p.\n", filter, index, value, flags, cmd);
return E_NOTIMPL; } @@ -435,7 +435,7 @@ static HRESULT WINAPI dvd_control2_SelectDefaultMenuLanguage(IDvdControl2 *iface { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, language %#x.\n", filter, language); + FIXME("filter %p, language %#lx.\n", filter, language);
return E_NOTIMPL; } @@ -445,7 +445,7 @@ static HRESULT WINAPI dvd_control2_SelectDefaultAudioLanguage(IDvdControl2 *ifac { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, language %#x, extension %d.\n", filter, language, extension); + FIXME("filter %p, language %#lx, extension %d.\n", filter, language, extension);
return E_NOTIMPL; } @@ -455,7 +455,7 @@ static HRESULT WINAPI dvd_control2_SelectDefaultSubpictureLanguage(IDvdControl2 { struct navigator *filter = impl_from_IDvdControl2(iface);
- FIXME("filter %p, language %#x, extension %d.\n", filter, language, extension); + FIXME("filter %p, language %#lx, extension %d.\n", filter, language, extension);
return E_NOTIMPL; } @@ -624,7 +624,7 @@ static HRESULT WINAPI dvd_info2_GetAudioLanguage(IDvdInfo2 *iface, ULONG stream, { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + FIXME("filter %p, stream %lu, language %p.\n", filter, stream, language);
return E_NOTIMPL; } @@ -633,7 +633,7 @@ static HRESULT WINAPI dvd_info2_GetSubpictureLanguage(IDvdInfo2 *iface, ULONG st { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, language %p.\n", filter, stream, language); + FIXME("filter %p, stream %lu, language %p.\n", filter, stream, language);
return E_NOTIMPL; } @@ -643,7 +643,7 @@ static HRESULT WINAPI dvd_info2_GetTitleAttributes(IDvdInfo2 *iface, ULONG index { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, index %u, menu %p, title %p.\n", filter, index, menu, title); + FIXME("filter %p, index %lu, menu %p, title %p.\n", filter, index, menu, title);
return E_NOTIMPL; } @@ -670,7 +670,7 @@ static HRESULT WINAPI dvd_info2_GetAudioAttributes(IDvdInfo2 *iface, ULONG strea { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + FIXME("filter %p, stream %lu, attr %p.\n", filter, stream, attr);
return E_NOTIMPL; } @@ -679,7 +679,7 @@ static HRESULT WINAPI dvd_info2_GetKaraokeAttributes(IDvdInfo2 *iface, ULONG str { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + FIXME("filter %p, stream %lu, attr %p.\n", filter, stream, attr);
return E_NOTIMPL; } @@ -689,7 +689,7 @@ static HRESULT WINAPI dvd_info2_GetSubpictureAttributes(IDvdInfo2 *iface, ULONG { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, attr %p.\n", filter, stream, attr); + FIXME("filter %p, stream %lu, attr %p.\n", filter, stream, attr);
return E_NOTIMPL; } @@ -719,7 +719,7 @@ static HRESULT WINAPI dvd_info2_GetDVDTextLanguageInfo(IDvdInfo2 *iface, ULONG i { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, index %u, string_count %p, language %p, character_set %p.\n", + FIXME("filter %p, index %lu, string_count %p, language %p, character_set %p.\n", filter, index, string_count, language, character_set);
return E_NOTIMPL; @@ -730,7 +730,7 @@ static HRESULT WINAPI dvd_info2_GetDVDTextStringAsNative(IDvdInfo2 *iface, ULONG { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + FIXME("filter %p, lang_index %lu, string_index %lu, string %p, size %lu, ret_size %p, type %p.\n", filter, lang_index, string_index, string, size, ret_size, type);
return E_NOTIMPL; @@ -741,7 +741,7 @@ static HRESULT WINAPI dvd_info2_GetDVDTextStringAsUnicode(IDvdInfo2 *iface, ULON { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, lang_index %u, string_index %u, string %p, size %u, ret_size %p, type %p.\n", + FIXME("filter %p, lang_index %lu, string_index %lu, string %p, size %lu, ret_size %p, type %p.\n", filter, lang_index, string_index, string, size, ret_size, type);
return E_NOTIMPL; @@ -760,7 +760,7 @@ static HRESULT WINAPI dvd_info2_GetNumberOfChapters(IDvdInfo2 *iface, ULONG titl { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, title %u, count %p.\n", filter, title, count); + FIXME("filter %p, title %lu, count %p.\n", filter, title, count);
return E_NOTIMPL; } @@ -769,7 +769,7 @@ static HRESULT WINAPI dvd_info2_GetTitleParentalLevels(IDvdInfo2 *iface, ULONG t { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, title %u, levels %p.\n", filter, title, levels); + FIXME("filter %p, title %lu, levels %p.\n", filter, title, levels);
return E_NOTIMPL; } @@ -778,7 +778,7 @@ static HRESULT WINAPI dvd_info2_GetDVDDirectory(IDvdInfo2 *iface, WCHAR *path, U { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, path %p, size %u, ret_size %p.\n", filter, path, size, ret_size); + FIXME("filter %p, path %p, size %lu, ret_size %p.\n", filter, path, size, ret_size);
return E_NOTIMPL; } @@ -787,7 +787,7 @@ static HRESULT WINAPI dvd_info2_IsAudioStreamEnabled(IDvdInfo2 *iface, ULONG str { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + FIXME("filter %p, stream %lu, enable %p.\n", filter, stream, enable);
return E_NOTIMPL; } @@ -814,7 +814,7 @@ static HRESULT WINAPI dvd_info2_GetMenuLanguages(IDvdInfo2 *iface, LCID *languag { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, languages %p, count %u, ret_count %p.\n", filter, languages, count, ret_count); + FIXME("filter %p, languages %p, count %lu, ret_count %p.\n", filter, languages, count, ret_count);
return E_NOTIMPL; } @@ -832,7 +832,7 @@ static HRESULT WINAPI dvd_info2_GetCmdFromEvent(IDvdInfo2 *iface, LONG_PTR param { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, param %#lx, cmd %p.\n", filter, param, cmd); + FIXME("filter %p, param %#Ix, cmd %p.\n", filter, param, cmd);
return E_NOTIMPL; } @@ -879,7 +879,7 @@ static HRESULT WINAPI dvd_info2_GetButtonRect(IDvdInfo2 *iface, ULONG button, RE { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, button %u, rect %p.\n", filter, button, rect); + FIXME("filter %p, button %lu, rect %p.\n", filter, button, rect);
return E_NOTIMPL; } @@ -888,7 +888,7 @@ static HRESULT WINAPI dvd_info2_IsSubpictureStreamEnabled(IDvdInfo2 *iface, ULON { struct navigator *filter = impl_from_IDvdInfo2(iface);
- FIXME("filter %p, stream %u, enable %p.\n", filter, stream, enable); + FIXME("filter %p, stream %lu, enable %p.\n", filter, stream, enable);
return E_NOTIMPL; }
Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/qedit/Makefile.in | 1 - dlls/qedit/mediadet.c | 40 ++++++++++++++-------------- dlls/qedit/samplegrabber.c | 14 ++++++---- dlls/qedit/timeline.c | 54 +++++++++++++++++++------------------- 4 files changed, 56 insertions(+), 53 deletions(-)
diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 7b0eea3c592..f9b6f5c3ed9 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qedit.dll IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32
diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index cdf2ea8ee5b..ad7ebfba442 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -79,7 +79,7 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var)
if (FAILED(hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) { - ERR("Failed to get property bag, hr %#x.\n", hr); + ERR("Failed to get property bag, hr %#lx.\n", hr); return hr; }
@@ -87,7 +87,7 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) V_VT(var) = VT_BSTR; if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", var, NULL))) { - ERR("Failed to get CLSID, hr %#x.\n", hr); + ERR("Failed to get CLSID, hr %#lx.\n", hr); IPropertyBag_Release(prop_bag); return hr; } @@ -95,7 +95,7 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) VariantClear(var);
if (FAILED(hr = IPropertyBag_Read(prop_bag, L"FriendlyName", var, NULL))) - ERR("Failed to get name, hr %#x.\n", hr); + ERR("Failed to get name, hr %#lx.\n", hr);
IPropertyBag_Release(prop_bag); return hr; @@ -135,20 +135,20 @@ static HRESULT find_splitter(MediaDetImpl *detector)
if (FAILED(hr = IBaseFilter_EnumPins(detector->source, &enum_pins))) { - ERR("Failed to enumerate source pins, hr %#x.\n", hr); + ERR("Failed to enumerate source pins, hr %#lx.\n", hr); return hr; } hr = IEnumPins_Next(enum_pins, 1, &source_pin, NULL); IEnumPins_Release(enum_pins); if (hr != S_OK) { - ERR("Failed to get source pin, hr %#x.\n", hr); + ERR("Failed to get source pin, hr %#lx.\n", hr); return hr; }
if (FAILED(hr = get_pin_media_type(source_pin, &mt))) { - ERR("Failed to get media type, hr %#x.\n", hr); + ERR("Failed to get media type, hr %#lx.\n", hr); IPin_Release(source_pin); return hr; } @@ -248,28 +248,28 @@ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid
static ULONG WINAPI MediaDet_inner_AddRef(IUnknown *iface) { - MediaDetImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedIncrement(&This->ref); + MediaDetImpl *detector = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&detector->ref);
- TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", detector, refcount);
- return ref; + return refcount; }
static ULONG WINAPI MediaDet_inner_Release(IUnknown *iface) { - MediaDetImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->ref); + MediaDetImpl *detector = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&detector->ref);
- TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", detector, refcount);
- if (ref == 0) + if (!refcount) { - MD_cleanup(This); - CoTaskMemFree(This); + MD_cleanup(detector); + CoTaskMemFree(detector); }
- return ref; + return refcount; }
static const IUnknownVtbl mediadet_vtbl = @@ -464,7 +464,7 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) MediaDetImpl *This = impl_from_IMediaDet(iface); HRESULT hr;
- TRACE("(%p)->(%d)\n", This, newVal); + TRACE("detector %p, index %ld.\n", This, newVal);
if (This->num_streams == -1) { @@ -623,7 +623,7 @@ static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, LONG Width, LONG Height) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, + FIXME("(%p)->(%.16e %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; } @@ -633,7 +633,7 @@ static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, LONG Height, BSTR Filename) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%f %d %d %p): not implemented!\n", This, StreamTime, Width, Height, Filename); + FIXME("(%p)->(%.16e %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; }
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index d1b974d3d5d..a89229c4447 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -163,7 +163,7 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa ref = IMediaSample_Release(sample) + 1 - ref; if (ref) { - ERR("(%p) Callback referenced sample %p by %u\n", This, sample, ref); + ERR("(%p) Callback referenced sample %p by %lu\n", This, sample, ref); /* ugly as hell but some apps are sooo buggy */ while (ref--) IMediaSample_Release(sample); @@ -181,7 +181,7 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa case -1: break; default: - FIXME("unsupported method %d\n", This->grabberMethod); + FIXME("Unknown method %ld.\n", This->grabberMethod); /* do not bother us again */ This->grabberMethod = -1; } @@ -315,7 +315,9 @@ static HRESULT WINAPI SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB *cb, LONG whichMethod) { struct sample_grabber *This = impl_from_ISampleGrabber(iface); - TRACE("(%p)->(%p, %u)\n", This, cb, whichMethod); + + TRACE("filter %p, callback %p, method %ld.\n", This, cb, whichMethod); + if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); This->grabberIface = cb; @@ -413,7 +415,9 @@ SampleGrabber_IMemInputPin_ReceiveMultiple(IMemInputPin *iface, IMediaSample **s { struct sample_grabber *This = impl_from_IMemInputPin(iface); LONG idx; - TRACE("(%p)->(%p, %u, %p) output = %p, grabber = %p\n", This, samples, nSamples, nProcessed, This->source.pMemInputPin, This->grabberIface); + + TRACE("filter %p, samples %p, count %lu, ret_count %p.\n", This, samples, nSamples, nProcessed); + if (!samples || !nProcessed) return E_POINTER; if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) @@ -615,7 +619,7 @@ static HRESULT WINAPI sample_grabber_source_DecideAllocator(struct strmbase_sour if (FAILED(hr = IFilterGraph_QueryInterface(filter->filter.graph, &IID_IFilterGraph2, (void **)&graph))) { - ERR("Failed to get IFilterGraph2 interface, hr %#x.\n", hr); + ERR("Failed to get IFilterGraph2 interface, hr %#lx.\n", hr); return hr; }
diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 3a4ed5c017e..c084ecc6c2e 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -97,25 +97,25 @@ static HRESULT WINAPI Timeline_QueryInterface(IUnknown *iface, REFIID riid, void
static ULONG WINAPI Timeline_AddRef(IUnknown *iface) { - TimelineImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedIncrement(&This->ref); + TimelineImpl *timeline = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&timeline->ref);
- TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", timeline, refcount);
- return ref; + return refcount; }
static ULONG WINAPI Timeline_Release(IUnknown *iface) { - TimelineImpl *This = impl_from_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->ref); + TimelineImpl *timeline = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&timeline->ref);
- TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %lu.\n", timeline, refcount);
- if (ref == 0) - CoTaskMemFree(This); + if (!refcount) + CoTaskMemFree(timeline);
- return ref; + return refcount; }
static const IUnknownVtbl timeline_vtbl = @@ -201,7 +201,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_RemGroupFromList(IAMTimeline *iface, static HRESULT WINAPI Timeline_IAMTimeline_GetGroup(IAMTimeline *iface, IAMTimelineObj **group, LONG index) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%p,%d): not implemented!\n", This, group, index); + FIXME("(%p)->(%p,%ld): not implemented!\n", This, group, index); return E_NOTIMPL; }
@@ -229,7 +229,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_GetInsertMode(IAMTimeline *iface, LON static HRESULT WINAPI Timeline_IAMTimeline_SetInsertMode(IAMTimeline *iface, LONG mode) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%d): not implemented!\n", This, mode); + FIXME("(%p)->(%ld): not implemented!\n", This, mode); return E_NOTIMPL; }
@@ -317,7 +317,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_GetCountOfType(IAMTimeline *iface, LO LONG *value_with_comps, TIMELINE_MAJOR_TYPE type) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%d,%p,%p,%04x): not implemented!\n", This, group, value, value_with_comps, type); + FIXME("(%p)->(%ld,%p,%p,%#x): not implemented!\n", This, group, value, value_with_comps, type); return E_NOTIMPL; }
@@ -325,7 +325,7 @@ static HRESULT WINAPI Timeline_IAMTimeline_ValidateSourceNames(IAMTimeline *ifac LONG_PTR notify_event) { TimelineImpl *This = impl_from_IAMTimeline(iface); - FIXME("(%p)->(%d,%p,%lx): not implemented!\n", This, flags, override, notify_event); + FIXME("(%p)->(%ld,%p,%#Ix): not implemented!\n", This, flags, override, notify_event); return E_NOTIMPL; }
@@ -475,25 +475,25 @@ static HRESULT WINAPI TimelineObj_QueryInterface(IAMTimelineObj *iface, REFIID r
static ULONG WINAPI TimelineObj_AddRef(IAMTimelineObj *iface) { - TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - ULONG ref = InterlockedIncrement(&This->ref); + TimelineObjImpl *obj = impl_from_IAMTimelineObj(iface); + ULONG refcount = InterlockedIncrement(&obj->ref);
- TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %lu.\n", obj, refcount);
- return ref; + return refcount; }
static ULONG WINAPI TimelineObj_Release(IAMTimelineObj *iface) { - TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - ULONG ref = InterlockedDecrement(&This->ref); + TimelineObjImpl *obj = impl_from_IAMTimelineObj(iface); + ULONG refcount = InterlockedDecrement(&obj->ref);
- TRACE("(%p) new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %lu.\n", obj, refcount);
- if (!ref) - CoTaskMemFree(This); + if (!refcount) + CoTaskMemFree(obj);
- return ref; + return refcount; }
static HRESULT WINAPI TimelineObj_GetStartStop(IAMTimelineObj *iface, REFERENCE_TIME *start, REFERENCE_TIME *stop) @@ -629,7 +629,7 @@ static HRESULT WINAPI TimelineObj_GetUserID(IAMTimelineObj *iface, LONG *id) static HRESULT WINAPI TimelineObj_SetUserID(IAMTimelineObj *iface, LONG id) { TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%d): not implemented!\n", This, id); + FIXME("(%p)->(%ld): not implemented!\n", This, id); return E_NOTIMPL; }
@@ -664,7 +664,7 @@ static HRESULT WINAPI TimelineObj_GetUserData(IAMTimelineObj *iface, BYTE *data, static HRESULT WINAPI TimelineObj_SetUserData(IAMTimelineObj *iface, BYTE *data, LONG size) { TimelineObjImpl *This = impl_from_IAMTimelineObj(iface); - FIXME("(%p)->(%p,%d): not implemented!\n", This, data, size); + FIXME("(%p)->(%p,%ld): not implemented!\n", This, data, size); return E_NOTIMPL; }
@@ -912,7 +912,7 @@ static HRESULT WINAPI timelinegrp_GetPreviewMode(IAMTimelineGroup *iface, BOOL * static HRESULT WINAPI timelinegrp_SetMediaTypeForVB(IAMTimelineGroup *iface, LONG type) { TimelineObjImpl *This = impl_from_IAMTimelineGroup(iface); - FIXME("(%p)->(%d)\n", This, type); + FIXME("(%p)->(%ld)\n", This, type); return E_NOTIMPL; }
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=107384
Your paranoid android.
=== debian11 (32 bit report) ===
qedit: mediadet.c:94: Test failed: Got unexpected refcount 5. mediadet.c:97: Test failed: Got unexpected refcount 6. mediadet.c:101: Test failed: Got unexpected refcount 7. mediadet.c:130: Test failed: Got unexpected refcount 10. mediadet.c:628: Test failed: IMediaDet_Release returned: 4 mediadet.c:737: Test failed: IMediaDet_Release returned: 4 mediadet.c:828: Test failed: Got outstanding refcount 4. mediadet.c:830: Test failed: Got outstanding refcount 4. mediadet.c:867: Test failed: Got outstanding refcount 4. mediadet.c:1150: Test failed: Failed to delete file, error 32. mediadet.c:1152: Test failed: Failed to delete file, error 32.
=== debian11 (32 bit Chinese:China report) ===
qedit: mediadet.c:94: Test failed: Got unexpected refcount 5. mediadet.c:97: Test failed: Got unexpected refcount 6. mediadet.c:101: Test failed: Got unexpected refcount 7. mediadet.c:130: Test failed: Got unexpected refcount 10. mediadet.c:628: Test failed: IMediaDet_Release returned: 4 mediadet.c:737: Test failed: IMediaDet_Release returned: 4 mediadet.c:828: Test failed: Got outstanding refcount 4. mediadet.c:830: Test failed: Got outstanding refcount 4. mediadet.c:867: Test failed: Got outstanding refcount 4. mediadet.c:1150: Test failed: Failed to delete file, error 32. mediadet.c:1152: Test failed: Failed to delete file, error 32.
=== debian11 (32 bit WoW report) ===
qedit: mediadet.c:94: Test failed: Got unexpected refcount 5. mediadet.c:97: Test failed: Got unexpected refcount 6. mediadet.c:101: Test failed: Got unexpected refcount 7. mediadet.c:130: Test failed: Got unexpected refcount 10. mediadet.c:628: Test failed: IMediaDet_Release returned: 4 mediadet.c:737: Test failed: IMediaDet_Release returned: 4 mediadet.c:828: Test failed: Got outstanding refcount 4. mediadet.c:830: Test failed: Got outstanding refcount 4. mediadet.c:867: Test failed: Got outstanding refcount 4. mediadet.c:1150: Test failed: Failed to delete file, error 32. mediadet.c:1152: Test failed: Failed to delete file, error 32.
=== debian11 (64 bit WoW report) ===
qedit: mediadet.c:94: Test failed: Got unexpected refcount 5. mediadet.c:97: Test failed: Got unexpected refcount 6. mediadet.c:101: Test failed: Got unexpected refcount 7. mediadet.c:130: Test failed: Got unexpected refcount 10. mediadet.c:628: Test failed: IMediaDet_Release returned: 4 mediadet.c:737: Test failed: IMediaDet_Release returned: 4 mediadet.c:828: Test failed: Got outstanding refcount 4. mediadet.c:830: Test failed: Got outstanding refcount 4. mediadet.c:867: Test failed: Got outstanding refcount 4. mediadet.c:1150: Test failed: Failed to delete file, error 32. mediadet.c:1152: Test failed: Failed to delete file, error 32.
-
Marvin -
Zebediah Figura