From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/cfgmgr32/tests/cfgmgr32.c | 2 +- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/stubs.c | 8 ++++---- include/cfgmgr32.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c index 6061d26fda2..4ef528f8452 100644 --- a/dlls/cfgmgr32/tests/cfgmgr32.c +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -248,7 +248,7 @@ static void test_CM_Get_Device_ID_List(void) ok(!ret, "got %#lx.\n", ret); ok(!wcscmp(id, instances[i].id), "got %s, expected %s.\n", debugstr_w(id), debugstr_w(instances[i].id)); size = len; - ret = CM_Get_DevNode_PropertyW(instances[i].inst, &DEVPROPKEY_GPU_LUID, &type, wbuf, &size, 0); + ret = CM_Get_DevNode_PropertyW(instances[i].inst, &DEVPROPKEY_GPU_LUID, &type, (BYTE *)wbuf, &size, 0); ok(!ret || ret == CR_NO_SUCH_VALUE, "got %#lx.\n", ret); if (!ret) ok(type == DEVPROP_TYPE_UINT64, "got %#lx.\n", type); diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ef3e6a55735..b7ef248feb3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -5415,7 +5415,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY * * CM_Get_DevNode_PropertyW (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST dev, const DEVPROPKEY *key, DEVPROPTYPE *type, - PVOID buf, PULONG len, ULONG flags) + BYTE *buf, PULONG len, ULONG flags) { return CM_Get_DevNode_Property_ExW(dev, key, type, buf, len, flags, NULL); } diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 44c81a1fd97..96b12cb8a44 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -357,9 +357,9 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) * CM_Get_Class_Registry_PropertyA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULONG regdatatype, - PVOID buf, ULONG len, ULONG flags, HMACHINE machine) + PVOID buf, ULONG *len, ULONG flags, HMACHINE machine) { - FIXME("%p %lu %p %p %lu 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + FIXME("%p %lu %p %p %p 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); return CR_FAILURE; } @@ -367,9 +367,9 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULON * CM_Get_Class_Registry_PropertyW (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULONG regdatatype, - PVOID buf, ULONG len, ULONG flags, HMACHINE machine) + PVOID buf, ULONG *len, ULONG flags, HMACHINE machine) { - FIXME("%p %lu %p %p %lu 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + FIXME("%p %lu %p %p %p 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); return CR_FAILURE; } diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index ee84533a2d0..29c19d148b2 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -331,8 +331,8 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG,LPGUID,DEVIN CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG,LPGUID,DEVINSTID_A,ULONG,HMACHINE); #define CM_Get_Device_Interface_List_Size_Ex WINELIB_NAME_AW(CM_Get_Device_Interface_List_Size_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW(LPCWSTR,const DEVPROPKEY*,DEVPROPTYPE*,PBYTE,PULONG,ULONG); -CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST,const DEVPROPKEY *,DEVPROPTYPE *type,PVOID,PULONG,ULONG); -CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyExW(DEVINST,const DEVPROPKEY *,DEVPROPTYPE *type,PVOID,PULONG,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyW(DEVINST,const DEVPROPKEY *,DEVPROPTYPE *type,BYTE*,PULONG,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyExW(DEVINST,const DEVPROPKEY *,DEVPROPTYPE *type,BYTE*,PULONG,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10012