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

Hans Leidekker : mshtml: Don' t append slashes to opaque protocol identifiers.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: e15a923a0aff0bddcb31828400ad7ee7b601ee14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e15a923a0aff0bddcb3182840… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 27 17:13:46 2013 +0100 mshtml: Don't append slashes to opaque protocol identifiers. --- dlls/mshtml/editor.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index dbb2d93..0a58d1f 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1016,17 +1016,17 @@ static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { static const WCHAR wszOther[] = {'(','o','t','h','e','r',')',0}; + static const WCHAR wszFile[] = {'f','i','l','e',':',0}; + static const WCHAR wszFtp[] = {'f','t','p',':',0}; + static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; + static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; + static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; + static const WCHAR wszNews[] = {'n','e','w','s',':',0}; switch (msg) { case WM_INITDIALOG: { - static const WCHAR wszFile[] = {'f','i','l','e',':',0}; - static const WCHAR wszFtp[] = {'f','t','p',':',0}; - static const WCHAR wszHttp[] = {'h','t','t','p',':',0}; - static const WCHAR wszHttps[] = {'h','t','t','p','s',':',0}; - static const WCHAR wszMailto[] = {'m','a','i','l','t','o',':',0}; - static const WCHAR wszNews[] = {'n','e','w','s',':',0}; INT def_idx; HWND hwndCB = GetDlgItem(hwnd, IDC_TYPE); HWND hwndURL = GetDlgItem(hwnd, IDC_URL); @@ -1102,8 +1102,9 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP /* add new protocol */ if (*type != '\0') { - memcpy(url, type, strlenW(type) * sizeof(WCHAR)); - memcpy(url + strlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); + memcpy(url, type, (strlenW(type) + 1) * sizeof(WCHAR)); + if (strcmpW(type, wszMailto) && strcmpW(type, wszNews)) + memcpy(url + strlenW(type), wszSlashSlash, sizeof(wszSlashSlash)); } SetWindowTextW(hwndURL, url);

1 0

Piotr Caban : msvcrt: Move fread_s function to msvcrt.
by Alexandre Julliard March 28, 2013

March 28, 2013

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 : msvcrt: Update spec file with functions added in newer version of the dll.
by Alexandre Julliard March 28, 2013

March 28, 2013

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

Huw Davies : user32: Invalidate the listbox in LB_SETCOUNT.
by Alexandre Julliard March 28, 2013

March 28, 2013

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

Alexandre Julliard : user32: Constify pointers that point to read-only file data.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 5bfc411ae79a6025298c4c8ddff6fb177fc4231a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfc411ae79a6025298c4c8dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 13:13:43 2013 +0100 user32: Constify pointers that point to read-only file data. --- dlls/user32/cursoricon.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index fa1ba24..93aa0c6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -292,7 +292,7 @@ ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) * [RETURN] ptr - pointer to mapped file * [RETURN] filesize - pointer size of file to be stored if not NULL */ -static void *map_fileW( LPCWSTR name, LPDWORD filesize ) +static const void *map_fileW( LPCWSTR name, LPDWORD filesize ) { HANDLE hFile, hMapping; LPVOID ptr = NULL; @@ -1091,7 +1091,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * |- ... * \- CHUNK:icon */ -static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, INT width, INT height, +static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, INT width, INT height, INT depth, BOOL is_icon, UINT loadflags ) { struct animated_cursoricon_object *ani_icon_data; @@ -1287,7 +1287,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, UINT cFlag ) { POINT hotspot; - BITMAPINFO *bmi; + const BITMAPINFO *bmi; TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, @@ -1314,10 +1314,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, } else /* get the hotspot */ { - SHORT *pt = (SHORT *)bits; + const SHORT *pt = (const SHORT *)bits; hotspot.x = pt[0]; hotspot.y = pt[1]; - bmi = (BITMAPINFO *)(pt + 2); + bmi = (const BITMAPINFO *)(pt + 2); cbSize -= 2 * sizeof(*pt); } @@ -1343,7 +1343,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, const CURSORICONFILEDIR *dir; DWORD filesize = 0; HICON hIcon = 0; - LPBYTE bits; + const BYTE *bits; POINT hotspot; TRACE("loading %s\n", debugstr_w( filename )); @@ -1379,7 +1379,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, hotspot.x = entry->xHotspot; hotspot.y = entry->yHotspot; - hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], filesize - entry->dwDIBOffset, + hIcon = create_icon_from_bmi( (const BITMAPINFO *)&bits[entry->dwDIBOffset], filesize - entry->dwDIBOffset, NULL, NULL, NULL, hotspot, !fCursor, width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); @@ -1402,7 +1402,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, DWORD size; const CURSORICONDIR *dir; const CURSORICONDIRENTRY *dirEntry; - LPBYTE bits; + const BYTE *bits; WORD wResId; POINT hotspot; @@ -1477,13 +1477,13 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, } else /* get the hotspot */ { - SHORT *pt = (SHORT *)bits; + const SHORT *pt = (const SHORT *)bits; hotspot.x = pt[0]; hotspot.y = pt[1]; bits += 2 * sizeof(SHORT); size -= 2 * sizeof(SHORT); } - hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, size, hInstance, name, hRsrc, + hIcon = create_icon_from_bmi( (const BITMAPINFO *)bits, size, hInstance, name, hRsrc, hotspot, !fCursor, width, height, loadflags ); FreeResource( handle ); return hIcon; @@ -2480,7 +2480,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, HBITMAP hbitmap = 0, orig_bm; HRSRC hRsrc; HGLOBAL handle; - char *ptr = NULL; + const char *ptr = NULL; BITMAPINFO *info, *fix_info = NULL, *scaled_info = NULL; int size; BYTE pix;

1 0

Alexandre Julliard : user32: Add size checks when creating an icon from bitmap info.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 267109d6f1be4852b0167b7ed8a082031721f943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267109d6f1be4852b0167b7ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 28 13:07:06 2013 +0100 user32: Add size checks when creating an icon from bitmap info. --- dlls/user32/cursoricon.c | 77 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 54 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index df11f56..fa1ba24 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -796,11 +796,11 @@ done: * * Create an icon from its BITMAPINFO. */ -static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resname, HRSRC rsrc, - POINT hotspot, BOOL bIcon, INT width, INT height, UINT cFlag ) +static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE module, LPCWSTR resname, + HRSRC rsrc, POINT hotspot, BOOL bIcon, INT width, INT height, + UINT cFlag ) { - unsigned int size = bitmap_info_size( bmi, DIB_RGB_COLORS ); - BOOL monochrome = is_dib_monochrome( bmi ); + DWORD size, color_size, mask_size; HBITMAP color = 0, mask = 0, alpha = 0; const void *color_bits, *mask_bits; BITMAPINFO *bmi_copy; @@ -811,14 +811,35 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn /* Check bitmap header */ + if (maxsize < sizeof(BITMAPCOREHEADER)) + { + WARN( "invalid size %u\n", maxsize ); + return 0; + } + if (maxsize < bmi->bmiHeader.biSize) + { + WARN( "invalid header size %u\n", bmi->bmiHeader.biSize ); + return 0; + } if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER) || (bmi->bmiHeader.biCompression != BI_RGB && bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { - WARN_(cursor)("\tinvalid resource bitmap header.\n"); - return 0; + WARN( "invalid bitmap header %u\n", bmi->bmiHeader.biSize ); + return 0; + } + + size = bitmap_info_size( bmi, DIB_RGB_COLORS ); + color_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, + bmi->bmiHeader.biBitCount ); + mask_size = get_dib_image_size( bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight / 2, 1 ); + if (size > maxsize || color_size > maxsize - size) + { + WARN( "truncated file %u < %u+%u+%u\n", maxsize, size, color_size, mask_size ); + return 0; } + if (mask_size > maxsize - size - color_size) mask_size = 0; /* no mask */ if (cFlag & LR_DEFAULTSIZE) { @@ -856,11 +877,10 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn bmi_copy->bmiHeader.biHeight /= 2; color_bits = (const char*)bmi + size; - mask_bits = (const char*)color_bits + - get_dib_image_size( bmi->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, bmi->bmiHeader.biBitCount ); + mask_bits = (const char*)color_bits + color_size; alpha = 0; - if (monochrome) + if (is_dib_monochrome( bmi )) { if (!(mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done; color = 0; @@ -908,10 +928,13 @@ static HICON create_icon_from_bmi( BITMAPINFO *bmi, HMODULE module, LPCWSTR resn } } - SelectObject( hdc, mask ); - StretchDIBits( hdc, 0, 0, width, height, - 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, - mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + if (mask_size) + { + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_copy->bmiHeader.biWidth, bmi_copy->bmiHeader.biHeight, + mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); + } ret = TRUE; done: @@ -1170,7 +1193,6 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, bits + bits_size - icon_data, width, height, depth, loadflags ); - bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); info->hotspot.x = entry->xHotspot; info->hotspot.y = entry->yHotspot; if (!header.width || !header.height) @@ -1184,9 +1206,16 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, frameHeight = header.height; } - /* Grab a frame from the animation */ - frames[i] = create_icon_from_bmi( (BITMAPINFO *)bmi, NULL, NULL, NULL, info->hotspot, - is_icon, frameWidth, frameHeight, loadflags ); + frames[i] = NULL; + if (entry->dwDIBOffset < bits + bits_size - icon_data) + { + bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); + /* Grab a frame from the animation */ + frames[i] = create_icon_from_bmi( bmi, bits + bits_size - (const BYTE *)bmi, + NULL, NULL, NULL, info->hotspot, + is_icon, frameWidth, frameHeight, loadflags ); + } + if (!frames[i]) { FIXME_(cursor)("failed to convert animated cursor frame.\n"); @@ -1250,8 +1279,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, /********************************************************************** * CreateIconFromResourceEx (USER32.@) * - * FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something - * with cbSize parameter as well. + * FIXME: Convert to mono when cFlag is LR_MONOCHROME. */ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, BOOL bIcon, DWORD dwVersion, @@ -1290,9 +1318,10 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, hotspot.x = pt[0]; hotspot.y = pt[1]; bmi = (BITMAPINFO *)(pt + 2); + cbSize -= 2 * sizeof(*pt); } - return create_icon_from_bmi( bmi, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag ); + return create_icon_from_bmi( bmi, cbSize, NULL, NULL, NULL, hotspot, bIcon, width, height, cFlag ); } @@ -1350,8 +1379,8 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, hotspot.x = entry->xHotspot; hotspot.y = entry->yHotspot; - hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], NULL, NULL, NULL, - hotspot, !fCursor, width, height, loadflags ); + hIcon = create_icon_from_bmi( (BITMAPINFO *)&bits[entry->dwDIBOffset], filesize - entry->dwDIBOffset, + NULL, NULL, NULL, hotspot, !fCursor, width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); @@ -1438,6 +1467,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, } if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; + size = SizeofResource( hInstance, hRsrc ); bits = LockResource( handle ); if (!fCursor) @@ -1451,8 +1481,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, hotspot.x = pt[0]; hotspot.y = pt[1]; bits += 2 * sizeof(SHORT); + size -= 2 * sizeof(SHORT); } - hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, hInstance, name, hRsrc, + hIcon = create_icon_from_bmi( (BITMAPINFO *)bits, size, hInstance, name, hRsrc, hotspot, !fCursor, width, height, loadflags ); FreeResource( handle ); return hIcon;

1 0

Dmitry Timoshkov : ole32: Fix an apartment reference count leak on error path.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 41d3085522f795d8e7c78d1463ce79790b4f36f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d3085522f795d8e7c78d146… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 28 18:46:22 2013 +0900 ole32: Fix an apartment reference count leak on error path. --- dlls/ole32/marshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index a8df28c..ddaaa53 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1437,6 +1437,7 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) if (!(stubmgr = get_stub_manager(apt, stdobjref.oid))) { + apartment_release(apt); ERR("could not map object ID to stub manager, oxid=%s, oid=%s\n", wine_dbgstr_longlong(stdobjref.oxid), wine_dbgstr_longlong(stdobjref.oid)); return RPC_E_INVALID_OBJREF;

1 0

Ken Thomases : winemac: Don't override -[NSOpenGLContext clearDrawable], just use our own method.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: wine Branch: master Commit: 4fba2995b633559c9baf4ad881c2d09e8028c964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fba2995b633559c9baf4ad88… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 12:05:41 2013 -0500 winemac: Don't override -[NSOpenGLContext clearDrawable], just use our own method. --- dlls/winemac.drv/cocoa_opengl.m | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 1368c73..b678cae 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -45,7 +45,7 @@ context attached). So, we finesse things by first setting the context's view to a different view (the content view of an off-screen window) and then letting the original implementation proceed. */ - - (void) clearDrawable + - (void) clearDrawableLeavingSurfaceOnScreen { static NSWindow* dummyWindow; static dispatch_once_t once; @@ -60,7 +60,7 @@ }); [self setView:[dummyWindow contentView]]; - [super clearDrawable]; + [self clearDrawable]; } @end @@ -99,7 +99,7 @@ void macdrv_dispose_opengl_context(macdrv_opengl_context c) macdrv_remove_view_opengl_context((macdrv_view)[context view], c); if ([context latentView]) macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - [context clearDrawable]; + [context clearDrawableLeavingSurfaceOnScreen]; [context release]; [pool release]; @@ -143,7 +143,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) else { [WineOpenGLContext clearCurrentContext]; - [context clearDrawable]; + [context clearDrawableLeavingSurfaceOnScreen]; } } else

1 0

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

March 28, 2013

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

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

March 28, 2013

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