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

Chip Davis : d3d11: Introduce a function to convert a D3D11 input class to wined3d.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: e9250827cbf1889fd919b327c471ed01e8967394 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9250827cbf1889fd919b327… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:05:59 2020 -0500 d3d11: Introduce a function to convert a D3D11 input class to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index e27984212b..6b59dd994b 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -38,6 +38,11 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co return NULL; } +static enum wined3d_input_classification wined3d_input_classification_from_d3d11(D3D11_INPUT_CLASSIFICATION slot_class) +{ + return (enum wined3d_input_classification)slot_class; +} + static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, struct wined3d_vertex_element **wined3d_elements) @@ -69,7 +74,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME e->input_slot = f->InputSlot; e->offset = f->AlignedByteOffset; e->output_slot = WINED3D_OUTPUT_SLOT_UNUSED; - e->input_slot_class = f->InputSlotClass; + e->input_slot_class = wined3d_input_classification_from_d3d11(f->InputSlotClass); e->instance_data_step_rate = f->InstanceDataStepRate; e->method = WINED3D_DECL_METHOD_DEFAULT; e->usage = 0;

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 blend factors to wined3d.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: b5d178c0289119cd36778656c58232cc867f8608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d178c0289119cd36778656… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:02 2020 -0500 d3d11: Introduce a function to convert D3D11 blend factors to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index d48d62e0a8..da2768880f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -303,6 +303,11 @@ static const struct wined3d_parent_ops d3d_blend_state_wined3d_parent_ops = d3d_blend_state_wined3d_object_destroyed, }; +static enum wined3d_blend wined3d_blend_from_d3d11(D3D11_BLEND factor) +{ + return (enum wined3d_blend)factor; +} + HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, struct d3d_blend_state **state) { @@ -385,11 +390,11 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { wined3d_desc.rt[i].enable = desc->RenderTarget[i].BlendEnable; - wined3d_desc.rt[i].src = desc->RenderTarget[i].SrcBlend; - wined3d_desc.rt[i].dst = desc->RenderTarget[i].DestBlend; + wined3d_desc.rt[i].src = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlend); + wined3d_desc.rt[i].dst = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlend); wined3d_desc.rt[i].op = desc->RenderTarget[i].BlendOp; - wined3d_desc.rt[i].src_alpha = desc->RenderTarget[i].SrcBlendAlpha; - wined3d_desc.rt[i].dst_alpha = desc->RenderTarget[i].DestBlendAlpha; + wined3d_desc.rt[i].src_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlendAlpha); + wined3d_desc.rt[i].dst_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlendAlpha); wined3d_desc.rt[i].op_alpha = desc->RenderTarget[i].BlendOpAlpha; wined3d_desc.rt[i].writemask = desc->RenderTarget[i].RenderTargetWriteMask; }

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 blend ops to wined3d.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 07832261b5001cc7e581cfc17f65eb0c63f6e2f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07832261b5001cc7e581cfc1… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:03 2020 -0500 d3d11: Introduce a function to convert D3D11 blend ops to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index da2768880f..eb3080d55c 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -308,6 +308,11 @@ static enum wined3d_blend wined3d_blend_from_d3d11(D3D11_BLEND factor) return (enum wined3d_blend)factor; } +static enum wined3d_blend_op wined3d_blend_op_from_d3d11(D3D11_BLEND_OP op) +{ + return (enum wined3d_blend_op)op; +} + HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, struct d3d_blend_state **state) { @@ -392,10 +397,10 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC wined3d_desc.rt[i].enable = desc->RenderTarget[i].BlendEnable; wined3d_desc.rt[i].src = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlend); wined3d_desc.rt[i].dst = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlend); - wined3d_desc.rt[i].op = desc->RenderTarget[i].BlendOp; + wined3d_desc.rt[i].op = wined3d_blend_op_from_d3d11(desc->RenderTarget[i].BlendOp); wined3d_desc.rt[i].src_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].SrcBlendAlpha); wined3d_desc.rt[i].dst_alpha = wined3d_blend_from_d3d11(desc->RenderTarget[i].DestBlendAlpha); - wined3d_desc.rt[i].op_alpha = desc->RenderTarget[i].BlendOpAlpha; + wined3d_desc.rt[i].op_alpha = wined3d_blend_op_from_d3d11(desc->RenderTarget[i].BlendOpAlpha); wined3d_desc.rt[i].writemask = desc->RenderTarget[i].RenderTargetWriteMask; }

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 fill modes to wined3d.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: a6529ff876043d03bdee124c7b3dad195a2c82c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6529ff876043d03bdee124c… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:04 2020 -0500 d3d11: Introduce a function to convert D3D11 fill modes to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index eb3080d55c..b4bcf63094 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1071,6 +1071,11 @@ static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = d3d_rasterizer_state_wined3d_object_destroyed, }; +static enum wined3d_fill_mode wined3d_fill_mode_from_d3d11(D3D11_FILL_MODE mode) +{ + return (enum wined3d_fill_mode)mode; +} + static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { @@ -1090,7 +1095,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str return E_FAIL; } - wined3d_desc.fill_mode = desc->FillMode; + wined3d_desc.fill_mode = wined3d_fill_mode_from_d3d11(desc->FillMode); wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_bias = desc->DepthBias;

1 0

Chip Davis : d3d11: Introduce a function to convert D3D11 cull modes to wined3d.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: b38d055a7cfe8af6dc9f51c6bfca0a78fb3160b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b38d055a7cfe8af6dc9f51c6… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 3 11:06:05 2020 -0500 d3d11: Introduce a function to convert D3D11 cull modes to wined3d. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b4bcf63094..a4a3021db9 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1076,6 +1076,11 @@ static enum wined3d_fill_mode wined3d_fill_mode_from_d3d11(D3D11_FILL_MODE mode) return (enum wined3d_fill_mode)mode; } +static enum wined3d_cull wined3d_cull_from_d3d11(D3D11_CULL_MODE mode) +{ + return (enum wined3d_cull)mode; +} + static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { @@ -1096,7 +1101,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str } wined3d_desc.fill_mode = wined3d_fill_mode_from_d3d11(desc->FillMode); - wined3d_desc.cull_mode = desc->CullMode; + wined3d_desc.cull_mode = wined3d_cull_from_d3d11(desc->CullMode); wined3d_desc.front_ccw = desc->FrontCounterClockwise; wined3d_desc.depth_bias = desc->DepthBias; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp;

1 0

Chip Davis : d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 36cd136a6b440b22b7fc2420377de8449b58930b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cd136a6b440b22b7fc2420… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 16:01:18 2020 +0430 d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat(). Signed-off-by: Chip Davis <cdavis(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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cde7664515..6a67f81778 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -35,7 +35,8 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (D3DFORMAT)format; switch(format) { @@ -85,7 +86,8 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (enum wined3d_format_id)format; switch(format) {

1 0

Chip Davis : d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 31d9d0f7f39b409f73e6046507544fd1e65fd8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d9d0f7f39b409f73e60465… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 16:01:19 2020 +0430 d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat(). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2693b94ce7..ad32146947 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -44,7 +44,8 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (D3DFORMAT)format; switch(format) { @@ -108,7 +109,8 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) BYTE *c = (BYTE *)&format; /* Don't translate FOURCC formats */ - if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format; + if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) + return (enum wined3d_format_id)format; switch(format) {

1 0

Dmitry Timoshkov : adsldp: Fix a typo in IDirectorySearch::GetNextRow().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: bd34ffbdda450d3e053697eef09d5466c479634e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd34ffbdda450d3e053697ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:09 2020 +0800 adsldp: Fix a typo in IDirectorySearch::GetNextRow(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 550f78bd9a..a4467c0abe 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1317,7 +1317,7 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND 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->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } if (!ldap_ctx->entry)

1 0

Dmitry Timoshkov : wldap32: Fix server controls lookup logic.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 6df25aafbb2999de30f17308cd516c509abeb05b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6df25aafbb2999de30f17308… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:39 2020 +0800 wldap32: Fix server controls lookup logic. This fixes 'supported == user_count' comparison if the server has duplicate control OIDs in the returned list. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 87eb779953..cf948bf037 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -439,10 +439,15 @@ static BOOL is_supported_server_ctrls( WLDAP32_LDAP *ld, LDAPControl **ctrls ) for (n = 0; n < user_count; n++) { + TRACE("looking for %s\n", debugstr_a(ctrls[n]->ldctl_oid)); + for (i = 0; i < server_count; i++) { if (!strncmp( ctrls[n]->ldctl_oid, ld->ld_server_ctrls[i]->bv_val, ld->ld_server_ctrls[i]->bv_len)) + { supported++; + break; + } } }

1 0

Dmitry Timoshkov : adsldp: Always fully initialize returned column values.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 0d15fb330d891a0f03470e14e40abaae48e33bf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d15fb330d891a0f03470e14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:44 2020 +0800 adsldp: Always fully initialize returned column values. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index a4467c0abe..2b5f621fba 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1393,13 +1393,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1421,13 +1418,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1459,13 +1453,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_valuesW(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_freeW(values); @@ -1488,13 +1479,10 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) - { - memset(col, 0, sizeof(*col)); return E_ADS_COLUMN_NOT_SET; - } count = ldap_count_values_len(values); - col->pADsValues = heap_alloc(count * sizeof(col->pADsValues[0])); + col->pADsValues = heap_alloc_zero(count * sizeof(col->pADsValues[0])); if (!col->pADsValues) { ldap_value_free_len(values); @@ -1533,6 +1521,8 @@ static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDL if (!res || !name || !ldap_ctx->entry) return E_ADS_BAD_PARAMETER; + memset(col, 0, sizeof(*col)); + if (!wcsicmp(name, L"ADsPath")) { WCHAR *dn = ldap_get_dnW(ldap->ld, ldap_ctx->entry);

1 0