wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Jacek Caban : include: Move __acrt_iob_func declaration to corecrt_wstdio.h.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 6017d33339ce49587467951c68b435dc9c77e41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6017d33339ce49587467951c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:30 2020 +0100 include: Move __acrt_iob_func declaration to corecrt_wstdio.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 6 ++++++ include/msvcrt/stdio.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 1480d32bf6..87f74916c5 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -41,6 +41,12 @@ typedef struct _iobuf #define WEOF (wint_t)(0xFFFF) #endif +FILE *__cdecl __acrt_iob_func(unsigned index); + +#define stdin (__acrt_iob_func(0)) +#define stdout (__acrt_iob_func(1)) +#define stderr (__acrt_iob_func(2)) + wint_t __cdecl _fgetwc_nolock(FILE*); wint_t __cdecl _fgetwchar(void); wint_t __cdecl _fputwc_nolock(wint_t,FILE*); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 7477ac171a..6db7ebe50b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -61,12 +61,6 @@ FILE* __cdecl __iob_func(void); # endif #endif /* _STDIO_DEFINED */ -FILE *__cdecl __acrt_iob_func(unsigned index); - -#define stdin (__acrt_iob_func(0)) -#define stdout (__acrt_iob_func(1)) -#define stderr (__acrt_iob_func(2)) - /* return value for _get_output_format */ #define _TWO_DIGIT_EXPONENT 0x1

1 0

Nikolay Sivov : mf: Use more descriptive name for one of the impl_from_* helpers.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f396d80df5faae4f7e21b92e0e0b7d657b3fc97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f396d80df5faae4f7e21b92e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 16:41:21 2020 +0300 mf: Use more descriptive name for one of the impl_from_* helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index b80499477c..6b5d590a25 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -278,7 +278,7 @@ static struct clock_timer *impl_clock_timer_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct clock_timer, IUnknown_iface); } -static struct sink_notification *impl_from_IUnknown(IUnknown *iface) +static struct sink_notification *impl_sink_notification_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct sink_notification, IUnknown_iface); } @@ -1918,7 +1918,7 @@ static HRESULT WINAPI sink_notification_QueryInterface(IUnknown *iface, REFIID r static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) { - struct sink_notification *notification = impl_from_IUnknown(iface); + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&notification->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1928,7 +1928,7 @@ static ULONG WINAPI sink_notification_AddRef(IUnknown *iface) static ULONG WINAPI sink_notification_Release(IUnknown *iface) { - struct sink_notification *notification = impl_from_IUnknown(iface); + struct sink_notification *notification = impl_sink_notification_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&notification->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -2496,7 +2496,7 @@ static HRESULT WINAPI present_clock_sink_callback_Invoke(IMFAsyncCallback *iface if (FAILED(hr = IMFAsyncResult_GetObject(result, &object))) return hr; - data = impl_from_IUnknown(object); + data = impl_sink_notification_from_IUnknown(object); clock_call_state_change(data->system_time, data->param, data->notification, data->sink);

1 0

Nikolay Sivov : mf: Implement timer functionality for presentation clock.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 0eda16206aeb3cafa9fdb63cb1dfa188930d13c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eda16206aeb3cafa9fdb63c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 16:41:20 2020 +0300 mf: Implement timer functionality for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++++--- include/mfidl.idl | 5 + 2 files changed, 275 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eda16206aeb3cafa9fd…

1 0

Nikolay Sivov : mferror: Add some more clock error codes.
by Alexandre Julliard 21 Feb '20

21 Feb '20

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 692095e561c81b808e1b5dd0fc161c87a609192b URL: https://source.winehq.org/git/wine.git/?a=commit;h=692095e561c81b808e1b5dd0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 20 08:38:54 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5f3bc950b1..a9b470e39e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-14 08:12+0200\n" +"PO-Revision-Date: 2020-02-20 08:38+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8418,16 +8418,12 @@ msgid "&Edit Value..." msgstr "&Redaguoti reikšmę..." #: version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Duomenų saito savybės" +msgstr "Duomenų saito klaida" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Išrinkite failą." +msgstr "Išrinkite tiekėją." #: version.rc:36 msgid "Data Link Properties"

1 0

Zhiyi Zhang : dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: ba4ee497050df6bb211bfba47e268d67ee6cd198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4ee497050df6bb211bfba4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 20 20:48:18 2020 +0800 dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2fc629c84..7cdf7bd0d6 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -128,6 +128,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); + if (!output) + return E_INVALIDARG; + if (output_idx > 0) { *output = NULL; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3ff42c4bc6..e2b5df7b27 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1175,6 +1175,9 @@ static void test_output(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) {

1 0

Zhiyi Zhang : dxgi: Check NULL adapter parameter in dxgi_factory_EnumAdapterByLuid().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 23a8887ded0e45b422c25a183adcb54ee0999eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a8887ded0e45b422c25a18… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 20 20:48:04 2020 +0800 dxgi: Check NULL adapter parameter in dxgi_factory_EnumAdapterByLuid(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 3 +++ dlls/dxgi/tests/dxgi.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a0038b4fe7..3f41df9e36 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -403,6 +403,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); + if (!adapter) + return DXGI_ERROR_INVALID_CALL; + adapter_index = 0; while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8e63ea25e..3ff42c4bc6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -912,6 +912,10 @@ static void test_adapter_luid(void) return; } + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, + &IID_IDXGIAdapter, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); @@ -4949,6 +4953,9 @@ static void test_multi_adapter(void) return; } + hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) {

1 0

Michael Stefaniuc : urlmon/tests: Get rid of a2w() in sec_mgr.c.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: eaacf86d6bc3bed715454ebdc825dfd3427fc2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaacf86d6bc3bed715454ebd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:22 2020 +0100 urlmon/tests: Get rid of a2w() in sec_mgr.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/urlmon/tests/sec_mgr.c | 172 +++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eaacf86d6bc3bed71545…

1 0

Michael Stefaniuc : urlmon/tests: Get rid of strcmp_aw() in sec_mgr.c.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c33e7dcadb2ddf7df4684a9766b103b77cb299d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c33e7dcadb2ddf7df4684a97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:21 2020 +0100 urlmon/tests: Get rid of strcmp_aw() in sec_mgr.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/urlmon/tests/sec_mgr.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2974eecc36..dda50dd056 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -190,13 +190,6 @@ static inline LPWSTR a2w(LPCSTR str) return ret; } -static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { - LPWSTR strAW = a2w(strA); - DWORD ret = lstrcmpW(strAW, strB); - heap_free(strAW); - return ret; -} - /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) @@ -1592,21 +1585,21 @@ static const struct { DWORD create_flags; const char *security_uri; HRESULT security_hres; - const char *default_uri; + const WCHAR *default_uri; HRESULT default_hres; BOOL todo; } sec_url_ex_tests[] = { - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK}, - {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK}, - {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"file:some file.jpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK}, - {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK}, - {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK}, - {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK}, - {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK}, - {"ftp://test@ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK}, - {"test://google@ftp.winehq.org/",0,"test://google@ftp.winehq.org/",S_OK,"test://google@ftp.winehq.org/",S_OK} + {"index.htm", Uri_CREATE_ALLOW_RELATIVE, "*:index.html", S_OK, L"*:index.htm", S_OK}, + {"file://c:\\Index.htm", Uri_CREATE_FILE_USE_DOS_PATH, "file:///c:/Index.htm", S_OK, L"file:///c:/Index.htm", S_OK}, + {"file:some%20file%2ejpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"file:some file.jpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"http://www.zone3.winetest/", 0, "http://www.zone3.winetest/", S_OK, L"http://www.zone3.winetest/", S_OK}, + {"about:blank", 0, "about:blank", S_OK, L"about:blank", S_OK}, + {"ftp://zone3.winetest/file.test", 0, "ftp://zone3.winetest/file.test", S_OK, L"ftp://zone3.winetest/file.test", S_OK}, + {"test:123abc", 0, "test:123abc", S_OK, L"test:123abc", S_OK}, + {"http:google.com/test.file", 0, "http:google.com/test.file", S_OK, L"http:google.com/test.file", S_OK}, + {"ftp://test@ftp.winehq.org/", 0, "ftp://ftp.winehq.org/", S_OK, L"ftp://ftp.winehq.org/", S_OK}, + {"test://google@ftp.winehq.org/", 0, "test://google@ftp.winehq.org/", S_OK, L"test://google@ftp.winehq.org/", S_OK} }; static void test_InternetGetSecurityUrlEx(void) @@ -1647,9 +1640,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received); @@ -1670,9 +1663,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received);

1 0

Michael Stefaniuc : urlmon/tests: Get rid of a2w() in misc.c.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 81f2b5fd9a457cb6a5f64cdd3d1281088785f9a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f2b5fd9a457cb6a5f64cdd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:19 2020 +0100 urlmon/tests: Get rid of a2w() in misc.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/urlmon/tests/misc.c | 83 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 07ab52407e..4c5c6aea10 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -84,21 +84,6 @@ static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); -static WCHAR *a2w(const char *str) -{ - WCHAR *ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static WCHAR *a2co(const char *str) { WCHAR *ret; @@ -476,22 +461,22 @@ static void test_CoInternetQueryInfo(void) } static const struct { - const char *url; + const WCHAR *url; const WCHAR *mime; HRESULT hres; BOOL broken_failure; const WCHAR *broken_mime; } mime_tests[] = { - {"res://mshtml.dll/blank.htm", L"text/html", S_OK}, - {"index.htm", L"text/html", S_OK}, - {"file://c:\\Index.htm", L"text/html", S_OK}, - {"file://c:\\Index.htm?q=test", L"text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part", L"text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part.txt", L"text/html", S_OK, FALSE, L"text/plain"}, - {"file://some%20file%2ejpg", NULL, E_FAIL}, - {"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, - {"about:blank", NULL, E_FAIL}, - {"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} + {L"res://mshtml.dll/blank.htm", L"text/html", S_OK}, + {L"index.htm", L"text/html", S_OK}, + {L"file://c:\\Index.htm", L"text/html", S_OK}, + {L"file://c:\\Index.htm?q=test", L"text/html", S_OK, TRUE}, + {L"file://c:\\Index.htm#hash_part", L"text/html", S_OK, TRUE}, + {L"file://c:\\Index.htm#hash_part.txt", L"text/html", S_OK, FALSE, L"text/plain"}, + {L"file://some%20file%2ejpg", NULL, E_FAIL}, + {L"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {L"about:blank", NULL, E_FAIL}, + {L"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; @@ -599,8 +584,8 @@ static const struct { const WCHAR *mime; const WCHAR *mime_pjpeg; const WCHAR *broken_mime; - const char *url; - const char *proposed_mime; + const WCHAR *url; + const WCHAR *proposed_mime; } mime_tests2[] = { {data1, sizeof(data1), L"text/plain"}, {data2, sizeof(data2), L"application/octet-stream", L"image/pjpeg"}, @@ -700,22 +685,22 @@ static const struct { {data96, sizeof(data96), L"text/plain"}, {data97, sizeof(data97), L"text/html", L"text/plain"}, {data98, sizeof(data98), L"text/html", L"text/plain"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {NULL, 0, L"text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, - {NULL, sizeof(data1), L"text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data2, sizeof(data2), L"text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data10, sizeof(data10), L"text/html", NULL, NULL, "http://www.winehq.org/test.css"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, - {data1, sizeof(data1), L"text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {NULL, 0, L"text/html", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"res://mshtml.dll/blank.htm", L"application/octet-stream"}, + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"file:some%20file%2ejpg", L"application/octet-stream"}, + {NULL, sizeof(data1), L"text/html", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data2, sizeof(data2), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data10, sizeof(data10), L"text/html", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css", L"text/plain"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css", L"application/octet-stream"}, + {data1, sizeof(data1), L"text/test", NULL, NULL, L"http://www.winehq.org/test.css", L"text/test"} }; static void test_FindMimeFromData(void) { - WCHAR *mime, *proposed_mime, *url; + WCHAR *mime; HRESULT hres; BYTE b; int i; @@ -728,8 +713,7 @@ static void test_FindMimeFromData(void) for(i = 0; i < ARRAY_SIZE(mime_tests); i++) { mime = (LPWSTR)0xf0f0f0f0; - url = a2w(mime_tests[i].url); - hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK || broken(mime_tests[i].broken_failure), "[%d] FindMimeFromData failed: %08x\n", i, hres); if(hres == S_OK) { @@ -746,32 +730,27 @@ static void test_FindMimeFromData(void) } mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, url, NULL, 0, text_plainW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, L"text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, url, NULL, 0, app_octet_streamW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, L"application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); - heap_free(url); } for(i = 0; i < ARRAY_SIZE(mime_tests2); i++) { - url = a2w(mime_tests2[i].url); - proposed_mime = a2w(mime_tests2[i].proposed_mime); - hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, - proposed_mime, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests2[i].url, mime_tests2[i].data, mime_tests2[i].size, + mime_tests2[i].proposed_mime, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); b = !lstrcmpW(mime, mime_tests2[i].mime); ok(b || broken(mime_tests2[i].broken_mime && !lstrcmpW(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); - heap_free(proposed_mime); - heap_free(url); CoTaskMemFree(mime); - if(!b || url || proposed_mime) + if(!b || mime_tests2[i].url || mime_tests2[i].proposed_mime) continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size,

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
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