January 2018 - Wine-commits

Andrey Gusev : msctf/tests: Fix a typo in sink_check_ok().
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 0b7882b00b71a95a255a1593643c5a42f0a29aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7882b00b71a95a255a1593… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 8 13:45:27 2018 +0200 msctf/tests: Fix a typo in sink_check_ok(). Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 34a2709..9bd112c 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1901,7 +1901,7 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"ITfContext_GetSelection failed\n"); ok(fetched == 1,"fetched incorrect\n"); ok(selection.range != NULL,"NULL range\n"); - sink_check_ok(&test_ACP_GetSelection,"ACP_GetSepection"); + sink_check_ok(&test_ACP_GetSelection,"GetSelection"); ITfRange_Release(selection.range); test_InsertAtSelection(ec, cxt);

1 0

Andrey Gusev : ddraw: Fix typos in comments.
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: fbb57d4176d5f42140ceb0b15d3bee2c2cca270c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbb57d4176d5f42140ceb0b1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 8 13:43:44 2018 +0200 ddraw: Fix typos in comments. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 542f23a..28bb2fb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1170,7 +1170,7 @@ static HRESULT WINAPI d3d_device3_EnumTextureFormats(IDirect3DDevice3 *iface, * IDirect3DDevice2::EnumTextureformats * * EnumTextureFormats for Version 1 and 2, see - * IDirect3DDevice7::EnumTexureFormats for a more detailed description. + * IDirect3DDevice7::EnumTextureFormats for a more detailed description. * * This version has a different callback and does not enumerate FourCC * formats diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index cc676f3..6a9544b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Unlock(IDirect3DVertexBuffer7 *iface) * SrcIndex: Index of the first vertex in the src buffer to process * D3DDevice: Device to use for transformation * Flags: 0 for default, D3DPV_DONOTCOPYDATA to prevent copying - * unchaned vertices + * unchanged vertices * * Returns: * D3D_OK on success

1 0

Alex Henrie : msi/tests: Add missing return value checks to package tests (Coverity).
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 0f49d2a80df9dfc4c440fcb5cb0386e18ec22922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f49d2a80df9dfc4c440fcb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 22:57:36 2018 -0700 msi/tests: Add missing return value checks to package tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 002e692..e4cee59 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3268,7 +3268,8 @@ static void test_states(void) add_file_entry( hdb, "'psi_file', 'psi', 'psi.txt', 100, '', '1033', 8192, 1" ); add_file_entry( hdb, "'upsilon_file', 'upsilon', 'upsilon.txt', 0, '', '1033', 16384, 1" ); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); /* these properties must not be in the saved msi file */ add_property_entry( hdb, "'ADDLOCAL', 'one,four'"); @@ -7056,7 +7057,8 @@ static void test_shortlongsource(void) /* CostFinalize:long */ add_directory_entry(hdb, "'SubDir7', 'TARGETDIR', 'eleven|twelve'"); - MsiDatabaseCommit(hdb); + r = MsiDatabaseCommit(hdb); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); r = package_from_db(hdb, &hpkg); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -8553,7 +8555,8 @@ static void test_MsiEnumComponentCosts(void) add_install_execute_sequence_entry( hdb, "'CostFinalize', '', '1000'" ); add_install_execute_sequence_entry( hdb, "'InstallValidate', '', '1100'" ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); sprintf( package, "#%u", hdb ); r = MsiOpenPackageA( package, &hpkg ); @@ -9116,8 +9119,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI { INT retval = context ? *((INT *)context) : 0; struct externalui_message msg; - char buffer[100]; - DWORD length = 100; + char buffer[256]; + DWORD length; + UINT r; int i; msg.message = message; @@ -9131,8 +9135,9 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI msg.field_count = MsiRecordGetFieldCount(hrecord); for (i = 0; i <= msg.field_count; i++) { - length = 100; - MsiRecordGetStringA(hrecord, i, buffer, &length); + length = sizeof(buffer); + r = MsiRecordGetStringA(hrecord, i, buffer, &length); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); memcpy(msg.field[i], buffer, min(100, length+1)); }

1 0

Alex Henrie : shell32/tests: Add missing return value check to shelllink tests (Coverity).
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 8bb6addb1ea15072cfbe60dc12602d515be7e018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bb6addb1ea15072cfbe60dc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 22:05:18 2018 -0700 shell32/tests: Add missing return value check to shelllink tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 6f12fb2..4f16290 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -169,8 +169,9 @@ static void test_get_set(void) ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); ok(finddata.cFileName[0] == 0, "unexpected filename '%s'\n", finddata.cFileName); - CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - &IID_IShellLinkW, (LPVOID*)&slW); + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&slW); + ok(r == S_OK, "CoCreateInstance failed (0x%08x)\n", r); if (!slW /* Win9x */ || !pGetLongPathNameA /* NT4 */) skip("SetPath with NULL parameter crashes on Win9x and some NT4\n"); else

1 0

Alex Henrie : kernel32/tests: Add missing return value check to module tests (Coverity).
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 3675b7035e2fd6d5606464d45182c7aa2bca8309 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3675b7035e2fd6d5606464d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 7 22:05:15 2018 -0700 kernel32/tests: Add missing return value check to module tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 108d0cb..d3b9c92 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -972,7 +972,8 @@ static void test_AddDllDirectory(void) buf[0] = '\0'; GetTempPathW( sizeof(path)/sizeof(path[0]), path ); - GetTempFileNameW( path, tmpW, 0, buf ); + ret = GetTempFileNameW( path, tmpW, 0, buf ); + ok( ret, "GetTempFileName failed err %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); cookie = pAddDllDirectory( buf ); ok( cookie != NULL, "AddDllDirectory failed err %u\n", GetLastError() );

1 0

Alex Henrie : wininet/tests: Fix off-by-one errors in HTTP tests (Coverity ).
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 7b2ead8da082e27d403f8554f0e714f0603ffd31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2ead8da082e27d403f8554… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 6 21:53:58 2018 -0700 wininet/tests: Fix off-by-one errors in HTTP tests (Coverity). 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/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index efc73e0..1c2aadb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -720,7 +720,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer)-1; + length = sizeof(buffer)-2; memset(buffer, 0x77, sizeof(buffer)); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); @@ -744,7 +744,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); - length = sizeof(wbuffer)-sizeof(WCHAR); + length = sizeof(wbuffer)-2*sizeof(WCHAR); memset(wbuffer, 0x77, sizeof(wbuffer)); res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError());

1 0

Alex Henrie : shlwapi/tests: Add missing return value checks to istream tests (Coverity).
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 031f2ab64f9700e2e4490b6f7aaf3762f9606f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=031f2ab64f9700e2e4490b6f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 01:19:29 2018 -0700 shlwapi/tests: Add missing return value checks to istream tests (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/istream.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 54a73fc..926f2f8 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -663,8 +663,10 @@ static void test_SHCreateStreamOnFileEx_CopyTo(void) static const WCHAR prefix[] = { 'T', 'S', 'T', 0 }; GetTempPathW(MAX_PATH, tmpPath); - GetTempFileNameW(tmpPath, prefix, 0, srcFileName); - GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + ret = GetTempFileNameW(tmpPath, prefix, 0, srcFileName); + ok(ret != 0, "GetTempFileName failed, got error %d\n", GetLastError()); + ret = GetTempFileNameW(tmpPath, prefix, 0, dstFileName); + ok(ret != 0, "GetTempFileName failed, got error %d\n", GetLastError()); ret = SHCreateStreamOnFileEx(srcFileName, STGM_CREATE | STGM_READWRITE | STGM_DELETEONRELEASE, FILE_ATTRIBUTE_TEMPORARY, FALSE, NULL, &src); ok(SUCCEEDED(ret), "SHCreateStreamOnFileEx failed with ret=0x%08x\n", ret);

1 0

Alex Henrie : msvcrt: Don' t include MSVC 7.0+ miscellaneous functions in SOs for older DLLs.
by Alexandre Julliard 08 Jan '18

08 Jan '18

Module: wine Branch: master Commit: 6413d96b6b91db062b32e5fa62a25e6e5ef348a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6413d96b6b91db062b32e5fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 6 22:05:31 2018 -0700 msvcrt: Don't include MSVC 7.0+ miscellaneous 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/except.c | 2 ++ dlls/msvcrt/mbcs.c | 2 ++ dlls/msvcrt/misc.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/msvcrt/process.c | 2 ++ dlls/msvcrt/thread.c | 2 ++ dlls/msvcrt/wcs.c | 4 ++++ 6 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 18c2f15..8d13e7f 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -321,6 +321,7 @@ void CDECL __security_error_handler(int code, void *data) MSVCRT__exit(3); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtSetUnhandledExceptionFilter (MSVCR110.@) */ @@ -328,6 +329,7 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } +#endif /********************************************************************* * _CreateFrameInfo (MSVCR80.@) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6e46b84..7ca1906 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -185,6 +185,7 @@ int CDECL MSVCRT____mb_cur_max_func(void) return get_locinfo()->mb_cur_max; } +#if _MSVCR_VER>=80 /********************************************************************* * ___mb_cur_max_l_func (MSVCR80.@) */ @@ -199,6 +200,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) return &locinfo->mb_cur_max; } +#endif /********************************************************************* * INTERNAL: _setmbcp_l diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index b9dadac..d784dec 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -426,8 +426,10 @@ int CDECL MSVCRT__resetstkoflw(void) return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } +#if _MSVCR_VER>=80 + /********************************************************************* - * _decode_pointer (MSVCR90.@) + * _decode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_decode_pointer(void * ptr) { @@ -435,7 +437,7 @@ void * CDECL MSVCRT_decode_pointer(void * ptr) } /********************************************************************* - * _encode_pointer (MSVCR90.@) + * _encode_pointer (MSVCR80.@) */ void * CDECL MSVCRT_encode_pointer(void * ptr) { @@ -443,7 +445,7 @@ void * CDECL MSVCRT_encode_pointer(void * ptr) } /********************************************************************* - * _encoded_null (MSVCR100.@) + * _encoded_null (MSVCR80.@) */ void * CDECL _encoded_null(void) { @@ -452,8 +454,12 @@ void * CDECL _encoded_null(void) return EncodePointer(NULL); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=70 + /********************************************************************* - * _CRT_RTC_INIT (MSVCR100.@) + * _CRT_RTC_INIT (MSVCR70.@) */ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -462,7 +468,7 @@ void* CDECL _CRT_RTC_INIT(void *unk1, void *unk2, int unk3, int unk4, int unk5) } /********************************************************************* - * _CRT_RTC_INITW (MSVCR100.@) + * _CRT_RTC_INITW (MSVCR70.@) */ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) { @@ -470,8 +476,12 @@ void* CDECL _CRT_RTC_INITW(void *unk1, void *unk2, int unk3, int unk4, int unk5) return NULL; } +#endif /* _MSVCR_VER>=70 */ + +#if _MSVCR_VER>=80 + /********************************************************************* - * _byteswap_ushort (MSVCR100.@) + * _byteswap_ushort (MSVCR80.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) { @@ -479,7 +489,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s) } /********************************************************************* - * _byteswap_ulong (MSVCR100.@) + * _byteswap_ulong (MSVCR80.@) */ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) { @@ -487,7 +497,7 @@ ULONG CDECL MSVCRT__byteswap_ulong(ULONG l) } /********************************************************************* - * _byteswap_uint64 (MSVCR100.@) + * _byteswap_uint64 (MSVCR80.@) */ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) { @@ -495,6 +505,10 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56); } +#endif /* _MSVCR_VER>=80 */ + +#if _MSVCR_VER>=110 + /********************************************************************* * __crtGetShowWindowMode (MSVCR110.@) */ @@ -517,6 +531,9 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( return InitializeCriticalSectionEx(cs, spin_count, flags); } +#endif /* _MSVCR_VER>=110 */ + +#if _MSVCR_VER>=120 /********************************************************************* * _vacopy (MSVCR120.@) */ @@ -524,7 +541,9 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) { __ms_va_copy(*dest, src); } +#endif +#if _MSVCR_VER>=80 /********************************************************************* * _crt_debugger_hook (MSVCR80.@) */ @@ -532,7 +551,9 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved) { WARN("(%x)\n", reserved); } +#endif +#if _MSVCR_VER>=110 /********************************************************************* * __crtUnhandledException (MSVCR110.@) */ @@ -542,7 +563,9 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } +#endif +#if _MSVCR_VER>=120 /********************************************************************* * __crtSleep (MSVCR120.@) */ @@ -551,3 +574,4 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } +#endif diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 1a183bc..fac3bd4 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1325,6 +1325,7 @@ int CDECL _getpid(void) return GetCurrentProcessId(); } +#if _MSVCR_VER>=110 /********************************************************************* * __crtTerminateProcess (MSVCR110.@) */ @@ -1332,3 +1333,4 @@ int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) { return TerminateProcess(GetCurrentProcess(), exit_code); } +#endif diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index da1f8bf..af31534 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -164,6 +164,7 @@ MSVCRT_uintptr_t CDECL _beginthreadex( initflag, thrdaddr); } +#if _MSVCR_VER>=80 /********************************************************************* * _getptd (MSVCR80.@) */ @@ -172,3 +173,4 @@ thread_data_t* CDECL _getptd(void) FIXME("returns undocumented/not fully filled data\n"); return msvcrt_get_thread_data(); } +#endif diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1aa8d98..098e0d5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -40,6 +40,8 @@ static BOOL n_format_enabled = TRUE; #include "printf.h" #undef PRINTF_WIDE +#if _MSVCR_VER>=80 + /********************************************************************* * _get_printf_count_output (MSVCR80.@) */ @@ -58,6 +60,8 @@ int CDECL MSVCRT__set_printf_count_output( int enable ) return old ? 1 : 0; } +#endif /* _MSVCR_VER>=80 */ + /********************************************************************* * _wcsdup (MSVCRT.@) */

1 0

Alexandre Julliard : Wine release 3.0-rc5
by Alexandre Julliard 05 Jan '18

05 Jan '18

Module: website Branch: master Commit: a0f5318afb9d84ba907df1979817936715fb9789 URL: https://source.winehq.org/git/website.git/?a=commit;h=a0f5318afb9d84ba907df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 21:02:19 2018 +0100 Wine release 3.0-rc5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018010501.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018010501.xml b/news/en/2018010501.xml new file mode 100644 index 0000000..6ff20b8 --- /dev/null +++ b/news/en/2018010501.xml @@ -0,0 +1,12 @@ +<news> +<date>January 5, 2018</date> +<title>Wine 3.0-rc5 Released</title> +<body> + The Wine development release 3.0-rc5 is now available. + <a href="{$root}/announce/3.0-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

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