wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Nikolay Sivov : msvcrt: Added _ismbcl0().
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 14665e19887606ffa1f1fd509ee3bded39642b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14665e19887606ffa1f1fd50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 8 16:44:41 2017 +0300 msvcrt: Added _ismbcl0(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a6e50ce97f85e2877420252b38664281559c7b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a4c944b..d80522a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -986,7 +986,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 768bf8b..adefdf1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1332,7 +1332,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b2c5eb..47f87df 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1337,7 +1337,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ca3ff87..f2aea27 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -381,7 +381,7 @@ @ cdecl _ismbcgraph(long) @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7e6d7c0..06c4d32 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -376,7 +376,7 @@ @ cdecl _ismbcgraph(long) @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 10d4d5a..b606cc3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -658,7 +658,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0957db0..251bff9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -636,7 +636,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 93bb1a7..aabbf7a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2441,3 +2441,17 @@ unsigned int CDECL _mbctokata(unsigned int c) return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0); return c; } + + +/********************************************************************* + * _ismbcl0 (MSVCRT.@) + */ +int CDECL _ismbcl0(unsigned int c) +{ + if(get_mbcinfo()->mbcodepage == 932) + { + /* JIS non-Kanji */ + return (c >= 0x8140 && c <= 0x889e); + } + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 589bc1d..daf80a0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -604,7 +604,7 @@ # stub _ismbchira_l(long ptr) @ cdecl _ismbckata(long) # stub _ismbckata_l(long ptr) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) # stub _ismbcl0_l(long ptr) @ stub _ismbcl1(long) # stub _ismbcl1_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e78695..3fe8df8 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3113,6 +3113,29 @@ static void test__mbscmp(void) ok(ret == 1, "got %d\n", ret); } +static void test__ismbclx(void) +{ + int cp, ret; + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + cp = _setmbcp(1252); + + ret = _ismbcl0(0x8140); + ok(!ret, "got %d\n", ret); + + _setmbcp(932); + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl0(0x8140); + ok(ret, "got %d\n", ret); + + _setmbcp(cp); +} + START_TEST(string) { char mem[100]; @@ -3227,4 +3250,5 @@ START_TEST(string) test__strnset_s(); test__wcsset_s(); test__mbscmp(); + test__ismbclx(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 85d2ed3..f6daec0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -476,7 +476,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l

1 0

Alex Henrie : ddraw/tests: Mark GetDC() failures on VMware as broken.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Michael Stefaniuc : d3d8/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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 : glu32: Don' t cast return value from HeapAlloc.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

André Hentschel : shell32: Don' t cast return value from DPA_GetPtr.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

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

02 Jan '18

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

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

02 Jan '18

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

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

02 Jan '18

Module: wine Branch: master Commit: 42ab0af66b74f7572db2f6d0256f49fae7527221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ab0af66b74f7572db2f6d0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 28 10:46:53 2017 -0700 msvcrt: Don't include MSVC 8.0+ heap 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/heap.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ed41253..7ea80a3 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -373,8 +373,9 @@ MSVCRT_size_t CDECL _msize(void* mem) return size; } +#if _MSVCR_VER>=80 /********************************************************************* - * _aligned_msize (MSVCR100.@) + * _aligned_msize (MSVCR80.@) */ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offset) { @@ -388,6 +389,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs alloc_ptr = SAVED_PTR(p); return _msize(*alloc_ptr)-alignment-sizeof(void*); } +#endif /********************************************************************* * calloc (MSVCRT.@) @@ -405,6 +407,7 @@ void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) return msvcrt_heap_alloc(HEAP_ZERO_MEMORY, bytes); } +#if _MSVCR_VER>=140 /********************************************************************* * _calloc_base (UCRTBASE.@) */ @@ -412,6 +415,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) { return MSVCRT_calloc(count, size); } +#endif /********************************************************************* * free (MSVCRT.@) @@ -421,6 +425,7 @@ void CDECL MSVCRT_free(void* ptr) msvcrt_heap_free(ptr); } +#if _MSVCR_VER>=140 /********************************************************************* * _free_base (UCRTBASE.@) */ @@ -428,6 +433,7 @@ void CDECL _free_base(void* ptr) { msvcrt_heap_free(ptr); } +#endif /********************************************************************* * malloc (MSVCRT.@) @@ -440,6 +446,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) return ret; } +#if _MSVCR_VER>=140 /********************************************************************* * _malloc_base (UCRTBASE.@) */ @@ -447,6 +454,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) { return MSVCRT_malloc(size); } +#endif /********************************************************************* * realloc (MSVCRT.@) @@ -459,6 +467,7 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) return NULL; } +#if _MSVCR_VER>=140 /********************************************************************* * _realloc_base (UCRTBASE.@) */ @@ -466,9 +475,11 @@ void* CDECL _realloc_base(void* ptr, MSVCRT_size_t size) { return MSVCRT_realloc(ptr, size); } +#endif +#if _MSVCR_VER>=80 /********************************************************************* - * _recalloc (MSVCR100.@) + * _recalloc (MSVCR80.@) */ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) { @@ -491,6 +502,7 @@ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) memset((BYTE*)ret+old_size, 0, size-old_size); return ret; } +#endif /********************************************************************* * __p__amblksiz (MSVCRT.@) @@ -739,6 +751,7 @@ int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const voi return 0; } +#if _MSVCR_VER>=100 /********************************************************************* * wmemmove_s (MSVCR100.@) */ @@ -761,6 +774,7 @@ int CDECL wmemmove_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, memmove(dest, src, sizeof(MSVCRT_wchar_t)*count); return 0; } +#endif /********************************************************************* * memcpy_s (MSVCRT.@) @@ -788,6 +802,7 @@ int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void return 0; } +#if _MSVCR_VER>=100 /********************************************************************* * wmemcpy_s (MSVCR100.@) */ @@ -813,6 +828,7 @@ int CDECL wmemcpy_s(MSVCRT_wchar_t *dest, MSVCRT_size_t numberOfElements, memcpy(dest, src, sizeof(MSVCRT_wchar_t)*count); return 0; } +#endif /********************************************************************* * strncpy_s (MSVCRT.@)

1 0

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

02 Jan '18

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

Jacek Caban : server: Pass proper async object to queue_irp in device_file_flush.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: master Commit: 56dfb384c7b44d657cf498f6eda60b66d4a97664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56dfb384c7b44d657cf498f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 2 13:56:54 2018 +0100 server: Pass proper async object to queue_irp in device_file_flush. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 65ae659..dcc2946 100644 --- a/server/device.c +++ b/server/device.c @@ -516,7 +516,7 @@ static int device_file_flush( struct fd *fd, struct async *async ) memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; params.flush.file = file->user_ptr; - return queue_irp( file, &params, NULL ); + return queue_irp( file, &params, async ); } static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async )

1 0

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