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

Nikolay Sivov : ole32: Do not allocate spyed memory array on freeing attempts.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: ed53127580413b6d48c63e98e12ba7a801d64135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed53127580413b6d48c63e98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:18 2020 +0300 ole32: Do not allocate spyed memory array on freeing attempts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 1b19be424c..dfced20de2 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -128,22 +128,19 @@ static void** mallocspy_is_allocation_spyed(const void *mem) return current; } -static BOOL RemoveMemoryLocation(LPCVOID pMem) +static BOOL mallocspy_remove_spyed_memory(const void *mem) { - LPVOID * Current; + void **current; - /* allocate the table if not already allocated */ - if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) - return FALSE; + if (!Malloc32.SpyedBlockTableLength) + return FALSE; - if (!(Current = mallocspy_is_allocation_spyed(pMem))) - return FALSE; + if (!(current = mallocspy_is_allocation_spyed(mem))) + return FALSE; - /* location found */ - Malloc32.SpyedAllocationsLeft--; - /*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/ - *Current = NULL; - return TRUE; + Malloc32.SpyedAllocationsLeft--; + *current = NULL; + return TRUE; } /****************************************************************************** @@ -216,7 +213,7 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) BOOL fSpyed; EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = RemoveMemoryLocation(pv); + fSpyed = mallocspy_remove_spyed_memory(pv); cb = IMallocSpy_PreRealloc(Malloc32.pSpy, pv, cb, &pRealMemory, fSpyed); /* check if can release the spy */ @@ -268,7 +265,7 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) if(Malloc32.pSpy) { EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = RemoveMemoryLocation(pv); + fSpyed = mallocspy_remove_spyed_memory(pv); pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed); }

1 0

Zebediah Figura : msi: Report the real NT version number up to 6.3.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 658183a803fced017e1e29f4001cec8b48748327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=658183a803fced017e1e29f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 18 12:50:28 2020 -0500 msi: Report the real NT version number up to 6.3. MSI always reports 6.3 even without a manifest, but does not report anything higher. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48959 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5065558827..7b64362b10 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "shlwapi.h" #include "wingdi.h" #include "msi.h" @@ -668,7 +669,7 @@ done: static VOID set_installer_properties(MSIPACKAGE *package) { WCHAR *ptr; - OSVERSIONINFOEXW OSVersion; + RTL_OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len, type; WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; @@ -860,9 +861,14 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szPrivileged, szOne, -1 ); /* set the os things */ - OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); - GetVersionExW((OSVERSIONINFOW *)&OSVersion); + OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); + RtlGetVersion(&OSVersion); verval = OSVersion.dwMinorVersion + OSVersion.dwMajorVersion * 100; + if (verval > 603) + { + verval = 603; + OSVersion.dwBuildNumber = 9600; + } len = swprintf( verstr, ARRAY_SIZE(verstr), szFormat, verval ); switch (OSVersion.dwPlatformId) {

1 0

Anton Baskanov : amstream: Implement AMAudioStream::SetState.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 86bc6a28f724e22c543cc3a3fe24729e39369fa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86bc6a28f724e22c543cc3a3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Apr 19 17:14:20 2020 -0500 amstream: Implement AMAudioStream::SetState. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 13 ++++++++++--- dlls/amstream/tests/amstream.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 1f9aed7338..4e34b2549e 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -184,6 +184,7 @@ struct audio_stream IMemAllocator *allocator; AM_MEDIA_TYPE mt; WAVEFORMATEX format; + FILTER_STATE state; }; static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -340,11 +341,17 @@ static HRESULT WINAPI audio_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); + TRACE("stream %p, state %u.\n", stream, state); - return S_FALSE; + EnterCriticalSection(&stream->cs); + + stream->state = state; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 82a833ad6f..472c6558fc 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2780,6 +2780,40 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostream_set_state(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAMMediaStream *am_stream; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAMMediaStream, (void **)&am_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Running); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Paused); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Stopped); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IAMMediaStream_Release(am_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -2951,6 +2985,7 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); test_audiostream_receive_connection(); + test_audiostream_set_state(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run();

1 0

Nikolay Sivov : ole32: Improve locking safety in IMalloc::Free().
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: da5903e7d17ab8af0ba0a2df395b13650123d712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5903e7d17ab8af0ba0a2df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:19 2020 +0300 ole32: Improve locking safety in IMalloc::Free(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index dfced20de2..f1dae0c956 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -254,35 +254,39 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) /****************************************************************************** * IMalloc32_Free [VTABLE] */ -static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) +static void WINAPI IMalloc_fnFree(IMalloc *iface, void *mem) { - BOOL fSpyed = FALSE; - - TRACE("(%p)\n",pv); - - if(!pv) - return; + BOOL spyed_block = FALSE, spy_active = FALSE; - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = mallocspy_remove_spyed_memory(pv); - pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed); - } + TRACE("(%p)\n", mem); - HeapFree(GetProcessHeap(),0,pv); + if (!mem) + return; - if(Malloc32.pSpy) { - IMallocSpy_PostFree(Malloc32.pSpy, fSpyed); + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = mallocspy_remove_spyed_memory(mem); + spy_active = TRUE; + mem = IMallocSpy_PreFree(Malloc32.pSpy, mem, spyed_block); + } - /* check if can release the spy */ - if(Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) { - IMallocSpy_Release(Malloc32.pSpy); - Malloc32.SpyReleasePending = FALSE; - Malloc32.pSpy = NULL; - } + HeapFree(GetProcessHeap(), 0, mem); - LeaveCriticalSection(&IMalloc32_SpyCS); + if (spy_active) + { + IMallocSpy_PostFree(Malloc32.pSpy, spyed_block); + + /* check if can release the spy */ + if (Malloc32.SpyReleasePending && !Malloc32.SpyedAllocationsLeft) + { + IMallocSpy_Release(Malloc32.pSpy); + Malloc32.SpyReleasePending = FALSE; + Malloc32.pSpy = NULL; } + + LeaveCriticalSection(&IMalloc32_SpyCS); + } } /******************************************************************************

1 0

Jacek Caban : ntdll: Leave critical section before blocking in RtlWaitOnAddress.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: eaad2380003777fa3036d9e7286f02d82a15064a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaad2380003777fa3036d9e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 00:02:29 2020 +0200 ntdll: Leave critical section before blocking in RtlWaitOnAddress. Fixes regression from commit 4f673d5386f44d4af4459a95b3059cfb887db8c9. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 9 +++++++-- dlls/ntdll/sync.c | 4 +--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 87341654ba..5df037b7ea 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -114,7 +114,7 @@ void wait_suspend( CONTEXT *context ) int saved_errno = errno; /* wait with 0 timeout, will only return once the thread is no longer suspended */ - server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL, NULL ); errno = saved_errno; } @@ -159,7 +159,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con { select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, &exception_context, NULL ); + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, &exception_context, NULL, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 964953e27d..eaed3cc1fc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -117,7 +117,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, user_apc_t *user_apc ) DECLSPEC_HIDDEN; + timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3de5a93556..c0dd0f35fc 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -602,7 +602,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, user_apc_t *user_apc ) + timeout_t abs_timeout, CONTEXT *context, RTL_CRITICAL_SECTION *cs, user_apc_t *user_apc ) { unsigned int ret; int cookie; @@ -660,6 +660,11 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = offsetof( select_op_t, signal_and_wait.signal ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); + if (cs) + { + RtlLeaveCriticalSection( cs ); + cs = NULL; + } if (ret != STATUS_PENDING) break; ret = wait_select_reply( &cookie ); @@ -692,7 +697,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f for (;;) { - ret = server_select( select_op, size, flags, abs_timeout, NULL, &apc ); + ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); if (ret != STATUS_USER_APC) break; invoke_apc( &apc ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index d3927a05af..fbfb8f893e 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2584,9 +2584,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); select_op.keyed_event.key = wine_server_client_ptr( addr ); - ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, NULL ); - RtlLeaveCriticalSection( &addr_section ); - return ret; + return server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, &addr_section, NULL ); } /***********************************************************************

1 0

Vincent Povirk : mscoree: Use mono_get_corlib to get mscorlib image.
by Alexandre Julliard 20 Apr '20

20 Apr '20

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 20 Apr '20

20 Apr '20

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

Nikolay Sivov : ole32: Improve locking safety in IMalloc::HeapMinimize().
by Alexandre Julliard 20 Apr '20

20 Apr '20

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: Update Wine Mono to 5.0.0.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: fc77666c0b354392a3244ba5211669849df4d53c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc77666c0b354392a3244ba5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 18 22:01:17 2020 -0500 mscoree: Update Wine Mono to 5.0.0. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 48a84f3958..c1405d5ec8 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 f824cc9d5c..cd032aefc0 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;

1 0

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

20 Apr '20

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