wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

David Woodhouse : secur32: Fix handling of ANSI NTLM credentials.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 5cc400ed60668e1739e82da1cf90ac8d6c22400b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc400ed60668e1739e82da1c… Author: David Woodhouse <dwmw2(a)infradead.org> Date: Thu May 26 10:45:22 2016 +0000 secur32: Fix handling of ANSI NTLM credentials. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index d24c763..94b94f4 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -131,6 +131,8 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( { SECURITY_STATUS ret; PNtlmCredentials ntlm_cred; + LPWSTR domain = NULL, user = NULL, password = NULL; + PSEC_WINNT_AUTH_IDENTITY_W auth_data = NULL; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -158,6 +160,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( break; case SECPKG_CRED_OUTBOUND: { + auth_data = pAuthData; ntlm_cred = HeapAlloc(GetProcessHeap(), 0, sizeof(*ntlm_cred)); if (!ntlm_cred) { @@ -173,26 +176,84 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( if(pAuthData != NULL) { - PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; + int domain_len = 0, user_len = 0, password_len = 0; - TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); - TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); + if (auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (auth_data->DomainLength) + { + domain_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, + auth_data->DomainLength, NULL, 0); + domain = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * domain_len); + if(!domain) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, auth_data->DomainLength, + domain, domain_len); + } + + if (auth_data->UserLength) + { + user_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->User, + auth_data->UserLength, NULL, 0); + user = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * user_len); + if(!user) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->User, auth_data->UserLength, + user, user_len); + } + + if (auth_data->PasswordLength) + { + password_len = MultiByteToWideChar(CP_ACP, 0,(char *)auth_data->Password, + auth_data->PasswordLength, NULL, 0); + password = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * password_len); + if(!password) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Password, auth_data->PasswordLength, + password, password_len); + } + } + else + { + domain = auth_data->Domain; + domain_len = auth_data->DomainLength; + + user = auth_data->User; + user_len = auth_data->UserLength; + + password = auth_data->Password; + password_len = auth_data->PasswordLength; + } + + TRACE("Username is %s\n", debugstr_wn(user, user_len)); + TRACE("Domain name is %s\n", debugstr_wn(domain, domain_len)); - ntlm_cred->username_arg = ntlm_GetUsernameArg(auth_data->User, auth_data->UserLength); - ntlm_cred->domain_arg = ntlm_GetDomainArg(auth_data->Domain, auth_data->DomainLength); + ntlm_cred->username_arg = ntlm_GetUsernameArg(user, user_len); + ntlm_cred->domain_arg = ntlm_GetDomainArg(domain, domain_len); - if(auth_data->PasswordLength != 0) + if(password_len != 0) { - ntlm_cred->pwlen = WideCharToMultiByte(CP_UNIXCP, - WC_NO_BEST_FIT_CHARS, auth_data->Password, - auth_data->PasswordLength, NULL, 0, NULL, - NULL); + ntlm_cred->pwlen = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, + password_len, NULL, 0, NULL, NULL); ntlm_cred->password = HeapAlloc(GetProcessHeap(), 0, ntlm_cred->pwlen); + if(!ntlm_cred->password) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + break; + } - WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, - auth_data->Password, auth_data->PasswordLength, + WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, password, password_len, ntlm_cred->password, ntlm_cred->pwlen, NULL, NULL); } } @@ -213,6 +274,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( phCredential = NULL; ret = SEC_E_UNKNOWN_CREDENTIALS; } + + if (auth_data && auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) + { + HeapFree(GetProcessHeap(), 0, domain); + HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, password); + } return ret; }

1 0

Alistair Leslie-Hughes : d3d11/tests: Test for ID3D11InfoQueue interface.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 5e9826a6a4f30fa3cd7ab76ee2d41dce9ad1d59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9826a6a4f30fa3cd7ab76ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 26 08:06:40 2016 +0000 d3d11/tests: Test for ID3D11InfoQueue interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0b73b2c..a737771 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -886,6 +886,9 @@ static void test_device_interfaces(void) todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); + ok(hr == E_NOINTERFACE, "Found ID3D11InfoQueue interface in non-debug mode, hr %#x.\n", hr); + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device1 interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(iface); @@ -893,6 +896,26 @@ static void test_device_interfaces(void) refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } + + for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) + { + struct device_desc device_desc; + + device_desc.feature_level = &d3d11_feature_levels[i]; + device_desc.flags = D3D11_CREATE_DEVICE_DEBUG; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", d3d11_feature_levels[i]); + continue; + } + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); + todo_wine ok(hr == S_OK, "Device should implement ID3D11InfoQueue interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } } static void test_get_immediate_context(void)

1 0

Józef Kucia : wined3d: Use immutable storage for 3D textures.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 4f9642d0e90b941e0316137523dbf12588c4bccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9642d0e90b941e031613752… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:28 2016 +0200 wined3d: Use immutable storage for 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 26ddda7..bdb8807 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2072,24 +2072,35 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { - unsigned int sub_count = texture->level_count * texture->layer_count; const struct wined3d_format *format = texture->resource.format; + GLenum internal = srgb ? format->glGammaInternal : format->glInternal; + unsigned int sub_count = texture->level_count * texture->layer_count; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; wined3d_texture_bind_and_dirtify(texture, context, srgb); - for (i = 0; i < sub_count; ++i) + if (wined3d_texture_use_immutable_storage(texture, gl_info)) { - struct wined3d_volume *volume = texture->sub_resources[i].u.volume; + GL_EXTCALL(glTexStorage3D(GL_TEXTURE_3D, texture->level_count, internal, + wined3d_texture_get_level_width(texture, 0), + wined3d_texture_get_level_height(texture, 0), + wined3d_texture_get_level_depth(texture, 0))); + checkGLcall("glTexStorage3D"); + } + else + { + for (i = 0; i < sub_count; ++i) + { + struct wined3d_volume *volume = texture->sub_resources[i].u.volume; - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, - srgb ? format->glGammaInternal : format->glInternal, - wined3d_texture_get_level_width(texture, volume->texture_level), - wined3d_texture_get_level_height(texture, volume->texture_level), - wined3d_texture_get_level_depth(texture, volume->texture_level), - 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, internal, + wined3d_texture_get_level_width(texture, volume->texture_level), + wined3d_texture_get_level_height(texture, volume->texture_level), + wined3d_texture_get_level_depth(texture, volume->texture_level), + 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } } }

1 0

Józef Kucia : wined3d: Use immutable storage for 2D textures.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 1ddf2e47e252fd30976237bd190a98b310909301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddf2e47e252fd30976237bd1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:27 2016 +0200 wined3d: Use immutable storage for 2D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 15 +++++-- dlls/wined3d/texture.c | 114 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 90 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 140c6a7..9233016 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3834,6 +3834,17 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; TRACE("Max texture stages: %u.\n", adapter->d3d_info.limits.ffp_blend_stages); + adapter->d3d_info.valid_rt_mask = 0; + for (i = 0; i < gl_info->limits.buffers; ++i) + adapter->d3d_info.valid_rt_mask |= (1u << i); + + if (!adapter->d3d_info.shader_color_key) + { + /* We do not want to deal with re-creating immutable texture storage for color keying emulation. */ + WARN("Disabling ARB_texture_storage because fragment pipe doesn't support color keying.\n"); + gl_info->supported[ARB_TEXTURE_STORAGE] = FALSE; + } + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { gl_info->fbo_ops.glIsRenderbuffer = gl_info->gl_ops.ext.p_glIsRenderbuffer; @@ -3911,10 +3922,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; - adapter->d3d_info.valid_rt_mask = 0; - for (i = 0; i < gl_info->limits.buffers; ++i) - adapter->d3d_info.valid_rt_mask |= (1u << i); - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { GLuint vao; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a7f28d5..26ddda7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -39,6 +39,15 @@ static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); } +static BOOL wined3d_texture_use_immutable_storage(const struct wined3d_texture *texture, + const struct wined3d_gl_info *gl_info) +{ + /* We don't expect to create texture views for textures with height-scaled formats. + * Besides, ARB_texture_storage doesn't allow to specify exact sizes for all levels. */ + return gl_info->supported[ARB_TEXTURE_STORAGE] + && !(texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE); +} + GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) { const struct wined3d_swapchain *swapchain = texture->swapchain; @@ -351,6 +360,72 @@ static void gltexture_delete(struct wined3d_device *device, const struct wined3d tex->name = 0; } +/* Context activation is done by the caller. */ +/* The caller is responsible for binding the correct texture. */ +static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture *texture, + GLenum gl_internal_format, const struct wined3d_format *format, + const struct wined3d_gl_info *gl_info) +{ + unsigned int i, sub_call_count; + + sub_call_count = texture->level_count; + if (texture->target != GL_TEXTURE_2D_ARRAY) + sub_call_count *= texture->layer_count; + + for (i = 0; i < sub_call_count; ++i) + { + struct wined3d_surface *surface = texture->sub_resources[i].u.surface; + GLsizei width, height; + + width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); + height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + height *= format->height_scale.numerator; + height /= format->height_scale.denominator; + } + + TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", + surface, surface->texture_target, surface->texture_level, width, height); + + if (texture->target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexImage3D(surface->texture_target, surface->texture_level, + gl_internal_format, width, height, texture->layer_count, 0, + format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } + else + { + gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, + gl_internal_format, width, height, 0, format->glFormat, format->glType, NULL); + checkGLcall("glTexImage2D"); + } + } +} + +/* Context activation is done by the caller. */ +/* The caller is responsible for binding the correct texture. */ +static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture *texture, + GLenum gl_internal_format, const struct wined3d_gl_info *gl_info) +{ + GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); + GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); + + if (texture->target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, + width, height, texture->layer_count)); + checkGLcall("glTexStorage3D"); + } + else + { + GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, gl_internal_format, + width, height)); + checkGLcall("glTexStorage2D"); + } +} + static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) { struct wined3d_device *device = texture->resource.device; @@ -1362,9 +1437,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_color_key_conversion *conversion; - unsigned int sub_call_count; GLenum internal; - UINT i; TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id)); @@ -1394,39 +1467,10 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi TRACE("internal %#x, format %#x, type %#x.\n", internal, format->glFormat, format->glType); - sub_call_count = texture->level_count; - if (texture->target != GL_TEXTURE_2D_ARRAY) - sub_call_count *= texture->layer_count; - for (i = 0; i < sub_call_count; ++i) - { - struct wined3d_surface *surface = texture->sub_resources[i].u.surface; - GLsizei width, height; - - width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); - height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); - if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) - { - height *= format->height_scale.numerator; - height /= format->height_scale.denominator; - } - - TRACE("surface %p, target %#x, level %u, width %u, height %u.\n", - surface, surface->texture_target, surface->texture_level, width, height); - - if (texture->target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexImage3D(surface->texture_target, surface->texture_level, - internal, width, height, texture->layer_count, 0, - format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); - } - else - { - gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, - internal, width, height, 0, format->glFormat, format->glType, NULL); - checkGLcall("glTexImage2D"); - } - } + if (wined3d_texture_use_immutable_storage(texture, gl_info)) + wined3d_texture_allocate_gl_immutable_storage(texture, internal, gl_info); + else + wined3d_texture_allocate_gl_mutable_storage(texture, internal, format, gl_info); } static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture)

1 0

Józef Kucia : wined3d: Add ARB_texture_storage extension.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 266528e244da3ddfa4f5efd59ea5cc1e4fdafc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=266528e244da3ddfa4f5efd59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:26 2016 +0200 wined3d: Add ARB_texture_storage extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e1438d3..140c6a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,6 +156,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, + {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, @@ -2691,6 +2692,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_storage */ + USE_GL_FUNC(glTexStorage1D) + USE_GL_FUNC(glTexStorage2D) + USE_GL_FUNC(glTexStorage3D) /* GL_ARB_timer_query */ USE_GL_FUNC(glQueryCounter) USE_GL_FUNC(glGetQueryObjectui64v) @@ -3515,6 +3520,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, @@ -3773,6 +3779,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; } + if (gl_info->supported[ARB_TEXTURE_STORAGE] && gl_info->supported[APPLE_YCBCR_422]) + { + /* AFAIK APPLE_ycbcr_422 is only available in legacy contexts so we shouldn't ever hit this. */ + FIXME("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); + gl_info->supported[APPLE_YCBCR_422] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 356ee7c..46df6ee 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -92,6 +92,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, + ARB_TEXTURE_STORAGE, ARB_TEXTURE_SWIZZLE, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT,

1 0

Józef Kucia : wined3d: Prefer sized GL internal formats.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: c7aa915a15d8795693434400faa7255ba36d10f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7aa915a15d8795693434400f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:25 2016 +0200 wined3d: Prefer sized GL internal formats. GL_ARB_texture_storage requires sized formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f85fcc9..4145bf5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1006,7 +1006,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_UYVY, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, 0, + {WINED3DFMT_UYVY, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE8_ALPHA8, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, @@ -1018,7 +1018,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_YUY2, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, 0, + {WINED3DFMT_YUY2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE8_ALPHA8, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, @@ -1030,7 +1030,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_YV12, GL_ALPHA, GL_ALPHA, 0, + {WINED3DFMT_YV12, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, @@ -1038,7 +1038,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_NV12, GL_ALPHA, GL_ALPHA, 0, + {WINED3DFMT_NV12, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL},

1 0

Józef Kucia : wined3d: Simplify match_apple().
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 1cf142e6e7d46c0dacfe2f9f021bad36ecaad37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf142e6e7d46c0dacfe2f9f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:24 2016 +0200 wined3d: Simplify match_apple(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4de3990..e1438d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -517,11 +517,7 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, const char *gl_re * * This test has been moved into wined3d_guess_gl_vendor() */ - if (gl_vendor == GL_VENDOR_APPLE) - { - return TRUE; - } - return FALSE; + return gl_vendor == GL_VENDOR_APPLE; } /* Context activation is done by the caller. */ @@ -1634,7 +1630,6 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, const char *gl_vendor_string, const char *gl_renderer) { - /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to * detect the Apple OpenGL implementation to apply some extension fixups afterwards. @@ -1646,8 +1641,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So * the chance that other implementations support them is rather small since Win32 QuickTime uses * DirectDraw, not OpenGL. */ - if (gl_info->supported[APPLE_FENCE] - && gl_info->supported[APPLE_YCBCR_422]) + if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; if (strstr(gl_vendor_string, "NVIDIA"))

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 breakc instruction.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 58774533a3c2d32da99df033ed7e7864f336c3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58774533a3c2d32da99df033e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:23 2016 +0200 d3d10core/tests: Add test for SM4 breakc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ebd3325..6f3f047 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6822,6 +6822,97 @@ static void test_sm4_if_instruction(void) release_test_context(&test_context); } +static void test_sm4_breakc_instruction(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_breakc_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (uint i = 0; i < 255; ++i) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x065ac80a, 0x24369e7e, 0x218d5dc1, 0x3532868c, 0x00000001, 0x00000188, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, 0x00000044, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0a00001e, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x00000001, 0x00000001, + 0x00000000, 0x00000000, 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x000000ff, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + 0x01000015, 0x0100003e, + }; + static const DWORD ps_breakc_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (int i = 0, j = 254; i < 255 && j >= 0; ++i, --j) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x687406ef, 0x7bdeb7d1, 0xb3282292, 0x934a9101, 0x00000001, 0x000001c0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000148, 0x00000040, 0x00000052, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100072, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x000000fe, 0x00000000, 0x01000030, 0x07000022, 0x00100082, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x07000021, 0x00100012, 0x00000001, + 0x0010002a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100082, 0x00000000, 0x0010003a, + 0x00000000, 0x0010000a, 0x00000001, 0x03000003, 0x0010003a, 0x00000000, 0x0a00001e, 0x00100072, + 0x00000000, 0x00100246, 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0xffffffff, 0x00000000, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_breakc_nz_code, sizeof(ps_breakc_nz_code), &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_nz pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D10PixelShader_Release(ps); + + hr = ID3D10Device_CreatePixelShader(device, ps_breakc_z_code, sizeof(ps_breakc_z_code), &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_z pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D10PixelShader_Release(ps); + + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -6861,4 +6952,5 @@ START_TEST(device) test_draw_depth_only(); test_shader_stage_input_output_matching(); test_sm4_if_instruction(); + test_sm4_breakc_instruction(); }

1 0

Józef Kucia : d3d11/tests: Add test for SM4 breakc instruction.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: a4b7e3ac93c69e102e3e31aa77d0e24563802ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b7e3ac93c69e102e3e31aa7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:22 2016 +0200 d3d11/tests: Add test for SM4 breakc instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e17114e..0b73b2c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6973,6 +6973,99 @@ static void test_sm4_if_instruction(void) release_test_context(&test_context); } +static void test_sm4_breakc_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_breakc_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (uint i = 0; i < 255; ++i) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x065ac80a, 0x24369e7e, 0x218d5dc1, 0x3532868c, 0x00000001, 0x00000188, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, 0x00000044, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0a00001e, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x00000001, 0x00000001, + 0x00000000, 0x00000000, 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x000000ff, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + 0x01000015, 0x0100003e, + }; + static const DWORD ps_breakc_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (int i = 0, j = 254; i < 255 && j >= 0; ++i, --j) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x687406ef, 0x7bdeb7d1, 0xb3282292, 0x934a9101, 0x00000001, 0x000001c0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000148, 0x00000040, 0x00000052, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100072, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x000000fe, 0x00000000, 0x01000030, 0x07000022, 0x00100082, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x07000021, 0x00100012, 0x00000001, + 0x0010002a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100082, 0x00000000, 0x0010003a, + 0x00000000, 0x0010000a, 0x00000001, 0x03000003, 0x0010003a, 0x00000000, 0x0a00001e, 0x00100072, + 0x00000000, 0x00100246, 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0xffffffff, 0x00000000, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_breakc_nz_code, sizeof(ps_breakc_nz_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_nz pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + hr = ID3D11Device_CreatePixelShader(device, ps_breakc_z_code, sizeof(ps_breakc_z_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_z pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -7015,4 +7108,5 @@ START_TEST(d3d11) test_getdc(); test_shader_stage_input_output_matching(); test_sm4_if_instruction(); + test_sm4_breakc_instruction(); }

1 0

Hans Leidekker : webservices: Implement WsEncodeUrl.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 57e69a6b485906e1bec8e93538f149f95723270d URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e69a6b485906e1bec8e9353… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 26 10:56:48 2016 +0200 webservices: Implement WsEncodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/url.c | 110 ++++++++++++++++ dlls/webservices/url.c | 269 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 380 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57e69a6b485906e1bec8e…

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
55
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 May 2016