July 2023 - Wine-commits - list.winehq.org

Alexandros Frantzis : winewayland.drv: Update only the flushed bounds from the window_surface.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 8f737258362a51dc0ec31329059d0b4d79ae0a48 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f737258362a51dc0ec31329059d0b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Jul 3 14:18:55 2023 +0300 winewayland.drv: Update only the flushed bounds from the window_surface. When flushing a window_surface, copy from the window_surface only the pixel data contained in the flushed bounds. If any other pixel data are needed, get them from the latest window buffer for the wayland surface, to ensure the data are valid and unchanged. --- dlls/winewayland.drv/wayland_surface.c | 3 ++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/window_surface.c | 54 ++++++++++++++++++++++++++++++++-- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index 13218a977a6..c770083b23f 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -148,6 +148,9 @@ void wayland_surface_destroy(struct wayland_surface *surface) pthread_mutex_unlock(&surface->mutex); pthread_mutex_unlock(&xdg_data_mutex); + if (surface->latest_window_buffer) + wayland_shm_buffer_unref(surface->latest_window_buffer); + wl_display_flush(process_wayland.wl_display); pthread_mutex_destroy(&surface->mutex); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 992f504e3d7..909c8ef5b7b 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -107,6 +107,7 @@ struct wayland_surface struct xdg_toplevel *xdg_toplevel; pthread_mutex_t mutex; uint32_t current_serial; + struct wayland_shm_buffer *latest_window_buffer; }; struct wayland_shm_buffer diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 94051e8fefd..015306bc5f6 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -357,6 +357,16 @@ static void wayland_window_surface_copy_to_buffer(struct wayland_window_surface copy_pixel_region(wws->bits, &wws_rect, buffer->map_data, &buffer_rect, region); } +static void wayland_shm_buffer_copy(struct wayland_shm_buffer *src, + struct wayland_shm_buffer *dst, + HRGN region) +{ + RECT src_rect = {0, 0, src->width, src->height}; + RECT dst_rect = {0, 0, dst->width, dst->height}; + TRACE("src=%p dst=%p\n", src, dst); + copy_pixel_region(src->map_data, &src_rect, dst->map_data, &dst_rect, region); +} + /*********************************************************************** * wayland_window_surface_flush */ @@ -366,7 +376,8 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) struct wayland_shm_buffer *shm_buffer = NULL; BOOL flushed = FALSE; RECT damage_rect; - HRGN surface_damage_region; + HRGN surface_damage_region = NULL; + HRGN copy_from_window_region; wayland_window_surface_lock(window_surface); @@ -391,7 +402,6 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) } wayland_buffer_queue_add_damage(wws->wayland_buffer_queue, surface_damage_region); - NtGdiDeleteObjectApp(surface_damage_region); shm_buffer = wayland_buffer_queue_get_free_buffer(wws->wayland_buffer_queue); if (!shm_buffer) @@ -400,7 +410,38 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) goto done; } - wayland_window_surface_copy_to_buffer(wws, shm_buffer, shm_buffer->damage_region); + if (wws->wayland_surface->latest_window_buffer) + { + TRACE("latest_window_buffer=%p\n", wws->wayland_surface->latest_window_buffer); + /* If we have a latest buffer, use it as the source of all pixel + * data that are not contained in the bounds of the flush... */ + if (wws->wayland_surface->latest_window_buffer != shm_buffer) + { + HRGN copy_from_latest_region = NtGdiCreateRectRgn(0, 0, 0, 0); + if (!copy_from_latest_region) + { + ERR("failed to create copy_from_latest region\n"); + goto done; + } + NtGdiCombineRgn(copy_from_latest_region, shm_buffer->damage_region, + surface_damage_region, RGN_DIFF); + wayland_shm_buffer_copy(wws->wayland_surface->latest_window_buffer, + shm_buffer, copy_from_latest_region); + NtGdiDeleteObjectApp(copy_from_latest_region); + } + /* ... and use the window_surface as the source of pixel data contained + * in the flush bounds. */ + copy_from_window_region = surface_damage_region; + } + else + { + TRACE("latest_window_buffer=NULL\n"); + /* If we don't have a latest buffer, use the window_surface as + * the source of all pixel data. */ + copy_from_window_region = shm_buffer->damage_region; + } + + wayland_window_surface_copy_to_buffer(wws, shm_buffer, copy_from_window_region); pthread_mutex_lock(&wws->wayland_surface->mutex); if (wws->wayland_surface->current_serial) @@ -417,9 +458,16 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) wl_display_flush(process_wayland.wl_display); NtGdiSetRectRgn(shm_buffer->damage_region, 0, 0, 0, 0); + /* Update the latest window buffer for the wayland surface. Note that we + * only care whether the buffer contains the latest window contents, + * it's irrelevant if it was actually committed or not. */ + if (wws->wayland_surface->latest_window_buffer) + wayland_shm_buffer_unref(wws->wayland_surface->latest_window_buffer); + wayland_shm_buffer_ref((wws->wayland_surface->latest_window_buffer = shm_buffer)); done: if (flushed) reset_bounds(&wws->bounds); + if (surface_damage_region) NtGdiDeleteObjectApp(surface_damage_region); wayland_window_surface_unlock(window_surface); }

1 0

Alexandros Frantzis : winewayland.drv: Send surface damage region to the compositor.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 295d961ee2c20d19193b26c1b3f29dd9f11e4a85 URL: https://gitlab.winehq.org/wine/wine/-/commit/295d961ee2c20d19193b26c1b3f29d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Jul 3 14:48:51 2023 +0300 winewayland.drv: Send surface damage region to the compositor. Send the surface damage region to the compositor, to enable it to optimize pixel data transfers. --- dlls/winewayland.drv/wayland_surface.c | 26 +++++++++++++++++++++++--- dlls/winewayland.drv/waylanddrv.h | 5 ++++- dlls/winewayland.drv/window_surface.c | 5 +++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index c770083b23f..fbc49191d9e 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -226,8 +226,11 @@ void wayland_surface_clear_role(struct wayland_surface *surface) * released by the compositor. */ void wayland_surface_attach_shm(struct wayland_surface *surface, - struct wayland_shm_buffer *shm_buffer) + struct wayland_shm_buffer *shm_buffer, + HRGN surface_damage_region) { + RGNDATA *surface_damage; + TRACE("surface=%p shm_buffer=%p (%dx%d)\n", surface, shm_buffer, shm_buffer->width, shm_buffer->height); @@ -235,8 +238,25 @@ void wayland_surface_attach_shm(struct wayland_surface *surface, wayland_shm_buffer_ref(shm_buffer); wl_surface_attach(surface->wl_surface, shm_buffer->wl_buffer, 0, 0); - wl_surface_damage_buffer(surface->wl_surface, 0, 0, - shm_buffer->width, shm_buffer->height); + + /* Add surface damage, i.e., which parts of the surface have changed since + * the last surface commit. Note that this is different from the buffer + * damage region. */ + surface_damage = get_region_data(surface_damage_region); + if (surface_damage) + { + RECT *rgn_rect = (RECT *)surface_damage->Buffer; + RECT *rgn_rect_end = rgn_rect + surface_damage->rdh.nCount; + + for (;rgn_rect < rgn_rect_end; rgn_rect++) + { + wl_surface_damage_buffer(surface->wl_surface, + rgn_rect->left, rgn_rect->top, + rgn_rect->right - rgn_rect->left, + rgn_rect->bottom - rgn_rect->top); + } + free(surface_damage); + } } /********************************************************************** diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 909c8ef5b7b..0fd2a7a6c77 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -146,7 +146,8 @@ void wayland_surface_destroy(struct wayland_surface *surface) DECLSPEC_HIDDEN; void wayland_surface_make_toplevel(struct wayland_surface *surface) DECLSPEC_HIDDEN; void wayland_surface_clear_role(struct wayland_surface *surface) DECLSPEC_HIDDEN; void wayland_surface_attach_shm(struct wayland_surface *surface, - struct wayland_shm_buffer *shm_buffer) DECLSPEC_HIDDEN; + struct wayland_shm_buffer *shm_buffer, + HRGN surface_damage_region) DECLSPEC_HIDDEN; /********************************************************************** * Wayland SHM buffer @@ -179,6 +180,8 @@ static inline BOOL intersect_rect(RECT *dst, const RECT *src1, const RECT *src2) return !IsRectEmpty(dst); } +RGNDATA *get_region_data(HRGN region) DECLSPEC_HIDDEN; + /********************************************************************** * USER driver functions */ diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index 015306bc5f6..baf2c12a922 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -271,7 +271,7 @@ static void wayland_window_surface_set_region(struct window_surface *window_surf /********************************************************************** * get_region_data */ -static RGNDATA *get_region_data(HRGN region) +RGNDATA *get_region_data(HRGN region) { RGNDATA *data; DWORD size; @@ -446,7 +446,8 @@ static void wayland_window_surface_flush(struct window_surface *window_surface) pthread_mutex_lock(&wws->wayland_surface->mutex); if (wws->wayland_surface->current_serial) { - wayland_surface_attach_shm(wws->wayland_surface, shm_buffer); + wayland_surface_attach_shm(wws->wayland_surface, shm_buffer, + surface_damage_region); wl_surface_commit(wws->wayland_surface->wl_surface); flushed = TRUE; }

1 0

Alistair Leslie-Hughes : urlmon: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 075d86affbd1ce913ff89ae8425ebd2d3d58fd68 URL: https://gitlab.winehq.org/wine/wine/-/commit/075d86affbd1ce913ff89ae8425ebd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 20:37:22 2023 +1000 urlmon: Remove DECLSPEC_HIDDEN usage. --- dlls/urlmon/urlmon_main.h | 108 +++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index b1a255a125c..81b0d629f53 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -33,57 +33,57 @@ #include "wine/list.h" -extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; -extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT Uri_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; - -extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN; -extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; -extern HRESULT WINAPI URLMON_DllRegisterServer(void) DECLSPEC_HIDDEN; -extern HRESULT WINAPI URLMON_DllUnregisterServer(void) DECLSPEC_HIDDEN; - -extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; -extern GUID const CLSID_CUri DECLSPEC_HIDDEN; +extern HINSTANCE hProxyDll; +extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT StdURLMoniker_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT HttpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT HttpSProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT Uri_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); + +extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); +extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); +extern HRESULT WINAPI URLMON_DllRegisterServer(void); +extern HRESULT WINAPI URLMON_DllUnregisterServer(void); + +extern GUID const CLSID_PSFactoryBuffer; +extern GUID const CLSID_CUri; /********************************************************************** * Dll lifetime tracking declaration for urlmon.dll */ -extern LONG URLMON_refCount DECLSPEC_HIDDEN; +extern LONG URLMON_refCount; static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } -extern HINSTANCE urlmon_instance DECLSPEC_HIDDEN; +extern HINSTANCE urlmon_instance; -IInternetProtocolInfo *get_protocol_info(LPCWSTR) DECLSPEC_HIDDEN; -HRESULT get_protocol_handler(IUri*,CLSID*,IClassFactory**) DECLSPEC_HIDDEN; -IInternetProtocol *get_mime_filter(LPCWSTR) DECLSPEC_HIDDEN; -BOOL is_registered_protocol(LPCWSTR) DECLSPEC_HIDDEN; -HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL) DECLSPEC_HIDDEN; -HINTERNET get_internet_session(IInternetBindInfo*) DECLSPEC_HIDDEN; -WCHAR *get_useragent(void) DECLSPEC_HIDDEN; -void update_user_agent(WCHAR*) DECLSPEC_HIDDEN; -void free_session(void) DECLSPEC_HIDDEN; +IInternetProtocolInfo *get_protocol_info(LPCWSTR); +HRESULT get_protocol_handler(IUri*,CLSID*,IClassFactory**); +IInternetProtocol *get_mime_filter(LPCWSTR); +BOOL is_registered_protocol(LPCWSTR); +HRESULT register_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL); +HINTERNET get_internet_session(IInternetBindInfo*); +WCHAR *get_useragent(void); +void update_user_agent(WCHAR*); +void free_session(void); -HRESULT find_mime_from_ext(const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; +HRESULT find_mime_from_ext(const WCHAR*,WCHAR**); -HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv) DECLSPEC_HIDDEN; +HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**); +HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv); -HRESULT create_default_callback(IBindStatusCallback**) DECLSPEC_HIDDEN; -HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**) DECLSPEC_HIDDEN; -IBindStatusCallback *bsc_from_bctx(IBindCtx*) DECLSPEC_HIDDEN; +HRESULT create_default_callback(IBindStatusCallback**); +HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**); +IBindStatusCallback *bsc_from_bctx(IBindCtx*); typedef HRESULT (*stop_cache_binding_proc_t)(void*,const WCHAR*,HRESULT,const WCHAR*); -HRESULT download_to_cache(IUri*,stop_cache_binding_proc_t,void*,IBindStatusCallback*) DECLSPEC_HIDDEN; +HRESULT download_to_cache(IUri*,stop_cache_binding_proc_t,void*,IBindStatusCallback*); typedef struct ProtocolVtbl ProtocolVtbl; @@ -151,16 +151,16 @@ struct ProtocolVtbl { #define FLAG_ERROR 0x0040 #define FLAG_SYNC_READ 0x0080 -HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN; -HRESULT protocol_continue(Protocol*,PROTOCOLDATA*) DECLSPEC_HIDDEN; -HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*) DECLSPEC_HIDDEN; -HRESULT protocol_lock_request(Protocol*) DECLSPEC_HIDDEN; -HRESULT protocol_unlock_request(Protocol*) DECLSPEC_HIDDEN; -HRESULT protocol_abort(Protocol*,HRESULT) DECLSPEC_HIDDEN; -HRESULT protocol_syncbinding(Protocol*) DECLSPEC_HIDDEN; -void protocol_close_connection(Protocol*) DECLSPEC_HIDDEN; +HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); +HRESULT protocol_continue(Protocol*,PROTOCOLDATA*); +HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*); +HRESULT protocol_lock_request(Protocol*); +HRESULT protocol_unlock_request(Protocol*); +HRESULT protocol_abort(Protocol*,HRESULT); +HRESULT protocol_syncbinding(Protocol*); +void protocol_close_connection(Protocol*); -void find_domain_name(const WCHAR*,DWORD,INT*) DECLSPEC_HIDDEN; +void find_domain_name(const WCHAR*,DWORD,INT*); typedef struct _task_header_t task_header_t; @@ -212,8 +212,8 @@ typedef struct { BSTR display_uri; } BindProtocol; -HRESULT create_binding_protocol(BindProtocol**) DECLSPEC_HIDDEN; -void set_binding_sink(BindProtocol*,IInternetProtocolSink*,IInternetBindInfo*) DECLSPEC_HIDDEN; +HRESULT create_binding_protocol(BindProtocol**); +void set_binding_sink(BindProtocol*,IInternetProtocolSink*,IInternetBindInfo*); typedef struct { HWND notif_hwnd; @@ -222,13 +222,13 @@ typedef struct { struct list entry; } tls_data_t; -tls_data_t *get_tls_data(void) DECLSPEC_HIDDEN; +tls_data_t *get_tls_data(void); -void unregister_notif_wnd_class(void) DECLSPEC_HIDDEN; -HWND get_notif_hwnd(void) DECLSPEC_HIDDEN; -void release_notif_hwnd(HWND) DECLSPEC_HIDDEN; +void unregister_notif_wnd_class(void); +HWND get_notif_hwnd(void); +void release_notif_hwnd(HWND); -const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; +const char *debugstr_bindstatus(ULONG); static inline WCHAR *strndupW(LPCWSTR str, int len) {

1 0

Alistair Leslie-Hughes : shdocvw: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 23a4ff05cc206a5f02050bdbce02d2295c4fb792 URL: https://gitlab.winehq.org/wine/wine/-/commit/23a4ff05cc206a5f02050bdbce02d2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 20:37:22 2023 +1000 shdocvw: Remove DECLSPEC_HIDDEN usage. --- dlls/shdocvw/shdocvw.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 568fbadfbd6..0b76b3d91f7 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -41,12 +41,12 @@ * Shell Instance Objects */ extern HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, - REFIID riid, LPVOID *ppvClassObj) DECLSPEC_HIDDEN; + REFIID riid, LPVOID *ppvClassObj); /********************************************************************** * Dll lifetime tracking declaration for shdocvw.dll */ -extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; +extern LONG SHDOCVW_refCount; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); }

1 0

Alistair Leslie-Hughes : wininet: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: bf21091547ad8e9591c821ee7cb8729d9ceb3974 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf21091547ad8e9591c821ee7cb872… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 6 20:37:22 2023 +1000 wininet: Remove DECLSPEC_HIDDEN usage. --- dlls/wininet/internet.h | 90 ++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index d9598d18eb5..b5be0523188 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -29,7 +29,7 @@ #include "winineti.h" -extern HMODULE WININET_hModule DECLSPEC_HIDDEN; +extern HMODULE WININET_hModule; typedef struct { WCHAR *name; @@ -52,15 +52,15 @@ typedef struct { struct list conn_pool; } server_t; -void server_addref(server_t*) DECLSPEC_HIDDEN; -void server_release(server_t*) DECLSPEC_HIDDEN; +void server_addref(server_t*); +void server_release(server_t*); typedef enum { COLLECT_TIMEOUT, COLLECT_CONNECTIONS, COLLECT_CLEANUP } collect_type_t; -BOOL collect_connections(collect_type_t) DECLSPEC_HIDDEN; +BOOL collect_connections(collect_type_t); /* used for netconnection.c stuff */ typedef struct @@ -85,8 +85,8 @@ typedef struct struct list pool_entry; } netconn_t; -BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; -void close_netconn(netconn_t *) DECLSPEC_HIDDEN; +BOOL is_valid_netconn(netconn_t *); +void close_netconn(netconn_t *); static inline WCHAR *strndupW(const WCHAR *str, UINT max_len) { @@ -360,61 +360,61 @@ struct task_header_t object_header_t *hdr; }; -void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN; +void *alloc_async_task(object_header_t*,async_task_proc_t,size_t); -void *alloc_object(object_header_t*,const object_vtbl_t*,size_t) DECLSPEC_HIDDEN; -object_header_t *get_handle_object( HINTERNET hinternet ) DECLSPEC_HIDDEN; -object_header_t *WININET_AddRef( object_header_t *info ) DECLSPEC_HIDDEN; -BOOL WININET_Release( object_header_t *info ) DECLSPEC_HIDDEN; +void *alloc_object(object_header_t*,const object_vtbl_t*,size_t); +object_header_t *get_handle_object( HINTERNET hinternet ); +object_header_t *WININET_AddRef( object_header_t *info ); +BOOL WININET_Release( object_header_t *info ); -DWORD INET_QueryOption(object_header_t*,DWORD,void*,DWORD*,BOOL) DECLSPEC_HIDDEN; -DWORD INET_SetOption(object_header_t*,DWORD,void*,DWORD) DECLSPEC_HIDDEN; +DWORD INET_QueryOption(object_header_t*,DWORD,void*,DWORD*,BOOL); +DWORD INET_SetOption(object_header_t*,DWORD,void*,DWORD); -time_t ConvertTimeString(LPCWSTR asctime) DECLSPEC_HIDDEN; +time_t ConvertTimeString(LPCWSTR asctime); HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, - DWORD dwInternalFlags) DECLSPEC_HIDDEN; + DWORD dwInternalFlags); DWORD HTTP_Connect(appinfo_t*,LPCWSTR, INTERNET_PORT nServerPort, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, - DWORD dwInternalFlags, HINTERNET*) DECLSPEC_HIDDEN; + DWORD dwInternalFlags, HINTERNET*); -BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*) DECLSPEC_HIDDEN; +BOOL GetAddress(const WCHAR*,INTERNET_PORT,SOCKADDR*,int*,char*); -DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; -DWORD set_cookie(substr_t,substr_t,substr_t,substr_t,DWORD) DECLSPEC_HIDDEN; +DWORD get_cookie_header(const WCHAR*,const WCHAR*,WCHAR**); +DWORD set_cookie(substr_t,substr_t,substr_t,substr_t,DWORD); -void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; -DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN; -DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN; -LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN; +void INTERNET_SetLastError(DWORD dwError); +DWORD INTERNET_GetLastError(void); +DWORD INTERNET_AsyncCall(task_header_t*); +LPSTR INTERNET_GetResponseBuffer(void); VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, - DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; -WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto) DECLSPEC_HIDDEN; + DWORD dwStatusInfoLength); +WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto); -DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; -void free_netconn(netconn_t*) DECLSPEC_HIDDEN; -void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; +DWORD create_netconn(server_t*,DWORD,BOOL,DWORD,netconn_t**); +void free_netconn(netconn_t*); +void NETCON_unload(void); +DWORD NETCON_secure_connect(netconn_t*,server_t*); DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, - int *sent /* out */) DECLSPEC_HIDDEN; -DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*) DECLSPEC_HIDDEN; -BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; -LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; -int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; -DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; -int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; -int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; + int *sent /* out */); +DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*); +BOOL NETCON_is_alive(netconn_t*); +LPCVOID NETCON_GetCert(netconn_t *connection); +int NETCON_GetCipherStrength(netconn_t*); +DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value); +int sock_send(int fd, const void *msg, size_t len, int flags); +int sock_recv(int fd, void *msg, size_t len, int flags); -server_t *get_server(substr_t,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; +server_t *get_server(substr_t,INTERNET_PORT,BOOL,BOOL); -DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; -void req_file_release(req_file_t*) DECLSPEC_HIDDEN; +DWORD create_req_file(const WCHAR*,req_file_t**); +void req_file_release(req_file_t*); static inline req_file_t *req_file_addref(req_file_t *req_file) { @@ -422,12 +422,12 @@ static inline req_file_t *req_file_addref(req_file_t *req_file) return req_file; } -BOOL init_urlcache(void) DECLSPEC_HIDDEN; -void free_urlcache(void) DECLSPEC_HIDDEN; -void free_cookie(void) DECLSPEC_HIDDEN; -void free_authorization_cache(void) DECLSPEC_HIDDEN; +BOOL init_urlcache(void); +void free_urlcache(void); +void free_cookie(void); +void free_authorization_cache(void); -void init_winsock(void) DECLSPEC_HIDDEN; +void init_winsock(void); #define MAX_REPLY_LEN 0x1000

1 0

Jacek Caban : dbghelp: Use V_INT macro to access VARIANT value.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 439a36e33a72de317a82380c64ee7b5ba80159d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/439a36e33a72de317a82380c64ee7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:34:50 2023 +0200 dbghelp: Use V_INT macro to access VARIANT value. --- dlls/dbghelp/msc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5abd5b577a1..6af3b415bf8 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2582,8 +2582,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, name = (const struct p_string*)((const char*)&sym->constant_v1.cvalue + vlen); se = codeview_get_type(sym->constant_v1.type, FALSE); - TRACE("S-Constant-V1 %u %s %x\n", - v.n1.n2.n3.intVal, terminate_string(name), sym->constant_v1.type); + TRACE("S-Constant-V1 %u %s %x\n", V_INT(&v), terminate_string(name), sym->constant_v1.type); symt_new_constant(msc_dbg->module, compiland, terminate_string(name), se, &v); } @@ -2599,8 +2598,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, name = (const struct p_string*)((const char*)&sym->constant_v2.cvalue + vlen); se = codeview_get_type(sym->constant_v2.type, FALSE); - TRACE("S-Constant-V2 %u %s %x\n", - v.n1.n2.n3.intVal, terminate_string(name), sym->constant_v2.type); + TRACE("S-Constant-V2 %u %s %x\n", V_INT(&v), terminate_string(name), sym->constant_v2.type); symt_new_constant(msc_dbg->module, compiland, terminate_string(name), se, &v); } @@ -2616,8 +2614,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, name = (const char*)&sym->constant_v3.cvalue + vlen; se = codeview_get_type(sym->constant_v3.type, FALSE); - TRACE("S-Constant-V3 %u %s %x\n", - v.n1.n2.n3.intVal, name, sym->constant_v3.type); + TRACE("S-Constant-V3 %u %s %x\n", V_INT(&v), name, sym->constant_v3.type); /* FIXME: we should add this as a constant value */ symt_new_constant(msc_dbg->module, compiland, name, se, &v); }

1 0

Jacek Caban : oleaut32/tests: Don't use __tagBRECORD type.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: b87e96200c3781f5bb97a556c6b571951e84db9a URL: https://gitlab.winehq.org/wine/wine/-/commit/b87e96200c3781f5bb97a556c6b571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:37:38 2023 +0200 oleaut32/tests: Don't use __tagBRECORD type. --- dlls/oleaut32/tests/vartest.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 34d0d1f269b..cf93e4cd5fc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -248,7 +248,7 @@ typedef struct IRecordInfoImpl unsigned int recordclear; unsigned int getsize; unsigned int recordcopy; - struct __tagBRECORD *rec; + VARIANT *v; } IRecordInfoImpl; static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) @@ -298,7 +298,7 @@ static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, void *data) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordclear++; - This->rec->pvRecord = NULL; + V_RECORD(This->v) = NULL; return S_OK; } @@ -766,7 +766,6 @@ static test_VariantClearImpl test_myVariantClearImpl = {{&test_VariantClear_vtbl static void test_VariantClear(void) { - struct __tagBRECORD *rec; IRecordInfoImpl *recinfo; HRESULT hres; VARIANTARG v; @@ -891,15 +890,14 @@ static void test_VariantClear(void) /* RECORD */ recinfo = get_test_recordinfo(); V_VT(&v) = VT_RECORD; - rec = &V_UNION(&v, brecVal); - rec->pRecInfo = &recinfo->IRecordInfo_iface; - rec->pvRecord = (void*)0xdeadbeef; + V_RECORDINFO(&v) = &recinfo->IRecordInfo_iface; + V_RECORD(&v) = (void*)0xdeadbeef; recinfo->recordclear = 0; recinfo->ref = 2; - recinfo->rec = rec; + recinfo->v = &v; hres = VariantClear(&v); ok(hres == S_OK, "ret %08lx\n", hres); - ok(rec->pvRecord == NULL, "got %p\n", rec->pvRecord); + ok(V_RECORD(&v) == NULL, "got %p\n", V_RECORD(&v)); ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); ok(recinfo->ref == 1, "got %ld\n", recinfo->ref); IRecordInfo_Release(&recinfo->IRecordInfo_iface); @@ -907,7 +905,6 @@ static void test_VariantClear(void) static void test_VariantCopy(void) { - struct __tagBRECORD *rec; IRecordInfoImpl *recinfo; VARIANTARG vSrc, vDst; VARTYPE vt; @@ -1032,20 +1029,18 @@ static void test_VariantCopy(void) V_VT(&vDst) = VT_EMPTY; V_VT(&vSrc) = VT_RECORD; - rec = &V_UNION(&vSrc, brecVal); - rec->pRecInfo = &recinfo->IRecordInfo_iface; - rec->pvRecord = (void*)0xdeadbeef; + V_RECORDINFO(&vSrc) = &recinfo->IRecordInfo_iface; + V_RECORD(&vSrc) = (void*)0xdeadbeef; recinfo->recordclear = 0; recinfo->recordcopy = 0; recinfo->getsize = 0; - recinfo->rec = rec; + recinfo->v = &vSrc; hres = VariantCopy(&vDst, &vSrc); ok(hres == S_OK, "ret %08lx\n", hres); - rec = &V_UNION(&vDst, brecVal); - ok(rec->pvRecord != (void*)0xdeadbeef && rec->pvRecord != NULL, "got %p\n", rec->pvRecord); - ok(rec->pRecInfo == &recinfo->IRecordInfo_iface, "got %p\n", rec->pRecInfo); + ok(V_RECORD(&vDst) != (void*)0xdeadbeef && V_RECORD(&vDst) != NULL, "got %p\n", V_RECORD(&vDst)); + ok(V_RECORDINFO(&vDst) == &recinfo->IRecordInfo_iface, "got %p\n", V_RECORDINFO(&vDst)); ok(recinfo->getsize == 1, "got %d\n", recinfo->recordclear); ok(recinfo->recordcopy == 1, "got %d\n", recinfo->recordclear);

1 0

Jacek Caban : oleaut32: Don't use __tagBRECORD type.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: b6c5bae7cc1c2a81a9a1c64d46a0037eb30183ca URL: https://gitlab.winehq.org/wine/wine/-/commit/b6c5bae7cc1c2a81a9a1c64d46a003… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:40:06 2023 +0200 oleaut32: Don't use __tagBRECORD type. --- dlls/oleaut32/variant.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 85fef3113b6..fa4492b968a 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -585,11 +585,11 @@ HRESULT VARIANT_ClearInd(VARIANTARG *pVarg) case VT_RECORD: case VT_RECORD | VT_BYREF: { - struct __tagBRECORD* pBr = &V_UNION(pVarg,brecVal); - if (pBr->pRecInfo) + IRecordInfo *rec_info = V_RECORDINFO(pVarg); + if (rec_info) { - IRecordInfo_RecordClear(pBr->pRecInfo, pBr->pvRecord); - IRecordInfo_Release(pBr->pRecInfo); + IRecordInfo_RecordClear(rec_info, V_RECORD(pVarg)); + IRecordInfo_Release(rec_info); } break; } @@ -645,11 +645,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) } else if (V_VT(pVarg) == VT_RECORD) { - struct __tagBRECORD* pBr = &V_UNION(pVarg,brecVal); - if (pBr->pRecInfo) + IRecordInfo *rec_info = V_RECORDINFO(pVarg); + if (rec_info) { - IRecordInfo_RecordClear(pBr->pRecInfo, pBr->pvRecord); - IRecordInfo_Release(pBr->pRecInfo); + IRecordInfo_RecordClear(rec_info, V_RECORD(pVarg)); + IRecordInfo_Release(rec_info); } } else if (V_VT(pVarg) == VT_DISPATCH || @@ -669,31 +669,28 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) */ static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, const VARIANT *src) { - struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); - const struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + IRecordInfo *src_info = V_RECORDINFO(src); HRESULT hr = S_OK; ULONG size; - if (!src_rec->pRecInfo) + if (!src_info) { - if (src_rec->pvRecord) return E_INVALIDARG; + if (V_RECORD(src)) return E_INVALIDARG; return S_OK; } - hr = IRecordInfo_GetSize(src_rec->pRecInfo, &size); + hr = IRecordInfo_GetSize(src_info, &size); if (FAILED(hr)) return hr; /* Windows does not use RecordCreate() here, memory should be allocated in compatible way so RecordDestroy() could free it later. */ - dest_rec->pvRecord = CoTaskMemAlloc(size); - if (!dest_rec->pvRecord) return E_OUTOFMEMORY; + V_RECORD(dest) = CoTaskMemAlloc(size); + if (!V_RECORD(dest)) return E_OUTOFMEMORY; if (size) - memset(dest_rec->pvRecord, 0, size); + memset(V_RECORD(dest), 0, size); - dest_rec->pRecInfo = src_rec->pRecInfo; - IRecordInfo_AddRef(src_rec->pRecInfo); - - return IRecordInfo_RecordCopy(src_rec->pRecInfo, src_rec->pvRecord, dest_rec->pvRecord); + IRecordInfo_AddRef(V_RECORDINFO(dest) = src_info); + return IRecordInfo_RecordCopy(src_info, V_RECORD(src), V_RECORD(dest)); } /******************************************************************************

1 0

Jacek Caban : oleaut32: Use macros to access variant members.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: 28f3128d24cc3a98c9d3514bfd9082e5813faf3c URL: https://gitlab.winehq.org/wine/wine/-/commit/28f3128d24cc3a98c9d3514bfd9082… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:41:02 2023 +0200 oleaut32: Use macros to access variant members. --- dlls/oleaut32/usrmarshal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index ae4d11b7a0c..eed0f3ac0aa 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -399,11 +399,11 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header->clSize = 0; /* fixed up at the end */ header->rpcReserved = 0; - header->vt = pvar->n1.n2.vt; + header->vt = V_VT(pvar); header->wReserved1 = pvar->n1.n2.wReserved1; header->wReserved2 = pvar->n1.n2.wReserved2; header->wReserved3 = pvar->n1.n2.wReserved3; - header->switch_is = pvar->n1.n2.vt; + header->switch_is = V_VT(pvar); if(header->switch_is & VT_ARRAY) header->switch_is &= ~VT_TYPEMASK; @@ -418,7 +418,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, Pos += 4; if((header->vt & VT_TYPEMASK) != VT_VARIANT) { - memcpy(Pos, pvar->n1.n2.n3.byref, type_size); + memcpy(Pos, V_BYREF(pvar), type_size); Pos += type_size; } else @@ -432,7 +432,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(Pos, pvar, type_size); else - memcpy(Pos, &pvar->n1.n2.n3, type_size); + memcpy(Pos, &V_UI8(pvar), type_size); Pos += type_size; } @@ -561,11 +561,11 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe else if((header->vt & VT_TYPEMASK) == VT_DECIMAL) memcpy(pvar, Pos, type_size); else - memcpy(&pvar->n1.n2.n3, Pos, type_size); + memcpy(&V_UI8(pvar), Pos, type_size); Pos += type_size; } - pvar->n1.n2.vt = header->vt; + V_VT(pvar) = header->vt; pvar->n1.n2.wReserved1 = header->wReserved1; pvar->n1.n2.wReserved2 = header->wReserved2; pvar->n1.n2.wReserved3 = header->wReserved3; @@ -621,7 +621,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) TRACE("%#lx, %p.\n", *pFlags, pvar); TRACE("vt=%04x\n", V_VT(pvar)); - if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref; + if (vt & VT_BYREF) ref = V_BYREF(pvar); VariantClear(pvar); if (!ref) return;

1 0

Jacek Caban : include: Don't force named VARIANT members when __STDC__ is defined.
by Alexandre Julliard 06 Jul '23

06 Jul '23

Module: wine Branch: master Commit: e68d6c16741a42cd4c27a6a9fa5683fdd053ae4d URL: https://gitlab.winehq.org/wine/wine/-/commit/e68d6c16741a42cd4c27a6a9fa5683… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:36:39 2023 +0200 include: Don't force named VARIANT members when __STDC__ is defined. --- dlls/oleaut32/tests/usrmarshal.c | 24 +++++++++--------------- dlls/oleaut32/usrmarshal.c | 12 ++++++------ include/oaidl.idl | 2 +- include/oleauto.h | 4 ++-- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 6559cdcd865..fee8097fac8 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -30,12 +30,6 @@ #include "wine/test.h" -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) -# define V_U2(A) ((A)->n1.n2) -#else -# define V_U2(A) (*(A)) -#endif - typedef struct { IUnknown IUnknown_iface; @@ -870,9 +864,9 @@ static DWORD *check_variant_header(DWORD *wirev, VARIANT *v, ULONG size) ok(header->clSize == (size + 7) >> 3, "wv[0] %08lx, expected %08lx\n", header->clSize, (size + 7) >> 3); ok(header->rpcReserved == 0, "wv[1] %08lx\n", header->rpcReserved); ok(header->vt == V_VT(v), "vt %04x expected %04x\n", header->vt, V_VT(v)); - ok(header->wReserved1 == V_U2(v).wReserved1, "res1 %04x expected %04x\n", header->wReserved1, V_U2(v).wReserved1); - ok(header->wReserved2 == V_U2(v).wReserved2, "res2 %04x expected %04x\n", header->wReserved2, V_U2(v).wReserved2); - ok(header->wReserved3 == V_U2(v).wReserved3, "res3 %04x expected %04x\n", header->wReserved3, V_U2(v).wReserved3); + ok(header->wReserved1 == v->wReserved1, "res1 %04x expected %04x\n", header->wReserved1, v->wReserved1); + ok(header->wReserved2 == v->wReserved2, "res2 %04x expected %04x\n", header->wReserved2, v->wReserved2); + ok(header->wReserved3 == v->wReserved3, "res3 %04x expected %04x\n", header->wReserved3, v->wReserved3); switch_is = V_VT(v); if(switch_is & VT_ARRAY) @@ -938,9 +932,9 @@ static void test_marshal_VARIANT(void) /* check_variant_header tests wReserved[123], so initialize to unique values. * (Could probably also do this by setting the variant to a known DECIMAL.) */ - V_U2(&v).wReserved1 = 0x1234; - V_U2(&v).wReserved2 = 0x5678; - V_U2(&v).wReserved3 = 0x9abc; + v.wReserved1 = 0x1234; + v.wReserved2 = 0x5678; + v.wReserved3 = 0x9abc; /* Variants have an alignment of 8 */ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 1, &v); @@ -1306,9 +1300,9 @@ static void test_marshal_VARIANT(void) /* check_variant_header tests wReserved[123], so initialize to unique values. * (Could probably also do this by setting the variant to a known DECIMAL.) */ - V_U2(&v2).wReserved1 = 0x0123; - V_U2(&v2).wReserved2 = 0x4567; - V_U2(&v2).wReserved3 = 0x89ab; + v2.wReserved1 = 0x0123; + v2.wReserved2 = 0x4567; + v2.wReserved3 = 0x89ab; stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index eed0f3ac0aa..25bce3155bf 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -400,9 +400,9 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header->clSize = 0; /* fixed up at the end */ header->rpcReserved = 0; header->vt = V_VT(pvar); - header->wReserved1 = pvar->n1.n2.wReserved1; - header->wReserved2 = pvar->n1.n2.wReserved2; - header->wReserved3 = pvar->n1.n2.wReserved3; + header->wReserved1 = pvar->wReserved1; + header->wReserved2 = pvar->wReserved2; + header->wReserved3 = pvar->wReserved3; header->switch_is = V_VT(pvar); if(header->switch_is & VT_ARRAY) header->switch_is &= ~VT_TYPEMASK; @@ -566,9 +566,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe } V_VT(pvar) = header->vt; - pvar->n1.n2.wReserved1 = header->wReserved1; - pvar->n1.n2.wReserved2 = header->wReserved2; - pvar->n1.n2.wReserved3 = header->wReserved3; + pvar->wReserved1 = header->wReserved1; + pvar->wReserved2 = header->wReserved2; + pvar->wReserved3 = header->wReserved3; if(header->vt & VT_ARRAY) { diff --git a/include/oaidl.idl b/include/oaidl.idl index 37da734baf7..eb8b28e3b5a 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -142,7 +142,7 @@ const USHORT FADF_CREATEVECTOR = 0x2000; /* This array is a vector */ /* Variant */ -cpp_quote("#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)") +cpp_quote("#ifdef NONAMELESSUNION") cpp_quote("#define __VARIANT_NAME_1 n1") cpp_quote("#define __VARIANT_NAME_2 n2") cpp_quote("#define __VARIANT_NAME_3 n3") diff --git a/include/oleauto.h b/include/oleauto.h index 657986e399f..5d5b8bbd371 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -112,7 +112,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG */ /* Macros for accessing the fields of the VARIANT type */ -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +#ifdef NONAMELESSUNION #define V_VT(A) ((A)->n1.n2.vt) #define V_UNION(A,B) ((A)->n1.n2.n3.B) #define V_RECORD(A) (V_UNION(A,brecVal).pvRecord) @@ -140,7 +140,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG #define V_CYREF(A) V_UNION(A,pcyVal) #define V_DATE(A) V_UNION(A,date) #define V_DATEREF(A) V_UNION(A,pdate) -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +#ifdef NONAMELESSUNION #define V_DECIMAL(A) ((A)->n1.decVal) #else #define V_DECIMAL(A) ((A)->decVal)

1 0