September 2023 - Wine-Commits

Alex Henrie : wldap32: Rename cert_callback to server_cert_callback.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: ca249a915d6a47b966063befdb10dd4d5ab4ecf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca249a915d6a47b966063befdb10dd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 19:40:26 2023 -0600 wldap32: Rename cert_callback to server_cert_callback. --- dlls/wldap32/init.c | 6 +++--- dlls/wldap32/option.c | 2 +- dlls/wldap32/winldap_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index c5b11a4de28..47063122b04 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -250,7 +250,7 @@ exit: */ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) { - VERIFYSERVERCERT *cert_callback = CERT_CALLBACK(ld); + VERIFYSERVERCERT *server_cert_callback = SERVER_CERT_CALLBACK(ld); int ret; TRACE( "(%p, %p)\n", ld, timeout ); @@ -261,7 +261,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) if (timeout && (timeout->tv_sec || timeout->tv_usec)) FIXME( "ignoring timeout\n" ); if ((ret = ldap_connect( CTX(ld) ))) return map_error( ret ); - if (cert_callback) + if (server_cert_callback) { CtxtHandle *tls_context; const CERT_CONTEXT *cert; @@ -271,7 +271,7 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) if (QueryContextAttributesA( tls_context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &cert ) == SEC_E_OK) { - if (cert_callback( ld, &cert )) + if (server_cert_callback( ld, &cert )) { TRACE( "accepted\n" ); } diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 1d6f692b7fa..41dfe5fd9cd 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -545,7 +545,7 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return map_error( ldap_set_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) ); case WLDAP32_LDAP_OPT_SERVER_CERTIFICATE: - CERT_CALLBACK(ld) = value; + SERVER_CERT_CALLBACK(ld) = value; return WLDAP32_LDAP_SUCCESS; case WLDAP32_LDAP_OPT_DEREF: diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index ce9a7cc3fa8..3393c031007 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -228,14 +228,14 @@ struct private_data { LDAP *ctx; struct berval **server_ctrls; - VERIFYSERVERCERT *cert_callback; + VERIFYSERVERCERT *server_cert_callback; BOOL connected; }; C_ASSERT(sizeof(struct private_data) < FIELD_OFFSET(struct ld_sb, sb_naddr) - FIELD_OFFSET(struct ld_sb, Reserved1)); #define CTX(ld) (((struct private_data *)ld->ld_sb.Reserved1)->ctx) #define SERVER_CTRLS(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_ctrls) -#define CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->cert_callback) +#define SERVER_CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_cert_callback) #define CONNECTED(ld) (((struct private_data *)ld->ld_sb.Reserved1)->connected) #define MSG(entry) (entry->Request)

1 0

Alex Henrie : wldap32: Implement setting LDAP_OPT_CLIENT_CERTIFICATE.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 16e4b086f2bbdd6a251ba022a251facbb981a41a URL: https://gitlab.winehq.org/wine/wine/-/commit/16e4b086f2bbdd6a251ba022a251fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 20:13:35 2023 -0600 wldap32: Implement setting LDAP_OPT_CLIENT_CERTIFICATE. Since most LDAP servers do not require mTLS, for now the callback function is saved but not called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55507 --- dlls/wldap32/init.c | 4 ++++ dlls/wldap32/option.c | 7 +++++-- dlls/wldap32/winldap_private.h | 4 ++++ include/winldap.h | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 47063122b04..44fc44ee485 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -250,6 +250,7 @@ exit: */ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) { + QUERYCLIENTCERT *client_cert_callback = CLIENT_CERT_CALLBACK(ld); VERIFYSERVERCERT *server_cert_callback = SERVER_CERT_CALLBACK(ld); int ret; @@ -258,6 +259,9 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout ) if (!ld) return WLDAP32_LDAP_PARAM_ERROR; if (CONNECTED(ld)) return WLDAP32_LDAP_SUCCESS; + if (client_cert_callback) + FIXME( "mTLS is not implemented\n" ); + if (timeout && (timeout->tv_sec || timeout->tv_usec)) FIXME( "ignoring timeout\n" ); if ((ret = ldap_connect( CTX(ld) ))) return map_error( ret ); diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 41dfe5fd9cd..00c08e0108c 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -341,6 +341,7 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) return ret; } case WLDAP32_LDAP_OPT_AUTO_RECONNECT: + case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DEREF: case WLDAP32_LDAP_OPT_DESC: case WLDAP32_LDAP_OPT_ENCRYPT: @@ -384,7 +385,6 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_UNWILLING_TO_PERFORM; case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE: - case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME: case WLDAP32_LDAP_OPT_ERROR_STRING: case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND: @@ -541,6 +541,10 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return map_error( ldap_set_option( CTX(ld), LDAP_OPT_RESTART, value ) ); } + case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: + CLIENT_CERT_CALLBACK(ld) = value; + return WLDAP32_LDAP_SUCCESS; + case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: return map_error( ldap_set_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) ); @@ -620,7 +624,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return WLDAP32_LDAP_SUCCESS; /* fall through */ case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE: - case WLDAP32_LDAP_OPT_CLIENT_CERTIFICATE: case WLDAP32_LDAP_OPT_DNSDOMAIN_NAME: case WLDAP32_LDAP_OPT_ERROR_STRING: case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND: diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 3393c031007..d75ba425774 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -23,6 +23,7 @@ #include "winternl.h" #include "wincrypt.h" #include "winnls.h" +#include "schannel.h" #define LDAP_NEEDS_PROTOTYPES #include <lber.h> @@ -222,12 +223,14 @@ typedef struct ldap ULONG ld_options; } LDAP, *PLDAP; +typedef BOOLEAN (CDECL QUERYCLIENTCERT)(LDAP *, SecPkgContext_IssuerListInfoEx *, const CERT_CONTEXT **); typedef BOOLEAN (CDECL VERIFYSERVERCERT)(LDAP *, const CERT_CONTEXT **); struct private_data { LDAP *ctx; struct berval **server_ctrls; + QUERYCLIENTCERT *client_cert_callback; VERIFYSERVERCERT *server_cert_callback; BOOL connected; }; @@ -235,6 +238,7 @@ C_ASSERT(sizeof(struct private_data) < FIELD_OFFSET(struct ld_sb, sb_naddr) - FI #define CTX(ld) (((struct private_data *)ld->ld_sb.Reserved1)->ctx) #define SERVER_CTRLS(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_ctrls) +#define CLIENT_CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->client_cert_callback) #define SERVER_CERT_CALLBACK(ld) (((struct private_data *)ld->ld_sb.Reserved1)->server_cert_callback) #define CONNECTED(ld) (((struct private_data *)ld->ld_sb.Reserved1)->connected) diff --git a/include/winldap.h b/include/winldap.h index 9e91d0e653a..4f2543a05aa 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -391,6 +391,7 @@ typedef struct ldap_apifeature_infoW DECL_WINELIB_TYPE_AW(LDAPAPIFeatureInfo) +typedef BOOLEAN (CDECL QUERYCLIENTCERT)(LDAP*,SecPkgContext_IssuerListInfoEx*,const CERT_CONTEXT**); typedef BOOLEAN (CDECL VERIFYSERVERCERT)(LDAP*,const CERT_CONTEXT**);

1 0

Dmitry Timoshkov : wldap32: Add support for ldap_set_option(LDAP_OPT_HOST_NAME).
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 2e5a8595ed81a810f6304ecf248e492a1139e183 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e5a8595ed81a810f6304ecf248e49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 21 16:27:51 2023 +0300 wldap32: Add support for ldap_set_option(LDAP_OPT_HOST_NAME). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/option.c | 66 +++++++++++++++++++++++++++++++++++++++++++--- dlls/wldap32/tests/parse.c | 28 ++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index cc416389276..1d6f692b7fa 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -105,6 +105,24 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: return ldap_get_optionW( ld, LDAP_OPT_REFHOPLIMIT, value ); + case WLDAP32_LDAP_OPT_HOST_NAME: + { + WCHAR *hostW; + char *host; + + ret = ldap_get_optionW( ld, option, &hostW ); + if (!ret) + { + host = strWtoA( hostW ); + if (!host) + ret = WLDAP32_LDAP_NO_MEMORY; + else + *(char **)value = host; + free( hostW ); + } + return map_error( ret ); + } + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -122,7 +140,6 @@ ULONG CDECL ldap_get_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_ERROR_STRING: case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND: case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS: - case WLDAP32_LDAP_OPT_HOST_NAME: case WLDAP32_LDAP_OPT_HOST_REACHABLE: case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE: case WLDAP32_LDAP_OPT_PING_LIMIT: @@ -238,6 +255,24 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_REFERRAL_HOP_LIMIT: return map_error( ldap_get_option( CTX(ld), LDAP_OPT_REFHOPLIMIT, value ) ); + case WLDAP32_LDAP_OPT_HOST_NAME: + { + WCHAR *hostW; + char *host; + + ret = ldap_get_option( CTX(ld), LDAP_OPT_HOST_NAME, &host ); + if (!ret) + { + hostW = strUtoW( host ); + if (!hostW) + ret = WLDAP32_LDAP_NO_MEMORY; + else + *(WCHAR **)value = hostW; + free( host ); + } + return map_error( ret ); + } + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -255,7 +290,6 @@ ULONG CDECL ldap_get_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_ERROR_STRING: case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND: case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS: - case WLDAP32_LDAP_OPT_HOST_NAME: case WLDAP32_LDAP_OPT_HOST_REACHABLE: case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE: case WLDAP32_LDAP_OPT_PING_LIMIT: @@ -322,6 +356,19 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_TIMELIMIT: return ldap_set_optionW( ld, option, value ); + case WLDAP32_LDAP_OPT_HOST_NAME: + { + char **host = value; + WCHAR *hostW; + + hostW = strAtoW( *host ); + if (!hostW) return WLDAP32_LDAP_NO_MEMORY; + + ret = ldap_set_optionW( ld, option, &hostW ); + free( hostW ); + return map_error( ret ); + } + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -342,7 +389,6 @@ ULONG CDECL ldap_set_optionA( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_ERROR_STRING: case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND: case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS: - case WLDAP32_LDAP_OPT_HOST_NAME: case WLDAP32_LDAP_OPT_HOST_REACHABLE: case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE: case WLDAP32_LDAP_OPT_PING_LIMIT: @@ -540,6 +586,19 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) return ret; } + case WLDAP32_LDAP_OPT_HOST_NAME: + { + WCHAR **hostW = value; + char *host; + + host = strWtoU( *hostW ); + if (!host) return WLDAP32_LDAP_NO_MEMORY; + + ret = ldap_set_option( CTX(ld), LDAP_OPT_HOST_NAME, host ); + free( host ); + return map_error( ret ); + } + case WLDAP32_LDAP_OPT_CACHE_ENABLE: case WLDAP32_LDAP_OPT_CACHE_FN_PTRS: case WLDAP32_LDAP_OPT_CACHE_STRATEGY: @@ -566,7 +625,6 @@ ULONG CDECL ldap_set_optionW( LDAP *ld, int option, void *value ) case WLDAP32_LDAP_OPT_ERROR_STRING: case WLDAP32_LDAP_OPT_FAST_CONCURRENT_BIND: case WLDAP32_LDAP_OPT_GETDSNAME_FLAGS: - case WLDAP32_LDAP_OPT_HOST_NAME: case WLDAP32_LDAP_OPT_HOST_REACHABLE: case WLDAP32_LDAP_OPT_PING_KEEP_ALIVE: case WLDAP32_LDAP_OPT_PING_LIMIT: diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 573ab172ebf..726b814081b 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -632,10 +632,38 @@ static void test_opt_auto_reconnect(void) ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionA should fail, got %#lx\n", ret ); } +static void test_ldap_host_name(void) +{ + LDAP *ld; + char *value; + ULONG ret; + + ld = ldap_initA( NULL, 389 ); + ok(ld != NULL, "ldap_init failed\n"); + + value = (char *)"deadbeef"; + ret = ldap_get_optionA( ld, LDAP_OPT_HOST_NAME, &value ); + ok( !ret, "ldap_get_option error %#lx\n", ret ); + todo_wine + ok( !value, "got %s\n", value ); + + value = (char *)"deadbeef"; + ret = ldap_set_optionA( ld, LDAP_OPT_HOST_NAME, &value ); + ok( !ret, "ldap_set_option error %#lx\n", ret ); + + value = (char *)""; + ret = ldap_get_optionA( ld, LDAP_OPT_HOST_NAME, &value ); + ok( !ret, "ldap_get_option error %#lx\n", ret ); + ok( !strcmp(value, "deadbeef") || !strcmp(value, "deadbeef:389"), "got %s\n", value ); + + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_host_name(); test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA();

1 0

Rémi Bernon : dmsynth: Use CRT allocation functions.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 6dedfec9c323dafe6d6bab33fee68c12606d6466 URL: https://gitlab.winehq.org/wine/wine/-/commit/6dedfec9c323dafe6d6bab33fee68c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 15:19:11 2023 +0200 dmsynth: Use CRT allocation functions. --- dlls/dmsynth/synth.c | 9 +++------ dlls/dmsynth/synthsink.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 30b7eee6808..00883505377 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -96,7 +96,7 @@ static ULONG WINAPI synth_Release(IDirectMusicSynth8 *iface) if (!ref) { if (This->latency_clock) IReferenceClock_Release(This->latency_clock); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -744,11 +744,8 @@ HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) TRACE("(%s, %p)\n", debugstr_guid(riid), ppobj); - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicSynth8_iface.lpVtbl = &synth_vtbl; obj->IKsControl_iface.lpVtbl = &synth_control_vtbl; obj->ref = 1; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 73c623585be..fce325681ee 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -92,7 +92,7 @@ static ULONG WINAPI synth_sink_Release(IDirectMusicSynthSink *iface) IReferenceClock_Release(This->latency_clock); if (This->master_clock) IReferenceClock_Release(This->master_clock); - HeapFree(GetProcessHeap(), 0, This); + free(This); } return ref; @@ -315,10 +315,7 @@ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) *ret_iface = NULL; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct synth_sink)); - if (!obj) - return E_OUTOFMEMORY; - + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicSynthSink_iface.lpVtbl = &synth_sink_vtbl; obj->IKsControl_iface.lpVtbl = &synth_sink_control; obj->ref = 1; @@ -326,7 +323,7 @@ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&obj->latency_clock); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, obj); + free(obj); return hr; }

1 0

Rémi Bernon : dmsynth: Get rid of the IDirectMusicSynth8Impl typedef.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 5e29d14789407a49576ad7be296bbd80b3ff773f URL: https://gitlab.winehq.org/wine/wine/-/commit/5e29d14789407a49576ad7be296bbd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 24 15:30:25 2023 +0200 dmsynth: Get rid of the IDirectMusicSynth8Impl typedef. --- dlls/dmsynth/synth.c | 68 +++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 35 deletions(-)

1 0

Rémi Bernon : dmsynth: Move IDirectMusicSynthImpl struct to where it is used.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 68b356142c67343b6a69f0a22a42edf045c0a46d URL: https://gitlab.winehq.org/wine/wine/-/commit/68b356142c67343b6a69f0a22a42ed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 18 21:34:24 2023 +0200 dmsynth: Move IDirectMusicSynthImpl struct to where it is used. --- dlls/dmsynth/dmsynth_private.h | 20 -------------------- dlls/dmsynth/synth.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index b9f160f000d..35c87775cf7 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -40,32 +40,12 @@ #include "dmusics.h" #include "dmksctrl.h" -/***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicSynth8Impl IDirectMusicSynth8Impl; - /***************************************************************************** * ClassFactory */ extern HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj); extern HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ppobj); -/***************************************************************************** - * IDirectMusicSynth8Impl implementation structure - */ -struct IDirectMusicSynth8Impl { - IDirectMusicSynth8 IDirectMusicSynth8_iface; - IKsControl IKsControl_iface; - LONG ref; - DMUS_PORTCAPS caps; - DMUS_PORTPARAMS params; - BOOL active; - BOOL open; - IReferenceClock *latency_clock; - IDirectMusicSynthSink *sink; -}; - /***************************************************************************** * Misc. */ diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index bcfc6e0ab37..1855d4d1bc5 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -28,6 +28,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); +typedef struct IDirectMusicSynth8Impl IDirectMusicSynth8Impl; + +struct IDirectMusicSynth8Impl +{ + IDirectMusicSynth8 IDirectMusicSynth8_iface; + IKsControl IKsControl_iface; + LONG ref; + + DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + BOOL active; + BOOL open; + IReferenceClock *latency_clock; + IDirectMusicSynthSink *sink; +}; + static inline IDirectMusicSynth8Impl *impl_from_IDirectMusicSynth8(IDirectMusicSynth8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicSynth8Impl, IDirectMusicSynth8_iface);

1 0

Rémi Bernon : dmsynth: Rename IDirectMusicSynthSinkImpl method prefix to synth_sink.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 1f7629dc0a22f4304f78e61e9c9330081d7b1449 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f7629dc0a22f4304f78e61e9c9330… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 18 21:49:49 2023 +0200 dmsynth: Rename IDirectMusicSynthSinkImpl method prefix to synth_sink. --- dlls/dmsynth/synthsink.c | 90 +++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : dmsynth: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 3b5160c97567ceb13d719219e45972f07f990fbb URL: https://gitlab.winehq.org/wine/wine/-/commit/3b5160c97567ceb13d719219e45972… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:44:17 2023 +0200 dmsynth: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmsynth/dmsynth_main.c | 22 ---------------------- dlls/dmsynth/dmsynth_private.h | 7 ------- dlls/dmsynth/synth.c | 2 -- dlls/dmsynth/synthsink.c | 2 -- 4 files changed, 33 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index a5e2e605419..edeaab8474e 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); -LONG DMSYNTH_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); @@ -62,15 +60,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMSYNTH_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMSYNTH_UnlockModule(); - return 1; /* non-heap based object */ } @@ -90,12 +84,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); - return S_OK; } @@ -111,16 +99,6 @@ static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMu static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicSynthSinkImpl}; -/****************************************************************** - * DllCanUnloadNow (DMSYNTH.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DMSYNTH_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMSYNTH.@) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index c21a9e84a84..3a3e76dfaf4 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -80,13 +80,6 @@ struct IDirectMusicSynthSinkImpl { BOOL active; }; -/********************************************************************** - * Dll lifetime tracking declaration for dmsynth.dll - */ -extern LONG DMSYNTH_refCount; -static inline void DMSYNTH_LockModule(void) { InterlockedIncrement( &DMSYNTH_refCount ); } -static inline void DMSYNTH_UnlockModule(void) { InterlockedDecrement( &DMSYNTH_refCount ); } - /***************************************************************************** * Misc. */ diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 2c46abf661b..bcfc6e0ab37 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -83,7 +83,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) if (This->latency_clock) IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); - DMSYNTH_UnlockModule(); } return ref; @@ -750,7 +749,6 @@ HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->caps.dwEffectFlags = DMUS_EFFECT_REVERB; lstrcpyW(obj->caps.wszDescription, L"Microsoft Synthesizer"); - DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index abc422f2b10..b9d9a31012c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -81,7 +81,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa if (This->master_clock) IReferenceClock_Release(This->master_clock); HeapFree(GetProcessHeap(), 0, This); - DMSYNTH_UnlockModule(); } return ref; @@ -317,7 +316,6 @@ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) return hr; } - DMSYNTH_LockModule(); hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface); IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface);

1 0

Rémi Bernon : dmsynth: Remove unnecessary comments.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 23b8988464135b3979270ed0993b51f35fc1f718 URL: https://gitlab.winehq.org/wine/wine/-/commit/23b8988464135b3979270ed0993b51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 24 11:05:32 2023 +0200 dmsynth: Remove unnecessary comments. --- dlls/dmsynth/synth.c | 4 ---- dlls/dmsynth/synthsink.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index b579c15c66e..2c46abf661b 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -33,7 +33,6 @@ static inline IDirectMusicSynth8Impl *impl_from_IDirectMusicSynth8(IDirectMusicS return CONTAINING_RECORD(iface, IDirectMusicSynth8Impl, IDirectMusicSynth8_iface); } -/* IDirectMusicSynth8Impl IUnknown part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_QueryInterface(IDirectMusicSynth8 *iface, REFIID riid, void **ret_iface) { @@ -90,7 +89,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) return ref; } -/* IDirectMusicSynth8Impl IDirectMusicSynth part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *params) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); @@ -539,7 +537,6 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend(IDirectMusicSynth8 *iface return S_OK; } -/* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(IDirectMusicSynth8 *iface, REFERENCE_TIME ref_time, DWORD voice_id, DWORD channel_group, DWORD channel, DWORD dwDLId, LONG prPitch, LONG vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, @@ -725,7 +722,6 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { DMSynthImpl_IKsControl_KsEvent }; -/* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { IDirectMusicSynth8Impl *obj; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 825ad86013c..abc422f2b10 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -30,7 +30,6 @@ static inline IDirectMusicSynthSinkImpl *impl_from_IDirectMusicSynthSink(IDirect return CONTAINING_RECORD(iface, IDirectMusicSynthSinkImpl, IDirectMusicSynthSink_iface); } -/* IDirectMusicSynthSinkImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicSynthSinkImpl_QueryInterface(IDirectMusicSynthSink *iface, REFIID riid, void **ret_iface) { @@ -88,7 +87,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa return ref; } -/* IDirectMusicSynthSinkImpl IDirectMusicSynthSink part: */ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *iface, IDirectMusicSynth *synth) { @@ -295,7 +293,6 @@ static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = { DMSynthSinkImpl_IKsControl_KsEvent }; -/* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *obj;

1 0

Rémi Bernon : dmsynth: Rename IDirectMusicSynth8Impl method prefix to synth.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 011dd289e66b2d1db121ec6e21d2dfe2275b8840 URL: https://gitlab.winehq.org/wine/wine/-/commit/011dd289e66b2d1db121ec6e21d2df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 18 21:51:42 2023 +0200 dmsynth: Rename IDirectMusicSynth8Impl method prefix to synth. --- dlls/dmsynth/synth.c | 146 ++++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 72 deletions(-)

1 0