June 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Remove now unnecessary window surface BITMAPINFO.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 5fbe49f5ae9574eafccab2f6841245d78570e774 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fbe49f5ae9574eafccab2f6841245… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:59:46 2024 +0200 winex11: Remove now unnecessary window surface BITMAPINFO. --- dlls/winex11.drv/bitblt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index f3bb102c033..c28a4d2d9a3 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1589,7 +1589,6 @@ struct x11drv_window_surface GC gc; struct x11drv_image *image; BOOL byteswap; - BITMAPINFO info; /* variable size, must be last */ }; static struct x11drv_window_surface *get_x11_surface( struct window_surface *surface ) @@ -2029,12 +2028,11 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV BITMAPINFO *info = (BITMAPINFO *)buffer; struct x11drv_window_surface *surface; int width = rect->right - rect->left, height = rect->bottom - rect->top; - int colors = format->bits_per_pixel <= 8 ? 1 << format->bits_per_pixel : 3; struct x11drv_image *image; D3DDDIFORMAT d3d_format; HBITMAP bitmap = 0; BOOL byteswap; - UINT size, status; + UINT status; memset( info, 0, sizeof(*info) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -2045,7 +2043,6 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV info->bmiHeader.biSizeImage = get_dib_image_size( info ); if (format->bits_per_pixel > 8) set_color_info( vis, info, use_alpha ); - size = FIELD_OFFSET( struct x11drv_window_surface, info.bmiColors[colors] ); if (!(image = x11drv_image_create( info, vis ))) return NULL; /* wrap the XImage data in a HBITMAP if we can write to the surface pixels directly */ @@ -2074,7 +2071,7 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV if (desc.hDeviceDc) NtUserReleaseDC( hwnd, desc.hDeviceDc ); } - if (!(surface = calloc( 1, size ))) + if (!(surface = calloc( 1, sizeof(*surface) ))) { if (bitmap) NtGdiDeleteObjectApp( bitmap ); x11drv_image_destroy( image ); @@ -2084,7 +2081,6 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV surface->byteswap = byteswap; if (!window_surface_init( &surface->header, &x11drv_surface_funcs, hwnd, rect, info, bitmap )) goto failed; - memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) ); surface->window = window; surface->gc = XCreateGC( gdi_display, window, 0, NULL );

1 0

Alistair Leslie-Hughes : msado15: Implement _Command::get_Parameters.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 090f2c60072475ad8f974a33c89ce029cdbe459b URL: https://gitlab.winehq.org/wine/wine/-/commit/090f2c60072475ad8f974a33c89ce0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 28 20:57:30 2024 +1000 msado15: Implement _Command::get_Parameters. --- dlls/msado15/command.c | 165 ++++++++++++++++++++++++++++++++++++++++- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/tests/msado15.c | 13 ++++ 4 files changed, 178 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 762a13c8776..de5dcc0233e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -33,6 +33,7 @@ struct command { _Command Command_iface; ADOCommandConstruction ADOCommandConstruction_iface; + Parameters Parameters_iface; LONG ref; CommandTypeEnum type; BSTR text; @@ -49,6 +50,156 @@ static inline struct command *impl_from_ADOCommandConstruction( ADOCommandConstr return CONTAINING_RECORD( iface, struct command, ADOCommandConstruction_iface ); } +static inline struct command *impl_from_Parameters( Parameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, Parameters_iface ); +} + +static HRESULT WINAPI parameters_QueryInterface(Parameters *iface, REFIID riid, void **obj) +{ + TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__Collection) || + IsEqualIID(riid, &IID__DynaCollection) || + IsEqualIID(riid, &IID_Parameters)) + { + *obj = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + + Parameters_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI parameters_AddRef(Parameters *iface) +{ + struct command *command = impl_from_Parameters( iface ); + return _Command_AddRef(&command->Command_iface); +} + +static ULONG WINAPI parameters_Release(Parameters *iface) +{ + struct command *command = impl_from_Parameters( iface ); + return _Command_Release(&command->Command_iface); +} + +static HRESULT WINAPI parameters_GetTypeInfoCount(Parameters *iface, UINT *count) +{ + struct command *command = impl_from_Parameters( iface ); + TRACE( "%p, %p\n", command, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI parameters_GetTypeInfo(Parameters *iface, UINT index, LCID lcid, ITypeInfo **info) +{ + struct command *command = impl_from_Parameters( iface ); + TRACE( "%p, %u, %lu, %p\n", command, index, lcid, info ); + return get_typeinfo(Parameters_tid, info); +} + +static HRESULT WINAPI parameters_GetIDsOfNames(Parameters *iface, REFIID riid, LPOLESTR *names, UINT count, + LCID lcid, DISPID *dispid) +{ + struct command *command = impl_from_Parameters( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %s, %p, %u, %lu, %p\n", command, debugstr_guid(riid), names, count, lcid, dispid ); + + hr = get_typeinfo(Parameters_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI parameters_Invoke(Parameters *iface, DISPID member, REFIID riid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep_info, UINT *arg_err) +{ + struct command *command = impl_from_Parameters( iface ); + HRESULT hr; + ITypeInfo *typeinfo; + + TRACE( "%p, %ld, %s, %ld, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, + result, excep_info, arg_err ); + + hr = get_typeinfo(Parameters_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &command->Parameters_iface, member, flags, params, + result, excep_info, arg_err); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI parameters_get_Count(Parameters *iface, LONG *count) +{ + FIXME( "%p, %p\n", iface, count); + *count = 0; + return S_OK; +} + +static HRESULT WINAPI parameters__NewEnum(Parameters *iface, IUnknown **object) +{ + FIXME( "%p, %p\n", iface, object); + return E_NOTIMPL; +} + +static HRESULT WINAPI parameters_Refresh(Parameters *iface) +{ + FIXME( "%p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI parameters_Append(Parameters *iface, IDispatch *object) +{ + FIXME( "%p, %p\n", iface, object); + return E_NOTIMPL; +} + +static HRESULT WINAPI parameters_Delete(Parameters *iface, VARIANT index) +{ + FIXME( "%p, %s\n", iface, debugstr_variant(&index)); + return E_NOTIMPL; +} + +static HRESULT WINAPI parameters_get_Item(Parameters *iface, VARIANT index, _Parameter **object) +{ + FIXME( "%p, %s, %p\n", iface, debugstr_variant(&index), object); + return E_NOTIMPL; +} + +static const struct ParametersVtbl parameters_vtbl = +{ + parameters_QueryInterface, + parameters_AddRef, + parameters_Release, + parameters_GetTypeInfoCount, + parameters_GetTypeInfo, + parameters_GetIDsOfNames, + parameters_Invoke, + parameters_get_Count, + parameters__NewEnum, + parameters_Refresh, + parameters_Append, + parameters_Delete, + parameters_get_Item +}; + static HRESULT WINAPI command_QueryInterface( _Command *iface, REFIID riid, void **obj ) { struct command *command = impl_from_Command( iface ); @@ -253,8 +404,17 @@ static HRESULT WINAPI command_CreateParameter( _Command *iface, BSTR name, DataT static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **parameters ) { - FIXME( "%p, %p\n", iface, parameters ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, parameters ); + + if (!parameters) + return E_INVALIDARG; + + *parameters = &command->Parameters_iface; + Parameters_AddRef(*parameters); + + return S_OK; } static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) @@ -446,6 +606,7 @@ HRESULT Command_create( void **obj ) if (!(command = malloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; command->ADOCommandConstruction_iface.lpVtbl = &construct_vtbl; + command->Parameters_iface.lpVtbl = &parameters_vtbl; command->type = adCmdUnknown; command->text = NULL; command->connection = NULL; diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 2d2f220c06f..2e2e5a83250 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -145,6 +145,7 @@ static REFIID tid_ids[] = { &IID__Connection, &IID_Field, &IID_Fields, + &IID_Parameters, &IID_Properties, &IID_Property, &IID__Recordset, diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f8a515a596f..797354e7dc0 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -32,6 +32,7 @@ typedef enum tid_t { Connection_tid, Field_tid, Fields_tid, + Parameters_tid, Properties_tid, Property_tid, Recordset_tid, diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 8826fb5b0e8..4b46848cbe7 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -1332,6 +1332,7 @@ static void test_Command(void) BSTR cmd_text = (BSTR)"test"; _Connection *connection; ADOCommandConstruction *adocommand; + Parameters *parameters, *parameters2; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08lx\n", hr ); @@ -1352,6 +1353,9 @@ static void test_Command(void) ok( hr == S_OK, "got %08lx\n", hr ); ADOCommandConstruction_Release( adocommand ); + hr = _Command_QueryInterface( command, &IID_Parameters, (void **)&parameters ); + ok( hr == E_NOINTERFACE, "got %08lx\n", hr ); + hr = _Command_get_CommandType( command, &cmd_type ); ok( hr == S_OK, "got %08lx\n", hr ); ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); @@ -1397,6 +1401,15 @@ static void test_Command(void) hr = _Command_putref_ActiveConnection( command, NULL ); ok( hr == S_OK, "got %08lx\n", hr ); + hr = _Command_get_Parameters( command, &parameters ); + ok( hr == S_OK, "got %08lx\n", hr ); + + hr = _Command_get_Parameters( command, &parameters2 ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( parameters == parameters2, "got %08lx\n", hr ); + Parameters_Release(parameters); + Parameters_Release(parameters2); + _Command_Release( command ); }

1 0

Alistair Leslie-Hughes : msado15: Implement Parameters interface.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 9e10bdb72a67c9ce3502737f890a31688afacb78 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e10bdb72a67c9ce3502737f890a31… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 28 20:57:30 2024 +1000 msado15: Implement Parameters interface. --- dlls/msado15/command.c | 61 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index de5dcc0233e..99519527c1c 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -24,11 +24,19 @@ #include "msado15_backcompat.h" #include "wine/debug.h" +#include "wine/list.h" #include "msado15_private.h" WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct param_item +{ + struct list entry; + + IDispatch *param; +}; + struct command { _Command Command_iface; @@ -38,6 +46,8 @@ struct command CommandTypeEnum type; BSTR text; _Connection *connection; + + struct list parameters; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -148,8 +158,9 @@ static HRESULT WINAPI parameters_Invoke(Parameters *iface, DISPID member, REFIID static HRESULT WINAPI parameters_get_Count(Parameters *iface, LONG *count) { - FIXME( "%p, %p\n", iface, count); - *count = 0; + struct command *command = impl_from_Parameters( iface ); + TRACE( "%p, %p\n", iface, count); + *count = list_count(&command->parameters); return S_OK; } @@ -167,14 +178,41 @@ static HRESULT WINAPI parameters_Refresh(Parameters *iface) static HRESULT WINAPI parameters_Append(Parameters *iface, IDispatch *object) { - FIXME( "%p, %p\n", iface, object); - return E_NOTIMPL; + struct command *command = impl_from_Parameters( iface ); + struct param_item *param; + + TRACE( "%p, %p\n", iface, object); + + if (!(param = calloc(1, sizeof(*param)))) + return E_OUTOFMEMORY; + param->param = object; + IDispatch_AddRef(object); + + list_add_tail(&command->parameters, &param->entry); + return S_OK; } static HRESULT WINAPI parameters_Delete(Parameters *iface, VARIANT index) { - FIXME( "%p, %s\n", iface, debugstr_variant(&index)); - return E_NOTIMPL; + struct command *command = impl_from_Parameters( iface ); + struct param_item *para, *para2; + int cnt = 0; + + TRACE( "%p, %s\n", iface, debugstr_variant(&index)); + + LIST_FOR_EACH_ENTRY_SAFE(para, para2, &command->parameters, struct param_item, entry) + { + if(cnt == V_I4(&index)) + { + list_remove(&para->entry); + if (para->param) + IDispatch_Release(para->param); + free(para); + break; + } + } + + return S_OK; } static HRESULT WINAPI parameters_get_Item(Parameters *iface, VARIANT index, _Parameter **object) @@ -242,7 +280,17 @@ static ULONG WINAPI command_Release( _Command *iface ) LONG ref = InterlockedDecrement( &command->ref ); if (!ref) { + struct param_item *para, *para2; TRACE( "destroying %p\n", command ); + + LIST_FOR_EACH_ENTRY_SAFE(para, para2, &command->parameters, struct param_item, entry) + { + list_remove(&para->entry); + if (para->param) + IDispatch_Release(para->param); + free(para); + } + if (command->connection) _Connection_Release(command->connection); free( command->text ); free( command ); @@ -610,6 +658,7 @@ HRESULT Command_create( void **obj ) command->type = adCmdUnknown; command->text = NULL; command->connection = NULL; + list_init(&command->parameters); command->ref = 1; *obj = &command->Command_iface;

1 0

Alistair Leslie-Hughes : msado15: Implement _Command::CreateParameter.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: ead511765133463843de66663ecb086cd97470cc URL: https://gitlab.winehq.org/wine/wine/-/commit/ead511765133463843de66663ecb08… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 28 20:57:30 2024 +1000 msado15: Implement _Command::CreateParameter. --- dlls/msado15/command.c | 305 ++++++++++++++++++++++++++++++++++++++++- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 1 + dlls/msado15/tests/msado15.c | 20 +++ 4 files changed, 323 insertions(+), 4 deletions(-)

1 0

Alexandre Julliard : Release 9.12.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: b87f35898d22b90e36970e0b1fce1172ba64eb15 URL: https://gitlab.winehq.org/wine/wine/-/commit/b87f35898d22b90e36970e0b1fce11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 22:35:25 2024 +0200 Release 9.12. --- ANNOUNCE.md | 752 ++++++++++++++++++++++++++++++++---------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 416 insertions(+), 356 deletions(-)

1 0

Elizabeth Figura : wined3d: Implement wined3d_check_device_format_conversion().
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: d8379aa2cc33e5b69c0ddceff59921e0822c7722 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8379aa2cc33e5b69c0ddceff59921… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat Jun 8 19:13:14 2024 -0500 wined3d: Implement wined3d_check_device_format_conversion(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44888 --- dlls/d3d9/directx.c | 3 ++ dlls/d3d9/tests/visual.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 43 +++++++++++++-- 3 files changed, 177 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d5b8e276075..13d32b00680 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -414,6 +414,9 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT if (output_idx >= d3d9->wined3d_output_count) return D3DERR_INVALIDCALL; + if (src_format == dst_format) + return S_OK; + wined3d_mutex_lock(); hr = wined3d_check_device_format_conversion(d3d9->wined3d_outputs[output_idx], wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(src_format), diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e924588630e..724d9ef1e39 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28682,6 +28682,141 @@ static void test_default_attribute_components(void) release_test_context(&context); } +static void test_format_conversion(void) +{ + D3DADAPTER_IDENTIFIER9 identifier; + struct d3d9_test_context context; + HRESULT hr; + + static const struct + { + D3DFORMAT src_format; + D3DFORMAT dst_format; + HRESULT expect_hr; + bool broken_warp; + } + tests[] = + { + {D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, S_OK}, + {D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, S_OK}, + {D3DFMT_R5G6B5, D3DFMT_X8R8G8B8, S_OK}, + {D3DFMT_YUY2, D3DFMT_X8R8G8B8, S_OK, .broken_warp = true}, + {D3DFMT_YUY2, D3DFMT_R5G6B5, S_OK, .broken_warp = true}, + {D3DFMT_R32F, D3DFMT_R16F, D3DERR_NOTAVAILABLE}, + + {D3DFMT_L8, D3DFMT_L8, S_OK}, + {D3DFMT_X8R8G8B8, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_A8, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_A8L8, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_L16, D3DFMT_L8, D3DERR_NOTAVAILABLE}, + {D3DFMT_L8, D3DFMT_A8, D3DERR_NOTAVAILABLE}, + {D3DFMT_L8, D3DFMT_L16, D3DERR_NOTAVAILABLE}, + {D3DFMT_L8, D3DFMT_A8L8, D3DERR_NOTAVAILABLE}, + }; + + static const D3DFORMAT all_formats[] = + { + D3DFMT_R8G8B8, + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_R5G6B5, + D3DFMT_X1R5G5B5, + D3DFMT_A1R5G5B5, + D3DFMT_A4R4G4B4, + D3DFMT_R3G3B2, + D3DFMT_A8, + D3DFMT_A8R3G3B2, + D3DFMT_X4R4G4B4, + D3DFMT_A2B10G10R10, + D3DFMT_A8B8G8R8, + D3DFMT_X8B8G8R8, + D3DFMT_G16R16, + D3DFMT_A2R10G10B10, + D3DFMT_A16B16G16R16, + D3DFMT_A8P8, + D3DFMT_P8, + D3DFMT_L8, + D3DFMT_A8L8, + D3DFMT_A4L4, + D3DFMT_V8U8, + D3DFMT_L6V5U5, + D3DFMT_X8L8V8U8, + D3DFMT_Q8W8V8U8, + D3DFMT_V16U16, + D3DFMT_A2W10V10U10, + D3DFMT_UYVY, + D3DFMT_YUY2, + D3DFMT_DXT1, + D3DFMT_DXT2, + D3DFMT_DXT3, + D3DFMT_DXT4, + D3DFMT_DXT5, + D3DFMT_MULTI2_ARGB8, + D3DFMT_G8R8_G8B8, + D3DFMT_R8G8_B8G8, + D3DFMT_D16_LOCKABLE, + D3DFMT_D32, + D3DFMT_D15S1, + D3DFMT_D24S8, + D3DFMT_D24X8, + D3DFMT_D24X4S4, + D3DFMT_D16, + D3DFMT_L16, + D3DFMT_D32F_LOCKABLE, + D3DFMT_D24FS8, + D3DFMT_D32_LOCKABLE, + D3DFMT_S8_LOCKABLE, + D3DFMT_VERTEXDATA, + D3DFMT_INDEX16, + D3DFMT_INDEX32, + D3DFMT_Q16W16V16U16, + D3DFMT_R16F, + D3DFMT_G16R16F, + D3DFMT_A16B16G16R16F, + D3DFMT_R32F, + D3DFMT_G32R32F, + D3DFMT_A32B32G32R32F, + D3DFMT_CxV8U8, + D3DFMT_A1, + D3DFMT_A2B10G10R10_XR_BIAS, + D3DFMT_BINARYBUFFER, + 200, + }; + + if (!init_test_context(&context)) + return; + + hr = IDirect3D9_GetAdapterIdentifier(context.d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == S_OK, "Failed to get adapter identifier, hr %#lx.\n", hr); + + for (unsigned int i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3D9_CheckDeviceFormatConversion(context.d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, tests[i].src_format, tests[i].dst_format); + todo_wine_if (i == 5) + ok(hr == tests[i].expect_hr + || broken(tests[i].broken_warp && adapter_is_warp(&identifier) && hr == D3DERR_NOTAVAILABLE), + "Got hr %#lx for %u to %u.\n", hr, tests[i].src_format, tests[i].dst_format); + } + + for (unsigned int src_format = 0; src_format < ARRAY_SIZE(all_formats); ++src_format) + { + for (unsigned int dst_format = 0; dst_format < ARRAY_SIZE(all_formats); ++dst_format) + { + hr = IDirect3D9_CheckDeviceFormatConversion(context.d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, all_formats[src_format], all_formats[dst_format]); + if (src_format == dst_format) + ok(hr == S_OK, "Got hr %#lx for %u to %u.\n", + hr, all_formats[src_format], all_formats[dst_format]); + else + ok(hr == S_OK || hr == D3DERR_NOTAVAILABLE, "Got hr %#lx for %u to %u.\n", + hr, all_formats[src_format], all_formats[dst_format]); + } + } + + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -28838,4 +28973,5 @@ START_TEST(visual) test_mipmap_upload(); test_default_diffuse(); test_default_attribute_components(); + test_format_conversion(); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9df95bdea55..f236a59f963 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2184,12 +2184,45 @@ unsigned int CDECL wined3d_calculate_format_pitch(const struct wined3d_adapter * } HRESULT CDECL wined3d_check_device_format_conversion(const struct wined3d_output *output, - enum wined3d_device_type device_type, enum wined3d_format_id src_format, - enum wined3d_format_id dst_format) + enum wined3d_device_type device_type, enum wined3d_format_id src_format_id, + enum wined3d_format_id dst_format_id) { - FIXME("output %p, device_type %s, src_format %s, dst_format %s stub!\n", - output, debug_d3ddevicetype(device_type), debug_d3dformat(src_format), - debug_d3dformat(dst_format)); + const struct wined3d_format *src_format = wined3d_get_format(output->adapter, src_format_id, 0); + const struct wined3d_format *dst_format = wined3d_get_format(output->adapter, dst_format_id, 0); + + TRACE("output %p, device_type %s, src_format %s, dst_format %s.\n", + output, debug_d3ddevicetype(device_type), debug_d3dformat(src_format_id), + debug_d3dformat(dst_format_id)); + + if (!(src_format->caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_BLIT)) + { + TRACE("Source format does not support blitting.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + if (!(dst_format->caps[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3D_FORMAT_CAP_BLIT)) + { + TRACE("Destination format does not support blitting.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + /* Source cannot be depth/stencil (although it can be YUV or compressed, + * and AMD also allows blitting from luminance formats). */ + if (src_format->depth_size || src_format->stencil_size) + { + TRACE("Source format is depth/stencil.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + /* The destination format must be a simple RGB format (no luminance, YUV, + * compression, etc.) All such formats have a nonzero red_size; the only + * exceptions are X24G8 (not supported in d3d9) and A8 (which, it turns out, + * no vendor reports support for converting to). */ + if (!dst_format->red_size) + { + TRACE("Destination format is not a simple RGB format.\n"); + return WINED3DERR_NOTAVAILABLE; + } return WINED3D_OK; }

1 0

Ziqing Hui : winegstreamer/aac_decoder: Support clearing media types.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 19d6a0177d743c1b471d5fb5692dfba23ca12c2b URL: https://gitlab.winehq.org/wine/wine/-/commit/19d6a0177d743c1b471d5fb5692dfb… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 16:22:17 2024 +0800 winegstreamer/aac_decoder: Support clearing media types. --- dlls/winegstreamer/aac_decoder.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 2cf605bc56c..d8e8246e1ca 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -324,6 +324,27 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (id) return MF_E_INVALIDSTREAMNUMBER; + if (!type) + { + if (decoder->input_type) + { + IMFMediaType_Release(decoder->input_type); + decoder->input_type = NULL; + } + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->output_type = NULL; + } + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(type, (WAVEFORMATEX **)&format, &size, MFWaveFormatExConvertFlag_ForceExtensible))) return hr; @@ -364,6 +385,23 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (id) return MF_E_INVALIDSTREAMNUMBER; + + if (!type) + { + if (decoder->output_type) + { + IMFMediaType_Release(decoder->output_type); + decoder->input_type = NULL; + } + if (decoder->wg_transform) + { + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = 0; + } + + return S_OK; + } + if (!decoder->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET;

1 0

Ziqing Hui : winegstreamer/color_converter: Support clearing media types.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: c34eb9693346d1cfa071db53a28e8c3283dd1aa2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c34eb9693346d1cfa071db53a28e8c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 16:27:44 2024 +0800 winegstreamer/color_converter: Support clearing media types. --- dlls/winegstreamer/color_convert.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 4b60628e8ba..21d2aa67e64 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -360,6 +360,22 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + if (!type) + { + if (impl->input_type) + { + IMFMediaType_Release(impl->input_type); + impl->input_type = NULL; + } + if (impl->wg_transform) + { + wg_transform_destroy(impl->wg_transform); + impl->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) return MF_E_ATTRIBUTENOTFOUND; @@ -422,6 +438,22 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + if (!type) + { + if (impl->output_type) + { + IMFMediaType_Release(impl->output_type); + impl->output_type = NULL; + } + if (impl->wg_transform) + { + wg_transform_destroy(impl->wg_transform); + impl->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) return MF_E_ATTRIBUTENOTFOUND;

1 0

Ziqing Hui : mf/tests: Add more tests for h264 encoder type attributes.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 2b094ace7e2d4b711d3e02255056e74ee71dce17 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b094ace7e2d4b711d3e02255056e7… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 26 14:48:51 2024 +0800 mf/tests: Add more tests for h264 encoder type attributes. --- dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 82 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index b3247ba00cc..9fa5d4fef41 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -58,6 +58,7 @@ struct attribute_desc PROPVARIANT value; BOOL ratio; BOOL required; + BOOL required_set; BOOL todo; BOOL todo_value; }; diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 262e3bc4726..deec2c7dd92 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -63,6 +63,8 @@ DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_IV50,MAKEFOURCC('I','V','5','0')); DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +static const GUID test_attr_guid = {0xdeadbeef}; + struct media_buffer { IMediaBuffer IMediaBuffer_iface; @@ -678,13 +680,25 @@ static void check_mft_set_input_type_required_(int line, IMFTransform *transform for (attr = attributes; attr && attr->key; attr++) { winetest_push_context("%s", debugstr_a(attr->name)); + hr = IMFMediaType_DeleteItem(media_type, attr->key); ok_(__FILE__, line)(hr == S_OK, "DeleteItem returned %#lx\n", hr); + hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); todo_wine_if(attr->todo) ok_(__FILE__, line)(FAILED(hr) == attr->required, "SetInputType returned %#lx.\n", hr); + + if (attr->required_set) + { + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok_(__FILE__, line)(FAILED(hr), "SetInputType Succeeded.\n"); + hr = IMFTransform_SetInputType(transform, 0, NULL, 0); + ok_(__FILE__, line)(hr == S_OK, "Failed to clear input type.\n"); + } + hr = IMFMediaType_SetItem(media_type, attr->key, &attr->value); ok_(__FILE__, line)(hr == S_OK, "SetItem returned %#lx\n", hr); + winetest_pop_context(); } @@ -759,12 +773,24 @@ static void check_mft_set_output_type_required_(int line, IMFTransform *transfor for (attr = attributes; attr && attr->key; attr++) { winetest_push_context("%s", debugstr_a(attr->name)); + hr = IMFMediaType_DeleteItem(media_type, attr->key); ok_(__FILE__, line)(hr == S_OK, "DeleteItem returned %#lx\n", hr); + hr = IMFTransform_SetOutputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); ok_(__FILE__, line)(FAILED(hr) == attr->required, "SetOutputType returned %#lx.\n", hr); + + if (attr->required_set) + { + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok_(__FILE__, line)(FAILED(hr), "SetOutputType Succeeded.\n"); + hr = IMFTransform_SetOutputType(transform, 0, NULL, 0); + ok_(__FILE__, line)(hr == S_OK, "Failed to clear output type.\n"); + } + hr = IMFMediaType_SetItem(media_type, attr->key, &attr->value); ok_(__FILE__, line)(hr == S_OK, "SetItem returned %#lx\n", hr); + winetest_pop_context(); } @@ -3810,43 +3836,43 @@ static void test_h264_encoder(void) {.subtype = &MFVideoFormat_H264}, }, }; - static const media_type_desc default_outputs[] = + static const media_type_desc default_inputs[] = { - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264), - }, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV)}, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12)}, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12)}, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2)}, }; - static const media_type_desc default_inputs[] = + static const media_type_desc default_outputs[] = { - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), - }, - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), - }, - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), - }, - { - ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), - ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), - }, + {ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264)}, }; static const struct attribute_desc expect_transform_attributes[] = { ATTR_UINT32(MFT_ENCODER_SUPPORTS_CONFIG_EVENT, 1), {0}, }; + static const struct attribute_desc expect_common_attributes[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + {0}, + }; + static const struct attribute_desc expect_available_input_attributes[] = + { + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(MF_MT_VIDEO_NOMINAL_RANGE, MFNominalRange_Wide), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + {0}, + }; const struct attribute_desc input_type_desc[] = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), + ATTR_UINT32(test_attr_guid, 0), {0}, }; const struct attribute_desc output_type_desc[] = @@ -3854,9 +3880,10 @@ static void test_h264_encoder(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video, .required = TRUE), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_H264, .required = TRUE), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .required = TRUE), - ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), - ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001, .required_set = TRUE), + ATTR_UINT32(MF_MT_AVG_BITRATE, 193540, .required_set = TRUE), + ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive, .required_set = TRUE), + ATTR_UINT32(test_attr_guid, 0), {0}, }; const struct attribute_desc expect_input_type_desc[] = @@ -3865,6 +3892,7 @@ static void test_h264_encoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_UINT32(test_attr_guid, 0), {0}, }; const struct attribute_desc expect_output_type_desc[] = @@ -3876,6 +3904,7 @@ static void test_h264_encoder(void) ATTR_UINT32(MF_MT_AVG_BITRATE, 193540), ATTR_BLOB(MF_MT_MPEG_SEQUENCE_HEADER, test_h264_sequence_header, sizeof(test_h264_sequence_header)), ATTR_UINT32(MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive), + ATTR_UINT32(test_attr_guid, 0), {0}, }; static const MFT_OUTPUT_STREAM_INFO expect_output_info = {.cbSize = 0x8000}; @@ -3929,6 +3958,7 @@ static void test_h264_encoder(void) { winetest_push_context("out %lu", i); ok(hr == S_OK, "GetOutputAvailableType returned %#lx.\n", hr); + check_media_type(media_type, expect_common_attributes, -1); check_media_type(media_type, default_outputs[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); @@ -3948,6 +3978,8 @@ static void test_h264_encoder(void) { winetest_push_context("out %lu", i); ok(hr == S_OK, "IMFTransform_GetInputAvailableType returned %#lx\n", hr); + check_media_type(media_type, expect_common_attributes, -1); + check_media_type(media_type, expect_available_input_attributes, -1); check_media_type(media_type, default_inputs[i], -1); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Ziqing Hui : winegstreamer/video_encoder: Implement GetOutputAvailableType.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: c73dddbf0f8627395b6e813b4f096bcc1a0b6e27 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73dddbf0f8627395b6e813b4f096b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 20 10:59:43 2024 +0800 winegstreamer/video_encoder: Implement GetOutputAvailableType. --- dlls/winegstreamer/video_encoder.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/video_encoder.c b/dlls/winegstreamer/video_encoder.c index beb74003d64..73d3f757ff9 100644 --- a/dlls/winegstreamer/video_encoder.c +++ b/dlls/winegstreamer/video_encoder.c @@ -38,6 +38,9 @@ struct video_encoder IMFTransform IMFTransform_iface; LONG refcount; + const GUID *const *output_types; + UINT output_type_count; + IMFAttributes *attributes; }; @@ -174,8 +177,14 @@ static HRESULT WINAPI transform_GetInputAvailableType(IMFTransform *iface, DWORD static HRESULT WINAPI transform_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, IMFMediaType **type) { - FIXME("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); - return E_NOTIMPL; + struct video_encoder *encoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, index %#lx, type %p.\n", iface, id, index, type); + + *type = NULL; + if (index >= encoder->output_type_count) + return MF_E_NO_MORE_TYPES; + return MFCreateVideoMediaTypeFromSubtype(encoder->output_types[index], (IMFVideoMediaType **)type); } static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) @@ -275,7 +284,8 @@ static const IMFTransformVtbl transform_vtbl = transform_ProcessOutput, }; -static HRESULT video_encoder_create(struct video_encoder **out) +static HRESULT video_encoder_create(const GUID *const *output_types, UINT output_type_count, + struct video_encoder **out) { struct video_encoder *encoder; HRESULT hr; @@ -286,6 +296,9 @@ static HRESULT video_encoder_create(struct video_encoder **out) encoder->IMFTransform_iface.lpVtbl = &transform_vtbl; encoder->refcount = 1; + encoder->output_types = output_types; + encoder->output_type_count = output_type_count; + if (FAILED(hr = MFCreateAttributes(&encoder->attributes, 16))) goto failed; if (FAILED(hr = IMFAttributes_SetUINT32(encoder->attributes, &MFT_ENCODER_SUPPORTS_CONFIG_EVENT, TRUE))) @@ -302,6 +315,11 @@ failed: return hr; } +static const GUID *const h264_encoder_output_types[] = +{ + &MFVideoFormat_H264, +}; + HRESULT h264_encoder_create(REFIID riid, void **out) { const MFVIDEOFORMAT input_format = @@ -327,7 +345,8 @@ HRESULT h264_encoder_create(REFIID riid, void **out) return hr; } - if (FAILED(hr = video_encoder_create(&encoder))) + if (FAILED(hr = video_encoder_create(h264_encoder_output_types, ARRAY_SIZE(h264_encoder_output_types), + &encoder))) return hr; TRACE("Created h264 encoder transform %p.\n", &encoder->IMFTransform_iface);

1 0