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

Huw Davies : user32: Invalidate the listbox in LB_SETCOUNT.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 698c7f0f3f8fa1d0ed33c629fa9e93279085d39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=698c7f0f3f8fa1d0ed33c629f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 28 10:21:22 2013 +0000 user32: Invalidate the listbox in LB_SETCOUNT. --- dlls/user32/listbox.c | 2 + dlls/user32/tests/listbox.c | 78 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0f4a8be..64691e4 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1767,6 +1767,8 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) return ret; } + + InvalidateRect( descr->self, NULL, TRUE ); return LB_OKAY; } diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index ef4a35b..5d96f5c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -274,30 +274,42 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return DefWindowProc(hwnd, msg, wparam, lparam); } -static void test_ownerdraw(void) +static HWND create_parent( void ) { WNDCLASS cls; - HWND parent, hLB; - INT ret; - RECT rc; + HWND parent; + static ATOM class; - cls.style = 0; - cls.lpfnWndProc = main_window_proc; - cls.cbClsExtra = 0; - cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandle(0); - cls.hIcon = 0; - cls.hCursor = LoadCursor(0, IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszMenuName = NULL; - cls.lpszClassName = "main_window_class"; - ok (RegisterClass(&cls), "RegisterClass failed\n"); + if (!class) + { + cls.style = 0; + cls.lpfnWndProc = main_window_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandle(0); + cls.hIcon = 0; + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "main_window_class"; + class = RegisterClass( &cls ); + } parent = CreateWindowEx(0, "main_window_class", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 400, 400, GetDesktopWindow(), 0, GetModuleHandle(0), NULL); + return parent; +} + +static void test_ownerdraw(void) +{ + HWND parent, hLB; + INT ret; + RECT rc; + + parent = create_parent(); assert(parent); hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); @@ -1498,6 +1510,41 @@ static void test_listbox_dlgdir(void) DestroyWindow(hWnd); } +static void test_set_count( void ) +{ + HWND parent, listbox; + LONG ret; + RECT r; + + parent = create_parent(); + listbox = create_listbox( LBS_OWNERDRAWFIXED | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent ); + + UpdateWindow( listbox ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessage( listbox, LB_SETCOUNT, 100, 0 ); + ok( ret == 0, "got %d\n", ret ); + ret = SendMessage( listbox, LB_GETCOUNT, 0, 0 ); + ok( ret == 100, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + ValidateRect( listbox, NULL ); + GetUpdateRect( listbox, &r, TRUE ); + ok( IsRectEmpty( &r ), "got non-empty rect\n"); + + ret = SendMessage( listbox, LB_SETCOUNT, 99, 0 ); + ok( ret == 0, "got %d\n", ret ); + + GetUpdateRect( listbox, &r, TRUE ); + ok( !IsRectEmpty( &r ), "got empty rect\n"); + + DestroyWindow( listbox ); + DestroyWindow( parent ); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1576,4 +1623,5 @@ START_TEST(listbox) test_listbox_item_data(); test_listbox_LB_DIR(); test_listbox_dlgdir(); + test_set_count(); }

1 0

Jacek Caban : secur32: Take schannel backend capabilities into account when configuring enabled protocols .
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: fe474e3b6a05dddae2c69fbe35100895dd38ae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe474e3b6a05dddae2c69fbe3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 28 12:05:59 2013 +0100 secur32: Take schannel backend capabilities into account when configuring enabled protocols. --- dlls/secur32/schannel.c | 2 +- dlls/secur32/schannel_gnutls.c | 6 ++++++ dlls/secur32/schannel_macosx.c | 5 +++++ dlls/secur32/secur32_priv.h | 1 + 4 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a83a76..df75b67 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -237,7 +237,7 @@ static void read_config(void) RegCloseKey(protocols_key); - config_enabled_protocols = enabled; + config_enabled_protocols = enabled & schan_imp_enabled_protocols(); config_default_disabled_protocols = default_disabled; config_read = TRUE; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8975b2d..b460505 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -106,6 +106,12 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } +DWORD schan_imp_enabled_protocols(void) +{ + /* NOTE: No support for SSL 2.0 */ + return SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT; +} + BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2acb6ca..c562a98 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -630,6 +630,11 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, return ret; } +DWORD schan_imp_enabled_protocols(void) +{ + /* NOTE: No support for TLS 1.1 and TLS 1.2 */ + return SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; +} BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5b2ac89..dc08429 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -260,6 +260,7 @@ extern SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, SIZE_T *length) DECLSPEC_HIDDEN; extern BOOL schan_imp_allocate_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; extern void schan_imp_free_certificate_credentials(schan_credentials*) DECLSPEC_HIDDEN; +extern DWORD schan_imp_enabled_protocols(void) DECLSPEC_HIDDEN; extern BOOL schan_imp_init(void) DECLSPEC_HIDDEN; extern void schan_imp_deinit(void) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Update spec file with functions added in newer version of the dll.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 12b8c9671e8fd66519f3c17f98e55ea1a1257ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b8c9671e8fd66519f3c17f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 12:56:38 2013 +0100 msvcrt: Update spec file with functions added in newer version of the dll. --- dlls/msvcrt/locale.c | 12 +++++++++--- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/wcs.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7fa4882..520c8fe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -702,7 +702,9 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) MSVCRT_free(mbcinfo); } -/* _get_current_locale - not exported in native msvcrt */ +/********************************************************************* + * _get_current_locale (MSVCRT.@) + */ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) { MSVCRT__locale_t loc = MSVCRT_malloc(sizeof(MSVCRT__locale_tstruct)); @@ -716,7 +718,9 @@ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) return loc; } -/* _free_locale - not exported in native msvcrt */ +/********************************************************************* + * _free_locale (MSVCRT.@) + */ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) { if (!locale) @@ -727,7 +731,9 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) MSVCRT_free(locale); } -/* _create_locale - not exported in native msvcrt */ +/********************************************************************* + * _create_locale (MSVCRT.@) + */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) { static const DWORD time_data[] = { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dc87b8e..a569ea2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -376,6 +376,7 @@ @ cdecl _cputs(str) @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat +@ cdecl _create_locale(long str) MSVCRT__create_locale # stub _crtAssertBusy # stub _crtBreakAlloc # stub _crtDbgFlag @@ -464,6 +465,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ cdecl _fputwchar(long) MSVCRT__fputwchar # stub _free_dbg(ptr long) +@ cdecl _free_locale(ptr) MSVCRT__free_locale # stub _freea(ptr) # stub _freea_s @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @@ -496,6 +498,7 @@ @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) @ cdecl _gcvt_s(ptr long double long) +@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_doserrno(ptr) # stub _get_environ(ptr) @ cdecl _get_errno(ptr) @@ -1117,6 +1120,7 @@ @ cdecl _wcsrev(wstr) MSVCRT__wcsrev @ cdecl _wcsset(wstr long) MSVCRT__wcsset # stub _wcsset_s(wstr long) +@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l(wstr ptr long ptr) @@ -1515,17 +1519,13 @@ @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl _configthreadlocale(long) -@ cdecl _create_locale(long str) MSVCRT__create_locale -@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _dupenv_s(ptr ptr str) -@ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _get_invalid_parameter_handler() @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_purecall_handler(ptr) @ cdecl _set_security_error_handler(ptr) @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl _wdupenv_s(ptr ptr wstr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7408bec..eb268dc 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -199,7 +199,7 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) } /********************************************************************* - * _wcstod_l - not exported in native msvcrt + * _wcstod_l (MSVCRT.@) */ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale)

1 0

Piotr Caban : msvcrt: Move fread_s function to msvcrt.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 280f8237b579a5a1140b96585ccbe0bf4f0bc474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280f8237b579a5a1140b96585… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 12:57:14 2013 +0100 msvcrt: Move fread_s function to msvcrt. --- dlls/msvcr100/msvcr100.c | 53 ------------------------------------------- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 5 ++++ dlls/msvcrt/msvcrt.spec | 1 + 8 files changed, 61 insertions(+), 57 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 3a0a205..2735d17 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -448,59 +448,6 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) } /********************************************************************* - * fread_s (MSVCR100.@) - */ -size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size, size_t count, FILE *stream) -{ - size_t bytes_left, buf_pos; - - TRACE("(%p %lu %lu %lu %p\n", buf, (unsigned long)buf_size, - (unsigned long)elem_size, (unsigned long)count, stream); - - - if(!CHECK_PMT(stream != NULL)) { - if(buf && buf_size) - memset(buf, 0, buf_size); - return 0; - } - if(!elem_size || !count) return 0; - if(!CHECK_PMT(buf != NULL)) return 0; - if(!CHECK_PMT(SIZE_MAX/count >= elem_size)) return 0; - - bytes_left = elem_size*count; - buf_pos = 0; - while(bytes_left) { - if(stream->_cnt > 0) { - size_t size = bytes_left<stream->_cnt ? bytes_left : stream->_cnt; - - if(!CHECK_PMT_ERR(size <= buf_size-buf_pos, ERANGE)) { - memset(buf, 0, buf_size); - return 0; - } - - fread((char*)buf+buf_pos, 1, size, stream); - buf_pos += size; - bytes_left -= size; - }else { - int c = _filbuf(stream); - - if(c == EOF) - break; - - if(!CHECK_PMT_ERR(buf_size-buf_pos > 0, ERANGE)) { - memset(buf, 0, buf_size); - return 0; - } - - ((char*)buf)[buf_pos++] = c; - bytes_left--; - } - } - - return buf_pos/elem_size; -} - -/********************************************************************* * _sprintf_p (MSVCR100.@) */ int CDECL _sprintf_p(char *buffer, size_t length, const char *format, ...) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index efba85a..af00082 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1670,7 +1670,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3718eae..a80cc6e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2033,7 +2033,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0d6b8f8..d8f361f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1323,7 +1323,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 158c9f5..7916839 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1324,7 +1324,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s +@ cdecl fread_s(ptr long long long ptr) msvcrt.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 28dd132..c8863b3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3686,6 +3686,57 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm return read / size; } + +/* fread_s - not exported in native msvcrt */ +MSVCRT_size_t CDECL fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size, + MSVCRT_size_t count, MSVCRT_FILE *stream) +{ + size_t bytes_left, buf_pos; + + TRACE("(%p %lu %lu %lu %p\n", buf, buf_size, elem_size, count, stream); + + if(!MSVCRT_CHECK_PMT(stream != NULL)) { + if(buf && buf_size) + memset(buf, 0, buf_size); + return 0; + } + if(!elem_size || !count) return 0; + if(!MSVCRT_CHECK_PMT(buf != NULL)) return 0; + if(!MSVCRT_CHECK_PMT(MSVCRT_SIZE_MAX/count >= elem_size)) return 0; + + bytes_left = elem_size*count; + buf_pos = 0; + while(bytes_left) { + if(stream->_cnt > 0) { + size_t size = bytes_left<stream->_cnt ? bytes_left : stream->_cnt; + + if(!MSVCRT_CHECK_PMT_ERR(size <= buf_size-buf_pos, MSVCRT_ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + MSVCRT_fread((char*)buf+buf_pos, 1, size, stream); + buf_pos += size; + bytes_left -= size; + }else { + int c = MSVCRT__filbuf(stream); + + if(c == EOF) + break; + + if(!MSVCRT_CHECK_PMT_ERR(buf_size-buf_pos > 0, MSVCRT_ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + ((char*)buf)[buf_pos++] = c; + bytes_left--; + } + } + + return buf_pos/elem_size; +} + /********************************************************************* * _wfreopen (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 69ad7a7..c688dea 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -48,6 +48,11 @@ #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) #define MSVCRT_MB_LEN_MAX 2 +#ifdef _WIN64 +#define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX +#else +#define MSVCRT_SIZE_MAX MSVCRT_ULONG_MAX +#endif #define MSVCRT__MAX_DRIVE 3 #define MSVCRT__MAX_DIR 256 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a569ea2..edef615 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1530,3 +1530,4 @@ @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _getptd() +@ cdecl fread_s(ptr long long long ptr)

1 0

Piotr Caban : kernel32: Fixed copy-paste error in IdnToUnicode.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 46919f21544fce02e3a90ecfcc0f2f3e79972932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46919f21544fce02e3a90ecfc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 28 16:10:44 2013 +0100 kernel32: Fixed copy-paste error in IdnToUnicode. --- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 57daab1..04fb6e8 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4480,8 +4480,8 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, return 0; } - if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpUnicodeCharStr[label_start]=='-' || - lpUnicodeCharStr[label_end-1]=='-')) { + if((dwFlags&IDN_USE_STD3_ASCII_RULES) && (lpASCIICharStr[label_start]=='-' || + lpASCIICharStr[label_end-1]=='-')) { SetLastError(ERROR_INVALID_NAME); return 0; } @@ -4494,7 +4494,7 @@ INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, tolowerW(lpASCIICharStr[label_start])!='x' || tolowerW(lpASCIICharStr[label_start+1])!='n' || lpASCIICharStr[label_start+2]!='-' || lpASCIICharStr[label_start+3]!='-') { - if(label_end < cchUnicodeChar) + if(label_end < cchASCIIChar) label_end++; if(!lpUnicodeCharStr) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e9c83b8..f1c66e2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3386,6 +3386,10 @@ static void test_IdnToUnicode(void) for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) { + ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, + test_data[i].in_len, NULL, 0); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + SetLastError(0xdeadbeef); ret = pIdnToUnicode(test_data[i].flags, test_data[i].in, test_data[i].in_len, buf, sizeof(buf));

1 0

Huw Davies : user32: Keep the combo listbox within the monitor's work area.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: b4b99697f99cebec0f92042075d62f27b235d35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b99697f99cebec0f9204207… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 28 16:03:30 2013 +0000 user32: Keep the combo listbox within the monitor's work area. --- dlls/user32/combo.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 346b346..2aa4424 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1043,18 +1043,24 @@ static void CBDropDown( LPHEADCOMBO lphc ) } } + r.left = rect.left; + r.top = rect.bottom; + r.right = r.left + lphc->droppedRect.right - lphc->droppedRect.left; + r.bottom = r.top + nDroppedHeight; + /*If height of dropped rectangle gets beyond a screen size it should go up, otherwise down.*/ monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); - if( (rect.bottom + nDroppedHeight) >= mon_info.rcWork.bottom ) - rect.bottom = rect.top - nDroppedHeight; + if (r.bottom > mon_info.rcWork.bottom) + { + r.top = max( rect.top - nDroppedHeight, mon_info.rcWork.top ); + r.bottom = min( r.top + nDroppedHeight, mon_info.rcWork.bottom ); + } - SetWindowPos( lphc->hWndLBox, HWND_TOP, rect.left, rect.bottom, - lphc->droppedRect.right - lphc->droppedRect.left, - nDroppedHeight, - SWP_NOACTIVATE | SWP_SHOWWINDOW); + SetWindowPos( lphc->hWndLBox, HWND_TOP, r.left, r.top, r.right - r.left, r.bottom - r.top, + SWP_NOACTIVATE | SWP_SHOWWINDOW ); if( !(lphc->wState & CBF_NOREDRAW) )

1 0

Aric Stewart : user32: ImmProcessKey is only called on WM_KEYDOWN and if the message is being removed .
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 6e4cbd5787c6241a406b6ae1ddacf1527ad1efc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4cbd5787c6241a406b6ae1d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 27 14:42:43 2013 -0500 user32: ImmProcessKey is only called on WM_KEYDOWN and if the message is being removed. --- dlls/user32/message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index b0bf176..09a4cb3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2453,8 +2453,8 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, } accept_hardware_message( hw_id, remove, 0 ); - if ( msg->message == WM_KEYDOWN || msg->message == WM_KEYUP ) - if ( ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) + if ( remove && msg->message == WM_KEYDOWN ) + if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) msg->wParam = VK_PROCESSKEY; return TRUE;

1 0

Aric Stewart : imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: wine Branch: master Commit: 83e233c97da8d3338abe5686bb69559b8d2c78db URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e233c97da8d3338abe5686b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 28 12:34:28 2013 -0500 imm32/tests: Show behavior with VK_PROCESSKEY in relation to PeekMessage. --- dlls/imm32/tests/imm32.c | 137 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 136 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 5aff7f7..8e6dab8 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -29,6 +29,7 @@ static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); /* * msgspy - record and analyse message traces sent to a certain window @@ -46,6 +47,19 @@ static struct _msg_spy { unsigned int i_msg; } msg_spy; +typedef struct +{ + DWORD type; + union + { + MOUSEINPUT mi; + KEYBDINPUT ki; + HARDWAREINPUT hi; + } u; +} TEST_INPUT; + +static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); + static LRESULT CALLBACK get_msg_filter(int nCode, WPARAM wParam, LPARAM lParam) { if (HC_ACTION == nCode) { @@ -169,11 +183,13 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) static BOOL init(void) { WNDCLASSEX wc; HIMC imc; - HMODULE hmod; + HMODULE hmod,huser; hmod = GetModuleHandleA("imm32.dll"); + huser = GetModuleHandleA("user32"); pImmAssociateContextEx = (void*)GetProcAddress(hmod, "ImmAssociateContextEx"); pImmIsUIMessageA = (void*)GetProcAddress(hmod, "ImmIsUIMessageA"); + pSendInput = (void*)GetProcAddress(huser, "SendInput"); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -701,6 +717,122 @@ static void test_ImmMessages(void) DestroyWindow(hwnd); } +static LRESULT CALLBACK processkey_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam ) +{ + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +static void test_ime_processkey(void) +{ + WCHAR classNameW[] = {'P','r','o','c','e','s','s', 'K','e','y','T','e','s','t','C','l','a','s','s',0}; + WCHAR windowNameW[] = {'P','r','o','c','e','s','s', 'K','e','y',0}; + + MSG msg; + WNDCLASSW wclass; + HANDLE hInstance = GetModuleHandleW(NULL); + TEST_INPUT inputs[2]; + HIMC imc; + INT rc; + HWND hWndTest; + + wclass.lpszClassName = classNameW; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = processkey_wnd_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIcon(0, IDI_APPLICATION); + wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + if(!RegisterClassW(&wclass)){ + win_skip("Failed to register window.\n"); + return; + } + + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + + ShowWindow(hWndTest, SW_SHOW); + SetWindowPos(hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hWndTest); + UpdateWindow(hWndTest); + + imc = ImmGetContext(hWndTest); + if (!imc) + { + win_skip("IME not supported\n"); + DestroyWindow(hWndTest); + return; + } + + rc = ImmSetOpenStatus(imc, TRUE); + if (rc != TRUE) + { + win_skip("Unable to open IME\n"); + ImmReleaseContext(hWndTest, imc); + DestroyWindow(hWndTest); + return; + } + + /* flush pending messages */ + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); + + SetFocus(hWndTest); + + /* init input data that never changes */ + inputs[1].type = inputs[0].type = INPUT_KEYBOARD; + inputs[1].u.ki.dwExtraInfo = inputs[0].u.ki.dwExtraInfo = 0; + inputs[1].u.ki.time = inputs[0].u.ki.time = 0; + + /* Pressing a key */ + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = 0x0; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYDOWN) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + if(msg.wParam == VK_PROCESSKEY) + trace("ProcessKey was correctly found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + inputs[0].u.ki.wVk = 0x41; + inputs[0].u.ki.wScan = 0x1e; + inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; + + pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + + while(PeekMessageW(&msg, hWndTest, 0, 0, PM_NOREMOVE)) { + if(msg.message != WM_KEYUP) + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + else + { + ok(msg.wParam != VK_PROCESSKEY,"Incorrect ProcessKey Found\n"); + PeekMessageW(&msg, hWndTest, 0, 0, PM_REMOVE); + ok(msg.wParam != VK_PROCESSKEY,"ProcessKey should still not be Found\n"); + } + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + ImmReleaseContext(hWndTest, imc); + ImmSetOpenStatus(imc, FALSE); + DestroyWindow(hWndTest); +} + START_TEST(imm32) { if (init()) { @@ -719,6 +851,9 @@ START_TEST(imm32) { msg_spy_init(NULL); test_ImmMessages(); msg_spy_cleanup(); + if (pSendInput) + test_ime_processkey(); + else win_skip("SendInput is not available\n"); } cleanup(); }

1 0

Francois Gouget : testbot: Add a 'canceled' status for jobs, steps and tasks.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: tools Branch: master Commit: ebc2c0c0728013a8d46a749d0badccfcfca511e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ebc2c0c0728013a8d46a749d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:19 2013 +0100 testbot: Add a 'canceled' status for jobs, steps and tasks. This makes it possible to report a job as canceled rather than failed (failed indicates either a WineTestBot error or a bad patch). --- testbot/ddl/update23.sql | 10 ++++++++++ testbot/ddl/winetestbot.sql | 6 +++--- testbot/lib/WineTestBot/Jobs.pm | 30 ++++++++++++++++++++---------- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/web/JobDetails.pl | 8 ++++++-- testbot/web/WineTestBot.css | 1 + testbot/web/index.pl | 6 ++++-- 8 files changed, 47 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ebc2c0c0728013a8d46a…

1 0

Francois Gouget : testbot: When canceling a job, update its status and reschedule immediately.
by Alexandre Julliard 28 Mar '13

28 Mar '13

Module: tools Branch: master Commit: 2d5f4a1df2739b7386bf0fafed7cac3559b139f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2d5f4a1df2739b7386bf0faf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:23 2013 +0100 testbot: When canceling a job, update its status and reschedule immediately. This is possible now that Job::Cancel() updates the task and VM status when it kills a child process. Also note that Job::Restart() was synchronous already. --- testbot/bin/Engine.pl | 15 +++++---------- testbot/lib/WineTestBot/Jobs.pm | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 5fcce05..670945a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -344,16 +344,11 @@ sub HandleJobCancel return "0$ErrMessage"; } - # Wait a couple of seconds before rescheduling so the child processes have - # the time to die. - AddEvent("JobCancel$JobKey", 2, 0, sub { - $Job->UpdateStatus(); - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; - } - }); + $ErrMessage = ScheduleJobs(); + if (defined($ErrMessage)) + { + LogMsg "Scheduling problem in HandleJobCancel: $ErrMessage\n"; + } return "1OK"; } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ab82c07..8176015 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -218,7 +218,8 @@ sub Cancel } } } - # Let the higher layers handle updating the overall job status + # Let UpdateStatus() handle updating the overall job status + $self->UpdateStatus(); return undef; }

1 0