wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Michael Stefaniuc : Release 5.0.5.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: oldstable Commit: 001c94a4423d6fa9aef5f8160baa537b4e118398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=001c94a4423d6fa9aef5f816… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 30 21:43:20 2021 +0200 Release 5.0.5. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 255 ++------------------------------------------------------------ VERSION | 2 +- configure | 18 ++--- 3 files changed, 16 insertions(+), 259 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=001c94a4423d6fa9aef5…

1 0

Michael Stefaniuc : Revert "qcap: Avoid unused variable warning if v4l is absent."
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: oldstable Commit: a6557f640a806096c618c84b80400120e6c419df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6557f640a806096c618c84b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 30 20:26:19 2021 +0200 Revert "qcap: Avoid unused variable warning if v4l is absent." This reverts commit cb8e15a64307e580123b459e4c5964dc7b0d73d9. Reported by Gerald Pfeifer to break the build when v4l is not available. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/v4l.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index e548000187f..0d7e176d3da 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -63,9 +63,10 @@ #include "qcap_main.h" #include "capture.h" +WINE_DEFAULT_DEBUG_CHANNEL(qcap); + #ifdef HAVE_LINUX_VIDEODEV2_H -WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open;

1 0

Henri Verbeet : wined3d: Make some functions static.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 39263558a2088940aaacd6eda19ca23d40b63495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39263558a2088940aaacd6ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 15 17:52:35 2021 +0200 wined3d: Make some functions static. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c3ce959a14f..990991e2e3d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4279,13 +4279,13 @@ static void adapter_gl_destroy_device(struct wined3d_device *device) heap_free(device_gl); } -struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_gl_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { return wined3d_context_gl_acquire(device, texture, sub_resource_idx); } -void adapter_gl_release_context(struct wined3d_context *context) +static void adapter_gl_release_context(struct wined3d_context *context) { return wined3d_context_gl_release(wined3d_context_gl(context)); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7303c994eb4..0abae24fd1f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -536,7 +536,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -549,7 +549,7 @@ struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device *device return &wined3d_device_vk(device)->context_vk.c; } -void adapter_vk_release_context(struct wined3d_context *context) +static void adapter_vk_release_context(struct wined3d_context *context) { TRACE("context %p.\n", context); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0a3c547e7a9..9883017f932 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2687,7 +2687,7 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) heap_free(device); } -struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, +static struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); @@ -2700,7 +2700,7 @@ struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_device *devi return &wined3d_device_no3d(device)->context_no3d; } -void adapter_no3d_release_context(struct wined3d_context *context) +static void adapter_no3d_release_context(struct wined3d_context *context) { TRACE("context %p.\n", context); } @@ -3044,7 +3044,7 @@ static void adapter_no3d_dispatch_compute(struct wined3d_device *device, ERR("device %p, state %p, parameters %p.\n", device, state, parameters); } -void adapter_no3d_clear_uav(struct wined3d_context *context, +static void adapter_no3d_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { ERR("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8ca7afb2ec7..45e7ecd4850 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -419,7 +419,7 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) +static unsigned int shader_glsl_full_ffp_varyings(const struct wined3d_gl_info *gl_info) { /* On core profile we have to also count diffuse and specular colours and * the fog coordinate. */

1 0

Piotr Caban : crypt32: Handle CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG when verifying chain policy.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 6ac02c0cacb036059bbd6089e3d96fdc435ba67a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ac02c0cacb036059bbd6089… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 17:25:13 2021 +0200 crypt32: Handle CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG when verifying chain policy. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 6 ++++-- dlls/crypt32/tests/chain.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c7d387ebc59..63bcfebec38 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3027,7 +3027,8 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, &pPolicyStatus->lElementIndex); } if (!pPolicyStatus->dwError && - pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) + pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID && + !(checks & CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG)) { pPolicyStatus->dwError = CERT_E_EXPIRED; find_element_with_error(pChainContext, @@ -3492,7 +3493,8 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, } else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID && - !(checks & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) + !(checks & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID) && + !(baseChecks & CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG)) { pPolicyStatus->dwError = CERT_E_EXPIRED; find_element_with_error(pChainContext, diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e8c8843a321..68817b98dda 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4741,12 +4741,12 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { { ARRAY_SIZE(chain2), chain2 }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { { ARRAY_SIZE(googleChain), googleChain }, - { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = {

1 0

Piotr Caban : crypt32/tests: Fix tests skipped on all test bot machines.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: be3f6c87a0bb99649e1d036c82fa6ca3d3559d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3f6c87a0bb99649e1d036c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 17:25:10 2021 +0200 crypt32/tests: Fix tests skipped on all test bot machines. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 26a1a16dc82..e8c8843a321 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4741,17 +4741,17 @@ static const CERT_CHAIN_POLICY_STATUS badDateNestingStatus = static const ChainPolicyCheck ignoredBadDateNestingBasePolicyCheck = { { ARRAY_SIZE(chain2), chain2 }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR }; static const ChainPolicyCheck ignoredInvalidDateBasePolicyCheck = { { ARRAY_SIZE(googleChain), googleChain }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, &badDateNestingStatus, TODO_ELEMENTS + { 0, 0, -1, -1, NULL}, NULL, TODO_ERROR }; static const ChainPolicyCheck ignoredInvalidUsageBasePolicyCheck = { { ARRAY_SIZE(chain15), chain15 }, - { 0, CERT_E_EXPIRED, 0, 1, NULL}, NULL, TODO_ERROR + { 0, 0, -1, -1, NULL}, NULL, 0 }; static const ChainPolicyCheck invalidUsageBasePolicyCheck = { @@ -4812,13 +4812,9 @@ static const ChainPolicyCheck googlePolicyCheckWithMatchingNameExpired = { { 0, CERT_E_EXPIRED, 0, 0, NULL}, NULL, 0 }; -/* Win98 sees the chain as expired, even though it isn't for the date tested */ -static const CERT_CHAIN_POLICY_STATUS expiredStatus = - { 0, CERT_E_EXPIRED, 0, 0, NULL }; - static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { { ARRAY_SIZE(googleChain), googleChain }, - { 0, 0, -1, -1, NULL}, &expiredStatus, 0 + { 0, 0, -1, -1, NULL}, NULL, 0 }; /* Win98 does not trust the root of the OpenSSL chain or the Stanford chain */

1 0

Piotr Caban : crypt32/tests: Fix tests on systems where google chain root is not trusted.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: a0dc2adf73b1d9aa967025490e0145b1c798effe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0dc2adf73b1d9aa96702549… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 17:25:06 2021 +0200 crypt32/tests: Fix tests on systems where google chain root is not trusted. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 18f7eca6829..26a1a16dc82 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -5091,7 +5091,8 @@ static void check_base_policy(void) CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, ignoredBadDateNestingBasePolicyCheck, &oct2007, &policyPara); - policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_BASE, NULL, ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG | @@ -5134,7 +5135,7 @@ static void check_authenticode_policy(void) epochStart.wYear = 1601; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredUnknownCAPolicyCheck, &epochStart, &policyPara); - policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; + policyPara.dwFlags |= CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredInvalidDateBasePolicyCheck, &oct2007, &policyPara); } @@ -5228,22 +5229,24 @@ static void check_ssl_policy(void) policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); - policyPara.dwFlags = 0; /* And again, but checking the Google chain at a bad date */ sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingNameExpired, &oct2007, &policyPara); + policyPara.dwFlags = 0; /* Again checking the Google chain at a bad date, but ignoring date * errors. */ - sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; + sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA | + SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingName, &oct2007, &policyPara); - sslPolicyPara.fdwChecks = 0; /* And again, but checking the Google chain at a good date */ + sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA; sslPolicyPara.pwszServerName = google_dot_com; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, NULL, googlePolicyCheckWithMatchingName, &nov2016, &policyPara); + sslPolicyPara.fdwChecks = 0; /* Check again with the openssl cert, which has a wildcard in its name, * with various combinations of matching and non-matching names.

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_get_constant_buffer().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 14920064cd769190f031d6835f5c45bb191eff82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14920064cd769190f031d683… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:58:57 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_get_constant_buffer(). 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/d3d11/device.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 36fc6a084fa..d93256e77ad 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -407,7 +407,7 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte static void d3d11_immediate_context_get_constant_buffers(ID3D11DeviceContext1 *iface, enum wined3d_shader_type type, UINT start_slot, UINT buffer_count, ID3D11Buffer **buffers) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); unsigned int i; wined3d_mutex_lock(); @@ -416,7 +416,7 @@ static void d3d11_immediate_context_get_constant_buffers(ID3D11DeviceContext1 *i struct wined3d_buffer *wined3d_buffer; struct d3d_buffer *buffer_impl; - if (!(wined3d_buffer = wined3d_device_get_constant_buffer(device->wined3d_device, + if (!(wined3d_buffer = wined3d_device_context_get_constant_buffer(context->wined3d_context, type, start_slot + i))) { buffers[i] = NULL; @@ -4358,7 +4358,7 @@ static void d3d10_device_get_constant_buffers(ID3D10Device1 *iface, struct wined3d_buffer *wined3d_buffer; struct d3d_buffer *buffer_impl; - if (!(wined3d_buffer = wined3d_device_get_constant_buffer(device->wined3d_device, + if (!(wined3d_buffer = wined3d_device_context_get_constant_buffer(device->immediate_context.wined3d_context, type, start_slot + i))) { buffers[i] = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 731a304a779..974db90037d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2451,10 +2451,10 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return wined3d_device_context_set_constant_buffer(&device->cs->c, type, idx, buffer); } -struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wined3d_device *device, +struct wined3d_buffer * CDECL wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, shader_type %#x, idx %u.\n", device, shader_type, idx); + TRACE("context %p, shader_type %#x, idx %u.\n", context, shader_type, idx); if (idx >= MAX_CONSTANT_BUFFERS) { @@ -2462,7 +2462,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_constant_buffer(const struct wi return NULL; } - return device->cs->c.state->cb[shader_type][idx]; + return context->state->cb[shader_type][idx]; } void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ada2c79fb77..406e511c0f6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -58,7 +58,6 @@ @ cdecl wined3d_device_get_blend_state(ptr ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_compute_shader(ptr) -@ cdecl wined3d_device_get_constant_buffer(ptr long long) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) @ cdecl wined3d_device_get_cs_resource_view(ptr long) @ cdecl wined3d_device_get_cs_sampler(ptr long) @@ -171,6 +170,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_constant_buffer(ptr long long) @ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 33844349968..1a58c671934 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2380,8 +2380,6 @@ struct wined3d_blend_state * __cdecl wined3d_device_get_blend_state(const struct HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); struct wined3d_shader * __cdecl wined3d_device_get_compute_shader(const struct wined3d_device *device); -struct wined3d_buffer * __cdecl wined3d_device_get_constant_buffer(const struct wined3d_device *device, - enum wined3d_shader_type shader_type, unsigned int idx); void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_cs_resource_view(const struct wined3d_device *device, @@ -2567,6 +2565,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_buffer * __cdecl wined3d_device_context_get_constant_buffer(const struct wined3d_device_context *context, + enum wined3d_shader_type shader_type, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_get_shader().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 8cd9754b072db91ca41cfd68ca4fe076f08d0acf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd9754b072db91ca41cfd68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:58:56 2021 -0500 d3d11: Use wined3d_device_context_get_shader(). 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/d3d11/device.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 43fc18126ff..36fc6a084fa 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1678,7 +1678,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceContext1 *iface, ID3D11PixelShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_shader *wined3d_shader; struct d3d_pixel_shader *shader_impl; @@ -1691,7 +1691,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL))) { wined3d_mutex_unlock(); *shader = NULL; @@ -1735,7 +1735,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceContext1 *iface, ID3D11VertexShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_vertex_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -1748,7 +1748,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX))) { wined3d_mutex_unlock(); *shader = NULL; @@ -1869,7 +1869,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceContext1 *iface, ID3D11GeometryShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_geometry_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -1882,7 +1882,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_mutex_unlock(); *shader = NULL; @@ -2318,7 +2318,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceContext1 *iface, ID3D11HullShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_hull_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2331,7 +2331,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_HULL))) { wined3d_mutex_unlock(); *shader = NULL; @@ -2410,7 +2410,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceContext1 *iface, ID3D11DomainShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_domain_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2423,7 +2423,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN))) { wined3d_mutex_unlock(); *shader = NULL; @@ -2527,7 +2527,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews( static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceContext1 *iface, ID3D11ComputeShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_compute_shader *shader_impl; struct wined3d_shader *wined3d_shader; @@ -2540,7 +2540,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo *class_instance_count = 0; wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE))) { wined3d_mutex_unlock(); *shader = NULL; @@ -5046,7 +5046,8 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetShader(ID3D10Device1 *iface, ID3 TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(device->immediate_context.wined3d_context, + WINED3D_SHADER_TYPE_PIXEL))) { wined3d_mutex_unlock(); *shader = NULL; @@ -5096,7 +5097,8 @@ static void STDMETHODCALLTYPE d3d10_device_VSGetShader(ID3D10Device1 *iface, ID3 TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(device->immediate_context.wined3d_context, + WINED3D_SHADER_TYPE_VERTEX))) { wined3d_mutex_unlock(); *shader = NULL; @@ -5218,7 +5220,8 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device1 *iface, ID3 TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) + if (!(wined3d_shader = wined3d_device_context_get_shader(device->immediate_context.wined3d_context, + WINED3D_SHADER_TYPE_GEOMETRY))) { wined3d_mutex_unlock(); *shader = NULL;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_get_shader().
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: fd7231493dc8e14a872e1bb7f3c866e759eaadfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7231493dc8e14a872e1bb7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 23:58:55 2021 -0500 wined3d: Introduce wined3d_device_context_get_shader(). 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/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6406c7a04f..731a304a779 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1901,6 +1901,14 @@ void CDECL wined3d_device_context_set_shader(struct wined3d_device_context *cont wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type) +{ + TRACE("context %p, type %#x.\n", context, type); + + return context->state->shader[type]; +} + void CDECL wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int idx, struct wined3d_buffer *buffer) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 34eba025b8a..ada2c79fb77 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_flush(ptr) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_get_shader(ptr long) @ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db5f75d7aca..33844349968 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2567,6 +2567,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context void __cdecl wined3d_device_context_flush(struct wined3d_device_context *context); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +struct wined3d_shader * __cdecl wined3d_device_context_get_shader(const struct wined3d_device_context *context, + enum wined3d_shader_type type); void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context,

1 0

Zebediah Figura : combase/tests: Link directly to combase.
by Alexandre Julliard 15 Apr '21

15 Apr '21

Module: wine Branch: master Commit: 141c182e4b34c95161c628a18c75153ab371e901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=141c182e4b34c95161c628a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 22:19:09 2021 -0500 combase/tests: Link directly to combase. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/Makefile.in | 1 + dlls/combase/tests/roapi.c | 59 +----- dlls/combase/tests/string.c | 443 ++++++++++++++++++----------------------- include/roapi.h | 2 + 4 files changed, 208 insertions(+), 297 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=141c182e4b34c95161c6…

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
87
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 April 2021