October 2019 - Wine-Commits

Alexandre Julliard : Wine release 4.18
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: website Branch: master Commit: fbc598fe52830e270bbebcfb8c4f387a432ced63 URL: https://source.winehq.org/git/website.git/?a=commit;h=fbc598fe52830e270bbeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 21:01:41 2019 +0200 Wine release 4.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019101801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019101801.xml b/news/en/2019101801.xml new file mode 100644 index 00000000..4d059e1a --- /dev/null +++ b/news/en/2019101801.xml @@ -0,0 +1,15 @@ +<news> +<date>October 18, 2019</date> +<title>Wine 4.18 Released</title> +<body> + The Wine development release 4.18 is now available. + <a href="{$root}/announce/4.18">What's new</a> in this release: +<ul> + <li>Many new VBScript functions.</li> + <li>A number of cleanups and improvements in Quartz.</li> + <li>Fixes for several test failures.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sven Baars : ddraw/tests: Fix some test failures on 64-bit Windows.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 79c5d8af2277cf05b059b25e42dacc7c995e0685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c5d8af2277cf05b059b25e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 5 11:25:21 2019 +0200 ddraw/tests: Fix some test failures on 64-bit Windows. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a23e76e1f7..64c03c87d0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12998,7 +12998,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { memset(&hal_caps, 0, sizeof(hal_caps)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2156bd5849..bf0cfef0b1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13878,7 +13878,7 @@ static void test_caps(void) } hr = DirectDrawCreate((GUID *)DDCREATE_EMULATIONONLY, &ddraw1, NULL); - ok(hr == (is_ddraw64 ? E_FAIL : DD_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK || (is_ddraw64 && hr == E_FAIL), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { hr = IDirectDraw_QueryInterface(ddraw1, &IID_IDirectDraw2, (void **)&ddraw);

1 0

Alexandre Julliard : Release 4.18.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 8c74027ba60a360f24cf232ee233e71262d8f1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c74027ba60a360f24cf232e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 20:59:26 2019 +0200 Release 4.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 776 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 432 insertions(+), 368 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c74027ba60a360f24cf…

1 0

Gijs Vermeulen : mscoree: Support loading assemblies from path specified in config file.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: d7031be8920e30463a3825e866a70f49e9a67740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7031be8920e30463a3825e8… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Oct 17 22:12:32 2019 +0200 mscoree: Support loading assemblies from path specified in config file. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 13 ++++++++++-- dlls/mscoree/corruntimehost.c | 45 ++++++++++++++++++++++++++++++++---------- dlls/mscoree/metahost.c | 38 ++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_private.h | 3 +++ 4 files changed, 86 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index f2abf107a5..035247442c 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -347,8 +347,15 @@ static HRESULT parse_probing(ConfigFileHandler *This, ISAXAttributes *pAttr) hr = ISAXAttributes_getValueFromName(pAttr, empty, 0, privatePath, lstrlenW(privatePath), &value, &value_size); if (SUCCEEDED(hr)) - FIXME("privatePath=%s not implemented\n", debugstr_wn(value, value_size)); - hr = S_OK; + { + TRACE("%s\n", debugstr_wn(value, value_size)); + + This->result->private_path = HeapAlloc(GetProcessHeap(), 0, (value_size + 1) * sizeof(WCHAR)); + if (This->result->private_path) + wcscpy(This->result->private_path, value); + else + hr = E_OUTOFMEMORY; + } return hr; } @@ -698,4 +705,6 @@ void free_parsed_config_file(parsed_config_file *file) list_remove(&cursor->entry); HeapFree(GetProcessHeap(), 0, cursor); } + + HeapFree(GetProcessHeap(), 0, file->private_path); } diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 2ccc7bc4f5..e932a7f58b 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -58,6 +58,8 @@ static HANDLE dll_fixup_heap; /* using a separate heap so we can have execute pe static struct list dll_fixups; +WCHAR **private_path = NULL; + struct dll_fixup { struct list entry; @@ -1436,6 +1438,8 @@ static void FixupVTable(HMODULE hmodule) __int32 WINAPI _CorExeMain(void) { + static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; + static const WCHAR scW[] = {';',0}; int exit_code; int argc; char **argv; @@ -1443,12 +1447,14 @@ __int32 WINAPI _CorExeMain(void) MonoImage *image; MonoImageOpenStatus status; MonoAssembly *assembly=NULL; - WCHAR filename[MAX_PATH]; + WCHAR filename[MAX_PATH], config_file[MAX_PATH], *temp, **priv_path; + SIZE_T config_file_dir_size; char *filenameA; ICLRRuntimeInfo *info; RuntimeHost *host; + parsed_config_file parsed_config; HRESULT hr; - int i; + int i, number_of_private_paths = 0; get_utf8_args(&argc, &argv); @@ -1468,6 +1474,33 @@ __int32 WINAPI _CorExeMain(void) FixupVTable(GetModuleHandleW(NULL)); + wcscpy(config_file, filename); + wcscat(config_file, dotconfig); + + hr = parse_config_file(config_file, &parsed_config); + if (SUCCEEDED(hr) && parsed_config.private_path) + { + for(i = 0; parsed_config.private_path[i] != 0; i++) + if (parsed_config.private_path[i] == ';') number_of_private_paths++; + if (parsed_config.private_path[wcslen(parsed_config.private_path) - 1] != ';') number_of_private_paths++; + config_file_dir_size = (wcsrchr(config_file, '\\') - config_file) + 1; + priv_path = HeapAlloc(GetProcessHeap(), 0, (number_of_private_paths + 1) * sizeof(WCHAR *)); + /* wcstok ignores trailing semicolons */ + temp = wcstok(parsed_config.private_path, scW); + for (i = 0; i < number_of_private_paths; i++) + { + priv_path[i] = HeapAlloc(GetProcessHeap(), 0, (config_file_dir_size + wcslen(temp) + 1) * sizeof(WCHAR)); + memcpy(priv_path[i], config_file, config_file_dir_size * sizeof(WCHAR)); + wcscpy(priv_path[i] + config_file_dir_size, temp); + temp = wcstok(NULL, scW); + } + priv_path[number_of_private_paths] = NULL; + if (InterlockedCompareExchangePointer((void **)&private_path, priv_path, NULL)) + ERR("private_path was already set\n"); + } + + free_parsed_config_file(&parsed_config); + hr = get_runtime_info(filename, NULL, NULL, NULL, 0, 0, FALSE, &info); if (SUCCEEDED(hr)) @@ -1475,15 +1508,7 @@ __int32 WINAPI _CorExeMain(void) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); if (SUCCEEDED(hr)) - { - WCHAR config_file[MAX_PATH]; - static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; - - lstrcpyW(config_file, filename); - lstrcatW(config_file, dotconfig); - hr = RuntimeHost_GetDefaultDomain(host, config_file, &domain); - } if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f87737cd83..18232a4568 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1610,20 +1610,56 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname HRESULT hr; MonoAssembly *result=NULL; char *stringname=NULL; + const char *assemblyname; LPWSTR stringnameW; int stringnameW_size; WCHAR path[MAX_PATH]; char *pathA; MonoImageOpenStatus stat; DWORD search_flags; + int i; + static const WCHAR dotdllW[] = {'.','d','l','l',0}; + static const WCHAR slashW[] = {'\\',0}; stringname = mono_stringify_assembly_name(aname); + assemblyname = mono_assembly_name_get_name(aname); TRACE("%s\n", debugstr_a(stringname)); - if (!stringname) return NULL; + if (!stringname || !assemblyname) return NULL; search_flags = get_assembly_search_flags(aname); + if (private_path) + { + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, NULL, 0); + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + { + MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, stringnameW, stringnameW_size); + for (i = 0; private_path[i] != NULL; i++) + { + wcscpy(path, private_path[i]); + wcscat(path, slashW); + wcscat(path, stringnameW); + wcscat(path, dotdllW); + pathA = WtoA(path); + if (pathA) + { + result = mono_assembly_open(pathA, &stat); + if (result) + { + TRACE("found: %s\n", debugstr_w(path)); + HeapFree(GetProcessHeap(), 0, pathA); + HeapFree(GetProcessHeap(), 0, stringnameW); + mono_free(stringname); + return result; + } + HeapFree(GetProcessHeap(), 0, pathA); + } + } + HeapFree(GetProcessHeap(), 0, stringnameW); + } + } /* FIXME: We should search the given paths before the GAC. */ diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index db18aff3eb..2b9c1dd35e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -117,6 +117,7 @@ extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDE typedef struct parsed_config_file { struct list supported_runtimes; + LPWSTR private_path; } parsed_config_file; typedef struct supported_runtime @@ -125,6 +126,8 @@ typedef struct supported_runtime LPWSTR version; } supported_runtime; +extern WCHAR **private_path; + extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) DECLSPEC_HIDDEN; extern HRESULT parse_config_stream(IStream *stream, parsed_config_file *result) DECLSPEC_HIDDEN;

1 0

Tag wine-4.18 : Alexandre Julliard : Release 4.18
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: refs/tags/wine-4.18 Tag: 01fc89c0bb33ffde308a8811156a00e18660babd URL: https://source.winehq.org/git/wine.git/?a=tag;h=01fc89c0bb33ffde308a8811156… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 20:59:26 2019 +0200 Release 4.18

1 0

Gijs Vermeulen : wined3d: Add default case in wined3d_calculate_fog_factor.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: b77ac263777304df214285bef4eaf1a42c35e163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b77ac263777304df214285be… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Fri Oct 4 22:26:49 2019 +0200 wined3d: Add default case in wined3d_calculate_fog_factor. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b1b630014..0a668c46b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3501,6 +3501,9 @@ static float wined3d_calculate_fog_factor(float fog_coord, const struct lights_s return expf(-fog_coord * ls->fog_density); case WINED3D_FOG_EXP2: return expf(-fog_coord * fog_coord * ls->fog_density * ls->fog_density); + default: + ERR("Unhandled fog mode %#x.\n", ls->fog_mode); + return 0.0f; } }

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetRenderState().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: e3a89b6e86506ef961ba19b06811b0c5949ca271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3a89b6e86506ef961ba19b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:07 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 827ec47c60..cc1409d5c1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1827,15 +1827,11 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - switch (state) - { - case D3DRS_ZBIAS: - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); - break; - - default: - wined3d_device_set_render_state(device->wined3d_device, state, value); - } + if (state == D3DRS_ZBIAS) + state = WINED3D_RS_DEPTHBIAS; + wined3d_stateblock_set_render_state(device->update_state, state, value); + if (!device->recording) + wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Jacek Caban : vbscript: Move init_global call to CreateInstance.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: cef14ac3380ee30e04eb3f77f151d0c28f32eb97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef14ac3380ee30e04eb3f77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:40 2019 +0200 vbscript: Move init_global call to CreateInstance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 8b81b7a5e3..56c53b4015 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -128,18 +128,6 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag return NULL; } -static HRESULT set_ctx_site(VBScript *This) -{ - HRESULT hres; - - hres = init_global(This->ctx); - if(FAILED(hres)) - return hres; - - change_state(This, SCRIPTSTATE_INITIALIZED); - return S_OK; -} - static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; @@ -434,7 +422,9 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->ctx->lcid = lcid; - return This->is_initialized ? set_ctx_site(This) : S_OK; + if(This->is_initialized) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -748,7 +738,9 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - return This->ctx->site ? set_ctx_site(This) : S_OK; + if(This->ctx->site) + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, @@ -968,6 +960,12 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU list_init(&ctx->code_list); list_init(&ctx->named_items); + hres = init_global(ctx); + if(FAILED(hres)) { + IActiveScript_Release(&ret->IActiveScript_iface); + return hres; + } + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); return hres;

1 0

Hans Leidekker : wininet/tests: Fix FTP test failures.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: bbf74ea22a5310978c9aecbdc648c562c26fa0fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf74ea22a5310978c9aecbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 18 16:46:23 2019 +0200 wininet/tests: Fix FTP test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/ftp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6f50104f3b..317b291495 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -71,7 +71,7 @@ static void test_connect(HINTERNET hInternet) */ SetLastError(0xdeadbeef); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (hFtp) /* some servers accept an empty password */ { ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); @@ -701,7 +701,7 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } -static void test_command(HINTERNET hFtp, HINTERNET hConnect) +static void test_command(HINTERNET hFtp) { BOOL ret; DWORD error; @@ -716,17 +716,18 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { { FALSE, ERROR_INVALID_PARAMETER, NULL }, { FALSE, ERROR_INVALID_PARAMETER, "" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, - { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, - { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" } + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "invalid" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size" }, + { TRUE, ERROR_SUCCESS, "type i" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " size" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg " }, + { TRUE, ERROR_SUCCESS, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "pwd welcome.msg" }, + { TRUE, ERROR_SUCCESS, "pwd" } }; if (!pFtpCommandA) @@ -964,7 +965,7 @@ static void test_status_callbacks(HINTERNET hInternet) cb = pInternetSetStatusCallbackA(hInternet, status_callback); ok(cb == NULL, "expected NULL got %p\n", cb); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 1); if (!hFtp) { @@ -998,7 +999,7 @@ START_TEST(ftp) hInternet = InternetOpenA("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError()); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (!hFtp) { InternetCloseHandle(hInternet); @@ -1031,7 +1032,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); - test_command(hFtp, hHttp); + test_command(hFtp); test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); test_status_callbacks(hInternet);

1 0

Zebediah Figura : quartz/tests: Relax system clock timing tests a bit.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: ebf82cd6868b795009989c5746895acb124e96e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf82cd6868b795009989c57… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 18 10:01:46 2019 -0500 quartz/tests: Relax system clock timing tests a bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index cd291e1490..3c493a0f38 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -89,8 +89,8 @@ static void test_get_time(void) Sleep(100); hr = IReferenceClock_GetTime(clock, &time2); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(time2 - time1 > 98 * 10000, "Expected about %s, but got %s.\n", - wine_dbgstr_longlong(time1 + 98 * 10000), wine_dbgstr_longlong(time2)); + ok(time2 - time1 > 80 * 10000, "Expected about %s, but got %s.\n", + wine_dbgstr_longlong(time1 + 80 * 10000), wine_dbgstr_longlong(time2)); ref = IReferenceClock_Release(clock); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -160,11 +160,11 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 20), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) { - ok(WaitForSingleObject(semaphore, 480) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - ok(!WaitForSingleObject(semaphore, 40), "Semaphore should be signaled.\n"); + ok(WaitForSingleObject(semaphore, 460) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 60), "Semaphore should be signaled.\n"); } hr = IReferenceClock_Unadvise(clock, cookie);

1 0