March 2020 - Wine-Commits - list.winehq.org

Paul Gofman : d3d11: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: fa990afbbc4ac09f06be847d35e47389364acf98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa990afbbc4ac09f06be847d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 25 21:28:07 2020 +0300 d3d11: Use stricmp() instead of _strnicmp(..., -1). Fixes Epic Games Launcher crash with native ucrtbase.dll. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 2 +- dlls/d3d11/shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 9bee927a7b..e27984212b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -30,7 +30,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx + if (!stricmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6bec79740b..d51d8e4e60 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1024,7 +1024,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) + && !stricmp(e1->SemanticName, e2->SemanticName) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent)

1 0

Zebediah Figura : mountmgr: Return STATUS_BUFFER_OVERFLOW from query_unix_drive() if the buffer is too small.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 2d0e113db15fc6109d0b44502cda40727ff04fa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0e113db15fc6109d0b4450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 25 18:17:03 2020 -0500 mountmgr: Return STATUS_BUFFER_OVERFLOW from query_unix_drive() if the buffer is too small. STATUS_MORE_ENTRIES is meant for enumeration APIs like NtQueryDirectoryFile(); we are not enumerating anything here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index dd3a3932b4..222395fadf 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -330,7 +330,7 @@ static NTSTATUS query_unix_drive( void *buff, SIZE_T insize, output->type = type; iosb->Information = FIELD_OFFSET( struct mountmgr_unix_drive, type ) + sizeof(output->type); } - status = STATUS_MORE_ENTRIES; + status = STATUS_BUFFER_OVERFLOW; goto done; }

1 0

Matteo Bruni : wined3d: Store the framebuffer inline in struct wined3d_state.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: e11ae91b9cb27a7f95baa7a9cfe1d50fb04155f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e11ae91b9cb27a7f95baa7a9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 13:25:57 2020 +0100 wined3d: Store the framebuffer inline in struct wined3d_state. 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/arb_program_shader.c | 4 +-- dlls/wined3d/context.c | 10 +++---- dlls/wined3d/cs.c | 34 ++++++++++++------------ dlls/wined3d/device.c | 56 +++++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 6 ++--- dlls/wined3d/state.c | 30 ++++++++++----------- dlls/wined3d/stateblock.c | 4 +-- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 4 +-- dlls/wined3d/wined3d_private.h | 11 +++----- 11 files changed, 81 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e11ae91b9cb27a7f95ba…

1 0

Alexandre Julliard : krnl386: Get rid of DOS parallel port I/O support.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: d637640f9af4ccfb6639361fc548d4bbeaafeb6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d637640f9af4ccfb6639361f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 16:49:17 2020 +0100 krnl386: Get rid of DOS parallel port I/O support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 35 ----- configure.ac | 12 -- dlls/krnl386.exe16/ioports.c | 318 ------------------------------------------- include/config.h.in | 3 - 4 files changed, 368 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d637640f9af4ccfb6639…

1 0

Alexandre Julliard : user.exe: Clear out the thunk array to catch invalid winprocs.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 64bd952b85eb183d97b438a3d2695b2bf78d17ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bd952b85eb183d97b438a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 15:31:21 2020 +0100 user.exe: Clear out the thunk array to catch invalid winprocs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48814 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 14e7a19889..e3ca3fd779 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -152,7 +152,8 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) { assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); - if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) + if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, + MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector );

1 0

Brendan Shanks : dinput: Fix IDirectInputEffect::SetParameters() behavior with NULL effect parameters.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: f66517b5a27057243912f3a7c4a41a291ab2bfb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f66517b5a27057243912f3a7… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Mar 25 16:31:30 2020 -0700 dinput: Fix IDirectInputEffect::SetParameters() behavior with NULL effect parameters. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 8 +++++++- dlls/dinput/tests/joystick.c | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index cc2df3ce87..ef21ecaa30 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -499,6 +499,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( dump_DIEFFECT(peff, &This->guid, dwFlags); if (dwFlags & DIEP_AXES) { + if (!(peff->rgdwAxes)) + return DIERR_INVALIDPARAM; + /* the linux input effect system only supports one or two axes */ if (peff->cAxes > 2) return DIERR_INVALIDPARAM; @@ -511,6 +514,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( * different opinions about which way direction "0" is. directx has 0 along the x * axis (left), linux has it along the y axis (down). */ if (dwFlags & DIEP_DIRECTION) { + if (!(peff->rglDirection)) + return DIERR_INVALIDPARAM; + if (peff->cAxes == 1) { if (peff->dwFlags & DIEFF_CARTESIAN) { if (dwFlags & DIEP_AXES) { @@ -629,7 +635,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( if (dwFlags & DIEP_TYPESPECIFICPARAMS) { if (!(peff->lpvTypeSpecificParams)) - return DIERR_INCOMPLETEEFFECT; + return DIERR_INVALIDPARAM; if (type == DIEFT_PERIODIC) { diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index fb777e71ae..a3d7440367 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -606,7 +606,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK,"IDirectInputEffect_Initialize failed: %08x\n", hr); /* Test SetParameters with NULL pointers */ - todo_wine { tmp = effect_data.eff.rgdwAxes; effect_data.eff.rgdwAxes = NULL; hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES); @@ -624,7 +623,6 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_TYPESPECIFICPARAMS); ok(hr==DIERR_INVALIDPARAM,"IDirectInputEffect_SetParameters should fail with INVALIDPARAM, got: %08x\n", hr); effect_data.eff.lpvTypeSpecificParams = tmp; - } hr = IDirectInputEffect_SetParameters(effect, &effect_data.eff, DIEP_AXES | DIEP_DIRECTION | DIEP_TYPESPECIFICPARAMS);

1 0

Alexandre Julliard : krnl386: Get rid of DOS SCSI ioctl support.
by Alexandre Julliard March 26, 2020

March 26, 2020

Module: wine Branch: master Commit: 7b10b02411258c837191f7a8a429451108fd1be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b10b02411258c837191f7a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 16:49:07 2020 +0100 krnl386: Get rid of DOS SCSI ioctl support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/int21.c | 280 ++++++--------------------------------------- 1 file changed, 37 insertions(+), 243 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b10b02411258c837191…

1 0

Connor McAdams : d3d10: Apply shader resources for shaders used in pass.
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: ab0a3cb2ff5378f6ab5dd79712547dc43a484100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0a3cb2ff5378f6ab5dd797… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Mar 25 14:16:27 2020 -0400 d3d10: Apply shader resources for shaders used in pass. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e2c18ce049..3d397a38eb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3619,9 +3619,119 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno return &null_variable.ID3D10EffectVariable_iface; } +static void update_buffer(ID3D10Device *device, struct d3d10_effect_variable *v) +{ + struct d3d10_effect_buffer_variable *b = &v->u.buffer; + + if (!b->changed) + return; + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)b->buffer, 0, NULL, + b->local_buffer, v->data_size, 0); + + b->changed = FALSE; +} + +static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShaderVariable *variable) +{ + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(variable); + struct d3d10_effect_shader_variable *sv = &v->u.shader; + struct d3d10_effect_shader_resource *sr; + struct d3d10_effect_variable *rsrc_v; + ID3D10ShaderResourceView **srv; + unsigned int i; + + for (i = 0; i < sv->resource_count; ++i) + { + sr = &sv->resources[i]; + rsrc_v = sr->variable; + + switch (sr->in_type) + { + case D3D10_SIT_CBUFFER: + update_buffer(device, rsrc_v); + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.buffer.buffer); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.buffer.buffer); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetConstantBuffers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.buffer.buffer); + break; + + default: + WARN("Incorrect shader type to bind constant buffer.\n"); + break; + } + break; + + case D3D10_SIT_TBUFFER: + update_buffer(device, rsrc_v); + srv = &rsrc_v->u.buffer.resource_view; + + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetShaderResources(device, sr->bind_point, sr->bind_count, srv); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetShaderResources(device, sr->bind_point, sr->bind_count, srv); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetShaderResources(device, sr->bind_point, sr->bind_count, srv); + break; + + default: + WARN("Incorrect shader type to bind shader resource view.\n"); + break; + } + break; + + case D3D10_SIT_SAMPLER: + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetSamplers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.state.object.sampler); + break; + + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetSamplers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.state.object.sampler); + break; + + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetSamplers(device, sr->bind_point, sr->bind_count, + &rsrc_v->u.state.object.sampler); + break; + + default: + WARN("Incorrect shader type to bind sampler.\n"); + break; + } + break; + + default: + WARN("Unhandled shader resource %#x.\n", sr->in_type); + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); + ID3D10Device *device = pass->technique->effect->device; HRESULT hr = S_OK; unsigned int i; @@ -3629,9 +3739,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (flags) FIXME("Ignoring flags (%#x)\n", flags); - for (i = 0; i < This->object_count; ++i) + if (pass->vs.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) + apply_shader_resources(device, pass->vs.pShaderVariable); + if (pass->gs.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) + apply_shader_resources(device, pass->gs.pShaderVariable); + if (pass->ps.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) + apply_shader_resources(device, pass->ps.pShaderVariable); + + for (i = 0; i < pass->object_count; ++i) { - hr = d3d10_effect_object_apply(&This->objects[i]); + hr = d3d10_effect_object_apply(&pass->objects[i]); if (FAILED(hr)) break; }

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::GetFirstRow().
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 6f14d858dee1d1b84f76d27d509a3a7cb800189c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f14d858dee1d1b84f76d27d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:18:13 2020 +0800 adsldp: Implement IDirectorySearch::GetFirstRow(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 53f766565c..264408c365 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -398,7 +398,8 @@ typedef struct struct ldap_search_context { - LDAPMessage *res; + LDAPMessage *res, *entry; + ULONG count, pos; }; static inline LDAP_namespace *impl_from_IADs(IADs *iface) @@ -1197,8 +1198,20 @@ static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_H static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { - FIXME("%p,%p: stub\n", iface, res); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + + TRACE("%p,%p\n", iface, res); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res) return E_ADS_BAD_PARAMETER; + + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + + return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; } static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)

1 0

Dmitry Timoshkov : adsldp: Implement IDirectorySearch::GetNextRow().
by Alexandre Julliard March 25, 2020

March 25, 2020

Module: wine Branch: master Commit: 093616eede952dc1a19e9c2f8be1d6119c8253c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=093616eede952dc1a19e9c2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 25 11:18:16 2020 +0800 adsldp: Implement IDirectorySearch::GetNextRow(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 264408c365..4957828391 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1216,8 +1216,31 @@ static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HAN static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { - FIXME("%p,%p: stub\n", iface, res); - return E_NOTIMPL; + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + struct ldap_search_context *ldap_ctx = res; + + TRACE("%p,%p\n", iface, res); + + if (!ldap->ld) return E_NOTIMPL; + + if (!res) return E_ADS_BAD_PARAMETER; + + if (!ldap_ctx->entry) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + } + else + { + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->res); + ldap_ctx->pos++; + } + + return ldap_ctx->entry ? S_OK : S_ADS_NOMORE_ROWS; } static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res)

1 0