[PATCH v22 8/8] kernelbase: Check for PERF_SIZE_LARGE in PerfSetULongLongCounterValue and PerfSetULongCounterValue

[Lorenzo Ferrillo]

From: Lorenzo Ferrillo

Should be setted for SetULongULong function and unsetted fo SetULong one, as test shown.
---
 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 409ebff95d5..f46eca1397a 100644
--- a/dlls/advapi32/tests/perf.c
+++ b/dlls/advapi32/tests/perf.c
@@ -265,9 +265,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);
@@ -315,9 +315,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 0313b0406e1..ce6e0d8d5f5 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"
@@ -361,6 +362,7 @@ ULONG WINAPI PerfSetULongCounterValue(HANDLE provider, PERF_COUNTERSET_INSTANCE

if (counter == NULL) return ERROR_NOT_FOUND;
     if (counter->Attrib & PERF_ATTRIB_BY_REFERENCE) return ERROR_INVALID_PARAMETER;
+    if (counter->Type & PERF_SIZE_LARGE) return ERROR_INVALID_PARAMETER;

*(ULONG*)((BYTE *)&inst->instance + sizeof(PERF_COUNTERSET_INSTANCE) + counter->Offset) = value;

@@ -386,6 +388,7 @@ ULONG WINAPI PerfSetULongLongCounterValue(HANDLE provider, PERF_COUNTERSET_INSTA

if (counter == NULL) return ERROR_NOT_FOUND;
     if (counter->Attrib & PERF_ATTRIB_BY_REFERENCE) return ERROR_INVALID_PARAMETER;
+    if (!(counter->Type & PERF_SIZE_LARGE)) return ERROR_INVALID_PARAMETER;

*(ULONGLONG*)((BYTE *)&inst->instance + sizeof(PERF_COUNTERSET_INSTANCE) + counter->Offset) = value;