wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Dmitry Timoshkov : include: Add adserr.h.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: b4e2ece8359f31a49b6853993a052c59084a0463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4e2ece8359f31a49b685399… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 16:40:27 2020 +0800 include: Add adserr.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/adserr.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index a91372eb4d..3b8a901383 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -7,6 +7,7 @@ SOURCES = \ activaut.idl \ activdbg.idl \ activscp.idl \ + adserr.h \ adshlp.h \ advpub.h \ af_irda.h \ diff --git a/include/adserr.h b/include/adserr.h new file mode 100644 index 0000000000..83da568763 --- /dev/null +++ b/include/adserr.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2019 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __ADSERR_H +#define __ADSERR_H + +#ifdef RC_INVOKED +#define _HRESULT_TYPEDEF_(x) (x) +#else +#define _HRESULT_TYPEDEF_(x) ((HRESULT)x) +#endif + +#define E_ADS_BAD_PATHNAME _HRESULT_TYPEDEF_(0x80005000) +#define E_ADS_INVALID_DOMAIN_OBJECT _HRESULT_TYPEDEF_(0x80005001) +#define E_ADS_INVALID_USER_OBJECT _HRESULT_TYPEDEF_(0x80005002) +#define E_ADS_INVALID_COMPUTER_OBJECT _HRESULT_TYPEDEF_(0x80005003) +#define E_ADS_UNKNOWN_OBJECT _HRESULT_TYPEDEF_(0x80005004) +#define E_ADS_PROPERTY_NOT_SET _HRESULT_TYPEDEF_(0x80005005) +#define E_ADS_PROPERTY_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80005006) +#define E_ADS_PROPERTY_INVALID _HRESULT_TYPEDEF_(0x80005007) +#define E_ADS_BAD_PARAMETER _HRESULT_TYPEDEF_(0x80005008) +#define E_ADS_OBJECT_UNBOUND _HRESULT_TYPEDEF_(0x80005009) +#define E_ADS_PROPERTY_NOT_MODIFIED _HRESULT_TYPEDEF_(0x8000500A) +#define E_ADS_PROPERTY_MODIFIED _HRESULT_TYPEDEF_(0x8000500B) +#define E_ADS_CANT_CONVERT_DATATYPE _HRESULT_TYPEDEF_(0x8000500C) +#define E_ADS_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0x8000500D) +#define E_ADS_OBJECT_EXISTS _HRESULT_TYPEDEF_(0x8000500E) +#define E_ADS_SCHEMA_VIOLATION _HRESULT_TYPEDEF_(0x8000500F) +#define E_ADS_COLUMN_NOT_SET _HRESULT_TYPEDEF_(0x80005010) +#define S_ADS_ERRORSOCCURRED _HRESULT_TYPEDEF_(0x00005011) +#define S_ADS_NOMORE_ROWS _HRESULT_TYPEDEF_(0x00005012) +#define S_ADS_NOMORE_COLUMNS _HRESULT_TYPEDEF_(0x00005013) +#define E_ADS_INVALID_FILTER _HRESULT_TYPEDEF_(0x80005014) + +#endif /* __ADSERR_H */

1 0

Rémi Bernon : ntdll/tests: Fix some format-overflow warnings.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 03d1a9c68e3e7f463b636142a0514e954878b5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d1a9c68e3e7f463b636142… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:35 2020 +0100 ntdll/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 1109f7f3a4..4618f4eaff 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -737,7 +737,7 @@ done: static void set_up_case_test(const char *testdir) { BOOL ret; - char buf[MAX_PATH]; + char buf[MAX_PATH + 5]; HANDLE h; ret = CreateDirectoryA(testdir, NULL);

1 0

Rémi Bernon : msvcrt/tests: Fix some format-overflow warnings.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: ab3ca36baf0a685d90b4ab45e5ff4a0534005ecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3ca36baf0a685d90b4ab45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:34 2020 +0100 msvcrt/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index b0acc60b20..b664edbab1 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -133,7 +133,7 @@ static void test___getmainargs(void) { int argc, new_argc, mode; char **argv, **new_argv, **envp; - char tmppath[MAX_PATH], filepath[MAX_PATH]; + char tmppath[MAX_PATH], filepath[MAX_PATH + 14]; FILE *f; ok(GetTempPathA(MAX_PATH, tmppath) != 0, "GetTempPath failed\n"); @@ -194,7 +194,7 @@ static void test___getmainargs(void) static void test___getmainargs_parent(char *name) { char cmdline[3*MAX_PATH]; - char tmppath[MAX_PATH], filepath[MAX_PATH]; + char tmppath[MAX_PATH], filepath[MAX_PATH + 14]; STARTUPINFOA startup; PROCESS_INFORMATION proc; FILE *f;

1 0

Rémi Bernon : services/tests: Fix some format-overflow warnings.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: bcbe1d120cf6f68dd6a888b488050b3db33d1e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbe1d120cf6f68dd6a888b4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:33 2020 +0100 services/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index dcaf5f0b58..aa9878b976 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -29,7 +29,7 @@ static SERVICE_STATUS_HANDLE (WINAPI *pRegisterServiceCtrlHandlerExA)(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID); static HANDLE pipe_handle = INVALID_HANDLE_VALUE; -static char service_name[100], named_pipe_name[100]; +static char service_name[100], named_pipe_name[114]; static SERVICE_STATUS_HANDLE service_handle; /* Service process global variables */

1 0

Rémi Bernon : version/tests: Fix some format-overflow warnings.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: a195c9a5130eddb2cf47e2aca6b64aaa771520d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a195c9a5130eddb2cf47e2ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:32 2020 +0100 version/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/version/tests/install.c b/dlls/version/tests/install.c index b06125ff50..d0e37e2809 100644 --- a/dlls/version/tests/install.c +++ b/dlls/version/tests/install.c @@ -31,7 +31,7 @@ static void test_find_file(void) DWORD ret; UINT dwCur, dwOut ; char tmp[MAX_PATH]; - char appdir[MAX_PATH]; + char appdir[MAX_PATH + 12]; char curdir[MAX_PATH]; char filename[MAX_PATH]; char outBuf[MAX_PATH];

1 0

Rémi Bernon : user32/tests: Fix some format-overflow warnings.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: b636f9cd5eeabcab418c6e7d66e34a0199f5ce56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b636f9cd5eeabcab418c6e7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:31 2020 +0100 user32/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 6687ebc4a8..7a5f955161 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1287,7 +1287,7 @@ static void test_LoadImage_working_directory(void) char executable_path[MAX_PATH]; int pos_slash; char old_PATH[10000]; - char new_PATH[10000]; + char new_PATH[10000 + MAX_PATH]; BOOL ret; GetCurrentDirectoryA(ARRAY_SIZE(old_working_dir), old_working_dir);

1 0

Marcus Meissner : ieframe: Use ARRAY_SIZE for GetLongPathNameW.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 5587160c053fe235cc2c124adc1aed90edb197e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5587160c053fe235cc2c124a… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 12 12:27:50 2020 +0100 ieframe: Use ARRAY_SIZE for GetLongPathNameW. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 7a8946b847..426fe18da0 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3973,7 +3973,7 @@ static void test_FileProtocol(void) } CloseHandle(file); - GetLongPathNameW(file_path, file_path, sizeof(file_path)); + GetLongPathNameW(file_path, file_path, ARRAY_SIZE(file_path)); lstrcatW(file_url, file_path); test_ConnectionPoint(webbrowser, TRUE);

1 0

Michael Stefaniuc : mshtml/tests: Get rid of a2bstr() in xmlhttprequest.c.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: da3a53ab205ea4dfe96cc34132ef874eae5e4245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3a53ab205ea4dfe96cc341… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 12 00:32:49 2020 +0100 mshtml/tests: Get rid of a2bstr() in xmlhttprequest.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 77 ++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 44 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 63df66ebe0..9280246b3c 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -28,18 +28,6 @@ #include "objsafe.h" #include "wine/test.h" -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -374,7 +362,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { - const char *key; + const WCHAR *key; const WCHAR *value; }; @@ -428,16 +416,17 @@ static void test_header(const struct HEADER_TYPE expect[], int num) for(i = 0; i < num; ++i) { text = NULL; - key = a2bstr(expect[i].key); + key = SysAllocString(expect[i].key); hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, key, &text); ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); ok(text != NULL, "text == NULL\n"); ok(!lstrcmpW(text, expect[i].value), - "Expect %s: %s, got %s\n", expect[i].key, wine_dbgstr_w(expect[i].value), wine_dbgstr_w(text)); + "Expect %s: %s, got %s\n", wine_dbgstr_w(expect[i].key), wine_dbgstr_w(expect[i].value), + wine_dbgstr_w(text)); SysFreeString(key); SysFreeString(text); - wsprintfW(buf, L"%S: %s", expect[i].key, expect[i].value); + wsprintfW(buf, L"%s: %s", expect[i].key, expect[i].value); ok(wcsstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", wine_dbgstr_w(all), wine_dbgstr_w(buf)); } @@ -485,9 +474,9 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) } #define set_request_header(a,b,c) _set_request_header(__LINE__,a,b,c) -static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const char *header_a, const char *value_a) +static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const WCHAR *header_w, const WCHAR *value_w) { - BSTR header = a2bstr(header_a), value = a2bstr(value_a); + BSTR header = SysAllocString(header_w), value = SysAllocString(value_w); HRESULT hres; hres = IHTMLXMLHttpRequest_setRequestHeader(xhr, header, value); @@ -534,10 +523,10 @@ static void test_responseXML(const WCHAR *expect_text) } #define xhr_open(a,b) _xhr_open(__LINE__,a,b) -static HRESULT _xhr_open(unsigned line, const char *url_a, const char *method_a) +static HRESULT _xhr_open(unsigned line, const WCHAR *url_w, const WCHAR *method_w) { - BSTR method = a2bstr(method_a); - BSTR url = a2bstr(url_a); + BSTR method = SysAllocString(method_w); + BSTR url = SysAllocString(url_w); VARIANT async, empty; HRESULT hres; @@ -574,7 +563,7 @@ static void _test_response_text(unsigned line, const WCHAR *expect_text) SysFreeString(text); } -static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) +static void test_sync_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR *expect_text) { VARIANT vbool, vempty, var; BSTR method, url; @@ -582,8 +571,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", L"51"}, - {"Content-Type", L"application/xml"} + {L"Content-Length", L"51"}, + {L"Content-Type", L"application/xml"} }; trace("test_sync_xhr\n"); @@ -641,8 +630,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(hres == E_FAIL, "got %08x\n", hres); ok(text == NULL, "text = %p\n", text); - method = a2bstr("GET"); - url = a2bstr(xml_url); + method = SysAllocString(L"GET"); + url = SysAllocString(xml_url); V_VT(&vbool) = VT_BOOL; V_BOOL(&vbool) = VARIANT_FALSE; V_VT(&vempty) = VT_EMPTY; @@ -685,7 +674,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); - set_request_header(xhr, "x-wine-test", "sync-test"); + set_request_header(xhr, L"x-wine-test", L"sync-test"); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); @@ -733,15 +722,15 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR xhr = NULL; } -static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) +static void test_async_xhr(IHTMLDocument2 *doc, const WCHAR *xml_url, const WCHAR *expect_text) { VARIANT var, vempty; BSTR text; LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", L"51"}, - {"Content-Type", L"application/xml"} + {L"Content-Length", L"51"}, + {L"Content-Type", L"application/xml"} }; create_xmlhttprequest(doc); @@ -798,7 +787,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(val == 0, "Expect UNSENT, got %d\n", val); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - hres = xhr_open(xml_url, "GET"); + hres = xhr_open(xml_url, L"GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); if(FAILED(hres)) { @@ -831,7 +820,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(val == 1, "Expect OPENED, got %d\n", val); - set_request_header(xhr, "x-wine-test", "async-test"); + set_request_header(xhr, L"x-wine-test", L"async-test"); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); SET_EXPECT(xmlhttprequest_onreadystatechange_headers_received); @@ -891,7 +880,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR xhr = NULL; } -static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) +static void test_async_xhr_abort(IHTMLDocument2 *doc, const WCHAR *xml_url) { VARIANT vempty, var; LONG val; @@ -909,7 +898,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(xml_url, "GET"); + xhr_open(xml_url, L"GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); hres = IHTMLXMLHttpRequest_abort(xhr); @@ -933,7 +922,7 @@ static void test_async_xhr_abort(IHTMLDocument2 *doc, const char *xml_url) hres = IHTMLXMLHttpRequest_put_onreadystatechange(xhr, var); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open(xml_url, "GET"); + xhr_open(xml_url, L"GET"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); loading_cnt = 0; @@ -980,13 +969,13 @@ static void test_xhr_post(IHTMLDocument2 *doc) ok(hres == S_OK, "put_onreadystatechange failed: %08x\n", hres); SET_EXPECT(xmlhttprequest_onreadystatechange_opened); - xhr_open("http://test.winehq.org/tests/post.php", "POST"); + xhr_open(L"http://test.winehq.org/tests/post.php", L"POST"); CHECK_CALLED(xmlhttprequest_onreadystatechange_opened); - set_request_header(xhr, "Content-Type", "application/x-www-form-urlencoded"); + set_request_header(xhr, L"Content-Type", L"application/x-www-form-urlencoded"); V_VT(&v) = VT_BSTR; - V_BSTR(&v) = a2bstr("X=Testing"); + V_BSTR(&v) = SysAllocString(L"X=Testing"); loading_cnt = 0; SET_EXPECT(xmlhttprequest_onreadystatechange_opened); @@ -1013,7 +1002,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) xhr = NULL; } -static IHTMLDocument2 *create_doc_from_url(const char *start_url) +static IHTMLDocument2 *create_doc_from_url(const WCHAR *start_url) { BSTR url; IBindCtx *bc; @@ -1025,7 +1014,7 @@ static IHTMLDocument2 *create_doc_from_url(const char *start_url) hres = CreateBindCtx(0, &bc); ok(hres == S_OK, "CreateBindCtx failed: 0x%08x\n", hres); - url = a2bstr(start_url); + url = SysAllocString(start_url); hres = CreateURLMoniker(NULL, url, &url_mon); ok(hres == S_OK, "CreateURLMoniker failed: 0x%08x\n", hres); @@ -1058,14 +1047,14 @@ static IHTMLDocument2 *create_doc_from_url(const char *start_url) START_TEST(xmlhttprequest) { IHTMLDocument2 *doc; - static const char start_url[] = "http://test.winehq.org/tests/hello.html"; - static const char xml_url[] = "http://test.winehq.org/tests/xmltest.xml"; - static const char large_page_url[] = "http://test.winehq.org/tests/data.php"; + static const WCHAR start_url[] = L"http://test.winehq.org/tests/hello.html"; + static const WCHAR xml_url[] = L"http://test.winehq.org/tests/xmltest.xml"; + static const WCHAR large_page_url[] = L"http://test.winehq.org/tests/data.php"; static const WCHAR expect_response_text[] = L"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; CoInitialize(NULL); - content_type = a2bstr("Content-Type"); + content_type = SysAllocString(L"Content-Type"); doc = create_doc_from_url(start_url); if(doc) { test_sync_xhr(doc, xml_url, expect_response_text);

1 0

Michael Stefaniuc : mshtml/tests: Get rid of strcmp_wa() in xmlhttprequest.c.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 605bd4591db9b724d76cee67bc3c931360e29eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=605bd4591db9b724d76cee67… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 12 00:32:48 2020 +0100 mshtml/tests: Get rid of strcmp_wa() in xmlhttprequest.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/xmlhttprequest.c | 67 +++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 099f1a2f38..63df66ebe0 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -40,13 +40,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -318,7 +311,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D hres = IHTMLDocument2_get_readyState(notif_doc, &state); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - if(!strcmp_wa(state, "complete")) + if(!lstrcmpW(state, L"complete")) doc_complete = TRUE; SysFreeString(state); @@ -382,7 +375,7 @@ static void pump_msgs(BOOL *b) struct HEADER_TYPE { const char *key; - const char *value; + const WCHAR *value; }; static void create_xmlhttprequest(IHTMLDocument2 *doc) @@ -424,17 +417,14 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) static void test_header(const struct HEADER_TYPE expect[], int num) { int i; - BSTR key, text, all_header; + BSTR key, text, all; HRESULT hres; - char all[4096], buf[512]; + WCHAR buf[512]; - all_header = NULL; - hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &all_header); + all = NULL; + hres = IHTMLXMLHttpRequest_getAllResponseHeaders(xhr, &all); ok(hres == S_OK, "getAllResponseHeader failed: %08x\n", hres); - ok(all_header != NULL, "all_header == NULL\n"); - - WideCharToMultiByte(CP_UTF8, 0, all_header, -1, all, sizeof(all), NULL, NULL); - SysFreeString(all_header); + ok(all != NULL, "all == NULL\n"); for(i = 0; i < num; ++i) { text = NULL; @@ -442,16 +432,17 @@ static void test_header(const struct HEADER_TYPE expect[], int num) hres = IHTMLXMLHttpRequest_getResponseHeader(xhr, key, &text); ok(hres == S_OK, "getResponseHeader failed, got %08x\n", hres); ok(text != NULL, "text == NULL\n"); - ok(!strcmp_wa(text, expect[i].value), - "Expect %s: %s, got %s\n", expect[i].key, expect[i].value, wine_dbgstr_w(text)); + ok(!lstrcmpW(text, expect[i].value), + "Expect %s: %s, got %s\n", expect[i].key, wine_dbgstr_w(expect[i].value), wine_dbgstr_w(text)); SysFreeString(key); SysFreeString(text); - strcpy(buf, expect[i].key); - strcat(buf, ": "); - strcat(buf, expect[i].value); - ok(strstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", all, buf); + wsprintfW(buf, L"%S: %s", expect[i].key, expect[i].value); + ok(wcsstr(all, buf) != NULL, "AllResponseHeaders(%s) don't have expected substr(%s)\n", + wine_dbgstr_w(all), wine_dbgstr_w(buf)); } + + SysFreeString(all); } static void test_illegal_xml(IXMLDOMDocument *xmldom) @@ -476,7 +467,7 @@ static void test_illegal_xml(IXMLDOMDocument *xmldom) VariantClear(&variant); hres = IXMLDOMDocument_get_text(xmldom, &bstr); - ok(!strcmp_wa(bstr, ""), "text = %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpW(bstr, L""), "text = %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); hres = IXMLDOMDocument_get_firstChild(xmldom, NULL); @@ -506,7 +497,7 @@ static void _set_request_header(unsigned line, IHTMLXMLHttpRequest *xhr, const c SysFreeString(value); } -static void test_responseXML(const char *expect_text) +static void test_responseXML(const WCHAR *expect_text) { IDispatch *disp; IXMLDOMDocument *xmldom; @@ -563,7 +554,7 @@ static HRESULT _xhr_open(unsigned line, const char *url_a, const char *method_a) } #define test_response_text(a) _test_response_text(__LINE__,a) -static void _test_response_text(unsigned line, const char *expect_text) +static void _test_response_text(unsigned line, const WCHAR *expect_text) { BSTR text = NULL; HRESULT hres; @@ -577,13 +568,13 @@ static void _test_response_text(unsigned line, const char *expect_text) len = SysStringLen(text); if(text[len-1] == '\n') text[len-1] = 0; - ok_(__FILE__,line)(!strcmp_wa(text, expect_text), "expect %s, got %s\n", - expect_text, wine_dbgstr_w(text)); + ok_(__FILE__,line)(!lstrcmpW(text, expect_text), "expect %s, got %s\n", + wine_dbgstr_w(expect_text), wine_dbgstr_w(text)); } SysFreeString(text); } -static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) +static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) { VARIANT vbool, vempty, var; BSTR method, url; @@ -591,8 +582,8 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Length", L"51"}, + {"Content-Type", L"application/xml"} }; trace("test_sync_xhr\n"); @@ -726,7 +717,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); ok(hres == S_OK, "get_statusText failed: %08x\n", hres); ok(text != NULL, "text == NULL\n"); - ok(!strcmp_wa(text, "OK"), + ok(!lstrcmpW(text, L"OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); @@ -742,15 +733,15 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * xhr = NULL; } -static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *expect_text) +static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const WCHAR *expect_text) { VARIANT var, vempty; BSTR text; LONG val; HRESULT hres; static const struct HEADER_TYPE expect_headers[] = { - {"Content-Length", "51"}, - {"Content-Type", "application/xml"} + {"Content-Length", L"51"}, + {"Content-Type", L"application/xml"} }; create_xmlhttprequest(doc); @@ -885,7 +876,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); ok(hres == S_OK, "get_statusText failed: %08x\n", hres); ok(text != NULL, "text == NULL\n"); - ok(!strcmp_wa(text, "OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); + ok(!lstrcmpW(text, L"OK"), "Expected \"OK\", got %s\n", wine_dbgstr_w(text)); SysFreeString(text); val = 0xdeadbeef; @@ -1016,7 +1007,7 @@ static void test_xhr_post(IHTMLDocument2 *doc) SysFreeString(V_BSTR(&v)); - test_response_text("X => Testing"); + test_response_text(L"X => Testing"); IHTMLXMLHttpRequest_Release(xhr); xhr = NULL; @@ -1070,7 +1061,7 @@ START_TEST(xmlhttprequest) static const char start_url[] = "http://test.winehq.org/tests/hello.html"; static const char xml_url[] = "http://test.winehq.org/tests/xmltest.xml"; static const char large_page_url[] = "http://test.winehq.org/tests/data.php"; - static const char expect_response_text[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; + static const WCHAR expect_response_text[] = L"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>"; CoInitialize(NULL);

1 0

Michael Stefaniuc : mshtml/tests: Get rid of strcmp_wa() in events.c.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 73cec9a86bc4fb21b5c22b9a2a791179d507ddc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cec9a86bc4fb21b5c22b9a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 12 00:32:47 2020 +0100 mshtml/tests: Get rid of strcmp_wa() in events.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 86 +++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73cec9a86bc4fb21b5c2…

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
88
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 2020