November 2021 - Wine-Commits

Hugh McMaster : kernelbase: Write NUL bytes to CPINFO.LeadByte for the CP_UTF7 and CP_UTF8 code pages.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 4b9010d538173cd6f03a9d5f2e5e4e1cdaedf9d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b9010d538173cd6f03a9d5f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 22 22:43:29 2021 +1100 kernelbase: Write NUL bytes to CPINFO.LeadByte for the CP_UTF7 and CP_UTF8 code pages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 12 ++++-------- dlls/kernelbase/locale.c | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4fb30eb5318..cad2577379b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3976,10 +3976,8 @@ static void test_GetCPInfo(void) ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); - ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); - ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); - for (i = 2; i < sizeof(cpinfo.LeadByte); i++) - todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); + for (i = 0; i < sizeof(cpinfo.LeadByte); i++) + ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); } @@ -3997,10 +3995,8 @@ static void test_GetCPInfo(void) ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); - ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); - ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); - for (i = 2; i < sizeof(cpinfo.LeadByte); i++) - todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); + for (i = 0; i < sizeof(cpinfo.LeadByte); i++) + ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, "expected 4, got %u\n", cpinfo.MaxCharSize); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 259b9d0d18e..10f3b2698b5 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3905,7 +3905,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCPInfo( UINT codepage, CPINFO *cpinfo ) case CP_UTF8: cpinfo->DefaultChar[0] = 0x3f; cpinfo->DefaultChar[1] = 0; - cpinfo->LeadByte[0] = cpinfo->LeadByte[1] = 0; + memset( cpinfo->LeadByte, 0, sizeof(cpinfo->LeadByte) ); cpinfo->MaxCharSize = (codepage == CP_UTF7) ? 5 : 4; break; default:

1 0

Paul Gofman : advapi32: Improve PerfSetCounterSetInfo() stub.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: ee8af8ff280389aa9188505e7c9a60c72d4e30dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8af8ff280389aa9188505e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 22 17:07:57 2021 +0300 advapi32: Improve PerfSetCounterSetInfo() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/perf.c | 39 ++++++++++++++++++++++++++++++++++ dlls/kernelbase/main.c | 52 +++++++++++++++++++++++++++++++++++++++++++--- include/perflib.h | 31 +++++++++++++++++++++++++++ include/winperf.h | 29 ++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c index 34fedd2b645..d76d6ddd44a 100644 --- a/dlls/advapi32/tests/perf.c +++ b/dlls/advapi32/tests/perf.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winerror.h" #include "perflib.h" +#include "winperf.h" #include "wine/test.h" @@ -35,7 +36,20 @@ static ULONG WINAPI test_provider_callback(ULONG code, void *buffer, ULONG size) void test_provider_init(void) { + static GUID test_set_guid = {0xdeadbeef, 0x0002, 0x0003, {0x0f, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00 ,0x0a}}; + static GUID test_set_guid2 = {0xdeadbeef, 0x0003, 0x0003, {0x0f, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00 ,0x0a}}; static GUID test_guid = {0xdeadbeef, 0x0001, 0x0002, {0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00 ,0x0a}}; + static struct + { + PERF_COUNTERSET_INFO counterset; + PERF_COUNTER_INFO counter; + } + pc_template = + { + {{0}}, + {1, PERF_COUNTER_COUNTER, PERF_ATTRIB_BY_REFERENCE, sizeof(PERF_COUNTER_INFO), PERF_DETAIL_NOVICE, 0, 0}, + }; + PERF_PROVIDER_CONTEXT prov_context; HANDLE prov, prov2; ULONG ret; @@ -76,6 +90,31 @@ void test_provider_init(void) bret = IsBadWritePtr(prov, 8); ok(!bret, "Handle does not point to the data.\n"); + pc_template.counterset.CounterSetGuid = test_set_guid; + pc_template.counterset.ProviderGuid = test_guid; + pc_template.counterset.NumCounters = 0; + pc_template.counterset.InstanceType = PERF_COUNTERSET_SINGLE_INSTANCE; + ret = PerfSetCounterSetInfo(prov, &pc_template.counterset, sizeof(pc_template.counterset)); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + pc_template.counterset.CounterSetGuid = test_set_guid; + pc_template.counterset.ProviderGuid = test_guid; + pc_template.counterset.NumCounters = 1; + pc_template.counterset.InstanceType = PERF_COUNTERSET_SINGLE_INSTANCE; + ret = PerfSetCounterSetInfo(prov, &pc_template.counterset, sizeof(pc_template)); + ok(!ret, "Got unexpected ret %u.\n", ret); + + pc_template.counterset.CounterSetGuid = test_set_guid2; + /* Looks like ProviderGuid doesn't need to match provider. */ + pc_template.counterset.ProviderGuid = test_set_guid; + pc_template.counterset.NumCounters = 1; + pc_template.counterset.InstanceType = PERF_COUNTERSET_SINGLE_INSTANCE; + ret = PerfSetCounterSetInfo(prov, &pc_template.counterset, sizeof(pc_template)); + ok(!ret, "Got unexpected ret %u.\n", ret); + + ret = PerfSetCounterSetInfo(prov, &pc_template.counterset, sizeof(pc_template)); + ok(ret == ERROR_ALREADY_EXISTS, "Got unexpected ret %u.\n", ret); + ret = PerfStopProvider(prov); ok(!ret, "Got unexpected ret %u.\n", ret); diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index d468c84f619..403c0cf6cd2 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -154,10 +154,18 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po return ERROR_SUCCESS; } +struct counterset_template +{ + PERF_COUNTERSET_INFO counterset; + PERF_COUNTER_INFO counter[1]; +}; + struct perf_provider { GUID guid; PERFLIBREQUEST callback; + struct counterset_template **countersets; + unsigned int counterset_count; }; static struct perf_provider *perf_provider_from_handle(HANDLE prov) @@ -187,10 +195,44 @@ ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block /*********************************************************************** * PerfSetCounterSetInfo (KERNELBASE.@) */ -ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +ULONG WINAPI PerfSetCounterSetInfo( HANDLE handle, PERF_COUNTERSET_INFO *template, ULONG size ) { - FIXME("%p %p %u: stub\n", handle, template, size); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov = perf_provider_from_handle( handle ); + struct counterset_template **new_array; + struct counterset_template *new; + unsigned int i; + + FIXME( "handle %p, template %p, size %u semi-stub.\n", handle, template, size ); + + if (!prov || !template) return ERROR_INVALID_PARAMETER; + if (!template->NumCounters) return ERROR_INVALID_PARAMETER; + if (size < sizeof(*template) || (size - (sizeof(*template))) / sizeof(PERF_COUNTER_INFO) < template->NumCounters) + return ERROR_INVALID_PARAMETER; + + for (i = 0; i < prov->counterset_count; ++i) + { + if (IsEqualGUID( &template->CounterSetGuid, &prov->countersets[i]->counterset.CounterSetGuid )) + return ERROR_ALREADY_EXISTS; + } + + size = offsetof( struct counterset_template, counter[template->NumCounters] ); + if (!(new = heap_alloc( size ))) return ERROR_OUTOFMEMORY; + + if (prov->counterset_count) + new_array = heap_realloc( prov->countersets, sizeof(*prov->countersets) * (prov->counterset_count + 1) ); + else + new_array = heap_alloc( sizeof(*prov->countersets) ); + + if (!new_array) + { + heap_free( new ); + return ERROR_OUTOFMEMORY; + } + memcpy( new, template, size ); + new_array[prov->counterset_count++] = new; + prov->countersets = new_array; + + return STATUS_SUCCESS; } /*********************************************************************** @@ -245,9 +287,13 @@ ULONG WINAPI PerfStartProviderEx( GUID *guid, PERF_PROVIDER_CONTEXT *context, HA ULONG WINAPI PerfStopProvider(HANDLE handle) { struct perf_provider *prov = perf_provider_from_handle( handle ); + unsigned int i; TRACE( "handle %p.\n", handle ); + for (i = 0; i < prov->counterset_count; ++i) + heap_free( prov->countersets[i] ); + heap_free( prov->countersets ); heap_free( prov ); return STATUS_SUCCESS; } diff --git a/include/perflib.h b/include/perflib.h index 47bc0716541..5a2a1162ae7 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -34,6 +34,19 @@ typedef struct _PERF_COUNTERSET_INFO { ULONG InstanceType; } PERF_COUNTERSET_INFO, * PPERF_COUNTERSET_INFO; +/* PERF_COUNTERSET_INFO InstanceType values. */ +#define PERF_COUNTERSET_FLAG_MULTIPLE 0x00000002 +#define PERF_COUNTERSET_FLAG_AGGREGATE 0x00000004 +#define PERF_COUNTERSET_FLAG_HISTORY 0x00000008 +#define PERF_COUNTERSET_FLAG_INSTANCE 0x00000010 + +#define PERF_COUNTERSET_SINGLE_INSTANCE 0 +#define PERF_COUNTERSET_MULTI_INSTANCES PERF_COUNTERSET_FLAG_MULTIPLE +#define PERF_COUNTERSET_SINGLE_AGGREGATE PERF_COUNTERSET_FLAG_AGGREGATE +#define PERF_COUNTERSET_MULTI_AGGREGATE (PERF_COUNTERSET_FLAG_AGGREGATE | PERF_COUNTERSET_FLAG_MULTIPLE) +#define PERF_COUNTERSET_SINGLE_AGGREGATE_HISTORY (PERF_COUNTERSET_FLAG_HISTORY | PERF_COUNTERSET_SINGLE_AGGREGATE) +#define PERF_COUNTERSET_INSTANCE_AGGREGATE (PERF_COUNTERSET_MULTI_AGGREGATE | PERF_COUNTERSET_FLAG_INSTANCE) + typedef struct _PERF_COUNTERSET_INSTANCE { GUID CounterSetGuid; ULONG dwSize; @@ -42,6 +55,23 @@ typedef struct _PERF_COUNTERSET_INSTANCE { ULONG InstanceNameSize; } PERF_COUNTERSET_INSTANCE, * PPERF_COUNTERSET_INSTANCE; +typedef struct _PERF_COUNTER_INFO { + ULONG CounterId; + ULONG Type; + ULONGLONG Attrib; + ULONG Size; + ULONG DetailLevel; + LONG Scale; + ULONG Offset; +} PERF_COUNTER_INFO, *PPERF_COUNTER_INFO; + +/* PERF_COUNTER_INFO Attrib flags. */ +#define PERF_ATTRIB_BY_REFERENCE 0x00000001 +#define PERF_ATTRIB_NO_DISPLAYABLE 0x00000002 +#define PERF_ATTRIB_NO_GROUP_SEPARATOR 0x00000004 +#define PERF_ATTRIB_DISPLAY_AS_REAL 0x00000008 +#define PERF_ATTRIB_DISPLAY_AS_HEX 0x00000010 + typedef struct _PROVIDER_CONTEXT { DWORD ContextSize; DWORD Reserved; @@ -51,6 +81,7 @@ typedef struct _PROVIDER_CONTEXT { LPVOID pMemContext; } PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; +ULONG WINAPI PerfSetCounterSetInfo(HANDLE, PERF_COUNTERSET_INFO *, ULONG); ULONG WINAPI PerfStartProvider(GUID *, PERFLIBREQUEST, HANDLE *); ULONG WINAPI PerfStartProviderEx(GUID *, PERF_PROVIDER_CONTEXT *, HANDLE *); ULONG WINAPI PerfStopProvider(HANDLE); diff --git a/include/winperf.h b/include/winperf.h index 113bfbae40f..926da8f8c4a 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -161,6 +161,35 @@ typedef struct _PERF_COUNTER_BLOCK DWORD ByteLength; } PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK; +#define PERF_COUNTER_VALUE 0x00000000 +#define PERF_COUNTER_RATE 0x00010000 +#define PERF_COUNTER_FRACTION 0x00020000 +#define PERF_COUNTER_BASE 0x00030000 +#define PERF_COUNTER_ELAPSED 0x00040000 +#define PERF_COUNTER_QUEUELEN 0x00050000 +#define PERF_COUNTER_HISTOGRAM 0x00060000 +#define PERF_COUNTER_PRECISION 0x00070000 + +#define PERF_TEXT_UNICODE 0x00000000 +#define PERF_TEXT_ASCII 0x00010000 + +#define PERF_TIMER_TICK 0x00000000 +#define PERF_TIMER_100NS 0x00100000 +#define PERF_OBJECT_TIMER 0x00200000 + +#define PERF_DELTA_COUNTER 0x00400000 +#define PERF_DELTA_BASE 0x00800000 +#define PERF_INVERSE_COUNTER 0x01000000 +#define PERF_MULTI_COUNTER 0x02000000 + +#define PERF_DISPLAY_NO_SUFFIX 0x00000000 +#define PERF_DISPLAY_PER_SEC 0x10000000 +#define PERF_DISPLAY_PERCENT 0x20000000 +#define PERF_DISPLAY_SECONDS 0x30000000 +#define PERF_DISPLAY_NOSHOW 0x40000000 + +#define PERF_COUNTER_COUNTER (PERF_SIZE_DWORD | PERF_TYPE_COUNTER | PERF_COUNTER_RATE | \ + PERF_TIMER_TICK | PERF_DELTA_COUNTER | PERF_DISPLAY_PER_SEC) #include <poppack.h>

1 0

Paul Gofman : advapi32: Improve perflib provider registration stubs.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: e843605b238a754c819f0a1f80242ee7f35deda1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e843605b238a754c819f0a1f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 22 17:07:56 2021 +0300 advapi32: Improve perflib provider registration stubs. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/Makefile.in | 1 + dlls/advapi32/tests/perf.c | 100 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/main.c | 49 ++++++++++++++++---- include/perflib.h | 4 ++ 4 files changed, 146 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 12583e59f57..2e9b007a91f 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c new file mode 100644 index 00000000000..34fedd2b645 --- /dev/null +++ b/dlls/advapi32/tests/perf.c @@ -0,0 +1,100 @@ +/* + * Unit tests for Perflib functions + * + * Copyright (c) 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "perflib.h" + +#include "wine/test.h" + +static ULONG WINAPI test_provider_callback(ULONG code, void *buffer, ULONG size) +{ + ok(0, "Provider callback called.\n"); + return ERROR_SUCCESS; +} + +void test_provider_init(void) +{ + static GUID test_guid = {0xdeadbeef, 0x0001, 0x0002, {0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00 ,0x0a}}; + PERF_PROVIDER_CONTEXT prov_context; + HANDLE prov, prov2; + ULONG ret; + BOOL bret; + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(NULL, test_provider_callback, &prov); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(&test_guid, test_provider_callback, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(&test_guid, test_provider_callback, &prov); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov != (HANDLE)0xdeadbeef, "Provider handle is not set.\n"); + + prov2 = prov; + ret = PerfStartProvider(&test_guid, test_provider_callback, &prov2); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov2 != prov, "Got the same provider handle.\n"); + + ret = PerfStopProvider(prov2); + ok(!ret, "Got unexpected ret %u.\n", ret); + + if (0) + { + /* Access violation on Windows. */ + PerfStopProvider(prov2); + } + + /* Provider handle is a pointer and not a kernel object handle. */ + bret = DuplicateHandle(GetCurrentProcess(), prov, GetCurrentProcess(), &prov2, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(!bret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected bret %d, err %u.\n", bret, GetLastError()); + bret = IsBadWritePtr(prov, 8); + ok(!bret, "Handle does not point to the data.\n"); + + ret = PerfStopProvider(prov); + ok(!ret, "Got unexpected ret %u.\n", ret); + + memset( &prov_context, 0, sizeof(prov_context) ); + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProviderEx( &test_guid, &prov_context, &prov ); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov_context.ContextSize = sizeof(prov_context) + 1; + ret = PerfStartProviderEx( &test_guid, &prov_context, &prov ); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov != (HANDLE)0xdeadbeef, "Provider handle is not set.\n"); + + ret = PerfStopProvider(prov); + ok(!ret, "Got unexpected ret %u.\n", ret); +} + +START_TEST(perf) +{ + test_provider_init(); +} diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index e6cf892a4dc..d468c84f619 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -154,6 +154,17 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po return ERROR_SUCCESS; } +struct perf_provider +{ + GUID guid; + PERFLIBREQUEST callback; +}; + +static struct perf_provider *perf_provider_from_handle(HANDLE prov) +{ + return (struct perf_provider *)prov; +} + /*********************************************************************** * PerfCreateInstance (KERNELBASE.@) */ @@ -195,19 +206,37 @@ ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE i /*********************************************************************** * PerfStartProvider (KERNELBASE.@) */ -ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +ULONG WINAPI PerfStartProvider( GUID *guid, PERFLIBREQUEST callback, HANDLE *provider ) { - FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); - return ERROR_CALL_NOT_IMPLEMENTED; + PERF_PROVIDER_CONTEXT ctx; + + FIXME( "guid %s, callback %p, provider %p semi-stub.\n", debugstr_guid(guid), callback, provider ); + + memset( &ctx, 0, sizeof(ctx) ); + ctx.ContextSize = sizeof(ctx); + ctx.ControlCallback = callback; + + return PerfStartProviderEx( guid, &ctx, provider ); } /*********************************************************************** * PerfStartProviderEx (KERNELBASE.@) */ -ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +ULONG WINAPI PerfStartProviderEx( GUID *guid, PERF_PROVIDER_CONTEXT *context, HANDLE *provider ) { - FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov; + + FIXME( "guid %s, context %p, provider %p semi-stub.\n", debugstr_guid(guid), context, provider ); + + if (!guid || !context || !provider) return ERROR_INVALID_PARAMETER; + if (context->ContextSize < sizeof(*context)) return ERROR_INVALID_PARAMETER; + + if (!(prov = heap_alloc_zero( sizeof(*prov) ))) return ERROR_OUTOFMEMORY; + memcpy( &prov->guid, guid, sizeof(prov->guid) ); + prov->callback = context->ControlCallback; + *provider = prov; + + return STATUS_SUCCESS; } /*********************************************************************** @@ -215,8 +244,12 @@ ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HAN */ ULONG WINAPI PerfStopProvider(HANDLE handle) { - FIXME("%p: stub\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov = perf_provider_from_handle( handle ); + + TRACE( "handle %p.\n", handle ); + + heap_free( prov ); + return STATUS_SUCCESS; } /*********************************************************************** diff --git a/include/perflib.h b/include/perflib.h index 2d3f6efb419..47bc0716541 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -51,6 +51,10 @@ typedef struct _PROVIDER_CONTEXT { LPVOID pMemContext; } PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; +ULONG WINAPI PerfStartProvider(GUID *, PERFLIBREQUEST, HANDLE *); +ULONG WINAPI PerfStartProviderEx(GUID *, PERF_PROVIDER_CONTEXT *, HANDLE *); +ULONG WINAPI PerfStopProvider(HANDLE); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Eric Pouech : dbghelp: Fix allocation error in image_load_debugaltlink.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 789512beee9e8e88b2e185ca5ff89fe49ba8703a URL: https://source.winehq.org/git/wine.git/?a=commit;h=789512beee9e8e88b2e185ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:54 2021 +0100 dbghelp: Fix allocation error in image_load_debugaltlink. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 363f6314b22..73243d80da5 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -671,9 +671,9 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru */ sect_len = image_get_map_size(&debugaltlink_sect); id = memchr(data, '\0', sect_len); - if (id) + if (id++) { - id++; + unsigned idlen = (const BYTE*)data + sect_len - id; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); if (fmap_link) { @@ -691,7 +691,8 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/','.','b','u','i','l','d','-','i','d','/'}; - dst = HeapAlloc(GetProcessHeap(), 0, sizeof(globalDebugDirW) + (3 + filename_len) * sizeof(WCHAR)); + dst = HeapAlloc(GetProcessHeap(), 0, + sizeof(globalDebugDirW) + (3 + filename_len + idlen * 2) * sizeof(WCHAR)); if (dst) { WCHAR* p;

1 0

Huw Davies : winecoreaudio: Use the presence of stream to indicate the init state.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: d5361a8b470d37a8ffc05cd0b3984eefa938c301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5361a8b470d37a8ffc05cd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:36 2021 +0000 winecoreaudio: Use the presence of stream to indicate the init state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 211 +++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5361a8b470d37a8ffc0…

1 0

Huw Davies : winecoreaudio: Pass the stream separately to ca_setvol().
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 3599e011404824f0a8f863e6401aa193e5f25ca3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3599e011404824f0a8f863e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 18 07:52:35 2021 +0000 winecoreaudio: Pass the stream separately to ca_setvol(). This is a temporary measure that will enable the client volumes to be initialized without having the stream set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index abe77d11ee9..1e678b08c5b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -178,7 +178,7 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, UINT32 index); +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -1382,7 +1382,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, -1); + ca_setvol(This, This->stream, -1); This->initted = TRUE; @@ -2978,7 +2978,7 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = }; /* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, UINT32 index) +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) { Float32 level; OSStatus sc; @@ -2989,7 +2989,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->stream->fmt->nChannels; ++i){ + for(i = 0; i < stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -3000,7 +3000,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3015,7 +3015,7 @@ static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ HRESULT hr; - hr = ca_setvol(client, index); + hr = ca_setvol(client, client->stream, index); if(FAILED(hr)) ret = hr; } @@ -3214,7 +3214,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, index); + ret = ca_setvol(This, This->stream, index); LeaveCriticalSection(&g_sessions_lock); @@ -3259,7 +3259,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, -1); + ret = ca_setvol(This, This->stream, -1); LeaveCriticalSection(&g_sessions_lock);

1 0

Zebediah Figura : gdi32/tests: Test whether D3DKMTDestroyDCFromMemory() frees the DC memory.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: c1ed24c86e1740913814cedf8cd267c60b6a38f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1ed24c86e1740913814cedf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 19 18:30:50 2021 -0600 gdi32/tests: Test whether D3DKMTDestroyDCFromMemory() frees the DC memory. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0293d881fd9..a244414660b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5686,10 +5686,12 @@ static void test_D3DKMTCreateDCFromMemory( void ) { D3DKMT_DESTROYDCFROMMEMORY destroy_desc; D3DKMT_CREATEDCFROMMEMORY create_desc; + MEMORY_BASIC_INFORMATION memory_info; unsigned int width_bytes; unsigned int i, x, y, z; DWORD expected, colour; BYTE data[12][48]; + void *alloc_data; NTSTATUS status; HGDIOBJ *bitmap; DIBSECTION dib; @@ -5939,6 +5941,39 @@ static void test_D3DKMTCreateDCFromMemory( void ) DeleteObject( SelectObject( bmp_dc, bmp ) ); DeleteDC( bmp_dc ); } + + alloc_data = VirtualAlloc( NULL, 4096, MEM_COMMIT, PAGE_READWRITE ); + ok(!!alloc_data, "Failed to allocate memory, error %u.\n", GetLastError()); + + create_desc.pMemory = alloc_data; + create_desc.Format = D3DDDIFMT_A8R8G8B8; + create_desc.Width = 16; + create_desc.Height = 16; + create_desc.Pitch = 16 * 4; + create_desc.hDeviceDc = CreateCompatibleDC( NULL ); + create_desc.pColorTable = NULL; + + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(!status, "Got unexpected status %#x.\n", status); + + size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); + ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); + ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + + destroy_desc.hDc = create_desc.hDc; + destroy_desc.hBitmap = create_desc.hBitmap; + + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(!status, "Got unexpected status %#x.\n", status); + + size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); + ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); + todo_wine ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + todo_wine ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + + ret = VirtualFree( alloc_data, 0, MEM_RELEASE ); + todo_wine ok(ret, "Failed to free memory, error %u.\n", GetLastError()); } START_TEST(bitmap)

1 0

Eric Pouech : dbghelp: In SymEnumerateLoadedModules, don't limit the number of modules.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: f10635ab08e43853ce7a577286822399da92bece URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10635ab08e43853ce7a5772… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:40 2021 +0100 dbghelp: In SymEnumerateLoadedModules, don't limit the number of modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8119f941e2a..363f6314b22 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1249,6 +1249,12 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, HeapFree(GetProcessHeap(), 0, hMods); return FALSE; } + if (sz > 256 * sizeof(hMods[0])) + { + hMods = HeapReAlloc(GetProcessHeap(), 0, hMods, sz); + if (!hMods || !EnumProcessModules(hProcess, hMods, sz, &sz)) + return FALSE; + } sz /= sizeof(HMODULE); for (i = 0; i < sz; i++) {

1 0

Nikolay Sivov : mf/tests: Attempt to fix test crashes on some test boxes.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 42c570f7be2cea4b62d42fa8b436b7365477c49a URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c570f7be2cea4b62d42fa8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 21 22:06:45 2021 +0300 mf/tests: Attempt to fix test crashes on some test boxes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb681a8b9a7..0d4cb05711a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4498,15 +4498,18 @@ todo_wine { hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, - (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFVideoSampleAllocator_Release(allocator); + if (SUCCEEDED(hr)) + { + hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, + (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoSampleAllocator_Release(allocator); - hr = IMFMediaSink_RemoveStreamSink(sink, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_RemoveStreamSink(sink, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFStreamSink_Release(stream_sink2); + IMFStreamSink_Release(stream_sink2); + } hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Eric Pouech : dbghelp: Remove incorrect FIXME in SymEnumerateLoadedModules.
by Alexandre Julliard Nov. 22, 2021

Nov. 22, 2021

Module: wine Branch: master Commit: 4cc7a3ba905f0cb10daa7eaec0bea2c955becc33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc7a3ba905f0cb10daa7eae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:20:27 2021 +0100 dbghelp: Remove incorrect FIXME in SymEnumerateLoadedModules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 1b64bb57eb7..8119f941e2a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1246,7 +1246,6 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, if (!EnumProcessModules(hProcess, hMods, 256 * sizeof(hMods[0]), &sz)) { /* hProcess should also be a valid process handle !! */ - FIXME("If this happens, bump the number in mod\n"); HeapFree(GetProcessHeap(), 0, hMods); return FALSE; }

1 0