February 2021 - Wine-commits

Nikolay Sivov : mf/tests: Skip all tests on Vista.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: b9ceaa6fed82e3fc70c601ea34eff71e55c37f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9ceaa6fed82e3fc70c601ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 16:12:10 2021 +0300 mf/tests: Skip all tests on Vista. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e3a752553bb..40d8561bb06 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -48,6 +48,12 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); +static HRESULT (WINAPI *pMFGetTopoNodeCurrentType)(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); + +static BOOL is_vista(void) +{ + return !pMFGetTopoNodeCurrentType; +} #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) @@ -5089,14 +5095,20 @@ static void test_MFGetTopoNodeCurrentType(void) IMFTopologyNode *node; HRESULT hr; + if (!pMFGetTopoNodeCurrentType) + { + win_skip("MFGetTopoNodeCurrentType() is unsupported.\n"); + return; + } + /* Tee node. */ hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateMediaType(&media_type2); @@ -5109,7 +5121,7 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetInputPrefType(node, 0, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5117,14 +5129,14 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetInputPrefType(node, 0, NULL); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); /* Set second output. */ hr = IMFTopologyNode_SetOutputPrefType(node, 1, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = IMFTopologyNode_SetOutputPrefType(node, 1, NULL); @@ -5134,7 +5146,7 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetOutputPrefType(node, 0, media_type2); ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5149,12 +5161,12 @@ static void test_MFGetTopoNodeCurrentType(void) hr = IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_PRIMARYOUTPUT, 1); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); - hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type); @@ -5169,6 +5181,7 @@ static void init_functions(void) #define X(f) p##f = (void*)GetProcAddress(mod, #f) X(MFCreateSampleCopierMFT); + X(MFGetTopoNodeCurrentType); #undef X } @@ -5176,6 +5189,12 @@ START_TEST(mf) { init_functions(); + if (is_vista()) + { + win_skip("Skipping tests on Vista.\n"); + return; + } + test_topology(); test_topology_tee_node(); test_topology_loader();

1 0

Akihiro Sagawa : krnl386.exe: Cap GetFreeSpace value to 2GB.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: eca2bfd071ea2142f5c4126badb5bcf923a9a655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca2bfd071ea2142f5c4126b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 20 21:26:27 2021 +0900 krnl386.exe: Cap GetFreeSpace value to 2GB. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index e66007784ee..0a8da28e99b 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -750,7 +750,7 @@ DWORD WINAPI GetFreeSpace16( UINT16 wFlags ) { MEMORYSTATUS ms; GlobalMemoryStatus( &ms ); - return ms.dwAvailVirtual; + return min( ms.dwAvailVirtual, MAXLONG ); } /***********************************************************************

1 0

Paul Gofman : advapi32: Return ERROR_INVALID_PARAMETER for invalid crypt objects' handles.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 7d4eaa30a4f5d1cda3efe1d7a7477ca70d1d1c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4eaa30a4f5d1cda3efe1d7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 23 16:07:31 2021 +0300 advapi32: Return ERROR_INVALID_PARAMETER for invalid crypt objects' handles. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 295 +++++++++++++++++++++++--------------------- dlls/advapi32/tests/crypt.c | 55 ++++++++- 2 files changed, 206 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d4eaa30a4f5d1cda3ef…

1 0

Paul Gofman : advapi32: Handle exceptions from dereferencing invalid crypt objects' handles.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 992117ac9820a8c8d1174a62179c87ca7cf309ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=992117ac9820a8c8d1174a62… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 23 16:07:32 2021 +0300 advapi32: Handle exceptions from dereferencing invalid crypt objects' handles. Fixes crash on start in "Re:ZERO -Starting Life in Another World- The Prophecy of the Throne". Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 19 +++++++++++++++---- dlls/advapi32/tests/crypt.c | 20 ++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 6cdb5f3ecff..20c55558fa5 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -37,6 +37,7 @@ #include "winreg.h" #include "rpc.h" #include "wine/debug.h" +#include "wine/exception.h" #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -59,12 +60,22 @@ static HWND crypt_hWindow; static void *pointer_from_handle(UINT_PTR handle, DWORD magic) { - if (!handle || *(DWORD *)handle != magic) + void *ret = NULL; + + __TRY + { + if (handle && *(DWORD *)handle == magic) + ret = (void *)handle; + } + __EXCEPT_PAGE_FAULT { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; } - return (void *)handle; + __ENDTRY + + if (!ret) + SetLastError(ERROR_INVALID_PARAMETER); + + return ret; } static PCRYPTPROV provider_from_handle(HCRYPTPROV handle) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index a6e3d447ba8..6df47cd626b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -154,6 +154,8 @@ static void test_CryptReleaseContext(void) ret = CryptContextAddRef(0, NULL, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ret = CryptContextAddRef(0xdeadbeef, NULL, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); ret = CryptReleaseContext(prov, 0); ok(ret, "got %u\n", GetLastError()); @@ -272,6 +274,9 @@ static void test_incorrect_api_usage(void) ok (result, "%08x\n", GetLastError()); if (!result) return; + /* Looks like native handles are just pointers. */ + ok(!!*(void **)hProv, "Got zero *(void **)hProv.\n"); + result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok (result, "%d\n", GetLastError()); if (!result) return; @@ -301,6 +306,9 @@ static void test_incorrect_api_usage(void) result = CryptDestroyHash(0); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptCreateHash(0xdeadbeef, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptCreateHash(0, CALG_SHA, 0, 0, &hHash); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -310,13 +318,25 @@ static void test_incorrect_api_usage(void) dwLen = 1; result = CryptDecrypt(hKey, 0, TRUE, 0, &temp, &dwLen); ok (result, "%d\n", GetLastError()); + result = CryptDecrypt(hKey, 0xdeadbeef, TRUE, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptDecrypt(0, 0, TRUE, 0, &temp, &dwLen); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptDecrypt(0xdeadbeef, 0, TRUE, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptEncrypt(hKey, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); ok (result, "%d\n", GetLastError()); + result = CryptEncrypt(hKey, 0xdeadbeef, TRUE, 0, &temp, &dwLen, sizeof(temp)); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptEncrypt(0, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptEncrypt(0xdeadbeef, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + dwLen = 1; + result = CryptExportKey(hKey, 0xdeadbeef, 0, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptDestroyKey(hKey); ok (result, "%d\n", GetLastError());

1 0

Rémi Bernon : wined3d: Use a separate allocation for the device state.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 50949c953a77d5b87acbb51cc9e30056b6c7c40f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50949c953a77d5b87acbb51c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 23 19:50:43 2021 +0100 wined3d: Use a separate allocation for the device state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +- dlls/wined3d/device.c | 417 ++++++++++++++++++++++++----------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 251 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50949c953a77d5b87acb…

1 0

Henri Verbeet : wined3d: Unbind framebuffer state in state_unbind_resources().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 57119a1c1f4992ebf81e6fe10c78a537ee8d0ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57119a1c1f4992ebf81e6fe1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 19:50:44 2021 +0100 wined3d: Unbind framebuffer state in state_unbind_resources(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 13 ------------- dlls/wined3d/stateblock.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 792263ca7d8..c9df09b5348 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1196,7 +1196,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; - unsigned int i; TRACE("device %p.\n", device); @@ -1224,10 +1223,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(state); - for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) - { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); - } wine_rb_clear(&device->samplers, device_free_sampler, NULL); wine_rb_clear(&device->rasterizer_states, device_free_rasterizer_state, NULL); @@ -1243,14 +1238,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) device->adapter->adapter_ops->adapter_uninit_3d(device); device->d3d_initialized = FALSE; - if ((view = state->fb.depth_stencil)) - { - TRACE("Releasing depth/stencil view %p.\n", view); - - state->fb.depth_stencil = NULL; - wined3d_rendertarget_view_decref(view); - } - if ((view = device->auto_depth_stencil_view)) { device->auto_depth_stencil_view = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 46588fa4246..52124583c90 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -374,6 +374,7 @@ void state_unbind_resources(struct wined3d_state *state) struct wined3d_shader_resource_view *srv; struct wined3d_vertex_declaration *decl; struct wined3d_blend_state *blend_state; + struct wined3d_rendertarget_view *rtv; struct wined3d_sampler *sampler; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -473,6 +474,21 @@ void state_unbind_resources(struct wined3d_state *state) state->blend_state = NULL; wined3d_blend_state_decref(blend_state); } + + for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i) + { + if ((rtv = state->fb.render_targets[i])) + { + state->fb.render_targets[i] = NULL; + wined3d_rendertarget_view_decref(rtv); + } + } + + if ((rtv = state->fb.depth_stencil)) + { + state->fb.depth_stencil = NULL; + wined3d_rendertarget_view_decref(rtv); + } } void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state)

1 0

Rémi Bernon : wined3d: Introduce public API to set a wined3d_state object on a device.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 80e1eb87ad531ecde5038739ab4e51026cc616ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e1eb87ad531ecde5038739… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 23 19:50:45 2021 +0100 wined3d: Introduce public API to set a wined3d_state object on a device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 139 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/stateblock.c | 22 ++++++++ dlls/wined3d/wined3d.spec | 5 ++ include/wine/wined3d.h | 6 ++ 4 files changed, 167 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80e1eb87ad531ecde503…

1 0

Alistair Leslie-Hughes : msado15: Add helper function to create CommandText interface.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 0949cb4552bb9435211fff5b6404d9bcae5d2358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0949cb4552bb9435211fff5b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 23 07:58:34 2021 +1100 msado15: Add helper function to create CommandText interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 1 + dlls/msado15/connection.c | 83 +++++++++++++++++++++++++++--------------- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 2 + dlls/msado15/stream.c | 1 + 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index d19108a1a25..9a56ced25ac 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -20,6 +20,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 500be033199..d55c0d18a35 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -264,61 +264,90 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, - LONG options, _Recordset **record_set ) +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) { - struct connection *connection = impl_from_Connection( iface ); HRESULT hr; IOpenRowset *openrowset; - IDBCreateCommand *create_command = NULL; - ICommand *cmd = NULL; - ICommandText *comand_text = NULL; - DBROWCOUNT affected; - IUnknown *rowset = NULL; - _Recordset *recordset = NULL; - ADORecordsetConstruction *construct; + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; - FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); - - if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - - hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); if (FAILED(hr)) return hr; hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + IOpenRowset_Release(openrowset); if (FAILED(hr)) - goto done; + return hr; hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); if (FAILED(hr)) - goto done; + return hr; - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); if (FAILED(hr)) { FIXME("Currently only ICommandText interface is support\n"); - goto done; + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + *cmd_text = command_text; + + return S_OK; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ICommandText *comand_text; + DBROWCOUNT affected; + IUnknown *rowset; + _Recordset *recordset; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = create_command_text(connection->session, command, &comand_text); if (FAILED(hr)) - goto done; + return hr; hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(comand_text); if (FAILED(hr)) - goto done; + return hr; hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + return hr; + } hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + _Recordset_Release(recordset); + return hr; + } ADORecordsetConstruction_put_Rowset(construct, rowset); ADORecordsetConstruction_Release(construct); + IUnknown_Release(rowset); if (records_affected) { @@ -329,12 +358,6 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; -done: - if (rowset) IUnknown_Release(rowset); - if (comand_text) ICommandText_Release(comand_text); - if (cmd) ICommand_Release(cmd); - if (create_command) IDBCreateCommand_Release(create_command); - if (openrowset) IOpenRowset_Release(openrowset); return hr; } diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 770a02fc59d..0b8de1f9117 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f6c60f0304c..dd98c382e2b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,6 +26,8 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) DECLSPEC_HIDDEN; + static inline void *heap_realloc_zero( void *mem, SIZE_T len ) { if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index c6add70b1bc..b40f664dcf1 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h"

1 0

Zebediah Figura : winegstreamer: Use wide-char string literals.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 1fb0b500b42fb2e56e5ddc5e65828fb97c464c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb0b500b42fb2e56e5ddc5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:45 2021 -0600 winegstreamer: Use wide-char string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 24 ++++++++---------------- dlls/winegstreamer/main.c | 18 +++++------------- dlls/winegstreamer/mfplat.c | 2 +- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 84e6bcd61e4..acfd3b3ae4c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -89,7 +89,6 @@ static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *i return CONTAINING_RECORD(iface, struct parser, filter); } -static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; @@ -1007,7 +1006,6 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_filter_init_gst(struct parser *filter) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = filter->wg_parser; unsigned int i, stream_count; WCHAR source_name[20]; @@ -1015,7 +1013,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1108,7 +1106,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &sink_ops, NULL); object->init_gst = decodebin_parser_filter_init_gst; object->source_query_accept = decodebin_parser_source_query_accept; @@ -1587,10 +1585,9 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = static BOOL wave_parser_filter_init_gst(struct parser *filter) { - static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; struct wg_parser *parser = filter->wg_parser; - if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), source_name)) + if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), L"output")) return FALSE; return TRUE; @@ -1625,7 +1622,6 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1641,7 +1637,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_filter_init_gst; object->source_query_accept = wave_parser_source_query_accept; object->source_get_media_type = wave_parser_source_get_media_type; @@ -1668,7 +1664,6 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_filter_init_gst(struct parser *filter) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = filter->wg_parser; uint32_t i, stream_count; WCHAR source_name[20]; @@ -1676,7 +1671,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1713,7 +1708,6 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1729,7 +1723,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &avi_splitter_sink_ops, NULL); object->init_gst = avi_splitter_filter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; object->source_get_media_type = avi_splitter_source_get_media_type; @@ -1761,10 +1755,9 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) { - static const WCHAR source_name[] = {'A','u','d','i','o',0}; struct wg_parser *parser = filter->wg_parser; - if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), source_name)) + if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), L"Audio")) return FALSE; return TRUE; @@ -1822,7 +1815,6 @@ static const struct strmbase_filter_ops mpeg_splitter_ops = HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'I','n','p','u','t',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1838,7 +1830,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"Input", &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; object->init_gst = mpeg_splitter_filter_init_gst; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 6f3be9095d6..ae26745773b 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,15 +31,6 @@ LONG object_locks; WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); -static const WCHAR wGstreamer_Splitter[] = -{'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; -static const WCHAR wave_parserW[] = -{'W','a','v','e',' ','P','a','r','s','e','r',0}; -static const WCHAR avi_splitterW[] = -{'A','V','I',' ','S','p','l','i','t','t','e','r',0}; -static const WCHAR mpeg_splitterW[] = -{'M','P','E','G','-','I',' ','S','t','r','e','a','m',' ','S','p','l','i','t','t','e','r',0}; - const struct unix_funcs *unix_funcs = NULL; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) @@ -336,11 +327,12 @@ HRESULT WINAPI DllRegisterServer(void) &IID_IFilterMapper2, (void **)&mapper))) return hr; - IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, avi_splitterW, NULL, NULL, NULL, &reg_avi_splitter); + IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, L"AVI Splitter", NULL, NULL, NULL, &reg_avi_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_decodebin_parser, - wGstreamer_Splitter, NULL, NULL, NULL, &reg_decodebin_parser); - IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, mpeg_splitterW, NULL, NULL, NULL, &reg_mpeg_splitter); - IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, wave_parserW, NULL, NULL, NULL, &reg_wave_parser); + L"GStreamer splitter filter", NULL, NULL, NULL, &reg_decodebin_parser); + IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, + L"MPEG-I Stream Splitter", NULL, NULL, NULL, &reg_mpeg_splitter); + IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, L"Wave Parser", NULL, NULL, NULL, &reg_wave_parser); IFilterMapper2_Release(mapper); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 439fc2ee5ed..22581eb7311 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -446,7 +446,7 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; +static WCHAR audio_converterW[] = L"Audio Converter"; static const GUID *audio_converter_supported_types[] = { &MFAudioFormat_PCM,

1 0

Zebediah Figura : winegstreamer: Use malloc() instead of HeapAlloc().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 672272e95ab03f1957aa8a631f9d01c1e2cd7a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=672272e95ab03f1957aa8a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:46 2021 -0600 winegstreamer: Use malloc() instead of HeapAlloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 5 ++- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/gstdemux.c | 26 +++++++-------- dlls/winegstreamer/media_source.c | 67 ++++++++++++++------------------------- dlls/winegstreamer/mfplat.c | 9 +++--- 5 files changed, 42 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=672272e95ab03f1957aa…

1 0