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

Rémi Bernon : windows.gaming.input: Fix IIterator_IInspectable trace messages.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 0fb4c0519b3a1cab52d20e3dc825ab26ec4a208d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb4c0519b3a1cab52d20e3d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:28:15 2022 +0100 windows.gaming.input: Fix IIterator_IInspectable trace messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index ae83d16a384..c98c89195d1 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -104,9 +104,7 @@ static HRESULT WINAPI iterator_GetTrustLevel( IIterator_IInspectable *iface, Tru static HRESULT WINAPI iterator_get_Current( IIterator_IInspectable *iface, IInspectable **value ) { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - - FIXME("\n"); - + TRACE( "iface %p, value %p.\n", iface, value ); return IVectorView_IInspectable_GetAt( impl->view, impl->index, value ); } @@ -114,7 +112,7 @@ static HRESULT WINAPI iterator_get_HasCurrent( IIterator_IInspectable *iface, BO { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - FIXME("\n"); + TRACE( "iface %p, value %p.\n", iface, value ); *value = impl->index < impl->size; return S_OK; @@ -124,7 +122,7 @@ static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, BOOL *va { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - FIXME("\n"); + TRACE( "iface %p, value %p.\n", iface, value ); if (impl->index < impl->size) impl->index++; return IIterator_IInspectable_get_HasCurrent( iface, value ); @@ -134,9 +132,7 @@ static HRESULT WINAPI iterator_GetMany( IIterator_IInspectable *iface, UINT32 it IInspectable **items, UINT *count ) { struct iterator *impl = impl_from_IIterator_IInspectable( iface ); - - FIXME("\n"); - + TRACE( "iface %p, items_size %u, items %p, count %p.\n", iface, items_size, items, count ); return IVectorView_IInspectable_GetMany( impl->view, impl->index, items_size, items, count ); } @@ -635,7 +631,7 @@ static HRESULT WINAPI iterable_First( IIterable_IInspectable *iface, IIterator_I IVectorView_IInspectable *view; HRESULT hr; - TRACE("\n"); + TRACE( "iface %p, value %p.\n", iface, value ); if (FAILED(hr = IVector_IInspectable_GetView( &impl->IVector_IInspectable_iface, &view ))) return hr;

1 0

Rémi Bernon : winebus.sys: Declare multiple HID simple haptics controller collections.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: e651f56e795e089f2e418ef0cbf21ab216b5f882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e651f56e795e089f2e418ef0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:29:36 2022 +0100 winebus.sys: Declare multiple HID simple haptics controller collections. Instead of having the waveforms combined. This better matches what Windows.Gaming.Input and Windows.Devices.Haptics are exposing, with one SimpleHapticsController for each motor. This will also simplify the declaration of left/right trigger motors. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 89 +++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/unix_private.h | 12 ++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 3e83a05cdf6..46336716a70 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -337,6 +337,11 @@ struct hid_haptics_waveform BYTE manual_trigger; BYTE repeat_count; }; +struct hid_haptics_intensity +{ + UINT16 rumble_intensity; + UINT16 buzz_intensity; +}; #include "poppack.h" BOOL hid_device_add_haptics(struct unix_device *iface) @@ -344,7 +349,8 @@ BOOL hid_device_add_haptics(struct unix_device *iface) struct hid_report_descriptor *desc = &iface->hid_report_descriptor; const BYTE haptics_features_report = ++desc->next_report_id[HidP_Feature]; const BYTE haptics_waveform_report = ++desc->next_report_id[HidP_Output]; - const BYTE haptics_template[] = + const BYTE haptics_intensity_report = ++desc->next_report_id[HidP_Output]; + const BYTE waveforms_template[] = { USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), @@ -404,16 +410,75 @@ BOOL hid_device_add_haptics(struct unix_device *iface) OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; + const BYTE haptics_template[] = + { + USAGE_PAGE(2, HID_USAGE_PAGE_HAPTICS), + USAGE(1, HID_USAGE_HAPTICS_SIMPLE_CONTROLLER), + COLLECTION(1, Logical), + REPORT_ID(1, haptics_features_report), + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_LIST), + COLLECTION(1, NamedArray), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE(1, HID_USAGE_HAPTICS_DURATION_LIST), + COLLECTION(1, NamedArray), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|3), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs|Null), + END_COLLECTION, + + USAGE(1, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME), + UNIT(2, 0x1001), /* seconds */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x7fffffff), + REPORT_SIZE(1, 32), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + /* reset global items */ + UNIT(1, 0), /* None */ + UNIT_EXPONENT(1, 0), + + REPORT_ID(1, haptics_intensity_report), + USAGE(1, HID_USAGE_HAPTICS_INTENSITY), + LOGICAL_MINIMUM(4, 0x00000000), + LOGICAL_MAXIMUM(4, 0x0000ffff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + }; iface->hid_haptics.features_report = haptics_features_report; iface->hid_haptics.waveform_report = haptics_waveform_report; + iface->hid_haptics.intensity_report = haptics_intensity_report; iface->hid_haptics.features.waveform_list[0] = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; iface->hid_haptics.features.waveform_list[1] = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; iface->hid_haptics.features.duration_list[0] = 0; iface->hid_haptics.features.duration_list[1] = 0; iface->hid_haptics.features.waveform_cutoff_time_ms = 1000; + iface->hid_haptics.features.rumble.waveform = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; + iface->hid_haptics.features.rumble.duration = 0; + iface->hid_haptics.features.rumble.cutoff_time_ms = 1000; + iface->hid_haptics.features.buzz.waveform = HID_USAGE_HAPTICS_WAVEFORM_BUZZ; + iface->hid_haptics.features.buzz.duration = 0; + iface->hid_haptics.features.buzz.cutoff_time_ms = 1000; + + if (!hid_report_descriptor_append(desc, waveforms_template, sizeof(waveforms_template))) + return FALSE; - return hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template)); + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + if (!hid_report_descriptor_append(desc, haptics_template, sizeof(haptics_template))) + return FALSE; + + return TRUE; } #include "pshpack1.h" @@ -1072,7 +1137,23 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC struct hid_physical *physical = &iface->hid_physical; struct hid_haptics *haptics = &iface->hid_haptics; - if (packet->reportId == haptics->waveform_report) + if (packet->reportId == haptics->intensity_report) + { + struct hid_haptics_intensity *report = (struct hid_haptics_intensity *)(packet->reportBuffer + 1); + ULONG duration_ms; + + io->Information = sizeof(*report) + 1; + assert(packet->reportBufferLen == io->Information); + + if (!report->rumble_intensity && !report->buzz_intensity) + io->Status = iface->hid_vtbl->haptics_stop(iface); + else + { + duration_ms = min(haptics->features.rumble.cutoff_time_ms, haptics->features.buzz.cutoff_time_ms); + io->Status = iface->hid_vtbl->haptics_start(iface, duration_ms, report->rumble_intensity, report->buzz_intensity); + } + } + else if (packet->reportId == haptics->waveform_report) { struct hid_haptics_waveform *report = (struct hid_haptics_waveform *)(packet->reportBuffer + 1); UINT16 *rumble_intensity = haptics->waveform_intensity + HAPTICS_WAVEFORM_RUMBLE_ORDINAL; @@ -1307,6 +1388,8 @@ static void hid_device_set_feature_report(struct unix_device *iface, HID_XFER_PA assert(packet->reportBufferLen == io->Information); haptics->features.waveform_cutoff_time_ms = features->waveform_cutoff_time_ms; + haptics->features.rumble.cutoff_time_ms = features->rumble.cutoff_time_ms; + haptics->features.buzz.cutoff_time_ms = features->buzz.cutoff_time_ms; io->Status = STATUS_SUCCESS; } else diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 553631e40fb..081e57dc53d 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -138,12 +138,23 @@ enum haptics_waveform_ordinal HAPTICS_WAVEFORM_LAST_ORDINAL = HAPTICS_WAVEFORM_BUZZ_ORDINAL, }; +#include "pshpack1.h" +struct hid_haptics_feature +{ + WORD waveform; + WORD duration; + UINT cutoff_time_ms; +}; + struct hid_haptics_features { WORD waveform_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; WORD duration_list[HAPTICS_WAVEFORM_LAST_ORDINAL - HAPTICS_WAVEFORM_FIRST_ORDINAL + 1]; UINT waveform_cutoff_time_ms; + struct hid_haptics_feature rumble; + struct hid_haptics_feature buzz; }; +#include "poppack.h" struct hid_haptics { @@ -151,6 +162,7 @@ struct hid_haptics UINT16 waveform_intensity[HAPTICS_WAVEFORM_LAST_ORDINAL + 1]; BYTE features_report; BYTE waveform_report; + BYTE intensity_report; }; /* must match the order and number of usages in the

1 0

Rémi Bernon : xinput1_3: Support multiple HID simple haptics controller collections.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: ec059e2b7e046ad1a28162279416d6e6b8018700 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec059e2b7e046ad1a2816227… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:29:37 2022 +0100 xinput1_3: Support multiple HID simple haptics controller collections. With individual waveform intensity caps, instead of a complicated waveform manual trigger. Also ignore collections with Z/RZ physical usages, later used to describe trigger haptics controllers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 224 +++++++++++++++++++++----------------------------- 1 file changed, 93 insertions(+), 131 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec059e2b7e046ad1a281…

1 0

Jinoh Kang : user32: Recognise RichEdit50W window class in spy.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 411d640d3f5e6c8bf13e5109a57eb892c659a42f URL: https://source.winehq.org/git/wine.git/?a=commit;h=411d640d3f5e6c8bf13e5109… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 12 19:36:01 2022 +0900 user32: Recognise RichEdit50W window class in spy. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index dc8e0b2a708..4d22acb43c2 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1764,6 +1764,7 @@ static const CONTROL_CLASS cc_array[] = { {TOOLTIPS_CLASSW, tooltips_array, ARRAY_SIZE(tooltips_array)}, {UPDOWN_CLASSW, updown_array, ARRAY_SIZE(updown_array)}, {RICHEDIT_CLASS20W, richedit_array, ARRAY_SIZE(richedit_array)}, + {MSFTEDIT_CLASS, richedit_array, ARRAY_SIZE(richedit_array)}, {0, 0, 0} };

1 0

Eric Pouech : oleaut32/tests: Convert UI8 to existing integer test scheme.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: df0eaf58825a83cb6d986dcd2f0c338100dffb68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0eaf58825a83cb6d986dcd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:30 2022 +0100 oleaut32/tests: Convert UI8 to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 152 +++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df0eaf58825a83cb6d98…

1 0

Eric Pouech : oleaut32/tests: Convert UI8Copy to existing integer test scheme.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 734a8ea204f629aac2b8bb753de558f323252f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=734a8ea204f629aac2b8bb75… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:38 2022 +0100 oleaut32/tests: Convert UI8Copy to existing integer test scheme. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 601520eb2f6..46897085d05 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2265,33 +2265,13 @@ static void test_VarUI8FromStr(void) static void test_VarUI8Copy(void) { - HRESULT hres; - VARIANTARG vSrc, vDst; - ULONGLONG in = 1; - if (!has_i8) { win_skip("I8 and UI8 data types are not available\n"); return; } - VariantInit(&vSrc); - VariantInit(&vDst); - V_VT(&vSrc) = VT_UI8; - V_UI8(&vSrc) = in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_UI8 && V_UI8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_UI8(&vDst) >> 32), (UINT)V_UI8(&vDst) ); - V_VT(&vSrc) = VT_UI8|VT_BYREF; - V_UI8REF(&vSrc) = &in; - hres = VariantCopy(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == (VT_UI8|VT_BYREF) && V_UI8REF(&vDst) == &in, - "ref hres 0x%X, type %d, ref (%p) %p\n", hres, V_VT(&vDst), &in, V_UI8REF(&vDst)); - hres = VariantCopyInd(&vDst, &vSrc); - ok(hres == S_OK && V_VT(&vDst) == VT_UI8 && V_UI8(&vDst) == in, - "copy hres 0x%X, type %d, value (%x%08x) %x%08x\n", - hres, V_VT(&vDst), (UINT)(in >> 32), (UINT)in, (UINT)(V_UI8(&vDst) >> 32), (UINT)V_UI8(&vDst) ); + COPYTEST(1ull, VT_UI8, V_UI8(&vSrc), V_UI8(&vDst), V_UI8REF(&vSrc), V_UI8REF(&vDst), "%I64u"); } static void test_VarUI8ChangeTypeEx(void)

1 0

Eric Pouech : oleaut32/tests: Ensure (re)definition of EXPECTRES for all integer types.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 3f7ef33e5b926f5a98167a6132e3fd64775ead5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f7ef33e5b926f5a98167a61… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:36:44 2022 +0100 oleaut32/tests: Ensure (re)definition of EXPECTRES for all integer types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 46897085d05..c368c5129bb 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -648,6 +648,8 @@ static void test_VarI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE BYTE +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%u") static void test_VarUI1FromI1(void) { @@ -942,6 +944,8 @@ static void test_VarUI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE SHORT +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI2FromI1(void) { @@ -1178,6 +1182,8 @@ static void test_VarI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE USHORT +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%u") static void test_VarUI2FromI1(void) { @@ -1411,6 +1417,8 @@ static void test_VarUI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG +#undef EXPECTRES +#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI4FromI1(void) {

1 0

Eric Pouech : ntdll/tests: Use correct integral type.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: f74474072a5e4123ebfb78469623263adfa61580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f74474072a5e4123ebfb7846… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 12 09:37:40 2022 +0100 ntdll/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a99b1e46b06..442aadfd784 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2425,7 +2425,8 @@ static void test_restore_context(void) EXCEPTION_RECORD rec; _JUMP_BUFFER buf; CONTEXT ctx; - int i, pass; + int i; + LONG pass; if (!pRtlUnwindEx || !pRtlRestoreContext || !pRtlCaptureContext || !p_setjmp) { @@ -4900,7 +4901,7 @@ static void CALLBACK test_unwind_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR a static void test_unwind_from_apc(void) { NTSTATUS status; - int pass; + LONG pass; if (!pNtQueueApcThread) { @@ -8648,7 +8649,7 @@ static void test_user_apc(void) { NTSTATUS status; CONTEXT context; - int pass; + LONG pass; if (!pNtQueueApcThread) { @@ -8818,7 +8819,7 @@ static void suspend_process_proc(void) { HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, suspend_process_event_name); HANDLE event2 = OpenEventA(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, suspend_process_event2_name); - unsigned int count; + DWORD count; NTSTATUS status; HANDLE thread;

1 0

Gijs Vermeulen : setupapi: Add SetupDiGetClassRegistryPropertyW stub.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: b8a4b9f93b1e9c12a5b543d3ebd62080c2f3a692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a4b9f93b1e9c12a5b543d3… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Mar 12 22:48:44 2022 +0100 setupapi: Add SetupDiGetClassRegistryPropertyW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52520 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b3f5cc6bd8..06d423373b8 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -336,6 +336,7 @@ @ stub SetupDiGetClassImageListExW @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW +@ stdcall SetupDiGetClassRegistryPropertyW(ptr long ptr ptr long ptr wstr ptr) @ stub SetupDiGetDeviceInfoListClass @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index af058b8eac8..4b1585c8df6 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -667,3 +667,12 @@ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWS FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags); return CR_SUCCESS; } + +BOOL WINAPI SetupDiGetClassRegistryPropertyW(const GUID *class, DWORD prop, DWORD *datatype, BYTE *buff, DWORD size, + DWORD *req_size, const WCHAR *name, VOID *reserved) +{ + FIXME("class %s, prop %ld, datatype %p, buff %p, size %ld, req_size %p, name %s, reserved %p stub!\n", + debugstr_guid(class), prop, datatype, buff, size, req_size, debugstr_w(name), reserved); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Gijs Vermeulen : include: Add more Wait Chain Traversal definitions.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: e3421d50fd1b1273e1d5758666c72e069a9597f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3421d50fd1b1273e1d57586… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 13 00:27:57 2022 +0100 include: Add more Wait Chain Traversal definitions. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wct.h | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/wct.h b/include/wct.h index 0cef59d7174..6c239786916 100644 --- a/include/wct.h +++ b/include/wct.h @@ -19,9 +19,85 @@ #ifndef __WINE_WCT_H #define __WINE_WCT_H +#ifdef __cplusplus +extern "C" { +#endif + +#define WCT_MAX_NODE_COUNT 16 +#define WCT_OBJNAME_LENGTH 128 + +#define WCT_ASYNC_OPEN_FLAG 0x1 +#define WCTP_OPEN_ALL_FLAGS (WCT_ASYNC_OPEN_FLAG) + +#define WCT_OUT_OF_PROC_FLAG 0x1 +#define WCT_OUT_OF_PROC_COM_FLAG 0x2 +#define WCT_OUT_OF_PROC_CS_FLAG 0x4 +#define WCT_NETWORK_IO_FLAG 0x8 +#define WCTP_GETINFO_ALL_FLAGS (WCT_OUT_OF_PROC_FLAG|WCT_OUT_OF_PROC_COM_FLAG|WCT_OUT_OF_PROC_CS_FLAG) + +typedef enum _WCT_OBJECT_TYPE +{ + WctCriticalSectionType = 1, + WctSendMessageType, + WctMutexType, + WctAlpcType, + WctComType, + WctThreadWaitType, + WctProcessWaitType, + WctThreadType, + WctComActivationType, + WctUnknownType, + WctSocketIoType, + WctSmbIoType, + WctMaxType +} WCT_OBJECT_TYPE; + +typedef enum _WCT_OBJECT_STATUS +{ + WctStatusNoAccess = 1, + WctStatusRunning, + WctStatusBlocked, + WctStatusPidOnly, + WctStatusPidOnlyRpcss, + WctStatusOwned, + WctStatusNotOwned, + WctStatusAbandoned, + WctStatusUnknown, + WctStatusError, + WctStatusMax +} WCT_OBJECT_STATUS; + +typedef struct _WAITCHAIN_NODE_INFO +{ + WCT_OBJECT_TYPE ObjectType; + WCT_OBJECT_STATUS ObjectStatus; + __C89_NAMELESS union { + struct { + WCHAR ObjectName[WCT_OBJNAME_LENGTH]; + LARGE_INTEGER Timeout; + BOOL Alertable; + } LockObject; + struct { + DWORD ProcessId; + DWORD ThreadId; + DWORD WaitTime; + DWORD ContextSwitches; + } ThreadObject; + }; +} WAITCHAIN_NODE_INFO, *PWAITCHAIN_NODE_INFO; + +typedef LPVOID HWCT; +typedef VOID (CALLBACK *PWAITCHAINCALLBACK) (HWCT,DWORD_PTR,DWORD,LPDWORD,PWAITCHAIN_NODE_INFO,LPBOOL); typedef HRESULT (WINAPI *PCOGETCALLSTATE)(int,PULONG); typedef HRESULT (WINAPI *PCOGETACTIVATIONSTATE)(GUID,DWORD,DWORD*); +VOID WINAPI CloseThreadWaitChainSession(HWCT); +BOOL WINAPI GetThreadWaitChain(HWCT,DWORD_PTR,DWORD,DWORD,LPDWORD,PWAITCHAIN_NODE_INFO,LPBOOL); +HWCT WINAPI OpenThreadWaitChainSession(DWORD,PWAITCHAINCALLBACK); void WINAPI RegisterWaitChainCOMCallback(PCOGETCALLSTATE,PCOGETACTIVATIONSTATE); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WCT_H */

1 0