wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Nikolay Sivov : vbscript: Handle null arguments in DateSerial().
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: f6d184fe8833e00484e65e8a30c1a4fa0d7a17bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d184fe8833e00484e65e8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 19 20:17:04 2022 +0300 vbscript: Handle null arguments in DateSerial(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 84d3344918a..5280730f19f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2095,6 +2095,9 @@ static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args assert(args_cnt == 3); + if (V_VT(args) == VT_NULL || V_VT(args + 1) == VT_NULL || V_VT(args + 2) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(args, &year); if (SUCCEEDED(hres)) hres = to_int(args + 1, &month); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d27c373a964..0e5b0ee6d37 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1972,12 +1972,23 @@ end sub sub testDateSerialError() on error resume next + dim x call Err.clear() call DateSerial(10000, 1, 1) call ok(Err.number = 5, "Err.number = " & Err.number) call Err.clear() call DateSerial(-10000, 1, 1) call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + x = DateSerial(null, 1, 1) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + call DateSerial(2000, null, 1) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call DateSerial(2000, 1, null) + call ok(Err.number = 94, "Err.number = " & Err.number) end sub call testDateSerial(100, 2, 1, 100, 2, 1)

1 0

Nikolay Sivov : vbscript: Implement Weekday().
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: da966b4d464e07cce58f5187439181abd2d52dde URL: https://source.winehq.org/git/wine.git/?a=commit;h=da966b4d464e07cce58f5187… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 19 20:17:03 2022 +0300 vbscript: Implement Weekday(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 46 ++++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 53 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1d3929ba249..84d3344918a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1982,10 +1982,50 @@ static HRESULT Global_Month(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wMonth); } -static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres = S_OK; + int first_day = 0; + SYSTEMTIME st; + + TRACE("(%s)\n", debugstr_variant(args)); + + assert(args_cnt == 1 || args_cnt == 2); + + /* [vbSunday = 1, vbSaturday = 7] -> wDayOfWeek [0, 6] */ + if (args_cnt == 2) + { + if (V_VT(args + 1) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args + 1, &first_day); + if (SUCCEEDED(hres)) + { + if (!first_day) + { + /* vbUseSystemDayOfWeek */ + GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, + sizeof(&first_day) / sizeof(WCHAR)); + first_day = (first_day + 1) % 7; + } + else if (first_day >= 1 && first_day <= 7) + { + first_day--; + } + else + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + } + + if (FAILED(hres)) + return hres; + + if (V_VT(args) == VT_NULL) + return return_null(res); + + if (FAILED(hres = to_system_time(args, &st))) return hres; + + return return_short(res, 1 + (7 - first_day + st.wDayOfWeek) % 7); } static HRESULT Global_Year(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..d27c373a964 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2036,4 +2036,57 @@ call testDateAdd(DateSerial(2000, 1, 1), "ww", -1, DateSerial(1999, 12, 25)) call testDateAdd(DateSerial(2000, 1, 1), "Ww", -1, DateSerial(1999, 12, 25)) call testDateAddError() +sub testWeekday(d, firstday, wd) + dim x, x2 + x = Weekday(d, firstday) + call ok(x = wd, "weekday = " & x & " expected " & wd) + call ok(getVT(x) = "VT_I2*", "getVT = " & getVT(x)) + if firstday = vbSunday then + x = Weekday(d) + call ok(x = wd, "weekday = " & x & " expected " & wd) + end if + x = Weekday(d, vbUseSystemDayOfWeek) + x2 = Weekday(d, firstDayOfWeek) + call ok(x = x2, "weekday = " & x & " expected " & x2) +end sub + +sub testWeekdayError() + on error resume next + dim x + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), 10) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, -1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + x = Weekday(null, vbSunday) + call ok(Err.number = 0, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_NULL*", "getVT = " & getVT(x)) + call Err.clear() + call Weekday(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call Weekday(null, "a") + call ok(Err.number = 13, "Err.number = " & Err.number) + call Err.clear() + call Weekday(DateSerial(1000, 1, 1), "a") + call ok(Err.number = 13, "Err.number = " & Err.number) +end sub + +call testWeekday(DateSerial(2000, 1, 1), vbSunday, 7) +call testWeekday(DateSerial(2000, 1, 1), vbMonday, 6) +call testWeekday(DateSerial(2000, 1, 1), vbTuesday, 5) +call testWeekday(DateSerial(2000, 1, 1), vbWednesday, 4) +call testWeekday(DateSerial(2000, 1, 1), vbThursday, 3) +call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) +call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) +call testWeekdayError() + Call reportSuccess()

1 0

Alistair Leslie-Hughes : d3drm: IDirect3DRMTexture3 Get/SetShades.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 0f44081775ee4fccd63a9af0823cfbe4ebb66acd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f44081775ee4fccd63a9af0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 13 13:19:15 2022 +1000 d3drm: IDirect3DRMTexture3 Get/SetShades. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 20 +++++++++++++++++++- dlls/d3drm/texture.c | 14 +++++++++----- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 9cebefb955a..44bf41fdabf 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -67,6 +67,7 @@ struct d3drm_texture LONG decal_x; LONG decal_y; DWORD max_colors; + DWORD max_shades; }; struct d3drm_frame diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0244892cdcf..426aa1fd28d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2707,7 +2707,7 @@ static void test_Texture(void) IDirect3DRMTexture3 *texture3; IDirectDrawSurface *surface; LONG decalx, decaly; - DWORD colors; + DWORD colors, shades; D3DRMIMAGE initimg = { @@ -2897,6 +2897,24 @@ static void test_Texture(void) hr = IDirect3DRMTexture_SetColors(texture1, 8); ok(hr == S_OK, "got %#lx.\n", hr); + shades = IDirect3DRMTexture_GetShades(texture1); + ok(shades == 16, "got %ld.\n", shades); + + hr = IDirect3DRMTexture_SetShades(texture1, 8); + ok(hr == S_OK, "got %#lx.\n", hr); + + shades = IDirect3DRMTexture_GetShades(texture1); + ok(shades == 8, "got %ld.\n", shades); + + hr = IDirect3DRMTexture_SetShades(texture1, 11); + ok(hr == S_OK, "got %#lx.\n", hr); + + shades = IDirect3DRMTexture_GetShades(texture1); + ok(shades == 11, "got %ld.\n", shades); + + hr = IDirect3DRMTexture_SetShades(texture1, 8); + ok(hr == S_OK, "got %#lx.\n", hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); ok(!!d3drm_img, "Failed to get image.\n"); ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 86fc5cd1595..76f82671811 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1183,9 +1183,12 @@ static HRESULT WINAPI d3drm_texture3_SetColors(IDirect3DRMTexture3 *iface, DWORD static HRESULT WINAPI d3drm_texture3_SetShades(IDirect3DRMTexture3 *iface, DWORD max_shades) { - FIXME("iface %p, max_shades %lu stub!\n", iface, max_shades); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + TRACE("iface %p, max_shades %lu\n", iface, max_shades); - return E_NOTIMPL; + texture->max_shades = max_shades; + + return S_OK; } static HRESULT WINAPI d3drm_texture3_SetDecalSize(IDirect3DRMTexture3 *iface, D3DVALUE width, D3DVALUE height) @@ -1258,9 +1261,9 @@ static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface) static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface) { - FIXME("iface %p stub!\n", iface); - - return 0; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + TRACE("iface %p\n", iface); + return texture->max_shades; } static DWORD WINAPI d3drm_texture3_GetColors(IDirect3DRMTexture3 *iface) @@ -1437,6 +1440,7 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; object->d3drm = d3drm; object->max_colors = 8; + object->max_shades = 16; d3drm_object_init(&object->obj, classname);

1 0

Alistair Leslie-Hughes : d3drm: IDirect3DRMTexture3 Get/SetColors.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 90b2a8e11e18c6e30ae9f640a563bc771c9ba48e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90b2a8e11e18c6e30ae9f640… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 13 13:14:09 2022 +1000 d3drm: IDirect3DRMTexture3 Get/SetColors. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 13 +++++++++++++ dlls/d3drm/texture.c | 14 +++++++++----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 26accb1e1fb..9cebefb955a 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -66,6 +66,7 @@ struct d3drm_texture IDirectDrawSurface *surface; LONG decal_x; LONG decal_y; + DWORD max_colors; }; struct d3drm_frame diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 82993e050d5..0244892cdcf 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2707,6 +2707,7 @@ static void test_Texture(void) IDirect3DRMTexture3 *texture3; IDirectDrawSurface *surface; LONG decalx, decaly; + DWORD colors; D3DRMIMAGE initimg = { @@ -2884,6 +2885,18 @@ static void test_Texture(void) hr = IDirect3DRMTexture_SetDecalOrigin(texture1, 0, 0); ok(hr == S_OK, "got %#lx.\n", hr); + colors = IDirect3DRMTexture_GetColors(texture1); + ok(colors == 8, "got %ld.\n", colors); + + hr = IDirect3DRMTexture_SetColors(texture1, 256); + ok(hr == S_OK, "got %#lx.\n", hr); + + colors = IDirect3DRMTexture_GetColors(texture1); + ok(colors == 256, "got %ld.\n", colors); + + hr = IDirect3DRMTexture_SetColors(texture1, 8); + ok(hr == S_OK, "got %#lx.\n", hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); ok(!!d3drm_img, "Failed to get image.\n"); ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 5e9dc37b3a6..86fc5cd1595 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1173,9 +1173,12 @@ static HRESULT WINAPI d3drm_texture3_Changed(IDirect3DRMTexture3 *iface, static HRESULT WINAPI d3drm_texture3_SetColors(IDirect3DRMTexture3 *iface, DWORD max_colors) { - FIXME("iface %p, max_colors %lu stub!\n", iface, max_colors); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + TRACE("iface %p, max_colors %lu\n", iface, max_colors); - return E_NOTIMPL; + texture->max_colors= max_colors; + + return S_OK; } static HRESULT WINAPI d3drm_texture3_SetShades(IDirect3DRMTexture3 *iface, DWORD max_shades) @@ -1262,9 +1265,9 @@ static DWORD WINAPI d3drm_texture3_GetShades(IDirect3DRMTexture3 *iface) static DWORD WINAPI d3drm_texture3_GetColors(IDirect3DRMTexture3 *iface) { - FIXME("iface %p stub!\n", iface); - - return 0; + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); + TRACE("iface %p\n", iface); + return texture->max_colors; } static DWORD WINAPI d3drm_texture3_GetDecalScale(IDirect3DRMTexture3 *iface) @@ -1433,6 +1436,7 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; object->d3drm = d3drm; + object->max_colors = 8; d3drm_object_init(&object->obj, classname);

1 0

Alistair Leslie-Hughes : d3drm: IDirect3DRMTexture3 Get/SetDecalOrigin.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 913c82e48c57984f1d87e3896faba35ef924bb40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913c82e48c57984f1d87e389… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 13 13:08:33 2022 +1000 d3drm: IDirect3DRMTexture3 Get/SetDecalOrigin. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/tests/d3drm.c | 17 +++++++++++++++++ dlls/d3drm/texture.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 4aea42ce0a3..26accb1e1fb 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -64,6 +64,8 @@ struct d3drm_texture IDirect3DRM *d3drm; D3DRMIMAGE *image; IDirectDrawSurface *surface; + LONG decal_x; + LONG decal_y; }; struct d3drm_frame diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 209ff7ec311..82993e050d5 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2706,6 +2706,7 @@ static void test_Texture(void) IDirect3DRMTexture2 *texture2; IDirect3DRMTexture3 *texture3; IDirectDrawSurface *surface; + LONG decalx, decaly; D3DRMIMAGE initimg = { @@ -2867,6 +2868,22 @@ static void test_Texture(void) test_object_name((IDirect3DRMObject *)texture2); test_object_name((IDirect3DRMObject *)texture3); + hr = IDirect3DRMTexture_GetDecalOrigin(texture1, &decalx, &decaly); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(decalx == 0, "got %ld.\n", decalx); + ok(decaly == 0, "got %ld.\n", decaly); + + hr = IDirect3DRMTexture_SetDecalOrigin(texture1, 1, 1); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = IDirect3DRMTexture_GetDecalOrigin(texture1, &decalx, &decaly); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(decalx == 1, "got %ld.\n", decalx); + ok(decaly == 1, "got %ld.\n", decaly); + + hr = IDirect3DRMTexture_SetDecalOrigin(texture1, 0, 0); + ok(hr == S_OK, "got %#lx.\n", hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); ok(!!d3drm_img, "Failed to get image.\n"); ok(d3drm_img == &initimg, "Expected image returned == %p, got %p.\n", &initimg, d3drm_img); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index c679100c6b7..5e9dc37b3a6 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1194,9 +1194,14 @@ static HRESULT WINAPI d3drm_texture3_SetDecalSize(IDirect3DRMTexture3 *iface, D3 static HRESULT WINAPI d3drm_texture3_SetDecalOrigin(IDirect3DRMTexture3 *iface, LONG x, LONG y) { - FIXME("iface %p, x %ld, y %ld stub!\n", iface, x, y); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, x %ld, y %ld\n", iface, x, y); + + texture->decal_x = x; + texture->decal_y = y; + + return S_OK; } static HRESULT WINAPI d3drm_texture3_SetDecalScale(IDirect3DRMTexture3 *iface, DWORD scale) @@ -1229,9 +1234,14 @@ static HRESULT WINAPI d3drm_texture3_GetDecalSize(IDirect3DRMTexture3 *iface, D3 static HRESULT WINAPI d3drm_texture3_GetDecalOrigin(IDirect3DRMTexture3 *iface, LONG *x, LONG *y) { - FIXME("iface %p, x %p, y %p stub!\n", iface, x, y); + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - return E_NOTIMPL; + TRACE("iface %p, x %p, y %p\n", iface, x, y); + + *x = texture->decal_x; + *y = texture->decal_y; + + return S_OK; } static D3DRMIMAGE * WINAPI d3drm_texture3_GetImage(IDirect3DRMTexture3 *iface)

1 0

Alistair Leslie-Hughes : d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: b8f67bf78d3f8ab091aebae9ddc0e9354144b26a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f67bf78d3f8ab091aebae9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 13 12:40:37 2022 +1000 d3drm: IDirect3DRMMeshBuilder2 Get/SetQuality. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/meshbuilder.c | 26 ++++++++++++++++++-------- dlls/d3drm/tests/d3drm.c | 13 +++++++++++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index b5d60e518f8..4aea42ce0a3 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -165,6 +165,7 @@ struct d3drm_mesh_builder DWORD nb_materials; struct mesh_material *materials; DWORD *material_indices; + D3DRMRENDERQUALITY quality; }; struct mesh_group diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4a08b32d72d..1f783baf1fe 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -670,9 +670,10 @@ static HRESULT WINAPI d3drm_mesh_builder2_SetTextureTopology(IDirect3DRMMeshBuil static HRESULT WINAPI d3drm_mesh_builder2_SetQuality(IDirect3DRMMeshBuilder2 *iface, D3DRMRENDERQUALITY quality) { - FIXME("iface %p, quality %#lx stub!\n", iface, quality); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); + TRACE("iface %p, quality %#lx\n", iface, quality); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetQuality(&mesh_builder->IDirect3DRMMeshBuilder3_iface, quality); } static HRESULT WINAPI d3drm_mesh_builder2_SetPerspective(IDirect3DRMMeshBuilder2 *iface, BOOL enable) @@ -815,9 +816,11 @@ static HRESULT WINAPI d3drm_mesh_builder2_CreateFace(IDirect3DRMMeshBuilder2 *if static D3DRMRENDERQUALITY WINAPI d3drm_mesh_builder2_GetQuality(IDirect3DRMMeshBuilder2 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface); - return 0; + TRACE("iface %p\n", iface); + + return mesh_builder->quality; } static BOOL WINAPI d3drm_mesh_builder2_GetPerspective(IDirect3DRMMeshBuilder2 *iface) @@ -1754,9 +1757,13 @@ static HRESULT WINAPI d3drm_mesh_builder3_SetTextureTopology(IDirect3DRMMeshBuil static HRESULT WINAPI d3drm_mesh_builder3_SetQuality(IDirect3DRMMeshBuilder3 *iface, D3DRMRENDERQUALITY quality) { - FIXME("iface %p, quality %#lx stub!\n", iface, quality); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - return E_NOTIMPL; + TRACE("iface %p, quality %#lx\n", iface, quality); + + mesh_builder->quality = quality; + + return S_OK; } static HRESULT WINAPI d3drm_mesh_builder3_SetPerspective(IDirect3DRMMeshBuilder3 *iface, @@ -1904,9 +1911,11 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateFace(IDirect3DRMMeshBuilder3 *if static D3DRMRENDERQUALITY WINAPI d3drm_mesh_builder3_GetQuality(IDirect3DRMMeshBuilder3 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - return 0; + TRACE("iface %p\n", iface); + + return mesh_builder->quality; } static BOOL WINAPI d3drm_mesh_builder3_GetPerspective(IDirect3DRMMeshBuilder3 *iface) @@ -2345,6 +2354,7 @@ HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDir object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &d3drm_mesh_builder3_vtbl; object->ref = 1; object->d3drm = d3drm; + object->quality = D3DRMRENDER_GOURAUD; IDirect3DRM_AddRef(object->d3drm); d3drm_object_init(&object->obj, classname); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7b591958373..209ff7ec311 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -863,6 +863,7 @@ static void test_Face(void) D3DCOLOR color; DWORD count; int icount; + D3DRMRENDERQUALITY quality; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr); @@ -934,6 +935,18 @@ static void test_Face(void) icount = IDirect3DRMFace_GetVertexCount(face1); ok(!icount, "wrong VertexCount: %i\n", icount); + quality = IDirect3DRMMeshBuilder3_GetQuality(MeshBuilder2); + ok(quality == D3DRMRENDER_GOURAUD, "Unexpected %lx.\n", quality); + + hr = IDirect3DRMMeshBuilder3_SetQuality(MeshBuilder2, D3DRMRENDER_PHONG); + ok(hr == S_OK, "got %lx.\n", hr); + + quality = IDirect3DRMMeshBuilder3_GetQuality(MeshBuilder2); + ok(quality == D3DRMRENDER_PHONG, "got %lx.\n", quality); + + hr = IDirect3DRMMeshBuilder3_SetQuality(MeshBuilder2, D3DRMRENDER_GOURAUD); + ok(hr == S_OK, "got %lx.\n", hr); + IDirect3DRMFace_Release(face1); IDirect3DRMMeshBuilder2_Release(MeshBuilder2);

1 0

Rémi Bernon : windows.gaming.input: Ignore IDirectInputDevice8_GetDeviceState failures.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 3c304287e7b83c3878dc97ddd3555ac7c48fcc94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c304287e7b83c3878dc97dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 10:50:13 2022 +0200 windows.gaming.input: Ignore IDirectInputDevice8_GetDeviceState failures. We will get hotplug notifications asynchronously, and returning an error here can cause uncaught C++ exceptions in games. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/provider.c b/dlls/windows.gaming.input/provider.c index 1f3f4e047f5..39229a35c7d 100644 --- a/dlls/windows.gaming.input/provider.c +++ b/dlls/windows.gaming.input/provider.c @@ -212,7 +212,7 @@ static HRESULT WINAPI wine_provider_get_State( IWineGameControllerProvider *ifac if (FAILED(hr = IDirectInputDevice8_GetDeviceState( impl->dinput_device, sizeof(state), &state ))) { WARN( "Failed to read device state, hr %#lx\n", hr ); - return hr; + return S_OK; } i = ARRAY_SIZE(state.rgbButtons);

1 0

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackEffect_get_State.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: b7f51783bb0ba540335b643cda8136cf045f562f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f51783bb0ba540335b643c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 29 14:02:03 2022 +0200 windows.gaming.input: Implement IForceFeedbackEffect_get_State. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 4 ---- dlls/windows.gaming.input/force_feedback.c | 21 +++++++++++++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 182bb9919bb..c7498e45727 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -6020,9 +6020,7 @@ static void test_windows_gaming_input(void) ok( hr == S_FALSE, "put_Gain returned %#lx\n", hr ); state = 0xdeadbeef; hr = IForceFeedbackEffect_get_State( effect, &state ); - todo_wine ok( hr == S_OK, "get_State returned %#lx\n", hr ); - todo_wine ok( state == ForceFeedbackEffectState_Stopped, "got state %#x\n", state ); hr = IForceFeedbackEffect_Start( effect ); todo_wine @@ -6260,9 +6258,7 @@ static void test_windows_gaming_input(void) ok( hr == S_FALSE, "put_Gain returned %#lx\n", hr ); state = 0xdeadbeef; hr = IForceFeedbackEffect_get_State( effect, &state ); - todo_wine ok( hr == S_OK, "get_State returned %#lx\n", hr ); - todo_wine ok( state == ForceFeedbackEffectState_Stopped, "get_State returned %#lx\n", hr ); hr = IForceFeedbackEffect_Start( effect ); todo_wine diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index 51d02171001..198268eac24 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -236,8 +236,25 @@ static HRESULT WINAPI effect_put_Gain( IForceFeedbackEffect *iface, DOUBLE value static HRESULT WINAPI effect_get_State( IForceFeedbackEffect *iface, ForceFeedbackEffectState *value ) { - FIXME( "iface %p, value %p stub!\n", iface, value ); - return E_NOTIMPL; + struct effect *impl = impl_from_IForceFeedbackEffect( iface ); + DWORD status; + HRESULT hr; + + TRACE( "iface %p, value %p.\n", iface, value ); + + EnterCriticalSection( &impl->cs ); + if (!impl->effect) + *value = ForceFeedbackEffectState_Stopped; + else if (FAILED(hr = IDirectInputEffect_GetEffectStatus( impl->effect, &status ))) + *value = ForceFeedbackEffectState_Faulted; + else + { + if (status == DIEGES_PLAYING) *value = ForceFeedbackEffectState_Running; + else *value = ForceFeedbackEffectState_Stopped; + } + LeaveCriticalSection( &impl->cs ); + + return S_OK; } static HRESULT WINAPI effect_Start( IForceFeedbackEffect *iface )

1 0

Rémi Bernon : windows.gaming.input: Implement IForceFeedbackEffect_(Start|Stop).
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: b2b1e6a4388b46d54971ca000690c77bdf544534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b1e6a4388b46d54971ca00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 29 14:01:32 2022 +0200 windows.gaming.input: Implement IForceFeedbackEffect_(Start|Stop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 18 ------------------ dlls/windows.gaming.input/force_feedback.c | 25 +++++++++++++++++++++---- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index c471a80de00..182bb9919bb 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5596,7 +5596,6 @@ static void test_windows_gaming_input(void) .report_id = 2, .report_len = 4, .report_buf = {2,0x01,0x01,0x01}, - .todo = TRUE, }; struct hid_expect expect_effect_stop = { @@ -5604,7 +5603,6 @@ static void test_windows_gaming_input(void) .report_id = 2, .report_len = 4, .report_buf = {2,0x01,0x03,0x00}, - .todo = TRUE, }; struct hid_expect expect_unload[] = { @@ -6103,20 +6101,16 @@ static void test_windows_gaming_input(void) set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, expect_unload, sizeof(expect_unload) ); @@ -6200,20 +6194,16 @@ static void test_windows_gaming_input(void) set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, expect_unload, sizeof(expect_unload) ); @@ -6299,20 +6289,16 @@ static void test_windows_gaming_input(void) set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, expect_unload, sizeof(expect_unload) ); @@ -6377,20 +6363,16 @@ static void test_windows_gaming_input(void) set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_start, sizeof(expect_effect_start) ); hr = IForceFeedbackEffect_Start( effect ); - todo_wine ok( hr == S_OK, "Start returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, &expect_effect_stop, sizeof(expect_effect_stop) ); hr = IForceFeedbackEffect_Stop( effect ); - todo_wine ok( hr == S_OK, "Stop returned %#lx\n", hr ); set_hid_expect( file, expect_unload, sizeof(expect_unload) ); diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c index dd10f86bd3e..51d02171001 100644 --- a/dlls/windows.gaming.input/force_feedback.c +++ b/dlls/windows.gaming.input/force_feedback.c @@ -242,14 +242,31 @@ static HRESULT WINAPI effect_get_State( IForceFeedbackEffect *iface, ForceFeedba static HRESULT WINAPI effect_Start( IForceFeedbackEffect *iface ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + struct effect *impl = impl_from_IForceFeedbackEffect( iface ); + HRESULT hr = E_UNEXPECTED; + DWORD flags = 0; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->cs ); + if (impl->effect) hr = IDirectInputEffect_Start( impl->effect, impl->repeat_count, flags ); + LeaveCriticalSection( &impl->cs ); + + return hr; } static HRESULT WINAPI effect_Stop( IForceFeedbackEffect *iface ) { - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; + struct effect *impl = impl_from_IForceFeedbackEffect( iface ); + HRESULT hr = E_UNEXPECTED; + + TRACE( "iface %p.\n", iface ); + + EnterCriticalSection( &impl->cs ); + if (impl->effect) hr = IDirectInputEffect_Stop( impl->effect ); + LeaveCriticalSection( &impl->cs ); + + return hr; } static const struct IForceFeedbackEffectVtbl effect_vtbl =

1 0

Rémi Bernon : winebus.sys: Add support for PID effect gain.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 4860e52924d6bb87889456d6f90afc040f6cb9c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4860e52924d6bb87889456d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 29 17:56:02 2022 +0200 winebus.sys: Add support for PID effect gain. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/winebus.sys/bus_udev.c | 8 ++++---- dlls/winebus.sys/hid.c | 9 +++++++++ dlls/winebus.sys/unix_private.h | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index a1e7942fe59..a5621972493 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -647,7 +647,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.periodic.direction.dir[0] = direction; effect.periodic.direction.dir[1] = params->direction[1]; effect.periodic.period = params->periodic.period; - effect.periodic.magnitude = params->periodic.magnitude; + effect.periodic.magnitude = (params->periodic.magnitude * params->gain_percent) / 100; effect.periodic.offset = params->periodic.offset; effect.periodic.phase = params->periodic.phase; effect.periodic.attack_length = params->envelope.attack_time; @@ -695,7 +695,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.constant.direction.type = SDL_HAPTIC_SPHERICAL; effect.constant.direction.dir[0] = direction; effect.constant.direction.dir[1] = params->direction[1]; - effect.constant.level = params->constant_force.magnitude; + effect.constant.level = (params->constant_force.magnitude * params->gain_percent) / 100; effect.constant.attack_length = params->envelope.attack_time; effect.constant.attack_level = params->envelope.attack_level; effect.constant.fade_length = params->envelope.fade_time; @@ -712,8 +712,8 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.ramp.direction.type = SDL_HAPTIC_SPHERICAL; effect.ramp.direction.dir[0] = params->direction[0]; effect.ramp.direction.dir[1] = params->direction[1]; - effect.ramp.start = params->ramp_force.ramp_start; - effect.ramp.end = params->ramp_force.ramp_end; + effect.ramp.start = (params->ramp_force.ramp_start * params->gain_percent) / 100; + effect.ramp.end = (params->ramp_force.ramp_end * params->gain_percent) / 100; effect.ramp.attack_length = params->envelope.attack_time; effect.ramp.attack_level = params->envelope.attack_level; effect.ramp.fade_length = params->envelope.fade_time; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 39573162afa..21a70d0829b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1138,7 +1138,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: effect.u.periodic.period = params->periodic.period; - effect.u.periodic.magnitude = params->periodic.magnitude; + effect.u.periodic.magnitude = (params->periodic.magnitude * params->gain_percent) / 100; effect.u.periodic.offset = params->periodic.offset; effect.u.periodic.phase = params->periodic.phase * 0x800 / 1125; effect.u.periodic.envelope.attack_length = params->envelope.attack_time; @@ -1172,7 +1172,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_CONSTANT_FORCE: - effect.u.constant.level = params->constant_force.magnitude; + effect.u.constant.level = (params->constant_force.magnitude * params->gain_percent) / 100; effect.u.constant.envelope.attack_length = params->envelope.attack_time; effect.u.constant.envelope.attack_level = params->envelope.attack_level; effect.u.constant.envelope.fade_length = params->envelope.fade_time; @@ -1180,8 +1180,8 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B break; case PID_USAGE_ET_RAMP: - effect.u.ramp.start_level = params->ramp_force.ramp_start; - effect.u.ramp.end_level = params->ramp_force.ramp_end; + effect.u.ramp.start_level = (params->ramp_force.ramp_start * params->gain_percent) / 100; + effect.u.ramp.end_level = (params->ramp_force.ramp_end * params->gain_percent) / 100; effect.u.ramp.envelope.attack_length = params->envelope.attack_time; effect.u.ramp.envelope.attack_level = params->envelope.attack_level; effect.u.ramp.envelope.fade_length = params->envelope.fade_time; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index de0c3bb0848..8ed8c752893 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -487,6 +487,7 @@ struct pid_effect_update UINT16 trigger_repeat_interval; UINT16 sample_period; UINT16 start_delay; + BYTE gain_percent; BYTE trigger_button; BYTE enable_bits; UINT16 direction[2]; @@ -909,6 +910,13 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co UNIT_EXPONENT(1, 0), UNIT(1, 0), /* None */ + USAGE(1, PID_USAGE_GAIN), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 100), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs|Null), + USAGE(1, PID_USAGE_TRIGGER_BUTTON), LOGICAL_MINIMUM(1, 0), LOGICAL_MAXIMUM(2, state->button_count), @@ -1181,6 +1189,7 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->trigger_repeat_interval = report->trigger_repeat_interval; params->sample_period = report->sample_period; params->start_delay = report->start_delay; + params->gain_percent = report->gain_percent; params->trigger_button = report->trigger_button == 0xff ? 0 : report->trigger_button; params->axis_enabled[0] = (report->enable_bits & 1) != 0; params->axis_enabled[1] = (report->enable_bits & 2) != 0; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index ab8060611a4..f94a243d887 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -78,6 +78,7 @@ struct effect_params BOOL axis_enabled[2]; BOOL direction_enabled; UINT16 direction[2]; + BYTE gain_percent; BYTE condition_count; /* only for periodic, constant or ramp forces */ struct effect_envelope envelope;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022