January 2018 - Wine-Commits

Tag wine-3.0-rc5 : Alexandre Julliard : Release 3.0-rc5
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: refs/tags/wine-3.0-rc5 Tag: 3ad561cd8eec161c001455b776d57165e492efc9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=3ad561cd8eec161c001455b776d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 20:59:29 2018 +0100 Release 3.0-rc5

1 0

Piotr Caban : user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 910129fcf7a7ade52a78d588685a860acae8d8b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=910129fcf7a7ade52a78d588… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:20 2018 +0100 user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 0e64e85..956385f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -703,8 +703,6 @@ static void CBPaintText( INT id, size = 0; LPWSTR pText = NULL; - if( lphc->wState & CBF_NOREDRAW ) return; - TRACE("\n"); /* follow Windows combobox that sends a bunch of text @@ -733,8 +731,9 @@ static void CBPaintText( if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } - else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */ + else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { + /* paint text field ourselves */ HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); UINT itemState = ODS_COMBOBOXEDIT; HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;

1 0

Piotr Caban : user32: Redraw combo text field even if it's empty.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: a912b2377117e4b826bdac09cfc87147da3a87c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a912b2377117e4b826bdac09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:33 2018 +0100 user32: Redraw combo text field even if it's empty. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 956385f..0c530f7 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -720,9 +720,6 @@ static void CBPaintText( pText[size] = '\0'; /* just in case */ } else return; } - else - if( !CB_OWNERDRAWN(lphc) ) - return; if( lphc->wState & CBF_EDIT ) {

1 0

Andrey Gusev : wininet/tests: Fix resource leak.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: dc9088b9ebf41ea534f71e1f478506ac8999403e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc9088b9ebf41ea534f71e1f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 14:38:37 2018 +0200 wininet/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ca1173e..efc73e0 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5459,7 +5459,10 @@ static void test_http_connection(void) r = WaitForSingleObject(si.hEvent, 10000); ok (r == WAIT_OBJECT_0, "failed to start wininet test server\n"); if (r != WAIT_OBJECT_0) + { + CloseHandle(hThread); return; + } test_basic_request(si.port, "GET", "/test1"); test_proxy_indirect(si.port);

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ locale functions in SOs for older DLLs.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 512c945e9a3dfe34a1fe0a9b9ce5c207eaf3c816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=512c945e9a3dfe34a1fe0a9b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:33:01 2018 -0700 msvcrt: Don't include MSVC 8.0+ locale functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 95fec0a..6d5ceb5 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -449,8 +449,9 @@ char* CDECL _Getdays(void) return out; } +#if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getdays (MSVCRT.@) + * _W_Getdays (MSVCR100.@) */ MSVCRT_wchar_t* CDECL _W_Getdays(void) { @@ -481,6 +482,7 @@ MSVCRT_wchar_t* CDECL _W_Getdays(void) return out; } +#endif /********************************************************************* * _Getmonths (MSVCRT.@) @@ -515,8 +517,9 @@ char* CDECL _Getmonths(void) return out; } +#if _MSVCR_VER >= 110 /********************************************************************* - * _W_Getmonths (MSVCRT.@) + * _W_Getmonths (MSVCR100.@) */ MSVCRT_wchar_t* CDECL _W_Getmonths(void) { @@ -547,6 +550,7 @@ MSVCRT_wchar_t* CDECL _W_Getmonths(void) return out; } +#endif /********************************************************************* * _Gettnames (MSVCRT.@) @@ -575,6 +579,7 @@ void* CDECL _Gettnames(void) return ret; } +#if _MSVCR_VER >= 110 /********************************************************************* * _W_Gettnames (MSVCR110.@) */ @@ -582,6 +587,7 @@ void* CDECL _W_Gettnames(void) { return _Gettnames(); } +#endif /********************************************************************* * __crtLCMapStringA (MSVCRT.@) @@ -644,6 +650,7 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i return GetLocaleInfoW( lcid, type, buffer, len ); } +#if _MSVCR_VER >= 110 /********************************************************************* * __crtGetLocaleInfoEx (MSVC110.@) */ @@ -652,6 +659,7 @@ int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, MSVCRT_wchar_t TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len); return GetLocaleInfoEx(locale, type, buffer, len); } +#endif /********************************************************************* * btowc(MSVCRT.@) @@ -709,10 +717,10 @@ LCID* CDECL ___lc_handle_func(void) return get_locinfo()->lc_handle; } +#if _MSVCR_VER >= 110 /********************************************************************* * ___lc_locale_name_func (MSVCR110.@) */ -#if _MSVCR_VER >= 110 MSVCRT_wchar_t** CDECL ___lc_locale_name_func(void) { return get_locinfo()->lc_name; @@ -1890,6 +1898,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo return ret ? current_lc_all : NULL; } +#if _MSVCR_VER >= 80 /********************************************************************* * _configthreadlocale (MSVCR80.@) */ @@ -1937,6 +1946,7 @@ int CDECL _configthreadlocale(int type) return -1; } +#endif BOOL msvcrt_init_locale(void) {

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ error functions in SOs for older DLLs.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 1c03dc45c38e22a02d788330db3873b881bb67c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c03dc45c38e22a02d788330… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:32:59 2018 -0700 msvcrt: Don't include MSVC 8.0+ error functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 5693043..c5fbae2 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -188,8 +188,10 @@ void msvcrt_set_errno(int err) } } +#if _MSVCR_VER >= 80 + /********************************************************************* - * __sys_nerr (MSVCR100.@) + * __sys_nerr (MSVCR80.@) */ int* CDECL __sys_nerr(void) { @@ -197,13 +199,15 @@ int* CDECL __sys_nerr(void) } /********************************************************************* - * __sys_errlist (MSVCR100.@) + * __sys_errlist (MSVCR80.@) */ char** CDECL __sys_errlist(void) { return MSVCRT__sys_errlist; } +#endif /* _MSVCR_VER >= 80 */ + /********************************************************************* * _errno (MSVCRT.@) */ @@ -478,8 +482,10 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ } } +#if _MSVCR_VER >= 80 + /********************************************************************* - * _invalid_parameter_noinfo (MSVCR100.@) + * _invalid_parameter_noinfo (MSVCR80.@) */ void CDECL _invalid_parameter_noinfo(void) { @@ -487,7 +493,7 @@ void CDECL _invalid_parameter_noinfo(void) } /********************************************************************* - * _invalid_parameter_noinfo_noreturn (MSVCR100.@) + * _invalid_parameter_noinfo_noreturn (MSVCR80.@) */ void CDECL _invalid_parameter_noinfo_noreturn(void) { @@ -518,7 +524,10 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( return old; } +#endif /* _MSVCR_VER >= 80 */ + #if _MSVCR_VER >= 140 + /********************************************************************* * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) */ @@ -542,4 +551,5 @@ MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handl data->invalid_parameter_handler = handler; return old; } -#endif + +#endif /* _MSVCR_VER >= 140 */

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ C++ functions in SOs for older DLLs.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: 8762cd5cf603b5361ceb47910fdd94c7c8891b43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8762cd5cf603b5361ceb4791… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:32:58 2018 -0700 msvcrt: Don't include MSVC 8.0+ C++ functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 2e17f62..07cde75 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -650,6 +650,7 @@ void * __thiscall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int f } #if _MSVCR_VER >= 80 + typedef exception bad_alloc; extern const vtable_ptr MSVCRT_bad_alloc_vtable; @@ -675,9 +676,11 @@ void __thiscall MSVCRT_bad_alloc_dtor(bad_alloc * _this) TRACE("(%p)\n", _this); MSVCRT_exception_dtor(_this); } -#endif + +#endif /* _MSVCR_VER >= 80 */ #if _MSVCR_VER >= 100 + typedef struct { exception e; HRESULT hr; @@ -985,7 +988,8 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( TRACE("(%p)\n", _this); MSVCRT_exception_dtor(_this); } -#endif + +#endif /* _MSVCR_VER >= 100 */ #ifndef __GNUC__ void __asm_dummy_vtables(void) { @@ -1583,6 +1587,8 @@ void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *typ } #endif +#if _MSVCR_VER >= 80 + /********************************************************************* * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z @@ -1669,7 +1675,7 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) #endif /********************************************************************* - * __clean_type_info_names_internal (MSVCR100.@) + * __clean_type_info_names_internal (MSVCR80.@) */ void CDECL __clean_type_info_names_internal(void *p) { @@ -1688,6 +1694,8 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct return MSVCRT_type_info_name(_this); } +#endif /* _MSVCR_VER >= 80 */ + /* std::exception_ptr class helpers */ typedef struct { @@ -1695,6 +1703,8 @@ typedef struct int *ref; /* not binary compatible with native msvcr100 */ } exception_ptr; +#if _MSVCR_VER >= 100 + /********************************************************************* * ?__ExceptionPtrCreate@@YAXPAX(a)Z * ?__ExceptionPtrCreate@@YAXPEAX(a)Z @@ -1781,6 +1791,8 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign InterlockedIncrement(ep->ref); } +#endif /* _MSVCR_VER >= 100 */ + /********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX(a)Z * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z @@ -1803,6 +1815,8 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) ep->rec->NumberParameters, ep->rec->ExceptionInformation); } +#if _MSVCR_VER >= 100 + #ifdef __i386__ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { @@ -1925,6 +1939,9 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +#endif /* _MSVCR_VER >= 100 */ + +#if _MSVCR_VER >= 110 /********************************************************************* * ?__ExceptionPtrToBool@@YA_NPBX(a)Z * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z @@ -1933,6 +1950,9 @@ MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) { return !!ep->rec; } +#endif + +#if _MSVCR_VER >= 100 /********************************************************************* * ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z @@ -2020,12 +2040,17 @@ MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const except return ep1->rec == ep2->rec; } +#endif /* _MSVCR_VER >= 100 */ + +#if _MSVCR_VER >= 80 void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj); } +#endif #if _MSVCR_VER >= 140 + typedef struct { char *name; @@ -2139,9 +2164,11 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti) return hash; } -#endif + +#endif /* _MSVCR_VER >= 140 */ #if _MSVCR_VER >= 100 + enum ConcRT_EventType { CONCRT_EVENT_GENERIC, @@ -2160,4 +2187,5 @@ void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char lev { FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); } -#endif + +#endif /* _MSVCR_VER >= 100 */

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ file functions in SOs for older DLLs.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: b489c6e9b1b4113ddb6c278407e8c7bcaabe2ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b489c6e9b1b4113ddb6c2784… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:33:00 2018 -0700 msvcrt: Don't include MSVC 8.0+ file functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 43c3fc4..6d0c1ae 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -786,13 +786,15 @@ MSVCRT_FILE * CDECL MSVCRT___iob_func(void) return &MSVCRT__iob[0]; } +#if _MSVCR_VER >= 140 /********************************************************************* - * __acrt_iob_func(MSVCRT.@) + * __acrt_iob_func(UCRTBASE.@) */ MSVCRT_FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx) { return &MSVCRT__iob[idx]; } +#endif /********************************************************************* * _access (MSVCRT.@) @@ -3064,8 +3066,10 @@ int CDECL MSVCRT_stat(const char* path, struct MSVCRT__stat * buf) return ret; } +#if _MSVCR_VER >= 80 + /********************************************************************* - * _stat32 (MSVCR100.@) + * _stat32 (MSVCR80.@) */ int CDECL MSVCRT__stat32(const char *path, struct MSVCRT__stat32 *buf) { @@ -3079,7 +3083,7 @@ int CDECL MSVCRT__stat32(const char *path, struct MSVCRT__stat32 *buf) } /********************************************************************* - * _stat32i64 (MSVCR100.@) + * _stat32i64 (MSVCR80.@) */ int CDECL MSVCRT__stat32i64(const char *path, struct MSVCRT__stat32i64 *buf) { @@ -3093,7 +3097,7 @@ int CDECL MSVCRT__stat32i64(const char *path, struct MSVCRT__stat32i64 *buf) } /********************************************************************* - * _stat64i32 (MSVCR100.@) + * _stat64i32 (MSVCR80.@) */ int CDECL MSVCRT__stat64i32(const char* path, struct MSVCRT__stat64i32 *buf) { @@ -3106,6 +3110,8 @@ int CDECL MSVCRT__stat64i32(const char* path, struct MSVCRT__stat64i32 *buf) return ret; } +#endif /* _MSVCR_VER >= 80 */ + /********************************************************************* * _wstat64 (MSVCRT.@) */ @@ -3203,8 +3209,10 @@ int CDECL MSVCRT__wstat(const MSVCRT_wchar_t* path, struct MSVCRT__stat * buf) return ret; } +#if _MSVCR_VER >= 80 + /********************************************************************* - * _wstat32 (MSVCR100.@) + * _wstat32 (MSVCR80.@) */ int CDECL MSVCRT__wstat32(const MSVCRT_wchar_t *path, struct MSVCRT__stat32 *buf) { @@ -3218,7 +3226,7 @@ int CDECL MSVCRT__wstat32(const MSVCRT_wchar_t *path, struct MSVCRT__stat32 *buf } /********************************************************************* - * _wstat32i64 (MSVCR100.@) + * _wstat32i64 (MSVCR80.@) */ int CDECL MSVCRT__wstat32i64(const MSVCRT_wchar_t *path, struct MSVCRT__stat32i64 *buf) { @@ -3232,7 +3240,7 @@ int CDECL MSVCRT__wstat32i64(const MSVCRT_wchar_t *path, struct MSVCRT__stat32i6 } /********************************************************************* - * _wstat64i32 (MSVCR100.@) + * _wstat64i32 (MSVCR80.@) */ int CDECL MSVCRT__wstat64i32(const MSVCRT_wchar_t *path, struct MSVCRT__stat64i32 *buf) { @@ -3245,6 +3253,8 @@ int CDECL MSVCRT__wstat64i32(const MSVCRT_wchar_t *path, struct MSVCRT__stat64i3 return ret; } +#endif /* _MSVCR_VER >= 80 */ + /********************************************************************* * _tell (MSVCRT.@) */ @@ -4350,6 +4360,7 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_s return read / size; } +#if _MSVCR_VER >= 80 /********************************************************************* * fread_s (MSVCR80.@) @@ -4425,6 +4436,8 @@ MSVCRT_size_t CDECL MSVCRT__fread_nolock_s(void *buf, MSVCRT_size_t buf_size, MS return buf_pos/elem_size; } +#endif /* _MSVCR_VER >= 80 */ + /********************************************************************* * _wfreopen (MSVCRT.@) * @@ -4610,13 +4623,15 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) return MSVCRT__ftelli64(file); } +#if _MSVCR_VER >= 80 /********************************************************************* - * _ftell_nolock (MSVCRT.@) + * _ftell_nolock (MSVCR80.@) */ LONG CDECL MSVCRT__ftell_nolock(MSVCRT_FILE* file) { return MSVCRT__ftelli64_nolock(file); } +#endif /********************************************************************* * fgetpos (MSVCRT.@) @@ -5213,6 +5228,8 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ return MSVCRT__vfwprintf_s_l(file, format, NULL, valist); } +#if _MSVCR_VER >= 140 + /********************************************************************* * __stdio_common_vfprintf (UCRTBASE.@) */ @@ -5263,6 +5280,8 @@ int CDECL MSVCRT__stdio_common_vfwprintf_s(unsigned __int64 options, MSVCRT_FILE file, format, locale, valist); } +#endif /* _MSVCR_VER >= 140 */ + /********************************************************************* * _vfprintf_l (MSVCRT.@) */ @@ -5592,6 +5611,7 @@ int CDECL MSVCRT__setmaxstdio(int newmax) return MSVCRT_max_streams; } +#if _MSVCR_VER >= 140 /********************************************************************* * _get_stream_buffer_pointers (UCRTBASE.@) */ @@ -5606,3 +5626,4 @@ int CDECL MSVCRT__get_stream_buffer_pointers(MSVCRT_FILE *file, char*** base, *count = &file->_cnt; return 0; } +#endif

1 0

Alex Henrie : msvcrt: Don' t include MSVC 8.0+ time functions in SOs for older DLLs.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: b4e1390123f372abe9ad0f86a3ca0fbd5743adc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4e1390123f372abe9ad0f86… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jan 3 21:33:02 2018 -0700 msvcrt: Don't include MSVC 8.0+ time functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 57657ca..b7b76af 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -890,6 +890,7 @@ int * CDECL MSVCRT___p__dstbias(void) return &MSVCRT__dstbias; } +#if _MSVCR_VER >= 80 /********************************************************************* * _get_dstbias (MSVCR80.@) */ @@ -899,6 +900,7 @@ int CDECL MSVCRT__get_dstbias(int *seconds) *seconds = MSVCRT__dstbias; return 0; } +#endif /********************************************************************* * __p__timezone (MSVCRT.@) @@ -1246,14 +1248,16 @@ einval_error: return 0; } +#if _MSVCR_VER >= 80 /******************************************************************** - * _strftime_l (MSVCRT.@) + * _strftime_l (MSVCR80.@) */ MSVCRT_size_t CDECL MSVCRT__strftime_l( char *str, MSVCRT_size_t max, const char *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) { return strftime_helper(str, max, format, mstm, NULL, loc); } +#endif /********************************************************************* * _Strftime (MSVCRT.@) @@ -1316,8 +1320,9 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, return wcsftime_helper(str, max, format, mstm, NULL, NULL); } +#if _MSVCR_VER >= 110 /********************************************************************* - * _Wcsftime (MSVCRT.@) + * _Wcsftime (MSVCR110.@) */ MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, @@ -1325,6 +1330,7 @@ MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, { return wcsftime_helper(str, max, format, mstm, time_data, NULL); } +#endif static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) { @@ -1582,8 +1588,10 @@ int CDECL MSVCRT__wctime32_s(MSVCRT_wchar_t *buf, MSVCRT_size_t size, return MSVCRT__wasctime_s(buf, size, &tm); } +#if _MSVCR_VER >= 80 + /********************************************************************* - * _get_timezone (MSVCR100.@) + * _get_timezone (MSVCR80.@) */ int CDECL _get_timezone(LONG *timezone) { @@ -1594,7 +1602,7 @@ int CDECL _get_timezone(LONG *timezone) } /********************************************************************* - * _get_daylight (MSVCR100.@) + * _get_daylight (MSVCR80.@) */ int CDECL _get_daylight(int *hours) { @@ -1603,3 +1611,5 @@ int CDECL _get_daylight(int *hours) *hours = MSVCRT___daylight; return 0; } + +#endif /* _MSVCR_VER >= 80 */

1 0

Piotr Caban : user32: Add more CB_SETCURSEL tests on ComboBox.
by Alexandre Julliard Jan. 5, 2018

Jan. 5, 2018

Module: wine Branch: master Commit: a5118adbbca903d686b8f12316ab642c682f3db9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5118adbbca903d686b8f123… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 5 19:25:46 2018 +0100 user32: Add more CB_SETCURSEL tests on ComboBox. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 0c530f7..b69f892 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -726,7 +726,7 @@ static void CBPaintText( static const WCHAR empty_stringW[] = { 0 }; if( CB_HASSTRINGS(lphc) ) SetWindowTextW( lphc->hWndEdit, pText ? pText : empty_stringW ); if( lphc->wState & CBF_FOCUSED ) - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, MAXLONG); } else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self )) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 64c7967..f391ab9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6625,6 +6625,14 @@ static const struct message SetCurSelComboSeq2[] = { 0 } }; +static const struct message SetCurSelComboSeq_edit[] = +{ + { CB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { WM_SETTEXT, sent|wparam, 0 }, + { EM_SETSEL, sent|wparam|lparam, 0, INT_MAX }, + { 0 } +}; + static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, @@ -6926,6 +6934,14 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(SetFocusButtonSeq2, "SetFocus on a Button (2)", TRUE); + SetFocus(combo); + SendMessageA(combo, WM_SETREDRAW, FALSE, 0); + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, CB_SETCURSEL, 0, 0); + log_all_parent_messages--; + ok_sequence(SetCurSelComboSeq_edit, "CB_SETCURSEL on a ComboBox with edit control", FALSE); + DestroyWindow(button); DestroyWindow(combo);

1 0