wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Hans Leidekker : wbemprox: Use separate critical sections for tables and table list.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: e7ff2688c8042fb6d7af163480b1d2ec849d0dee URL: https://gitlab.winehq.org/wine/wine/-/commit/e7ff2688c8042fb6d7af163480b1d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 5 12:44:43 2024 +0100 wbemprox: Use separate critical sections for tables and table list. --- dlls/wbemprox/builtin.c | 13 +++++--- dlls/wbemprox/table.c | 66 ++++++++++++++++++++++++++-------------- dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1095450e053..f6991ac2d8a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4374,9 +4374,9 @@ static struct table wmi_builtin_classes[] = static const struct { - const WCHAR *name; - struct table *classes; - unsigned int table_count; + const WCHAR *name; + struct table *tables; + unsigned int table_count; } builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { @@ -4395,7 +4395,12 @@ void init_table_list( void ) { list_init( &tables[ns] ); for (i = 0; i < builtin_namespaces[ns].table_count; i++) - list_add_tail( &tables[ns], &builtin_namespaces[ns].classes[i].entry ); + { + struct table *table = &builtin_namespaces[ns].tables[i]; + InitializeCriticalSectionEx( &table->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + table->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": table.cs" ); + list_add_tail( &tables[ns], &table->entry ); + } table_list[ns] = &tables[ns]; } } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 573cf035245..37aa546ad2b 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -29,14 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -static CRITICAL_SECTION table_cs; +static CRITICAL_SECTION table_list_cs; static CRITICAL_SECTION_DEBUG table_debug = { - 0, 0, &table_cs, + 0, 0, &table_list_cs, { &table_debug.ProcessLocksList, &table_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": table_cs") } + 0, 0, { (DWORD_PTR)(__FILE__ ": table_list_cs") } }; -static CRITICAL_SECTION table_cs = { &table_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION table_list_cs = { &table_debug, -1, 0, 0, 0, 0 }; HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column ) { @@ -337,31 +338,49 @@ void free_columns( struct column *columns, UINT num_cols ) void free_table( struct table *table ) { if (!table) return; + assert( table->flags & TABLE_FLAG_DYNAMIC ); + + TRACE("destroying %p\n", table); - EnterCriticalSection( &table_cs ); clear_table( table ); - if (table->flags & TABLE_FLAG_DYNAMIC) - { - TRACE("destroying %p\n", table); - free( (WCHAR *)table->name ); - free_columns( (struct column *)table->columns, table->num_cols ); - free( table->data ); - list_remove( &table->entry ); - free( table ); - } - LeaveCriticalSection( &table_cs ); + free( (WCHAR *)table->name ); + free_columns( (struct column *)table->columns, table->num_cols ); + free( table->data ); + + table->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &table->cs ); + free( table ); } void release_table( struct table *table ) { - if (!InterlockedDecrement( &table->refs )) free_table( table ); - LeaveCriticalSection( &table_cs ); + if (!--table->refs) + { + clear_table( table ); + if (table->flags & TABLE_FLAG_DYNAMIC) + { + EnterCriticalSection( &table_list_cs ); + list_remove( &table->entry ); + table->removed = TRUE; + LeaveCriticalSection( &table_list_cs ); + + LeaveCriticalSection( &table->cs ); + free_table( table ); + return; + } + } + LeaveCriticalSection( &table->cs ); } struct table *grab_table( struct table *table ) { - EnterCriticalSection( &table_cs ); - InterlockedIncrement( &table->refs ); + EnterCriticalSection( &table->cs ); + if (table->removed) + { + LeaveCriticalSection( &table->cs ); + return NULL; + } + table->refs++; return table; } @@ -398,7 +417,10 @@ struct table *create_table( const WCHAR *name, UINT num_cols, const struct colum table->fill = fill; table->flags = TABLE_FLAG_DYNAMIC; table->refs = 0; + table->removed = FALSE; list_init( &table->entry ); + InitializeCriticalSectionEx( &table->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + table->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": table.cs"); return table; } @@ -408,18 +430,18 @@ BOOL add_table( enum wbm_namespace ns, struct table *table ) if (ns == WBEMPROX_NAMESPACE_LAST) return FALSE; - EnterCriticalSection( &table_cs ); + EnterCriticalSection( &table_list_cs ); LIST_FOR_EACH_ENTRY( iter, table_list[ns], struct table, entry ) { if (!wcsicmp( iter->name, table->name )) { TRACE("table %s already exists\n", debugstr_w(table->name)); - LeaveCriticalSection( &table_cs ); + LeaveCriticalSection( &table_list_cs ); return FALSE; } } list_add_tail( table_list[ns], &table->entry ); - LeaveCriticalSection( &table_cs ); + LeaveCriticalSection( &table_list_cs ); TRACE("added %p\n", table); return TRUE; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 655e3db27c2..5e585049aa6 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -121,6 +121,8 @@ struct table UINT flags; struct list entry; LONG refs; + CRITICAL_SECTION cs; + BOOL removed; }; struct property

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement ternary operator for older vertex profiles.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: vkd3d Branch: master Commit: 937d76507d9f54f07000f9e6ceecd2dd1ffca621 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/937d76507d9f54f07000f9e6ceecd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 15:40:26 2024 +0100 vkd3d-shader/hlsl: Implement ternary operator for older vertex profiles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56333 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 4 ++++ libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 42 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 27f5c810..a697a2a8 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2329,6 +2329,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } break; + case HLSL_OP2_SLT: + write_sm1_binary_op(ctx, buffer, D3DSIO_SLT, &instr->reg, &arg1->reg, &arg2->reg); + break; + case HLSL_OP3_CMP: write_sm1_ternary_op(ctx, buffer, D3DSIO_CMP, &instr->reg, &arg1->reg, &arg2->reg, &arg3->reg); break; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 538f083d..e68ffe3f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2611,6 +2611,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_MUL] = "*", [HLSL_OP2_NEQUAL] = "!=", [HLSL_OP2_RSHIFT] = ">>", + [HLSL_OP2_SLT] = "slt", [HLSL_OP3_CMP] = "cmp", [HLSL_OP3_DP2ADD] = "dp2add", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 74990fb1..aad9b3c7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -593,6 +593,7 @@ enum hlsl_ir_expr_op HLSL_OP2_MUL, HLSL_OP2_NEQUAL, HLSL_OP2_RSHIFT, + HLSL_OP2_SLT, /* DP2ADD(a, b, c) computes the scalar product of a.xy and b.xy, * then adds c. */ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 307f86f5..e7fc02d0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2903,7 +2903,7 @@ static bool lower_floor(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct return true; } -/* Use 'movc' for the ternary operator. */ +/* Use movc/cmp/slt for the ternary operator. */ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = { 0 }, *replacement; @@ -2949,8 +2949,44 @@ static bool lower_ternary(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, stru } else if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX) { - hlsl_fixme(ctx, &instr->loc, "Ternary operator is not implemented for %s profile.", ctx->profile->name); - return false; + struct hlsl_ir_node *neg, *slt, *sum, *mul, *cond2; + + /* Expression used here is "slt(<cond>) * (first - second) + second". */ + + if (ctx->profile->major_version == 3) + { + if (!(cond2 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, cond, &instr->loc))) + return false; + } + else + { + if (!(cond2 = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, cond, cond))) + return false; + } + hlsl_block_add_instr(block, cond2); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, cond2, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); + + if (!(slt = hlsl_new_binary_expr(ctx, HLSL_OP2_SLT, neg, cond2))) + return false; + hlsl_block_add_instr(block, slt); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, second, &instr->loc))) + return false; + hlsl_block_add_instr(block, neg); + + if (!(sum = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, first, neg))) + return false; + hlsl_block_add_instr(block, sum); + + if (!(mul = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, slt, sum))) + return false; + hlsl_block_add_instr(block, mul); + + if (!(replacement = hlsl_new_binary_expr(ctx, HLSL_OP2_ADD, mul, second))) + return false; } else {

1 0

Ziqing Hui : winegstreamer: Set AvgTimePerFrame in GetOutputType() for WMV decoder.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: ff0cd457b48b2fc5482bb0df9f9307cf3a3450fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ff0cd457b48b2fc5482bb0df9f9307… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Mar 5 18:29:57 2024 +0800 winegstreamer: Set AvgTimePerFrame in GetOutputType() for WMV decoder. Krkr2 game engine need AvgTimePerFrame to calculate video frame time. --- dlls/mf/tests/transform.c | 1 - dlls/winegstreamer/wmv_decoder.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c81a649a38c..28ac7291e0b 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1349,7 +1349,6 @@ static void check_video_info_header_(int line, VIDEOINFOHEADER *info, const VIDE expected->rcTarget.left, expected->rcTarget.top, expected->rcTarget.right, expected->rcTarget.bottom); check_member_(__FILE__, line, *info, *expected, "%lu", dwBitRate); check_member_(__FILE__, line, *info, *expected, "%lu", dwBitErrorRate); - todo_wine_if(expected->AvgTimePerFrame) check_member_(__FILE__, line, *info, *expected, "%I64d", AvgTimePerFrame); check_member_(__FILE__, line, *info, *expected, "%lu", bmiHeader.biSize); check_member_(__FILE__, line, *info, *expected, "%ld", bmiHeader.biWidth); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index d13b5a065ed..ee77309aae4 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -470,6 +470,8 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde info->rcSource.bottom = height; info->rcTarget.right = width; info->rcTarget.bottom = height; + info->AvgTimePerFrame = MulDiv(10000000, decoder->input_format.u.video_wmv.fps_d, + decoder->input_format.u.video_wmv.fps_n); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = height;

1 0

Ziqing Hui : mf/tests: Test AvgTimePerFrame for WMV decoder DMO.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 732ed628192ea9560de8af965d9f398745079dfb URL: https://gitlab.winehq.org/wine/wine/-/commit/732ed628192ea9560de8af965d9f39… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Mar 6 08:50:27 2024 +0800 mf/tests: Test AvgTimePerFrame for WMV decoder DMO. --- dlls/mf/tests/transform.c | 51 ++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-)

1 0

Zebediah Figura : shell32: Implement IDataObject::SetData().
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: f8ddba3ad03ba17afe8092889d4978659a9bae66 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8ddba3ad03ba17afe8092889d4978… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 23:55:05 2024 -0600 shell32: Implement IDataObject::SetData(). --- dlls/shell32/dataobject.c | 46 ++++++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shlfolder.c | 29 ++++++++++++-------------- 2 files changed, 55 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index dd4d77f6942..d0ed644c437 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -344,11 +344,49 @@ static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(IDataObject *iface, LP return E_NOTIMPL; } -static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) +static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, + FORMATETC *format, STGMEDIUM *medium, BOOL release) { - IDataObjectImpl *This = impl_from_IDataObject(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + IDataObjectImpl *obj = impl_from_IDataObject(iface); + struct data *new_array; + + TRACE("iface %p, format %p, medium %p, release %d.\n", iface, format, medium, release); + + if (!release) + return E_INVALIDARG; + + if (format->tymed != TYMED_HGLOBAL) + { + FIXME("Unhandled format tymed %#lx.\n", format->tymed); + return E_NOTIMPL; + } + + if (medium->tymed != TYMED_HGLOBAL) + { + FIXME("Unhandled medium tymed %#lx.\n", format->tymed); + return E_NOTIMPL; + } + + if (medium->pUnkForRelease) + FIXME("Ignoring IUnknown %p.\n", medium->pUnkForRelease); + + for (size_t i = 0; i < obj->data_count; ++i) + { + if (obj->data[i].cf == format->cfFormat) + { + GlobalFree(obj->data[i].global); + obj->data[i].global = medium->hGlobal; + return S_OK; + } + } + + if (!(new_array = realloc(obj->data, (obj->data_count + 1) * sizeof(*obj->data)))) + return E_OUTOFMEMORY; + obj->data = new_array; + obj->data[obj->data_count].cf = format->cfFormat; + obj->data[obj->data_count].global = medium->hGlobal; + ++obj->data_count; + return S_OK; } static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD direction, IEnumFORMATETC **out) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3f364b49769..b2448938728 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5318,15 +5318,15 @@ static void test_enum_format(IDataObject *data_obj) hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 4); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - hr = IEnumFORMATETC_Skip(enum1, 1); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + hr = IEnumFORMATETC_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 3); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Skip(enum1, 1); - ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Next(enum1, 1, formats, NULL); todo_wine ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Next(enum2, 1, formats, NULL); @@ -5342,7 +5342,7 @@ static void test_enum_format(IDataObject *data_obj) formats[0].lindex = -1; formats[0].tymed = TYMED_HGLOBAL; hr = IDataObject_SetData(data_obj, &formats[0], &medium, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IEnumFORMATETC_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -5457,23 +5457,20 @@ static void test_DataObject(void) medium.hGlobal = global; fmt.tymed = TYMED_HGLOBAL; hr = IDataObject_SetData(data_obj, &fmt, &medium, FALSE); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IDataObject_SetData(data_obj, &fmt, &medium, TRUE); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDataObject_QueryGetData(data_obj, &fmt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&medium, 0xcc, sizeof(medium)); hr = IDataObject_GetData(data_obj, &fmt, &medium); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - { - ok(medium.hGlobal && medium.hGlobal != global, "Got global %p.\n", medium.hGlobal); - value = GlobalLock(medium.hGlobal); - ok(*value == 0xabacab, "Got value %#x.\n", *value); - GlobalUnlock(medium.hGlobal); - ReleaseStgMedium(&medium); - } + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(medium.hGlobal && medium.hGlobal != global, "Got global %p.\n", medium.hGlobal); + value = GlobalLock(medium.hGlobal); + ok(*value == 0xabacab, "Got value %#x.\n", *value); + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); for (unsigned int i = 0; i < ARRAY_SIZE(enum_directions); ++i) {

1 0

Zebediah Figura : shell32: Reimplement the data object to store a generic array of HGLOBALs.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 4f02c8ba2dfdc1438fe6e651373c7aa805fb1137 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f02c8ba2dfdc1438fe6e651373c7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 23:53:38 2024 -0600 shell32: Reimplement the data object to store a generic array of HGLOBALs. --- dlls/shell32/clipboard.c | 8 +- dlls/shell32/dataobject.c | 212 ++++++++++++++++++++--------------------- dlls/shell32/shell32_main.h | 8 +- dlls/shell32/tests/shlfolder.c | 8 +- 4 files changed, 113 insertions(+), 123 deletions(-)

1 0

Zebediah Figura : shell32: Do not interpret the direction in IDataObject::EnumFormatEtc().
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 0344f3aa855073f204e32992ca874f93cb0cd359 URL: https://gitlab.winehq.org/wine/wine/-/commit/0344f3aa855073f204e32992ca874f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 4 23:44:45 2024 -0600 shell32: Do not interpret the direction in IDataObject::EnumFormatEtc(). --- dlls/shell32/dataobject.c | 18 ++++++------------ dlls/shell32/tests/shlfolder.c | 5 +---- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 96b9a0ad5dd..2b4ee6bb55b 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -368,21 +368,15 @@ static HRESULT WINAPI IDataObject_fnSetData(IDataObject *iface, LPFORMATETC pfor return E_NOTIMPL; } -static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) +static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject *iface, DWORD direction, IEnumFORMATETC **out) { - IDataObjectImpl *This = impl_from_IDataObject(iface); - - TRACE("(%p)->()\n", This); - *ppenumFormatEtc=NULL; + IDataObjectImpl *obj = impl_from_IDataObject(iface); - /* only get data */ - if (DATADIR_GET == dwDirection) - { - *ppenumFormatEtc = IEnumFORMATETC_Constructor(MAX_FORMATS, This->pFormatEtc); - return (*ppenumFormatEtc) ? S_OK : E_FAIL; - } + TRACE("iface %p, direction %#lx, out %p.\n", iface, direction, out); - return E_NOTIMPL; + if (!(*out = IEnumFORMATETC_Constructor(MAX_FORMATS, obj->pFormatEtc))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI IDataObject_fnDAdvise(IDataObject *iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index eb77e2113f3..7e85ced8ded 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5478,10 +5478,7 @@ static void test_DataObject(void) for (unsigned int i = 0; i < ARRAY_SIZE(enum_directions); ++i) { hr = IDataObject_EnumFormatEtc(data_obj, enum_directions[i], &enum_format); - todo_wine_if (enum_directions[i] == DATADIR_SET) - ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) - continue; + ok(hr == S_OK, "Got hr %#lx.\n", hr); memset(&fmt, 0xcc, sizeof(fmt)); hr = IEnumFORMATETC_Next(enum_format, 1, &fmt, NULL);

1 0

Zebediah Figura : shell32/tests: Add more tests for IDataObject.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: b6128bbb516eaef6019d7fe8afa68e10a3e2f860 URL: https://gitlab.winehq.org/wine/wine/-/commit/b6128bbb516eaef6019d7fe8afa68e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Mar 3 17:16:54 2024 -0600 shell32/tests: Add more tests for IDataObject. --- dlls/shell32/tests/shlfolder.c | 236 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 223 insertions(+), 13 deletions(-)

1 0

Rémi Bernon : win32u: Introduce and use new reg_(open|create)_ascii_key helpers.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: e614610aafc9557dda2f34415cd306e3bbb1f3c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e614610aafc9557dda2f34415cd306… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 27 00:05:38 2024 +0100 win32u: Introduce and use new reg_(open|create)_ascii_key helpers. --- dlls/win32u/font.c | 17 ++- dlls/win32u/sysparams.c | 292 ++++++++++--------------------------------- dlls/win32u/win32u_private.h | 3 + 3 files changed, 86 insertions(+), 226 deletions(-)

1 0

Rémi Bernon : win32u: Use set_reg_ascii_value whenever possible.
by Alexandre Julliard 06 Mar '24

06 Mar '24

Module: wine Branch: master Commit: 6b8b35f9507f61e435d0b4582e31584c9244fa70 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b8b35f9507f61e435d0b4582e3158… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 26 23:40:52 2024 +0100 win32u: Use set_reg_ascii_value whenever possible. --- dlls/win32u/sysparams.c | 87 +++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 54 deletions(-)

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
78
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 March 2024