January 2018 - Wine-Commits

Nikolay Sivov : kernel32/nls: Added genitive month names for Belarusian.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: a03703f83230067af1ba24f6dd2a0d5cfe777a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a03703f83230067af1ba24f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 30 17:37:55 2017 +0300 kernel32/nls: Added genitive month names for Belarusian. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5999e0d0324540513b4466325af07757d90a02e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/nls/bel.nls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/bel.nls b/dlls/kernel32/nls/bel.nls index 76141bd..5112ebf 100644 --- a/dlls/kernel32/nls/bel.nls +++ b/dlls/kernel32/nls/bel.nls @@ -109,18 +109,18 @@ STRINGTABLE LANGUAGE LANG_BELARUSIAN, SUBLANG_DEFAULT LOCALE_SLONGDATE "d MMMM yyyy" LOCALE_SMONDECIMALSEP "," LOCALE_SMONGROUPING "3;3" - LOCALE_SMONTHNAME1 "Студзень" - LOCALE_SMONTHNAME2 "Люты" - LOCALE_SMONTHNAME3 "Сакавік" - LOCALE_SMONTHNAME4 "Красавік" - LOCALE_SMONTHNAME5 "Май" - LOCALE_SMONTHNAME6 "Чэрвень" - LOCALE_SMONTHNAME7 "Ліпень" - LOCALE_SMONTHNAME8 "Жнівень" - LOCALE_SMONTHNAME9 "Верасень" - LOCALE_SMONTHNAME10 "Кастрычнік" - LOCALE_SMONTHNAME11 "Лістапад" - LOCALE_SMONTHNAME12 "Снежань" + LOCALE_SMONTHNAME1 "Студзень\0студзеня" + LOCALE_SMONTHNAME2 "Люты\0лютага" + LOCALE_SMONTHNAME3 "Сакавік\0сакавіка" + LOCALE_SMONTHNAME4 "Красавік\0красавіка" + LOCALE_SMONTHNAME5 "Май\0мая" + LOCALE_SMONTHNAME6 "Чэрвень\0чэрвеня" + LOCALE_SMONTHNAME7 "Ліпень\0ліпеня" + LOCALE_SMONTHNAME8 "Жнівень\0жніўня" + LOCALE_SMONTHNAME9 "Верасень\0верасня" + LOCALE_SMONTHNAME10 "Кастрычнік\0кастрычніка" + LOCALE_SMONTHNAME11 "Лістапад\0лістапада" + LOCALE_SMONTHNAME12 "Снежань\0снежня" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " LOCALE_SNAME "be-BY"

1 0

Alexandre Julliard : regedit/tests: Get rid of version check.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: 6c5deaa4745e0fdf7cef46499a9593c17c946087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c5deaa4745e0fdf7cef4649… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 15:22:16 2018 +0100 regedit/tests: Get rid of version check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d67c57b..3bab7e1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1647,7 +1647,7 @@ static void test_invalid_import_unicode(void) { LONG lr; HKEY hkey; - DWORD dword = 0x8, os_version, major_version, minor_version; + DWORD dword = 0x8; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -1740,19 +1740,10 @@ static void test_invalid_import_unicode(void) "\"Test10\"=\"Value\"\n"); verify_reg_nonexist(hkey, "Test10"); - os_version = GetVersion(); - major_version = LOBYTE(LOWORD(os_version)); - minor_version = HIBYTE(LOWORD(os_version)); - - if (major_version > 5 || (major_version == 5 && minor_version > 0)) - { - exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Test11\"=\"Value\"\n"); - verify_reg_nonexist(hkey, "Test11"); - } - else /* Windows 2000 */ - win_skip("Skipping a non-standard header test\n"); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test11\"=\"Value\"\n"); + verify_reg_nonexist(hkey, "Test11"); /* Test multi-line import with incorrect comma placement */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"

1 0

Jacek Caban : mshtml: Don' t dispatch load event if document is already detached from its window.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: c36b424ec23a2644baed99344663695cbc4fe445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36b424ec23a2644baed9934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 2 15:07:07 2018 +0100 mshtml: Don't dispatch load event if document is already detached from its window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index f0819d6..afe09fb 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -234,7 +234,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; HTMLDocumentObj *doc_obj = NULL; - nsresult nsres = NS_OK; + DOMEvent *load_event; + HRESULT hres; TRACE("(%p)\n", doc); @@ -267,27 +268,27 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event &doc->basedoc.window->base.IHTMLWindow2_iface, 0); if(doc->nsdoc) { - DOMEvent *load_event; - HRESULT hres; - hres = create_document_event(doc, EVENTID_LOAD, &load_event); if(SUCCEEDED(hres)) { dispatch_event(&doc->node.event_target, load_event); IDOMEvent_Release(&load_event->IDOMEvent_iface); } + }else { + WARN("no nsdoc\n"); + } + if(doc->window) { hres = create_event_from_nsevent(event, &load_event); if(SUCCEEDED(hres)) { dispatch_event(&doc->window->event_target, load_event); IDOMEvent_Release(&load_event->IDOMEvent_iface); } }else { - ERR("NULL nsdoc\n"); - nsres = NS_ERROR_FAILURE; + WARN("no window\n"); } htmldoc_release(&doc->basedoc); - return nsres; + return NS_OK; } static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent)

1 0

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

Jan. 2, 2018

Module: wine Branch: master Commit: 1afc4339540ff2446a5d4078c782fc4b2c8c9638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1afc4339540ff2446a5d4078… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 28 10:46:54 2017 -0700 msvcrt: Don't include MSVC 8.0+ string 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/ctype.c | 2 ++ dlls/msvcrt/scanf.c | 4 ++++ dlls/msvcrt/string.c | 8 ++++++++ dlls/msvcrt/wcs.c | 37 +++++++++++++++++++++++++++++++++---- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index e076d89..2c39a56 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -469,6 +469,7 @@ int CDECL MSVCRT__tolower(int c) return c + 0x20; /* sic */ } +#if _MSVCR_VER>=120 /********************************************************************* * wctype (MSVCR120.@) */ @@ -498,3 +499,4 @@ unsigned short __cdecl wctype(const char *property) return 0; } +#endif diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 50ef168..09ddf28 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -796,6 +796,8 @@ int WINAPIV MSVCRT__snwscanf_s_l(MSVCRT_wchar_t *input, MSVCRT_size_t length, return res; } +#if _MSVCR_VER>=120 + /********************************************************************* * vsscanf (MSVCRT120.@) */ @@ -815,3 +817,5 @@ int CDECL MSVCRT_vswscanf(const MSVCRT_wchar_t *buffer, const MSVCRT_wchar_t *fo return MSVCRT_vswscanf_l(buffer, format, NULL, valist); } + +#endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 234d728..2c05e37 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -499,6 +499,8 @@ double CDECL MSVCRT_strtod( const char *str, char **end ) return MSVCRT_strtod_l( str, end, NULL ); } +#if _MSVCR_VER>=120 + /********************************************************************* * strtof_l (MSVCR120.@) */ @@ -515,6 +517,8 @@ float CDECL MSVCRT_strtof( const char *str, char **end ) return MSVCRT__strtof_l(str, end, NULL); } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * atof (MSVCRT.@) */ @@ -1046,6 +1050,8 @@ int CDECL MSVCRT_atoi(const char *str) } #endif +#if _MSVCR_VER>=120 + /****************************************************************** * _atoll_l (MSVCR120.@) */ @@ -1062,6 +1068,8 @@ MSVCRT_longlong CDECL MSVCRT_atoll(const char* str) return MSVCRT__atoll_l(str, NULL); } +#endif /* if _MSVCR_VER>=120 */ + /****************************************************************** * _strtol_l (MSVCRT.@) */ diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0c54800..1aa8d98 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -664,6 +664,8 @@ double CDECL MSVCRT__wtof_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) return MSVCRT__wcstod_l(str, NULL, locale); } +#if _MSVCR_VER>=120 + /********************************************************************* * _wcstof_l (MSVCR120.@) */ @@ -680,6 +682,8 @@ float CDECL MSVCRT_wcstof( const MSVCRT_wchar_t *str, MSVCRT_wchar_t **end ) return MSVCRT__wcstof_l(str, end, NULL); } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * arg_clbk_valist (INTERNAL) */ @@ -728,6 +732,8 @@ int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, return ret; } +#if _MSVCR_VER>=140 + static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) { struct _str_ctx_a *out = ctx; @@ -775,6 +781,8 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS return ret; } +#endif /* _MSVCR_VER>=140 */ + /********************************************************************* * _vsnprintf_l (MSVCRT.@) */ @@ -919,6 +927,8 @@ int CDECL MSVCRT_vsnprintf_s( char *str, MSVCRT_size_t sizeOfBuffer, return MSVCRT_vsnprintf_s_l(str,sizeOfBuffer, count, format, NULL, valist); } +#if _MSVCR_VER>=140 + /********************************************************************* * __stdio_common_vsnprintf_s (UCRTBASE.@) */ @@ -965,6 +975,8 @@ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options, return MSVCRT_vsnprintf_s_l_opt(str, INT_MAX, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); } +#endif /* _MSVCR_VER>=140 */ + /********************************************************************* * vsprintf (MSVCRT.@) */ @@ -1150,16 +1162,18 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, args); } +#if _MSVCR_VER>=80 /********************************************************************* - * _vswprintf_p (MSVCR100.@) + * _vswprintf_p (MSVCR80.@) */ int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, __ms_va_list args) { return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, NULL, args); } +#endif - +#if _MSVCR_VER>=140 /********************************************************************* * __stdio_common_vswprintf_p (UCRTBASE.@) */ @@ -1171,6 +1185,7 @@ int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); return MSVCRT_vswprintf_p_l_opt(str, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); } +#endif /********************************************************************* * _vsnwprintf_s_l (MSVCRT.@) @@ -1247,6 +1262,8 @@ int WINAPIV MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsign return retval; } +#if _MSVCR_VER>=140 + static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) { struct _str_ctx_w *out = ctx; @@ -1295,6 +1312,8 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, return ret; } +#endif /* _MSVCR_VER>=140 */ + /********************************************************************* * sprintf (MSVCRT.@) */ @@ -1424,13 +1443,15 @@ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t return MSVCRT_vswprintf_p_l_opt( NULL, INT_MAX, format, 0, locale, args ); } +#if _MSVCR_VER>=80 /********************************************************************* - * _vscwprintf_p (MSVCR100.@) + * _vscwprintf_p (MSVCR80.@) */ int CDECL MSVCRT__vscwprintf_p(const MSVCRT_wchar_t *format, __ms_va_list args) { return MSVCRT_vswprintf_p_l_opt(NULL, INT_MAX, format, 0, NULL, args); } +#endif /********************************************************************* * vswprintf_s (MSVCRT.@) @@ -1496,6 +1517,7 @@ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, return MSVCRT_vsprintf_p_l(buffer, length, format, NULL, args); } +#if _MSVCR_VER>=140 /********************************************************************* * __stdio_common_vsprintf_p (UCRTBASE.@) */ @@ -1506,6 +1528,7 @@ int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); } +#endif /********************************************************************* * _sprintf_p_l (MSVCRT.@) @@ -1537,8 +1560,9 @@ int WINAPIV MSVCRT___swprintf_l( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *form return retval; } +#if _MSVCR_VER>=80 /********************************************************************* - * _sprintf_p (MSVCR100.@) + * _sprintf_p (MSVCR80.@) */ int WINAPIV MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *format, ...) { @@ -1551,6 +1575,7 @@ int WINAPIV MSVCRT__sprintf_p(char *buffer, MSVCRT_size_t length, const char *fo return r; } +#endif /********************************************************************* * _swprintf_p_l (MSVCRT.@) @@ -2234,6 +2259,8 @@ MSVCRT_long __cdecl MSVCRT__wtol(const MSVCRT_wchar_t *str) return MSVCRT__wtol_l(str, NULL); } +#if _MSVCR_VER>=120 + /********************************************************************* * _wtoll_l (MSVCR120.@) */ @@ -2250,6 +2277,8 @@ MSVCRT_longlong __cdecl MSVCRT__wtoll(const MSVCRT_wchar_t *str) return MSVCRT__wtoll_l(str, NULL); } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _wcstoui64_l (MSVCRT.@) *

1 0

André Hentschel : glu32: Don' t cast return value from HeapAlloc.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: d2ad5ead321f457ea5a32559cff3454743e0be80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ad5ead321f457ea5a32559… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 2 12:54:26 2018 +0100 glu32: Don't cast return value from HeapAlloc. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/mipmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 87d4770..2eff558 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -4169,7 +4169,7 @@ static int gluBuild2DMipmapLevelsCore(GLenum target, GLint internalFormat, case GL_UNSIGNED_INT_8_8_8_8_REV: case GL_UNSIGNED_INT_10_10_10_2: case GL_UNSIGNED_INT_2_10_10_10_REV: - dstImage = (GLuint *)HeapAlloc(GetProcessHeap(), 0, memreq); + dstImage = HeapAlloc(GetProcessHeap(), 0, memreq); break; default: return GLU_INVALID_ENUM;

1 0

Michael Stefaniuc : d3d8/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: 9ac1523962ca08b625c4801c44877c7e2f1d62cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac1523962ca08b625c4801c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 28 19:30:35 2017 +0100 d3d8/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ac1523962ca08b625c4…

1 0

André Hentschel : shell32: Don' t cast return value from DPA_GetPtr.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: 460053b8fc07e3ca39db02e3b2666fc284c50bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=460053b8fc07e3ca39db02e3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 2 12:54:21 2018 +0100 shell32: Don't cast return value from DPA_GetPtr. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 0ea2eb9..fc4e703 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -129,7 +129,7 @@ HRESULT SIC_get_location( int list_idx, WCHAR *file, DWORD *size, int *res_idx ) dpa_idx = DPA_Search( sic_hdpa, &seek, 0, SIC_CompareEntries, SIC_COMPARE_LISTINDEX, 0 ); if (dpa_idx != -1) { - found = (SIC_ENTRY *)DPA_GetPtr( sic_hdpa, dpa_idx ); + found = DPA_GetPtr( sic_hdpa, dpa_idx ); needed = (strlenW( found->sSourceFile ) + 1) * sizeof(WCHAR); if (needed <= *size) {

1 0

Alexandre Julliard : reg/tests: Get rid of version check.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: 59c47c9e2c08bd09288633317d1aa6d285532220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59c47c9e2c08bd0928863331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 15:11:04 2018 +0100 reg/tests: Get rid of version check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 50fae7f..b64defb 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4328,7 +4328,7 @@ error: static void test_export(void) { LONG err; - DWORD r, os_version, major_version, minor_version, dword; + DWORD r, dword; HKEY hkey, subkey; BYTE hex[4]; @@ -4454,23 +4454,15 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - os_version = GetVersion(); - major_version = LOBYTE(LOWORD(os_version)); - minor_version = HIBYTE(LOWORD(os_version)); - - if (major_version > 5 || (major_version == 5 && minor_version == 2)) - { - run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - } - else /* Windows XP (32-bit) and older */ - win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE), /* winxp */ + "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n");

1 0

Alex Henrie : ddraw/tests: Mark GetDC() failures on VMware as broken.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: 9aeb3b98f85029824befb76486a61ab2952e1e12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aeb3b98f85029824befb764… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 2 16:28:12 2018 +0100 ddraw/tests: Mark GetDC() failures on VMware as broken. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2c4410a..52c5e85 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9071,7 +9071,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result || ddraw_is_vmware(ddraw)), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 89d0d7e..e87244b 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10205,7 +10205,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result || ddraw_is_vmware(ddraw)), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fa1178d..b280628 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11767,7 +11767,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface4_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fdfac69..846a83d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11718,7 +11718,7 @@ static void test_getdc(void) dc = (void *)0x1234; hr = IDirectDrawSurface7_GetDC(surface, &dc); if (test_data[i].getdc_supported) - ok(SUCCEEDED(hr) || (test_data[i].alt_result && hr == test_data[i].alt_result), + ok(SUCCEEDED(hr) || broken(hr == test_data[i].alt_result), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name); else ok(FAILED(hr), "Got unexpected hr %#x for format %s.\n", hr, test_data[i].name);

1 0

André Hentschel : advapi32/tests: Don' t cast return value from HeapAlloc.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: master Commit: ab2ae76ea4bf5d367c2f444b2358cf7e404a863d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab2ae76ea4bf5d367c2f444b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 2 12:54:11 2018 +0100 advapi32/tests: Don't cast return value from HeapAlloc. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/eventlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 8c78dcf..e6b2de5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1157,7 +1157,7 @@ static void test_start_trace(void) LONG ret; buffersize = sizeof(EVENT_TRACE_PROPERTIES) + sizeof(sessionname) + sizeof(filepath); - properties = (EVENT_TRACE_PROPERTIES *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); + properties = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buffersize); properties->Wnode.BufferSize = buffersize; properties->Wnode.Flags = WNODE_FLAG_TRACED_GUID; properties->LogFileMode = EVENT_TRACE_FILE_MODE_NONE;

1 0