From: Hans Leidekker <hans@codeweavers.com>
Subject: Re: [PATCH v2] msado15: Semi-stub _Recordset Open
Message-Id: <ea285ebc881039f8fbea28b73e718cbe7569f374.camel@codeweavers.com>
Date: Wed, 24 Feb 2021 11:03:46 +0100
In-Reply-To: <SLXP216MB0621D994C6F7C84733C41BE5939F9@SLXP216MB0621.KORP216.PROD.OUTLOOK.COM>
References: <20210224093012.4523-1-leslie_alistair@hotmail.com> <SLXP216MB0621D994C6F7C84733C41BE5939F9@SLXP216MB0621.KORP216.PROD.OUTLOOK.COM>

On Wed, 2021-02-24 at 20:30 +1100, Alistair Leslie-Hughes wrote:
> diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
> index 12bb9680258..6064908bb28 100644
> --- a/dlls/msado15/recordset.c
> +++ b/dlls/msado15/recordset.c
> @@ -1182,15 +1182,62 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT
>                                        CursorTypeEnum cursor_type, LockTypeEnum lock_type, LONG options )
>  {
>      struct recordset *recordset = impl_from_Recordset( iface );
> +    ADOConnectionConstruction15 *construct;
> +    IUnknown *session;
> +    ICommandText *command_text;
> +    DBROWCOUNT affected;
> +    IUnknown *rowset;
> +    HRESULT hr;
>  
> -    FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection),
> +    FIXME( "%p, %s, %s, %d, %d, %d Semi-stub\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection),
>             cursor_type, lock_type, options );
>  
> -    if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection );
>      if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen );
>  
> +    if (recordset->fields)
> +    {
> +        recordset->state = adStateOpen;
> +        return S_OK;
> +    }
> +
> +    if (V_VT(&active_connection) != VT_DISPATCH)
> +    {
> +        FIXME("Unsupported Active connection type %d\n", V_VT(&active_connection));
> +        return MAKE_ADO_HRESULT( adErrInvalidConnection );
> +    }
> +
> +    hr = IDispatch_QueryInterface(V_DISPATCH(&active_connection), &IID_ADOConnectionConstruction15, (void**)&construct);
> +    if (FAILED(hr))
> +        return E_FAIL;
> +
> +    hr = ADOConnectionConstruction15_get_Session(construct, &session);
> +    ADOConnectionConstruction15_Release(construct);
> +    if (FAILED(hr))
> +        return E_FAIL;
> +
> +    if (V_VT(&source) != VT_BSTR)
> +    {
> +        FIXME("Unsupported source type!\n");
> +        return E_FAIL;
> +    }

session should be released here.