January 2020 - Wine-Commits

Zebediah Figura : winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 0401213770ee6efa6ac522c6d64867d930d66a57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0401213770ee6efa6ac522c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:06 2020 -0600 winegstreamer: Implement IPin::QueryAccept() for the AVI splitter source. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 16 ++++++++-------- dlls/winegstreamer/gstdemux.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index befcac404c..31cb767b60 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -621,42 +621,42 @@ static void test_media_types(void) pmt->majortype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->majortype = MEDIATYPE_Video; pmt->subtype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->subtype = MEDIASUBTYPE_I420; pmt->formattype = GUID_NULL; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_None; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); pmt->formattype = FORMAT_VideoInfo; vih = (VIDEOINFOHEADER *)pmt->pbFormat; vih->AvgTimePerFrame = 10000; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); vih->AvgTimePerFrame = 1000 * 10000; vih->dwBitRate = 1000000; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); vih->dwBitRate = 0; SetRect(&vih->rcSource, 0, 0, 32, 24); hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); SetRect(&vih->rcSource, 0, 0, 0, 0); vih->bmiHeader.biCompression = BI_RGB; hr = IPin_QueryAccept(pin, pmt); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); vih->bmiHeader.biCompression = mmioFOURCC('I','4','2','0'); CoTaskMemFree(pmt->pbFormat); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index dadad69beb..81a0617e56 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2377,7 +2377,7 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return S_OK; + return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr)

1 0

Zebediah Figura : http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION.
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 533acfb1f62233f875461c6527500b5a1165121e URL: https://source.winehq.org/git/wine.git/?a=commit;h=533acfb1f62233f875461c65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 13:55:37 2020 -0600 http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION. Fixes intermittent failures on the Debian 10 testbot. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 7 ++++++- dlls/httpapi/tests/httpapi.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 91d81400e6..4259ca618f 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1104,10 +1104,15 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) addr.sin_addr.S_un.S_addr = INADDR_ANY; if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); closesocket(s); heap_free(url); + if (WSAGetLastError() == WSAEADDRINUSE) + { + WARN("Address %s is already in use.\n", debugstr_a(params->url)); + return STATUS_SHARING_VIOLATION; + } + ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ee585948ab..a52a3f6c34 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -113,8 +113,9 @@ static unsigned short add_url_v1(HANDLE queue) for (port = 50000; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = HttpAddUrl(queue, url, NULL)) != ERROR_SHARING_VIOLATION) + if (!(ret = HttpAddUrl(queue, url, NULL))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; @@ -129,8 +130,9 @@ static ULONG add_url_v2(HTTP_URL_GROUP_ID group) for (port = 50010; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0)) != ERROR_SHARING_VIOLATION) + if (!(ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0;

1 0

Zebediah Figura : winegstreamer: Split the implementation of source_get_media_type().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 847d8970fe56b89679d0943bfe278871e7a72735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=847d8970fe56b89679d0943b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 19:55:08 2020 -0600 winegstreamer: Split the implementation of source_get_media_type(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 54 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 47eb30383b..625d9f31cd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -76,6 +76,7 @@ struct gstdemux BOOL (*init_gst)(struct gstdemux *filter); HRESULT (*source_query_accept)(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt); + HRESULT (*source_get_media_type)(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); }; struct gstdemux_source @@ -1537,6 +1538,15 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const return S_OK; } +static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) { struct gstdemux *object; @@ -1562,6 +1572,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = gstdecoder_init_gst; object->source_query_accept = gstdecoder_source_query_accept; + object->source_get_media_type = gstdecoder_source_get_media_type; *phr = S_OK; TRACE("Created GStreamer demuxer %p.\n", object); @@ -1873,16 +1884,11 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY return filter->source_query_accept(pin, mt); } -static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) +static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - struct gstdemux_source *This = impl_source_from_IPin(&iface->IPin_iface); - - if (iPosition > 0) - return VFW_S_NO_MORE_ITEMS; - - CopyMediaType(pmt, &This->mt); - - return S_OK; + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); + struct gstdemux *filter = impl_from_strmbase_filter(iface->filter); + return filter->source_get_media_type(pin, index, mt); } static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, @@ -2268,6 +2274,15 @@ static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, cons return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } +static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -2292,6 +2307,7 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) object->init_gst = wave_parser_init_gst; object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->source_query_accept = wave_parser_source_query_accept; + object->source_get_media_type = wave_parser_source_get_media_type; *phr = S_OK; TRACE("Created WAVE parser %p.\n", object); @@ -2380,6 +2396,15 @@ static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, con return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } +static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) { static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -2405,6 +2430,7 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = avi_splitter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; + object->source_get_media_type = avi_splitter_source_get_media_type; *phr = S_OK; TRACE("Created AVI splitter %p.\n", object); @@ -2503,6 +2529,15 @@ static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, co return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; } +static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + if (index > 0) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &pin->mt); + return S_OK; +} + static HRESULT mpeg_splitter_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) { struct gstdemux *filter = impl_from_strmbase_filter(iface); @@ -2556,6 +2591,7 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); object->init_gst = mpeg_splitter_init_gst; object->source_query_accept = mpeg_splitter_source_query_accept; + object->source_get_media_type = mpeg_splitter_source_get_media_type; object->enum_sink_first = TRUE; *phr = S_OK;

1 0

Alexandre Julliard : user32/tests: Get rid of strncmpW() and strcpyW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: b933b5d06b3b3c02dbcdd352f8c2f858a6048412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b933b5d06b3b3c02dbcdd352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:58:40 2020 +0100 user32/tests: Get rid of strncmpW() and strcpyW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index de0828365c..1ca4141957 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1202,21 +1202,6 @@ static void test_menu_add_string( void ) DestroyMenu( hmenu ); } -/* define building blocks for the menu item info tests */ -static int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) -{ - if (n <= 0) return 0; - while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - -static WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) -{ - WCHAR *p = dst; - while ((*p++ = *src++)); - return dst; -} - static void insert_menu_item( int line, HMENU hmenu, BOOL ansi, UINT mask, UINT type, UINT state, UINT id, HMENU submenu, HBITMAP checked, HBITMAP unchecked, ULONG_PTR data, void *type_data, UINT len, HBITMAP item, BOOL expect ) @@ -1307,7 +1292,7 @@ static void check_menu_item_info( int line, HMENU hmenu, BOOL ansi, UINT mask, U ok_(__FILE__, line)( !strncmp( expname, info.dwTypeData, out_len ), "menu item name differed from '%s' '%s'\n", expname, info.dwTypeData ); else - ok_(__FILE__, line)( !strncmpW( (WCHAR *)expname, (WCHAR *)info.dwTypeData, out_len ), + ok_(__FILE__, line)( !wcsncmp( (WCHAR *)expname, (WCHAR *)info.dwTypeData, out_len ), "menu item name wrong\n" ); SetLastError( 0xdeadbeef ); @@ -1364,7 +1349,7 @@ static void set_menu_item_info( int line, HMENU hmenu, BOOL ansi, UINT mask, UIN hmenu = CreateMenu();\ submenu = CreateMenu();\ if(ansi)strcpy( string, init );\ - else strcpyW( string, init );\ + else wcscpy( string, init );\ insert_menu_item( __LINE__, hmenu, ansi, c1, d1, e1, f1, g1, h1, i1, j1, k1, l1, m1, eret1 ) /* GetMenuItemInfo + GetMenuString */

1 0

Alexandre Julliard : shlwapi/tests: Get rid of strcmpW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: ce487612af47144ea79094ff79e030a5689bb247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce487612af47144ea79094ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:57:53 2020 +0100 shlwapi/tests: Get rid of strcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/string.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 9114ad88e1..927c8012cc 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -69,12 +69,6 @@ static LPWSTR (WINAPI *pStrChrNW)(LPCWSTR,WCHAR,UINT); static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); -static int strcmpW(const WCHAR *str1, const WCHAR *str2) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - /* StrToInt/StrToIntEx results */ typedef struct tagStrToIntResult { @@ -830,14 +824,14 @@ static void test_StrRetToBSTR(void) U(strret).pOleStr = CoDupStrW("Test"); bstr = 0; ret = pStrRetToBSTR(&strret, NULL, &bstr); - ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), + ok(ret == S_OK && bstr && !wcscmp(bstr, szTestW), "STRRET_WSTR: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); SysFreeString(bstr); strret.uType = STRRET_CSTR; lstrcpyA(U(strret).cStr, "Test"); ret = pStrRetToBSTR(&strret, NULL, &bstr); - ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), + ok(ret == S_OK && bstr && !wcscmp(bstr, szTestW), "STRRET_CSTR: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); SysFreeString(bstr); @@ -845,7 +839,7 @@ static void test_StrRetToBSTR(void) U(strret).uOffset = 1; strcpy((char*)&iidl, " Test"); ret = pStrRetToBSTR(&strret, iidl, &bstr); - ok(ret == S_OK && bstr && !strcmpW(bstr, szTestW), + ok(ret == S_OK && bstr && !wcscmp(bstr, szTestW), "STRRET_OFFSET: dup failed, ret=0x%08x, bstr %p\n", ret, bstr); SysFreeString(bstr);

1 0

Alexandre Julliard : shell32/tests: Get rid of strcmpW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: e4e3dc7eb6082978bd285aeefdf852519c6d469f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e3dc7eb6082978bd285aee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:57:37 2020 +0100 shell32/tests: Get rid of strcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/string.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 5fd589300b..acd9444811 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -42,12 +42,6 @@ static WCHAR *CoDupStrW(const char* src) return szTemp; } -static inline int strcmpW(const WCHAR *str1, const WCHAR *str2) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - static void test_StrRetToStringNA(void) { trace("StrRetToStringNAW is Ascii\n"); @@ -68,14 +62,14 @@ static void test_StrRetToStringNW(void) U(strret).pOleStr = CoDupStrW("Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, NULL); - ok(ret == TRUE && !strcmpW(buff, szTestW), + ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_WSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_CSTR; lstrcpyA(U(strret).cStr, "Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, NULL); - ok(ret == TRUE && !strcmpW(buff, szTestW), + ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_CSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_OFFSET; @@ -83,7 +77,7 @@ static void test_StrRetToStringNW(void) strcpy((char*)&iidl, " Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, ARRAY_SIZE(buff), &strret, iidl); - ok(ret == TRUE && !strcmpW(buff, szTestW), + ok(ret == TRUE && !wcscmp(buff, szTestW), "STRRET_OFFSET: dup failed, ret=%d\n", ret); /* The next test crashes on W2K, WinXP and W2K3, so we don't test. */

1 0

Alexandre Julliard : oledlg/test: Get rid of strstrW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 7b4658c1346ee47ab96197ca1f65dae5eac95967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4658c1346ee47ab96197ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:57:21 2020 +0100 oledlg/test: Get rid of strstrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/tests/main.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/oledlg/tests/main.c b/dlls/oledlg/tests/main.c index cef55eb9ca..3bb384710b 100644 --- a/dlls/oledlg/tests/main.c +++ b/dlls/oledlg/tests/main.c @@ -26,18 +26,6 @@ #include "initguid.h" #include "oledlg.h" -static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) return str; - str++; - } - return NULL; -} - static HRESULT WINAPI enumverbs_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IEnumOLEVERB) || IsEqualIID(riid, &IID_IUnknown)) { @@ -411,7 +399,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, exact format depends on localization. */ - ok(strstrW(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW)); + ok(wcsstr(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW)); ok(info.fState == 0, "got state 0x%08x\n", info.fState); ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);

1 0

Alexandre Julliard : oleaut32/tests: Get rid of strcmpW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 0053ab28e6963b6c9a1931082dea5f2e37d707ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0053ab28e6963b6c9a193108… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:57:03 2020 +0100 oleaut32/tests: Get rid of strcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 394b97991e..9e4cc063f9 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -50,18 +50,12 @@ static BOOL has_i8; #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } -static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - #define FMT_NUMBER(vt,val) \ VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ if (hres == S_OK) { \ - ok(str && strcmpW(str,szResult1) == 0, \ + ok(str && wcscmp(str,szResult1) == 0, \ "VarFormatNumber (vt %d): string different\n", vt); \ SysFreeString(str); \ } @@ -107,7 +101,7 @@ static void test_VarFormatNumber(void) hres = pVarFormatNumber(&v,2,0,0,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) - ok(str && strcmpW(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); + ok(str && wcscmp(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); SysFreeString(V_BSTR(&v)); SysFreeString(str); @@ -115,7 +109,7 @@ static void test_VarFormatNumber(void) hres = pVarFormatNumber(&v,2,0,-1,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) - ok(str && strcmpW(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); + ok(str && wcscmp(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); SysFreeString(V_BSTR(&v)); SysFreeString(str); } @@ -582,7 +576,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -590,7 +584,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); VariantClear(&var); @@ -603,7 +597,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -611,7 +605,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); VariantClear(&var); @@ -624,7 +618,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); @@ -632,7 +626,7 @@ static void test_VarFormatFromTokens(void) ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); - ok(!strcmpW(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + ok(!wcscmp(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); }

1 0

Alexandre Julliard : mshtml/tests: Get rid of strstrW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 0f15851e03462251ee9b67674959374f72e0afea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f15851e03462251ee9b6767… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:52:30 2020 +0100 mshtml/tests: Get rid of strstrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 141d2378db..2dcc1eecf1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -297,18 +297,6 @@ static BOOL wstr_contains(const WCHAR *strw, const char *stra) return strstr(buf, stra) != NULL; } -static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) return str; - str++; - } - return NULL; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -7853,7 +7841,7 @@ static void test_cookies(IHTMLDocument2 *doc) ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); if(str2) - ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); + ok(wcsstr(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); SysFreeString(str2); @@ -7870,7 +7858,7 @@ static void test_cookies(IHTMLDocument2 *doc) ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); if(str2) - ok(strstrW(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); + ok(wcsstr(str2, str) != NULL, "could not find %s in %s\n", wine_dbgstr_w(str), wine_dbgstr_w(str2)); SysFreeString(str); SysFreeString(str2); }

1 0

Alexandre Julliard : mlang/tests: Get rid of strstrW().
by Alexandre Julliard Jan. 27, 2020

Jan. 27, 2020

Module: wine Branch: master Commit: 70644be9df31adcfd883dc3758a2e7d81778d783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70644be9df31adcfd883dc37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 26 10:52:08 2020 +0100 mlang/tests: Get rid of strstrW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/mlang.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index b5d6fc6114..d3a71e935d 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1294,19 +1294,6 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) ok(processed == 0, "expected 0, got %d\n", processed); } -/* copied from libs/wine/string.c */ -static WCHAR *strstrW(const WCHAR *str, const WCHAR *sub) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) return (WCHAR *)str; - str++; - } - return NULL; -} - static void test_rfc1766(IMultiLanguage2 *iML2) { IEnumRfc1766 *pEnumRfc1766; @@ -1336,7 +1323,7 @@ static void test_rfc1766(IMultiLanguage2 *iML2) /* not an exact 1:1 correspondence between lcid and rfc1766 in the * mlang database, e.g., nb-no -> 1044 -> no */ - ok(strstrW(info.wszRfc1766, rfcstr) != NULL, + ok(wcsstr(info.wszRfc1766, rfcstr) != NULL, "Expected matching locale names\n"); SysFreeString(rfcstr);

1 0