- Wine-Commits - list.winehq.org

Alexandre Julliard : inetcomm: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 6431b9584b3bb957c7d819b0d1ce652bdb68a254 URL: https://gitlab.winehq.org/wine/wine/-/commit/6431b9584b3bb957c7d819b0d1ce65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:54 2023 +0200 inetcomm: Use nameless unions/structs. --- dlls/inetcomm/mimeintl.c | 1 - dlls/inetcomm/mimeole.c | 11 +++++------ dlls/inetcomm/pop3transport.c | 1 - dlls/inetcomm/protocol.c | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 0ac695afb39..1e5b1a0ce90 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index dd2c00b01fa..5a2225b2fdf 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> @@ -267,7 +266,7 @@ static HRESULT WINAPI sub_stream_Seek( sub_stream_t *This = impl_from_IStream(iface); LARGE_INTEGER new_pos; - TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + TRACE("(%08lx.%08lx, %lx, %p)\n", dlibMove.HighPart, dlibMove.LowPart, dwOrigin, plibNewPosition); switch(dwOrigin) { @@ -314,7 +313,7 @@ static HRESULT WINAPI sub_stream_CopyTo( ULARGE_INTEGER totalBytesRead; ULARGE_INTEGER totalBytesWritten; - TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); + TRACE("(%p)->(%p, %ld, %p, %p)\n", iface, pstm, cb.LowPart, pcbRead, pcbWritten); totalBytesRead.QuadPart = 0; totalBytesWritten.QuadPart = 0; @@ -324,7 +323,7 @@ static HRESULT WINAPI sub_stream_CopyTo( if ( cb.QuadPart >= sizeof(tmpBuffer) ) copySize = sizeof(tmpBuffer); else - copySize = cb.u.LowPart; + copySize = cb.LowPart; hr = IStream_Read(iface, tmpBuffer, copySize, &bytesRead); if (FAILED(hr)) break; @@ -2063,7 +2062,7 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc zero.QuadPart = 0; hr = IStream_Seek(stm, zero, STREAM_SEEK_CUR, &cur); - start = cur.u.LowPart; + start = cur.LowPart; do { hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read); @@ -2218,7 +2217,7 @@ static HRESULT WINAPI MimeMessage_Load(IMimeMessage *iface, IStream *pStm) zero.QuadPart = 0; IStream_Seek(pStm, zero, STREAM_SEEK_END, &cur); - offsets.cbBodyEnd = cur.u.LowPart; + offsets.cbBodyEnd = cur.LowPart; MimeBody_set_offsets(root_body->mime_body, &offsets); list_add_head(&This->body_tree, &root_body->entry); diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 7901b831cb5..6dbbab1fa3f 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index c98139ad49e..155adace482 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <assert.h> @@ -316,7 +315,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if assert(pstgmed->tymed == TYMED_ISTREAM); while(1) { - hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); + hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read); if(FAILED(hres)) return hres; if(!read) @@ -567,7 +566,7 @@ static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTE DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; }

1 0

Alexandre Julliard : fusion: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 36bb34fd7e60cf90b81f79694e7f119a56ecd70d URL: https://gitlab.winehq.org/wine/wine/-/commit/36bb34fd7e60cf90b81f79694e7f11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:56:55 2023 +0200 fusion: Use nameless unions/structs. --- dlls/fusion/asmenum.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 8a35951accc..bdde3bf1e3c 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -21,9 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -409,7 +406,7 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) lstrcpyW(path, buf); GetNativeSystemInfo(&info); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { lstrcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); @@ -432,7 +429,7 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) return hr; lstrcpyW(path, buf); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { lstrcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path);

1 0

Alexandre Julliard : hhctrl.ocx: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: a40b2139f7c5b5fa23ac606dc789c2672524451c URL: https://gitlab.winehq.org/wine/wine/-/commit/a40b2139f7c5b5fa23ac606dc789c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:18 2023 +0200 hhctrl.ocx: Use nameless unions/structs. --- dlls/hhctrl.ocx/content.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 8ad088c16ff..c6f01b80d97 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "hhctrl.h" #include "stream.h" #include "resource.h" @@ -267,12 +265,12 @@ static void insert_content_item(HWND hwnd, ContentItem *parent, ContentItem *ite TVINSERTSTRUCTW tvis; memset(&tvis, 0, sizeof(tvis)); - tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; - tvis.u.item.cchTextMax = lstrlenW(item->name)+1; - tvis.u.item.pszText = item->name; - tvis.u.item.lParam = (LPARAM)item; - tvis.u.item.iImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; - tvis.u.item.iSelectedImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; + tvis.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; + tvis.item.cchTextMax = lstrlenW(item->name)+1; + tvis.item.pszText = item->name; + tvis.item.lParam = (LPARAM)item; + tvis.item.iImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; + tvis.item.iSelectedImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; tvis.hParent = parent ? parent->id : 0; tvis.hInsertAfter = TVI_LAST;

1 0

Alexandre Julliard : gdiplus: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 313e4d0efc9f40246cee831007d88970a0d62fdc URL: https://gitlab.winehq.org/wine/wine/-/commit/313e4d0efc9f40246cee831007d889… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:07 2023 +0200 gdiplus: Use nameless unions/structs. --- dlls/gdiplus/image.c | 2 -- dlls/gdiplus/metafile.c | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3b9ce3c14f1..50a666c5bc9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -20,8 +20,6 @@ #include <stdarg.h> #include <assert.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4880211ad87..0664aa5fc89 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -20,8 +20,6 @@ #include <math.h> #include <assert.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -1702,7 +1700,7 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) BYTE* buffer; UINT buffer_size; - gdi_bounds_rc = header.u.EmfHeader.rclBounds; + gdi_bounds_rc = header.EmfHeader.rclBounds; if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) { @@ -4156,7 +4154,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY); header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX); header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY); - header->u.EmfHeader = emfheader; + header->EmfHeader = emfheader; if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly) { @@ -4259,11 +4257,11 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->image.frame_count = 1; (*metafile)->image.xres = header.DpiX; (*metafile)->image.yres = header.DpiY; - (*metafile)->bounds.X = (REAL)header.u.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; - (*metafile)->bounds.Y = (REAL)header.u.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; - (*metafile)->bounds.Width = (REAL)(header.u.EmfHeader.rclFrame.right - header.u.EmfHeader.rclFrame.left) + (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; + (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; + (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left) / 2540.0 * header.DpiX; - (*metafile)->bounds.Height = (REAL)(header.u.EmfHeader.rclFrame.bottom - header.u.EmfHeader.rclFrame.top) + (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top) / 2540.0 * header.DpiY; (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = header.Type;

1 0

Alexandre Julliard : ieframe: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: c48816400b300f830767b14207292d8efc0cfa31 URL: https://gitlab.winehq.org/wine/wine/-/commit/c48816400b300f830767b14207292d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:35 2023 +0200 ieframe: Use nameless unions/structs. --- dlls/ieframe/intshcut.c | 10 ++++------ dlls/ieframe/navigate.c | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index d250fb051ea..b992305a724 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -29,8 +29,6 @@ #include <stdio.h> -#define NONAMELESSUNION - #include "ieframe.h" #include "shlobj.h" @@ -507,7 +505,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam PROPSPEC ps; PROPVARIANT pv; ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONFILE; + ps.propid = PID_IS_ICONFILE; pv.vt = VT_LPWSTR; pv.pwszVal = iconfile; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); @@ -523,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam PROPVARIANT pv; iconindex = wcstol(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONINDEX; + ps.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; pv.iVal = iconindex; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); @@ -583,9 +581,9 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam PROPSPEC ps[2]; PROPVARIANT pvread[2]; ps[0].ulKind = PRSPEC_PROPID; - ps[0].u.propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].u.propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; WriteFile(file, str_header, ARRAY_SIZE(str_header) - 1, &bytesWritten, NULL); WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 8f8b1f3f192..488ac62fbdf 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "ieframe.h" #include "exdispid.h" @@ -80,7 +78,7 @@ static void dump_BINDINFO(BINDINFO *bi) "}\n", bi->cbSize, debugstr_w(bi->szExtraInfo), - bi->stgmedData.tymed, bi->stgmedData.u.hGlobal, bi->stgmedData.pUnkForRelease, + bi->stgmedData.tymed, bi->stgmedData.hGlobal, bi->stgmedData.pUnkForRelease, bi->grfBindInfoF > BINDINFOF_URLENCODEDEXTRAINFO ? "unknown" : BINDINFOF_str[bi->grfBindInfoF], bi->dwBindVerb > BINDVERB_CUSTOM @@ -392,7 +390,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->post_data; + pbindinfo->stgmedData.hGlobal = This->post_data; pbindinfo->cbstgmedData = This->post_data_len; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface; IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); @@ -1040,7 +1038,7 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, if(bindinfo.dwBindVerb == BINDVERB_POST) { post_data_len = bindinfo.cbstgmedData; if(post_data_len) - post_data = bindinfo.stgmedData.u.hGlobal; + post_data = bindinfo.stgmedData.hGlobal; } if(This->doc_navigate) {

1 0

Alexandre Julliard : ddrawex: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 4ca6d95a88ba1caa61c1248d3083e3b06805eb5a URL: https://gitlab.winehq.org/wine/wine/-/commit/4ca6d95a88ba1caa61c1248d3083e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:56:26 2023 +0200 ddrawex: Use nameless unions/structs. --- dlls/ddrawex/ddraw.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 736cb585eb9..4affc43ff3e 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h> #include "windef.h" @@ -387,21 +386,21 @@ void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) out->dwFlags = in->dwFlags; if(in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; if(in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; - if(in->dwFlags & DDSD_PIXELFORMAT) out->u4.ddpfPixelFormat = in->ddpfPixelFormat; + if(in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->ddpfPixelFormat; if(in->dwFlags & DDSD_CAPS) out->ddsCaps.dwCaps = in->ddsCaps.dwCaps; - if(in->dwFlags & DDSD_PITCH) out->u1.lPitch = in->u1.lPitch; - if(in->dwFlags & DDSD_BACKBUFFERCOUNT) out->u5.dwBackBufferCount = in->dwBackBufferCount; - if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->u2.dwMipMapCount = in->u2.dwZBufferBitDepth; /* same union */ + if(in->dwFlags & DDSD_PITCH) out->lPitch = in->lPitch; + if(in->dwFlags & DDSD_BACKBUFFERCOUNT) out->dwBackBufferCount = in->dwBackBufferCount; + if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->dwMipMapCount = in->dwZBufferBitDepth; /* same union */ if(in->dwFlags & DDSD_ALPHABITDEPTH) out->dwAlphaBitDepth = in->dwAlphaBitDepth; /* DDraw(native, and wine) does not set the DDSD_LPSURFACE, so always copy */ out->lpSurface = in->lpSurface; - if(in->dwFlags & DDSD_CKDESTOVERLAY) out->u3.ddckCKDestOverlay = in->ddckCKDestOverlay; + if(in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->ddckCKDestOverlay; if(in->dwFlags & DDSD_CKDESTBLT) out->ddckCKDestBlt = in->ddckCKDestBlt; if(in->dwFlags & DDSD_CKSRCOVERLAY) out->ddckCKSrcOverlay = in->ddckCKSrcOverlay; if(in->dwFlags & DDSD_CKSRCBLT) out->ddckCKSrcBlt = in->ddckCKSrcBlt; - if(in->dwFlags & DDSD_MIPMAPCOUNT) out->u2.dwMipMapCount = in->u2.dwMipMapCount; - if(in->dwFlags & DDSD_REFRESHRATE) out->u2.dwRefreshRate = in->u2.dwRefreshRate; - if(in->dwFlags & DDSD_LINEARSIZE) out->u1.dwLinearSize = in->u1.dwLinearSize; + if(in->dwFlags & DDSD_MIPMAPCOUNT) out->dwMipMapCount = in->dwMipMapCount; + if(in->dwFlags & DDSD_REFRESHRATE) out->dwRefreshRate = in->dwRefreshRate; + if(in->dwFlags & DDSD_LINEARSIZE) out->dwLinearSize = in->dwLinearSize; /* Does not exist in DDSURFACEDESC: * DDSD_TEXTURESTAGE, DDSD_FVF, DDSD_SRCVBHANDLE, */ @@ -414,21 +413,21 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) out->dwFlags = in->dwFlags; if(in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; if(in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; - if(in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->u4.ddpfPixelFormat; + if(in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->ddpfPixelFormat; if(in->dwFlags & DDSD_CAPS) out->ddsCaps.dwCaps = in->ddsCaps.dwCaps; - if(in->dwFlags & DDSD_PITCH) out->u1.lPitch = in->u1.lPitch; - if(in->dwFlags & DDSD_BACKBUFFERCOUNT) out->dwBackBufferCount = in->u5.dwBackBufferCount; - if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->u2.dwZBufferBitDepth = in->u2.dwMipMapCount; /* same union */ + if(in->dwFlags & DDSD_PITCH) out->lPitch = in->lPitch; + if(in->dwFlags & DDSD_BACKBUFFERCOUNT) out->dwBackBufferCount = in->dwBackBufferCount; + if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->dwZBufferBitDepth = in->dwMipMapCount; /* same union */ if(in->dwFlags & DDSD_ALPHABITDEPTH) out->dwAlphaBitDepth = in->dwAlphaBitDepth; /* DDraw(native, and wine) does not set the DDSD_LPSURFACE, so always copy */ out->lpSurface = in->lpSurface; - if(in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->u3.ddckCKDestOverlay; + if(in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->ddckCKDestOverlay; if(in->dwFlags & DDSD_CKDESTBLT) out->ddckCKDestBlt = in->ddckCKDestBlt; if(in->dwFlags & DDSD_CKSRCOVERLAY) out->ddckCKSrcOverlay = in->ddckCKSrcOverlay; if(in->dwFlags & DDSD_CKSRCBLT) out->ddckCKSrcBlt = in->ddckCKSrcBlt; - if(in->dwFlags & DDSD_MIPMAPCOUNT) out->u2.dwMipMapCount = in->u2.dwMipMapCount; - if(in->dwFlags & DDSD_REFRESHRATE) out->u2.dwRefreshRate = in->u2.dwRefreshRate; - if(in->dwFlags & DDSD_LINEARSIZE) out->u1.dwLinearSize = in->u1.dwLinearSize; + if(in->dwFlags & DDSD_MIPMAPCOUNT) out->dwMipMapCount = in->dwMipMapCount; + if(in->dwFlags & DDSD_REFRESHRATE) out->dwRefreshRate = in->dwRefreshRate; + if(in->dwFlags & DDSD_LINEARSIZE) out->dwLinearSize = in->dwLinearSize; /* Does not exist in DDSURFACEDESC: * DDSD_TEXTURESTAGE, DDSD_FVF, DDSD_SRCVBHANDLE, */

1 0

Alexandre Julliard : explorerframe: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 1e00844195043194b263d07d76c2fc1d0bf57027 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e00844195043194b263d07d76c2fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:56:43 2023 +0200 explorerframe: Use nameless unions/structs. --- dlls/explorerframe/nstc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 3b56d33367a..ffc512dcd75 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -21,8 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION - #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -333,7 +331,7 @@ static HTREEITEM insert_shellitem(NSTC2Impl *This, IShellItem *psi, HTREEITEM hParent, HTREEITEM hInsertAfter) { TVINSERTSTRUCTW tvins; - TVITEMEXW *tvi = &tvins.u.itemex; + TVITEMEXW *tvi = &tvins.itemex; HTREEITEM hinserted; TRACE("%p (%p, %p)\n", psi, hParent, hInsertAfter);

1 0

Alexandre Julliard : d3drm: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 2aab642849f329b24a228f530b97bf62c164b369 URL: https://gitlab.winehq.org/wine/wine/-/commit/2aab642849f329b24a228f530b97bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:55:55 2023 +0200 d3drm: Use nameless unions/structs. --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/device.c | 2 +- dlls/d3drm/frame.c | 56 +++++++++++++++++++++++----------------------- dlls/d3drm/math.c | 52 +++++++++++++++++++++--------------------- dlls/d3drm/meshbuilder.c | 24 ++++++++++---------- dlls/d3drm/viewport.c | 16 ++++++------- 6 files changed, 75 insertions(+), 77 deletions(-)

1 0

Alexandre Julliard : ddraw: Use nameless unions/structs.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: 5eab460c8b4710bdb974629c8375ececc287b09c URL: https://gitlab.winehq.org/wine/wine/-/commit/5eab460c8b4710bdb974629c8375ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:56:15 2023 +0200 ddraw: Use nameless unions/structs. --- dlls/ddraw/ddraw.c | 62 +++--- dlls/ddraw/ddraw_private.h | 2 - dlls/ddraw/device.c | 6 +- dlls/ddraw/executebuffer.c | 30 +-- dlls/ddraw/material.c | 10 +- dlls/ddraw/surface.c | 120 ++++++------ dlls/ddraw/utils.c | 455 ++++++++++++++++++++++----------------------- dlls/ddraw/viewport.c | 18 +- 8 files changed, 350 insertions(+), 353 deletions(-)

1 0

Connor McAdams : ole32/tests: Extend test_marshal_channel_buffer() test to include IRpcProxyBufferWrapper checks.
by Alexandre Julliard July 13, 2023

July 13, 2023

Module: wine Branch: master Commit: b87c502a4ffbfb3065978e2b852eb2d4e072d347 URL: https://gitlab.winehq.org/wine/wine/-/commit/b87c502a4ffbfb3065978e2b852eb2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 28 15:22:18 2023 -0400 ole32/tests: Extend test_marshal_channel_buffer() test to include IRpcProxyBufferWrapper checks. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 102 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 1344cf1d163..f76505ea1bf 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -351,10 +351,12 @@ static const IClassFactoryVtbl TestClassFactory_Vtbl = static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; DEFINE_EXPECT(Invoke); +DEFINE_EXPECT(Connect); DEFINE_EXPECT(CreateStub); DEFINE_EXPECT(CreateProxy); DEFINE_EXPECT(GetWindow); -DEFINE_EXPECT(Disconnect); +DEFINE_EXPECT(RpcStubBuffer_Disconnect); +DEFINE_EXPECT(RpcProxyBuffer_Disconnect); static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) { @@ -476,7 +478,7 @@ static HRESULT WINAPI RpcStubBuffer_Connect(IRpcStubBuffer *iface, IUnknown *pUn static void WINAPI RpcStubBuffer_Disconnect(IRpcStubBuffer *iface) { - CHECK_EXPECT(Disconnect); + CHECK_EXPECT(RpcStubBuffer_Disconnect); } static HRESULT WINAPI RpcStubBuffer_Invoke(IRpcStubBuffer *iface, RPCOLEMESSAGE *_prpcmsg, @@ -533,6 +535,79 @@ static const IRpcStubBufferVtbl RpcStubBufferVtbl = { RpcStubBuffer_DebugServerRelease }; +typedef struct { + IRpcProxyBuffer IRpcProxyBuffer_iface; + LONG ref; + IRpcProxyBuffer *buffer; +} ProxyBufferWrapper; + +static ProxyBufferWrapper *impl_from_IRpcProxyBuffer(IRpcProxyBuffer *iface) +{ + return CONTAINING_RECORD(iface, ProxyBufferWrapper, IRpcProxyBuffer_iface); +} + +static HRESULT WINAPI RpcProxyBuffer_QueryInterface(IRpcProxyBuffer *iface, REFIID riid, void **ppv) +{ + ProxyBufferWrapper *This = impl_from_IRpcProxyBuffer(iface); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IRpcProxyBuffer, riid)) { + *ppv = &This->IRpcProxyBuffer_iface; + }else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI RpcProxyBuffer_AddRef(IRpcProxyBuffer *iface) +{ + ProxyBufferWrapper *This = impl_from_IRpcProxyBuffer(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI RpcProxyBuffer_Release(IRpcProxyBuffer *iface) +{ + ProxyBufferWrapper *This = impl_from_IRpcProxyBuffer(iface); + LONG ref = InterlockedDecrement(&This->ref); + if(!ref) { + IRpcProxyBuffer_Release(This->buffer); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI RpcProxyBuffer_Connect(IRpcProxyBuffer *iface, IRpcChannelBuffer *pRpcChannelBuffer) +{ + ProxyBufferWrapper *This = impl_from_IRpcProxyBuffer(iface); + void *dest_context_data; + DWORD dest_context; + HRESULT hr; + + CHECK_EXPECT(Connect); + + hr = IRpcChannelBuffer_GetDestCtx(pRpcChannelBuffer, &dest_context, &dest_context_data); + ok(hr == S_OK, "GetDestCtx failed: %08lx\n", hr); + todo_wine ok(dest_context == MSHCTX_INPROC, "desc_context = %lx\n", dest_context); + ok(!dest_context_data, "desc_context_data = %p\n", dest_context_data); + + return IRpcProxyBuffer_Connect(This->buffer, pRpcChannelBuffer); +} + +static void WINAPI RpcProxyBuffer_Disconnect(IRpcProxyBuffer *iface) +{ + CHECK_EXPECT(RpcProxyBuffer_Disconnect); +} + +static const IRpcProxyBufferVtbl RpcProxyBufferVtbl = { + RpcProxyBuffer_QueryInterface, + RpcProxyBuffer_AddRef, + RpcProxyBuffer_Release, + RpcProxyBuffer_Connect, + RpcProxyBuffer_Disconnect, +}; + static IPSFactoryBuffer *ps_factory_buffer; static HRESULT WINAPI PSFactoryBuffer_QueryInterface(IPSFactoryBuffer *iface, REFIID riid, void **ppv) @@ -561,8 +636,20 @@ static ULONG WINAPI PSFactoryBuffer_Release(IPSFactoryBuffer *iface) static HRESULT WINAPI PSFactoryBuffer_CreateProxy(IPSFactoryBuffer *iface, IUnknown *outer, REFIID riid, IRpcProxyBuffer **ppProxy, void **ppv) { + ProxyBufferWrapper *proxy; + HRESULT hr; + CHECK_EXPECT(CreateProxy); - return IPSFactoryBuffer_CreateProxy(ps_factory_buffer, outer, riid, ppProxy, ppv); + proxy = heap_alloc(sizeof(*proxy)); + proxy->IRpcProxyBuffer_iface.lpVtbl = &RpcProxyBufferVtbl; + proxy->ref = 1; + + hr = IPSFactoryBuffer_CreateProxy(ps_factory_buffer, outer, riid, &proxy->buffer, ppv); + ok(hr == S_OK, "CreateProxy failed: %08lx\n", hr); + + *ppProxy = &proxy->IRpcProxyBuffer_iface; + + return S_OK; } static HRESULT WINAPI PSFactoryBuffer_CreateStub(IPSFactoryBuffer *iface, REFIID riid, @@ -1327,10 +1414,12 @@ static void test_marshal_channel_buffer(void) SET_EXPECT(CreateStub); SET_EXPECT(CreateProxy); + SET_EXPECT(Connect); hr = IUnknown_QueryInterface(proxy, &IID_IOleWindow, (void**)&ole_window); ok(hr == S_OK, "Could not get IOleWindow iface: %08lx\n", hr); CHECK_CALLED(CreateStub); CHECK_CALLED(CreateProxy); + CHECK_CALLED(Connect); SET_EXPECT(Invoke); SET_EXPECT(GetWindow); @@ -1342,10 +1431,13 @@ static void test_marshal_channel_buffer(void) IOleWindow_Release(ole_window); - SET_EXPECT(Disconnect); + SET_EXPECT(RpcStubBuffer_Disconnect); + SET_EXPECT(RpcProxyBuffer_Disconnect); IUnknown_Release(proxy); todo_wine - CHECK_CALLED(Disconnect); + CHECK_CALLED(RpcStubBuffer_Disconnect); + todo_wine + CHECK_CALLED(RpcProxyBuffer_Disconnect); hr = CoRevokeClassObject(registration_key); ok(hr == S_OK, "CoRevokeClassObject failed: %08lx\n", hr);

1 0