marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32: Performance providers' Open() expects to see the configured name as its parameter. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Dmitry Timoshkov 2018-07-11 12:16:14 +08:00 committed by Alexandre Julliard
parent 903de9b678
commit a77eed47b4
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/advapi32/registry.c
View File

@ -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;
}