July 2020 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Don't use strcmpW in wcscmp.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 841fbd5b141db7bed7445e95f7accd6cb393c3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=841fbd5b141db7bed7445e95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:45 2020 +0200 msvcrt: Don't use strcmpW in wcscmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 46eb0cc080..b5b877e7ec 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4210,6 +4210,20 @@ static void test_iswdigit(void) } } +static void test_wcscmp(void) +{ + int r; + + r = wcscmp(L"a", L"z"); + ok(r == -1, "wcscmp returned %d\n", r); + + r = wcscmp(L"z", L"a"); + ok(r == 1, "wcscmp returned %d\n", r); + + r = wcscmp(L"f", L"f"); + ok(!r, "wcscmp returned %d\n", r); +} + START_TEST(string) { char mem[100]; @@ -4359,4 +4373,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_wcscmp(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 73ade3be73..70a8d6201f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1583,6 +1583,24 @@ int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, return r; } +/********************************************************************* + * wcscmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) +{ + while (*str1 && (*str1 == *str2)) + { + str1++; + str2++; + } + + if (*str1 < *str2) + return -1; + if (*str1 > *str2) + return 1; + return 0; +} + /********************************************************************* * _wcscoll_l (MSVCRT.@) */ @@ -1596,7 +1614,7 @@ int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcmpW(str1, str2); + return MSVCRT_wcscmp(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -2668,11 +2686,3 @@ MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, { return MSVCRT__wcsxfrm_l(dest, src, len, NULL); } - -/********************************************************************* - * wcscmp (MSVCRT.@) - */ -int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) -{ - return strcmpW(str1, str2); -}

1 0

Piotr Caban : msvcrt: Use proper flags instead of characters for printf flags.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: e20756e9b8dcb29241ae435760d04a9c7cf519bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e20756e9b8dcb29241ae4357… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 15:33:33 2020 +0200 msvcrt: Use proper flags instead of characters for printf flags. Port 1a43c5de71eea457855f7dcfb7e5811f1c74ebf8 to msvcrt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 101 ++++++++++++++++++++++++--------------------------- dlls/msvcrt/wcs.c | 9 +++++ 2 files changed, 56 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e20756e9b8dcb29241ae…

1 0

Jacek Caban : server: Remove no longer needed fill_console_output request.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 35352575e4e8d9fc753dad583f2b24ed999ec8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=35352575e4e8d9fc753dad58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:59 2020 +0200 server: Remove no longer needed fill_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 7 +++++++ include/wine/server_protocol.h | 32 +------------------------------- server/console.c | 20 -------------------- server/protocol.def | 21 --------------------- server/request.h | 13 ------------- server/trace.c | 26 -------------------------- tools/make_requests | 1 - 7 files changed, 8 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35352575e4e8d9fc753d…

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in fill_console_output.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: a07aa965e5d3c2f4a46387ad911ef1c8500e2107 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a07aa965e5d3c2f4a46387ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 14 16:23:35 2020 +0200 kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in fill_console_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 49259857af..27918d8370 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -163,19 +163,16 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) /* helper function for ScrollConsoleScreenBufferW */ static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO *fill ) { - SERVER_START_REQ( fill_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->x = i; - req->y = j; - req->count = len; - req->wrap = FALSE; - req->data.ch = fill->Char.UnicodeChar; - req->data.attr = fill->Attributes; - wine_server_call_err( req ); - } - SERVER_END_REQ; + struct condrv_fill_output_params params; + + params.mode = CHAR_INFO_MODE_TEXTATTR; + params.x = i; + params.y = j; + params.count = len; + params.wrap = FALSE; + params.ch = fill->Char.UnicodeChar; + params.attr = fill->Attributes; + console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), NULL, 0, NULL ); } /* helper function for GetLargestConsoleWindowSize */

1 0

Nikolay Sivov : msxml3/tests: Remove traces.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 007df5deed60fc16689d9480e75fecaccdeb1d37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=007df5deed60fc16689d9480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:47:48 2020 +0300 msxml3/tests: Remove traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 4 ---- dlls/msxml3/tests/httpreq.c | 1 - 2 files changed, 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f45364058a..7f3b42d840 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13146,8 +13146,6 @@ static BOOL qi_list_contains_service(REFIID service, REFIID iid) static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID iid, void **ppv) { - trace("sp_QueryInterface: %s\n", wine_dbgstr_guid(iid)); - if (qi_count < ARRAY_SIZE(qi_list)) qi_list[qi_count++] = iid; else @@ -13177,8 +13175,6 @@ static ULONG WINAPI sp_Release(IServiceProvider *iface) static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, REFIID iid, void **ppv) { - trace("sp_QueryService: %s, %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(iid)); - if (IsEqualGUID(service, &SID_SContainerDispatch) || IsEqualGUID(service, &SID_SInternetHostSecurityManager)) { diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 8a2ed2c73a..74c302d5eb 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -235,7 +235,6 @@ static IHTMLElementCollection htmlecoll = { &TestHTMLECollectionVtbl }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) { - trace("\n"); *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary system information.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 20bc32cddc6ca8b1e2577cbc12050804972ca0ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=20bc32cddc6ca8b1e2577cbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:35:27 2020 +0200 ntdll: Use malloc() to allocate temporary system information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 835cf8d134..c705f5a8d1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2073,7 +2073,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, char *buffer = NULL; unsigned int pos = 0; - if (size && !(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; break; @@ -2090,7 +2090,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, if (ret) { - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); break; } @@ -2166,7 +2166,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } if (len > size) ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap( GetProcessHeap(), 0, buffer ); + free( buffer ); break; } @@ -2327,8 +2327,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } num_handles = (size - FIELD_OFFSET( SYSTEM_HANDLE_INFORMATION, Handle )) / sizeof(SYSTEM_HANDLE_ENTRY); - if (!(handle_info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*handle_info) * num_handles ))) - return STATUS_NO_MEMORY; + if (!(handle_info = malloc( sizeof(*handle_info) * num_handles ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_system_handles ) { @@ -2355,7 +2354,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } SERVER_END_REQ; - RtlFreeHeap( GetProcessHeap(), 0, handle_info ); + free( handle_info ); break; }

1 0

Zebediah Figura : quartz: Get rid of the IFilterGraphImpl typedef.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: d93137e2e07e0fea56e0c5148c27b1c7e9cb5a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93137e2e07e0fea56e0c514… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:16 2020 -0500 quartz: Get rid of the IFilterGraphImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 559 +++++++++++++++++++++++----------------------- 1 file changed, 280 insertions(+), 279 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d93137e2e07e0fea56e0…

1 0

Zebediah Figura : quartz/vmr9: Show the window only if auto-show is enabled.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 4d580796bc64106e8105df458cbc938fbac3988a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d580796bc64106e8105df45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 17:37:17 2020 -0500 quartz/vmr9: Show the window only if auto-show is enabled. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b6b55c70c5..a540feb237 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -482,7 +482,7 @@ static void vmr_start_stream(struct strmbase_renderer *iface) struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); IVMRImagePresenter9_StartPresenting(filter->presenter, filter->cookie); - if (filter->window.hwnd) + if (filter->window.hwnd && filter->window.AutoShow) ShowWindow(filter->window.hwnd, SW_SHOW); SetEvent(filter->run_event); }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate temporary process data.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 42a2ad202e6a260dc9e3f04939c7dacf270f7434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a2ad202e6a260dc9e3f049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:33:57 2020 +0200 ntdll: Use malloc() to allocate temporary process data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 8b03834df6..83c67737f8 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -233,7 +233,7 @@ static startup_info_t *create_startup_info( const RTL_USER_PROCESS_PARAMETERS *p size = (size + 1) & ~1; *info_size = size; - if (!(info = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) return NULL; + if (!(info = calloc( size, 1 ))) return NULL; info->debug_flags = params->DebugFlags; info->console_flags = params->ConsoleFlags; @@ -461,7 +461,7 @@ static ULONG get_env_size( const RTL_USER_PROCESS_PARAMETERS *params, char **win if (!*winedebug && !wcsncmp( ptr, WINEDEBUG, ARRAY_SIZE( WINEDEBUG ) - 1 )) { DWORD len = wcslen(ptr) * 3 + 1; - if ((*winedebug = RtlAllocateHeap( GetProcessHeap(), 0, len ))) + if ((*winedebug = malloc( len ))) ntdll_wcstoumbs( ptr, wcslen(ptr) + 1, *winedebug, len, FALSE ); } ptr += wcslen(ptr) + 1; @@ -991,8 +991,8 @@ done: if (thread_handle) NtClose( thread_handle ); if (socketfd[0] != -1) close( socketfd[0] ); if (unixdir != -1) close( unixdir ); - RtlFreeHeap( GetProcessHeap(), 0, startup_info ); - RtlFreeHeap( GetProcessHeap(), 0, winedebug ); + free( startup_info ); + free( winedebug ); return status; }

1 0

Alexandre Julliard : ntdll: Use malloc() to allocate the system processor information.
by Alexandre Julliard July 14, 2020

July 14, 2020

Module: wine Branch: master Commit: 242dc8989a993d1b3807f437fbac7b92707b6e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=242dc8989a993d1b3807f437… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 14 10:35:14 2020 +0200 ntdll: Use malloc() to allocate the system processor information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eedd67fba1..835cf8d134 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2182,6 +2182,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, ret = STATUS_INFO_LENGTH_MISMATCH; break; } + if (!(sppi = calloc( out_cpus, sizeof(*sppi) ))) + { + ret = STATUS_NO_MEMORY; + break; + } else #ifdef __APPLE__ { @@ -2196,8 +2201,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { int i; cpus = min(cpus,out_cpus); - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); for (i = 0; i < cpus; i++) { sppi[i].IdleTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_IDLE]; @@ -2214,7 +2217,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { unsigned long clk_tck = sysconf(_SC_CLK_TCK); unsigned long usr,nice,sys,idle,remainder[8]; - int i, count; + int i, count, id; char name[32]; char line[255]; @@ -2230,17 +2233,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, for (i = 0; i + 5 < count; ++i) sys += remainder[i]; sys += idle; usr += nice; - cpus = atoi( name + 3 ) + 1; - if (cpus > out_cpus) break; - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - if (sppi) - sppi = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sppi, len ); - else - sppi = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - - sppi[cpus-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; - sppi[cpus-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; - sppi[cpus-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; + id = atoi( name + 3 ) + 1; + if (id > out_cpus) break; + if (id > cpus) cpus = id; + sppi[id-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; + sppi[id-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; + sppi[id-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; } fclose(cpuinfo); } @@ -2251,8 +2249,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, static int i = 1; unsigned int n; cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; - sppi = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); /* many programs expect these values to change so fake change */ for (n = 0; n < cpus; n++) @@ -2264,6 +2260,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, i++; } + len = sizeof(*sppi) * cpus; if (size >= len) { if (!info) ret = STATUS_ACCESS_VIOLATION; @@ -2271,7 +2268,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } else ret = STATUS_INFO_LENGTH_MISMATCH; - RtlFreeHeap(GetProcessHeap(),0,sppi); + free( sppi ); break; }

1 0