February 2020 - Wine-Commits

Zebediah Figura : ddraw: Stop setting the device state when setting sampler states.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: e1926af200ce0a338fa085d8cb70bcb99c9db8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1926af200ce0a338fa085d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:28 2020 -0600 ddraw: Stop setting the device state when setting sampler states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 87 +++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1926af200ce0a338fa0…

1 0

Matteo Bruni : wined3d: Rename struct wined3d_map_range to struct wined3d_range.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: 8d87bce071f142399ceb8b9674f6fd7160f407c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d87bce071f142399ceb8b96… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:10 2020 +0100 wined3d: Rename struct wined3d_map_range to struct wined3d_range. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 20 ++++++++++---------- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 14 +++++++------- 8 files changed, 28 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d87bce071f142399ceb…

1 0

Matteo Bruni : wined3d: Optimize scanning changed render states in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: 3b27222aa2c1c85324ca0e03b119635dc031b435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b27222aa2c1c85324ca0e03… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:13 2020 +0100 wined3d: Optimize scanning changed render states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64cc80780d..e706c830d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3929,22 +3929,25 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_blend_state(device, blend_state, &colour); } - for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + for (i = 0; i < ARRAY_SIZE(changed->renderState); ++i) { - if (!wined3d_bitmap_is_set(changed->renderState, i)) - continue; - - if (i != WINED3D_RS_BLENDFACTOR) + map = changed->renderState[i]; + while (map) { - wined3d_device_set_render_state(device, i, state->rs[i]); - continue; - } + j = wined3d_bit_scan(&map); + idx = i * word_bit_count + j; + if (idx != WINED3D_RS_BLENDFACTOR) + { + wined3d_device_set_render_state(device, idx, state->rs[idx]); + continue; + } - if (!set_blend_state) - { - blend_state = wined3d_device_get_blend_state(device, &colour); - wined3d_color_from_d3dcolor(&colour, state->rs[i]); - wined3d_device_set_blend_state(device, blend_state, &colour); + if (!set_blend_state) + { + blend_state = wined3d_device_get_blend_state(device, &colour); + wined3d_color_from_d3dcolor(&colour, state->rs[idx]); + wined3d_device_set_blend_state(device, blend_state, &colour); + } } }

1 0

Matteo Bruni : wined3d: Optimize scanning changed transform states in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: fd816f263ea246a963b9bf7aae86a096764b98d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd816f263ea246a963b9bf7a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:12 2020 +0100 wined3d: Optimize scanning changed transform states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fa675f5729..64cc80780d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3837,10 +3837,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; + const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; struct wined3d_blend_state *blend_state; + unsigned int i, j, start, idx; struct wined3d_color colour; struct wined3d_range range; - unsigned int i, j, start; BOOL set_blend_state; DWORD map; @@ -3968,10 +3969,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + for (i = 0; i < ARRAY_SIZE(changed->transform); ++i) { - if (wined3d_bitmap_is_set(changed->transform, i)) - wined3d_device_set_transform(device, i, &state->transforms[i]); + map = changed->transform[i]; + while (map) + { + j = wined3d_bit_scan(&map); + idx = i * word_bit_count + j; + wined3d_device_set_transform(device, idx, &state->transforms[idx]); + } } if (changed->indices)

1 0

Matteo Bruni : d3d8: Fix texture stage index checks.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: 565f7b4494785b24efc60220c05b9c5e5b5c9930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=565f7b4494785b24efc60220… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:09 2020 +0100 d3d8: Fix texture stage index checks. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 869a6a2dd0..9793eda0c3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2159,10 +2159,7 @@ static HRESULT WINAPI d3d8_device_GetTexture(IDirect3DDevice8 *iface, DWORD stag if (!texture) return D3DERR_INVALIDCALL; - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - - if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) { WARN("Ignoring invalid stage %u.\n", stage); *texture = NULL; @@ -2253,10 +2250,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - - if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) { WARN("Invalid stage %u.\n", stage); *value = 0;

1 0

Zebediah Figura : ddraw: Retrieve sampler states from the primary stateblock.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: 4eb5312c4ec951944e2edcd75213297e7101efae URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb5312c4ec951944e2edcd7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:27 2020 -0600 ddraw: Retrieve sampler states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f189d32d95..ec9997c6cb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2317,9 +2317,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, { case D3DRENDERSTATE_TEXTUREMAG: { - enum wined3d_texture_filter_type tex_mag; + enum wined3d_texture_filter_type tex_mag = device_state->sampler_states[0][WINED3D_SAMP_MAG_FILTER]; - tex_mag = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MAG_FILTER); switch (tex_mag) { case WINED3D_TEXF_POINT: @@ -2340,8 +2339,8 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, enum wined3d_texture_filter_type tex_min; enum wined3d_texture_filter_type tex_mip; - tex_min = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIN_FILTER); - tex_mip = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_MIP_FILTER); + tex_min = device_state->sampler_states[0][WINED3D_SAMP_MIN_FILTER]; + tex_mip = device_state->sampler_states[0][WINED3D_SAMP_MIP_FILTER]; switch (tex_min) { case WINED3D_TEXF_POINT: @@ -2390,10 +2389,10 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREADDRESS: case D3DRENDERSTATE_TEXTUREADDRESSU: - *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_U); + *value = device_state->sampler_states[0][WINED3D_SAMP_ADDRESS_U]; break; case D3DRENDERSTATE_TEXTUREADDRESSV: - *value = wined3d_device_get_sampler_state(device->wined3d_device, 0, WINED3D_SAMP_ADDRESS_V); + *value = device_state->sampler_states[0][WINED3D_SAMP_ADDRESS_V]; break; case D3DRENDERSTATE_BORDERCOLOR: @@ -4951,6 +4950,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + const struct wined3d_stateblock_state *device_state; const struct tss_lookup *l; TRACE("iface %p, stage %u, state %#x, value %p.\n", @@ -4965,13 +4965,22 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, return DD_OK; } + if (stage >= DDRAW_MAX_TEXTURES) + { + WARN("Invalid stage %u.\n", stage); + *value = 0; + return D3D_OK; + } + l = &tss_lookup[state]; wined3d_mutex_lock(); + device_state = wined3d_stateblock_get_state(device->state); + if (l->sampler_state) { - *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->u.sampler_state); + *value = device_state->sampler_states[stage][l->u.sampler_state]; switch (state) { @@ -5031,7 +5040,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, } else { - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->u.texture_state); + *value = device_state->texture_states[stage][l->u.texture_state]; } wined3d_mutex_unlock();

1 0

Zebediah Figura : ddraw: Retrieve textures from the primary stateblock.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: 7b3419375d827dcabe9b66ac86b46c28839a41b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b3419375d827dcabe9b66ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:25 2020 -0600 ddraw: Retrieve textures from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4ecd83d006..088092830c 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -68,6 +68,7 @@ struct FvfToDecl | WINED3D_LEGACY_CUBEMAP_FILTERING) #define DDRAW_MAX_ACTIVE_LIGHTS 32 +#define DDRAW_MAX_TEXTURES 8 enum ddraw_device_state { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e18c2c7853..575050acd2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2462,7 +2462,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, *value = 0; wined3d_mutex_lock(); - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ @@ -2699,7 +2699,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) return; - if ((tex = wined3d_device_get_texture(device->wined3d_device, 0))) + if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) { struct wined3d_resource_desc desc; @@ -4759,8 +4759,15 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, if (!texture) return DDERR_INVALIDPARAMS; + if (stage >= DDRAW_MAX_TEXTURES) + { + WARN("Invalid stage %u.\n", stage); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if (!(wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if (!(wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[stage])) { *texture = NULL; wined3d_mutex_unlock();

1 0

Jacek Caban : winebuild: Check more target components for platform string.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: d24503fecf4d831fdd8d78bd5ddb850957b7402c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d24503fecf4d831fdd8d78bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 13:37:51 2020 +0100 winebuild: Check more target components for platform string. Fixes parsing llvm style mingw target *-pc-windows-gnu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index ca8f8af03a..e30ecdd4b5 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -197,7 +197,7 @@ static void set_subsystem( const char *subsystem, DLLSPEC *spec ) static void set_target( const char *target ) { unsigned int i; - char *p, *platform, *spec = xstrdup( target ); + char *p, *spec = xstrdup( target ); /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ @@ -213,13 +213,11 @@ static void set_target( const char *target ) cpu = get_cpu_from_name( spec ); if (cpu == -1) fatal_error( "Unrecognized CPU '%s'\n", spec ); target_cpu = cpu; - platform = p; - if ((p = strrchr( p, '-' ))) platform = p + 1; } else if (!strcmp( spec, "mingw32" )) { target_cpu = CPU_x86; - platform = spec; + p = spec; } else fatal_error( "Invalid target specification '%s'\n", target ); @@ -227,13 +225,18 @@ static void set_target( const char *target ) /* get the OS part */ target_platform = PLATFORM_UNSPECIFIED; /* default value */ - for (i = 0; i < ARRAY_SIZE(platform_names); i++) + for (;;) { - if (!strncmp( platform_names[i].name, platform, strlen(platform_names[i].name) )) + for (i = 0; i < ARRAY_SIZE(platform_names); i++) { - target_platform = platform_names[i].platform; - break; + if (!strncmp( platform_names[i].name, p, strlen(platform_names[i].name) )) + { + target_platform = platform_names[i].platform; + break; + } } + if (target_platform != PLATFORM_UNSPECIFIED || !(p = strchr( p, '-' ))) break; + p++; } free( spec );

1 0

Lauri Kenttä : oledb32: Resize dialog fields to accomodate translations.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: aeb454541a2101047de0ecbb9bdb9d06c6a252a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeb454541a2101047de0ecbb… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 27 13:36:12 2020 +0200 oledb32: Resize dialog fields to accomodate translations. Needed for German (7), Finnish (11), French (12), Lithuanian (39). Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/version.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 080e444eb7..247709dec2 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -68,17 +68,17 @@ BEGIN LTEXT "Specify the following to connect to ODBC data:",-1,7,7,213,8 LTEXT "1. Specify the source of data:",IDC_LBL_SOURCE,14,18,206,8 CONTROL "Use &data source name",IDC_RDO_SRC_NAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,29,29,192,10 - COMBOBOX IDC_CBO_NAMES,36,40,150,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,189,39,31,14 + COMBOBOX IDC_CBO_NAMES,36,40,120,128,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Refresh",IDC_BTN_REFRESH,159,39,61,14 CONTROL "Use c&onnection string",IDC_BTN_CONNECTION,"Button",BS_AUTORADIOBUTTON,29,57,192,10 LTEXT "&Connection string:",IDC_LBL_CONNECTION,36,68,182,8 - EDITTEXT IDC_EDT_CONNECTION,36,78,148,12,ES_AUTOHSCROLL - PUSHBUTTON "B&uild...",IDC_BTN_BUILD,189,77,31,14 + EDITTEXT IDC_EDT_CONNECTION,36,78,118,12,ES_AUTOHSCROLL + PUSHBUTTON "B&uild...",IDC_BTN_BUILD,159,77,61,14 LTEXT "2. Enter information to log on to the server",IDC_LBL_LOGIN,14,98,206,8 - LTEXT "User &name:",-1,29,110,38,8 - EDITTEXT IDC_EDT_NAME,67,108,153,12,ES_AUTOHSCROLL - LTEXT "&Password:",-1,29,126,34,8 - EDITTEXT IDC_EDT_PASSWORD,67,124,153,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "User &name:",-1,29,110,58,8 + EDITTEXT IDC_EDT_NAME,87,108,133,12,ES_AUTOHSCROLL + LTEXT "&Password:",-1,29,126,58,8 + EDITTEXT IDC_EDT_PASSWORD,87,124,133,12,ES_PASSWORD | ES_AUTOHSCROLL CONTROL "&Blank password",IDC_CHK_BLANK,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,29,140,69,10 CONTROL "Allow &saving password",IDC_CHK_SAVE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,103,140,103,10 LTEXT "3. Enter the &initial catalog to use:",IDC_LBL_INITIAL,14,159,206,8 @@ -111,5 +111,5 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_LST_PROPERTIES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,33,213,155 LTEXT "These are the initialization properties for this type of data. To edit a value, select a property, then choose Edit Value below.",-1,7,7,213,23 - PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT_ALL,7,194,60,14 + PUSHBUTTON "&Edit Value...",IDC_BTN_EDIT_ALL,7,194,100,14 END

1 0

Gabriel Ivăncescu : hid: Implement HidP_GetUsageValueArray.
by Alexandre Julliard Feb. 27, 2020

Feb. 27, 2020

Module: wine Branch: master Commit: ec88633912442e0e0c6e11cfdb395ff653e9e951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec88633912442e0e0c6e11cf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 26 15:03:46 2020 +0200 hid: Implement HidP_GetUsageValueArray. Games like Risk of Rain 2 need this with certain controllers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/hid/tests/device.c | 37 ++++++++++++++++++++++++---- include/ddk/hidpi.h | 1 + 4 files changed, 99 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b8e29fef16..98508a456c 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -27,7 +27,7 @@ @ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) -@ stub HidP_GetUsageValueArray +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 817e021fe4..c4d162695a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -117,6 +117,46 @@ static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } +static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT startBit, UINT elemSize, + UINT numElements, PCHAR values, UINT valuesSize) +{ + BYTE byte, *end, *p = report + startBit / 8; + ULONG size = elemSize * numElements; + ULONG m, bit_index = startBit % 8; + BYTE *data = (BYTE*)values; + + if ((startBit + size) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valuesSize < (size + 7) / 8) + return HIDP_STATUS_BUFFER_TOO_SMALL; + + end = report + (startBit + size + 7) / 8; + + data--; + byte = *p++; + while (p != end) + { + *(++data) = byte >> bit_index; + byte = *p++; + *data |= byte << (8 - bit_index); + } + + /* Handle the end and mask out bits beyond */ + m = (startBit + size) % 8; + m = m ? m : 8; + + if (m > bit_index) + *(++data) = (byte >> bit_index) & ((1 << (m - bit_index)) - 1); + else + *data &= (1 << (m + 8 - bit_index)) - 1; + + if (++data < (BYTE*)values + valuesSize) + memset(data, 0, (BYTE*)values + valuesSize - data); + + return HIDP_STATUS_SUCCESS; +} + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) @@ -325,6 +365,31 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, } +NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %p, %u, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + UsageValueByteLength, PreparsedData, Report, ReportLength); + + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + if (element.caps.value.IsRange || element.caps.value.ReportCount <= 1 || !element.bitCount) + return HIDP_STATUS_NOT_VALUE_ARRAY; + + return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, + element.caps.value.ReportCount, UsageValue, UsageValueByteLength); + } + + return rc; +} + + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 24c307704f..3dd22b7f06 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -253,11 +253,38 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D trace("\tValues:\n"); for (i = 0; i < length; i++) { - status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, - values[i].Range.UsageMin, &value, ppd, data, data_length); - ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", - values[i].UsagePage, values[i].Range.UsageMin, status); - trace("[%02x, %02x]: %u\n",values[i].UsagePage, values[i].Range.UsageMin, value); + ok(values[i].ReportCount, "Zero ReportCount for [%i,%i]\n", values[i].UsagePage, values[i].NotRange.Usage); + if (values[i].IsRange || values[i].ReportCount <= 1) + { + status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, + values[i].Range.UsageMin, &value, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", + values[i].UsagePage, values[i].Range.UsageMin, status); + trace("[%02x, %02x]: %u\n", values[i].UsagePage, values[i].Range.UsageMin, value); + } + else + { + USHORT k, array_size = (values[i].BitSize * values[i].ReportCount + 7) / 8; + PCHAR array = HeapAlloc(GetProcessHeap(), 0, array_size); + char *dump = HeapAlloc(GetProcessHeap(), 0, array_size * 3 + 1); + + status = HidP_GetUsageValueArray(HidP_Input, values[i].UsagePage, 0, + values[i].NotRange.Usage, array, array_size, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value array [%i,%i] (%x)\n", + values[i].UsagePage, values[i].NotRange.Usage, status); + dump[0] = 0; + for (k = 0; k < array_size; k++) + { + char bytestr[5]; + sprintf(bytestr, " %02x", (BYTE)array[k]); + strcat(dump, bytestr); + } + trace("[%02x, %02x] element bit size %u num elements %u:%s\n", values[i].UsagePage, + values[i].NotRange.Usage, values[i].BitSize, values[i].ReportCount, dump); + + HeapFree(GetProcessHeap(), 0, dump); + HeapFree(GetProcessHeap(), 0, array); + } } HeapFree(GetProcessHeap(), 0, values); diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 51d61ea854..fb497f3282 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -195,6 +195,7 @@ NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAP NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData);

1 0