wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Zebediah Figura : quartz/tests/avisplit: Add some tests for IBaseFilter_EnumPins().
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 0765edd5f24e8f1af340c538c8a860b5527f3623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0765edd5f24e8f1af340c538… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 26 22:56:28 2019 -0600 quartz/tests/avisplit: Add some tests for IBaseFilter_EnumPins(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 245 ++++++++++++++++++++++++++++++++----------- 1 file changed, 185 insertions(+), 60 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 2ad7e0f..418fcb9 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -23,6 +23,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; + static IBaseFilter *create_avi_splitter(void) { IBaseFilter *filter = NULL; @@ -32,6 +34,72 @@ static IBaseFilter *create_avi_splitter(void) return filter; } +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %u.\n", + wine_dbgstr_w(pathW), GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok(!!res, "Failed to load resource, error %u.\n", GetLastError()); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource( GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write resource.\n"); + CloseHandle(file); + + return pathW; +} + +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + +static IFilterGraph2 *connect_input(IBaseFilter *splitter, const WCHAR *filename) +{ + static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; + IFileSourceFilter *filesource; + IFilterGraph2 *graph; + IBaseFilter *reader; + IPin *source, *sink; + HRESULT hr; + + CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&reader); + IBaseFilter_QueryInterface(reader, &IID_IFileSourceFilter, (void **)&filesource); + IFileSourceFilter_Load(filesource, filename, NULL); + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, reader, NULL); + IFilterGraph2_AddFilter(graph, splitter, NULL); + + IBaseFilter_FindPin(splitter, sink_name, &sink); + IBaseFilter_FindPin(reader, outputW, &source); + + hr = IFilterGraph2_ConnectDirect(graph, source, sink, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(source); + IPin_Release(sink); + IBaseFilter_Release(reader); + IFileSourceFilter_Release(filesource); + return graph; +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -72,84 +140,141 @@ static void test_interfaces(void) IBaseFilter_Release(filter); } -static void test_pin(IPin *pin) +static void test_enum_pins(void) { - IMemInputPin *mpin = NULL; + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + IEnumPins *enum1, *enum2; + IFilterGraph2 *graph; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + BOOL ret; - IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&mpin); + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); - ok(mpin == NULL, "IMemInputPin found!\n"); - if (mpin) - IMemInputPin_Release(mpin); - /* TODO */ -} + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); -static void test_basefilter(void) -{ - IEnumPins *pin_enum = NULL; - IBaseFilter *base = create_avi_splitter(); - IPin *pins[2]; - ULONG ref; - HRESULT hr; + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); - hr = IBaseFilter_EnumPins(base, NULL); - ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); - hr= IBaseFilter_EnumPins(base, &pin_enum); - ok(hr == S_OK, "hr = %08x and not S_OK\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); +todo_wine + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(pin_enum, 1, NULL, NULL); - ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); - hr = IEnumPins_Next(pin_enum, 2, pins, NULL); - ok(hr == E_INVALIDARG, "hr = %08x and not E_INVALIDARG\n", hr); + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); - pins[0] = (void *)0xdead; - pins[1] = (void *)0xdeed; + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IEnumPins_Next(pin_enum, 2, pins, &ref); - ok(hr == S_FALSE, "hr = %08x instead of S_FALSE\n", hr); - ok(pins[0] != (void *)0xdead && pins[0] != NULL, - "pins[0] = %p\n", pins[0]); - if (pins[0] != (void *)0xdead && pins[0] != NULL) - { - test_pin(pins[0]); - IPin_Release(pins[0]); - } + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - ok(pins[1] == (void *)0xdeed, "pins[1] = %p\n", pins[1]); + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); - ref = IEnumPins_Release(pin_enum); - ok(ref == 0, "ref is %u and not 0!\n", ref); + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - IBaseFilter_Release(base); -} + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); -static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); -static WCHAR *load_resource(const WCHAR *name) -{ - static WCHAR pathW[MAX_PATH]; - DWORD written; - HANDLE file; - HRSRC res; - void *ptr; + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - GetTempPathW(ARRAY_SIZE(pathW), pathW); - lstrcatW(pathW, name); + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), - GetLastError()); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); - ok( res != 0, "couldn't find resource\n" ); - ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); - WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); - ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); - CloseHandle( file ); + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); - return pathW; + IEnumPins_Release(enum2); + + graph = connect_input(filter, filename); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); +todo_wine + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + IEnumPins_Release(enum1); + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } static void test_filter_graph(void) @@ -399,7 +524,7 @@ START_TEST(avisplit) CoInitialize(NULL); test_interfaces(); - test_basefilter(); + test_enum_pins(); test_filter_graph(); CoUninitialize();

1 0

Zebediah Figura : quartz: Also report the input pin in Parser_GetPinCount( ).
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: fb2f9fa15116b1ece2519699a83eec097c3e6778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb2f9fa15116b1ece2519699… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 26 22:56:27 2019 -0600 quartz: Also report the input pin in Parser_GetPinCount(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 49b0adf..664cecf 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -85,7 +85,7 @@ static LONG WINAPI Parser_GetPinCount(BaseFilter *iface) TRACE("%p->()\n", This); - return This->cStreams; + return This->cStreams + 1; } static const BaseFilterFuncTable BaseFuncTable = {

1 0

Zebediah Figura : quartz/tests/avisplit: Clean up test_query_interface().
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: be916a7eea0858702267cbed0692bfc5e42f4f28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be916a7eea0858702267cbed… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 26 22:56:26 2019 -0600 quartz/tests/avisplit: Clean up test_query_interface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 116 ++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 72 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index be9ec18..2ad7e0f 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1,5 +1,5 @@ /* - * Unit tests for the avi splitter functions + * AVI splitter filter unit tests * * Copyright (C) 2007 Google (Lei Zhang) * Copyright (C) 2008 Google (Maarten Lankhorst) @@ -20,62 +20,56 @@ */ #define COBJMACROS - -#include "wine/test.h" #include "dshow.h" -#include "tlhelp32.h" - -static IUnknown *pAviSplitter = NULL; +#include "wine/test.h" -static BOOL create_avisplitter(void) +static IBaseFilter *create_avi_splitter(void) { - HRESULT hr; - - hr = CoCreateInstance(&CLSID_AviSplitter, NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (LPVOID*)&pAviSplitter); - return (hr == S_OK && pAviSplitter != NULL); + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_AviSplitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; } -static void release_avisplitter(void) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { - HRESULT hr; - - Sleep(1000); - hr = IUnknown_Release(pAviSplitter); + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; - /* Looks like wine has a reference leak somewhere on test_threads tests, - * it passes in windows - */ - ok(hr == 0, "IUnknown_Release failed with %d\n", (INT)hr); + expected_hr = supported ? S_OK : E_NOINTERFACE; - while (hr > 0) - hr = IUnknown_Release(pAviSplitter); - pAviSplitter = NULL; + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); } -static void test_query_interface(void) +static void test_interfaces(void) { - HRESULT hr; - ULONG ref; - IUnknown *iface= NULL; - -#define TEST_INTERFACE(riid,expected) do { \ - hr = IUnknown_QueryInterface(pAviSplitter, &riid, (void**)&iface); \ - ok( hr == expected, #riid" should %s got %08X\n", expected==S_OK ? "exist" : "not be present", GetLastError() ); \ - if (hr == S_OK) { \ - ref = IUnknown_Release(iface); \ - ok(ref == 1, "Reference is %u, expected 1\n", ref); \ - } \ - iface = NULL; \ - } while(0) - - TEST_INTERFACE(IID_IBaseFilter,S_OK); - TEST_INTERFACE(IID_IMediaSeeking,E_NOINTERFACE); - TEST_INTERFACE(IID_IKsPropertySet,E_NOINTERFACE); - TEST_INTERFACE(IID_IMediaPosition,E_NOINTERFACE); - TEST_INTERFACE(IID_IQualityControl,E_NOINTERFACE); - TEST_INTERFACE(IID_IQualProp,E_NOINTERFACE); -#undef TEST_INTERFACE + IBaseFilter *filter = create_avi_splitter(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); } static void test_pin(IPin *pin) @@ -93,19 +87,11 @@ static void test_pin(IPin *pin) static void test_basefilter(void) { IEnumPins *pin_enum = NULL; - IBaseFilter *base = NULL; + IBaseFilter *base = create_avi_splitter(); IPin *pins[2]; ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void **)&base); - if (base == NULL) - { - /* test_query_interface handles this case */ - skip("No IBaseFilter\n"); - return; - } - hr = IBaseFilter_EnumPins(base, NULL); ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); @@ -169,7 +155,7 @@ static WCHAR *load_resource(const WCHAR *name) static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; - IBaseFilter *preader = NULL, *pavi = NULL; + IBaseFilter *preader = NULL, *pavi = create_avi_splitter(); IEnumPins *enumpins = NULL; IPin *filepin = NULL, *avipin = NULL; HRESULT hr; @@ -202,7 +188,7 @@ static void test_filter_graph(void) return; } - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IFileSourceFilter, + hr = IUnknown_QueryInterface(pavi, &IID_IFileSourceFilter, (void **)&pfile); ok(hr == E_NOINTERFACE, "Avi splitter returns unexpected error: %08x\n", hr); @@ -222,12 +208,6 @@ static void test_filter_graph(void) if (hr != S_OK) goto fail; - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, - (void**)&pavi); - ok(hr == S_OK, "Could not get base filter: %08x\n", hr); - if (hr != S_OK) - goto fail; - hr = IFileSourceFilter_Load(pfile, filename, NULL); if (hr != S_OK) { @@ -418,17 +398,9 @@ START_TEST(avisplit) { CoInitialize(NULL); - if (!create_avisplitter()) - { - skip("Could not create avisplitter\n"); - return; - } - - test_query_interface(); + test_interfaces(); test_basefilter(); test_filter_graph(); - release_avisplitter(); - CoUninitialize(); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Rewrite FindString to use helpers and avoid the macro.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 874c5508ee6d55f727de50cc5f1583a97bb1696b URL: https://source.winehq.org/git/wine.git/?a=commit;h=874c5508ee6d55f727de50cc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 27 14:19:15 2019 +0200 comctl32/listbox: Rewrite FindString to use helpers and avoid the macro. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 57 +++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 954866a..f2d0615 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -965,46 +965,42 @@ static INT LISTBOX_FindFileStrPos( LB_DESCR *descr, LPCWSTR str ) */ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exact ) { - INT i; - LB_ITEMDATA *item; + INT i, index; if (descr->style & LBS_NODATA) return LB_ERR; - if (start >= descr->nb_items) start = -1; - item = descr->items + start + 1; + start++; + if (start >= descr->nb_items) start = 0; if (HAS_STRINGS(descr)) { if (!str || ! str[0] ) return LB_ERR; if (exact) { - for (i = start + 1; i < descr->nb_items; i++, item++) - if (!LISTBOX_lstrcmpiW( descr->locale, str, item->str )) return i; - for (i = 0, item = descr->items; i <= start; i++, item++) - if (!LISTBOX_lstrcmpiW( descr->locale, str, item->str )) return i; + for (i = 0, index = start; i < descr->nb_items; i++, index++) + { + if (index == descr->nb_items) index = 0; + if (!LISTBOX_lstrcmpiW(descr->locale, str, get_item_string(descr, index))) + return index; + } } else { - /* Special case for drives and directories: ignore prefix */ -#define CHECK_DRIVE(item) \ - if ((item)->str[0] == '[') \ - { \ - if (!strncmpiW( str, (item)->str+1, len )) return i; \ - if (((item)->str[1] == '-') && !strncmpiW(str, (item)->str+2, len)) \ - return i; \ - } - + /* Special case for drives and directories: ignore prefix */ INT len = strlenW(str); - for (i = start + 1; i < descr->nb_items; i++, item++) - { - if (!strncmpiW( str, item->str, len )) return i; - CHECK_DRIVE(item); - } - for (i = 0, item = descr->items; i <= start; i++, item++) + WCHAR *item_str; + + for (i = 0, index = start; i < descr->nb_items; i++, index++) { - if (!strncmpiW( str, item->str, len )) return i; - CHECK_DRIVE(item); + if (index == descr->nb_items) index = 0; + item_str = get_item_string(descr, index); + + if (!strncmpiW(str, item_str, len)) return index; + if (item_str[0] == '[') + { + if (!strncmpiW(str, item_str + 1, len)) return index; + if (item_str[1] == '-' && !strncmpiW(str, item_str + 2, len)) return index; + } } -#undef CHECK_DRIVE } } else @@ -1014,10 +1010,11 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa return LISTBOX_FindStringPos( descr, str, TRUE ); /* Otherwise use a linear search */ - for (i = start + 1; i < descr->nb_items; i++, item++) - if (item->data == (ULONG_PTR)str) return i; - for (i = 0, item = descr->items; i <= start; i++, item++) - if (item->data == (ULONG_PTR)str) return i; + for (i = 0, index = start; i < descr->nb_items; i++, index++) + { + if (index == descr->nb_items) index = 0; + if (get_item_data(descr, index) == (ULONG_PTR)str) return index; + } } return LB_ERR; }

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to set item data by index.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 2fddd6211efa8aec93d1e4f5296ac21a9f3af272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fddd6211efa8aec93d1e4f5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 27 14:19:14 2019 +0200 comctl32/listbox: Use a helper to set item data by index. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2b6702a..954866a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -161,6 +161,11 @@ static ULONG_PTR get_item_data( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].data; } +static void set_item_data( LB_DESCR *descr, UINT index, ULONG_PTR data ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].data = data; +} + static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) { return HAS_STRINGS(descr) ? descr->items[index].str : NULL; @@ -2684,7 +2689,7 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; + set_item_data(descr, wParam, lParam); /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE;

1 0

Michael Stefaniuc : msvcp120/tests: Avoid using the comma operator.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 9f3a187f9c2c826f68250de7f5ff41857b55d448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3a187f9c2c826f68250de7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 26 23:14:58 2019 +0100 msvcp120/tests: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 70fc0c1..c1c7002 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -924,13 +924,13 @@ static void test_xtime_get(void) } /* Test parameter and return value */ - before.sec = 0xdeadbeef, before.nsec = 0xdeadbeef; + before.sec = 0xdeadbeef; before.nsec = 0xdeadbeef; i = p_xtime_get(&before, 0); ok(i == 0, "expect xtime_get() to return 0, got: %d\n", i); ok(before.sec == 0xdeadbeef && before.nsec == 0xdeadbeef, "xtime_get() shouldn't have modified the xtime struct with the given option\n"); - before.sec = 0xdeadbeef, before.nsec = 0xdeadbeef; + before.sec = 0xdeadbeef; before.nsec = 0xdeadbeef; i = p_xtime_get(&before, 1); ok(i == 1, "expect xtime_get() to return 1, got: %d\n", i); ok(before.sec != 0xdeadbeef && before.nsec != 0xdeadbeef,

1 0

Vijay Kiran Kamuju : wmvcore: Add stub for WMCheckURlExtension.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 474a6771ba03e2c475cd088ff40c97e8285a455f URL: https://source.winehq.org/git/wine.git/?a=commit;h=474a6771ba03e2c475cd088f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Feb 21 08:55:56 2019 +0100 wmvcore: Add stub for WMCheckURlExtension. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++++++++++++++- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ include/wmsdkidl.idl | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index b11a5bf..af6d32a 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -18,7 +18,7 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/test.h" @@ -232,6 +232,26 @@ static void test_WMCreateWriterPriv(void) IWMWriter_Release(writer2); } +static void test_urlextension(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; + const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; + const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; + + hr = WMCheckURLExtension(NULL); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mkvfile); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mp3file); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(urlfile); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(testurl); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); +} + START_TEST(wmvcore) { HRESULT hr; @@ -245,6 +265,7 @@ START_TEST(wmvcore) test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); + test_urlextension(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index f3e3b64..61c3c08 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,4 +1,4 @@ -@ stub WMCheckURLExtension +@ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) @ stub WMCreateBackupRestorerPrivate @ stub WMCreateSyncReaderPriv diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 690885e..14014ee 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } +HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) +{ + FIXME("(%s): stub\n", wine_dbgstr_w(url)); + + if (!url) + return E_INVALIDARG; + + return NS_E_INVALID_NAME; +} + HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) { FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5bc8546..bb7bfee 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown [in] DWORD flags); }; +cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") +cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Zhiyi Zhang : user32/tests: Add more EnumDisplayDevices tests.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 741b673bc997ec7c79866afad42fd746c4244f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741b673bc997ec7c79866afa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 21 17:04:39 2019 +0800 user32/tests: Add more EnumDisplayDevices tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 194 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 174 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=741b673bc997ec7c7986…

1 0

Zhiyi Zhang : include: Add EnumDisplayDevices flags.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: aa754f3ae4a2f936c1be03267b435a8df5cd3bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa754f3ae4a2f936c1be0326… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 21 17:04:22 2019 +0800 include: Add EnumDisplayDevices flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 14 +++++++++++++- include/winuser.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 1851654..01d3ff3 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,12 +3318,24 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +#define DISPLAY_DEVICE_REMOVABLE 0x00000020 +#define DISPLAY_DEVICE_ACC_DRIVER 0x00000040 +#define DISPLAY_DEVICE_UNSAFE_MODES_ON 0x00080000 +#define DISPLAY_DEVICE_TS_COMPATIBLE 0x00200000 +#define DISPLAY_DEVICE_RDPUDD 0x01000000 +#define DISPLAY_DEVICE_DISCONNECT 0x02000000 +#define DISPLAY_DEVICE_REMOTE 0x04000000 +#define DISPLAY_DEVICE_MODESPRUNED 0x08000000 + +/* DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { diff --git a/include/winuser.h b/include/winuser.h index 693965a..6300cc9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1082,6 +1082,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used by EnumDisplayDevices */ +#define EDD_GET_DEVICE_INTERFACE_NAME 0x00000001 + #define EDS_RAWMODE 0x00000002 #define EDS_ROTATEDMODE 0x00000004

1 0

Zebediah Figura : setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: bb4a6da373d7fdb4a61743ee0632298f6a2f333f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4a6da373d7fdb4a61743ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 22:26:39 2019 -0600 setupapi: Search for substituted strings in SetupFindNextMatchLine(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0..5cde5eb 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaaf..06c674a 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].data, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019