July 2018 - Wine-devel - list.winehq.org

[PATCH 5/7] advapi32: Performance providers' Open() expects to see the configured name as its parameter.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/registry.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index ac75e7b577..ce56b5aad5 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1485,6 +1485,7 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, struct perf_provider { HMODULE perflib; + WCHAR linkage[MAX_PATH]; PM_OPEN_PROC *pOpen; PM_CLOSE_PROC *pClose; PM_COLLECT_PROC *pCollect; @@ -1510,6 +1511,8 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr { static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; + static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 }; + static const WCHAR exportW[] = { 'E','x','p','o','r','t',0 }; WCHAR buf[MAX_PATH], buf2[MAX_PATH]; DWORD err, type, len; HKEY service, perf; @@ -1518,6 +1521,21 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr if (err != ERROR_SUCCESS) return FALSE; + provider->linkage[0] = 0; + err = RegOpenKeyExW(service, linkageW, 0, KEY_READ, &perf); + if (err == ERROR_SUCCESS) + { + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, exportW, NULL, &type, (BYTE *)buf, &len); + if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ)) + { + memcpy(provider->linkage, buf, len); + provider->linkage[len / sizeof(WCHAR)] = 0; + TRACE("Export: %s\n", debugstr_w(provider->linkage)); + } + RegCloseKey(perf); + } + err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf); RegCloseKey(service); if (err != ERROR_SUCCESS) @@ -1564,12 +1582,13 @@ error: static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) { + WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL; DWORD err; - err = provider->pOpen(NULL); + err = provider->pOpen(linkage); if (err != ERROR_SUCCESS) { - TRACE("Open error %u (%#x)\n", err, err); + TRACE("Open(%s) error %u (%#x)\n", debugstr_w(linkage), err, err); return err; } -- 2.17.1

1 0

[PATCH 3/7] advapi32: Add initial support for querying performance counters data.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/registry.c | 244 ++++++++++++++++++++++++++++++++- dlls/advapi32/tests/registry.c | 17 +-- 2 files changed, 249 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 087d47f772..ac75e7b577 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2,6 +2,7 @@ * Registry management * * Copyright (C) 1999 Alexandre Julliard + * Copyright (C) 2017 Dmitry Timoshkov * * Based on misc/registry.c code * Copyright (C) 1996 Marcus Meissner @@ -36,6 +37,7 @@ #include "winreg.h" #include "winerror.h" #include "winternl.h" +#include "winperf.h" #include "winuser.h" #include "sddl.h" #include "advapi32_misc.h" @@ -1480,6 +1482,234 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, return ret; } +struct perf_provider +{ + HMODULE perflib; + PM_OPEN_PROC *pOpen; + PM_CLOSE_PROC *pClose; + PM_COLLECT_PROC *pCollect; +}; + +static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name) +{ + char buf[MAX_PATH]; + DWORD err, type, len; + + len = sizeof(buf) - 1; + err = RegQueryValueExA(perf, name, NULL, &type, (BYTE *)buf, &len); + if (err != ERROR_SUCCESS || type != REG_SZ) + return NULL; + + buf[len] = 0; + TRACE("Loading function pointer for %s: %s\n", name, debugstr_a(buf)); + + return GetProcAddress(perflib, buf); +} + +static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider) +{ + static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 }; + static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 }; + WCHAR buf[MAX_PATH], buf2[MAX_PATH]; + DWORD err, type, len; + HKEY service, perf; + + err = RegOpenKeyExW(root, name, 0, KEY_READ, &service); + if (err != ERROR_SUCCESS) + return FALSE; + + err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf); + RegCloseKey(service); + if (err != ERROR_SUCCESS) + return FALSE; + + len = sizeof(buf) - sizeof(WCHAR); + err = RegQueryValueExW(perf, libraryW, NULL, &type, (BYTE *)buf, &len); + if (err != ERROR_SUCCESS || !(type == REG_SZ || type == REG_EXPAND_SZ)) + goto error; + + buf[len / sizeof(WCHAR)] = 0; + if (type == REG_EXPAND_SZ) + { + len = ExpandEnvironmentStringsW(buf, buf2, MAX_PATH); + if (!len || len > MAX_PATH) goto error; + strcpyW(buf, buf2); + } + + if (!(provider->perflib = LoadLibraryW(buf))) + { + WARN("Failed to load %s\n", debugstr_w(buf)); + goto error; + } + + GetModuleFileNameW(provider->perflib, buf, MAX_PATH); + TRACE("Loaded provider %s\n", wine_dbgstr_w(buf)); + + provider->pOpen = get_provider_entry(perf, provider->perflib, "Open"); + provider->pClose = get_provider_entry(perf, provider->perflib, "Close"); + provider->pCollect = get_provider_entry(perf, provider->perflib, "Collect"); + if (provider->pOpen && provider->pClose && provider->pCollect) + { + RegCloseKey(perf); + return TRUE; + } + + TRACE("Provider is missing required exports\n"); + FreeLibrary(provider->perflib); + +error: + RegCloseKey(perf); + return FALSE; +} + +static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count) +{ + DWORD err; + + err = provider->pOpen(NULL); + if (err != ERROR_SUCCESS) + { + TRACE("Open error %u (%#x)\n", err, err); + return err; + } + + *obj_count = 0; + err = provider->pCollect((WCHAR *)query, data, size, obj_count); + if (err != ERROR_SUCCESS) + { + TRACE("Collect error %u (%#x)\n", err, err); + *obj_count = 0; + } + + provider->pClose(); + return err; +} + +#define MAX_SERVICE_NAME 260 + +static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD *ret_size) +{ + static const WCHAR SZ_SERVICES_KEY[] = { 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'S','e','r','v','i','c','e','s',0 }; + DWORD err, i, data_size; + HKEY root; + PERF_DATA_BLOCK *pdb; + + if (!ret_size) + return ERROR_INVALID_PARAMETER; + + data_size = *ret_size; + *ret_size = 0; + + if (type) + *type = REG_BINARY; + + if (!data || data_size < sizeof(*pdb)) + return ERROR_MORE_DATA; + + pdb = data; + + pdb->Signature[0] = 'P'; + pdb->Signature[1] = 'E'; + pdb->Signature[2] = 'R'; + pdb->Signature[3] = 'F'; +#ifdef WORDS_BIGENDIAN + pdb->LittleEndian = FALSE; +#else + pdb->LittleEndian = TRUE; +#endif + pdb->Version = PERF_DATA_VERSION; + pdb->Revision = PERF_DATA_REVISION; + pdb->TotalByteLength = 0; + pdb->HeaderLength = sizeof(*pdb); + pdb->NumObjectTypes = 0; + pdb->DefaultObject = 0; + QueryPerformanceCounter(&pdb->PerfTime); + QueryPerformanceFrequency(&pdb->PerfFreq); + + data = pdb + 1; + pdb->SystemNameOffset = sizeof(*pdb); + pdb->SystemNameLength = (data_size - sizeof(*pdb)) / sizeof(WCHAR); + if (!GetComputerNameW(data, &pdb->SystemNameLength)) + return ERROR_MORE_DATA; + + pdb->SystemNameLength++; + pdb->SystemNameLength *= sizeof(WCHAR); + + pdb->HeaderLength += pdb->SystemNameLength; + + /* align to 8 bytes */ + if (pdb->SystemNameLength & 7) + pdb->HeaderLength += 8 - (pdb->SystemNameLength & 7); + + if (data_size < pdb->HeaderLength) + return ERROR_MORE_DATA; + + pdb->TotalByteLength = pdb->HeaderLength; + + data_size -= pdb->HeaderLength; + data = (char *)data + pdb->HeaderLength; + + err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, KEY_READ, &root); + if (err != ERROR_SUCCESS) + return err; + + i = 0; + for (;;) + { + DWORD collected_size = data_size, obj_count = 0; + struct perf_provider provider; + WCHAR name[MAX_SERVICE_NAME]; + void *collected_data = data; + + err = RegEnumKeyW(root, i++, name, MAX_SERVICE_NAME); + if (err == ERROR_NO_MORE_ITEMS) + { + err = ERROR_SUCCESS; + break; + } + + if (err != ERROR_SUCCESS) + continue; + + if (!load_provider(root, name, &provider)) + continue; + + err = collect_data(&provider, query, &collected_data, &collected_size, &obj_count); + FreeLibrary(provider.perflib); + + if (err == ERROR_MORE_DATA) + break; + + if (err == ERROR_SUCCESS) + { + PERF_OBJECT_TYPE *obj = (PERF_OBJECT_TYPE *)data; + + TRACE("Collect: obj->TotalByteLength %u, collected_size %u\n", + obj->TotalByteLength, collected_size); + + data_size -= collected_size; + data = collected_data; + + pdb->TotalByteLength += collected_size; + pdb->NumObjectTypes += obj_count; + } + } + + RegCloseKey(root); + + if (err == ERROR_SUCCESS) + { + *ret_size = pdb->TotalByteLength; + + GetSystemTime(&pdb->SystemTime); + GetSystemTimeAsFileTime((FILETIME *)&pdb->PerfTime100nSec); + } + + return err; +} + /****************************************************************************** * RegQueryValueExW [ADVAPI32.@] * @@ -1500,6 +1730,10 @@ LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDW (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + + if (hkey == HKEY_PERFORMANCE_DATA) + return query_perf_data(name, type, data, count); + if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; RtlInitUnicodeString( &name_str, name ); @@ -1590,7 +1824,8 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; + if (hkey != HKEY_PERFORMANCE_DATA && !(hkey = get_special_root_hkey( hkey, 0 ))) + return ERROR_INVALID_HANDLE; if (count) datalen = *count; if (!data && count) *count = 0; @@ -1602,6 +1837,13 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) return RtlNtStatusToDosError(status); + if (hkey == HKEY_PERFORMANCE_DATA) + { + DWORD ret = query_perf_data( nameW.Buffer, type, data, count ); + RtlFreeUnicodeString( &nameW ); + return ret; + } + status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, sizeof(buffer), &total_size ); if (status && status != STATUS_BUFFER_OVERFLOW) goto done; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1573b6c03b..5e3535354c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3652,10 +3652,10 @@ static void test_RegQueryValueExPerformanceData(void) /* Test with data == NULL */ dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); - todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData ); - todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); /* Test ERROR_MORE_DATA, start with small buffer */ len = 10; @@ -3663,8 +3663,7 @@ static void test_RegQueryValueExPerformanceData(void) cbData = len; type = 0xdeadbeef; dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); - todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); -todo_wine + ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); ok(type == REG_BINARY, "got %u\n", type); while( dwret == ERROR_MORE_DATA && limit) { @@ -3677,14 +3676,13 @@ todo_wine } ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); - todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); -todo_wine + ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); ok(type == REG_BINARY, "got %u\n", type); /* Check returned data */ if (dwret == ERROR_SUCCESS) { - todo_wine ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); + ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); if (len >= sizeof(PERF_DATA_BLOCK)) { pdb = (PERF_DATA_BLOCK*) value; ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]); @@ -3701,13 +3699,11 @@ todo_wine { cbData = 0xdeadbeef; dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); -todo_wine ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); ok(cbData == 0, "got %u\n", cbData); cbData = 0; dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); -todo_wine ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); ok(cbData == 0, "got %u\n", cbData); @@ -3740,9 +3736,7 @@ todo_wine type = 0xdeadbeef; cbData = sizeof(buf); dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData); -todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); -todo_wine ok(type == REG_BINARY, "got %u\n", type); if (dwret == ERROR_SUCCESS) { @@ -3772,6 +3766,7 @@ todo_wine ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len); ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength); ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes); +todo_wine ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject); ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear); ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth); -- 2.17.1

1 0

[PATCH 2/7] include: Add more definitions for performance counters.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winperf.h | 113 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 97 insertions(+), 16 deletions(-) diff --git a/include/winperf.h b/include/winperf.h index dce1a6d648..113bfbae40 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -67,25 +67,106 @@ #define PERF_DETAIL_EXPERT 300 #define PERF_DETAIL_WIZARD 400 +#include <pshpack8.h> + /* Performance data structure header * returned in answer to HKEY_PERFORMANCE_DATA request */ -typedef struct _PERF_DATA_BLOCK { - WCHAR Signature[4]; - DWORD LittleEndian; - DWORD Version; - DWORD Revision; - DWORD TotalByteLength; - DWORD HeaderLength; - DWORD NumObjectTypes; - DWORD DefaultObject; - SYSTEMTIME SystemTime; - LARGE_INTEGER PerfTime; - LARGE_INTEGER PerfFreq; - LARGE_INTEGER PerfTime100nSec; - DWORD SystemNameLength; - DWORD SystemNameOffset; -} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK; +#define PERF_DATA_VERSION 1 +#define PERF_DATA_REVISION 1 + +typedef struct _PERF_DATA_BLOCK +{ + WCHAR Signature[4]; + DWORD LittleEndian; + DWORD Version; + DWORD Revision; + DWORD TotalByteLength; + DWORD HeaderLength; + DWORD NumObjectTypes; + DWORD DefaultObject; + SYSTEMTIME SystemTime; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER PerfTime100nSec; + DWORD SystemNameLength; + DWORD SystemNameOffset; +} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK; + +#define PERF_NO_INSTANCES -1 + +typedef struct _PERF_OBJECT_TYPE +{ + DWORD TotalByteLength; + DWORD DefinitionLength; + DWORD HeaderLength; + DWORD ObjectNameTitleIndex; +#ifdef _WIN64 + DWORD ObjectNameTitle; +#else + LPWSTR ObjectNameTitle; +#endif + DWORD ObjectHelpTitleIndex; +#ifdef _WIN64 + DWORD ObjectHelpTitle; +#else + LPWSTR ObjectHelpTitle; +#endif + DWORD DetailLevel; + DWORD NumCounters; + LONG DefaultCounter; + LONG NumInstances; + DWORD CodePage; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; +} PERF_OBJECT_TYPE, *PPERF_OBJECT_TYPE; + +typedef struct _PERF_COUNTER_DEFINITION +{ + DWORD ByteLength; + DWORD CounterNameTitleIndex; +#ifdef _WIN64 + DWORD CounterNameTitle; +#else + LPWSTR CounterNameTitle; +#endif + DWORD CounterHelpTitleIndex; +#ifdef _WIN64 + DWORD CounterHelpTitle; +#else + LPWSTR CounterHelpTitle; +#endif + LONG DefaultScale; + DWORD DetailLevel; + DWORD CounterType; + DWORD CounterSize; + DWORD CounterOffset; +} PERF_COUNTER_DEFINITION, *PPERF_COUNTER_DEFINITION; + +#define PERF_NO_UNIQUE_ID -1 + +typedef struct _PERF_INSTANCE_DEFINITION +{ + DWORD ByteLength; + DWORD ParentObjectTitleIndex; + DWORD ParentObjectInstance; + LONG UniqueID; + DWORD NameOffset; + DWORD NameLength; +} PERF_INSTANCE_DEFINITION, *PPERF_INSTANCE_DEFINITION; + +typedef struct _PERF_COUNTER_BLOCK +{ + DWORD ByteLength; +} PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK; + + +#include <poppack.h> + +typedef DWORD (APIENTRY PM_OPEN_PROC)(LPWSTR); +typedef DWORD (APIENTRY PM_COLLECT_PROC)(LPWSTR,LPVOID *,LPDWORD,LPDWORD); +typedef DWORD (APIENTRY PM_CLOSE_PROC)(void); +typedef DWORD (APIENTRY PM_QUERY_PROC)(LPDWORD,LPVOID *,LPDWORD,LPDWORD); #endif /* _WINPERF_ */ -- 2.17.1

1 0

[PATCH 1/7] advapi32/tests: Add more tests for performance counters.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/tests/registry.c | 196 ++++++++++++++++++++++++++++++++- include/winreg.h | 2 + 2 files changed, 194 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9d248685ca..1573b6c03b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3613,35 +3613,73 @@ static void test_RegNotifyChangeKeyValue(void) CloseHandle(event); } +static const char *dbgstr_longlong(ULONGLONG ll) +{ + static char buf[16][64]; + static int idx; + + idx &= 0x0f; + + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(buf[idx], "0x%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(buf[idx], "0x%08lx", (unsigned long)ll); + + return buf[idx++]; +} + +#define cmp_li(a, b, c) cmp_li_real(a, b, c, __LINE__) +static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, int line) +{ + LONGLONG diff = l2->QuadPart - l1->QuadPart; + if (diff < 0) diff = -diff; + ok_(__FILE__, line)(diff <= slack, "values don't match: %s/%s\n", + dbgstr_longlong(l1->QuadPart), dbgstr_longlong(l2->QuadPart)); +} + static void test_RegQueryValueExPerformanceData(void) { - DWORD cbData, len; + static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 }; + static const WCHAR dummyW[5] = { 'd','u','m','m','y' }; + static const char * const names[] = { NULL, "", "Global", "2" "invalid counter name" }; + DWORD cbData, len, i, type; BYTE *value; DWORD dwret; LONG limit = 6; PERF_DATA_BLOCK *pdb; + HKEY hkey; + BYTE buf[256 + sizeof(PERF_DATA_BLOCK)]; /* Test with data == NULL */ dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData ); + todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + /* Test ERROR_MORE_DATA, start with small buffer */ len = 10; value = HeapAlloc(GetProcessHeap(), 0, len); cbData = len; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + type = 0xdeadbeef; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); +todo_wine + ok(type == REG_BINARY, "got %u\n", type); while( dwret == ERROR_MORE_DATA && limit) { len = len * 10; value = HeapReAlloc( GetProcessHeap(), 0, value, len ); cbData = len; - dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + type = 0xdeadbeef; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData ); limit--; } ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); +todo_wine + ok(type == REG_BINARY, "got %u\n", type); /* Check returned data */ if (dwret == ERROR_SUCCESS) @@ -3658,8 +3696,158 @@ static void test_RegQueryValueExPerformanceData(void) } HeapFree(GetProcessHeap(), 0, value); -} + for (i = 0; i < sizeof(names)/sizeof(names[0]); i++) + { + cbData = 0xdeadbeef; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0xdeadbeef; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0xdeadbeef; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + + cbData = 0; + dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData); +todo_wine + ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret); + ok(cbData == 0, "got %u\n", cbData); + } + + memset(buf, 0x77, sizeof(buf)); + type = 0xdeadbeef; + cbData = sizeof(buf); + dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData); +todo_wine + ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); +todo_wine + ok(type == REG_BINARY, "got %u\n", type); + if (dwret == ERROR_SUCCESS) + { + SYSTEMTIME st; + WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD sysname_len; + LARGE_INTEGER counter, freq, ftime; + + GetSystemTime(&st); + GetSystemTimeAsFileTime((FILETIME *)&ftime); + QueryPerformanceCounter(&counter); + QueryPerformanceFrequency(&freq); + + sysname_len = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(sysname, &sysname_len); + + pdb = (PERF_DATA_BLOCK *)buf; + ok(pdb->Signature[0] == 'P', "got '%c'\n", pdb->Signature[0]); + ok(pdb->Signature[1] == 'E', "got '%c'\n", pdb->Signature[1]); + ok(pdb->Signature[2] == 'R', "got '%c'\n", pdb->Signature[2]); + ok(pdb->Signature[3] == 'F', "got '%c'\n", pdb->Signature[3]); + + ok(pdb->LittleEndian == 1, "got %u\n", pdb->LittleEndian); + ok(pdb->Version == 1, "got %u\n", pdb->Version); + ok(pdb->Revision == 1, "got %u\n", pdb->Revision); + len = (sizeof(*pdb) + pdb->SystemNameLength + 7) & ~7; + ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len); + ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength); + ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes); + ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject); + ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear); + ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth); + ok(pdb->SystemTime.wDayOfWeek == st.wDayOfWeek, "got %u\n", pdb->SystemTime.wDayOfWeek); + ok(pdb->SystemTime.wDay == st.wDay, "got %u\n", pdb->SystemTime.wDay); + if (U(pdb->PerfTime).LowPart != 0x77777777) /* TestBot is broken */ + cmp_li(&pdb->PerfTime, &counter, freq.QuadPart); + if (U(pdb->PerfFreq).LowPart != 0x77777777) /* TestBot is broken */ + cmp_li(&pdb->PerfFreq, &freq, 0); + cmp_li(&pdb->PerfTime100nSec, &ftime, 200000); /* TestBot needs huge slack value */ + ok(pdb->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected %u, got %u\n", + (sysname_len + 1) * 2 /*sizeof(WCHAR)*/, pdb->SystemNameLength); + ok(pdb->SystemNameOffset == sizeof(*pdb), "got %u\n", pdb->SystemNameOffset); + ok(!lstrcmpW(sysname, (LPCWSTR)(pdb + 1)), "%s != %s\n", + wine_dbgstr_w(sysname), wine_dbgstr_w((LPCWSTR)(pdb + 1))); + + len = pdb->TotalByteLength - (sizeof(*pdb) + pdb->SystemNameLength); + if (len) + { + BYTE remainder[8], *p; + + memset(remainder, 0x77, sizeof(remainder)); + p = buf + sizeof(*pdb) + pdb->SystemNameLength; + ok(!memcmp(p, remainder, len), "remainder: %02x,%02x...\n", p[0], p[1]); + } + } + + dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, NULL, &hkey); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, "Global", &hkey); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegOpenKeyExA(HKEY_PERFORMANCE_DATA, "Global", 0, KEY_READ, &hkey); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegQueryValueA(HKEY_PERFORMANCE_DATA, "Global", NULL, (LONG *)&cbData); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegSetValueA(HKEY_PERFORMANCE_DATA, "Global", REG_SZ, "dummy", 4); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + dwret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 40); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + cbData = sizeof(buf); + dwret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, cbData); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + + cbData = sizeof(buf); + dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, &cbData, NULL, NULL, NULL, NULL); +todo_wine + ok(dwret == ERROR_MORE_DATA, "got %u\n", dwret); +todo_wine + ok(cbData == sizeof(buf), "got %u\n", cbData); + + dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, NULL, &cbData, NULL, NULL, NULL, NULL); + ok(dwret == ERROR_INVALID_PARAMETER, "got %u\n", dwret); + + if (pRegSetKeyValueW) + { + dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, globalW, REG_SZ, dummyW, sizeof(dummyW)); +todo_wine + ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret); + } + + dwret = RegCloseKey(HKEY_PERFORMANCE_DATA); + ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); +} START_TEST(registry) { diff --git a/include/winreg.h b/include/winreg.h index 42b77251ae..ddbd929378 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -32,6 +32,8 @@ extern "C" { #define HKEY_PERFORMANCE_DATA ((HKEY)(LONG_PTR)(LONG)0x80000004) #define HKEY_CURRENT_CONFIG ((HKEY)(LONG_PTR)(LONG)0x80000005) #define HKEY_DYN_DATA ((HKEY)(LONG_PTR)(LONG)0x80000006) +#define HKEY_PERFORMANCE_TEXT ((HKEY)(LONG_PTR)(LONG)0x80000050) +#define HKEY_PERFORMANCE_NLSTEXT ((HKEY)(LONG_PTR)(LONG)0x80000060) /* * registry provider structs -- 2.17.1

1 0

[PATCH v2] packager: Prefer native version
by André Hentschel 10 Jul '18

10 Jul '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/packager/packager_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index c1d194e..af1ee22 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p, %u, %p)\n", instance, reason, reserved); switch(reason){ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: g_instance = instance; DisableThreadLibraryCalls(instance); -- 2.7.4

3 4

[PATCH] packager: Prefer native version.
by André Hentschel 10 Jul '18

10 Jul '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/packager/packager_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index c1d194e..af1ee22 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -675,6 +675,8 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p, %u, %p)\n", instance, reason, reserved); switch(reason){ + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: g_instance = instance; DisableThreadLibraryCalls(instance); -- 2.7.4

1 1

[PATCH 3/8] winedump: Stop prepending every line of information with an offset.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

This patch makes typelib output consistent with other dumpers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index e30761540b..0d8f059c03 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -173,9 +173,6 @@ static int tlb_read_byte(void) static void print_offset(void) { int i; - - printf("%04x: ", offset); - for(i=0; i<indent; i++) printf(" "); } -- 2.17.1

2 1

[PATCH 7/8] winedump: Use common binary dumper for typelib.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

This is an adapted code from dump.c. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 52 +++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index d2883598d7..5d009fcedb 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -283,25 +283,47 @@ static void print_ctl2(const char *name) printf("\n"); } -static void dump_binary(int n) +static int tlb_isprint(unsigned char c) { - int i; + return c >= 32; +} - for(i = 1; i <= n; i++) { - switch(i & 0x0f) { - case 0: - printf("%02x\n", tlb_read_byte()); - break; - case 1: - print_offset(); - /* fall through */ - default: - printf("%02x ", tlb_read_byte()); +static void dump_binary(int size) +{ + const unsigned char *ptr; + int i, j; + + if (!size) return; + + ptr = tlb_read(size); + if (!ptr) return; + + print_offset(); + printf("%08x: ", offset - size); + + for (i = 0; i < size; i++) + { + printf("%02x%c", ptr[i], (i % 16 == 7) ? '-' : ' '); + if ((i % 16) == 15) + { + printf( " " ); + for (j = 0; j < 16; j++) + printf("%c", tlb_isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.'); + if (i < size-1) + { + printf("\n"); + print_offset(); + printf("%08x: ", offset - size + i + 1); + } } } - - if(n&0x0f) - printf("\n"); + if (i % 16) + { + printf("%*s ", 3 * (16-(i%16)), ""); + for (j = 0; j < i % 16; j++) + printf("%c", tlb_isprint(ptr[i-(i%16)+j]) ? ptr[i-(i%16)+j] : '.'); + } + printf("\n"); } static int dump_msft_varflags(void) -- 2.17.1

2 3

[PATCH 6/8] winedump: Add print_string() helper.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 330fee8fbf..d2883598d7 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -517,11 +517,17 @@ static BOOL dump_msft_namehashtab(seg_t *seg) return TRUE; } -static void dump_string(int len, int align_off) +static void print_string(int len) { printf("\""); fwrite(tlb_read(len), len, 1, stdout); - printf("\" "); + printf("\""); +} + +static void dump_string(int len, int align_off) +{ + print_string(len); + printf(" "); while((len++ + align_off) & 3) printf("\\%2.2x", tlb_read_byte()); } -- 2.17.1

2 1

[PATCH 1/8] winedump: Correctly declare the array of segments.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index df1ea4b576..5c710360e6 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -109,7 +109,7 @@ typedef struct seg_t { int offset; int length; } seg_t; -static seg_t segdir[]; +static seg_t segdir[15]; enum SEGDIRTYPE { SEGDIR_TYPEINFO, -- 2.17.1

2 3