January 2016 - Wine-Commits

Hugh McMaster : user32/tests: Add message tests for EM_SETSEL when getting /losing focus in combo boxes.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 75d95f68863b924958b3f7558311f6725fb6611c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d95f68863b924958b3f7558… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sat Jan 2 22:55:26 2016 +1100 user32/tests: Add message tests for EM_SETSEL when getting/losing focus in combo boxes. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bf1dab2..7d6c99a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -24,6 +24,7 @@ #define WINVER 0x0600 /* for WM_GETTITLEBARINFOEX */ #include <assert.h> +#include <limits.h> #include <stdarg.h> #include <stdio.h> @@ -5936,7 +5937,96 @@ static const struct message WmSetPosComboSeq[] = { 0 } }; -static WNDPROC old_combobox_proc; +static const struct message WMSetFocusComboBoxSeq[] = +{ + { WM_SETFOCUS, sent }, + { WM_KILLFOCUS, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|defwinproc }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, INT_MAX }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SETFOCUS) }, + { 0 } +}; + +static const struct message SetFocusButtonSeq[] = +{ + { WM_KILLFOCUS, sent }, + { CB_GETCOMBOBOXINFO, sent|optional },/* Windows 2000 */ + { 0x0167, sent|optional },/* Undocumented message. Sent on all versions except Windows 2000 */ + { WM_LBUTTONUP, sent|defwinproc }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDCANCEL) }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_KILLFOCUS) }, + { WM_CTLCOLORBTN, sent|parent }, + { 0 } +}; + +static const struct message SetFocusComboBoxSeq[] = +{ + { WM_CTLCOLORBTN, sent|parent }, + { WM_SETFOCUS, sent }, + { WM_KILLFOCUS, sent|defwinproc }, + { WM_SETFOCUS, sent }, + { WM_COMMAND, sent|defwinproc }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, INT_MAX }, + { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SETFOCUS) }, + { 0 } +}; + +static const struct message SetFocusButtonSeq2[] = +{ + { WM_KILLFOCUS, sent }, + { CB_GETCOMBOBOXINFO, sent|optional },/* Windows 2000 */ + { 0x0167, sent|optional },/* Undocumented message. Sent on all versions except Windows 2000 */ + { WM_LBUTTONUP, sent|defwinproc }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDCANCEL) }, + { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_CTLCOLOREDIT, sent|defwinproc }, + { WM_CTLCOLOREDIT, sent|parent }, + { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_COMBOBOX, CBN_KILLFOCUS) }, + { WM_CTLCOLORBTN, sent|parent }, + { 0 } +}; + +static WNDPROC old_combobox_proc, edit_window_proc; + +static LRESULT CALLBACK combobox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct recvd_message msg; + + /* do not log painting messages */ + if (message != WM_PAINT && + message != WM_NCPAINT && + message != WM_SYNCPAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + message != WM_GETTEXT && + !ignore_message( message )) + { + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "combo"; + add_message(&msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(edit_window_proc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -5987,8 +6077,11 @@ static void subclass_combobox(void) static void test_combobox_messages(void) { - HWND parent, combo; + HWND parent, combo, button, edit; LRESULT ret; + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + COMBOBOXINFO cbInfo; + BOOL res; subclass_combobox(); @@ -6029,6 +6122,65 @@ static void test_combobox_messages(void) DestroyWindow(combo); DestroyWindow(parent); + + /* Start again. Test combobox text selection when getting and losing focus */ + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + parent = CreateWindowExA(0, "TestParentClass", "Parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 10, 300, 300, NULL, NULL, NULL, NULL); + ok(parent != 0, "Failed to create parent window\n"); + + combo = CreateWindowExA(0, "my_combobox_class", "test", WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, + 5, 5, 100, 100, parent, (HMENU)ID_COMBOBOX, NULL, NULL); + ok(combo != 0, "Failed to create combobox window\n"); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + res = pGetComboBoxInfo(combo, &cbInfo); + ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + edit = cbInfo.hwndItem; + + edit_window_proc = (WNDPROC)SetWindowLongPtrA(edit, GWLP_WNDPROC, (ULONG_PTR)combobox_subclass_proc); + + button = CreateWindowExA(0, "Button", "OK", WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, + 5, 50, 100, 20, parent, NULL, + (HINSTANCE)GetWindowLongPtrA(parent, GWLP_HINSTANCE), NULL); + ok(button != 0, "Failed to create button window\n"); + + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, WM_SETFOCUS, 0, (LPARAM)edit); + log_all_parent_messages--; + ok_sequence(WMSetFocusComboBoxSeq, "WM_SETFOCUS on a ComboBox", TRUE); + + flush_sequence(); + log_all_parent_messages++; + SetFocus(button); + log_all_parent_messages--; + ok_sequence(SetFocusButtonSeq, "SetFocus on a Button", TRUE); + + SendMessageA(combo, WM_SETTEXT, 0, (LPARAM)"Wine Test"); + + flush_sequence(); + log_all_parent_messages++; + SetFocus(combo); + log_all_parent_messages--; + ok_sequence(SetFocusComboBoxSeq, "SetFocus on a ComboBox", TRUE); + + flush_sequence(); + log_all_parent_messages++; + SetFocus(button); + log_all_parent_messages--; + ok_sequence(SetFocusButtonSeq2, "SetFocus on a Button (2)", TRUE); + + DestroyWindow(button); + DestroyWindow(combo); + DestroyWindow(parent); } /****************** WM_IME_KEYDOWN message test *******************/

1 0

Sebastian Lackner : ntdll: Receive debug registers from server on x86_64.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 7c468f8eca3af45eb8d8422f161c3f9782e55370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c468f8eca3af45eb8d8422f1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:41:01 2016 +0100 ntdll: Receive debug registers from server on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index aaf7a71..1455eb1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -830,9 +830,11 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) DWORD needed_flags = context->ContextFlags; BOOL self = (handle == GetCurrentThread()); + /* on i386/amd64 debug registers always require a server call */ #ifdef __i386__ - /* on i386 debug registers always require a server call */ if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) self = FALSE; +#elif defined(__x86_64__) + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_AMD64)) self = FALSE; #endif if (!self)

1 0

Sebastian Lackner : ntdll: Check ContextFlags before restoring registers on x86_64.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 897ac569c84d9be42e0b4bbd718a3eb05663e4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897ac569c84d9be42e0b4bbd7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:40:46 2016 +0100 ntdll: Check ContextFlags before restoring registers on x86_64. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 524de68..0c64541 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1800,11 +1800,12 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "ret" ); /*********************************************************************** - * set_cpu_context + * set_full_cpu_context * * Set the new CPU context. */ -__ASM_GLOBAL_FUNC( set_cpu_context, +extern void set_full_cpu_context( const CONTEXT *context ); +__ASM_GLOBAL_FUNC( set_full_cpu_context, "subq $40,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 40\n\t") "ldmxcsr 0x34(%rdi)\n\t" /* context->MxCsr */ @@ -1852,6 +1853,25 @@ __ASM_GLOBAL_FUNC( set_cpu_context, "movq 0xb0(%rdi),%rdi\n\t" /* context->Rdi */ "iretq" ); + +/*********************************************************************** + * set_cpu_context + * + * Set the new CPU context. Used by NtSetContextThread. + */ +void set_cpu_context( const CONTEXT *context ) +{ + DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; + if (flags & CONTEXT_FULL) + { + if (!(flags & CONTEXT_CONTROL)) + FIXME( "setting partial context (%x) not supported\n", flags ); + else + set_full_cpu_context( context ); + } +} + + /*********************************************************************** * copy_context *

1 0

Jacek Caban : mshtml: Properly convert VT_NULL to string in get_elem_attr_value_by_dispid.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: f394dca92a014fa07e0cec59f97fb9fd2ba157da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f394dca92a014fa07e0cec59f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 5 18:53:21 2016 +0100 mshtml: Properly convert VT_NULL to string in get_elem_attr_value_by_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 8 ++++++++ dlls/mshtml/tests/dom.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ce9d859..e5ae4e0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -644,6 +644,8 @@ HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD fl EXCEPINFO excep; HRESULT hres; + static const WCHAR nullW[] = {'n','u','l','l',0}; + hres = IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); if(FAILED(hres)) @@ -653,6 +655,12 @@ HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD fl switch(V_VT(ret)) { case VT_BSTR: break; + case VT_NULL: + V_BSTR(ret) = SysAllocString(nullW); + if(!V_BSTR(ret)) + return E_OUTOFMEMORY; + V_VT(ret) = VT_BSTR; + break; case VT_DISPATCH: IDispatch_Release(V_DISPATCH(ret)); V_VT(ret) = VT_BSTR; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bcb016d..1be81e5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1411,8 +1411,19 @@ static void test_get_set_attr(IHTMLDocument2 *doc) ok(V_VT(&val) == VT_BOOL, "variant type should have been VT_BOOL (0x%x), was: 0x%x\n", VT_BOOL, V_VT(&val)); ok(V_BOOL(&val) == VARIANT_TRUE, "variant value should have been VARIANT_TRUE (0x%x), was %d\n", VARIANT_TRUE, V_BOOL(&val)); VariantClear(&val); - SysFreeString(bstr); + /* overwrite the attribute with null */ + V_VT(&val) = VT_NULL; + hres = IHTMLElement_setAttribute(elem, bstr, val, 0); + ok(hres == S_OK, "setAttribute failed: %08x\n", hres); + + hres = IHTMLElement_getAttribute(elem, bstr, 2, &val); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&val) == VT_BSTR, "V_VT(val) = %u, expected VT_BSTR", V_VT(&val)); + ok(!strcmp_wa(V_BSTR(&val), "null"), "V_BSTR(val) = %s, expected \"null\"\n", wine_dbgstr_w(V_BSTR(&val))); + VariantClear(&val); + + SysFreeString(bstr); IHTMLElement_Release(elem); }

1 0

Hans Leidekker : bcrypt: Implement BCryptHashData.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: b1e08b3928f00f36eefd1bcec17c83dbd58419ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e08b3928f00f36eefd1bcec… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 6 14:19:18 2016 +0100 bcrypt: Implement BCryptHashData. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 53db32a..5d67516 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -29,7 +29,7 @@ @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) -@ stub BCryptHashData +@ stdcall BCryptHashData(ptr ptr long long) @ stub BCryptImportKey @ stub BCryptImportKeyPair @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9ad3060..806fee8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -202,6 +202,32 @@ static NTSTATUS hash_init( struct hash *hash ) } return STATUS_SUCCESS; } + +static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + switch (hash->alg_id) + { + case ALG_ID_SHA1: + CC_SHA1_Update( &hash->u.sha1_ctx, input, size ); + break; + + case ALG_ID_SHA256: + CC_SHA256_Update( &hash->u.sha256_ctx, input, size ); + break; + + case ALG_ID_SHA384: + CC_SHA384_Update( &hash->u.sha512_ctx, input, size ); + break; + + case ALG_ID_SHA512: + CC_SHA512_Update( &hash->u.sha512_ctx, input, size ); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + break; + } +} #else struct hash { @@ -214,6 +240,11 @@ static NTSTATUS hash_init( struct hash *hash ) ERR( "support for hashes not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } + +static void hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ + ERR( "support for hashes not available at build time\n" ); +} #endif #define OBJECT_LENGTH_SHA1 278 @@ -410,3 +441,16 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) HeapFree( GetProcessHeap(), 0, hash ); return STATUS_SUCCESS; } + +NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG size, ULONG flags ) +{ + struct hash *hash = handle; + + TRACE( "%p, %p, %u, %08x\n", handle, input, size, flags ); + + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!input) return STATUS_INVALID_PARAMETER; + + hash_update( hash, input, size ); + return STATUS_SUCCESS; +}

1 0

Hans Leidekker : bcrypt: Implement BCryptGetProperty.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 46369d79e0cd24f1ef396a692e001bfc3d1ef101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46369d79e0cd24f1ef396a692… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 6 14:19:17 2016 +0100 bcrypt: Implement BCryptGetProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 152 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index d496d80..9ad3060 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -216,11 +216,157 @@ static NTSTATUS hash_init( struct hash *hash ) } #endif -NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) +#define OBJECT_LENGTH_SHA1 278 +#define OBJECT_LENGTH_SHA256 286 +#define OBJECT_LENGTH_SHA384 382 +#define OBJECT_LENGTH_SHA512 382 + +#define HASH_DIGEST_LENGTH_SHA1 20 +#define HASH_DIGEST_LENGTH_SHA256 32 +#define HASH_DIGEST_LENGTH_SHA384 48 +#define HASH_DIGEST_LENGTH_SHA512 64 + +static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { - FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); + ULONG value; - return STATUS_NOT_IMPLEMENTED; + switch (id) + { + case ALG_ID_SHA1: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA1; + break; + } + FIXME( "unsupported sha1 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA256: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA256; + break; + } + FIXME( "unsupported sha256 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA384: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA384; + break; + } + FIXME( "unsupported sha384 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA512: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_SHA512; + break; + } + FIXME( "unsupported sha512 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + default: + FIXME( "unsupported algorithm %u\n", id ); + return STATUS_NOT_IMPLEMENTED; + } + + if (size < sizeof(ULONG)) + { + *ret_size = sizeof(ULONG); + return STATUS_BUFFER_TOO_SMALL; + } + if (buf) *(ULONG *)buf = value; + *ret_size = sizeof(ULONG); + + return STATUS_SUCCESS; +} + +static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + ULONG value; + + switch (id) + { + case ALG_ID_SHA1: + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA1; + break; + } + FIXME( "unsupported sha1 hash property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA256: + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA256; + break; + } + FIXME( "unsupported sha256 hash property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA384: + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA384; + break; + } + FIXME( "unsupported sha384 hash property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + case ALG_ID_SHA512: + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + value = HASH_DIGEST_LENGTH_SHA512; + break; + } + FIXME( "unsupported sha512 hash property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + default: + FIXME( "unsupported hash %u\n", id ); + return STATUS_NOT_IMPLEMENTED; + } + + if (size < sizeof(ULONG)) + { + *ret_size = sizeof(ULONG); + return STATUS_BUFFER_TOO_SMALL; + } + if (buf) *(ULONG *)buf = value; + *ret_size = sizeof(ULONG); + + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) +{ + struct object *object = handle; + + TRACE( "%p, %s, %p, %u, %p, %08x\n", handle, wine_dbgstr_w(prop), buffer, count, res, flags ); + + if (!object) return STATUS_INVALID_HANDLE; + if (!prop || !res) return STATUS_INVALID_PARAMETER; + + switch (object->magic) + { + case MAGIC_ALG: + { + const struct algorithm *alg = (const struct algorithm *)object; + return get_alg_property( alg->id, prop, buffer, count, res ); + } + case MAGIC_HASH: + { + const struct hash *hash = (const struct hash *)object; + return get_hash_property( hash->alg_id, prop, buffer, count, res ); + } + default: + WARN( "unknown magic %08x", object->magic ); + return STATUS_INVALID_HANDLE; + } } NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen,

1 0

Hugh McMaster : kernel32: Remove incorrect comment from !i386 version of GetLargestConsoleWindowSize.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 66974e5502c5d094286455cf23f51ca62c5b1220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66974e5502c5d094286455cf2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jan 6 18:27:59 2016 +1100 kernel32: Remove incorrect comment from !i386 version of GetLargestConsoleWindowSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 85e4ba8..5db37a0 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1398,19 +1398,9 @@ DWORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) TRACE("(%p), returning %dx%d (%x)\n", hConsoleOutput, x.c.X, x.c.Y, x.w); return x.w; } -#endif /* defined(__i386__) */ +#else -/*********************************************************************** - * GetLargestConsoleWindowSize (KERNEL32.@) - * - * NOTE - * This should return a COORD, but calling convention for returning - * structures is different between Windows and gcc on i386. - * - * VERSION: [!i386] - */ -#ifndef __i386__ COORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) { COORD c;

1 0

Andrew Eikum : oleaut32: Don't clear BSTR size.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 3bc2ec33712ed57abf92b8014dda334cb9046d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc2ec33712ed57abf92b8014… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 5 13:38:21 2016 -0600 oleaut32: Don't clear BSTR size. The size is used during cache lookup. Clearing it will break lookup and prevent detection of double-freeing when warn+heap is enabled. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 78cb083..214421c 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -277,7 +277,6 @@ void WINAPI SysFreeString(BSTR str) if(WARN_ON(heap)) { unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; - bstr->size = ARENA_FREE_FILLER; for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER; }

1 0

Sebastian Lackner : ntdll/tests: Add tests for setting debug registers with NtSetContextThread.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: 6483c07b4e06caecbe5e6076e8ddd837a90a3e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6483c07b4e06caecbe5e6076e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 2 04:41:19 2016 +0100 ntdll/tests: Add tests for setting debug registers with NtSetContextThread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a368997..bd2fa40 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1723,6 +1723,50 @@ static void test_dynamic_unwind(void) #endif /* __x86_64__ */ #if defined(__i386__) || defined(__x86_64__) + +static void test_debug_registers(void) +{ + static const struct + { + ULONG_PTR dr0, dr1, dr2, dr3, dr6, dr7; + } + tests[] = + { + { 0x42424240, 0, 0x126bb070, 0x0badbad0, 0, 0xffff0115 }, + { 0x42424242, 0, 0x100f0fe7, 0x0abebabe, 0, 0x115 }, + }; + NTSTATUS status; + CONTEXT ctx; + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + ctx.Dr0 = tests[i].dr0; + ctx.Dr1 = tests[i].dr1; + ctx.Dr2 = tests[i].dr2; + ctx.Dr3 = tests[i].dr3; + ctx.Dr6 = tests[i].dr6; + ctx.Dr7 = tests[i].dr7; + + status = pNtSetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08x\n", status); + + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + + status = pNtGetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %08x\n", status); + ok(ctx.Dr0 == tests[i].dr0, "test %d: expected %lx, got %lx\n", i, tests[i].dr0, (DWORD_PTR)ctx.Dr0); + ok(ctx.Dr1 == tests[i].dr1, "test %d: expected %lx, got %lx\n", i, tests[i].dr1, (DWORD_PTR)ctx.Dr1); + ok(ctx.Dr2 == tests[i].dr2, "test %d: expected %lx, got %lx\n", i, tests[i].dr2, (DWORD_PTR)ctx.Dr2); + ok(ctx.Dr3 == tests[i].dr3, "test %d: expected %lx, got %lx\n", i, tests[i].dr3, (DWORD_PTR)ctx.Dr3); + ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %lx, got %lx\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); + ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %lx, got %lx\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); + } +} + static DWORD outputdebugstring_exceptions; static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -1946,6 +1990,7 @@ START_TEST(exception) test_unwind(); test_exceptions(); test_rtlraiseexception(); + test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); test_vectored_continue_handler(); @@ -1965,6 +2010,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); + test_debug_registers(); test_outputdebugstring(1, FALSE); test_ripevent(1); test_vectored_continue_handler();

1 0

Sebastian Lackner : kernel32: Clamp maximum console window size to screen buffer size.
by Alexandre Julliard Jan. 6, 2016

Jan. 6, 2016

Module: wine Branch: master Commit: dfe42ca50652517db365bd1f02f848c7029072d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe42ca50652517db365bd1f0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 6 01:05:04 2016 +0100 kernel32: Clamp maximum console window size to screen buffer size. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 4 ++-- dlls/kernel32/tests/console.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 3c53b52..85e4ba8 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2160,8 +2160,8 @@ BOOL WINAPI GetConsoleScreenBufferInfo(HANDLE hConsoleOutput, LPCONSOLE_SCREEN_B csbi->srWindow.Right = reply->win_right; csbi->srWindow.Top = reply->win_top; csbi->srWindow.Bottom = reply->win_bottom; - csbi->dwMaximumWindowSize.X = reply->max_width; - csbi->dwMaximumWindowSize.Y = reply->max_height; + csbi->dwMaximumWindowSize.X = min(reply->width, reply->max_width); + csbi->dwMaximumWindowSize.Y = min(reply->height, reply->max_height); } } SERVER_END_REQ; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f362415..43a4b75 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2686,9 +2686,11 @@ static void test_GetLargestConsoleWindowSize(HANDLE std_output) COORD c, font; RECT r; LONG workarea_w, workarea_h, maxcon_w, maxcon_h; + CONSOLE_SCREEN_BUFFER_INFO sbi; CONSOLE_FONT_INFO cfi; DWORD index, i; HMODULE hmod; + BOOL ret; DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); BOOL (WINAPI *pSetConsoleFont)(HANDLE, DWORD); @@ -2740,6 +2742,13 @@ static void test_GetLargestConsoleWindowSize(HANDLE std_output) maxcon_h = workarea_h / font.Y; ok(c.X == maxcon_w || c.X == maxcon_w - 1 /* Win10 */, "got %d, expected %d\n", c.X, maxcon_w); ok(c.Y == maxcon_h || c.Y == maxcon_h - 1 /* Win10 */, "got %d, expected %d\n", c.Y, maxcon_h); + + ret = GetConsoleScreenBufferInfo(std_output, &sbi); + ok(ret, "GetConsoleScreenBufferInfo failed %u\n", GetLastError()); + ok(sbi.dwMaximumWindowSize.X == min(c.X, sbi.dwSize.X), "got %d, expected %d\n", + sbi.dwMaximumWindowSize.X, min(c.X, sbi.dwSize.X)); + ok(sbi.dwMaximumWindowSize.Y == min(c.Y, sbi.dwSize.Y), "got %d, expected %d\n", + sbi.dwMaximumWindowSize.Y, min(c.Y, sbi.dwSize.Y)); } pSetConsoleFont(std_output, index); /* restore original font size */ }

1 0