wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Alexandre Julliard : dnsapi: Implement DnsExtractRecordsFromMessage().
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: aec19e86f66988aec25b258258017d648110f95b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aec19e86f66988aec25b2582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:48:15 2021 +0100 dnsapi: Implement DnsExtractRecordsFromMessage(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/main.c | 26 --- dlls/dnsapi/record.c | 433 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/record.c | 199 +++++++++++++++++++++ 3 files changed, 632 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aec19e86f66988aec25b…

1 0

Alexandre Julliard : dnsapi: Make type_to_str() into a proper debugstr function.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 87f94202bb391cfcc7e65505cefa92f196e4f09b URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f94202bb391cfcc7e65505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:45:10 2021 +0100 dnsapi: Make type_to_str() into a proper debugstr function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 2 +- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/query.c | 8 ++++---- dlls/dnsapi/record.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index c598ade756e..a356d24b1f0 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -119,7 +119,7 @@ static inline char *strdup_ua( const char *src ) return dst; } -extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; +extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN; struct resolv_funcs { diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index e5c520a0a32..e72e86ad1b1 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -109,7 +109,7 @@ static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) } } -static const char *debugstr_type( unsigned short type ) +const char *debugstr_type( unsigned short type ) { const char *str; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 3155c93b360..3f2e82eb9c1 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -110,7 +110,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) return "(null)"; return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, - debugstr_w(req->QueryName), type_to_str(req->QueryType), + debugstr_w(req->QueryName), debugstr_type(req->QueryType), (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); } @@ -136,7 +136,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server DNS_RECORDW *resultW; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -169,7 +169,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -200,7 +200,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve DNS_RECORDA *resultA; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 014d788cf5e..1fdbae523eb 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -const char *type_to_str( unsigned short type ) +const char *debugstr_type( unsigned short type ) { switch (type) { @@ -91,7 +91,7 @@ const char *type_to_str( unsigned short type ) X(DNS_TYPE_WINS) X(DNS_TYPE_WINSR) #undef X - default: { static char tmp[7]; sprintf( tmp, "0x%04x", type ); return tmp; } + default: return wine_dbg_sprintf( "0x%04x", type ); } } @@ -339,7 +339,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) break; } default: - FIXME( "unknown type: %s\n", type_to_str( r1->wType ) ); + FIXME( "unknown type: %s\n", debugstr_type( r1->wType ) ); return FALSE; } return TRUE;

1 0

Alexandre Julliard : dnsapi: Fix the DNS_KEY_DATA and DNS_SIG_DATA structure definitions.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 0b7dba8c71ea5d9808d2108e29719328b40e6b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7dba8c71ea5d9808d2108e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:46:28 2021 +0100 dnsapi: Fix the DNS_KEY_DATA and DNS_SIG_DATA structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/libresolv.c | 2 ++ dlls/dnsapi/record.c | 12 ++++++------ include/windns.h | 10 ++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 197ca84aeae..e5c520a0a32 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -581,6 +581,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD r->Data.KEY.chAlgorithm = *pos++; size = rr->rdata + rr->rdlength - pos; + r->Data.KEY.wKeyLength = size; for (i = 0; i < size; i++) r->Data.KEY.Key[i] = *pos++; @@ -668,6 +669,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD r->Data.SIG.wKeyTag = *(const WORD *)pos; size = rr->rdata + rr->rdlength - pos; + r->Data.SIG.wSignatureLength = size; for (i = 0; i < size; i++) r->Data.SIG.Signature[i] = *pos++; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 5a75503d892..014d788cf5e 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -221,10 +221,10 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) { if (r1->Data.KEY.wFlags != r2->Data.KEY.wFlags || r1->Data.KEY.chProtocol != r2->Data.KEY.chProtocol || - r1->Data.KEY.chAlgorithm != r2->Data.KEY.chAlgorithm) + r1->Data.KEY.chAlgorithm != r2->Data.KEY.chAlgorithm || + r1->Data.KEY.wKeyLength != r2->Data.KEY.wKeyLength) return FALSE; - if (memcmp( r1->Data.KEY.Key, r2->Data.KEY.Key, - r1->wDataLength - sizeof(DNS_KEY_DATA) + 1 )) + if (memcmp( r1->Data.KEY.Key, r2->Data.KEY.Key, r1->Data.KEY.wKeyLength )) return FALSE; break; } @@ -238,10 +238,10 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.SIG.dwOriginalTtl != r2->Data.SIG.dwOriginalTtl || r1->Data.SIG.dwExpiration != r2->Data.SIG.dwExpiration || r1->Data.SIG.dwTimeSigned != r2->Data.SIG.dwTimeSigned || - r1->Data.SIG.wKeyTag != r2->Data.SIG.wKeyTag) + r1->Data.SIG.wKeyTag != r2->Data.SIG.wKeyTag || + r1->Data.SIG.wSignatureLength != r2->Data.SIG.wSignatureLength) return FALSE; - if (memcmp( r1->Data.SIG.Signature, r2->Data.SIG.Signature, - r1->wDataLength - sizeof(DNS_SIG_DATAA) + 1 )) + if (memcmp( r1->Data.SIG.Signature, r2->Data.SIG.Signature, r1->Data.SIG.wSignatureLength )) return FALSE; break; } diff --git a/include/windns.h b/include/windns.h index f1f2184281c..9796a299d04 100644 --- a/include/windns.h +++ b/include/windns.h @@ -339,6 +339,8 @@ typedef struct WORD wFlags; BYTE chProtocol; BYTE chAlgorithm; + WORD wKeyLength; + WORD wPad; BYTE Key[1]; } DNS_KEY_DATA, *PDNS_KEY_DATA; @@ -355,7 +357,6 @@ typedef struct typedef struct { - PSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -363,13 +364,13 @@ typedef struct DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PSTR pNameSigner; BYTE Signature[1]; } DNS_SIG_DATAA, *PDNS_SIG_DATAA; typedef struct { - PWSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -377,7 +378,8 @@ typedef struct DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PWSTR pNameSigner; BYTE Signature[1]; } DNS_SIG_DATAW, *PDNS_SIG_DATAW;

1 0

Alexandre Julliard : faudio: Import upstream release 21.11.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: da89825f98e4f0cb3875735345a455512b36b665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da89825f98e4f0cb38757353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 10:25:12 2021 +0100 faudio: Import upstream release 21.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT.c | 17 +++-------------- libs/faudio/src/FAudio.c | 4 +++- libs/faudio/src/FAudioFX_reverb.c | 6 ++++-- libs/faudio/src/FAudio_platform_win32.c | 10 ++++++---- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 046e7f4098c..6f68013d79f 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 21 -#define FAUDIO_MINOR_VERSION 10 +#define FAUDIO_MINOR_VERSION 11 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c index 5eca83b389f..bca46d38824 100644 --- a/libs/faudio/src/FACT.c +++ b/libs/faudio/src/FACT.c @@ -2415,20 +2415,7 @@ uint32_t FACTCue_Destroy(FACTCue *pCue) FAudio_assert(cue != NULL && "Could not find Cue reference!"); pCue->parentBank->parentEngine->pFree(pCue->variableValues); - if (pCue->notifyOnDestroy || pCue->parentBank->parentEngine->notifications & NOTIFY_CUEDESTROY) - { - note.type = FACTNOTIFICATIONTYPE_CUEDESTROYED; - note.cue.pCue = pCue; - if (pCue->parentBank->parentEngine->notifications & NOTIFY_CUEDESTROY) - { - note.pvContext = pCue->parentBank->parentEngine->cue_context; - } - else - { - note.pvContext = pCue->usercontext; - } - pCue->parentBank->parentEngine->notificationCallback(&note); - } + FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUEDESTROY, FACTNOTIFICATIONTYPE_CUEDESTROYED); mutex = pCue->parentBank->parentEngine->apiLock; pCue->parentBank->parentEngine->pFree(pCue); @@ -2679,6 +2666,8 @@ uint32_t FACTCue_Stop(FACTCue *pCue, uint32_t dwFlags) } } + FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUESTOP, FACTNOTIFICATIONTYPE_CUESTOP); + FAudio_PlatformUnlockMutex(pCue->parentBank->parentEngine->apiLock); return 0; } diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c index 81363b983c7..ff373ef8dbb 100644 --- a/libs/faudio/src/FAudio.c +++ b/libs/faudio/src/FAudio.c @@ -2453,7 +2453,9 @@ uint32_t FAudioSourceVoice_SubmitSourceBuffer( FAudio_assert(voice->type == FAUDIO_VOICE_SOURCE); #ifdef HAVE_WMADEC - FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2)) || + FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || + (voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2 || + voice->src.format->wFormatTag == FAUDIO_FORMAT_EXTENSIBLE))) || (voice->src.wmadec == NULL && (pBufferWMA == NULL && voice->src.format->wFormatTag != FAUDIO_FORMAT_XMAUDIO2)) ); #endif /* HAVE_WMADEC */ diff --git a/libs/faudio/src/FAudioFX_reverb.c b/libs/faudio/src/FAudioFX_reverb.c index 4d43fa4e76c..79c4151c2d9 100644 --- a/libs/faudio/src/FAudioFX_reverb.c +++ b/libs/faudio/src/FAudioFX_reverb.c @@ -507,7 +507,8 @@ static FAudio_ChannelPositionFlags FAudio_GetChannelPositionFlags(int32_t total_ case 3: return Position_Right | Position_Rear; } - + FAudio_assert(0 && "Unsupported channel count"); + break; case 5: switch (channel) { @@ -522,7 +523,8 @@ static FAudio_ChannelPositionFlags FAudio_GetChannelPositionFlags(int32_t total_ case 4: return Position_Right | Position_Rear; } - + FAudio_assert(0 && "Unsupported channel count"); + break; default: FAudio_assert(0 && "Unsupported channel count"); break; diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index f70e260c542..ccb8d8abbbf 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -228,8 +228,8 @@ void FAudio_PlatformInit( FAudio_assert(!FAILED(hr) && "Failed to create audio client!"); IMMDevice_Release(device); - if (flags & FAUDIO_1024_QUANTUM) duration = 21330; - else duration = 30000; + if (flags & FAUDIO_1024_QUANTUM) duration = 213333; + else duration = 100000; hr = IAudioClient_IsFormatSupported( data->client, @@ -250,7 +250,7 @@ void FAudio_PlatformInit( data->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, - duration, + duration * 3, 0, &args->format.Format, &GUID_NULL @@ -287,7 +287,8 @@ void FAudio_PlatformInit( args->events[0] = audioEvent; args->events[1] = data->stopEvent; args->audio = audio; - args->updateSize = args->format.Format.nSamplesPerSec / 100; + if (flags & FAUDIO_1024_QUANTUM) args->updateSize = args->format.Format.nSamplesPerSec / (1000.0 / (64.0 / 3.0)); + else args->updateSize = args->format.Format.nSamplesPerSec / 100; data->audioThread = CreateThread(NULL, 0, &FAudio_AudioClientThread, args, 0, NULL); FAudio_assert(!!data->audioThread && "Failed to create audio client thread!"); @@ -622,6 +623,7 @@ static int FAUDIOCALL FAudio_mem_close(void *data) { if (!data) return 0; FAudio_free(data); + return 0; } FAudioIOStream* FAudio_memopen(void *mem, int len)

1 0

Alistair Leslie-Hughes : msdasql: Trace unsupported rowset interfaces.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 1b443bd516ea0a74303cc69450b2a872b43e8d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b443bd516ea0a74303cc694… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:26 2021 +1100 msdasql: Trace unsupported rowset interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 15 +++++++++++++++ dlls/msdasql/tests/provider.c | 10 ++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 5345701a35e..0298c7e7424 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -472,6 +472,21 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetChange, riid)) + { + TRACE("IID_IRowsetChange not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetUpdate, riid)) + { + TRACE("IID_IRowsetUpdate not supported\n"); + return E_NOINTERFACE; + } + else if (IsEqualGUID(&IID_IRowsetLocate, riid)) + { + TRACE("IID_IRowsetLocate not supported\n"); + return E_NOINTERFACE; + } if(*ppv) { diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index f10156aacfa..8b076ed4479 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -228,6 +228,7 @@ static void test_rowset_interfaces(IRowset *rowset) IColumnsInfo *col_info; IColumnsRowset *col_rs; IAccessor *accessor; + IUnknown *unk; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -245,6 +246,15 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsRowset_Release(col_rs); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetChange, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetUpdate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetLocate, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); } static void test_command_rowset(IUnknown *cmd)

1 0

Alistair Leslie-Hughes : msdasql: Add IColumnsRowset support to rowset.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: c56b43891f908668a28a222cfc847ed63ce5eb60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56b43891f908668a28a222c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:25 2021 +1100 msdasql: Add IColumnsRowset support to rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 55 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index f1e4eecb1ac..5345701a35e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -415,6 +415,7 @@ struct msdasql_rowset IRowsetInfo IRowsetInfo_iface; IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; + IColumnsRowset IColumnsRowset_iface; LONG refs; }; @@ -438,6 +439,11 @@ static inline struct msdasql_rowset *impl_from_IAccessor ( IAccessor *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IAccessor_iface ); } +static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -462,6 +468,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IAccessor_iface; } + else if(IsEqualGUID(&IID_IColumnsRowset, riid)) + { + *ppv = &rowset->IColumnsRowset_iface; + } if(*ppv) { @@ -700,6 +710,50 @@ struct IAccessorVtbl accessor_vtbl = rowset_accessor_ReleaseAccessor }; +static HRESULT WINAPI column_rs_QueryInterface(IColumnsRowset *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI column_rs_AddRef(IColumnsRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + FIXME("%p, %p, %p\n", rowset, count, columns); + return E_NOTIMPL; +} + +static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count, + const DBID columns[], REFIID riid, ULONG property_cnt, DBPROPSET property_sets[], IUnknown **unk_rs) +{ + struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); + FIXME("(%p)->(%p %ld %p %s %u, %p %p): stub\n", rowset, outer, count, columns, debugstr_guid(riid), + property_cnt, property_sets, unk_rs); + return E_NOTIMPL; +} + +struct IColumnsRowsetVtbl columnrs_rs_vtbl = +{ + column_rs_QueryInterface, + column_rs_AddRef, + column_rs_Release, + column_rs_GetAvailableColumns, + column_rs_GetColumnsRowset +}; + + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -717,6 +771,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; + msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8acac93ddd8..f10156aacfa 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -226,6 +226,7 @@ static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; IColumnsInfo *col_info; + IColumnsRowset *col_rs; IAccessor *accessor; HRESULT hr; @@ -240,6 +241,10 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); ok(hr == S_OK, "got 0x%08x\n", hr); IAccessor_Release(accessor); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsRowset, (void**)&col_rs); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsRowset_Release(col_rs); } static void test_command_rowset(IUnknown *cmd)

1 0

Alistair Leslie-Hughes : msdasql: Add IAccessor to rowset.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 5edd674216a6f5a6304fe58dbc03668cfc5982f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5edd674216a6f5a6304fe58d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:24 2021 +1100 msdasql: Add IAccessor to rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 71 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 +++ 2 files changed, 76 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 898cf6fa864..f1e4eecb1ac 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -414,6 +414,7 @@ struct msdasql_rowset IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; IColumnsInfo IColumnsInfo_iface; + IAccessor IAccessor_iface; LONG refs; }; @@ -432,6 +433,11 @@ static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); } +static inline struct msdasql_rowset *impl_from_IAccessor ( IAccessor *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IAccessor_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -452,6 +458,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsInfo_iface; } + else if(IsEqualGUID(&IID_IAccessor, riid)) + { + *ppv = &rowset->IAccessor_iface; + } if(*ppv) { @@ -630,6 +640,66 @@ static struct IColumnsInfoVtbl rowset_columninfo_vtbll = rowset_colsinfo_MapColumnIDs }; +static HRESULT WINAPI rowset_accessor_QueryInterface(IAccessor *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_accessor_AddRef(IAccessor *iface) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_accessor_Release(IAccessor *iface) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_accessor_AddRefAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_CreateAccessor(IAccessor *iface, DBACCESSORFLAGS flags, + DBCOUNTITEM count, const DBBINDING bindings[], DBLENGTH row_size, HACCESSOR *accessor, + DBBINDSTATUS status[]) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p 0x%08x, %lu, %p, %lu, %p, %p\n", rowset, flags, count, bindings, row_size, accessor, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_GetBindings(IAccessor *iface, HACCESSOR accessor, + DBACCESSORFLAGS *flags, DBCOUNTITEM *count, DBBINDING **bindings) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p %lu, %p, %p, %p\n", rowset, accessor, flags, count, bindings); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_accessor_ReleaseAccessor(IAccessor *iface, HACCESSOR accessor, DBREFCOUNT *count) +{ + struct msdasql_rowset *rowset = impl_from_IAccessor( iface ); + FIXME("%p, %lu, %p\n", rowset, accessor, count); + return E_NOTIMPL; +} + +struct IAccessorVtbl accessor_vtbl = +{ + rowset_accessor_QueryInterface, + rowset_accessor_AddRef, + rowset_accessor_Release, + rowset_accessor_AddRefAccessor, + rowset_accessor_CreateAccessor, + rowset_accessor_GetBindings, + rowset_accessor_ReleaseAccessor +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -646,6 +716,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; + msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 708d6d22ed3..8acac93ddd8 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -226,6 +226,7 @@ static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; IColumnsInfo *col_info; + IAccessor *accessor; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); @@ -235,6 +236,10 @@ static void test_rowset_interfaces(IRowset *rowset) hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); ok(hr == S_OK, "got 0x%08x\n", hr); IColumnsInfo_Release(col_info); + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void**)&accessor); + ok(hr == S_OK, "got 0x%08x\n", hr); + IAccessor_Release(accessor); } static void test_command_rowset(IUnknown *cmd)

1 0

Alistair Leslie-Hughes : msdasql: Support IColumnsInfo in Rowset.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 60c97a57c2fd5e576cf9ffa0587447b6c9d304b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c97a57c2fd5e576cf9ffa0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:23 2021 +1100 msdasql: Support IColumnsInfo in Rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 56 ++++++++++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85b11670687..898cf6fa864 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -413,6 +413,7 @@ struct msdasql_rowset { IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -426,6 +427,11 @@ static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); } +static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -442,6 +448,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowsetInfo_iface; } + else if (IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &rowset->IColumnsInfo_iface; + } if(*ppv) { @@ -547,7 +557,7 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + FIXME("%p, %d, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); return E_NOTIMPL; } @@ -577,6 +587,49 @@ struct IRowsetInfoVtbl rowset_info_vtbl = rowset_info_GetSpecification }; +static HRESULT WINAPI rowset_colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_colsinfo_AddRef(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_colsinfo_Release(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", rowset, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", rowset, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl rowset_columninfo_vtbll = +{ + rowset_colsinfo_QueryInterface, + rowset_colsinfo_AddRef, + rowset_colsinfo_Release, + rowset_colsinfo_GetColumnInfo, + rowset_colsinfo_MapColumnIDs +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -592,6 +645,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; + msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 604815b1ee5..708d6d22ed3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -225,11 +225,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; + IColumnsInfo *col_info; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); ok(hr == S_OK, "got 0x%08x\n", hr); IRowsetInfo_Release(info); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(col_info); } static void test_command_rowset(IUnknown *cmd)

1 0

Alistair Leslie-Hughes : msdasql: Support IRowsetInfo in IRowset interface.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 3c34f073c0d80099a992ceeabb644a4738728dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c34f073c0d80099a992ceea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:22 2021 +1100 msdasql: Support IRowsetInfo in IRowset interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 12 +++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 6a1e6bb8e0d..85b11670687 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -412,6 +412,7 @@ static HRESULT WINAPI command_Cancel(ICommandText *iface) struct msdasql_rowset { IRowset IRowset_iface; + IRowsetInfo IRowsetInfo_iface; LONG refs; }; @@ -420,6 +421,11 @@ static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowset_iface ); } +static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -432,6 +438,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetInfo, riid)) + { + *ppv = &rowset->IRowsetInfo_iface; + } if(*ppv) { @@ -515,6 +525,58 @@ static const struct IRowsetVtbl msdasql_rowset_vtbl = msdasql_rowset_RestartPosition }; +static HRESULT WINAPI rowset_info_QueryInterface(IRowsetInfo *iface, REFIID riid, void **ppv) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, ppv); +} + +static ULONG WINAPI rowset_info_AddRef(IRowsetInfo *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_info_Release(IRowsetInfo *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, + REFIID riid, IUnknown **unk) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %ld, %s, %p\n", rowset, ordinal, debugstr_guid(riid), unk); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID riid, + IUnknown **specification) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); + return E_NOTIMPL; +} + +struct IRowsetInfoVtbl rowset_info_vtbl = +{ + rowset_info_QueryInterface, + rowset_info_AddRef, + rowset_info_Release, + rowset_info_GetProperties, + rowset_info_GetReferencedRowset, + rowset_info_GetSpecification +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -529,6 +591,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI return E_OUTOFMEMORY; msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; + msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8b8d8e4b494..604815b1ee5 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -222,6 +222,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } +static void test_rowset_interfaces(IRowset *rowset) +{ + IRowsetInfo *info; + HRESULT hr; + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IRowsetInfo_Release(info); +} + static void test_command_rowset(IUnknown *cmd) { ICommandText *comand_text; @@ -258,6 +268,8 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); + test_rowset_interfaces(rowset); + IRowset_Release(rowset); IUnknown_Release(unk); }

1 0

Alistair Leslie-Hughes : msdasql: Correct ICommandText Execute test.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 6649396abe04a0630c7d5450f49607235f041aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=6649396abe04a0630c7d5450… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:21 2021 +1100 msdasql: Correct ICommandText Execute test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index df642a6a637..8b8d8e4b494 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -244,12 +244,16 @@ static void test_command_rowset(IUnknown *cmd) if (unk) IUnknown_Release(unk); - affected = 9999; hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK && unk) + + affected = 9999; + hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != NULL, "Unexepcted value\n"); + if (hr == S_OK) { - ok(affected == 0, "wrong affected value\n"); + ok(affected == -1, "wrong affected value\n"); hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

← Newer
1
...
85
86
87
88
89
90
91
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021