April 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] ntdll: Remove APC handling from RtlWaitOnAddress.
by Jacek Caban 19 Apr '20

19 Apr '20

It uses non-alertable wait anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/server.c | 4 ++-- dlls/ntdll/sync.c | 34 +++++++++++----------------------- 3 files changed, 13 insertions(+), 27 deletions(-)

1 0

[PATCH] ntdll: Improve portability of call_constructor (and port to FreeBSD)
by Gerald Pfeifer 19 Apr '20

19 Apr '20

The new function call_constructors in dlls/ntdll/loader.c introduced via 081c8e1c73bb8d79a060da7816b5c429180b35b7 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:22:24 2020 +0200 ntdll: Execute .so constructors during module initialization. breaks the build on FreeBSD and presumably others. Specifically, struct link_map *map; : if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; while (map->l_ld->d_tag) : fails to compile: loader.c: In function ‘call_constructors’: loader.c:1329:21: warning: dereferencing ‘void *’ pointer 1329 | while (map->l_ld->d_tag) | ^~ loader.c:1329:21: error: request for member ‘d_tag’ in something not a structure or union This is due to /usr/include/link.h (via /usr/include/sys/link_elf.h) defining link_map.l_ld as a void* as opposed to a more specific type like on Linux: typedef struct link_map { caddr_t l_addr; /* Base Address of library */ #ifdef __mips__ caddr_t l_offs; /* Load Offset of library */ #endif const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ } Link_map; Luckily FreeBSD does feature Elf64_Dyn and Elf32_Dyn which do match their Linux equivalents, so introducing a new variable holding a pointer to one of those and using implicit type conversions with void* addresses this. If further platforms require similar adjustments, this should now be a question of extending one condition or adding two lines. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/loader.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c713a5d0a6..e9140145e1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1324,17 +1324,25 @@ static void call_constructors( WINE_MODREF *wm ) void (*init_func)(int, char **, char **) = NULL; void (**init_array)(int, char **, char **) = NULL; ULONG_PTR i, init_arraysz = 0; +#if defined (__FreeBSD__) && defined (__LP64__) + const Elf64_Dyn *l_ld; +#elif defined (__FreeBSD__) + const Elf32_Dyn *l_ld; +#else + const ElfW(Dyn) *l_ld; +#endif if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; - while (map->l_ld->d_tag) + l_ld = map->l_ld; + while (l_ld->d_tag) { - switch (map->l_ld->d_tag) + switch (l_ld->d_tag) { - case 0x60009990: init_array = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; - case 0x60009991: init_arraysz = map->l_ld->d_un.d_val; break; - case 0x60009992: init_func = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + case 0x60009990: init_array = (void *)((char *)map->l_addr + l_ld->d_un.d_val); break; + case 0x60009991: init_arraysz = l_ld->d_un.d_val; break; + case 0x60009992: init_func = (void *)((char *)map->l_addr + l_ld->d_un.d_val); break; } - map->l_ld++; + l_ld++; } TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ), -- 2.25.0

1 0

[PATCH 3/3] mscoree: Update Wine Mono to 5.0.0.
by Esme 19 Apr '20

19 Apr '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 12 +++++++++--- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 48a84f39589..c1405d5ec8a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.4" -#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" +#define MONO_VERSION "5.0.0" +#if defined(__i386__) || defined(__x86_64__) +#define MONO_ARCH "x86" +#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5" +#else +#define MONO_ARCH "" +#define MONO_SHA "???" +#endif typedef struct { const char *version; @@ -88,7 +94,7 @@ static const addon_info_t addons_info[] = { }, { MONO_VERSION, - L"wine-mono-" MONO_VERSION ".msi", + L"wine-mono-" MONO_VERSION "-" MONO_ARCH ".msi", L"mono", MONO_SHA, "http://source.winehq.org/winemono.php", diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f824cc9d5c1..cd032aefc06 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.4" +#define WINE_MONO_VERSION "5.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

[PATCH 2/3] mscoree: Replace uses of mono_domain_assembly_open.
by Esme 19 Apr '20

19 Apr '20

From: Vincent Povirk <vincent(a)codeweavers.com> This function is only intended to be used for the entry point assembly. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 10 ++++++---- dlls/mscoree/metahost.c | 2 -- dlls/mscoree/mscoree_private.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c79c4fd8d11..9f53555ee94 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -206,10 +206,11 @@ static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname, } else { - assembly = mono_domain_assembly_open(domain, assemblyname); + MonoImageOpenStatus status; + assembly = mono_assembly_open(assemblyname, &status); if (!assembly) { - ERR("Cannot load assembly %s\n", assemblyname); + ERR("Cannot load assembly %s, status=%i\n", assemblyname, status); return FALSE; } @@ -1819,6 +1820,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) MonoClass *klass; MonoObject *result; MonoDomain *prev_domain; + MonoImageOpenStatus status; IUnknown *unk = NULL; char *filenameA, *ns; char *classA; @@ -1828,11 +1830,11 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) prev_domain = domain_attach(domain); filenameA = WtoA(filename); - assembly = mono_domain_assembly_open(domain, filenameA); + assembly = mono_assembly_open(filenameA, &status); HeapFree(GetProcessHeap(), 0, filenameA); if (!assembly) { - ERR("Cannot open assembly %s\n", filenameA); + ERR("Cannot open assembly %s, status=%i\n", filenameA, status); domain_restore(prev_domain); goto cleanup; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 9fa7978340d..9a299662e38 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -93,7 +93,6 @@ MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); static void (CDECL *mono_config_parse)(const char *filename); -MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); MonoDomain* (CDECL *mono_domain_get)(void); MonoDomain* (CDECL *mono_domain_get_by_id)(int id); BOOL (CDECL *mono_domain_set)(MonoDomain *domain,BOOL force); @@ -199,7 +198,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_class_from_mono_type); LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); - LOAD_MONO_FUNCTION(mono_domain_assembly_open); LOAD_MONO_FUNCTION(mono_domain_get); LOAD_MONO_FUNCTION(mono_domain_get_by_id); LOAD_MONO_FUNCTION(mono_domain_set); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8ad95e385eb..f824cc9d5c1 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -157,7 +157,6 @@ extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN; extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN; -extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_domain_get)(void) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_domain_get_by_id)(int id) DECLSPEC_HIDDEN; extern BOOL (CDECL *mono_domain_set)(MonoDomain *domain, BOOL force) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH 1/3] mscoree: Use mono_get_corlib to get mscorlib image.
by Esme 19 Apr '20

19 Apr '20

From: Vincent Povirk <vincent(a)codeweavers.com> Apparently, mono_domain_assembly_open is intended for the entry point assembly only, and no longer works when mscorlib is passed in. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 39 ++++++++++++++++++++-------------- dlls/mscoree/metahost.c | 2 ++ dlls/mscoree/mscoree_private.h | 1 + 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 7eb43854940..c79c4fd8d11 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -200,18 +200,25 @@ static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname, MonoImage *image; MonoClass *klass; - assembly = mono_domain_assembly_open(domain, assemblyname); - if (!assembly) + if (!assemblyname) { - ERR("Cannot load assembly %s\n", assemblyname); - return FALSE; + image = mono_get_corlib(); } - - image = mono_assembly_get_image(assembly); - if (!image) + else { - ERR("Couldn't get assembly image for %s\n", assemblyname); - return FALSE; + assembly = mono_domain_assembly_open(domain, assemblyname); + if (!assembly) + { + ERR("Cannot load assembly %s\n", assemblyname); + return FALSE; + } + + image = mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image for %s\n", assemblyname); + return FALSE; + } } klass = mono_class_from_name(image, namespace, typename); @@ -250,7 +257,7 @@ static HRESULT RuntimeHost_DoInvoke(RuntimeHost *This, MonoDomain *domain, if (methodname != get_hresult) { /* Map the exception to an HRESULT. */ - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Exception", get_hresult, + hr = RuntimeHost_Invoke(This, domain, NULL, "System", "Exception", get_hresult, exc, NULL, 0, &hr_object); if (SUCCEEDED(hr)) hr = *(HRESULT*)mono_object_unbox(hr_object); @@ -348,7 +355,7 @@ static HRESULT RuntimeHost_GetObjectForIUnknown(RuntimeHost *This, MonoDomain *d MonoObject *result; args[0] = &unk; - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System.Runtime.InteropServices", "Marshal", "GetObjectForIUnknown", + hr = RuntimeHost_Invoke(This, domain, NULL, "System.Runtime.InteropServices", "Marshal", "GetObjectForIUnknown", NULL, args, 1, &result); if (SUCCEEDED(hr)) @@ -413,7 +420,7 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, const WCHAR *name, IUnkn args[2] = NULL; } - res = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "AppDomain", "CreateDomain", + res = RuntimeHost_Invoke(This, domain, NULL, "System", "AppDomain", "CreateDomain", NULL, args, 3, &new_domain); if (FAILED(res)) @@ -427,7 +434,7 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, const WCHAR *name, IUnkn * Instead, do a vcall. */ - res = RuntimeHost_VirtualInvoke(This, domain, "mscorlib", "System", "AppDomain", "get_Id", + res = RuntimeHost_VirtualInvoke(This, domain, NULL, "System", "AppDomain", "get_Id", new_domain, NULL, 0, &id); if (FAILED(res)) @@ -448,7 +455,7 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d MonoObject *appdomain_object; IUnknown *unk; - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "AppDomain", "get_CurrentDomain", + hr = RuntimeHost_Invoke(This, domain, NULL, "System", "AppDomain", "get_CurrentDomain", NULL, NULL, 0, &appdomain_object); if (SUCCEEDED(hr)) @@ -480,7 +487,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) args[0] = &exitcode; args[1] = NULL; - RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Environment", "Exit", + RuntimeHost_Invoke(This, domain, NULL, "System", "Environment", "Exit", NULL, args, 1, &dummy); ERR("Process should have exited\n"); @@ -1048,7 +1055,7 @@ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, domain = mono_object_get_domain(obj); - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System.Runtime.InteropServices", "Marshal", "GetIUnknownForObject", + hr = RuntimeHost_Invoke(This, domain, NULL, "System.Runtime.InteropServices", "Marshal", "GetIUnknownForObject", NULL, (void**)&obj, 1, &result); if (SUCCEEDED(hr)) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index df01f9b77ff..9fa7978340d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -99,6 +99,7 @@ MonoDomain* (CDECL *mono_domain_get_by_id)(int id); BOOL (CDECL *mono_domain_set)(MonoDomain *domain,BOOL force); void (CDECL *mono_domain_set_config)(MonoDomain *domain,const char *base_dir,const char *config_file_name); static void (CDECL *mono_free)(void *); +MonoImage* (CDECL *mono_get_corlib)(void); static MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); @@ -204,6 +205,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_domain_set); LOAD_MONO_FUNCTION(mono_domain_set_config); LOAD_MONO_FUNCTION(mono_free); + LOAD_MONO_FUNCTION(mono_get_corlib); LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5b6c3987615..8ad95e385eb 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -162,6 +162,7 @@ extern MonoDomain* (CDECL *mono_domain_get)(void) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_domain_get_by_id)(int id) DECLSPEC_HIDDEN; extern BOOL (CDECL *mono_domain_set)(MonoDomain *domain, BOOL force) DECLSPEC_HIDDEN; extern void (CDECL *mono_domain_set_config)(MonoDomain *domain,const char *base_dir,const char *config_file_name) DECLSPEC_HIDDEN; +extern MonoImage* (CDECL *mono_get_corlib)(void) DECLSPEC_HIDDEN; extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version) DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH] gdiplus/tests: Use originating line when ok_path reports failures.
by Jeff Smith 19 Apr '20

19 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a02500bc1d..a987cd165d 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,8 +75,10 @@ typedef struct int todo; } path_test_t; -#define ok_path(a,b,c,d) ok_path_fudge(a,b,c,d,2.0) -static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge) +#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,2.0,__LINE__) +#define ok_path_fudge(a,b,c,d,e) _ok_path_fudge(a,b,c,d,e,__LINE__) +static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, + BOOL todo_size, REAL fudge, int line) { BYTE * types; INT size, idx = 0, eidx = 0, numskip; @@ -89,7 +91,7 @@ static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expecte } todo_wine_if (todo_size) - ok(size == expected_size, "Path size %d does not match expected size %d\n", + ok_(__FILE__,line)(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); @@ -112,7 +114,7 @@ static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expecte stringify_point_type(types[idx], name); todo_wine_if (expected[eidx].todo || numskip) - ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ok_(__FILE__,line)(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, ename, expected[eidx].X, expected[eidx].Y, name, points[idx].X, points[idx].Y); -- 2.23.0

2 1

[PATCH] kernelbase: Fix a string leak in CreateProcessInternal (Valgrind).
by Sven Baars 18 Apr '20

18 Apr '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/kernelbase/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index b125f100f6..3369180206 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -182,10 +182,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (envW != env) RtlFreeHeap( GetProcessHeap(), 0, envW ); return NULL; } + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; -- 2.24.0

1 2

[PATCH] kernel32: Fix a memory leak in MoveFileWithProgressW (Valgrind).
by Sven Baars 18 Apr '20

18 Apr '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 334fc25e87..93759592c4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -502,6 +502,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, memcpy( rename_info->FileName, nt_name.Buffer, nt_name.Length ); RtlFreeUnicodeString( &nt_name ); status = NtSetInformationFile( source_handle, &io, rename_info, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, rename_info ); if (status == STATUS_NOT_SAME_DEVICE && (flag & MOVEFILE_COPY_ALLOWED)) { NtClose( source_handle ); -- 2.24.0

2 1

[PATCH] configure: Install wineusb.inf.
by Zebediah Figura 18 Apr '20

18 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48958 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index e09072c935..46d51caf92 100644 --- a/configure.ac +++ b/configure.ac @@ -4100,6 +4100,7 @@ fonts \ loader/wine.inf \ loader/winebus.inf \ loader/winehid.inf \ +loader/wineusb.inf \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \ -- 2.26.0

1 0

[PATCH 1/3] mshtml: for res:// URLs, numeric resource type ids don't need a leading '#'
by Damjan Jovanovic 18 Apr '20

18 Apr '20

Numeric resource type ids are either specified as the number with MAKEINTRESOURCEW(), or as a string prefixed by '#'. But mshtml's res:// protocol also allows the resource type id to be a numeric string without the '#' prefix. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/protocol.c | 27 +++++++++++++++++++-------- dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 26 insertions(+), 8 deletions(-)

2 1