March 2018 - Wine-commits - list.winehq.org

Jacek Caban : kernel32: Reimplement TransactNamedPipe on top of FSCTL_PIPE_TRANSCEIVE.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 0ca7c5c4e22fe7f0ae43596fe5ab7d27af5ff65e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ca7c5c4e22fe7f0ae43596f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 22:46:51 2018 +0200 kernel32: Reimplement TransactNamedPipe on top of FSCTL_PIPE_TRANSCEIVE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 36 ++++++++---- dlls/kernel32/tests/pipe.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 4e85aed..fcf1be7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1715,29 +1715,41 @@ BOOL WINAPI DisconnectNamedPipe(HANDLE hPipe) /*********************************************************************** * TransactNamedPipe (KERNEL32.@) - * - * BUGS - * should be done as a single operation in the wineserver or kernel */ BOOL WINAPI TransactNamedPipe( HANDLE handle, LPVOID write_buf, DWORD write_size, LPVOID read_buf, DWORD read_size, LPDWORD bytes_read, LPOVERLAPPED overlapped) { - BOOL r; - DWORD count; + IO_STATUS_BLOCK default_iosb, *iosb = &default_iosb; + HANDLE event = NULL; + void *cvalue = NULL; + NTSTATUS status; - TRACE("%p %p %d %p %d %p %p\n", - handle, write_buf, write_size, read_buf, + TRACE("%p %p %u %p %u %p %p\n", handle, write_buf, write_size, read_buf, read_size, bytes_read, overlapped); if (overlapped) - FIXME("Doesn't support overlapped operation as yet\n"); + { + event = overlapped->hEvent; + iosb = (IO_STATUS_BLOCK *)overlapped; + if (((ULONG_PTR)event & 1) == 0) cvalue = overlapped; + } + else + { + iosb->Information = 0; + } - r = WriteFile(handle, write_buf, write_size, &count, NULL); - if (r) - r = ReadFile(handle, read_buf, read_size, bytes_read, NULL); + status = NtFsControlFile(handle, event, NULL, cvalue, iosb, FSCTL_PIPE_TRANSCEIVE, + write_buf, write_size, read_buf, read_size); - return r; + if (bytes_read) *bytes_read = overlapped && status ? 0 : iosb->Information; + + if (status) + { + SetLastError(RtlNtStatusToDosError(status)); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 22d120f..fa677cf 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3011,6 +3011,44 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_flush_done(flush_thread); } +#define overlapped_transact(a,b,c,d,e,f) _overlapped_transact(__LINE__,a,b,c,d,e,f) +static void _overlapped_transact(unsigned line, HANDLE caller, void *write_buf, DWORD write_size, + void *read_buf, DWORD read_size, OVERLAPPED *overlapped) +{ + BOOL res; + + memset(overlapped, 0, sizeof(*overlapped)); + overlapped->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + res = TransactNamedPipe(caller, write_buf, write_size, read_buf, read_size, NULL, overlapped); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_IO_PENDING, + "TransactNamedPipe returned: %x(%u)\n", res, GetLastError()); +} + +#define overlapped_transact_failure(a,b,c,d,e,f) _overlapped_transact_failure(__LINE__,a,b,c,d,e,f) +static void _overlapped_transact_failure(unsigned line, HANDLE caller, void *write_buf, DWORD write_size, + void *read_buf, DWORD read_size, DWORD expected_error) +{ + OVERLAPPED overlapped; + BOOL res; + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + res = TransactNamedPipe(caller, write_buf, write_size, read_buf, read_size, NULL, &overlapped); + ok_(__FILE__,line)(!res, "TransactNamedPipe succeeded\n"); + + if (GetLastError() == ERROR_IO_PENDING) /* win8+ */ + { + _test_overlapped_failure(line, caller, &overlapped, expected_error); + } + else + { + ok_(__FILE__,line)(GetLastError() == expected_error, + "TransactNamedPipe returned error %u, expected %u\n", + GetLastError(), expected_error); + CloseHandle(overlapped.hEvent); + } +} + static void child_process_write_pipe(HANDLE pipe) { OVERLAPPED overlapped; @@ -3146,6 +3184,105 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) CloseHandle(client); } +static void test_transact(HANDLE caller, HANDLE callee, DWORD write_buf_size, DWORD read_buf_size) +{ + OVERLAPPED overlapped, overlapped2, read_overlapped, write_overlapped; + char buf[10000], read_buf[10000]; + + memset(buf, 0xaa, sizeof(buf)); + + /* simple transact call */ + overlapped_transact(caller, (BYTE*)"abc", 3, read_buf, 100, &overlapped); + overlapped_write_sync(callee, (BYTE*)"test", 4); + test_overlapped_result(caller, &overlapped, 4, FALSE); + ok(!memcmp(read_buf, "test", 4), "unexpected read_buf\n"); + overlapped_read_sync(callee, read_buf, 1000, 3, FALSE); + ok(!memcmp(read_buf, "abc", 3), "unexpected read_buf\n"); + + /* transact fails if there is already data in read buffer */ + overlapped_write_sync(callee, buf, 1); + overlapped_transact_failure(caller, buf, 2, read_buf, 1, ERROR_PIPE_BUSY); + overlapped_read_sync(caller, read_buf, 1000, 1, FALSE); + + /* transact doesn't block on write */ + overlapped_write_async(caller, buf, write_buf_size+2000, &write_overlapped); + overlapped_transact(caller, buf, 2, read_buf, 1, &overlapped); + test_not_signaled(overlapped.hEvent); + overlapped_write_sync(callee, buf, 1); + test_overlapped_result(caller, &overlapped, 1, FALSE); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), write_buf_size+2000, FALSE); + test_overlapped_result(caller, &write_overlapped, write_buf_size+2000, FALSE); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 2, FALSE); + + /* transact with already pending read */ + overlapped_read_async(callee, read_buf, 10, &read_overlapped); + overlapped_transact(caller, buf, 5, read_buf, 6, &overlapped); + test_overlapped_result(callee, &read_overlapped, 5, FALSE); + test_not_signaled(overlapped.hEvent); + overlapped_write_sync(callee, buf, 10); + test_overlapped_result(caller, &overlapped, 6, TRUE); + overlapped_read_sync(caller, read_buf, sizeof(read_buf), 4, FALSE); + + /* 0-size messages */ + overlapped_transact(caller, buf, 5, read_buf, 0, &overlapped); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 5, FALSE); + overlapped_write_sync(callee, buf, 0); + test_overlapped_result(caller, &overlapped, 0, FALSE); + + overlapped_transact(caller, buf, 0, read_buf, 0, &overlapped); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 0, FALSE); + test_not_signaled(overlapped.hEvent); + overlapped_write_sync(callee, buf, 0); + test_overlapped_result(caller, &overlapped, 0, FALSE); + + /* reply transact with another transact */ + overlapped_transact(caller, buf, 3, read_buf, 100, &overlapped); + overlapped_read_sync(callee, read_buf, 1000, 3, FALSE); + overlapped_transact(callee, buf, 4, read_buf, 100, &overlapped2); + test_overlapped_result(caller, &overlapped, 4, FALSE); + overlapped_write_sync(caller, buf, 1); + test_overlapped_result(caller, &overlapped2, 1, FALSE); + + if (!pCancelIoEx) return; + + /* cancel keeps written data */ + overlapped_write_async(caller, buf, write_buf_size+2000, &write_overlapped); + overlapped_transact(caller, buf, 2, read_buf, 1, &overlapped); + test_not_signaled(overlapped.hEvent); + cancel_overlapped(caller, &overlapped); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), write_buf_size+2000, FALSE); + test_overlapped_result(caller, &write_overlapped, write_buf_size+2000, FALSE); + overlapped_read_sync(callee, read_buf, sizeof(read_buf), 2, FALSE); +} + +static void test_TransactNamedPipe(void) +{ + HANDLE client, server; + BYTE buf[10]; + + create_overlapped_pipe(PIPE_TYPE_BYTE, &client, &server); + overlapped_transact_failure(client, buf, 2, buf, 1, ERROR_BAD_PIPE); + CloseHandle(client); + CloseHandle(server); + + create_overlapped_pipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_BYTE, &client, &server); + overlapped_transact_failure(client, buf, 2, buf, 1, ERROR_BAD_PIPE); + CloseHandle(client); + CloseHandle(server); + + trace("testing server->client transaction...\n"); + create_overlapped_pipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, &client, &server); + test_transact(server, client, 5000, 6000); + CloseHandle(client); + CloseHandle(server); + + trace("testing client->server transaction...\n"); + create_overlapped_pipe(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, &client, &server); + test_transact(client, server, 6000, 5000); + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { char **argv; @@ -3186,4 +3323,5 @@ START_TEST(pipe) test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); test_overlapped_transport(FALSE, FALSE); + test_TransactNamedPipe(); }

1 0

Louis Lenders : user32: Add stub for SetThreadDpiAwarenessContext.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 40b46d900a60e5a4011f0004fd939dfc7dba735a URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b46d900a60e5a4011f0004… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 26 19:27:08 2018 +0200 user32: Add stub for SetThreadDpiAwarenessContext. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + include/windef.h | 1 + include/winuser.h | 1 + 4 files changed, 12 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f80cea1..4824ad2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2964,6 +2964,15 @@ BOOL WINAPI IsProcessDPIAware(void) } /********************************************************************** + * SetThreadDpiAwarenessContext (USER32.@) + */ +DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) +{ + FIXME("(%p): stub\n", context); + return NULL; +} + +/********************************************************************** * GetAutoRotationState [USER32.@] */ BOOL WINAPI GetAutoRotationState( AR_STATE *state ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index f601d7d..1bcdf2c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -686,6 +686,7 @@ @ stdcall SetSystemTimer(long long long ptr) @ stdcall SetTaskmanWindow (long) @ stdcall SetThreadDesktop(long) +@ stdcall SetThreadDpiAwarenessContext(ptr) @ stdcall SetTimer(long long long ptr) @ stdcall SetUserObjectInformationA(long long ptr long) @ stdcall SetUserObjectInformationW(long long ptr long) diff --git a/include/windef.h b/include/windef.h index 8a9f944..df0eb77 100644 --- a/include/windef.h +++ b/include/windef.h @@ -289,6 +289,7 @@ typedef DWORD COLORREF, *LPCOLORREF; /* Handle types */ typedef int HFILE; +DECLARE_HANDLE(DPI_AWARENESS_CONTEXT); DECLARE_HANDLE(HACCEL); DECLARE_HANDLE(HBITMAP); DECLARE_HANDLE(HBRUSH); diff --git a/include/winuser.h b/include/winuser.h index 08a0298..d587859 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4071,6 +4071,7 @@ WINUSERAPI BOOL WINAPI SetSystemCursor(HCURSOR,DWORD); WINUSERAPI BOOL WINAPI SetSystemMenu(HWND,HMENU); WINUSERAPI UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); WINUSERAPI BOOL WINAPI SetThreadDesktop(HDESK); +WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT); WINUSERAPI UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC); WINUSERAPI BOOL WINAPI SetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD); WINUSERAPI BOOL WINAPI SetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD);

1 0

Dmitry Timoshkov : advapi32: Use larger buffers for domain names.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 923f7246be21334ebe6ec19ced55d4d5cbed60eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=923f7246be21334ebe6ec19c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 29 09:52:48 2018 +0800 advapi32: Use larger buffers for domain names. Otherwise GetComputerNameExW(ComputerNamePhysicalDnsDomain) and GetComputerNameExW(ComputerNameDnsDomain) fail if the names don't fit into MAX_COMPUTERNAME_LENGTH characters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 95bfe09..354db65 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -771,9 +771,9 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( SID sid; DWORD sid_subauthority[3]; } domain_sid; - WCHAR domain_name[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR dns_domain_name[MAX_COMPUTERNAME_LENGTH + 1]; - WCHAR dns_forest_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR domain_name[256]; + WCHAR dns_domain_name[256]; + WCHAR dns_forest_name[256]; } *xdi; struct { @@ -785,7 +785,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( xdi = heap_alloc_zero(sizeof(*xdi)); if (!xdi) return STATUS_NO_MEMORY; - dwSize = MAX_COMPUTERNAME_LENGTH + 1; + dwSize = 256; if (GetComputerNameExW(ComputerNamePhysicalDnsDomain, xdi->domain_name, &dwSize)) { WCHAR *dot; @@ -799,7 +799,7 @@ NTSTATUS WINAPI LsaQueryInformationPolicy( TRACE("setting Name to %s\n", debugstr_w(xdi->info.Name.Buffer)); } - dwSize = MAX_COMPUTERNAME_LENGTH + 1; + dwSize = 256; if (GetComputerNameExW(ComputerNameDnsDomain, xdi->dns_domain_name, &dwSize)) { xdi->info.DnsDomainName.Buffer = xdi->dns_domain_name;

1 0

Zebediah Figura : ole32/tests: Simplify implicit MTA tests.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 62422db030f795f9d1bd215af8f34c86b4a5da47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62422db030f795f9d1bd215a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 28 21:01:56 2018 -0500 ole32/tests: Simplify implicit MTA tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 228 +++++++++------------------------------------ 1 file changed, 46 insertions(+), 182 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62422db030f795f9d1bd…

1 0

Zebediah Figura : ole32: Simplify grabbing the MTA.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: c889780c2f5ff8850acabc077ef8419a00d53f3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c889780c2f5ff8850acabc07… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 28 21:01:57 2018 -0500 ole32: Simplify grabbing the MTA. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 58b9835..fc8587b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -717,6 +717,23 @@ static inline BOOL apartment_is_model(const APARTMENT *apt, DWORD model) return (apt->multi_threaded == !(model & COINIT_APARTMENTTHREADED)); } +/* gets the multi-threaded apartment if it exists. The caller must + * release the reference from the apartment as soon as the apartment pointer + * is no longer required. */ +static APARTMENT *apartment_find_mta(void) +{ + APARTMENT *apt; + + EnterCriticalSection(&csApartment); + + if ((apt = MTA)) + apartment_addref(apt); + + LeaveCriticalSection(&csApartment); + + return apt; +} + static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) { list_remove(&curClass->entry); @@ -1295,31 +1312,6 @@ static APARTMENT *apartment_findmain(void) return result; } -/* gets the multi-threaded apartment if it exists. The caller must - * release the reference from the apartment as soon as the apartment pointer - * is no longer required. */ -static APARTMENT *apartment_find_multi_threaded(void) -{ - APARTMENT *result = NULL; - struct list *cursor; - - EnterCriticalSection(&csApartment); - - LIST_FOR_EACH( cursor, &apts ) - { - struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); - if (apt->multi_threaded) - { - result = apt; - apartment_addref(result); - break; - } - } - - LeaveCriticalSection(&csApartment); - return result; -} - /* gets the specified class object by loading the appropriate DLL, if * necessary and calls the DllGetClassObject function for the DLL */ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, @@ -3000,7 +2992,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (!(apt = COM_CurrentApt())) { - if (!(apt = apartment_find_multi_threaded())) + if (!(apt = apartment_find_mta())) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; @@ -3300,7 +3292,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( if (!(apt = COM_CurrentApt())) { - if (!(apt = apartment_find_multi_threaded())) + if (!(apt = apartment_find_mta())) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; @@ -5007,7 +4999,7 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) if (!info->apt) { APARTMENT *apt; - if (!(apt = apartment_find_multi_threaded())) + if (!(apt = apartment_find_mta())) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED;

1 0

Hans Leidekker : bcrypt: Add support for BCRYPT_OPAQUE_KEY_BLOB.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: f352837868192907ef2ac6ad0d77f40700479581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f352837868192907ef2ac6ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 29 12:26:16 2018 +0200 bcrypt: Add support for BCRYPT_OPAQUE_KEY_BLOB. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 99 ++++++++++++++++++++++++++++++---------------- dlls/bcrypt/tests/bcrypt.c | 27 +++++++++++-- 2 files changed, 88 insertions(+), 38 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 1490089..1e56062 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1018,6 +1018,40 @@ static ULONG get_block_size( struct algorithm *alg ) return ret; } +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) +{ + ULONG len; + + if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) + { + BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)input; + + if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) return STATUS_BUFFER_TOO_SMALL; + if (header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) return STATUS_INVALID_PARAMETER; + if (header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) + { + FIXME( "unknown key data blob version %u\n", header->dwVersion ); + return STATUS_INVALID_PARAMETER; + } + len = header->cbKeyData; + if (len + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, (UCHAR *)&header[1], len, 0 ); + } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) + { + if (input_len < sizeof(len)) return STATUS_BUFFER_TOO_SMALL; + len = *(ULONG *)input; + if (len + sizeof(len) > input_len) return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey( algorithm, key, object, object_len, input + sizeof(len), len, 0 ); + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) { if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) @@ -1034,6 +1068,17 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U memcpy( &header[1], key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_OPAQUE_KEY_BLOB )) + { + ULONG len, req_size = sizeof(len) + key->u.s.secret_len; + + *size = req_size; + if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)output = key->u.s.secret_len; + memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); + return STATUS_SUCCESS; + } FIXME( "unsupported key type %s\n", debugstr_w(type) ); return STATUS_NOT_IMPLEMENTED; @@ -1829,7 +1874,8 @@ static NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *ha return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS key_destroy( struct key *key ) +static NTSTATUS key_import( BCRYPT_ALG_HANDLE algorithm, const WCHAR *type, BCRYPT_KEY_HANDLE *key, UCHAR *object, + ULONG object_len, UCHAR *input, ULONG input_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1841,6 +1887,12 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_destroy( struct key *key ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static inline BOOL key_is_symmetric( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1880,9 +1932,9 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ return STATUS_SUCCESS; } -NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, - BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, - ULONG input_len, ULONG flags) +NTSTATUS WINAPI BCryptImportKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, + BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, + ULONG input_len, ULONG flags ) { struct algorithm *alg = algorithm; @@ -1894,50 +1946,27 @@ NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE d if (decrypt_key) { - FIXME("Decrypting of key not yet supported\n"); - return STATUS_NO_MEMORY; - } - - if (!strcmpW(type, BCRYPT_KEY_DATA_BLOB)) - { - BCRYPT_KEY_DATA_BLOB_HEADER *key_header = (BCRYPT_KEY_DATA_BLOB_HEADER*)input; - - if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) - return STATUS_BUFFER_TOO_SMALL; - - if (key_header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) - return STATUS_INVALID_PARAMETER; - - if (key_header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) - { - FIXME("Unknown key data blob version: %d\n", key_header->dwVersion); - return STATUS_INVALID_PARAMETER; - } - - if (key_header->cbKeyData + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) - return STATUS_INVALID_PARAMETER; - - return BCryptGenerateSymmetricKey(algorithm, key, object, object_len, (UCHAR*)&key_header[1], key_header->cbKeyData, 0); + FIXME( "decryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; } - FIXME("Unsupported key type: %s\n", debugstr_w(type)); - return STATUS_INVALID_PARAMETER; + return key_import( algorithm, type, key, object, object_len, input, input_len ); } -NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, - PUCHAR output, ULONG output_len, ULONG *size, ULONG flags) +NTSTATUS WINAPI BCryptExportKey( BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, + PUCHAR output, ULONG output_len, ULONG *size, ULONG flags ) { struct key *key = export_key; TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (!output || !output_len || !size) return STATUS_INVALID_PARAMETER; + if (!output || !type || !size) return STATUS_INVALID_PARAMETER; if (encrypt_key) { - FIXME("Encryption of key not yet supported\n"); - return STATUS_NO_MEMORY; + FIXME( "encryption of key not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; } return key_export( key, type, output, output_len, size ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7d59f6d..2a49971 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1393,7 +1393,7 @@ static void test_BCryptDecrypt(void) static void test_key_import_export(void) { UCHAR buffer1[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; - UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; + UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16], *buf; BCRYPT_KEY_DATA_BLOB_HEADER *key_data1 = (void*)buffer1; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; @@ -1408,6 +1408,7 @@ static void test_key_import_export(void) key_data1->cbKeyData = 16; memset(&key_data1[1], 0x11, 16); + key = NULL; ret = pBCryptImportKey(aes, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, buffer1, sizeof(buffer1), 0); ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); if (ret == STATUS_INVALID_PARAMETER) @@ -1415,11 +1416,12 @@ static void test_key_import_export(void) win_skip("broken BCryptImportKey\n"); return; } + ok(key != NULL, "key not set\n"); size = 0; - ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 1, &size, 0); + ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 0, &size, 0); ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); - ok(size == sizeof(buffer2), "Got %u\n", size); + ok(size == sizeof(buffer2), "got %u\n", size); size = 0; memset(buffer2, 0xff, sizeof(buffer2)); @@ -1428,6 +1430,25 @@ static void test_key_import_export(void) ok(size == sizeof(buffer2), "Got %u\n", size); ok(!memcmp(buffer1, buffer2, sizeof(buffer1)), "Expected exported key to match imported key\n"); + /* opaque blob */ + size = 0; + ret = pBCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buffer2, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size > 0, "got zero\n"); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + ret = pBCryptExportKey(key, NULL, BCRYPT_OPAQUE_KEY_BLOB, buf, size, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + key = NULL; + ret = pBCryptImportKey(aes, NULL, BCRYPT_OPAQUE_KEY_BLOB, &key, NULL, 0, buf, size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(key != NULL, "key not set\n"); + HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Hans Leidekker : bcrypt: Introduce helpers for BCryptDe/ Encrypt and BCryptImportKeyPair.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 576d22d2510045b1b330a9e7909741c10faa527c URL: https://source.winehq.org/git/wine.git/?a=commit;h=576d22d2510045b1b330a9e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 29 12:26:17 2018 +0200 bcrypt: Introduce helpers for BCryptDe/Encrypt and BCryptImportKeyPair. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 694 +++++++++++++++++++++++----------------------- 1 file changed, 349 insertions(+), 345 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=576d22d2510045b1b330…

1 0

Matteo Bruni : ddraw: Forbid setting a viewport larger than the render target.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 451c376977931e883684ec09e19c34b53b9812f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=451c376977931e883684ec09… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 21:05:14 2018 +0200 ddraw: Forbid setting a viewport larger than the render target. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 52 ++++++++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 75e000a..3599562 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5296,25 +5296,12 @@ static HRESULT WINAPI d3d_device7_Clear_FPUPreserve(IDirect3DDevice7 *iface, DWO return hr; } -/***************************************************************************** - * IDirect3DDevice7::SetViewport - * - * Sets the current viewport. - * - * Version 7 only, but IDirect3DViewport uses this call for older - * versions - * - * Params: - * Data: The new viewport to set - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Data is NULL - * - *****************************************************************************/ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_sub_resource_desc rt_desc; + struct wined3d_rendertarget_view *rtv; + struct ddraw_surface *surface; struct wined3d_viewport vp; TRACE("iface %p, viewport %p.\n", iface, viewport); @@ -5322,6 +5309,23 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi if (!viewport) return DDERR_INVALIDPARAMS; + wined3d_mutex_lock(); + if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + { + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); + + if (viewport->dwX > rt_desc.width || viewport->dwWidth > rt_desc.width - viewport->dwX + || viewport->dwY > rt_desc.height || viewport->dwHeight > rt_desc.height - viewport->dwY) + { + WARN("Invalid viewport, returning E_INVALIDARG.\n"); + wined3d_mutex_unlock(); + return E_INVALIDARG; + } + vp.x = viewport->dwX; vp.y = viewport->dwY; vp.width = viewport->dwWidth; @@ -5329,7 +5333,6 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi vp.min_z = viewport->dvMinZ; vp.max_z = viewport->dvMaxZ; - wined3d_mutex_lock(); wined3d_device_set_viewport(device->wined3d_device, &vp); wined3d_mutex_unlock(); @@ -5353,21 +5356,6 @@ static HRESULT WINAPI d3d_device7_SetViewport_FPUPreserve(IDirect3DDevice7 *ifac return hr; } -/***************************************************************************** - * IDirect3DDevice::GetViewport - * - * Returns the current viewport - * - * Version 7 - * - * Params: - * Data: D3D7Viewport structure to write the viewport information to - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Data is NULL - * - *****************************************************************************/ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *viewport) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface);

1 0

Matteo Bruni : wined3d: Limit clears to the size of the framebuffer.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: c830b0706b9c727067b4a1258e89d4382818a7ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=c830b0706b9c727067b4a125… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 21:05:15 2018 +0200 wined3d: Limit clears to the size of the framebuffer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8edb74f..2f0c4ed 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -531,7 +531,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewport; + struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; + RECT view_rect; unsigned int i; op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), @@ -553,12 +555,21 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { for (i = 0; i < rt_count; ++i) { - if (state->fb->render_targets[i]) - wined3d_resource_acquire(state->fb->render_targets[i]->resource); + if ((view = state->fb->render_targets[i])) + { + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); + } } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - wined3d_resource_acquire(state->fb->depth_stencil->resource); + { + view = state->fb->depth_stencil; + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); + } cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); }

1 0

Matteo Bruni : ddraw/tests: Port test_viewport() to ddraw7.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 3f6ab8f58b404a8c2e573267b0975cc7d4415c39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f6ab8f58b404a8c2e573267… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 21:05:16 2018 +0200 ddraw/tests: Port test_viewport() to ddraw7. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3f433a6..fb14409 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -280,6 +280,45 @@ static D3DCOLOR get_surface_color(IDirectDrawSurface7 *surface, UINT x, UINT y) return color; } +static void check_rect(IDirectDrawSurface7 *surface, RECT r, const char *message) +{ + LONG x_coords[2][2] = + { + {r.left - 1, r.left + 1}, + {r.right + 1, r.right - 1}, + }; + LONG y_coords[2][2] = + { + {r.top - 1, r.top + 1}, + {r.bottom + 1, r.bottom - 1} + }; + unsigned int i, j, x_side, y_side; + DWORD color; + LONG x, y; + + for (i = 0; i < 2; ++i) + { + for (j = 0; j < 2; ++j) + { + for (x_side = 0; x_side < 2; ++x_side) + { + for (y_side = 0; y_side < 2; ++y_side) + { + DWORD expected = (x_side == 1 && y_side == 1) ? 0x00ffffff : 0x00000000; + + x = x_coords[i][x_side]; + y = y_coords[j][y_side]; + if (x < 0 || x >= 640 || y < 0 || y >= 480) + continue; + color = get_surface_color(surface, x, y); + ok(color == expected, "%s: Pixel (%d, %d) has color %08x, expected %08x.\n", + message, x, y, color, expected); + } + } + } + } +} + static HRESULT CALLBACK enum_z_fmt(DDPIXELFORMAT *format, void *ctx) { DDPIXELFORMAT *z_fmt = ctx; @@ -14095,6 +14134,143 @@ static void test_enum_surfaces(void) IDirectDraw7_Release(ddraw); } +static void test_viewport(void) +{ + static struct + { + D3DVIEWPORT7 vp; + RECT expected_rect; + const char *message; + } + tests[] = + { + {{ 0, 0, 640, 480}, { 0, 120, 479, 359}, "Viewport (0, 0) - (640, 480)"}, + {{ 0, 0, 320, 240}, { 0, 60, 239, 179}, "Viewport (0, 0) - (320, 240)"}, + {{ 0, 0, 1280, 960}, { 0, 240, 639, 479}, "Viewport (0, 0) - (1280, 960)"}, + {{ 0, 0, 2000, 1600}, {-10, -10, -10, -10}, "Viewport (0, 0) - (2000, 1600)"}, + {{100, 100, 640, 480}, {100, 220, 579, 459}, "Viewport (100, 100) - (640, 480)"}, + {{ 0, 0, 8192, 8192}, {-10, -10, -10, -10}, "Viewport (0, 0) - (8192, 8192)"}, + }; + static struct vec3 quad[] = + { + {-1.5f, -0.5f, 0.1f}, + {-1.5f, 0.5f, 0.1f}, + { 0.5f, -0.5f, 0.1f}, + { 0.5f, 0.5f, 0.1f}, + }; + static const struct vec2 rt_sizes[] = + { + {640, 480}, {1280, 960}, {320, 240}, {800, 600}, + }; + IDirectDrawSurface7 *rt, *ds; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + DDPIXELFORMAT z_fmt; + unsigned int i, j; + IDirect3D7 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable depth test, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetViewport(device, NULL); + ok(hr == E_INVALIDARG, "Setting NULL viewport data returned unexpected hr %#x.\n", hr); + + ds = get_depth_stencil(device); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(ds, &surface_desc); + z_fmt = U4(surface_desc).ddpfPixelFormat; + + for (i = 0; i < ARRAY_SIZE(rt_sizes); ++i) + { + if (i) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.dwWidth = rt_sizes[i].x; + surface_desc.dwHeight = rt_sizes[i].y; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x (i %u).\n", hr, i); + + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat = z_fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x (i %u).\n", hr, i); + hr = IDirectDrawSurface7_AddAttachedSurface(rt, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x (i %u).\n", hr, i); + + hr = IDirect3DDevice7_SetRenderTarget(device, rt, 0); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x (i %u).\n", hr, i); + } + else + { + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + } + + for (j = 0; j < ARRAY_SIZE(tests); ++j) + { + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x (i %u, j %u).\n", hr, i, j); + + hr = IDirect3DDevice7_SetViewport(device, &tests[j].vp); + if (tests[j].vp.dwX + tests[j].vp.dwWidth > rt_sizes[i].x + || tests[j].vp.dwY + tests[j].vp.dwHeight > rt_sizes[i].y) + { + ok(hr == E_INVALIDARG, "Setting the viewport returned unexpected hr %#x (i %u, j %u).\n", hr, i, j); + continue; + } + else + { + ok(SUCCEEDED(hr), "Failed to set the viewport, hr %#x (i %u, j %u).\n", hr, i, j); + } + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x (i %u, j %u).\n", hr, i, j); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ, quad, 4, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x (i %u, j %u).\n", hr, i, j); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x (i %u, j %u).\n", hr, i, j); + + check_rect(rt, tests[j].expected_rect, tests[j].message); + } + + hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); + ok(SUCCEEDED(hr), "Failed to detach surface, hr %#x (i %u).\n", hr, i); + IDirectDrawSurface7_Release(ds); + + IDirectDrawSurface7_Release(rt); + } + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -14229,4 +14405,5 @@ START_TEST(ddraw7) test_depth_readback(); test_clear(); test_enum_surfaces(); + test_viewport(); }

1 0