September 2008 - Wine-commits

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_SERVER_CERT_CONTEXT.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 64a7d23565640b3815676cd53eba169fc246cccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a7d23565640b3815676cd53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 7 21:30:31 2008 +0200 winhttp: Implement WINHTTP_OPTION_SERVER_CERT_CONTEXT. --- dlls/winhttp/Makefile.in | 1 + dlls/winhttp/net.c | 46 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/session.c | 17 ++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index e08355c..287ee4d 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = wininet kernel32 +DELAYIMPORTS = crypt32 C_SRCS = \ handle.c \ diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 498e5ac..e2c6cd6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -48,6 +48,7 @@ #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wincrypt.h" /* to avoid conflicts with the Unix socket headers */ #define USE_WS_PREFIX @@ -102,6 +103,7 @@ MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_get_timeout ); MAKE_FUNCPTR( SSL_CTX_set_timeout ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); +MAKE_FUNCPTR( i2d_X509 ); MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( ERR_get_error ); @@ -218,6 +220,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_CTX_get_timeout ); LOAD_FUNCPTR( SSL_CTX_set_timeout ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); + LOAD_FUNCPTR( i2d_X509 ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -616,3 +619,46 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * #endif return TRUE; } + +const void *netconn_get_certificate( netconn_t *conn ) +{ +#ifdef SONAME_LIBSSL + X509 *cert; + unsigned char *buffer, *p; + int len; + BOOL malloc = FALSE; + const CERT_CONTEXT *ret; + + if (!conn->secure) return NULL; + + if (!(cert = pSSL_get_peer_certificate( conn->ssl_conn ))) return NULL; + p = NULL; + if ((len = pi2d_X509( cert, &p )) < 0) return NULL; + /* + * SSL 0.9.7 and above malloc the buffer if it is null. + * however earlier version do not and so we would need to alloc the buffer. + * + * see the i2d_X509 man page for more details. + */ + if (!p) + { + if (!(buffer = heap_alloc( len ))) return NULL; + p = buffer; + len = pi2d_X509( cert, &p ); + } + else + { + buffer = p; + malloc = TRUE; + } + + ret = CertCreateCertificateContext( X509_ASN_ENCODING, buffer, len ); + + if (malloc) free( buffer ); + else heap_free( buffer ); + + return ret; +#else + return NULL; +#endif +} diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 29510fc..4e22896 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wincrypt.h" #include "winhttp_private.h" @@ -264,6 +265,22 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *buflen = sizeof(DWORD); return TRUE; } + case WINHTTP_OPTION_SERVER_CERT_CONTEXT: + { + const CERT_CONTEXT *cert; + request_t *request = (request_t *)hdr; + + if (!(cert = netconn_get_certificate( &request->netconn ))) return FALSE; + memcpy( buffer, cert, sizeof(CERT_CONTEXT) ); + *buflen = sizeof(cert); + return TRUE; + } + case WINHTTP_OPTION_SECURITY_KEY_BITNESS: + { + *(DWORD *)buffer = 128; /* FIXME */ + *buflen = sizeof(DWORD); + return TRUE; + } default: FIXME("unimplemented option %u\n", option); return FALSE; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7cec99b..05a9e54 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -143,6 +143,7 @@ BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_in * ); BOOL netconn_secure_connect( netconn_t * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); +const void *netconn_get_certificate( netconn_t * ); static inline void *heap_alloc( SIZE_T size ) {

1 0

Hans Leidekker : winhttp: The last parameter of WinHttpWriteData is optional.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 520b6e815397b91c13b3ff135a503577532df226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520b6e815397b91c13b3ff135… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 7 21:31:22 2008 +0200 winhttp: The last parameter of WinHttpWriteData is optional. --- dlls/winhttp/request.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index e2c00df..2645430 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1315,6 +1315,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write, LPDWORD written ) { BOOL ret; + int num_bytes; request_t *request; TRACE("%p, %p, %d, %p\n", hrequest, buffer, to_write, written); @@ -1331,8 +1332,9 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write return FALSE; } - ret = netconn_send( &request->netconn, buffer, to_write, 0, (int *)written ); + ret = netconn_send( &request->netconn, buffer, to_write, 0, &num_bytes ); + if (ret && written) *written = num_bytes; release_object( &request->hdr ); return ret; }

1 0

Hans Leidekker : winhttp: Use a process global SSL context instead of per connection.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 2fb746783f363b8a34f87476c997ba55ccb1c90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb746783f363b8a34f87476c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 7 21:35:07 2008 +0200 winhttp: Use a process global SSL context instead of per connection. --- dlls/winhttp/net.c | 16 +++++++--------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index e2c6cd6..1abfbdd 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -83,6 +83,7 @@ static void *libssl_handle; static void *libcrypto_handle; static SSL_METHOD *method; +static SSL_CTX *ctx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -90,7 +91,6 @@ MAKE_FUNCPTR( SSL_library_init ); MAKE_FUNCPTR( SSL_load_error_strings ); MAKE_FUNCPTR( SSLv23_method ); MAKE_FUNCPTR( SSL_CTX_new ); -MAKE_FUNCPTR( SSL_CTX_free ); MAKE_FUNCPTR( SSL_new ); MAKE_FUNCPTR( SSL_free ); MAKE_FUNCPTR( SSL_set_fd ); @@ -207,7 +207,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_load_error_strings ); LOAD_FUNCPTR( SSLv23_method ); LOAD_FUNCPTR( SSL_CTX_new ); - LOAD_FUNCPTR( SSL_CTX_free ); LOAD_FUNCPTR( SSL_new ); LOAD_FUNCPTR( SSL_free ); LOAD_FUNCPTR( SSL_set_fd ); @@ -240,8 +239,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) pBIO_new_fp( stderr, BIO_NOCLOSE ); method = pSSLv23_method(); - conn->ssl_ctx = pSSL_CTX_new( method ); - #else WARN("SSL support not compiled in.\n"); set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); @@ -312,13 +309,14 @@ BOOL netconn_secure_connect( netconn_t *conn ) X509 *cert; long res; - if (!pSSL_CTX_set_default_verify_paths( conn->ssl_ctx )) + ctx = pSSL_CTX_new( method ); + if (!pSSL_CTX_set_default_verify_paths( ctx )) { ERR("SSL_CTX_set_default_verify_paths failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_OUTOFMEMORY ); return FALSE; } - if (!(conn->ssl_conn = pSSL_new( conn->ssl_ctx ))) + if (!(conn->ssl_conn = pSSL_new( ctx ))) { ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); set_last_error( ERROR_OUTOFMEMORY ); @@ -488,8 +486,8 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) #ifdef SONAME_LIBSSL long timeout; - timeout = pSSL_CTX_get_timeout( conn->ssl_ctx ); - pSSL_CTX_set_timeout( conn->ssl_ctx, DEFAULT_RECEIVE_TIMEOUT ); + timeout = pSSL_CTX_get_timeout( ctx ); + pSSL_CTX_set_timeout( ctx, DEFAULT_RECEIVE_TIMEOUT ); while (recvd < *buflen) { @@ -506,7 +504,7 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) } if (buffer[recvd] != '\r') recvd++; } - pSSL_CTX_set_timeout( conn->ssl_ctx, timeout ); + pSSL_CTX_set_timeout( ctx, timeout ); if (ret) { buffer[recvd++] = 0; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 05a9e54..6d9a142 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -91,7 +91,6 @@ typedef struct { int socket; BOOL secure; /* SSL active on connection? */ - void *ssl_ctx; void *ssl_conn; char *peek_msg; char *peek_msg_mem;

1 0

Hans Leidekker : winhttp: Add the remaining completion notifications.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: a4d0abb2344f93552add6eef9a723573c76ba6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d0abb2344f93552add6eef9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 7 21:35:53 2008 +0200 winhttp: Add the remaining completion notifications. --- dlls/winhttp/request.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2645430..ea08b5c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1190,6 +1190,17 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) ret = netconn_query_data_available( &request->netconn, &num_bytes ); + if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &num_bytes, sizeof(DWORD) ); + else + { + WINHTTP_ASYNC_RESULT async; + async.dwResult = API_QUERY_DATA_AVAILABLE; + async.dwError = get_last_error(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &async, sizeof(async) ); + } + } if (ret && available) *available = num_bytes; release_object( &request->hdr ); return ret; @@ -1304,6 +1315,17 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L else ret = read_data( request, buffer, to_read, &num_bytes, async ); + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, num_bytes ); + else + { + WINHTTP_ASYNC_RESULT async; + async.dwResult = API_READ_DATA; + async.dwError = get_last_error(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &async, sizeof(async) ); + } + } if (ret && read) *read = num_bytes; release_object( &request->hdr ); return ret; @@ -1334,6 +1356,17 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write ret = netconn_send( &request->netconn, buffer, to_write, 0, &num_bytes ); + if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE, &num_bytes, sizeof(DWORD) ); + else + { + WINHTTP_ASYNC_RESULT async; + async.dwResult = API_WRITE_DATA; + async.dwError = get_last_error(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &async, sizeof(async) ); + } + } if (ret && written) *written = num_bytes; release_object( &request->hdr ); return ret;

1 0

Hans Leidekker : winhttp: Start sending async completion notifications. Add corresponding tests.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 3d8a9564cde87f34d9404917e0265b7d0fa8bdb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8a9564cde87f34d9404917e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 7 21:29:44 2008 +0200 winhttp: Start sending async completion notifications. Add corresponding tests. --- dlls/winhttp/request.c | 33 +++++++++++-- dlls/winhttp/session.c | 6 ++ dlls/winhttp/tests/notification.c | 95 +++++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 127 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d8a9564cde87f34d9404…

1 0

Detlef Riekenberg : include: Update RASCONN and error codes.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: e5ab43c256d504f37c3e521fdf9239b8c369d687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ab43c256d504f37c3e521fd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 8 05:20:26 2008 +0200 include: Update RASCONN and error codes. --- include/ras.h | 8 ++++++++ include/raserror.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/ras.h b/include/ras.h index f90d25a..3a75f41 100644 --- a/include/ras.h +++ b/include/ras.h @@ -81,6 +81,10 @@ typedef struct tagRASCONNA { CHAR szDeviceName[ RAS_MaxDeviceName + 1 ]; CHAR szPhonebook[ MAX_PATH ]; DWORD dwSubEntry; + GUID guidEntry; + DWORD dwFlags; + LUID luid; + GUID guidCorrelationId; } RASCONNA,*LPRASCONNA; typedef struct tagRASCONNW { @@ -91,6 +95,10 @@ typedef struct tagRASCONNW { WCHAR szDeviceName[ RAS_MaxDeviceName + 1 ]; WCHAR szPhonebook[ MAX_PATH ]; DWORD dwSubEntry; + GUID guidEntry; + DWORD dwFlags; + LUID luid; + GUID guidCorrelationId; } RASCONNW,*LPRASCONNW; DECL_WINELIB_TYPE_AW(RASCONN) diff --git a/include/raserror.h b/include/raserror.h index ad38cd3..694dfe9 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -21,6 +21,7 @@ #define RASBASE 600 #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) +#define ERROR_BUFFER_INVALID (RASBASE+10) #define ERROR_INVALID_SIZE (RASBASE+32) #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111)

1 0

Alexandre Julliard : makefile: Fix dependency for programs install.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 78c79ba349deea392e4a6828d2d9519945366aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c79ba349deea392e4a6828d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 8 12:37:56 2008 +0200 makefile: Fix dependency for programs install. --- Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0b2c6c0..1dd8ef1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,8 @@ include/__install__ include/__install-dev__: include libs tools libs/__install__ libs/__install-lib__ libs/__install-dev__: libs loader/__install__ loader/__install-lib__: libs tools server/__install__ server/__install-lib__: libs tools -programs/__install__ programs/__install-lib__: libs tools include dlls/__install-lib__ +programs/__install__: libs tools include dlls/__install__ +programs/__install-lib__: libs tools include dlls/__install-lib__ tools/__install__ tools/__install-lib__ tools/__install-dev__: tools RECURSE_TARGETS = \

1 0

Eric Pouech : dbghelp: While loading MSC debug info, don' t handle public symbol at once, but delay their handling after all other symbols are loaded.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 69bbefac5f01dd347df461131f01f113dbcaf044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bbefac5f01dd347df461131… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 6 22:20:19 2008 +0200 dbghelp: While loading MSC debug info, don't handle public symbol at once, but delay their handling after all other symbols are loaded. This allows to handle properly addresses between public and real symbols. It should also increase drastically the performance of .dbg/.pdb loading. --- dlls/dbghelp/msc.c | 223 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 155 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69bbefac5f01dd347df46…

1 0

Henri Verbeet : sspi: SECBUFFER_HEADER should be called SECBUFFER_STREAM_HEADER.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: e5f198549bd8c2260b8e2538520eb57fe0259965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f198549bd8c2260b8e25385… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Sun Sep 7 18:48:41 2008 +0200 sspi: SECBUFFER_HEADER should be called SECBUFFER_STREAM_HEADER. --- include/sspi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sspi.h b/include/sspi.h index dffc7a4..29eda33 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -146,7 +146,7 @@ typedef struct _SecBuffer #define SECBUFFER_MISSING 4 #define SECBUFFER_EXTRA 5 #define SECBUFFER_STREAM_TRAILER 6 -#define SECBUFFER_HEADER 7 +#define SECBUFFER_STREAM_HEADER 7 #define SECBUFFER_NEGOTIATION_INFO 8 #define SECBUFFER_PADDING 9 #define SECBUFFER_STREAM 10

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 7dd099416e380a44bf2382ac9b31d9213824fe37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd099416e380a44bf2382ac9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 7 21:13:19 2008 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/overlay.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 10f66b4..b99d228 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -40,9 +40,9 @@ static IDirectDrawSurface7 *create_overlay(DWORD width, DWORD height, DWORD form ddsd.dwWidth = width; ddsd.dwHeight = height; ddsd.ddsCaps.dwCaps = DDSCAPS_OVERLAY; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_FOURCC; - ddsd.ddpfPixelFormat.dwFourCC = format; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = format; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &ret, NULL); if(FAILED(hr)) return NULL; else return ret; @@ -158,13 +158,13 @@ static void offscreen_test(void) { ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; ddsd.dwWidth = 64; ddsd.dwHeight = 64; - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwFourCC = 0; - ddsd.ddpfPixelFormat.dwRGBBitCount = 16; - ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; - ddsd.ddpfPixelFormat.dwGBitMask = 0x07e0; - ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U4(ddsd).ddpfPixelFormat.dwFourCC = 0; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07e0; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &offscreen, NULL); ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed with hr=0x%08x\n", hr); @@ -204,7 +204,7 @@ static void yv12_test(void) ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 64x64, got %ux%u\n", desc.dwWidth, desc.dwHeight); /* The overlay pitch seems to have 256 byte alignment */ - ok(desc.lPitch == 256, "Unexpected pitch %u, expected 256\n", desc.lPitch); + ok(U1(desc).lPitch == 256, "Unexpected pitch %u, expected 256\n", U1(desc).lPitch); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr);

1 0