Module: wine Branch: master Commit: fe8d66bf49dc4023fa17080edbada662ffc23fe5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe8d66bf49dc4023fa17080edbada66...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Jul 17 11:33:22 2023 +0200
quartz: Use nameless unions/structs.
---
dlls/quartz/filesource.c | 13 +++++-------- dlls/quartz/filtermapper.c | 2 -- dlls/quartz/regsvr.c | 2 -- 3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 0579f564af7..48950026ddf 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "quartz_private.h"
#include "wine/debug.h" @@ -740,8 +737,8 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample assert(i < filter->max_requests); req = &filter->requests[i];
- req->ovl.u.s.Offset = BYTES_FROM_MEDIATIME(start); - req->ovl.u.s.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32; + req->ovl.Offset = BYTES_FROM_MEDIATIME(start); + req->ovl.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32; /* No reference is taken. */
if (ReadFile(filter->file, data, BYTES_FROM_MEDIATIME(end - start), NULL, &req->ovl) @@ -789,7 +786,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface, REFERENCE_TIME start, end;
IMediaSample_SetActualDataLength(req->sample, size); - start = MEDIATIME_FROM_BYTES(((ULONGLONG)req->ovl.u.s.OffsetHigh << 32) + req->ovl.u.s.Offset); + start = MEDIATIME_FROM_BYTES(((ULONGLONG)req->ovl.OffsetHigh << 32) + req->ovl.Offset); end = start + MEDIATIME_FROM_BYTES(size); IMediaSample_SetTime(req->sample, &start, &end);
@@ -814,8 +811,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D BOOL ret;
ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); - ovl.u.s.Offset = (DWORD)offset; - ovl.u.s.OffsetHigh = offset >> 32; + ovl.Offset = (DWORD)offset; + ovl.OffsetHigh = offset >> 32;
*read_len = 0;
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index dd7c6c41872..69755c3648e 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h>
#include "windef.h" diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index b7b3ddc7ba3..f203f0b7fa7 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h> #include <string.h>