wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

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

05 Jan '18

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+ file functions in SOs for older DLLs.
by Alexandre Julliard 05 Jan '18

05 Jan '18

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+ error functions in SOs for older DLLs.
by Alexandre Julliard 05 Jan '18

05 Jan '18

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 05 Jan '18

05 Jan '18

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@Z * ?__ExceptionPtrCreate@@YAXPEAX@Z @@ -1781,6 +1791,8 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign InterlockedIncrement(ep->ref); } +#endif /* _MSVCR_VER >= 100 */ + /********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX@Z * ?__ExceptionPtrRethrow@@YAXPEBX@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@Z * ?__ExceptionPtrToBool@@YA_NPEBX@Z @@ -1933,6 +1950,9 @@ MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) { return !!ep->rec; } +#endif + +#if _MSVCR_VER >= 100 /********************************************************************* * ?__ExceptionPtrCopyException@@YAXPAXPBX1@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

Andrey Gusev : wininet/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

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

Andrey Gusev : winhttp/tests: Fix resource leak.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 67e80856e65f2d52fca5ad3cd23ad0a92b8c0b5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67e80856e65f2d52fca5ad3c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 5 14:38:11 2018 +0200 winhttp/tests: Fix resource leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 3 +++ dlls/winhttp/tests/winhttp.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index da8f8e9..2a647e3 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1033,7 +1033,10 @@ START_TEST (notification) ret = WaitForSingleObject( si.event, 10000 ); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_persistent_connection( si.port ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e06661c..4399cf6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4475,7 +4475,10 @@ START_TEST (winhttp) ret = WaitForSingleObject(si.event, 10000); ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); if (ret != WAIT_OBJECT_0) + { + CloseHandle(thread); return; + } test_IWinHttpRequest(si.port); test_connection_info(si.port); @@ -4495,4 +4498,5 @@ START_TEST (winhttp) test_basic_request(si.port, NULL, quitW); WaitForSingleObject(thread, 3000); + CloseHandle(thread); }

1 0

Nikolay Sivov : mshtml/tests: Remove null check after dereference ( Coverity).
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 53b73055b73fd107b8f479ae509a7f8155c516f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b73055b73fd107b8f479ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 14:38:57 2018 +0300 mshtml/tests: Remove null check after dereference (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 908e647..685bfc1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2578,7 +2578,7 @@ static IHTMLWindow2 *get_iframe_window(IHTMLIFrameElement *iframe) ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); ok(window != NULL, "window == NULL\n"); - if(base) IHTMLFrameBase2_Release(base); + IHTMLFrameBase2_Release(base); return window; }

1 0

Nikolay Sivov : mshtml/tests: Test document stream creation failure ( Coverity).
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 286174a5ac2d5901e2970844aeb120c973e7e1ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=286174a5ac2d5901e2970844… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 14:38:56 2018 +0300 mshtml/tests: Test document stream creation failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/activex.c | 7 +++++-- dlls/mshtml/tests/dom.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 78602b7..8b6a47c 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -2246,6 +2246,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) IStream *stream; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc; @@ -2253,9 +2254,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6c0b637..b003467 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10518,6 +10518,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IHTMLDocument2 *doc; HGLOBAL mem; SIZE_T len; + HRESULT hr; notif_doc = doc = create_document(); if(!doc) @@ -10527,9 +10528,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hr = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hr = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hr == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hr); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init);

1 0

Alex Henrie : mshtml/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 93eac48cc70e553a7ba0895999565e87d4de3b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eac48cc70e553a7ba08959… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 4 22:02:30 2018 -0700 mshtml/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 2 +- dlls/mshtml/tests/xmlhttprequest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 28aa93c..908e647 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -384,7 +384,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, DISPID id, WORD if(pdp->cArgs > 1) ok_(__FILE__,line) (V_VT(pdp->rgvarg+1) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg+1)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); - ok_(__FILE__,line) (pei != NULL, "pei == NULL"); + ok_(__FILE__,line) (pei != NULL, "pei == NULL\n"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index df5d644..733987f 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -132,7 +132,7 @@ static void _test_event_args(unsigned line, const IID *dispiid, const IID *broke pdp->rgdispidNamedArgs[0]); ok_(__FILE__,line) (V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok_(__FILE__,line) (pvarRes != NULL, "pvarRes == NULL\n"); - ok_(__FILE__,line) (pei != NULL, "pei == NULL"); + ok_(__FILE__,line) (pei != NULL, "pei == NULL\n"); ok_(__FILE__,line) (!pspCaller, "pspCaller != NULL\n"); if(dispiid)

1 0

Nikolay Sivov : oleaut32/tests: Test more return values.
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: wine Branch: master Commit: 0fc0e34fb0260bc54d060c79571dcf0acb7bb4a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc0e34fb0260bc54d060c79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 5 14:25:11 2018 +0300 oleaut32/tests: Test more return values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 4a81e2e..7db1d84 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -722,7 +722,8 @@ static void test_Render(void) HDC hdc = create_render_dc(); /* test IPicture::Render return code on uninitialized picture */ - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, &type); ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); @@ -755,7 +756,8 @@ static void test_Render(void) return; } - OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); /* zero dimensions, PICTYPE_ICON */ hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); @@ -809,7 +811,8 @@ static void test_get_Attributes(void) short type; DWORD attr; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, &type); ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); @@ -830,8 +833,8 @@ static void test_get_Handle(void) IPicture *pic; HRESULT hres; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); - + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Handle(pic, NULL); ole_expect(hres, E_POINTER); @@ -843,7 +846,8 @@ static void test_get_Type(void) IPicture *pic; HRESULT hres; - OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)&pic); + ok(hres == S_OK, "Failed to create a picture, hr %#x.\n", hres); hres = IPicture_get_Type(pic, NULL); ole_expect(hres, E_POINTER);

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018