Commit fe8d66bf authored by Alexandre Julliard's avatar Alexandre Julliard

quartz: Use nameless unions/structs.

parent 7dc37b2a
...@@ -18,9 +18,6 @@ ...@@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "quartz_private.h" #include "quartz_private.h"
#include "wine/debug.h" #include "wine/debug.h"
...@@ -740,8 +737,8 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample ...@@ -740,8 +737,8 @@ static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample
assert(i < filter->max_requests); assert(i < filter->max_requests);
req = &filter->requests[i]; req = &filter->requests[i];
req->ovl.u.s.Offset = BYTES_FROM_MEDIATIME(start); req->ovl.Offset = BYTES_FROM_MEDIATIME(start);
req->ovl.u.s.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32; req->ovl.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32;
/* No reference is taken. */ /* No reference is taken. */
if (ReadFile(filter->file, data, BYTES_FROM_MEDIATIME(end - start), NULL, &req->ovl) if (ReadFile(filter->file, data, BYTES_FROM_MEDIATIME(end - start), NULL, &req->ovl)
...@@ -789,7 +786,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface, ...@@ -789,7 +786,7 @@ static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface,
REFERENCE_TIME start, end; REFERENCE_TIME start, end;
IMediaSample_SetActualDataLength(req->sample, size); 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); end = start + MEDIATIME_FROM_BYTES(size);
IMediaSample_SetTime(req->sample, &start, &end); IMediaSample_SetTime(req->sample, &start, &end);
...@@ -814,8 +811,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D ...@@ -814,8 +811,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D
BOOL ret; BOOL ret;
ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1);
ovl.u.s.Offset = (DWORD)offset; ovl.Offset = (DWORD)offset;
ovl.u.s.OffsetHigh = offset >> 32; ovl.OffsetHigh = offset >> 32;
*read_len = 0; *read_len = 0;
......
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <stdarg.h> #include <stdarg.h>
#include "windef.h" #include "windef.h"
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#define COBJMACROS #define COBJMACROS
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment