March 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : winex11: Support XInput2 events on individual windows.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 0f1322d2df4c5238c601a2865b6e65ad14bfa26a URL: https://gitlab.winehq.org/wine/wine/-/commit/0f1322d2df4c5238c601a2865b6e65… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 12 10:01:33 2024 +0100 winex11: Support XInput2 events on individual windows. --- dlls/winex11.drv/desktop.c | 2 ++ dlls/winex11.drv/mouse.c | 56 +++++++++++++++++++++++++++++----------------- dlls/winex11.drv/window.c | 9 +++++++- dlls/winex11.drv/x11drv.h | 2 ++ 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d6fa078e8a9..cb119c9a7be 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -86,6 +86,8 @@ BOOL X11DRV_CreateDesktop( const WCHAR *name, UINT width, UINT height ) 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; + + x11drv_xinput2_enable( display, win ); XFlush( display ); X11DRV_init_desktop( win, width, height ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 03c2152b76b..19a82d23ab0 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -253,11 +253,10 @@ static void update_relative_valuators( XIAnyClassInfo **classes, int num_classes /*********************************************************************** - * enable_xinput2 + * x11drv_xinput2_enable */ -static void enable_xinput2(void) +void x11drv_xinput2_enable( Display *display, Window window ) { - struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; @@ -267,21 +266,23 @@ static void enable_xinput2(void) mask.mask_len = sizeof(mask_bits); mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); - XISetMask( mask_bits, XI_DeviceChanged ); - XISetMask( mask_bits, XI_RawMotion ); - XISetMask( mask_bits, XI_ButtonPress ); - pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + + if (window == DefaultRootWindow( display )) + { + XISetMask( mask_bits, XI_DeviceChanged ); + XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_ButtonPress ); + } + + pXISelectEvents( display, window, &mask, 1 ); } -#endif /*********************************************************************** - * disable_xinput2 + * x11drv_xinput2_disable */ -static void disable_xinput2(void) +void x11drv_xinput2_disable( Display *display, Window window ) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H - struct x11drv_thread_data *data = x11drv_thread_data(); unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; XIEventMask mask; @@ -291,9 +292,11 @@ static void disable_xinput2(void) mask.mask_len = sizeof(mask_bits); mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); - XISetMask( mask_bits, XI_DeviceChanged ); - pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); -#endif + + if (window == DefaultRootWindow( display )) + XISetMask( mask_bits, XI_DeviceChanged ); + + pXISelectEvents( display, window, &mask, 1 ); } @@ -302,7 +305,6 @@ static void disable_xinput2(void) */ void x11drv_xinput2_init( struct x11drv_thread_data *data ) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; int major = 2, minor = 2; XIEventMask mask; @@ -332,9 +334,23 @@ void x11drv_xinput2_init( struct x11drv_thread_data *data ) } TRACE( "XInput2 %d.%d available\n", major, minor ); -#endif } +#else /* HAVE_X11_EXTENSIONS_XINPUT2_H */ + +void x11drv_xinput2_enable( Display *display, Window window ) +{ +} + +void x11drv_xinput2_disable( Display *display, Window window ) +{ +} + +void x11drv_xinput2_init( struct x11drv_thread_data *data ) +{ +} + +#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ /*********************************************************************** * grab_clipping_window @@ -370,7 +386,7 @@ static BOOL grab_clipping_window( const RECT *clip ) } /* enable XInput2 unless we are already clipping */ - if (!data->clipping_cursor) enable_xinput2(); + if (!data->clipping_cursor) x11drv_xinput2_enable( data->display, DefaultRootWindow( data->display ) ); TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); @@ -403,7 +419,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clipping_cursor) { - disable_xinput2(); + x11drv_xinput2_disable( data->display, DefaultRootWindow( data->display ) ); return FALSE; } clip_rect = *clip; @@ -432,7 +448,7 @@ void ungrab_clipping_window(void) if (clipping_cursor) XUngrabPointer( data->display, CurrentTime ); clipping_cursor = FALSE; data->clipping_cursor = FALSE; - disable_xinput2(); + x11drv_xinput2_disable( data->display, DefaultRootWindow( data->display ) ); } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 84878e95e37..afa13f01277 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -362,6 +362,7 @@ static void sync_window_style( struct x11drv_win_data *data ) int mask = get_window_attributes( data, &attr ); XChangeWindowAttributes( data->display, data->whole_window, mask, &attr ); + x11drv_xinput2_enable( data->display, data->whole_window ); } } @@ -1700,6 +1701,7 @@ static void create_whole_window( struct x11drv_win_data *data ) data->vis.visual, mask, &attr ); if (!data->whole_window) goto done; + x11drv_xinput2_enable( data->display, data->whole_window ); set_initial_wm_hints( data->display, data->whole_window ); set_wm_hints( data ); @@ -1742,7 +1744,12 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des Window xwin = (Window)NtUserGetProp( data->hwnd, foreign_window_prop ); if (xwin) { - if (!already_destroyed) XSelectInput( data->display, xwin, 0 ); + if (!already_destroyed) + { + x11drv_xinput2_disable( data->display, xwin ); + XSelectInput( data->display, xwin, 0 ); + } + XDeleteContext( data->display, xwin, winContext ); NtUserRemoveProp( data->hwnd, foreign_window_prop ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9c1b8012466..2f46522f59f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -573,6 +573,8 @@ extern BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *event ); extern int xinput2_opcode; extern void x11drv_xinput2_load(void); extern void x11drv_xinput2_init( struct x11drv_thread_data *data ); +extern void x11drv_xinput2_enable( Display *display, Window window ); +extern void x11drv_xinput2_disable( Display *display, Window window ); extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Implement ternary operator for older vertex profiles.
by Alexandre Julliard March 6, 2024

March 6, 2024

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 March 6, 2024

March 6, 2024

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 March 6, 2024

March 6, 2024

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: Do not interpret the direction in IDataObject::EnumFormatEtc().
by Alexandre Julliard March 6, 2024

March 6, 2024

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: Implement IDataObject::SetData().
by Alexandre Julliard March 6, 2024

March 6, 2024

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/tests: Add more tests for IDataObject.
by Alexandre Julliard March 6, 2024

March 6, 2024

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 March 6, 2024

March 6, 2024

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

Zebediah Figura : shell32: Reimplement the data object to store a generic array of HGLOBALs.
by Alexandre Julliard March 6, 2024

March 6, 2024

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

Rémi Bernon : win32u: Use set_reg_ascii_value whenever possible.
by Alexandre Julliard March 6, 2024

March 6, 2024

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