[PATCH v16 7/7] kernelbase: Check for PERF_SIZE_LARGE in PerfSetULongLongCounterValue and PerfSetULongCounterValue

[Lorenzo Ferrillo]

From: Lorenzo Ferrillo

Cannot check for PERF_SIZE_DWORD as it have a value of 0x0

v2: Fix test failure
Signed-off-by: Lorenzo Ferrillo 
---
 dlls/advapi32/tests/perf.c | 8 ++++----
 dlls/kernelbase/main.c     | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c
index b237b15bc84..b2727d2ea4e 100644
--- a/dlls/advapi32/tests/perf.c
+++ b/dlls/advapi32/tests/perf.c
@@ -266,9 +266,9 @@ void test_provider_init(void)

/*Cannot be used with PERF_SIZE_DWORD*/
     ret = PerfSetULongLongCounterValue(prov, instance, 1, 900000L);
-    todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);
     ret = PerfSetULongLongCounterValue(prov, instance, 2, 666L);
-    todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);

ret = PerfSetULongLongCounterValue(prov, instance, 0, 42);
     ok(ret == ERROR_NOT_FOUND, "Got unexpected ret %lu.\n", ret);
@@ -316,9 +316,9 @@ void test_provider_init(void)

/* Don't work on PERF_SIZE_LARGE */
     ret = PerfSetULongCounterValue(prov, instance, 1, 666L);
-    todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);
     ret = PerfSetULongCounterValue(prov, instance, 2, 900000L);
-    todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %lu.\n", ret);

ret = PerfDeleteInstance(prov, instance);
     ok(!ret, "Got unexpected ret %lu.\n", ret);
diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
index 036d14bc5dc..ad54f55d09f 100644
--- a/dlls/kernelbase/main.c
+++ b/dlls/kernelbase/main.c
@@ -26,6 +26,7 @@
 #include "shlwapi.h"
 #include "perflib.h"
 #include "winternl.h"
+#include "winperf.h"

#include "wine/debug.h"
 #include "kernelbase.h"
@@ -355,6 +356,7 @@ ULONG WINAPI PerfSetULongCounterValue(HANDLE provider, PERF_COUNTERSET_INSTANCE

if (i == template->counterset.NumCounters) return ERROR_NOT_FOUND;
     if (template->counter[i].Attrib & PERF_ATTRIB_BY_REFERENCE) return ERROR_INVALID_PARAMETER;
+    if (template->counter[i].Type & PERF_SIZE_LARGE) return ERROR_INVALID_PARAMETER;

*(ULONG*)((BYTE *)&inst->instance + sizeof(PERF_COUNTERSET_INSTANCE) + template->counter[i].Offset) = value;

@@ -384,6 +386,7 @@ ULONG WINAPI PerfSetULongLongCounterValue(HANDLE provider, PERF_COUNTERSET_INSTA
         if (template->counter[i].CounterId == counterid) break;
     if (i == template->counterset.NumCounters) return ERROR_NOT_FOUND;
     if (template->counter[i].Attrib & PERF_ATTRIB_BY_REFERENCE) return ERROR_INVALID_PARAMETER;
+    if (!(template->counter[i].Type & PERF_SIZE_LARGE)) return ERROR_INVALID_PARAMETER;

*(ULONGLONG*)((BYTE *)&inst->instance + sizeof(PERF_COUNTERSET_INSTANCE) + template->counter[i].Offset) = value;