July 2022 - Wine-commits - list.winehq.org

Brendan Shanks : ntdll: Allow changes to DEP flags under Wow64.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: ce5fe931e138b880aa110143d840cf13143066ba URL: https://gitlab.winehq.org/wine/wine/-/commit/ce5fe931e138b880aa110143d840cf… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jul 21 11:03:18 2022 -0700 ntdll: Allow changes to DEP flags under Wow64. --- dlls/ntdll/unix/process.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 078ad75099d..83888717a5c 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -73,9 +73,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); -static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE | (sizeof(void *) > sizeof(int) ? - MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | - MEM_EXECUTE_OPTION_PERMANENT : 0); +static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE; static UINT process_error_mode; @@ -1434,8 +1432,14 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class case ProcessExecuteFlags: len = sizeof(ULONG); - if (size == len) *(ULONG *)info = execute_flags; - else ret = STATUS_INFO_LENGTH_MISMATCH; + if (size != len) + ret = STATUS_INFO_LENGTH_MISMATCH; + else if (is_win64 && !NtCurrentTeb()->WowTebOffset) + *(ULONG *)info = MEM_EXECUTE_OPTION_DISABLE | + MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | + MEM_EXECUTE_OPTION_PERMANENT; + else + *(ULONG *)info = execute_flags; break; case ProcessPriorityClass: @@ -1560,7 +1564,7 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, break; case ProcessExecuteFlags: - if (is_win64 || size != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; + if ((is_win64 && !NtCurrentTeb()->WowTebOffset) || size != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; if (execute_flags & MEM_EXECUTE_OPTION_PERMANENT) return STATUS_ACCESS_DENIED; else {

1 0

Brendan Shanks : wow64: Allow setting NtSetInformationProcess(ProcessExecuteFlags).
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: bbdab496eec81a37921ea492b70c49f9f206666e URL: https://gitlab.winehq.org/wine/wine/-/commit/bbdab496eec81a37921ea492b70c49… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Sun Jul 24 10:12:25 2022 -0700 wow64: Allow setting NtSetInformationProcess(ProcessExecuteFlags). --- dlls/wow64/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 55cb19c6a17..1d35702bf01 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1075,6 +1075,7 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) { case ProcessDefaultHardErrorMode: /* ULONG */ case ProcessPriorityClass: /* PROCESS_PRIORITY_CLASS */ + case ProcessExecuteFlags: /* ULONG */ return NtSetInformationProcess( handle, class, ptr, len ); case ProcessAffinityMask: /* ULONG_PTR */ @@ -1085,9 +1086,6 @@ NTSTATUS WINAPI wow64_NtSetInformationProcess( UINT *args ) } else return STATUS_INVALID_PARAMETER; - case ProcessExecuteFlags: /* ULONG */ - return STATUS_ACCESS_DENIED; - case ProcessInstrumentationCallback: /* PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION */ if (len == sizeof(PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION32)) {

1 0

Hugh McMaster : regedit: Update binary data via update_registry_value().
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 5e2c3dd53725c4a5064c2f09daaf570f048946f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e2c3dd53725c4a5064c2f09daaf57… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Jul 24 22:41:05 2022 +1000 regedit: Update binary data via update_registry_value(). --- programs/regedit/edit.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 44ef45993fd..e63fd8fcf8b 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -96,6 +96,11 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) switch (params->type) { + case REG_SZ: + case REG_EXPAND_SZ: + params->data = buf; + params->size = (len + 1) * sizeof(WCHAR); + break; case REG_DWORD: params->size = sizeof(DWORD); params->data = malloc(params->size); @@ -129,9 +134,11 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) params->size = j * sizeof(WCHAR); break; } - default: /* REG_SZ, REG_EXPAND_SZ */ - params->data = buf; - params->size = (len + 1) * sizeof(WCHAR); + default: /* hex data types */ + free(buf); + params->size = SendMessageW(hwndValue, HEM_GETDATA, 0, 0); + params->data = malloc(params->size); + SendMessageW(hwndValue, HEM_GETDATA, (WPARAM)params->size, (LPARAM)params->data); } ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size); @@ -224,9 +231,7 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { struct edit_params *params; - BYTE *data; - LONG size; - LONG lRet; + int ret = 0; switch(uMsg) { case WM_INITDIALOG: @@ -243,23 +248,10 @@ static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wP switch (LOWORD(wParam)) { case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER); - size = SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, 0, 0); - data = malloc(size); - - SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_GETDATA, (WPARAM)size, (LPARAM)data); - lRet = RegSetValueExW(params->hkey, params->value_name, 0, params->type, data, size); - free(data); - - if (lRet == ERROR_SUCCESS) - EndDialog(hwndDlg, 1); - else - { - error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED); - EndDialog(hwndDlg, 0); - } - return TRUE; + ret = update_registry_value(hwndDlg, params); + /* fall through */ case IDCANCEL: - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, ret); return TRUE; } }

1 0

Hugh McMaster : regedit: Set the dlgproc value name via a function, not a global.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: d1bc3623e8dfe1b71e9d0c6905cdde03cf253f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1bc3623e8dfe1b71e9d0c6905cdde… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 25 20:40:27 2022 +1000 regedit: Set the dlgproc value name via a function, not a global. --- programs/regedit/edit.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index e63fd8fcf8b..4588be196d6 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -29,7 +29,6 @@ #include "main.h" -static const WCHAR* editValueName; static BOOL isDecimal; struct edit_params @@ -150,6 +149,14 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) return !ret; } +static void set_dlgproc_value_name(HWND hwndDlg, struct edit_params *params) +{ + if (params->value_name) + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); + else + SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); +} + static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) { struct edit_params *params; @@ -160,7 +167,7 @@ static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpa case WM_INITDIALOG: params = (struct edit_params *)lparam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); + set_dlgproc_value_name(hwndDlg, params); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data); return TRUE; case WM_COMMAND: @@ -200,7 +207,7 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar case WM_INITDIALOG: params = (struct edit_params *)lparam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, editValueName); + set_dlgproc_value_name(hwndDlg, params); SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, params->data); CheckRadioButton(hwndDlg, IDC_DWORD_HEX, IDC_DWORD_DEC, IDC_DWORD_HEX); isDecimal = FALSE; @@ -237,10 +244,7 @@ static INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wP case WM_INITDIALOG: params = (struct edit_params *)lParam; SetWindowLongPtrW(hwndDlg, DWLP_USER, (ULONG_PTR)params); - if (params->value_name) - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, params->value_name); - else - SetDlgItemTextW(hwndDlg, IDC_VALUE_NAME, g_pszDefaultValueName); + set_dlgproc_value_name(hwndDlg, params); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, HEM_SETDATA, (WPARAM)params->size, (LPARAM)params->data); SendDlgItemMessageW(hwndDlg, IDC_VALUE_DATA, WM_SETFONT, (WPARAM) GetStockObject(ANSI_FIXED_FONT), TRUE); return TRUE; @@ -380,8 +384,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) struct edit_params params; BOOL result = FALSE; - editValueName = valueName ? valueName : g_pszDefaultValueName; - if (RegOpenKeyExW(hKeyRoot, keyPath, 0, KEY_READ | KEY_SET_VALUE, &params.hkey)) { error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED);

1 0

Hugh McMaster : regedit: Update the listview item without reloading the value data.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 6901f3ccfc30155a5c38e2285c26a02dce8d903e URL: https://gitlab.winehq.org/wine/wine/-/commit/6901f3ccfc30155a5c38e2285c26a0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 25 20:45:35 2022 +1000 regedit: Update the listview item without reloading the value data. --- programs/regedit/edit.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 4588be196d6..537bcbd4541 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -143,9 +143,6 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) ret = RegSetValueExW(params->hkey, params->value_name, 0, params->type, (BYTE *)params->data, params->size); if (ret) error_code_messagebox(hwndDlg, IDS_SET_VALUE_FAILED); - free(params->data); - params->data = NULL; - return !ret; } @@ -427,7 +424,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); - read_value(hwnd, &params); format_value_data(g_pChildWnd->hListWnd, index, params.type, params.data, params.size); }

1 0

Arkadiusz Hiler : dinput: Set correct object names for dials and sliders.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 17ce835ed3f4b4957fe8cc53df28c845c3cae464 URL: https://gitlab.winehq.org/wine/wine/-/commit/17ce835ed3f4b4957fe8cc53df28c8… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:51:38 2022 +0300 dinput: Set correct object names for dials and sliders. --- dlls/dinput/joystick_hid.c | 2 ++ dlls/dinput/tests/joystick8.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3dc7b70aac4..7370982d4c9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -354,6 +354,8 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance ) case MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC): return L"X Axis"; case MAKELONG(HID_USAGE_GENERIC_Y, HID_USAGE_PAGE_GENERIC): return L"Y Axis"; case MAKELONG(HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC): return L"Z Axis"; + case MAKELONG(HID_USAGE_GENERIC_SLIDER, HID_USAGE_PAGE_GENERIC): return L"Slider"; + case MAKELONG(HID_USAGE_GENERIC_DIAL, HID_USAGE_PAGE_GENERIC): return L"Dial"; case MAKELONG(PID_USAGE_ATTACK_LEVEL, HID_USAGE_PAGE_PID): return L"Attack Level"; case MAKELONG(PID_USAGE_ATTACK_TIME, HID_USAGE_PAGE_PID): return L"Attack Time"; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 90d7182a1fa..3303a3c9f32 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2992,8 +2992,8 @@ static void test_many_axes_joystick(void) {0}, {0}, {0}, - {.name = TRUE}, - {.name = TRUE, .guid = TRUE}, + {0}, + {.guid = TRUE}, {.flags = TRUE}, {.flags = TRUE}, {.flags = TRUE}, @@ -3120,7 +3120,7 @@ static void test_many_axes_joystick(void) check_member( objinst, expect_objects[8], "%#lx", dwOfs ); check_member( objinst, expect_objects[8], "%#lx", dwType ); check_member( objinst, expect_objects[8], "%#lx", dwFlags ); - if (!localized) todo_wine check_member_wstr( objinst, expect_objects[8], tszName ); + if (!localized) check_member_wstr( objinst, expect_objects[8], tszName ); check_member( objinst, expect_objects[8], "%lu", dwFFMaxForce ); check_member( objinst, expect_objects[8], "%lu", dwFFForceResolution ); check_member( objinst, expect_objects[8], "%u", wCollectionNumber );

1 0

Arkadiusz Hiler : dinput: Get rid of unused parameter in match_device_object.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 8a74acd73a9ba819e555212a06e64c46f50362b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a74acd73a9ba819e555212a06e64c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:53:04 2022 +0300 dinput: Get rid of unused parameter in match_device_object. --- dlls/dinput/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index f4bdce51633..e15a22bb413 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -244,7 +244,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD } static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format, - const DIDATAFORMAT *format, const DIOBJECTDATAFORMAT *match_obj, DWORD version ) + const DIOBJECTDATAFORMAT *match_obj, DWORD version ) { DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType ); DIOBJECTDATAFORMAT *device_obj, *user_obj; @@ -292,7 +292,7 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const { match_obj = format->rgodf + i; - if (!match_device_object( device_format, user_format, format, match_obj, impl->dinput->dwVersion )) + if (!match_device_object( device_format, user_format, match_obj, impl->dinput->dwVersion )) { WARN( "object %s not found\n", debugstr_diobjectdataformat( match_obj ) ); if (!(match_obj->dwType & DIDFT_OPTIONAL)) goto failed;

1 0

Arkadiusz Hiler : dinput/tests: Use helper for checking device object instances.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 76a1fd280414d73b58d845243fdf468144dd5bea URL: https://gitlab.winehq.org/wine/wine/-/commit/76a1fd280414d73b58d845243fdf46… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:53:50 2022 +0300 dinput/tests: Use helper for checking device object instances. --- dlls/dinput/tests/joystick8.c | 223 ++++++++++-------------------------------- 1 file changed, 49 insertions(+), 174 deletions(-)

1 0

Arkadiusz Hiler : dinput: Enumerate user format object forwards.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: 50690e08bd712c0b31c40197584b1c89a804dd53 URL: https://gitlab.winehq.org/wine/wine/-/commit/50690e08bd712c0b31c40197584b1c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Jul 22 14:54:41 2022 +0300 dinput: Enumerate user format object forwards. It's important for the default broken formats like c_dfDIJoystick2 which have multiple sets of sliders defined with the same offsets. --- dlls/dinput/device.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e15a22bb413..f0220252279 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -880,25 +880,23 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = &impl->device_format, *user_format = &impl->user_format; - DIOBJECTDATAFORMAT *device_obj, *user_obj; + DIOBJECTDATAFORMAT *user_objs = impl->user_format.rgodf; + DWORD i, count = impl->device_format.dwNumObjs; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; if (filter->dwHow == DIPH_BYUSAGE && !(impl->instance.dwDevType & DIDEVTYPE_HID)) return DIERR_UNSUPPORTED; if (filter->dwHow != DIPH_BYOFFSET) return DI_OK; - if (!user_format->rgodf) return DIERR_NOTFOUND; + if (!user_objs) return DIERR_NOTFOUND; - user_obj = user_format->rgodf + device_format->dwNumObjs; - device_obj = device_format->rgodf + device_format->dwNumObjs; - while (user_obj-- > user_format->rgodf && device_obj-- > device_format->rgodf) + for (i = 0; i < count; i++) { - if (!user_obj->dwType) continue; - if (user_obj->dwOfs == filter->dwObj) break; + if (!user_objs[i].dwType) continue; + if (user_objs[i].dwOfs == filter->dwObj) break; } - if (user_obj < user_format->rgodf) return DIERR_NOTFOUND; + if (i == count) return DIERR_NOTFOUND; - filter->dwObj = device_obj->dwOfs; + filter->dwObj = impl->device_format.rgodf[i].dwOfs; return DI_OK; }

1 0

Claire Girka : setupapi: Add support for SPDRP_BASE_CONTAINERID.
by Alexandre Julliard 25 Jul '22

25 Jul '22

Module: wine Branch: master Commit: f7f109d9d301be9062c480a9a2f34774c49e77ca URL: https://gitlab.winehq.org/wine/wine/-/commit/f7f109d9d301be9062c480a9a2f347… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:11:40 2022 +0200 setupapi: Add support for SPDRP_BASE_CONTAINERID. --- dlls/setupapi/devinst.c | 2 ++ include/setupapi.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 73e721753aa..901af4650c8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -96,6 +96,7 @@ static const WCHAR Capabilities[] = {'C','a','p','a','b','i','l','i','t','i','e' static const WCHAR UINumber[] = {'U','I','N','u','m','b','e','r',0}; static const WCHAR UpperFilters[] = {'U','p','p','e','r','F','i','l','t','e','r','s',0}; static const WCHAR LowerFilters[] = {'L','o','w','e','r','F','i','l','t','e','r','s',0}; +static const WCHAR ContainerId[] = {'C','o','n','t','a','i','n','e','r','I','d',0}; static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; @@ -654,6 +655,7 @@ static const struct PropertyMapEntry PropertyMap[] = { { REG_DWORD, "UINumber", UINumber }, { REG_MULTI_SZ, "UpperFilters", UpperFilters }, { REG_MULTI_SZ, "LowerFilters", LowerFilters }, + [SPDRP_BASE_CONTAINERID] = { REG_SZ, "ContainerId", ContainerId }, }; static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, diff --git a/include/setupapi.h b/include/setupapi.h index 14e3774fc42..806df7baaf5 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1315,7 +1315,8 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define SPDRP_REMOVAL_POLICY_HW_DEFAULT 0x00000020 #define SPDRP_REMOVAL_POLICY_OVERRIDE 0x00000021 #define SPDRP_INSTALL_STATE 0x00000022 -#define SPDRP_MAXIMUM_PROPERTY 0x00000023 +#define SPDRP_BASE_CONTAINERID 0x00000024 +#define SPDRP_MAXIMUM_PROPERTY 0x00000025 #define DPROMPT_SUCCESS 0 #define DPROMPT_CANCEL 1

1 0