November 2019 - Wine-Devel - list.winehq.org

[PATCH] tapi32: Add error checks for lineInitialize
by Vijay Kiran Kamuju Nov. 23, 2019

Nov. 23, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/tapi32/line.c | 4 ++++ dlls/tapi32/tests/tapi.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index a44ac1a1a726..a978e8e69321 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1165,6 +1165,10 @@ DWORD WINAPI lineInitialize( { FIXME("(%p, %p, %p, %s, %p): stub.\n", lphLineApp, hInstance, lpfnCallback, debugstr_a(lpszAppName), lpdwNumDevs); + + if (!lphLineApp || !hInstance || !lpfnCallback || !lpdwNumDevs) + return LINERR_INVALPOINTER; + return 0; } diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c index 13772c8c7d49..e6fcc96b1853 100644 --- a/dlls/tapi32/tests/tapi.c +++ b/dlls/tapi32/tests/tapi.c @@ -35,16 +35,16 @@ static void test_lineInitialize(void) HLINEAPP lnApp; ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); - todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); ok(!ret, "unexpected return value, got %u.\n", ret); -- 2.21.0

2 1

[PATCH 1/5] strmbase: Return a strmbase_pin pointer from the filter_get_pin() callback.
by Zebediah Figura Nov. 23, 2019

Nov. 23, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 6 +++--- dlls/qcap/avimux.c | 6 +++--- dlls/qcap/smartteefilter.c | 8 ++++---- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 6 +++--- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/strmbase/enumpins.c | 10 ++++------ dlls/strmbase/filter.c | 14 +++----------- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 6 +++--- dlls/winegstreamer/gstdemux.c | 6 +++--- dlls/wineqtdecoder/qtsplitter.c | 10 +++++----- include/wine/strmbase.h | 2 +- 17 files changed, 45 insertions(+), 55 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 6446ee6b4e..0262bc5bd8 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -67,7 +67,7 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin *audio_record_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *audio_record_get_pin(struct strmbase_filter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 1cbeb70f03..2e81a6b0c4 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -178,14 +178,14 @@ static const IBaseFilterVtbl AVICompressorVtbl = { BaseFilterImpl_QueryVendorInfo, }; -static IPin *avi_compressor_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *avi_compressor_get_pin(struct strmbase_filter *iface, unsigned int index) { AVICompressor *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 51a1a503af..1995358ac2 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -113,14 +113,14 @@ static inline AviMux* impl_from_strmbase_filter(struct strmbase_filter *filter) return CONTAINING_RECORD(filter, AviMux, filter); } -static IPin *avi_mux_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *avi_mux_get_pin(struct strmbase_filter *iface, unsigned int index) { AviMux *filter = impl_from_strmbase_filter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; else if (index <= filter->input_pin_no) - return &filter->in[index - 1]->pin.pin.IPin_iface; + return &filter->in[index - 1]->pin.pin; return NULL; } diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index e3740bed13..fd0dd621e3 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -69,16 +69,16 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo }; -static IPin *smart_tee_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *smart_tee_get_pin(struct strmbase_filter *iface, unsigned int index) { SmartTeeFilter *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->capture.pin.IPin_iface; + return &filter->capture.pin; else if (index == 2) - return &filter->preview.pin.IPin_iface; + return &filter->preview.pin; return NULL; } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 0be0914836..883aade2dc 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -82,14 +82,14 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa return CONTAINING_RECORD(iface, VfwCapture, IPersistPropertyBag_iface); } -static IPin *vfw_capture_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *vfw_capture_get_pin(struct strmbase_filter *iface, unsigned int index) { VfwCapture *This = impl_from_strmbase_filter(iface); if (index >= 1) return NULL; - return &This->source.pin.IPin_iface; + return &This->source.pin; } static void vfw_capture_destroy(struct strmbase_filter *iface) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 59238f5896..9dd8c02b23 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -100,14 +100,14 @@ static void SampleGrabber_cleanup(SG_Impl *This) IUnknown_Release(This->seekthru_unk); } -static IPin *sample_grabber_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *sample_grabber_get_pin(struct strmbase_filter *iface, unsigned int index) { SG_Impl *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 59f1cc5a18..1c17980f58 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -341,12 +341,12 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID return FALSE; } -static IPin *async_reader_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *async_reader_get_pin(struct strmbase_filter *iface, unsigned int index) { AsyncReader *filter = impl_from_strmbase_filter(iface); if (!index && filter->pszFileName) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 046d94b0b8..8ff7917a7b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -519,11 +519,11 @@ static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *if return CONTAINING_RECORD(iface, struct testfilter, filter); } -static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) { struct testfilter *filter = impl_from_BaseFilter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 568d74a26a..01d9ad10fa 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -879,11 +879,11 @@ static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filte return CONTAINING_RECORD(iface, struct testfilter, filter); } -static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) { struct testfilter *filter = impl_from_strmbase_filter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c5a455afb2..9379fa11e4 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -883,11 +883,11 @@ static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filte return CONTAINING_RECORD(iface, struct testfilter, filter); } -static IPin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) { struct testfilter *filter = impl_from_strmbase_filter(iface); if (!index) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 5175158e96..1cfea85b0c 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -42,7 +42,6 @@ static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT enum_pins_create(struct strmbase_filter *base, IEnumPins **out) { IEnumPinsImpl *object; - IPin *pin; if (!out) return E_POINTER; @@ -59,7 +58,7 @@ HRESULT enum_pins_create(struct strmbase_filter *base, IEnumPins **out) IBaseFilter_AddRef(&base->IBaseFilter_iface); object->Version = base->pin_version; - while ((pin = base->ops->filter_get_pin(base, object->count))) + while (base->ops->filter_get_pin(base, object->count)) ++object->count; TRACE("Created enumerator %p.\n", object); @@ -137,12 +136,12 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** for (i = 0; i < cPins; ++i) { - IPin *pin = This->base->ops->filter_get_pin(This->base, This->uIndex + i); + struct strmbase_pin *pin = This->base->ops->filter_get_pin(This->base, This->uIndex + i); if (!pin) break; - IPin_AddRef(ppPins[i] = pin); + IPin_AddRef(ppPins[i] = &pin->IPin_iface); } if (pcFetched) @@ -173,14 +172,13 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) { IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); - IPin *pin; TRACE("iface %p.\n", iface); if (enum_pins->Version != enum_pins->base->pin_version) { enum_pins->count = 0; - while ((pin = enum_pins->base->ops->filter_get_pin(enum_pins->base, enum_pins->count))) + while (enum_pins->base->ops->filter_get_pin(enum_pins->base, enum_pins->count)) ++enum_pins->count; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index ffe506d517..60e3823322 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -250,24 +250,16 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) { struct strmbase_filter *This = impl_from_IBaseFilter(iface); + struct strmbase_pin *pin; unsigned int i; - PIN_INFO info; - HRESULT hr; - IPin *pin; TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); for (i = 0; (pin = This->ops->filter_get_pin(This, i)); ++i) { - hr = IPin_QueryPinInfo(pin, &info); - if (FAILED(hr)) - return hr; - - if (info.pFilter) IBaseFilter_Release(info.pFilter); - - if (!lstrcmpW(id, info.achName)) + if (!lstrcmpW(id, pin->name)) { - IPin_AddRef(*ret = pin); + IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; } } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index aa134ba5da..add999b4ec 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -163,12 +163,12 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment }; -static IPin *renderer_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *renderer_get_pin(struct strmbase_filter *iface, unsigned int index) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; return NULL; } diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 12a99eef67..e7d4d66164 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -114,14 +114,14 @@ static HRESULT source_get_media_type(struct strmbase_pin *This, unsigned int iPo return S_OK; } -static IPin *transform_get_pin(struct strmbase_filter *iface, unsigned int index) +static struct strmbase_pin *transform_get_pin(struct strmbase_filter *iface, unsigned int index) { TransformFilter *filter = impl_from_strmbase_filter(iface); if (index == 0) - return &filter->sink.pin.IPin_iface; + return &filter->sink.pin; else if (index == 1) - return &filter->source.pin.IPin_iface; + return &filter->source.pin; return NULL; } diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 394b919df9..479077b48f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1203,14 +1203,14 @@ static inline struct gstdemux_source *impl_from_IMediaSeeking(IMediaSeeking *ifa return CONTAINING_RECORD(iface, struct gstdemux_source, seek.IMediaSeeking_iface); } -static IPin *gstdemux_get_pin(struct strmbase_filter *base, unsigned int index) +static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsigned int index) { struct gstdemux *filter = impl_from_strmbase_filter(base); if (!index) - return &filter->sink.IPin_iface; + return &filter->sink; else if (index <= filter->cStreams) - return &filter->ppPins[index - 1]->pin.pin.IPin_iface; + return &filter->ppPins[index - 1]->pin.pin; return NULL; } diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2da0f691dc..fbec10a912 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -208,21 +208,21 @@ static inline QTInPin *impl_from_IPin(IPin *iface) * Base Filter */ -static IPin *qt_splitter_get_pin(struct strmbase_filter *base, unsigned int index) +static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, unsigned int index) { QTSplitter *filter = impl_from_strmbase_filter(base); if (index == 0) - return &filter->pInputPin.pin.IPin_iface; + return &filter->pInputPin.pin; else if (index == 1) { if (filter->pVideo_Pin) - return &filter->pVideo_Pin->pin.pin.IPin_iface; + return &filter->pVideo_Pin->pin.pin; else if (filter->pAudio_Pin) - return &filter->pAudio_Pin->pin.pin.IPin_iface; + return &filter->pAudio_Pin->pin.pin; } else if (index == 2 && filter->pVideo_Pin && filter->pAudio_Pin) - return &filter->pAudio_Pin->pin.pin.IPin_iface; + return &filter->pAudio_Pin->pin.pin; return NULL; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index fd79e9726d..dd2f8426bf 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -166,7 +166,7 @@ struct strmbase_filter struct strmbase_filter_ops { - IPin *(*filter_get_pin)(struct strmbase_filter *iface, unsigned int index); + struct strmbase_pin *(*filter_get_pin)(struct strmbase_filter *iface, unsigned int index); void (*filter_destroy)(struct strmbase_filter *iface); HRESULT (*filter_query_interface)(struct strmbase_filter *iface, REFIID iid, void **out); -- 2.24.0

1 4

[PATCH] rasapi32: Add a few error checks in for RasGetErrorStringA and tests
by Vijay Kiran Kamuju Nov. 22, 2019

Nov. 22, 2019

Supercedes 174337 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/rasapi32/rasapi.c | 14 ++++++++++++-- dlls/rasapi32/tests/rasapi.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab133e..6f0dfaa06b33 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -458,14 +458,24 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetProjectionInfoA(HRASCONN hrasconn, RASPROJECTION rasprojection, diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 5171bb2762ca..d0850b8055af 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -28,6 +28,7 @@ static HMODULE hmodule; static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD); +static DWORD (WINAPI *pRasGetErrorStringA)(UINT, LPSTR, DWORD); #define RASAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hmodule, #func); \ @@ -39,6 +40,7 @@ static void InitFunctionPtrs(void) hmodule = LoadLibraryA("rasapi32.dll"); RASAPI32_GET_PROC(RasEnumDevicesA) + RASAPI32_GET_PROC(RasGetErrorStringA) } static void test_rasenum(void) @@ -176,11 +178,44 @@ static void test_rasenum(void) HeapFree(GetProcessHeap(), 0, rasDevInfo); } +static void test_rasgeterrorstring(void) +{ + DWORD result; + UINT errcode; + CHAR buffer[512]; + + errcode = 87; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, NULL, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 10); + todo_wine ok(result == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 256); + todo_wine ok(result == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08d\n", result); + + errcode = 999; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); +} + START_TEST(rasapi) { InitFunctionPtrs(); test_rasenum(); + test_rasgeterrorstring(); FreeLibrary(hmodule); } -- 2.21.0

1 0

[PATCH] include: fix definition of PHONECALLBACK in tapi.h
by Vijay Kiran Kamuju Nov. 22, 2019

Nov. 22, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/tapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tapi.h b/include/tapi.h index 535ca67a4295..b87b139ddaaa 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -879,7 +879,7 @@ typedef struct phonestatus_tag { DWORD dwDevSpecificOffset; } PHONESTATUS, *LPPHONESTATUS; -typedef void (CALLBACK *PHONECALLBACK)(HANDLE, DWORD, DWORD, DWORD, DWORD, DWORD); +typedef void (CALLBACK *PHONECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR); typedef struct varstring_tag { DWORD dwTotalSize; -- 2.21.0

1 0

[PATCH] rasapi32: Add tests for RasGetErrorStringA
by Vijay Kiran Kamuju Nov. 22, 2019

Nov. 22, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/rasapi32/rasapi.c | 14 ++++++++++++-- dlls/rasapi32/tests/rasapi.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab133e..6f0dfaa06b33 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -458,14 +458,24 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { + DWORD ret = 1; + FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); - return 1; + if (uErrorValue < RASBASE || uErrorValue > RASBASEEND || !lpszErrorString) + ret = ERROR_INVALID_PARAMETER; + + return ret; } DWORD WINAPI RasGetProjectionInfoA(HRASCONN hrasconn, RASPROJECTION rasprojection, diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 5171bb2762ca..d0850b8055af 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -28,6 +28,7 @@ static HMODULE hmodule; static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD); +static DWORD (WINAPI *pRasGetErrorStringA)(UINT, LPSTR, DWORD); #define RASAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hmodule, #func); \ @@ -39,6 +40,7 @@ static void InitFunctionPtrs(void) hmodule = LoadLibraryA("rasapi32.dll"); RASAPI32_GET_PROC(RasEnumDevicesA) + RASAPI32_GET_PROC(RasGetErrorStringA) } static void test_rasenum(void) @@ -176,11 +178,44 @@ static void test_rasenum(void) HeapFree(GetProcessHeap(), 0, rasDevInfo); } +static void test_rasgeterrorstring(void) +{ + DWORD result; + UINT errcode; + CHAR buffer[512]; + + errcode = 87; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, NULL, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 10); + todo_wine ok(result == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08d\n", result); + + errcode = 600; + result = pRasGetErrorStringA(errcode, buffer, 256); + todo_wine ok(result == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08d\n", result); + + errcode = 999; + result = pRasGetErrorStringA(errcode, buffer, 256); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); +} + START_TEST(rasapi) { InitFunctionPtrs(); test_rasenum(); + test_rasgeterrorstring(); FreeLibrary(hmodule); } -- 2.21.0

1 0

[PATCH] quartz/tests: Relax some more timings.
by Zebediah Figura Nov. 22, 2019

Nov. 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4b233dbcff..ca4503117a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3163,7 +3163,7 @@ todo_wine check_filter_state(graph, State_Paused); Sleep(600); - start_time += 600 * 10000; + start_time += 550 * 10000; hr = IMediaFilter_Run(filter, 0); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3929,12 +3929,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); @@ -3947,12 +3947,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); -- 2.24.0

2 1

[PATCH v2] quartz/tests: Fix some tests on w7u.
by Zebediah Figura Nov. 22, 2019

Nov. 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 22ddb63746..568d74a26a 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1048,9 +1048,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 4); + memset(data, 0x55, IMediaSample_GetSize(sample)); - hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + hr = IMediaSample_SetActualDataLength(sample, IMediaSample_GetSize(sample)); ok(hr == S_OK, "Got hr %#x.\n", hr); start_time = 0; @@ -1350,6 +1350,10 @@ static void test_connect_pin(void) { vih.bmiHeader.biBitCount = 24; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + /* w7u is also rather buggy with its allocator. Requesting a size of + * 32 * 16 * 4 succeeds and returns that size from SetProperties(), but + * the actual samples only have a size of 32 * 16 * 3. */ + req_props.cbBuffer = 32 * 16 * 3; } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); -- 2.24.0

1 0

[PATCH] dmloader: Stop after find first matching object.
by Alistair Leslie-Hughes Nov. 22, 2019

Nov. 22, 2019

This stops a crash in Legoland on startup when finding cached objects. Placing a break in each of the if's causes the wrong object to be loaded. The help states it looks at each type in order. So, we might have to loop the cache multiple times to ensure that when an object has flag DMUS_OBJ_OBJECT, it's preferred over a DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH match. I hope this simple change will be accepted until a proper solution is implemented. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmloader/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0da8323e7e5..69a438765d5 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -208,6 +208,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": not loaded yet\n"); pObjectEntry = pExistingEntry; } + break; } else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && -- 2.24.0

2 1

[PATCH] quartz/tests: Fix some tests on w7u.
by Zebediah Figura Nov. 22, 2019

Nov. 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 29a4bea781..dd2e9ace97 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1048,9 +1048,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 4); + memset(data, 0x55, IMediaSample_GetSize(sample)); - hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + hr = IMediaSample_SetActualDataLength(sample, IMediaSample_GetSize(sample)); ok(hr == S_OK, "Got hr %#x.\n", hr); start_time = 0; @@ -1307,6 +1307,9 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, HRESULT hr; LONG size; + /* Note that the bitmap returned by GetCurrentImage() has a bit depth of + * 32 regardless of the format used for pin connection. */ + expect_bih.biBitCount = 32; expect_bih.biSizeImage = 32 * 16 * 4; IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); @@ -1450,6 +1453,10 @@ static void test_connect_pin(void) { vih.bmiHeader.biBitCount = 24; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + /* w7u is also rather buggy with its allocator. Requesting a size of + * 32 * 16 * 4 succeeds and returns that size from SetProperties(), but + * the actual samples only have a size of 32 * 16 * 3. */ + req_props.cbBuffer = 32 * 16 * 3; } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); -- 2.24.0

2 1

[PATCH] d3dcompiler_43/tests: Fix tracing the expected Stream value in reflection ok() calls.
by Francois Gouget Nov. 22, 2019

Nov. 22, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3dcompiler_43/tests/reflection.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 810eac89364..f8c97230d61 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -434,7 +434,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -459,7 +459,7 @@ static void test_reflection_desc_vs(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -741,7 +741,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -772,7 +772,7 @@ static void test_reflection_desc_ps(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1009,7 +1009,7 @@ static void test_reflection_desc_ps_output(void) ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->ReadWriteMask); + i, desc.Stream, pdesc->Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count); -- 2.20.1

1 0