May 2019 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ole32/tests: Avoid a cast from COM object to interface.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: a2d26ae8227c04b8ae8add191587e440aeaa9c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d26ae8227c04b8ae8add19… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 29 22:47:27 2019 +0200 ole32/tests: Avoid a cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 2f5a3ca..83f7c66 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -244,7 +244,7 @@ static void ole_server(void) if (hr == S_OK) { trace("server: registering class object\n"); - hr = CoRegisterClassObject(&CLSID_WineTestObject, (IUnknown *)&factory, + hr = CoRegisterClassObject(&CLSID_WineTestObject, (IUnknown *)&factory.IClassFactory_iface, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &key); if (hr == S_OK) {

1 0

Alexandre Julliard : kernel32: Simplify K32GetPerformanceInfo().
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 32582a780e35c04ccd75aa43306b2f94998e99df URL: https://source.winehq.org/git/wine.git/?a=commit;h=32582a780e35c04ccd75aa43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 21:53:05 2019 +0200 kernel32: Simplify K32GetPerformanceInfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 78 +++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 44 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 9445d0b..7668a10 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -209,14 +209,10 @@ BOOL WINAPI IsProcessorFeaturePresent ( DWORD feature ) */ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size) { - union - { - SYSTEM_PERFORMANCE_INFORMATION performance; - SYSTEM_PROCESS_INFORMATION process; - SYSTEM_BASIC_INFORMATION basic; - } *sysinfo; - SYSTEM_PROCESS_INFORMATION *spi; - DWORD process_info_size; + SYSTEM_PERFORMANCE_INFORMATION perf; + SYSTEM_BASIC_INFORMATION basic; + SYSTEM_PROCESS_INFORMATION *process, *spi; + DWORD info_size; NTSTATUS status; TRACE( "(%p, %d)\n", info, size ); @@ -227,62 +223,56 @@ BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size) return FALSE; } - memset( info, 0, sizeof(*info) ); - info->cb = sizeof(*info); + status = NtQuerySystemInformation( SystemPerformanceInformation, &perf, sizeof(perf), NULL ); + if (status) goto err; + status = NtQuerySystemInformation( SystemBasicInformation, &basic, sizeof(basic), NULL ); + if (status) goto err; + + info->cb = sizeof(*info); + info->CommitTotal = perf.TotalCommittedPages; + info->CommitLimit = perf.TotalCommitLimit; + info->CommitPeak = perf.PeakCommitment; + info->PhysicalTotal = basic.MmNumberOfPhysicalPages; + info->PhysicalAvailable = perf.AvailablePages; + info->SystemCache = 0; + info->KernelTotal = perf.PagedPoolUsage + perf.NonPagedPoolUsage; + info->KernelPaged = perf.PagedPoolUsage; + info->KernelNonpaged = perf.NonPagedPoolUsage; + info->PageSize = basic.PageSize; /* fields from SYSTEM_PROCESS_INFORMATION */ - NtQuerySystemInformation( SystemProcessInformation, NULL, 0, &process_info_size ); + NtQuerySystemInformation( SystemProcessInformation, NULL, 0, &info_size ); for (;;) { - sysinfo = HeapAlloc( GetProcessHeap(), 0, max(process_info_size, sizeof(*sysinfo)) ); - if (!sysinfo) + process = HeapAlloc( GetProcessHeap(), 0, info_size ); + if (!process) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - status = NtQuerySystemInformation( SystemProcessInformation, &sysinfo->process, - process_info_size, &process_info_size ); + status = NtQuerySystemInformation( SystemProcessInformation, process, info_size, &info_size ); if (!status) break; + HeapFree( GetProcessHeap(), 0, process ); if (status != STATUS_INFO_LENGTH_MISMATCH) goto err; - HeapFree( GetProcessHeap(), 0, sysinfo ); } - for (spi = &sysinfo->process;; spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset)) + + info->HandleCount = info->ProcessCount = info->ThreadCount = 0; + spi = process; + for (;;) { info->ProcessCount++; info->HandleCount += spi->HandleCount; info->ThreadCount += spi->dwThreadCount; if (spi->NextEntryOffset == 0) break; + spi = (SYSTEM_PROCESS_INFORMATION *)((char *)spi + spi->NextEntryOffset); } - - /* fields from SYSTEM_PERFORMANCE_INFORMATION */ - status = NtQuerySystemInformation( SystemPerformanceInformation, &sysinfo->performance, - sizeof(sysinfo->performance), NULL ); - if (status) goto err; - info->CommitTotal = sysinfo->performance.TotalCommittedPages; - info->CommitLimit = sysinfo->performance.TotalCommitLimit; - info->CommitPeak = sysinfo->performance.PeakCommitment; - info->PhysicalAvailable = sysinfo->performance.AvailablePages; - info->KernelTotal = sysinfo->performance.PagedPoolUsage + - sysinfo->performance.NonPagedPoolUsage; - info->KernelPaged = sysinfo->performance.PagedPoolUsage; - info->KernelNonpaged = sysinfo->performance.NonPagedPoolUsage; - - /* fields from SYSTEM_BASIC_INFORMATION */ - status = NtQuerySystemInformation( SystemBasicInformation, &sysinfo->basic, - sizeof(sysinfo->basic), NULL ); - if (status) goto err; - info->PhysicalTotal = sysinfo->basic.MmNumberOfPhysicalPages; - info->PageSize = sysinfo->basic.PageSize; + HeapFree( GetProcessHeap(), 0, process ); + return TRUE; err: - HeapFree( GetProcessHeap(), 0, sysinfo ); - if (status) - { - SetLastError( RtlNtStatusToDosError( status ) ); - return FALSE; - } - return TRUE; + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; } /***********************************************************************

1 0

Alexandre Julliard : oleacc/tests: Preserve the full 64 bits of the LRESULT value.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 749243b869362a146ba405eb7efe32f0e8f9e7e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=749243b869362a146ba405eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 15:04:47 2019 +0200 oleacc/tests: Preserve the full 64 bits of the LRESULT value. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index c62fa79..685e9b7 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -543,7 +543,7 @@ static void test_LresultFromObject(const char *name) ok(SUCCEEDED(lres), "got %lx\n", lres); ok(Object_ref > 1, "Object_ref = %d\n", Object_ref); - sprintf(cmdline, "\"%s\" main ObjectFromLresult %lx", name, lres); + sprintf(cmdline, "\"%s\" main ObjectFromLresult %s", name, wine_dbgstr_longlong(lres)); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &proc); @@ -992,7 +992,7 @@ START_TEST(main) HRESULT hres; LRESULT lres; - sscanf(argv[3], "%lx", &lres); + lres = strtoll( argv[3], NULL, 16 ); hres = ObjectFromLresult(lres, &IID_IUnknown, 0, (void**)&unk); ok(hres == S_OK, "hres = %x\n", hres); IUnknown_Release(unk);

1 0

Alexandre Julliard : msvcrt/tests: Don' t use win_skip for functions that are not exported on 64-bit.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 4685e88de8ed52ea3537c22c09393fd818e7f50a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4685e88de8ed52ea3537c22c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 12:01:55 2019 +0200 msvcrt/tests: Don't use win_skip for functions that are not exported on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/data.c | 3 +-- dlls/msvcrt/tests/environ.c | 4 ++-- dlls/msvcrt/tests/locale.c | 2 +- dlls/msvcrt/tests/time.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 9aacac7..b0acc60 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -153,9 +153,8 @@ static void test___getmainargs(void) new_argv = *p___p___argv(); ok(new_argc == 4, "*__p___argc() = %d\n", new_argc); ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv); - }else { - win_skip("__p___argc or __p___argv is not available\n"); } + else skip("__p___argc or __p___argv is not available\n"); mode = 0; __getmainargs(&argc, &argv, &envp, 1, &mode); diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 11b79f0..b8e0ae6 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -97,7 +97,7 @@ static void test__environ(void) "Expected _environ pointers to be identical\n" ); } else - win_skip( "__p__environ() is not available\n" ); + skip( "__p__environ() is not available\n" ); if (p_get_environ) { @@ -163,7 +163,7 @@ static void test__wenviron(void) "Expected _wenviron pointers to be NULL\n" ); } else - win_skip( "__p__wenviron() is not available\n" ); + skip( "__p__wenviron() is not available\n" ); if (p_get_wenviron) { diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index ff77759..08abac0 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -759,7 +759,7 @@ static void test___mb_cur_max_func(void) /* for older Windows */ if (!p__p___mb_cur_max) - win_skip("Skipping __p___mb_cur_max tests\n"); + skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index e9edb57..2b1c781 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -577,7 +577,7 @@ static void test_daylight(void) if (!p___p__daylight) { - win_skip("__p__daylight not available\n"); + skip("__p__daylight not available\n"); return; } @@ -829,7 +829,7 @@ static void test__tzset(void) int ret; if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { - win_skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); return; }

1 0

Zebediah Figura : qcap/tests: Add more tests for aggregation.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 5e1ed74c9f749087f54f70d31f3f1b3809712c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e1ed74c9f749087f54f70d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:55 2019 -0500 qcap/tests: Add more tests for aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 103 ++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avico.c | 95 ++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avimux.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 301 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e1ed74c9f749087f54f…

1 0

Alexandre Julliard : davclnt: Build with msvcrt.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: fcd598940fa3d069be23e6cfbe7b04729bc3f1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd598940fa3d069be23e6cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:19:03 2019 +0200 davclnt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/davclnt/Makefile.in | 2 ++ dlls/davclnt/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in index 73af482..70dea6f 100644 --- a/dlls/davclnt/Makefile.in +++ b/dlls/davclnt/Makefile.in @@ -1,4 +1,6 @@ MODULE = davclnt.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 8e0bf84..485de92 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : dbgeng: Build with msvcrt.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 3fd3df9a09eec0ccd20c97de96c3748f9cf2e56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd3df9a09eec0ccd20c97de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:19:11 2019 +0200 dbgeng: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in index c2639c5..55600e2 100644 --- a/dlls/dbgeng/Makefile.in +++ b/dlls/dbgeng/Makefile.in @@ -2,4 +2,6 @@ MODULE = dbgeng.dll IMPORTLIB = dbgeng DELAYIMPORTS = version +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = dbgeng.c

1 0

Alexandre Julliard : msi/tests: Don't skip a 64-bit test on Wine.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 3b621e6d6d0db956864907bc7960cdd20428b033 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b621e6d6d0db956864907bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 15:04:21 2019 +0200 msi/tests: Don't skip a 64-bit test on Wine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7a515df..c0d67c3 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5642,7 +5642,7 @@ static void test_register_typelib(void) } /* UnregisterTypeLibraries action fails in 64-bit Windows <= 7 */ - if (sizeof(void *) == 8) + if (sizeof(void *) == 8 && strcmp( winetest_platform, "wine" )) { win_skip("broken on 64-bit Windows\n"); return;

1 0

Zebediah Figura : winebus.sys: Use the winebus driver to create all devices.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 50b9456e878f57d8c850282d77e74534c57a181e URL: https://source.winehq.org/git/wine.git/?a=commit;h=50b9456e878f57d8c850282d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 23:02:28 2019 -0500 winebus.sys: Use the winebus driver to create all devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 +--- dlls/winebus.sys/bus_iohid.c | 24 ++++++++---------------- dlls/winebus.sys/bus_sdl.c | 16 +++------------- dlls/winebus.sys/bus_udev.c | 10 ++-------- dlls/winebus.sys/main.c | 20 +++++++++++++------- 5 files changed, 27 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50b9456e878f57d8c850…

1 0

Alexandre Julliard : d3dx9: Build with msvcrt.
by Alexandre Julliard May 30, 2019

May 30, 2019

1 0