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

Brendan Shanks : dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: f925becd4af104b196440442c50858ea88d3cf17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f925becd4af104b196440442… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 24 17:13:36 2020 -0700 dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 01611b0e44..19dd9ad736 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -207,7 +207,7 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - rglDirection: %p\n", eff->rglDirection); - if (dwFlags & DIEP_DIRECTION) { + if (dwFlags & DIEP_DIRECTION && eff->rglDirection) { TRACE(" "); for (i = 0; i < eff->cAxes; ++i) TRACE("%d ", eff->rglDirection[i]);

1 0

Paul Gofman : d3dx9: Validate state operation in d3dx_parse_state().
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 2b5b069dd70ba328dc0ce660861ad802feae912c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5b069dd70ba328dc0ce660… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 24 20:59:38 2020 +0300 d3dx9: Validate state operation in d3dx_parse_state(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 525b87340b..345bee3c3a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5564,6 +5564,12 @@ static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *s state->type = ST_CONSTANT; read_dword(ptr, &state->operation); + if (state->operation >= ARRAY_SIZE(state_table)) + { + WARN("Unknown state operation %u.\n", state->operation); + return D3DERR_INVALIDCALL; + } + TRACE("Operation: %#x (%s)\n", state->operation, state_table[state->operation].name); read_dword(ptr, &state->index);

1 0

Zebediah Figura : d3dcompiler: Store a pointer to the bwriter_shader structure inside the bc_writer structure.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 8ea5b759ef6d353bff50fd1ca5873d683e8ccc7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea5b759ef6d353bff50fd1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 24 19:18:33 2020 -0500 d3dcompiler: Store a pointer to the bwriter_shader structure inside the bc_writer structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/bytecodewriter.c | 30 +++++++++++++++++++----------- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 8b016cd620..35bd6669ef 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -939,7 +939,8 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERVS_VERSION(2, 1)){ + if (This->shader->major_version != 2 || This->shader->minor_version != 1) + { WARN("Predicate register is allowed only in vs_2_x\n"); This->state = E_INVALIDARG; return; @@ -1634,7 +1635,8 @@ static void vs_2_srcreg(struct bc_writer *This, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERVS_VERSION(2, 1)){ + if (This->shader->major_version != 2 || This->shader->minor_version != 1) + { WARN("Predicate register is allowed only in vs_2_x\n"); This->state = E_INVALIDARG; return; @@ -1871,7 +1873,8 @@ static void ps_2_srcreg(struct bc_writer *This, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERPS_VERSION(2, 1)){ + if (This->shader->minor_version == 0) + { WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } @@ -1917,7 +1920,8 @@ static void ps_2_0_dstreg(struct bc_writer *This, break; case BWRITERSPR_PREDICATE: - if(This->version != BWRITERPS_VERSION(2, 1)){ + if (This->shader->minor_version == 0) + { WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } @@ -2072,6 +2076,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha static void sm_3_srcreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer) { + const struct bwriter_shader *shader = This->shader; DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; @@ -2081,14 +2086,16 @@ static void sm_3_srcreg(struct bc_writer *This, token |= d3d9_srcmod(reg->srcmod); if(reg->rel_reg) { - if(reg->type == BWRITERSPR_CONST && This->version == BWRITERPS_VERSION(3, 0)) { + if (reg->type == BWRITERSPR_CONST && shader->type == ST_PIXEL) + { WARN("c%u[...] is unsupported in ps_3_0\n", reg->regnum); This->state = E_INVALIDARG; return; } - if(((reg->rel_reg->type == BWRITERSPR_ADDR && This->version == BWRITERVS_VERSION(3, 0)) || - reg->rel_reg->type == BWRITERSPR_LOOP) && - reg->rel_reg->regnum == 0) { + + if (((reg->rel_reg->type == BWRITERSPR_ADDR && shader->type == ST_VERTEX) + || reg->rel_reg->type == BWRITERSPR_LOOP) && reg->rel_reg->regnum == 0) + { token |= D3DVS_ADDRMODE_RELATIVE & D3DVS_ADDRESSMODE_MASK; } else { WARN("Unsupported relative addressing register\n"); @@ -2111,12 +2118,13 @@ static void sm_3_dstreg(struct bc_writer *This, const struct shader_reg *reg, struct bytecode_buffer *buffer, DWORD shift, DWORD mod) { + const struct bwriter_shader *shader = This->shader; DWORD token = (1u << 31); /* Bit 31 of registers is 1 */ DWORD d3d9reg; if(reg->rel_reg) { - if(This->version == BWRITERVS_VERSION(3, 0) && - reg->type == BWRITERSPR_OUTPUT) { + if (shader->type == ST_VERTEX && reg->type == BWRITERSPR_OUTPUT) + { token |= D3DVS_ADDRMODE_RELATIVE & D3DVS_ADDRESSMODE_MASK; } else { WARN("Relative addressing not supported for this shader type or register type\n"); @@ -2395,7 +2403,6 @@ static struct bc_writer *create_writer(DWORD version) WARN("Unexpected shader version requested: %08x\n", version); goto fail; } - ret->version = version; return ret; fail: @@ -2437,6 +2444,7 @@ HRESULT shader_write_bytecode(const struct bwriter_shader *shader, DWORD **resul return E_FAIL; } writer = create_writer(sm1_version(shader)); + writer->shader = shader; *result = NULL; if(!writer) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3dfc736abe..b9caf59580 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -332,12 +332,11 @@ struct bytecode_backend { /* Bytecode writing stuff */ struct bc_writer { const struct bytecode_backend *funcs; + const struct bwriter_shader *shader; /* Avoid result checking */ HRESULT state; - DWORD version; - /* Vertex shader varying mapping */ DWORD oPos_regnum; DWORD oD_regnum[2];

1 0

Connor McAdams : d3d10: Add impl_from_ID3D10EffectShaderVariable.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 176c1c6b4c5ac78cb93e1b073e558c695cd1ddd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=176c1c6b4c5ac78cb93e1b07… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Wed Mar 25 14:16:26 2020 -0400 d3d10: Add impl_from_ID3D10EffectShaderVariable. 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 | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2360e5a025..e2c18ce049 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -124,6 +124,11 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1 return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); } +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + struct d3d10_effect_state_property_info { UINT id; @@ -6639,7 +6644,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6661,7 +6666,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10GeometryShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6683,7 +6688,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetGeometryShader( static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); @@ -6706,7 +6711,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; D3D10_SIGNATURE_PARAMETER_DESC *d; @@ -6720,13 +6725,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetInputSignatureE } /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= This->effect->used_shader_count) + if (shader_index >= v->effect->used_shader_count) { WARN("This should crash on W7/DX10!\n"); return E_FAIL; } - s = &This->effect->used_shaders[shader_index]->u.shader; + s = &v->effect->used_shaders[shader_index]->u.shader; if (!s->input_signature.signature) { WARN("No shader signature\n"); @@ -6762,7 +6767,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature ID3D10EffectShaderVariable *iface, UINT shader_index, UINT element_index, D3D10_SIGNATURE_PARAMETER_DESC *desc) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); struct d3d10_effect_shader_variable *s; D3D10_SIGNATURE_PARAMETER_DESC *d; @@ -6776,13 +6781,13 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetOutputSignature } /* Check shader_index, this crashes on W7/DX10 */ - if (shader_index >= This->effect->used_shader_count) + if (shader_index >= v->effect->used_shader_count) { WARN("This should crash on W7/DX10!\n"); return E_FAIL; } - s = &This->effect->used_shaders[shader_index]->u.shader; + s = &v->effect->used_shaders[shader_index]->u.shader; if (!s->output_signature.signature) { WARN("No shader signature\n");

1 0

Connor McAdams : d3d10: Apply shader resources for shaders used in pass.
by Alexandre Julliard 25 Mar '20

25 Mar '20

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

Nikolay Sivov : mf: Fix string array access for registration data helpers.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: d0f4487c61f6393021bef6ea9d6c33aed38824b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0f4487c61f6393021bef6ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 15:01:24 2020 +0300 mf: Fix string array access for registration data helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 8e42837b46..ac80c51016 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1090,7 +1090,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *count, BOOL unique, const WCHAR *str) +static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *capacity, BOOL unique, const WCHAR *str) { WCHAR *ptrW; int len, i; @@ -1104,17 +1104,17 @@ static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *coun } } - if (!vector->calpwstr.cElems || *count > vector->calpwstr.cElems - 1) + if (!*capacity || *capacity - 1 < vector->calpwstr.cElems) { unsigned int new_count; WCHAR **ptr; - new_count = *count ? *count * 2 : 10; + new_count = *capacity ? *capacity * 2 : 10; ptr = CoTaskMemRealloc(vector->calpwstr.pElems, new_count * sizeof(*vector->calpwstr.pElems)); if (!ptr) return E_OUTOFMEMORY; vector->calpwstr.pElems = ptr; - *count = new_count; + *capacity = new_count; } len = lstrlenW(str); @@ -1129,12 +1129,14 @@ static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *coun static int __cdecl qsort_string_compare(const void *a, const void *b) { - return lstrcmpW(a, b); + const WCHAR *left = *(const WCHAR **)a, *right = *(const WCHAR **)b; + return lstrcmpW(left, right); } static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst) { static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + unsigned int capacity = 0, count, size; HRESULT hr = S_OK; int i, index; WCHAR *buffW; @@ -1148,8 +1150,6 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned for (i = 0; i < ARRAY_SIZE(hkey_roots); ++i) { - unsigned int count; - DWORD size; HKEY hkey; if (RegOpenKeyW(hkey_roots[i], path, &hkey)) @@ -1162,7 +1162,8 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned { if (filter && !wcschr(buffW, filter)) continue; - if (FAILED(hr = prop_string_vector_append(dst, &count, i > 0, buffW))) + + if (FAILED(hr = prop_string_vector_append(dst, &capacity, i > 0, buffW))) break; size = maxlen; }

1 0

Jacek Caban : ntdll: Support device paths in LdrGetDllPath.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 1a05b7da6335772af50636a31be6d4f9f58ade16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a05b7da6335772af50636a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 14:15:36 2020 +0100 ntdll: Support device paths in LdrGetDllPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48698 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 18 ++++++++++++++++++ dlls/ntdll/loader.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7342a865af..0e45ad44ff 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2635,6 +2635,24 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( fooW, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); ok( ret == STATUS_INVALID_PARAMETER, "LdrGetDllPath failed %x\n", ret ); + lstrcpyW( buffer, L"\\\\?\\" ); + lstrcatW( buffer, dlldir ); + p = buffer + lstrlenW(buffer); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + ok( !memcmp( path, L"\\\\?\\", 4 * sizeof(WCHAR) ) && path_equal( path + 4, dlldir ), + "got %s expected \\\\?\\%s\n", wine_dbgstr_w(path), wine_dbgstr_w(dlldir)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"\\\\?\\c:\\test.dll", LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 85eb297680..1b641f1b9d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2204,7 +2204,7 @@ static NTSTATUS get_dll_load_path_search_flags( LPCWSTR module, DWORD flags, WCH if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) { DWORD type = RtlDetermineDosPathNameType_U( module ); - if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH) + if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH && type != DEVICE_PATH) return STATUS_INVALID_PARAMETER; mod_end = get_module_path_end( module ); len += (mod_end - module) + 1;

1 0

Alexandre Julliard : krnl386: Fix some calling convention mismatches.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 7b68705d3cf5642f7a71e5c18b9bf66a768452c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b68705d3cf5642f7a71e5c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:22:41 2020 +0100 krnl386: Fix some calling convention mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/selector.c | 18 +++++++++--------- dlls/krnl386.exe16/thunk.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 8c45d6af04..765d2ee9b8 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -575,7 +575,7 @@ __ASM_STDCALL_FUNC( SUnMapLS, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, "movl 8(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,8(%ebp)\n\t" "ret" ) @@ -584,7 +584,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_8, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, "movl 12(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,12(%ebp)\n\t" "ret" ) @@ -593,7 +593,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_12, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, "movl 16(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,16(%ebp)\n\t" "ret" ) @@ -602,7 +602,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_16, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, "movl 20(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,20(%ebp)\n\t" "ret" ) @@ -611,7 +611,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_20, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, "movl 24(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,24(%ebp)\n\t" "ret" ) @@ -620,7 +620,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_24, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, "movl 28(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,28(%ebp)\n\t" "ret" ) @@ -629,7 +629,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_28, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, "movl 32(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,32(%ebp)\n\t" "ret" ) @@ -638,7 +638,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_32, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, "movl 36(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,36(%ebp)\n\t" "ret" ) @@ -647,7 +647,7 @@ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_36, 0, */ __ASM_STDCALL_FUNC( SMapLS_IP_EBP_40, 0, "movl 40(%ebp),%eax\n\t" - "call " __ASM_STDCALL("SMapLS",4) "\n\t" + "call " __ASM_STDCALL("SMapLS",0) "\n\t" "movl %edx,40(%ebp)\n\t" "ret" ) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 91a24f19c4..3b54bd4edc 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -148,10 +148,10 @@ SEGPTR CALL32_CBClientEx_RetAddr = 0; extern int call_entry_point( void *func, int nb_args, const DWORD *args ); extern void __wine_call_from_16_thunk(void); -extern void FT_Prolog(void); -extern void FT_PrologPrime(void); -extern void QT_Thunk(void); -extern void QT_ThunkPrime(void); +extern void WINAPI FT_Prolog(void); +extern void WINAPI FT_PrologPrime(void); +extern void WINAPI QT_Thunk(void); +extern void WINAPI QT_ThunkPrime(void); /*********************************************************************** * *

1 0

Alexandre Julliard : krnl386: Get rid of DOS UMB support.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 88cc1fb8b4755f716ef1d66d934b5849c181ad48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88cc1fb8b4755f716ef1d66d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:00 2020 +0100 krnl386: Get rid of DOS UMB support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.h | 15 +-- dlls/krnl386.exe16/dosmem.c | 58 +++++++++- dlls/krnl386.exe16/dosvm.c | 245 ---------------------------------------- dlls/krnl386.exe16/int21.c | 8 +- dlls/krnl386.exe16/int2f.c | 6 +- dlls/krnl386.exe16/interrupts.c | 21 +++- dlls/krnl386.exe16/relay.c | 8 +- 8 files changed, 85 insertions(+), 277 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88cc1fb8b4755f716ef1…

1 0

Alexandre Julliard : krnl386: Get rid of DOS EMS support.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: d94a4e46c1321a15951ef8dcdb5164564bf01ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94a4e46c1321a15951ef8dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 19:23:05 2020 +0100 krnl386: Get rid of DOS EMS support. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.h | 17 -- dlls/krnl386.exe16/int21.c | 1 - dlls/krnl386.exe16/int67.c | 495 ---------------------------------------- dlls/krnl386.exe16/interrupts.c | 5 +- 5 files changed, 1 insertion(+), 518 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d94a4e46c1321a15951e…

1 0