wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Tag wine-9.12 : Alexandre Julliard : Release 9.12
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: refs/tags/wine-9.12 Tag: 81e697ff7c4c5b5195789855a16ab9bb8e96c648 URL: https://gitlab.winehq.org/wine/wine/-/tags/81e697ff7c4c5b5195789855a16ab9bb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 28 22:35:25 2024 +0200 Release 9.12

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

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

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::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

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

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

28 Jun '24

Module: wine Branch: master Commit: 7014d04889050a2478fe80315506f8d99d04823a URL: https://gitlab.winehq.org/wine/wine/-/commit/7014d04889050a2478fe80315506f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 30 13:55:13 2024 +0200 winewayland: Remove now unnecessary window surface BITMAPINFO. --- dlls/winewayland.drv/window_surface.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 7cff84a5bf7..084f987df6c 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -45,7 +45,6 @@ struct wayland_window_surface struct window_surface header; struct wayland_surface *wayland_surface; struct wayland_buffer_queue *wayland_buffer_queue; - BITMAPINFO info; }; static struct wayland_window_surface *wayland_window_surface_cast( @@ -460,7 +459,6 @@ static struct window_surface *wayland_window_surface_create(HWND hwnd, const REC wws = calloc(1, sizeof(*wws)); if (!wws) return NULL; if (!window_surface_init(&wws->header, &wayland_window_surface_funcs, hwnd, rect, info, 0)) goto failed; - wws->info = *info; TRACE("created %p hwnd %p %s\n", wws, hwnd, wine_dbgstr_rect(rect));

1 0

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

28 Jun '24

Module: wine Branch: master Commit: 1b9e6e6d1f23358fd1ad4bf1e4fa4b0881928b6f URL: https://gitlab.winehq.org/wine/wine/-/commit/1b9e6e6d1f23358fd1ad4bf1e4fa4b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:47:36 2024 +0200 wineandroid: Remove now unnecessary window surface BITMAPINFO. --- dlls/wineandroid.drv/window.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 060fa73d15c..1ee542455a3 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -70,16 +70,6 @@ static inline int context_idx( HWND hwnd ) return LOWORD( hwnd ) >> 1; } -/* only for use on sanitized BITMAPINFO structures */ -static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) -{ - if (info->bmiHeader.biCompression == BI_BITFIELDS) - return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); - if (coloruse == DIB_PAL_COLORS) - return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); - return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); -} - static inline int get_dib_stride( int width, int bpp ) { return ((width * bpp + 31) >> 3) & ~3; @@ -564,7 +554,6 @@ struct android_window_surface ANativeWindow *window; UINT clip_count; RECT *clip_rects; - BITMAPINFO info; /* variable size, must be last */ }; static struct android_window_surface *get_android_surface( struct window_surface *surface ) @@ -742,10 +731,8 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, info->bmiHeader.biPlanes = 1; info->bmiHeader.biSizeImage = get_dib_image_size( info ); - surface = calloc( 1, FIELD_OFFSET( struct android_window_surface, info.bmiColors[3] )); - if (!surface) return NULL; + if (!(surface = calloc( 1, sizeof(*surface) ))) return NULL; if (!window_surface_init( &surface->header, &android_surface_funcs, hwnd, rect, info, 0 )) goto failed; - memcpy( &surface->info, info, get_dib_info_size( info, DIB_RGB_COLORS ) ); surface->window = get_ioctl_window( hwnd );

1 0

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

28 Jun '24

Module: wine Branch: master Commit: e1b1a97fc828af557a130e40d4bfb813d92a0f60 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1b1a97fc828af557a130e40d4bfb8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 10:43:05 2024 +0200 winemac: Remove now unnecessary driver surface BITMAPINFO. --- dlls/winemac.drv/surface.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 4bc65b957c1..e4f140a898e 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -48,7 +48,6 @@ struct macdrv_window_surface struct window_surface header; macdrv_window window; CGDataProviderRef provider; - BITMAPINFO info; /* variable size, must be last */ }; static struct macdrv_window_surface *get_mac_surface(struct window_surface *surface); @@ -166,9 +165,8 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co } if (desc.hDeviceDc) NtUserReleaseDC(hwnd, desc.hDeviceDc); - if (!(surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])))) goto failed; + if (!(surface = calloc(1, sizeof(*surface)))) goto failed; if (!window_surface_init(&surface->header, &macdrv_surface_funcs, hwnd, rect, info, bitmap)) goto failed; - memcpy(&surface->info, info, offsetof(BITMAPINFO, bmiColors[3])); surface->window = window; if (old_surface) surface->header.bounds = old_surface->bounds;

1 0

Rémi Bernon : win32u: Get rid of the unnecessary offscreen window surface struct.
by Alexandre Julliard 28 Jun '24

28 Jun '24

Module: wine Branch: master Commit: 6f047d8c85a910b18be8967b89d8faacac4b453b URL: https://gitlab.winehq.org/wine/wine/-/commit/6f047d8c85a910b18be8967b89d8fa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 12 12:16:53 2024 +0200 win32u: Get rid of the unnecessary offscreen window surface struct. --- dlls/win32u/dce.c | 51 +++++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 4f86e6fb01d..91bcb02a6a8 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -92,34 +92,19 @@ struct window_surface dummy_surface = * Off-screen window surface. */ -struct offscreen_window_surface -{ - struct window_surface header; - BITMAPINFO info; -}; - -static const struct window_surface_funcs offscreen_window_surface_funcs; - -static struct offscreen_window_surface *impl_from_window_surface( struct window_surface *base ) -{ - if (!base || base->funcs != &offscreen_window_surface_funcs) return NULL; - return CONTAINING_RECORD( base, struct offscreen_window_surface, header ); -} - -static void offscreen_window_surface_set_clip( struct window_surface *base, const RECT *rects, UINT count ) +static void offscreen_window_surface_set_clip( struct window_surface *surface, const RECT *rects, UINT count ) { } -static BOOL offscreen_window_surface_flush( struct window_surface *base, const RECT *rect, const RECT *dirty, +static BOOL offscreen_window_surface_flush( struct window_surface *surface, const RECT *rect, const RECT *dirty, const BITMAPINFO *color_info, const void *color_bits ) { return TRUE; } -static void offscreen_window_surface_destroy( struct window_surface *base ) +static void offscreen_window_surface_destroy( struct window_surface *surface ) { - struct offscreen_window_surface *impl = impl_from_window_surface( base ); - free( impl ); + free( surface ); } static const struct window_surface_funcs offscreen_window_surface_funcs = @@ -129,22 +114,19 @@ static const struct window_surface_funcs offscreen_window_surface_funcs = offscreen_window_surface_destroy }; -void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **surface ) +void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struct window_surface **window_surface ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; - struct offscreen_window_surface *impl; + struct window_surface *surface, *previous; - TRACE( "hwnd %p, surface_rect %s, surface %p.\n", hwnd, wine_dbgstr_rect( surface_rect ), surface ); + TRACE( "hwnd %p, surface_rect %s, window_surface %p.\n", hwnd, wine_dbgstr_rect( surface_rect ), window_surface ); /* check that old surface is an offscreen_window_surface, or release it */ - if ((impl = impl_from_window_surface( *surface ))) - { - /* if the rect didn't change, keep the same surface */ - if (EqualRect( surface_rect, &impl->header.rect )) return; - window_surface_release( &impl->header ); - } - else if (*surface) window_surface_release( *surface ); + if ((previous = *window_surface) && previous->funcs == &offscreen_window_surface_funcs && + EqualRect( surface_rect, &previous->rect )) return; + if (previous) window_surface_release( previous ); + *window_surface = NULL; memset( info, 0, sizeof(*info) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); @@ -156,14 +138,11 @@ void create_offscreen_window_surface( HWND hwnd, const RECT *surface_rect, struc info->bmiHeader.biCompression = BI_RGB; /* create a new window surface */ - *surface = NULL; - if (!(impl = calloc(1, sizeof(*impl)))) return; - window_surface_init( &impl->header, &offscreen_window_surface_funcs, hwnd, surface_rect, info, 0 ); - impl->info = *info; - - TRACE( "created window surface %p\n", &impl->header ); + if (!(surface = calloc(1, sizeof(*surface)))) return; + window_surface_init( surface, &offscreen_window_surface_funcs, hwnd, surface_rect, info, 0 ); - *surface = &impl->header; + TRACE( "created window surface %p\n", surface ); + *window_surface = surface; } /* window surface common helpers */

1 0

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 June 2024