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

Roman Pišl : comctl32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: be1446f56cd82d1c9d3b6ffc31ce71fe54c8c87e URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1446f56cd82d1c9d3b6ffc… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Apr 20 12:20:14 2020 +0200 comctl32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 8 ++++++-- dlls/comctl32/tests/edit.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index b0c32445b0..4861fd7a9c 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1579,8 +1579,12 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy) { INT nyoff; INT x_offset_in_pixels; - INT lines_per_page = (es->format_rect.bottom - es->format_rect.top) / - es->line_height; + INT lines_per_page; + + if (!es->line_height || !es->char_width) + return TRUE; + + lines_per_page = (es->format_rect.bottom - es->format_rect.top) / es->line_height; if (es->style & ES_MULTILINE) { diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 763ade4831..e3b2f40804 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1790,6 +1790,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, ok(r == 1, "Returned %ld, expected 1.\n", r); r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1); + ok(r == 1, "Returned %ld, expected 1.\n", r); return result; @@ -1800,6 +1802,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, ok(r == 1, "Returned %ld, expected 1.\n", r); r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1); + ok(r == 1, "Returned %ld, expected 1.\n", r); break; }

1 0

Nikolay Sivov : ole32: Simplify static IMalloc instance initialization.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 0a35f0053ab8ddd771126d617dbe15c916d21c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a35f0053ab8ddd771126d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:22 2020 +0300 ole32: Simplify static IMalloc instance initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 62007800e3..a144833c7a 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -47,17 +47,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); /* set the vtable later */ static const IMallocVtbl VT_IMalloc32; -typedef struct { +struct allocator +{ IMalloc IMalloc_iface; IMallocSpy * pSpy; /* the spy when active */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ BOOL SpyReleasePending; /* CoRevokeMallocSpy called with spyed allocations left*/ LPVOID * SpyedBlocks; /* root of the table */ DWORD SpyedBlockTableLength;/* size of the table*/ -} _Malloc32; +}; -/* this is the static object instance */ -static _Malloc32 Malloc32 = {{&VT_IMalloc32}, NULL, 0, 0, NULL, 0}; +static struct allocator Malloc32 = { .IMalloc_iface.lpVtbl = &VT_IMalloc32 }; /* with a spy active all calls from pre to post methods are threadsafe */ static CRITICAL_SECTION IMalloc32_SpyCS;

1 0

Liam Middlebrook : winevulkan: Don't mark alias functions as required.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 8379a7f87c1ba8b4bcd95455974005229cea6c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8379a7f87c1ba8b4bcd95455… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:00 2020 -0700 winevulkan: Don't mark alias functions as required. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ccbb74e626..482d9805cb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2659,9 +2659,6 @@ class VkRegistry(object): elif type_info["category"] == "bitmask": mark_bitmask_dependencies(type_info["data"], self.types) - if func.is_alias(): - func.alias.required = True - def _parse_commands(self, root): """ Parse command section containing the Vulkan function calls. """ funcs = {}

1 0

Sven Baars : ntdll: Fix a memory leak in fork_and_exec.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 1cfaf1425a965d54331a2cc4906cad9fb56b8a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cfaf1425a965d54331a2cc4… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 22:06:48 2020 +0200 ntdll: Fix a memory leak in fork_and_exec. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6d506c8530..28aa671f47 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1554,6 +1554,7 @@ static NTSTATUS fork_and_exec( UNICODE_STRING *path, const RTL_USER_PROCESS_PARA if (stdout_fd != -1) close( stdout_fd ); RtlFreeHeap( GetProcessHeap(), 0, argv ); RtlFreeHeap( GetProcessHeap(), 0, envp ); + RtlFreeHeap( GetProcessHeap(), 0, unixdir ); RtlFreeAnsiString( &unix_name ); return status; }

1 0

Vincent Povirk : mscoree: Replace uses of mono_domain_assembly_open.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: e3e0cb8ebc98bebf70008b29ee33d25f1338813d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e0cb8ebc98bebf70008b29… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 18 22:01:16 2020 -0500 mscoree: Replace uses of mono_domain_assembly_open. This function is only intended to be used for the entry point assembly. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 c79c4fd8d1..9f53555ee9 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 9fa7978340..9a299662e3 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 8ad95e385e..f824cc9d5c 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;

1 0

Zebediah Figura : configure: Install wineusb.inf.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 17d0da9f47421cad033b38c1487b77efd4fd98a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d0da9f47421cad033b38c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 18 10:54:41 2020 -0500 configure: Install wineusb.inf. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48958 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index 5c01f4a27c..6c4a5f21b5 100755 --- a/configure +++ b/configure @@ -21392,6 +21392,7 @@ fonts \ loader/wine.inf \ loader/winebus.inf \ loader/winehid.inf \ +loader/wineusb.inf \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \ diff --git a/configure.ac b/configure.ac index 2a472864b1..37e3445a34 100644 --- a/configure.ac +++ b/configure.ac @@ -4099,6 +4099,7 @@ fonts \ loader/wine.inf \ loader/winebus.inf \ loader/winehid.inf \ +loader/wineusb.inf \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \

1 0

Nikolay Sivov : ole32: Improve locking safety in IMalloc::HeapMinimize().
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 1039a7756271b742419eeaf34a895d14dacd8a4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1039a7756271b742419eeaf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:20 2020 +0300 ole32: Improve locking safety in IMalloc::HeapMinimize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index f1dae0c956..96977fc751 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -363,17 +363,22 @@ static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) */ static void WINAPI IMalloc_fnHeapMinimize(IMalloc *iface) { - TRACE("()\n"); + BOOL spy_active = FALSE; - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - IMallocSpy_PreHeapMinimize(Malloc32.pSpy); - } + TRACE("()\n"); - if(Malloc32.pSpy) { - IMallocSpy_PostHeapMinimize(Malloc32.pSpy); - LeaveCriticalSection(&IMalloc32_SpyCS); - } + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spy_active = TRUE; + IMallocSpy_PreHeapMinimize(Malloc32.pSpy); + } + + if (spy_active) + { + IMallocSpy_PostHeapMinimize(Malloc32.pSpy); + LeaveCriticalSection(&IMalloc32_SpyCS); + } } static const IMallocVtbl VT_IMalloc32 =

1 0

Vincent Povirk : mscoree: Use mono_get_corlib to get mscorlib image.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 049e50bcaa0719c6730346d1556f434549a0f3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=049e50bcaa0719c6730346d1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 18 22:01:15 2020 -0500 mscoree: Use mono_get_corlib to get mscorlib image. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7eb4385494..c79c4fd8d1 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 df01f9b77f..9fa7978340 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 5b6c398761..8ad95e385e 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;

1 0

Dmitry Timoshkov : wldap32/tests: Add a test for LDAP paged search.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 82bcbcc54999cd7b8a957a3925ae9491b8be3191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82bcbcc54999cd7b8a957a39… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 20 13:59:35 2020 +0800 wldap32/tests: Add a test for LDAP paged search. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/parse.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 5a49b9c69d..2915d9c02b 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -212,10 +212,72 @@ static void test_ldap_server_control( void ) ldap_unbind( ld ); } +static void test_ldap_paged_search(void) +{ + LDAP *ld; + ULONG ret, count; + int version; + LDAPSearch *search; + LDAPMessage *res, *entry; + BerElement *ber; + WCHAR *attr; + + ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + version = LDAP_VERSION3; + ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } + + search = ldap_search_init_pageW( ld, (WCHAR *)L"", LDAP_SCOPE_BASE, (WCHAR *)L"(objectclass=*)", + NULL, FALSE, NULL, NULL, 0, 0, NULL); + ok( search != NULL, "ldap_search_init_page failed\n" ); + + count = 0xdeadbeef; + res = NULL; + ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); + ok( !ret, "ldap_get_next_page_s failed 0x%x\n", ret ); + ok( res != NULL, "expected res != NULL\n" ); + ok( count == 0, "got %u\n", count ); + + count = ldap_count_entries( ld, res); + ok( count == 1, "got %u\n", count ); + + entry = ldap_first_entry( ld, res); + ok( res != NULL, "expected entry != NULL\n" ); + + attr = ldap_first_attributeW( ld, entry, &ber ); + ok( !wcscmp( attr, L"objectClass" ), "got %s\n", wine_dbgstr_w( attr ) ); + ldap_memfreeW( attr ); + attr = ldap_next_attributeW( ld, entry, ber ); + ok( !attr, "got %s\n", wine_dbgstr_w( attr )); + + ber_free(ber, 0); + ldap_msgfree( res ); + + count = 0xdeadbeef; + res = (void *)0xdeadbeef; + ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret ); +todo_wine + ok( !res, "expected res == NULL\n" ); +todo_wine + ok( count == 0, "got %u\n", count ); + + ldap_search_abandon_page( ld, search ); + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA();

1 0

Zebediah Figura : winecfg: Set the Current{Major, Minor}VersionNumber registry values.
by Alexandre Julliard April 20, 2020

April 20, 2020

Module: wine Branch: master Commit: 7458092ec329fede4f64835769e214f72ffb3efc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7458092ec329fede4f648357… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 18 12:50:29 2020 -0500 winecfg: Set the Current{Major, Minor}VersionNumber registry values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48959 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/appdefaults.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 1ac2985a11..dd3480cd63 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -416,6 +416,8 @@ static void set_winver(const struct win_version *version) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMajorVersionNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMinorVersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); @@ -429,6 +431,8 @@ static void set_winver(const struct win_version *version) snprintf(Buffer, sizeof(Buffer), "%d.%d", version->dwMajorVersion, version->dwMinorVersion); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); + set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMajorVersionNumber", version->dwMajorVersion); + set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMinorVersionNumber", version->dwMinorVersion); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", version->szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", version->dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer);

1 0