February 2022 - Wine-Commits

Eric Pouech : uninstaller: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: bae8ef750a944f6a047cd6ec47eb813bdff5bc18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae8ef750a944f6a047cd6ec… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:13 2022 +0100 uninstaller: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/Makefile.in | 1 - programs/uninstaller/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 0fc7d679f19..f7fef51a51c 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uninstaller.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index d8203b6763b..68d0dfe49f9 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -79,7 +79,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (LPWSTR)&str, 0, &va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; } output_writeconsole(str, len); @@ -93,7 +93,7 @@ static void WINAPIV output_message(unsigned int id, ...) if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; } va_start(va_args, id); @@ -173,7 +173,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) GetExitCodeProcess( pi.hProcess, &exit_code ); ExitProcess( exit_code ); } - else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + else WINE_ERR( "failed to restart 64-bit %s, err %ld\n", wine_dbgstr_w(filename), GetLastError() ); Wow64RevertWow64FsRedirection( redir ); } @@ -347,7 +347,7 @@ static void UninstallProgram(void) { /* wait for the process to exit */ WaitForSingleObject(info.hProcess, INFINITE); res = GetExitCodeProcess(info.hProcess, &exit_code); - WINE_TRACE("%d: %08x\n", res, exit_code); + WINE_TRACE("%d: %08lx\n", res, exit_code); } else {

1 0

Eric Pouech : spoolsv: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: bd298b4a02a5d8694aad3687db8993a50f2ae0e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd298b4a02a5d8694aad3687… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:49 2022 +0100 spoolsv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/spoolsv/Makefile.in | 1 - programs/spoolsv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index 04c8a5cbeee..5046a9c0861 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolsv.exe IMPORTS = advapi32 diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 2893fa614a1..3640ccee754 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -52,7 +52,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

Eric Pouech : svchost: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 528c7a5f0cefc02d3c35cfbe0b9d229d9c5c7609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=528c7a5f0cefc02d3c35cfbe… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:01 2022 +0100 svchost: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/svchost/Makefile.in | 1 - programs/svchost/svchost.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index 969a31da11e..f31e393c8af 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = svchost.exe IMPORTS = advapi32 diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 603deef1abd..618147a55c4 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -86,7 +86,7 @@ static LPWSTR ExpandEnv(LPWSTR string) size = ExpandEnvironmentStringsW(string, NULL, size); if (size == 0) { - WINE_ERR("cannot expand env vars in %s: %u\n", + WINE_ERR("cannot expand env vars in %s: %lu\n", wine_dbgstr_w(string), GetLastError()); return NULL; } @@ -94,7 +94,7 @@ static LPWSTR ExpandEnv(LPWSTR string) (size + 1) * sizeof(WCHAR)); if (ExpandEnvironmentStringsW(string, expanded_string, size) == 0) { - WINE_ERR("cannot expand env vars in %s: %u\n", + WINE_ERR("cannot expand env vars in %s: %lu\n", wine_dbgstr_w(string), GetLastError()); HeapFree(GetProcessHeap(), 0, expanded_string); return NULL; @@ -134,7 +134,7 @@ static BOOL AddServiceElem(LPWSTR service_name, KEY_READ, &service_hkey); if (ret != ERROR_SUCCESS) { - WINE_ERR("cannot open key %s, err=%d\n", + WINE_ERR("cannot open key %s, err=%ld\n", wine_dbgstr_w(service_param_key), ret); goto cleanup; } @@ -182,7 +182,7 @@ static BOOL AddServiceElem(LPWSTR service_name, library = LoadLibraryExW(dll_name_long, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!library) { - WINE_ERR("failed to load library %s, err=%u\n", + WINE_ERR("failed to load library %s, err=%lu\n", wine_dbgstr_w(dll_name_long), GetLastError()); goto cleanup; } @@ -240,7 +240,7 @@ static BOOL StartGroupServices(LPWSTR services) service_name = service_name + lstrlenW(service_name); ++service_name; } - WINE_TRACE("Service group contains %d services\n", service_count); + WINE_TRACE("Service group contains %ld services\n", service_count); /* Populate the service table */ service_table = HeapAlloc(GetProcessHeap(), 0, @@ -263,7 +263,7 @@ static BOOL StartGroupServices(LPWSTR services) /* Start the services */ if (!(ret = StartServiceCtrlDispatcherW(service_table))) - WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %u\n", + WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %lu\n", wine_dbgstr_w(services), GetLastError()); HeapFree(GetProcessHeap(), 0, service_table); @@ -285,7 +285,7 @@ static BOOL LoadGroup(PWCHAR group_name) KEY_READ, &group_hkey); if (ret != ERROR_SUCCESS) { - WINE_ERR("cannot open key %s, err=%d\n", + WINE_ERR("cannot open key %s, err=%ld\n", wine_dbgstr_w(svchost_path), ret); return FALSE; }

1 0

Eric Pouech : winebrowser: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 5686741fce229f2a01b238e14b3d7415df18b5fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5686741fce229f2a01b238e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:31 2022 +0100 winebrowser: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/Makefile.in | 1 - programs/winebrowser/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index fe4371b6bf2..161be7e08de 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winebrowser.exe IMPORTS = urlmon oleaut32 shell32 user32 advapi32 diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 913c0a8d672..369ecb98002 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -197,7 +197,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, { DWORD size = 0, ret = 0; - WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", + WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08Ix, %08Ix\n", uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); switch (uType) @@ -213,7 +213,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, else if (!(ddeString = malloc(size))) WINE_ERR("Out of memory\n"); else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size) - WINE_WARN("DdeGetData did not return %d bytes\n", size); + WINE_WARN("DdeGetData did not return %ld bytes\n", size); DdeFreeDataHandle(hData); return (HDDEDATA)DDE_FACK; @@ -224,7 +224,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, else if (!(ddeString = malloc( (size + 1) * sizeof(WCHAR)))) WINE_ERR("Out of memory\n"); else if (DdeQueryStringW(ddeInst, hsz2, ddeString, size + 1, CP_WINUNICODE) != size) - WINE_WARN("DdeQueryString did not return %d characters\n", size); + WINE_WARN("DdeQueryString did not return %ld characters\n", size); else ret = -2; /* acknowledgment */ return DdeCreateDataHandle(ddeInst, (LPBYTE)&ret, sizeof(ret), 0,

1 0

Zebediah Figura : strmbase: Remove the no longer used BaseOutputPinImpl_GetDeliveryBuffer() helper.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 186b99c2acbcd6c172e73db6f40aa8da6e7d07dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=186b99c2acbcd6c172e73db6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:43 2022 -0600 strmbase: Remove the no longer used BaseOutputPinImpl_GetDeliveryBuffer() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 2 -- libs/strmbase/pin.c | 20 -------------------- 2 files changed, 22 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1c8696ed620..868ea4c580a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -105,8 +105,6 @@ struct strmbase_sink_ops }; /* Base Pin */ -HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin, - IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 36b3fdf1425..f6e4ef1c139 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -677,26 +677,6 @@ static const IPinVtbl source_vtbl = source_NewSegment, }; -HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This, - IMediaSample **ppSample, REFERENCE_TIME *tStart, REFERENCE_TIME *tStop, DWORD dwFlags) -{ - HRESULT hr; - - TRACE("(%p)->(%p, %p, %p, %x)\n", This, ppSample, tStart, tStop, dwFlags); - - if (!This->pin.peer) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IMemAllocator_GetBuffer(This->pAllocator, ppSample, tStart, tStop, dwFlags); - - if (SUCCEEDED(hr)) - hr = IMediaSample_SetTime(*ppSample, tStart, tStop); - } - - return hr; -} - HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc) { return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);

1 0

Zebediah Figura : ws2_32: Avoid an unnecessary goto.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 2895f0fd22ce95d1157efc316de661f770a29d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2895f0fd22ce95d1157efc31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 4 19:35:36 2022 -0600 ws2_32: Avoid an unnecessary goto. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4b3ca3c2507..b06fb341991 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3305,8 +3305,9 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, if (!num_startup) { - err = WSANOTINITIALISED; - goto done; + WARN( "not initialised\n" ); + SetLastError( WSANOTINITIALISED ); + return -1; } /* hack for WSADuplicateSocket */ @@ -3406,11 +3407,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } WSASetLastError(0); return ret; - -done: - WARN("\t\tfailed, error %d!\n", err); - SetLastError(err); - return INVALID_SOCKET; } /***********************************************************************

1 0

Zebediah Figura : qcap: Use IMemAllocator::GetBuffer() and IMediaSample::SetTime() directly.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: ed4df6964cb9517c9d962ea16f3033e0a08e0365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed4df6964cb9517c9d962ea1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:42 2022 -0600 qcap: Use IMemAllocator::GetBuffer() and IMediaSample::SetTime() directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 9 +++++++-- dlls/qcap/vfwcapture.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index e8a452fc7f5..b56a051d67b 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -350,9 +350,14 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia return hres; } - hres = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &out_sample, &start, &stop, 0); - if(FAILED(hres)) + if (FAILED(hres = IMemAllocator_GetBuffer(This->source.pAllocator, &out_sample, &start, &stop, 0))) + { + ERR("Failed to get sample, hr %#x.\n", hres); return hres; + } + + if (FAILED(hres = IMediaSample_SetTime(out_sample, &start, &stop))) + ERR("Failed to set time, hr %#x.\n", hres); hres = IMediaSample_GetPointer(out_sample, &buf); if(FAILED(hres)) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7e6b0ee5afe..84d6c093cc6 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -165,7 +165,7 @@ static DWORD WINAPI stream_thread(void *arg) LeaveCriticalSection(&filter->state_cs); - if (FAILED(hr = BaseOutputPinImpl_GetDeliveryBuffer(&filter->source, &sample, NULL, NULL, 0))) + if (FAILED(hr = IMemAllocator_GetBuffer(filter->source.pAllocator, &sample, NULL, NULL, 0))) { ERR("Failed to get sample, hr %#x.\n", hr); break;

1 0

Nikolay Sivov : dbgeng: Fix long types warnings in traces.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 010dd60f84f8c346b5244e804cc5ec403f7192ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=010dd60f84f8c346b5244e80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 7 09:07:08 2022 +0300 dbgeng: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/Makefile.in | 1 - dlls/dbgeng/dbgeng.c | 468 ++++++++++++++++++++++++------------------------ 2 files changed, 234 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=010dd60f84f8c346b524…

1 0

Zebediah Figura : quartz: Use IMemAllocator::GetBuffer() directly.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 9d5d8df6f0503a46b15deadb2bd856b405ec0db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d5d8df6f0503a46b15deadb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 6 20:59:38 2022 -0600 quartz: Use IMemAllocator::GetBuffer() directly. BaseOutputPinImpl_GetDeliveryBuffer() is doing nothing helpful here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 3 +-- dlls/quartz/avidec.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 12d96f69376..cf8e7cd125d 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -140,8 +140,7 @@ static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMed while(hr == S_OK && ash.cbSrcLength) { - hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); - if (FAILED(hr)) + if (FAILED(hr = IMemAllocator_GetBuffer(This->source.pAllocator, &pOutSample, NULL, NULL, 0))) { ERR("Failed to get sample, hr %#lx.\n", hr); return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 30b6c741eed..f8660890273 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -139,8 +139,8 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface, /* Update input size to match sample size */ This->pBihIn->biSizeImage = cbSrcStream; - hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); - if (FAILED(hr)) { + if (FAILED(hr = IMemAllocator_GetBuffer(This->source.pAllocator, &pOutSample, NULL, NULL, 0))) + { ERR("Failed to get sample, hr %#lx.\n", hr); return hr; }

1 0

Alistair Leslie-Hughes : msdasql: ICommandText Execute use ODBC to fetch results.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 50fc9d7ddce7d2abe03549aa28df192b6cd944ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=50fc9d7ddce7d2abe03549aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 6 19:07:36 2022 +1100 msdasql: ICommandText Execute use ODBC to fetch results. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 59 ++++++++++++++++++++++++++++++++----------- dlls/msdasql/tests/provider.c | 15 ++++++++--- 2 files changed, 56 insertions(+), 18 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 0f74c126138..199eb0830d6 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -477,6 +477,7 @@ struct msdasql_rowset IColumnsRowset IColumnsRowset_iface; IUnknown *caller; LONG refs; + SQLHSTMT hstmt; }; static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) @@ -575,6 +576,8 @@ static ULONG WINAPI msdasql_rowset_Release(IRowset *iface) { TRACE( "destroying %p\n", rowset ); + SQLFreeHandle(SQL_HANDLE_STMT, rowset->hstmt); + if (rowset->caller) IUnknown_Release(rowset->caller); @@ -845,27 +848,53 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI { struct command *command = impl_from_ICommandText( iface ); struct msdasql_rowset *msrowset; - HRESULT hr; + HRESULT hr = S_OK; + RETCODE ret; + SQLHSTMT hstmt = command->hstmt; + SQLLEN results = -1; - FIXME("%p, %p, %s, %p %p %p Semi Stub\n", command, outer, debugstr_guid(riid), params, affected, rowset); + TRACE("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); - msrowset = heap_alloc(sizeof(*msrowset)); - if (!msrowset) - return E_OUTOFMEMORY; + if (!hstmt) + SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &hstmt); - 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->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->refs = 1; - ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); + ret = SQLExecDirectW(hstmt, command->query, SQL_NTS); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_STMT, hstmt); + return E_FAIL; + } + + ret = SQLRowCount(hstmt, &results); + if (ret != SQL_SUCCESS) + ERR("SQLRowCount failed (%d)\n", ret); if (affected) - *affected = 0; /* FIXME */ + *affected = results; + + *rowset = NULL; + if (!wcsnicmp( command->query, L"select ", 7 )) + { + msrowset = heap_alloc(sizeof(*msrowset)); + if (!msrowset) + return E_OUTOFMEMORY; - hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); - IRowset_Release(&msrowset->IRowset_iface); + command->hstmt = NULL; + + 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->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; + msrowset->refs = 1; + ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); + msrowset->hstmt = hstmt; + + hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); + IRowset_Release(&msrowset->IRowset_iface); + } + else + SQLFreeStmt(hstmt, SQL_CLOSE); return hr; } diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 7a5175fa050..d261e34e987 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -382,11 +382,20 @@ static void test_command_rowset(IUnknown *cmd) affected = 9999; hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08lx\n", hr); - todo_wine ok(unk == NULL, "Unexpected value\n"); - todo_wine ok(affected == -1, "got %Id\n", affected); + ok(unk == NULL, "Unexpected value\n"); + ok(affected == -1, "got %Id\n", affected); if (unk) IUnknown_Release(unk); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"insert into testing values(1, 0)"); + ok(hr == S_OK, "got 0x%08lx\n", hr); + + affected = 9999; + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(affected == 1, "got %Id\n", affected); + ok(unk == NULL, "Unexpected value\n"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08lx\n", hr); @@ -396,7 +405,7 @@ static void test_command_rowset(IUnknown *cmd) ok(unk != NULL, "Unexpected value\n"); if (hr == S_OK) { - ok(affected == -1, "wrong affected value\n"); + ok(affected == -1, "got %Id\n", affected); hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08lx\n", hr);

1 0