- Wine-Devel - list.winehq.org

[PATCH 2/2] msvcp90: Add _Wcsxfrm implementation.
by Piotr Caban Feb. 3, 2021

Feb. 3, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50401 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 37 +++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 24 +++++++++++++++++++ 10 files changed, 69 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] msvcp90: Return required buffer size in _Strxfrm.
by Piotr Caban Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[PATCH] msvcr120: Run strtof tests once.
by Piotr Caban Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH] wbemprox: Fix Windows 8/8.1 caption.
by Hans Leidekker Feb. 3, 2021

Feb. 3, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50610 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1cf75ab380..b86326327fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3436,8 +3436,8 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) { if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) ); -- 2.30.0

1 0

[PATCH v2 1/2] wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation.
by Dmitry Timoshkov Feb. 3, 2021

Feb. 3, 2021

For some reason testbot chokes on UTF-8 character in Copyright while applying the patch, this version of the patch doesn't change the Copyright header. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wevtapi/main.c | 27 +++++++++++++++++++++++++++ include/winevt.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index f7aa7a2a593..1e06a2089e9 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -19,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -26,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); +static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -63,6 +68,28 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, { FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); + + switch (PropertyId) + { + case EvtChannelLoggingConfigLogFilePath: + *PropertyValueBufferUsed = sizeof(log_pathW) + sizeof(EVT_VARIANT); + + if (PropertyValueBufferSize < sizeof(log_pathW) + sizeof(EVT_VARIANT) || !PropertyValueBuffer) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->Type = EvtVarTypeString; + return TRUE; + + default: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + } + return FALSE; } diff --git a/include/winevt.h b/include/winevt.h index a37954f2f94..c41ca7b5ffa 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -62,6 +62,36 @@ typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionDeliver } EVT_SUBSCRIBE_NOTIFY_ACTION; +typedef enum _EVT_VARIANT_TYPE { + EvtVarTypeNull, + EvtVarTypeString, + EvtVarTypeAnsiString, + EvtVarTypeSByte, + EvtVarTypeByte, + EvtVarTypeInt16, + EvtVarTypeUInt16, + EvtVarTypeInt32, + EvtVarTypeUInt32, + EvtVarTypeInt64, + EvtVarTypeUInt64, + EvtVarTypeSingle, + EvtVarTypeDouble, + EvtVarTypeBoolean, + EvtVarTypeBinary, + EvtVarTypeGuid, + EvtVarTypeSizeT, + EvtVarTypeFileTime, + EvtVarTypeSysTime, + EvtVarTypeSid, + EvtVarTypeHexInt32, + EvtVarTypeHexInt64, + EvtVarTypeEvtHandle = 32, + EvtVarTypeEvtXml = 35 +} EVT_VARIANT_TYPE; + +#define EVT_VARIANT_TYPE_MASK 0x7f +#define EVT_VARIANT_TYPE_ARRAY 128 + typedef struct _EVT_VARIANT { union { BOOL BooleanVal; -- 2.29.2

2 1

[PATCH v2 2/2] wevtapi/tests: Add some EvtGetChannelConfigProperty() tests.
by Dmitry Timoshkov Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/wevtapi/Makefile.in | 1 + dlls/wevtapi/main.c | 1 - dlls/wevtapi/tests/Makefile.in | 5 +++ dlls/wevtapi/tests/wevtapi.c | 74 ++++++++++++++++++++++++++++++++++ include/winevt.h | 1 + 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 dlls/wevtapi/tests/Makefile.in create mode 100644 dlls/wevtapi/tests/wevtapi.c diff --git a/configure.ac b/configure.ac index a9003523700..3a0bc6e713a 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtapi/tests) WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 9b742fe9aeb..c80aac26d3a 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = wevtapi.dll +IMPORTLIB = wevtapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in new file mode 100644 index 00000000000..47fde74b0eb --- /dev/null +++ b/dlls/wevtapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wevtapi.dll +IMPORTS = wevtapi advapi32 + +C_SRCS = \ + wevtapi.c diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c new file mode 100644 index 00000000000..a0a21aa9971 --- /dev/null +++ b/dlls/wevtapi/tests/wevtapi.c @@ -0,0 +1,74 @@ +/* + * Copyright 2021 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 + */ + +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winevt.h" +#include "wine/test.h" + +static void test_EvtGetChannelConfigProperty(void) +{ + HKEY key; + EVT_HANDLE config; + DWORD size, ret; + struct + { + EVT_VARIANT var; + WCHAR buf[MAX_PATH]; + } path; + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\EventLog\\Winetest", &key); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough privileges to modify HKLM\n"); + return; + } + ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + + config = EvtOpenChannelConfig(NULL, L"Winetest", 0); + ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); + ok(!ret, "EvtGetChannelConfigProperty should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size < sizeof(path), "got %u\n", size); + + memset(&path, 0, sizeof(path)); + path.var.Count = 0xdeadbeef; + path.var.Type = 0xdeadbeef; + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); + ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + + EvtClose(config); + + RegDeleteKeyW(key, L""); + RegCloseKey(key); +} + +START_TEST(wevtapi) +{ + test_EvtGetChannelConfigProperty(); +} diff --git a/include/winevt.h b/include/winevt.h index c41ca7b5ffa..f9f73ba18c4 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,7 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, -- 2.29.2

1 0

[PATCH v2 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 78 ++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..9d74caca986 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,83 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} START_TEST(iphlpapi) { @@ -2370,6 +2447,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

1 1

[PATCH] mscoree: Improve non-neutral assembly lookup logic.
by Rémi Bernon Feb. 3, 2021

Feb. 3, 2021

And neutral logic too, and the combinations with custom privatePath config. This fixes a crash with Mafia III launcher, when it tries to load its localized strings from culture-specific assemblies to display its warning popup message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mscoree/metahost.c | 75 ++++++-- dlls/mscoree/tests/loadpaths.dll.cs | 33 ++++ dlls/mscoree/tests/loadpaths.exe.config | 8 + dlls/mscoree/tests/loadpaths.exe.cs | 28 +++ dlls/mscoree/tests/mscoree.c | 226 ++++++++++++++++++++++++ dlls/mscoree/tests/resource.rc | 9 + 6 files changed, 360 insertions(+), 19 deletions(-) create mode 100644 dlls/mscoree/tests/loadpaths.dll.cs create mode 100644 dlls/mscoree/tests/loadpaths.exe.config create mode 100644 dlls/mscoree/tests/loadpaths.exe.cs diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index a3ed1534753..d9b599fadc7 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "winternl.h" #include "ole2.h" +#include "shlwapi.h" #include "corerror.h" #include "cor.h" @@ -87,6 +88,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); +const char* (CDECL *mono_assembly_name_get_culture)(MonoAssemblyName *aname); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -193,6 +195,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_get_image); LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_name_get_name); + LOAD_MONO_FUNCTION(mono_assembly_name_get_culture); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1651,24 +1654,48 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } +static MonoAssembly* mono_assembly_try_load(WCHAR *path) +{ + MonoAssembly *result = NULL; + MonoImageOpenStatus stat; + char *pathA; + + if (!(pathA = WtoA(path))) return NULL; + + result = mono_assembly_open(pathA, &stat); + HeapFree(GetProcessHeap(), 0, pathA); + + if (result) TRACE("found: %s\n", debugstr_w(path)); + return result; +} + static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; char *stringname=NULL; const char *assemblyname; - LPWSTR stringnameW; - int stringnameW_size; + const char *culture; + LPWSTR stringnameW, cultureW; + int stringnameW_size, cultureW_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}; + static const WCHAR dotexeW[] = {'.','e','x','e',0}; stringname = mono_stringify_assembly_name(aname); assemblyname = mono_assembly_name_get_name(aname); + culture = mono_assembly_name_get_culture(aname); + if (culture) + { + cultureW_size = MultiByteToWideChar(CP_UTF8, 0, culture, -1, NULL, 0); + cultureW = HeapAlloc(GetProcessHeap(), 0, cultureW_size * sizeof(WCHAR)); + if (cultureW) MultiByteToWideChar(CP_UTF8, 0, culture, -1, cultureW, cultureW_size); + } + else cultureW = NULL; TRACE("%s\n", debugstr_a(stringname)); @@ -1684,26 +1711,34 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, stringnameW, stringnameW_size); for (i = 0; private_path[i] != NULL; i++) { + /* This is the lookup order used in Mono */ + /* 1st try: [culture]/[name].dll (culture may be empty) */ wcscpy(path, private_path[i]); - wcscat(path, slashW); - wcscat(path, stringnameW); + if (cultureW) PathAppendW(path, cultureW); + PathAppendW(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); - } + result = mono_assembly_try_load(path); + if (result) break; + + /* 2nd try: [culture]/[name].exe (culture may be empty) */ + wcscpy(path + wcslen(path) - wcslen(dotdllW), dotexeW); + result = mono_assembly_try_load(path); + if (result) break; + + /* 3rd try: [culture]/[name]/[name].dll (culture may be empty) */ + path[wcslen(path) - wcslen(dotexeW)] = 0; + PathAppendW(path, stringnameW); + wcscat(path, dotdllW); + result = mono_assembly_try_load(path); + if (result) break; + + /* 4th try: [culture]/[name]/[name].exe (culture may be empty) */ + wcscpy(path + wcslen(path) - wcslen(dotdllW), dotexeW); + result = mono_assembly_try_load(path); + if (result) break; } HeapFree(GetProcessHeap(), 0, stringnameW); + if (result) goto done; } } @@ -1745,6 +1780,8 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname else TRACE("skipping Windows GAC search due to override setting\n"); +done: + if (cultureW) HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); return result; diff --git a/dlls/mscoree/tests/loadpaths.dll.cs b/dlls/mscoree/tests/loadpaths.dll.cs new file mode 100644 index 00000000000..99732b011d8 --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.dll.cs @@ -0,0 +1,33 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * 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 + */ + +using System.Reflection; + +#if NEUTRAL +[assembly: AssemblyCulture("")] +#else +[assembly: AssemblyCulture("en")] +#endif + +namespace LoadPaths +{ + public class Test2 + { + public int Foo() { return 0; } + } +} diff --git a/dlls/mscoree/tests/loadpaths.exe.config b/dlls/mscoree/tests/loadpaths.exe.config new file mode 100644 index 00000000000..be6d9fb95cd --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.exe.config @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <probing privatePath="private"/> + </assemblyBinding> + </runtime> +</configuration> diff --git a/dlls/mscoree/tests/loadpaths.exe.cs b/dlls/mscoree/tests/loadpaths.exe.cs new file mode 100644 index 00000000000..22c32603c59 --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.exe.cs @@ -0,0 +1,28 @@ +/* + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * 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 + */ + +namespace LoadPaths +{ + public static class Test + { + static int Main(string[] args) + { + return new Test2().Foo(); + } + } +} diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 26c06246a94..4be3da8c731 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -538,6 +538,229 @@ static void test_createinstance(void) } } +static BOOL write_resource(const WCHAR *resource, const WCHAR *filename) +{ + HANDLE file; + HRSRC rsrc; + void *data; + DWORD size; + BOOL ret; + + rsrc = FindResourceW(GetModuleHandleW(NULL), resource, MAKEINTRESOURCEW(RT_RCDATA)); + if (!rsrc) return FALSE; + + data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!data) return FALSE; + + size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!size) return FALSE; + + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(file, data, size, &size, NULL); + CloseHandle(file); + return ret; +} + +static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *type, const WCHAR *args) +{ + static const WCHAR *csc = L"C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + WCHAR cmdline[2 * MAX_PATH + 74]; + PROCESS_INFORMATION pi; + STARTUPINFOW si = { 0 }; + BOOL ret; + + if (!PathFileExistsW(csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s /t:%s %s /out:\"%s\" \"%s\"", csc, type, args, target, source); + + si.cb = sizeof(si); + ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsW(target); + ok(ret, "Compilation failed\n"); + + return ret; +} + +static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, const WCHAR *cfg_name, + const WCHAR *dll_dest, BOOL expect_failure, BOOL todo) +{ + WCHAR tmp[MAX_PATH], tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOW si = { 0 }; + WCHAR *ptr, *end; + DWORD exit_code = 0xdeadbeef; + LUID id; + BOOL ret; + + GetTempPathW(MAX_PATH, tmp); + ret = AllocateLocallyUniqueId(&id); + ok(ret, "AllocateLocallyUniqueId failed: %u\n", GetLastError()); + ret = GetTempFileNameW(tmp, L"loadpaths", id.LowPart, tmpdir); + ok(ret, "GetTempFileNameW failed: %u\n", GetLastError()); + + ret = CreateDirectoryW(tmpdir, NULL); + ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + + wcscpy(tmpexe, tmpdir); + PathAppendW(tmpexe, exe_name); + ret = CopyFileW(exe_name, tmpexe, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + if (cfg_name) + { + wcscpy(tmpcfg, tmpdir); + PathAppendW(tmpcfg, cfg_name); + ret = CopyFileW(cfg_name, tmpcfg, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + } + + ptr = tmpdir + wcslen(tmpdir); + PathAppendW(tmpdir, dll_dest); + while (*ptr && (ptr = wcschr(ptr + 1, '\\'))) + { + *ptr = '\0'; + ret = CreateDirectoryW(tmpdir, NULL); + ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + *ptr = '\\'; + } + + wcscpy(tmpdll, tmpdir); + if ((ptr = wcsrchr(tmpdir, '\\'))) *ptr = '\0'; + + ret = CopyFileW(dll_name, tmpdll, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + + si.cb = sizeof(si); + ret = CreateProcessW(tmpexe, tmpexe, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 500); + else + { + ret = WaitForSingleObject(pi.hProcess, 5000); + ok(ret == WAIT_OBJECT_0, "%s: WaitForSingleObject returned %d: %u\n", debugstr_w(dll_dest), ret, GetLastError()); + } + + GetExitCodeProcess(pi.hProcess, &exit_code); + if (ret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0xdeadbeef); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + if (expect_failure) todo_wine_if(todo) ok(exit_code != 0, "%s: Succeeded to execute process\n", debugstr_w(dll_dest)); + else ok(exit_code == 0, "%s: Failed to execute process\n", debugstr_w(dll_dest)); + + /* sometimes the failing process never returns, in which case cleaning up won't work */ + if (ret == WAIT_TIMEOUT && expect_failure) return; + + if (cfg_name) + { + ret = DeleteFileW(tmpcfg); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + } + ret = DeleteFileW(tmpdll); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + ret = DeleteFileW(tmpexe); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + end = tmpdir + wcslen(tmp); + ptr = tmpdir + wcslen(tmpdir) - 1; + while (ptr > end && (ptr = wcsrchr(tmpdir, '\\'))) + { + ret = RemoveDirectoryW(tmpdir); + ok(ret, "RemoveDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + *ptr = '\0'; + } +} + +static void test_loadpaths(BOOL neutral) +{ + static const WCHAR *loadpaths[] = {L"", L"en", L"libloadpaths", L"en\\libloadpaths"}; + static const WCHAR *dll_source = L"loadpaths.dll.cs"; + static const WCHAR *dll_name = L"libloadpaths.dll"; + static const WCHAR *exe_source = L"loadpaths.exe.cs"; + static const WCHAR *exe_name = L"loadpaths.exe"; + static const WCHAR *cfg_name = L"loadpaths.exe.config"; + WCHAR tmp[MAX_PATH]; + BOOL ret; + int i; + + DeleteFileW(dll_source); + ret = write_resource(dll_source, dll_source); + ok(ret, "Could not write resource: %u\n", GetLastError()); + DeleteFileW(dll_name); + ret = compile_cs(dll_source, dll_name, L"library", neutral ? L"-define:NEUTRAL" : L""); + if (!ret) return; + ret = DeleteFileW(dll_source); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + + DeleteFileW(exe_source); + ret = write_resource(exe_source, exe_source); + ok(ret, "Could not write resource: %u\n", GetLastError()); + DeleteFileW(exe_name); + ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + if (!ret) return; + ret = DeleteFileW(exe_source); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + + DeleteFileW(cfg_name); + ret = write_resource(cfg_name, cfg_name); + ok(ret, "Could not write resource: %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(loadpaths); ++i) + { + const WCHAR *path = loadpaths[i]; + BOOL expect_failure = neutral ? wcsstr(path, L"en") != NULL + : wcsstr(path, L"en") == NULL; + + wcscpy(tmp, path); + PathAppendW(tmp, dll_name); + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, expect_failure, !neutral && !*path); + + wcscpy(tmp, L"private"); + if (*path) PathAppendW(tmp, path); + PathAppendW(tmp, dll_name); + + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, TRUE, FALSE); + test_loadpaths_execute(exe_name, dll_name, cfg_name, tmp, expect_failure, FALSE); + + /* exe name for dll should work too */ + if (*path) + { + wcscpy(tmp, path); + PathAppendW(tmp, dll_name); + wcscpy(tmp + wcslen(tmp) - 4, L".exe"); + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, expect_failure, FALSE); + } + + wcscpy(tmp, L"private"); + if (*path) PathAppendW(tmp, path); + PathAppendW(tmp, dll_name); + wcscpy(tmp + wcslen(tmp) - 4, L".exe"); + + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, TRUE, FALSE); + test_loadpaths_execute(exe_name, dll_name, cfg_name, tmp, expect_failure, FALSE); + } + + ret = DeleteFileW(cfg_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ret = DeleteFileW(exe_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ret = DeleteFileW(dll_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); +} + static void test_createdomain(void) { static const WCHAR test_name[] = {'t','e','s','t',0}; @@ -650,5 +873,8 @@ START_TEST(mscoree) test_createdomain(); } + test_loadpaths(FALSE); + test_loadpaths(TRUE); + FreeLibrary(hmscoree); } diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc index 9a1b89f6569..34516f744a0 100644 --- a/dlls/mscoree/tests/resource.rc +++ b/dlls/mscoree/tests/resource.rc @@ -28,3 +28,12 @@ comtest_exe.manifest RCDATA comtest_exe.manifest /* @makedep: comtest_dll.manifest */ comtest_dll.manifest RCDATA comtest_dll.manifest + +/* @makedep: loadpaths.exe.cs */ +loadpaths.exe.cs RCDATA loadpaths.exe.cs + +/* @makedep: loadpaths.dll.cs */ +loadpaths.dll.cs RCDATA loadpaths.dll.cs + +/* @makedep: loadpaths.exe.config */ +loadpaths.exe.config RCDATA loadpaths.exe.config -- 2.30.0

2 1

[PATCH] gdiplus/tests: Test image brush transformation.
by Haoyang Chen Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/gdiplus/tests/brush.c | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 78939e68991..0287078bc80 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <math.h> #include "objbase.h" @@ -274,6 +275,37 @@ static void test_transform(void) GpPointF start, end; GpRectF rectf; REAL elements[6]; + UINT buf[15]; + HBITMAP hbmp,old; + HDC dcmem; + BITMAP bm; + GpImage *image; + IStream *stream; + HGLOBAL hglob; + VOID *data; + HRESULT hr; + LONG size; + + /* 3*5 bmp 32bit*/ + static const unsigned char bmpimage[] = { + 0x42,0x4d,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00, + 0x00,0x00,0x28,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00, + 0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x3e,0x00, + 0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00, + 0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00, + 0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00, + 0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00, + 0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00, + 0x00,0x00,0x00,0x00}; + + static const UINT buf_rotate_180[15] = { + 0xffffffff, 0xffffffff, 0xffffffff, + 0xffff11ff, 0xffff11ff, 0xffff11ff, + 0xffff33ff, 0xffff33ff, 0xffff33ff, + 0xffff55ff, 0xffff55ff, 0xffff55ff, + 0xffffaaff, 0xffffaaff, 0xffffaaff}; /* GpTexture */ status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); @@ -556,6 +588,38 @@ static void test_transform(void) expect(Ok, status); status = GdipDeleteBrush((GpBrush*)line); expect(Ok,status); + GdipDeleteGraphics(graphics); + + dcmem = CreateCompatibleDC(hdc); + hbmp = CreateBitmap(3, 5, 1, 32, NULL); + old = SelectObject(dcmem, hbmp); + status = GdipCreateFromHDC(dcmem, &graphics); + expect(Ok, status); + hglob = GlobalAlloc(0, sizeof(bmpimage)); + data = GlobalLock (hglob); + memcpy(data, bmpimage, sizeof(bmpimage)); + GlobalUnlock(hglob); + hr = CreateStreamOnHGlobal(hglob, TRUE, &stream); + expect(S_OK, hr); + status = GdipLoadImageFromStream(stream, &image); + expect(Ok, status); + status = GdipCreateTexture(image, WrapModeTile, &texture); + expect(Ok, status); + status = GdipRotateTextureTransform(texture, 180.0f, MatrixOrderPrepend); + expect(Ok, status); + status = GdipFillRectangle(graphics, (GpBrush*)texture, .0f, .0f, (REAL)3, (REAL)5); + expect(Ok, status); + GdipDeleteBrush((GpBrush*)texture); + GdipDisposeImage(image); + GdipDeleteGraphics(graphics); + IStream_Release(stream); + hbmp = SelectObject(dcmem, old); + GetObjectW(hbmp, sizeof(bm), &bm); + size = GetBitmapBits(hbmp, sizeof(buf), buf); + expect(sizeof(buf), size); + DeleteObject(hbmp); + DeleteDC(dcmem); + ok(!memcmp(buf, buf_rotate_180, sizeof(buf)), "Failed to rotate image.\n"); if(0){ /* enable to visually compare with Windows */ -- 2.20.1

2 1

[tools] testbot/PatchUtils: Only update the Wine files list for Wine patches.
by Francois Gouget Feb. 3, 2021

Feb. 3, 2021

Only update the list of Wine files if the patch is a Wine patch or will trigger a make_makefiles run (which means any new file could be used). Also reset IsWinePatch to evaluate later parts on their own merits. But note that if we had MakeMakefiles=1 despite IsWinePatch=0 (previous parts modified a Makefile.in file but are not unambiguously a Wine patch), if the last part modifies one of the files newly added to the Wine files list it will automatically get IsWinePatch=1; whereas if presented as a single patch it would still have had MakeMakefiles=1 + IsWinePatch=0. Fortunately the two cases are equivalent as far as Patches::Submit() is concerned. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite test: WTBS S6.2 - Patch to a non-Wine file. testbot/lib/WineTestBot/PatchUtils.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index dda855d11..aeb874321 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -393,10 +393,14 @@ sub GetPatchImpacts($) # Build a copy of the Wine files list reflecting the current situation. $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; - $Impacts->{NewFiles} = {}; - $Impacts->{DeletedFiles} = {}; + if ($Impacts->{IsWinePatch} or $Impacts->{MakeMakefiles}) + { + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; + $Impacts->{NewFiles} = {}; + $Impacts->{DeletedFiles} = {}; + delete $Impacts->{IsWinePatch}; + } # The modules impacted by previous parts will still need to be built, # but only if the last part justifies a build. So make a backup. -- 2.20.1

1 0