May 2016 - Wine-commits - list.winehq.org

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: 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

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

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 : secur32/tests: Add AcquireCredentialsHandleW tests.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: ee7bc087fd802cb5fc7a8a2703a0d4c4ba72e617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7bc087fd802cb5fc7a8a270… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 26 10:45:35 2016 +0000 secur32/tests: Add AcquireCredentialsHandleW tests. 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/tests/ntlm.c | 119 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 100 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 4147ac7..3b661c1 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -42,6 +42,8 @@ static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv); static SECURITY_STATUS (SEC_ENTRY * pQuerySecurityPackageInfoA)(SEC_CHAR*, PSecPkgInfoA*); static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleA)(SEC_CHAR*, SEC_CHAR*, ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp); +static SECURITY_STATUS (SEC_ENTRY * pAcquireCredentialsHandleW)(SEC_CHAR*, SEC_WCHAR*, + ULONG, PLUID, void*, SEC_GET_KEY_FN, void*, CredHandle*, TimeStamp*); static SECURITY_STATUS (SEC_ENTRY * pInitializeSecurityContextA)(PCredHandle, PCtxtHandle, SEC_CHAR*, ULONG, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, PSecBufferDesc, PULONG, PTimeStamp); @@ -149,6 +151,11 @@ static BYTE crypt_message_server2[] = {0xc8, 0xf2, 0x39, 0x7f, 0x0c, 0xaf, 0xf5, 0x5d, 0xef, 0x0c, 0x8b, 0x5f, 0x82}; +static char test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass", + sec_pkg_name[] = "NTLM"; + static void InitFunctionPtrs(void) { secdll = LoadLibraryA("secur32.dll"); @@ -160,6 +167,7 @@ static void InitFunctionPtrs(void) pFreeContextBuffer = (PVOID)GetProcAddress(secdll, "FreeContextBuffer"); pQuerySecurityPackageInfoA = (PVOID)GetProcAddress(secdll, "QuerySecurityPackageInfoA"); pAcquireCredentialsHandleA = (PVOID)GetProcAddress(secdll, "AcquireCredentialsHandleA"); + pAcquireCredentialsHandleW = (void*)GetProcAddress(secdll, "AcquireCredentialsHandleW"); pInitializeSecurityContextA = (PVOID)GetProcAddress(secdll, "InitializeSecurityContextA"); pCompleteAuthToken = (PVOID)GetProcAddress(secdll, "CompleteAuthToken"); pAcceptSecurityContext = (PVOID)GetProcAddress(secdll, "AcceptSecurityContext"); @@ -568,10 +576,6 @@ static void testInitializeSecurityContextFlags(void) PSecPkgInfoA pkg_info = NULL; SspiData client; SEC_WINNT_AUTH_IDENTITY_A id; - static char sec_pkg_name[] = "NTLM", - test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass"; ULONG req_attr, ctxt_attr; TimeStamp ttl; PBYTE packet; @@ -793,10 +797,6 @@ static void testAuth(ULONG data_rep, BOOL fake) SspiData client, server; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; - static char sec_pkg_name[] = "NTLM", - test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass"; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { @@ -930,9 +930,6 @@ static void testSignSeal(void) SecBuffer data[2], fake_data[2], complex_data[4]; ULONG qop = 0xdeadbeef; SecPkgContext_Sizes ctxt_sizes; - static char test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass"; complex_data[1].pvBuffer = complex_data[3].pvBuffer = NULL; @@ -1186,10 +1183,6 @@ static BOOL testAcquireCredentialsHandle(void) { CredHandle cred; TimeStamp ttl; - static char test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass", - sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; SEC_WINNT_AUTH_IDENTITY_A id; PSecPkgInfoA pkg_info = NULL; @@ -1251,12 +1244,98 @@ static BOOL testAcquireCredentialsHandle(void) return TRUE; } +static void testAcquireCredentialsHandleW(void) +{ + CredHandle cred; + TimeStamp ttl; + static WCHAR sec_pkg_nameW[] = {'N','T','L','M',0 }; + static WCHAR test_userW[] = {'t','e','s','t','u','s','e','r',0 }; + static WCHAR workgroupW[] = {'W','O','R','K','G','R','O','U','P',0}; + static WCHAR test_passW[] = {'t','e','s','t','p','a','s','s',0}; + SECURITY_STATUS ret; + SEC_WINNT_AUTH_IDENTITY_A idA; + SEC_WINNT_AUTH_IDENTITY_W id; + PSecPkgInfoA pkg_info = NULL; + + if(!pAcquireCredentialsHandleW) + { + win_skip("AcquireCredentialsHandleW not available\n"); + return; + } + + if(pQuerySecurityPackageInfoA(sec_pkg_name, &pkg_info) != SEC_E_OK) + { + ok(0, "NTLM package not installed, skipping test\n"); + return; + } + pFreeContextBuffer(pkg_info); + + id.User = test_userW; + id.UserLength = lstrlenW(test_userW); + id.Domain = workgroupW; + id.DomainLength = lstrlenW(workgroupW); + id.Password = test_passW; + id.PasswordLength = lstrlenW(test_passW); + id.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.DomainLength = 0; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.Domain = NULL; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.Domain = workgroupW; + id.DomainLength = lstrlenW(workgroupW); + id.UserLength = 0; + id.User = NULL; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + id.User = test_userW; + id.UserLength = lstrlenW(test_userW); + id.Password = test_passW; /* NULL string causes a crash. */ + id.PasswordLength = 0; + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &id, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); + + /* Test using the ASCII structure. */ + idA.User = (unsigned char*) test_user; + idA.UserLength = strlen(test_user); + idA.Domain = (unsigned char *) workgroup; + idA.DomainLength = strlen(workgroup); + idA.Password = (unsigned char*) test_pass; + idA.PasswordLength = strlen(test_pass); + idA.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; + + ret = pAcquireCredentialsHandleW(NULL, sec_pkg_nameW, SECPKG_CRED_OUTBOUND, + NULL, &idA, NULL, NULL, &cred, &ttl); + ok(ret == SEC_E_OK, "AcquireCredentialsHandeW() returned %s\n", + getSecError(ret)); + pFreeCredentialsHandle(&cred); +} + static void test_cred_multiple_use(void) { - static char test_user[] = "testuser", - workgroup[] = "WORKGROUP", - test_pass[] = "testpass", - sec_pkg_name[] = "NTLM"; SECURITY_STATUS ret; SEC_WINNT_AUTH_IDENTITY_A id; PSecPkgInfoA pkg_info = NULL; @@ -1373,6 +1452,8 @@ START_TEST(ntlm) pAcquireCredentialsHandleA && pInitializeSecurityContextA && pCompleteAuthToken && pQuerySecurityPackageInfoA) { + testAcquireCredentialsHandleW(); + if(!testAcquireCredentialsHandle()) goto cleanup; testInitializeSecurityContextFlags();

1 0

Jacek Caban : mshtml: Improved FIXMEs about unimplemented events.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 8abd37637af36c6f969de1f5a6244f279a72decf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abd37637af36c6f969de1f5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 16:15:55 2016 +0200 mshtml: Improved FIXMEs about unimplemented events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7abd727..67c8460 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3732,7 +3732,7 @@ static HRESULT WINAPI HTMLElement4_put_onmousewheel(IHTMLElement4 *iface, VARIAN { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEWHEEL, &v); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 27b6c39..43e742f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -173,6 +173,7 @@ typedef struct { #define EVENT_BIND_TO_BODY 0x0008 #define EVENT_CANCELABLE 0x0010 #define EVENT_HASDEFAULTHANDLERS 0x0020 +#define EVENT_FIXME 0x0040 static const event_info_t event_info[] = { {abortW, onabortW, EVENTT_NONE, DISPID_EVMETH_ONABORT, @@ -226,7 +227,7 @@ static const event_info_t event_info[] = { {mouseupW, onmouseupW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mousewheelW, onmousewheelW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, - 0}, + EVENT_FIXME}, {pasteW, onpasteW, EVENTT_NONE, DISPID_EVMETH_ONPASTE, EVENT_CANCELABLE}, {readystatechangeW, onreadystatechangeW, EVENTT_NONE, DISPID_EVMETH_ONREADYSTATECHANGE, @@ -1416,6 +1417,9 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, { event_target_t *data; + if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + remove_event_handler(event_target, eid); if(!disp) return S_OK; @@ -1518,6 +1522,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; } + if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + data = get_event_target_data(event_target, TRUE); if(!data) return E_OUTOFMEMORY;

1 0

Jacek Caban : mshtml: Added IHTMLWindow2:: onunload property implementation.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 7d2bba46479866d5e532e5188370027fdd9807b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bba46479866d5e532e5188… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 16:16:09 2016 +0200 mshtml: Added IHTMLWindow2::onunload property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 43e742f..0477e91 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -141,6 +141,9 @@ static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t',' static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR onsubmitW[] = {'o','n','s','u','b','m','i','t',0}; +static const WCHAR unloadW[] = {'u','n','l','o','a','d',0}; +static const WCHAR onunloadW[] = {'o','n','u','n','l','o','a','d',0}; + static const WCHAR HTMLEventsW[] = {'H','T','M','L','E','v','e','n','t','s',0}; static const WCHAR KeyboardEventW[] = {'K','e','y','b','o','a','r','d','E','v','e','n','t',0}; static const WCHAR MouseEventW[] = {'M','o','u','s','e','E','v','e','n','t',0}; @@ -239,7 +242,9 @@ static const event_info_t event_info[] = { {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS} + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, + {unloadW, onunloadW, EVENTT_HTML, DISPID_EVMETH_ONUNLOAD, + EVENT_FIXME} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f723ef6..cc16fd8 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -49,6 +49,7 @@ typedef enum { EVENTID_SCROLL, EVENTID_SELECTSTART, EVENTID_SUBMIT, + EVENTID_UNLOAD, EVENTID_LAST } eventid_t; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5f46c2a..2e33c0b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1128,15 +1128,19 @@ static HRESULT WINAPI HTMLWindow2_get_onbeforeunload(IHTMLWindow2 *iface, VARIAN static HRESULT WINAPI HTMLWindow2_put_onunload(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_UNLOAD, &v); } static HRESULT WINAPI HTMLWindow2_get_onunload(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_UNLOAD, p); } static HRESULT WINAPI HTMLWindow2_put_onhelp(IHTMLWindow2 *iface, VARIANT v)

1 0

Paul Gofman : d3dx9: Add d3ds_dotswiz opcode to preshader.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 4786f53ef89121be5fb479313559f39e6aa5866b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4786f53ef89121be5fb479313… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 20 20:43:56 2016 +0300 d3dx9: Add d3ds_dotswiz opcode to preshader. 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/preshader.c | 29 ++++++++++++++++++++++------- dlls/d3dx9_36/tests/effect.c | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a16c065..78f3bdb 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -44,6 +44,8 @@ enum pres_ops PRESHADER_OP_COS, PRESHADER_OP_RSQ, PRESHADER_OP_EXP, + PRESHADER_OP_DOTSWIZ6, + PRESHADER_OP_DOTSWIZ8, }; typedef double (*pres_op_func)(double *args, int n); @@ -61,6 +63,17 @@ static double pres_dot(double *args, int n) sum += args[i] * args[i + n]; return sum; } + +static double pres_dotswiz6(double *args, int n) +{ + return pres_dot(args, 3); +} + +static double pres_dotswiz8(double *args, int n) +{ + return pres_dot(args, 4); +} + static double pres_neg(double *args, int n) {return -args[0];} static double pres_rcp(double *args, int n) {return 1.0 / args[0];} static double pres_lt(double *args, int n) {return args[0] < args[1] ? 1.0 : 0.0;} @@ -97,7 +110,7 @@ static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} struct op_info { unsigned int opcode; - char mnem[8]; + char mnem[16]; unsigned int input_count; BOOL func_all_comps; pres_op_func func; @@ -122,6 +135,8 @@ static const struct op_info pres_op_info[] = {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ + {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ + {0x70e, "d3ds_dotswiz", 8, 0, pres_dotswiz8}, /* PRESHADER_OP_DOTSWIZ8 */ }; enum pres_value_type @@ -178,7 +193,7 @@ struct d3dx_pres_operand unsigned int offset; }; -#define MAX_INPUTS_COUNT 3 +#define MAX_INPUTS_COUNT 8 struct d3dx_pres_ins { @@ -410,18 +425,18 @@ static unsigned int *parse_pres_ins(unsigned int *ptr, unsigned int count, struc input_count = *ptr++; count -= 2; for (i = 0; i < ARRAY_SIZE(pres_op_info); ++i) - if (ins_code == pres_op_info[i].opcode) + if (ins_code == pres_op_info[i].opcode && input_count == pres_op_info[i].input_count) break; if (i == ARRAY_SIZE(pres_op_info)) { - FIXME("Unknown opcode %#x, raw %#x.\n", ins_code, ins_raw); + FIXME("Unknown opcode %#x, input_count %u, raw %#x.\n", ins_code, input_count, ins_raw); return NULL; } ins->op = i; - if (input_count > ARRAY_SIZE(ins->inputs) || input_count != pres_op_info[i].input_count) + if (input_count > ARRAY_SIZE(ins->inputs)) { - FIXME("Actual input args %u, expected %u, instruction %s.\n", input_count, - pres_op_info[i].input_count, pres_op_info[i].mnem); + FIXME("Actual input args count %u exceeds inputs array size, instruction %s.\n", input_count, + pres_op_info[i].mnem); return NULL; } for (i = 0; i < input_count; ++i) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c31b584..5963725 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3872,7 +3872,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) {"den mul",{FALSE, FALSE, FALSE, FALSE}, {0x7f800000, 0xff800000, 0xbb94f209, 0x000051ec}}, {"dot", {FALSE, FALSE, FALSE, FALSE}, {0x00000000, 0x7f800000, 0x41f00000, 0x00000000}}, {"prec", {FALSE, FALSE, TRUE, FALSE}, {0x2b8cbccc, 0x2c0cbccc, 0xac531800, 0x00000000}}, - {"dotswiz", { TRUE, TRUE, TRUE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, + {"dotswiz", {FALSE, FALSE, FALSE, FALSE}, {0xc00ccccd, 0xc0d33334, 0xc10ccccd, 0}}, {"reladdr", { TRUE, TRUE, TRUE, TRUE}, {0xc00ccccd, 0x40000000, 0x41a00000, 0x41500000}}, }; #define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv)

1 0

Paul Gofman : d3dx9: Add is_param_type_sampler() helper function.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: dca016d7dce0c7e5323281b975d195cdfb5ac40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca016d7dce0c7e5323281b97… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 23 13:40:55 2016 +0300 d3dx9: Add is_param_type_sampler() helper function. 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/d3dx9_private.h | 7 +++++++ dlls/d3dx9_36/effect.c | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index a0e62f1..9938d83 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -108,6 +108,13 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) +{ + return type == D3DXPT_SAMPLER + || type == D3DXPT_SAMPLER1D || type == D3DXPT_SAMPLER2D + || type == D3DXPT_SAMPLER3D || type == D3DXPT_SAMPLERCUBE; +} + struct d3dx_parameter; enum pres_reg_tables diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index da7de54..7d5e612 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1326,9 +1326,7 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -1391,9 +1389,7 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -2743,9 +2739,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct ret = D3D_OK; for (i = 0; i < parameters_count; ++i) { - if (params[i] && params[i]->class == D3DXPC_OBJECT && (params[i]->type == D3DXPT_SAMPLER - || params[i]->type == D3DXPT_SAMPLER1D || params[i]->type == D3DXPT_SAMPLER2D - || params[i]->type == D3DXPT_SAMPLER3D || params[i]->type == D3DXPT_SAMPLERCUBE)) + if (params[i] && params[i]->class == D3DXPC_OBJECT && is_param_type_sampler(params[i]->type)) { struct d3dx_sampler *sampler;

1 0

Alistair Leslie-Hughes : d3dx10_43: Add D3DX10GetImageInfoFromMemory stub.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 62ede82a72a4268f8a30b910d45566fac8ceb25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ede82a72a4268f8a30b910d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 11:03:11 2016 +0000 d3dx10_43: Add D3DX10GetImageInfoFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 10 ++++++++++ include/d3dx10tex.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 7bfd9f3..492a588 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -51,7 +51,7 @@ @ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) -@ stub D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) +@ stdcall D3DX10GetImageInfoFromMemory(ptr long ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceA(long str ptr ptr ptr) @ stub D3DX10GetImageInfoFromResourceW(long wstr ptr ptr ptr) @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 1654544..71d6ae8 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -35,6 +35,7 @@ #include "d3d10_1.h" #include "d3dx10core.h" +#include "d3dx10tex.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -193,3 +194,12 @@ HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **devi return ID3D10Device_QueryInterface(device, &IID_ID3D10Device1, (void **)device1); } + +HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *img_info, HRESULT *hresult) +{ + FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", + src_data, src_data_size, pump, img_info, hresult); + + return E_NOTIMPL; +} diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index aa89ab4..d44edf2 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -87,6 +87,8 @@ extern "C" { HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, + D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); #ifdef __cplusplus }

1 0