January 2022 - Wine-Commits

Nikolay Sivov : d3d10/effect: Fix iteration in GetBackingStore() for depth stencil states.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 5639edd26ebf90e93ad0f0688641fcac01f88d1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5639edd26ebf90e93ad0f068… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:23 2022 +0300 d3d10/effect: Fix iteration in GetBackingStore() for depth stencil states. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++------ dlls/d3d10/tests/effect.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a6a1189be20..3198ad5a575 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8796,21 +8796,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - - if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a depth stencil state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->ds_states))) + return E_FAIL; + *desc = v->u.state.desc.depth_stencil; return S_OK; } - static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_stencil_variable_vtbl = { /* ID3D10EffectVariable methods */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 418747b5df5..93ad4d8a475 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4548,6 +4548,8 @@ static void test_effect_state_groups(void) ds_desc.BackFace.StencilPassOp); ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); + d->lpVtbl->GetBackingStore(d, 1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v);

1 0

Nikolay Sivov : d3d10/effect: Fix iteration in GetBackingStore() for rasterizer states.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 3ec149232cb3d34ff63147e1742cbd7bddec9922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ec149232cb3d34ff63147e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 10:26:24 2022 +0300 d3d10/effect: Fix iteration in GetBackingStore() for rasterizer states. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 11 +++++------ dlls/d3d10/tests/effect.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3198ad5a575..daca3379fde 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -9037,21 +9037,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStor TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - - if (v->type->basetype != D3D10_SVT_RASTERIZER) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a rasterizer state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->rs_states))) + return E_FAIL; + *desc = v->u.state.desc.rasterizer; return S_OK; } - static const struct ID3D10EffectRasterizerVariableVtbl d3d10_effect_rasterizer_variable_vtbl = { /* ID3D10EffectVariable methods */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 93ad4d8a475..84a2abcb4d9 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4567,6 +4567,8 @@ static void test_effect_state_groups(void) ok(rast_desc.MultisampleEnable, "Got unexpected MultisampleEnable %#x.\n", rast_desc.MultisampleEnable); ok(rast_desc.AntialiasedLineEnable, "Got unexpected AntialiasedLineEnable %#x.\n", rast_desc.AntialiasedLineEnable); + r->lpVtbl->GetBackingStore(r, 1, &rast_desc); + ok(rast_desc.CullMode == D3D10_CULL_BACK, "Got unexpected CullMode %#x.\n", rast_desc.CullMode); technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n");

1 0

Rémi Bernon : mf/tests: Add some WMA decoder SetOutputType tests.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: b075af742ac0221d1bc4dab0a4e13ea72ed9bed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b075af742ac0221d1bc4dab0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 24 10:55:36 2022 +0100 mf/tests: Add some WMA decoder SetOutputType tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index cf6bd0fc61c..10f5afc39ed 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5624,6 +5624,17 @@ static void test_wma_decoder(void) ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), {0}, }; + static const struct attribute_desc output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 176400), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + {0}, + }; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; @@ -5644,6 +5655,17 @@ static void test_wma_decoder(void) todo_wine check_interface(transform, &IID_IMediaObject, TRUE); + /* setting output media type first doesn't work */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + init_media_type(media_type, output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "SetOutputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + /* check required input media type attributes */ hr = MFCreateMediaType(&media_type); @@ -5669,6 +5691,31 @@ static void test_wma_decoder(void) ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %u\n", ret); + /* check required output media type attributes */ + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, 1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "SetOutputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, 2); + for (i = 2; i < ARRAY_SIZE(output_type_desc) - 1; ++i) + { + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == MF_E_INVALIDMEDIATYPE, "SetOutputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, i + 1); + } + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + todo_wine + ok(hr == S_OK, "SetOutputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Alexandre Julliard : server: Define a server-side structure for ACL.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: c36f81fa750591fc395a66d5323ff032e85b762b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36f81fa750591fc395a66d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:10:40 2022 +0100 server: Define a server-side structure for ACL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 15 ++++- server/file.c | 24 ++++---- server/handle.c | 6 +- server/object.c | 10 ++-- server/process.c | 16 +++--- server/protocol.def | 17 ++++-- server/registry.c | 16 +++--- server/security.h | 14 ++--- server/token.c | 125 +++++++++++++++++++++-------------------- server/trace.c | 21 +++---- 10 files changed, 144 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c36f81fa750591fc395a…

1 0

Alexandre Julliard : server: Don't depend on the TOKEN_GROUPS structure on the server side.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 868af0c500225c09dea150edabcc3c923c650131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=868af0c500225c09dea150ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:35:48 2022 +0100 server: Don't depend on the TOKEN_GROUPS structure on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 33 ++++++++++------------ include/wine/server_protocol.h | 14 +++------- server/protocol.def | 13 +++------ server/request.h | 3 +- server/token.c | 38 ++++++------------------- server/trace.c | 63 +++++++++++++++++------------------------- 6 files changed, 58 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=868af0c500225c09dea1…

1 0

Rémi Bernon : mf/tests: Add some WMA encoder ProcessInput tests.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 32cfcd66a9edb36200fe354a59f3b2bc1a364068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cfcd66a9edb36200fe354a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 24 10:55:34 2022 +0100 mf/tests: Add some WMA encoder ProcessInput tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index 614eb4fbc9e..0b89107e1b4 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf mfplat mfuuid ole32 user32 +IMPORTS = mf mfplat mfuuid ole32 user32 propsys C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9768491650a..d1d68830176 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -110,6 +110,7 @@ typedef struct attribute_desc media_type_desc[32]; #define ATTR_GUID(k, g) {.key = &k, .name = #k, {.vt = VT_CLSID, .puuid = (GUID *)&g}} #define ATTR_UINT32(k, v) {.key = &k, .name = #k, {.vt = VT_UI4, .ulVal = v}} +#define ATTR_BLOB(k, p, n) {.key = &k, .name = #k, {.vt = VT_VECTOR | VT_UI1, .caub = {.pElems = (void *)p, .cElems = n}}} static HWND create_window(void) { @@ -5420,6 +5421,43 @@ static BOOL create_transform(GUID category, MFT_REGISTER_TYPE_INFO *input_type, return TRUE; } +static IMFSample *create_sample(const BYTE *data, ULONG size) +{ + IMFMediaBuffer *media_buffer; + IMFSample *sample; + DWORD length; + BYTE *buffer; + HRESULT hr; + ULONG ret; + + hr = MFCreateSample(&sample); + ok(hr == S_OK, "MFCreateSample returned %#x\n", hr); + hr = MFCreateMemoryBuffer(size, &media_buffer); + ok(hr == S_OK, "MFCreateMemoryBuffer returned %#x\n", hr); + if (data) + { + hr = IMFMediaBuffer_SetCurrentLength(media_buffer, size); + ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr); + hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); + ok(hr == S_OK, "Lock returned %#x\n", hr); + ok(length == size, "got size %u\n", length); + if (!data) memset(buffer, 0xcd, length); + else memcpy(buffer, data, length); + hr = IMFMediaBuffer_Unlock(media_buffer); + ok(hr == S_OK, "Unlock returned %#x\n", hr); + } + hr = IMFSample_AddBuffer(sample, media_buffer); + ok(hr == S_OK, "AddBuffer returned %#x\n", hr); + ret = IMFMediaBuffer_Release(media_buffer); + ok(ret == 1, "Release returned %u\n", ret); + + return sample; +} + +static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0}; +static const BYTE wma_decoded_data[0x4000] = {0}; +static const ULONG wma_block_size = 1487; + static void test_wma_encoder(void) { static const media_type_desc transform_inputs[] = @@ -5449,12 +5487,39 @@ static void test_wma_encoder(void) }, }; + static const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 176400), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + {0}, + }; + const struct attribute_desc output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV8), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 4003), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, wma_block_size), + ATTR_BLOB(MF_MT_USER_DATA, wma_codec_data, sizeof(wma_codec_data)), + {0}, + }; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float}; + MFT_OUTPUT_STREAM_INFO output_info; + MFT_INPUT_STREAM_INFO input_info; + IMFMediaType *media_type; IMFTransform *transform; + IMFSample *sample; GUID class_id; + ULONG i, ret; HRESULT hr; - ULONG ret; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -5466,6 +5531,49 @@ static void test_wma_encoder(void) check_interface(transform, &IID_IMediaObject, TRUE); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + init_media_type(media_type, input_type_desc, -1); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetInputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetOutputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + ok(input_info.hnsMaxLatency == 19969161, "got hnsMaxLatency %s\n", + wine_dbgstr_longlong(input_info.hnsMaxLatency)); + ok(input_info.dwFlags == 0, "got dwFlags %#x\n", input_info.dwFlags); + ok(input_info.cbSize == 8, "got cbSize %u\n", input_info.cbSize); + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 1, "got cbAlignment %#x\n", input_info.cbAlignment); + + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + ok(output_info.dwFlags == 0, "got dwFlags %#x\n", output_info.dwFlags); + ok(output_info.cbSize == wma_block_size, "got cbSize %#x\n", output_info.cbSize); + ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); + + i = 0; + sample = create_sample(wma_decoded_data, sizeof(wma_decoded_data)); + while (SUCCEEDED(hr = IMFTransform_ProcessInput(transform, 0, sample, 0))) + { + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + i += sizeof(wma_decoded_data); + } + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + ok(i == 0x204000, "ProcessInput consumed %#x bytes\n", i); + + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "ProcessMessage returned %#x\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Alistair Leslie-Hughes : msdasql: Implement ICommandPrepare Prepare.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 7491a7f13f776bf9f1a4d384183259e9c9d5081a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7491a7f13f776bf9f1a4d384… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 25 15:48:27 2022 +1100 msdasql: Implement ICommandPrepare Prepare. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 4 ++-- dlls/msdasql/msdasql_private.h | 3 ++- dlls/msdasql/session.c | 31 ++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0d0a60ab7a2..d6c833c4c14 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -43,7 +43,7 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); -static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) { SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; SQLINTEGER native; @@ -611,7 +611,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, provider->hdbc, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index 7d7f67c2c78..42bb8697030 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) DECLSPEC_HIDDEN; +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..f0e915ca710 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -30,6 +30,7 @@ #include "msdasql.h" #include "oledberr.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -45,6 +46,8 @@ struct msdasql_session LONG refs; IUnknown *datasource; + + HDBC hdbc; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -305,6 +308,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + HDBC hdbc; + SQLHSTMT hstmt; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -424,6 +429,10 @@ static ULONG WINAPI command_Release(ICommandText *iface) TRACE( "destroying %p\n", command ); if (command->session) IUnknown_Release(command->session); + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + heap_free( command->query ); heap_free( command ); } @@ -1051,7 +1060,24 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); + RETCODE ret; + TRACE("%p, %u\n", command, runs); + + if (!command->query) + return DB_E_NOCOMMAND; + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + + SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &command->hstmt); + + ret = SQLPrepareW(command->hstmt, command->query, SQL_NTS); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_STMT, command->hstmt); + return E_FAIL; + } return S_OK; } @@ -1147,6 +1173,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; + command->hdbc = session->hdbc; + command->hstmt = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); @@ -1163,7 +1191,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1179,6 +1207,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; + session->hdbc = hdbc; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); IUnknown_Release(&session->session_iface); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ce3573fbfd7..eefddbf6dcb 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -354,6 +354,7 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { ICommandText *command_text; + ICommandPrepare *commandprepare; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; @@ -362,9 +363,22 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandPrepare_Release(commandprepare); + affected = 9999; hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : msdasql: Fix logic when dumping diagnostics records.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 1636530c816ebc77234e32ad0f9f24b47efc7484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1636530c816ebc77234e32ad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 25 15:48:26 2022 +1100 msdasql: Fix logic when dumping diagnostics records. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index cf69195baf7..0d0a60ab7a2 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -52,7 +52,7 @@ static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) if (!TRACE_ON(msdasql)) return; - while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) == SQL_SUCCESS) { WARN("%d: %s: %s\n", i, state, msg); i++;

1 0

Florian Will : gdiplus: Disable PNG encoding filters.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 6090276b3eadcf22470b68a77a69736e36da0622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6090276b3eadcf22470b68a7… Author: Florian Will <florian.will(a)gmail.com> Date: Mon Jan 24 10:49:39 2022 +0100 gdiplus: Disable PNG encoding filters. This speeds up the encoding process, sometimes at the cost of increased PNG file sizes. PNGs created using gdiplus on Windows 10 have filters disabled, too, according to pngcheck. The application "ZusiDisplay" encodes finished frames in PNG format and sends them through a named pipe for "Zusi 3" to use as an in-game texture, so performance matters for that use case to improve "embedded display" FPS. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 2 +- dlls/gdiplus/image.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index ac12bd1c613..c87ec5ba827 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,6 +1,6 @@ MODULE = gdiplus.dll IMPORTLIB = gdiplus -IMPORTS = uuid shlwapi ole32 user32 gdi32 +IMPORTS = uuid shlwapi ole32 oleaut32 user32 gdi32 DELAYIMPORTS = windowscodecs C_SRCS = \ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 518a9bf8689..56eb62392ec 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4544,6 +4544,7 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) GpBitmap *bitmap; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; + GUID container_format; HRESULT hr; UINT width, height; PixelFormat gdipformat=0; @@ -4570,7 +4571,20 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) if (SUCCEEDED(hr)) /* created frame */ { - hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, &container_format); + if (SUCCEEDED(hr) && IsEqualGUID(&container_format, &GUID_ContainerFormatPng)) + { + /* disable PNG filters for faster encoding */ + PROPBAG2 filter_option = { .pstrName = (LPOLESTR) L"FilterOption" }; + VARIANT filter_value; + VariantInit(&filter_value); + V_VT(&filter_value) = VT_UI1; + V_UI1(&filter_value) = WICPngFilterNone; + hr = IPropertyBag2_Write(encoderoptions, 1, &filter_option, &filter_value); + } + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions); if (SUCCEEDED(hr)) hr = IWICBitmapFrameEncode_SetSize(frameencode, width, height);

1 0

Louis Lenders : ole32: Add stub for OleConvertIStorageToOLESTREAMEx.
by Alexandre Julliard Jan. 25, 2022

Jan. 25, 2022

Module: wine Branch: master Commit: 18e331fd63173b3f3fe00e930e3e09aad94493a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e331fd63173b3f3fe00e93… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Jan 21 10:06:59 2022 +0100 ole32: Add stub for OleConvertIStorageToOLESTREAMEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52298 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 2 +- dlls/ole32/storage32.c | 11 +++++++++++ include/ole2.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d9ffd63585c..e9982036eeb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -187,7 +187,7 @@ @ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) -@ stub OleConvertIStorageToOLESTREAMEx +@ stdcall OleConvertIStorageToOLESTREAMEx(ptr long long long long ptr ptr) @ stdcall OleConvertOLESTREAMToIStorage(ptr ptr ptr) @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1bc8455cc6b..06766a28fe7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10570,6 +10570,17 @@ enum stream_1ole_flags { OleStream_Convert = 0x00000004 }; +/************************************************************************* + * OleConvertIStorageToOLESTREAMEx [OLE32.@] + */ +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ) +{ + FIXME("%p %x %d %d %d %p %p stub\n", stg, cf, width, height, size, medium, olestream); + + return E_NOTIMPL; +} + /*********************************************************************** * GetConvertStg (OLE32.@) */ diff --git a/include/ole2.h b/include/ole2.h index 05c1b5502c7..628bebae137 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -161,6 +161,8 @@ typedef struct _OLESTREAM { HRESULT WINAPI OleConvertOLESTREAMToIStorage( LPOLESTREAM lpolestream, LPSTORAGE pstg, const DVTARGETDEVICE* ptd); HRESULT WINAPI OleConvertIStorageToOLESTREAM( LPSTORAGE pstg, LPOLESTREAM lpolestream); +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ); HRESULT WINAPI OleDoAutoConvert( LPSTORAGE pStg, LPCLSID pClsidNew ); HRESULT WINAPI OleGetAutoConvert( REFCLSID clsidOld, LPCLSID pClsidNew );

1 0