wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : wined3d: Remove IWineD3DBaseTexture::GetTextureDimensions() from the public wined3d interface.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 5a3a4ac77ac25cbe6f4aa6366e7a6773dce66568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3a4ac77ac25cbe6f4aa6366… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 17 11:59:39 2010 +0200 wined3d: Remove IWineD3DBaseTexture::GetTextureDimensions() from the public wined3d interface. --- dlls/wined3d/arb_program_shader.c | 6 ++++-- dlls/wined3d/basetexture.c | 8 ++++---- dlls/wined3d/cubetexture.c | 10 ---------- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/glsl_shader.c | 23 +++++++++++++---------- dlls/wined3d/nvidia_texture_shader.c | 6 ++++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 6 +++--- dlls/wined3d/texture.c | 29 ++++++++++++----------------- dlls/wined3d/utils.c | 14 +++++++++----- dlls/wined3d/volumetexture.c | 10 ---------- include/wine/wined3d.idl | 2 -- 12 files changed, 53 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a3a4ac77ac25cbe6f4aa…

1 0

Henri Verbeet : wined3d: Move the texture' s target field to the base texture struct.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 2e119ecd2828bce51225144053c7fbc0e809bef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e119ecd2828bce5122514405… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 17 11:59:38 2010 +0200 wined3d: Move the texture's target field to the base texture struct. --- dlls/wined3d/cubetexture.c | 5 ++++- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/volumetexture.c | 5 ++++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 13ec3a8..b64eab7 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -308,9 +308,11 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i static UINT WINAPI IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface) { + IWineD3DCubeTextureImpl *texture = (IWineD3DCubeTextureImpl *)iface; + TRACE("iface %p.\n", iface); - return GL_TEXTURE_CUBE_MAP_ARB; + return texture->baseTexture.target; } static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) @@ -538,6 +540,7 @@ HRESULT cubetexture_init(IWineD3DCubeTextureImpl *texture, UINT edge_length, UIN texture->baseTexture.pow2Matrix[15] = 1.0f; texture->baseTexture.pow2Matrix_identity = FALSE; } + texture->baseTexture.target = GL_TEXTURE_CUBE_MAP_ARB; /* Generate all the surfaces. */ tmp_w = edge_length; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a52d7c4..ff57104 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -327,7 +327,7 @@ static UINT WINAPI IWineD3DTextureImpl_GetTextureDimensions(IWineD3DTexture *ifa IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; TRACE("(%p)\n", This); - return This->target; + return This->baseTexture.target; } static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { @@ -556,7 +556,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[5] = 1.0f; texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; + texture->baseTexture.target = GL_TEXTURE_2D; texture->cond_np2 = TRUE; texture->baseTexture.minMipLookup = minMipLookup_noFilter; } @@ -570,7 +570,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[5] = (float)height; texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; - texture->target = GL_TEXTURE_RECTANGLE_ARB; + texture->baseTexture.target = GL_TEXTURE_RECTANGLE_ARB; texture->cond_np2 = TRUE; if(texture->resource.format->Flags & WINED3DFMT_FLAG_FILTERING) @@ -598,7 +598,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; - texture->target = GL_TEXTURE_2D; + texture->baseTexture.target = GL_TEXTURE_2D; texture->cond_np2 = FALSE; } TRACE("xf(%f) yf(%f)\n", texture->baseTexture.pow2Matrix[0], texture->baseTexture.pow2Matrix[5]); @@ -621,7 +621,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT } surface_set_container((IWineD3DSurfaceImpl *)surface, WINED3D_CONTAINER_TEXTURE, (IWineD3DBase *)texture); - surface_set_texture_target((IWineD3DSurfaceImpl *)surface, texture->target); + surface_set_texture_target((IWineD3DSurfaceImpl *)surface, texture->baseTexture.target); texture->baseTexture.sub_resources[i] = (IWineD3DResourceImpl *)surface; TRACE("Created surface level %u @ %p.\n", i, surface); /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index a69ff68..742ac2f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -244,9 +244,11 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTextur static UINT WINAPI IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture *iface) { + IWineD3DVolumeTextureImpl *texture = (IWineD3DVolumeTextureImpl *)iface; + TRACE("iface %p.\n", iface); - return GL_TEXTURE_3D; + return texture->baseTexture.target; } static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *iface) @@ -453,6 +455,7 @@ HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT texture->baseTexture.pow2Matrix[5] = 1.0f; texture->baseTexture.pow2Matrix[10] = 1.0f; texture->baseTexture.pow2Matrix[15] = 1.0f; + texture->baseTexture.target = GL_TEXTURE_3D; /* Generate all the surfaces. */ tmp_w = width; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90082ba..d542de0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1871,6 +1871,7 @@ typedef struct IWineD3DBaseTextureClass BOOL pow2Matrix_identity; const struct min_lookup *minMipLookup; const GLenum *magLookup; + GLenum target; void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb); } IWineD3DBaseTextureClass; @@ -1917,7 +1918,6 @@ typedef struct IWineD3DTextureImpl IWineD3DBaseTextureClass baseTexture; /* IWineD3DTexture */ - UINT target; BOOL cond_np2; } IWineD3DTextureImpl;

1 0

Piotr Caban : secur32: Handle extra data in schan_InitializeSecurityContextW.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: cdf8d455c2ca3ecb85f5616bcc42638bfe23437f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf8d455c2ca3ecb85f5616bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 17 10:18:41 2010 +0200 secur32: Handle extra data in schan_InitializeSecurityContextW. --- dlls/secur32/schannel.c | 8 ++++++++ dlls/secur32/tests/schannel.c | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 199c7ce..2d244d1 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -775,6 +775,14 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( /* Perform the TLS handshake */ err = pgnutls_handshake(ctx->session); + if(transport.in.offset && transport.in.offset != pInput->pBuffers[0].cbBuffer) { + if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) + return SEC_E_INVALID_TOKEN; + + pInput->pBuffers[1].BufferType = SECBUFFER_EXTRA; + pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-transport.in.offset; + } + out_buffers = &transport.out; if (out_buffers->current_buffer_idx != -1) { diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 71520eb..1bb28e3 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -586,7 +586,7 @@ static void test_communication(void) return; } - /* Create a socket and connect to mail.google.com */ + /* Create a socket and connect to www.codeweavers.com */ ret = WSAStartup(0x0202, &wsa_data); if (ret) { @@ -636,6 +636,23 @@ static void test_communication(void) 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + buffers[1].cBuffers = 1; + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + data_size = buffers[0].pBuffers[0].cbBuffer; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + + buffers[0].pBuffers[0].cbBuffer = buf_size; + buffers[1].cBuffers = 4; + buffers[1].pBuffers[0].cbBuffer = buf_size; + + status = pInitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); + ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + while (status == SEC_I_CONTINUE_NEEDED) { buf = &buffers[0].pBuffers[0];

1 0

Anders Jonsson : inetcpl.cpl: Add Swedish translation.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 98ed9bcdf0da8c1464d1cf4b6fff73cad2bed5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ed9bcdf0da8c1464d1cf4b6… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Sep 17 01:50:38 2010 +0200 inetcpl.cpl: Add Swedish translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Sv.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index c75d77c..dfbdde6 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ cpl_Lt.rc \ cpl_Nl.rc \ cpl_Si.rc \ + cpl_Sv.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc new file mode 100644 index 0000000..b004250 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -0,0 +1,32 @@ +/* + * Swedish resources for the Internet control panel applet + * + * Copyright 2010 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Internetinställningar" + IDS_CPL_INFO "Konfigurera Wines webbläsare och tillhörande inställningar" +END

1 0

Anders Jonsson : shdocvw: Update Swedish translation.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 6a0794194cb8bc63b32b352d57ebd8451b74f683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0794194cb8bc63b32b352d5… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Sep 17 01:49:16 2010 +0200 shdocvw: Update Swedish translation. --- dlls/shdocvw/Sv.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Sv.rc b/dlls/shdocvw/Sv.rc index bf6e739..f71d4ed 100644 --- a/dlls/shdocvw/Sv.rc +++ b/dlls/shdocvw/Sv.rc @@ -51,6 +51,7 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&Förhandsgranska...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&Egenskaper...", ID_BROWSE_PROPERTIES + MENUITEM "Stä&ng", ID_BROWSE_QUIT } POPUP "&Visa" {

1 0

Thomas Mullaly : urlmon/tests: Fixed bug in tests where the wrong value is checked.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: b5939f68ef267936796c83ec511f52e74ccf0cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5939f68ef267936796c83ec5… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Sep 16 20:06:11 2010 -0400 urlmon/tests: Fixed bug in tests where the wrong value is checked. --- dlls/urlmon/tests/uri.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 191dfcd..e39c410 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6448,7 +6448,7 @@ static void test_IUriBuilder_CreateUriSimple(IUriBuilder *builder, const uri_bui IUri *uri = NULL; hr = IUriBuilder_CreateUriSimple(builder, test->uri_simple_encode_flags, 0, &uri); - if(test->uri_todo) { + if(test->uri_simple_todo) { todo_wine { ok(hr == test->uri_simple_hres, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", @@ -6536,7 +6536,7 @@ static void test_IUriBuilder_CreateUriWithFlags(IUriBuilder *builder, const uri_ hr = IUriBuilder_CreateUriWithFlags(builder, test->uri_with_flags, test->uri_with_builder_flags, test->uri_with_encode_flags, 0, &uri); - if(test->uri_todo) { + if(test->uri_with_todo) { todo_wine { ok(hr == test->uri_with_hres, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n",

1 0

Thomas Mullaly : urlmon/tests: IUriBuilder_CreateUri functions will return the base IUri if no changes have been made .
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 3395c5623a6fd25e8e3e2608920f8ec877462218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3395c5623a6fd25e8e3e26089… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Sep 9 16:40:56 2010 -0400 urlmon/tests: IUriBuilder_CreateUri functions will return the base IUri if no changes have been made. --- dlls/urlmon/tests/uri.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 85eb1e7..191dfcd 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -7897,6 +7897,7 @@ static void test_IUriBuilder_IUriProperty(void) { hr = pCreateUri(http_urlW, 0, 0, &uri); if(SUCCEEDED(hr)) { + IUri *test = NULL; ULONG cur_count, orig_count; /* IUriBuilder doesn't clone the IUri, it use the same IUri. */ @@ -7912,6 +7913,51 @@ static void test_IUriBuilder_IUriProperty(void) { if(SUCCEEDED(hr)) ok(cur_count == orig_count, "Error: Expected uri ref count to be %d, but was %d instead.\n", orig_count, cur_count); + + /* CreateUri* functions will return back the same IUri if nothing has changed. */ + hr = IUriBuilder_SetIUri(builder, uri); + ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + orig_count = get_refcnt(uri); + + hr = IUriBuilder_CreateUri(builder, 0, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + } + if(SUCCEEDED(hr)) { + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + ok(test == uri, "Error: Expected test to be %p, but was %p instead.\n", + uri, test); + } + if(test) IUri_Release(test); + + test = NULL; + hr = IUriBuilder_CreateUriSimple(builder, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + } + if(SUCCEEDED(hr)) { + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + ok(test == uri, "Error: Expected test to be %p, but was %p instead.\n", uri, test); + } + if(test) IUri_Release(test); + + test = NULL; + hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, &test); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + if(SUCCEEDED(hr)) { + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + ok(test == uri, "Error: Expected test to be %p, but was %p instead.\n", uri, test); + } + if(test) IUri_Release(test); } if(uri) IUri_Release(uri); }

1 0

Thomas Mullaly : urlmon: Can' t set the scheme name of a IUriBuilder to NULL or an empty string.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 0da2e4c39f9af74ffb82d47fa275cf3612a03cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da2e4c39f9af74ffb82d47fa… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 12 00:20:15 2010 -0400 urlmon: Can't set the scheme name of a IUriBuilder to NULL or an empty string. --- dlls/urlmon/tests/uri.c | 78 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 14 +++++--- 2 files changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3045b3d..85eb1e7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4922,6 +4922,72 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* Can't set the scheme name to NULL. */ + { "zip://google.com/",0,S_OK,FALSE, + { + {TRUE,NULL,"zip",Uri_PROPERTY_SCHEME_NAME,E_INVALIDARG,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"zip://google.com/",S_OK}, + {"google.com",S_OK}, + {"zip://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"zip://google.com/",S_OK}, + {"zip",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + /* Can't set the scheme name to an empty string. */ + { "zip://google.com/",0,S_OK,FALSE, + { + {TRUE,"","zip",Uri_PROPERTY_SCHEME_NAME,E_INVALIDARG,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"zip://google.com/",S_OK}, + {"google.com",S_OK}, + {"zip://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"zip://google.com/",S_OK}, + {"zip",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -4975,6 +5041,11 @@ static const uri_builder_remove_test uri_builder_remove_tests[] = { { "http://google.com/?test=x",0,S_OK,FALSE, Uri_HAS_PATH_AND_QUERY,S_OK,FALSE, "http://google.com/?test=x",0,S_OK,TRUE + }, + /* Can't remove the scheme name. */ + { "http://google.com/?test=x",0,S_OK,FALSE, + Uri_HAS_SCHEME_NAME|Uri_HAS_QUERY,E_INVALIDARG,FALSE, + "http://google.com/?test=x",0,S_OK,TRUE } }; @@ -7519,7 +7590,7 @@ static void test_IUriBuilder_GetUserName(IUriBuilder *builder, const uri_builder prop = &(test->properties[i]); } - if(prop) { + if(prop && prop->value && *prop->value) { /* Use expected_value unless it's NULL, then use value. */ LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; hr = IUriBuilder_GetUserName(builder, &len, &received); @@ -7652,8 +7723,11 @@ static void test_IUriBuilder(void) { for(j = 0; j < URI_BUILDER_STR_PROPERTY_COUNT; ++j) { uri_builder_property prop = test.properties[j]; if(prop.change) { - modified = TRUE; change_property(builder, &prop, i); + if(prop.property != Uri_PROPERTY_SCHEME_NAME) + modified = TRUE; + else if(prop.value && *prop.value) + modified = TRUE; } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e69f090..b1304d8 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4729,8 +4729,13 @@ static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNe { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, - &This->modified_props, Uri_HAS_SCHEME_NAME); + + /* Only set the scheme name if it's not NULL or empty. */ + if(pwzNewValue && *pwzNewValue) + return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_SCHEME_NAME); + else + return E_INVALIDARG; } static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -4745,7 +4750,7 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr { const DWORD accepted_flags = Uri_HAS_AUTHORITY|Uri_HAS_DOMAIN|Uri_HAS_EXTENSION|Uri_HAS_FRAGMENT|Uri_HAS_HOST| Uri_HAS_PASSWORD|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_QUERY| - Uri_HAS_SCHEME_NAME|Uri_HAS_USER_INFO|Uri_HAS_USER_NAME; + Uri_HAS_USER_INFO|Uri_HAS_USER_NAME; UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(0x%08x)\n", This, dwPropertyMask); @@ -4771,9 +4776,6 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr if(dwPropertyMask & Uri_HAS_QUERY) UriBuilder_SetQuery(iface, NULL); - if(dwPropertyMask & Uri_HAS_SCHEME_NAME) - UriBuilder_SetSchemeName(iface, NULL); - if(dwPropertyMask & Uri_HAS_USER_NAME) UriBuilder_SetUserName(iface, NULL);

1 0

Jacek Caban : mshtml: Use stored nsWineURI object to create moniker in async_open.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: f39d94524668e4045516e99621cd3062276d31e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39d94524668e4045516e9962… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 16 22:47:00 2010 +0200 mshtml: Use stored nsWineURI object to create moniker in async_open. --- dlls/mshtml/nsio.c | 37 ++++--------------------------------- 1 files changed, 4 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7fdd0e6..08d3c06 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -801,37 +801,6 @@ static nsresult NSAPI nsChannel_Open(nsIHttpChannel *iface, nsIInputStream **_re return NS_ERROR_NOT_IMPLEMENTED; } -static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) -{ - nsWineURI *wine_uri; - nsresult nsres; - HRESULT hres; - - if(!channel->original_uri) { - ERR("original_uri == NULL\n"); - return E_FAIL; - } - - nsres = nsIURI_QueryInterface(channel->original_uri, &IID_nsWineURI, (void**)&wine_uri); - if(NS_FAILED(nsres)) { - ERR("Could not get nsWineURI: %08x\n", nsres); - return E_FAIL; - } - - if(wine_uri->wine_url) { - hres = CreateURLMoniker(NULL, wine_uri->wine_url, mon); - if(FAILED(hres)) - WARN("CreateURLMoniker failed: %08x\n", hres); - }else { - TRACE("wine_url == NULL\n"); - hres = E_FAIL; - } - - nsIURI_Release(NSURI(wine_uri)); - - return hres; -} - static HTMLWindow *get_window_from_load_group(nsChannel *This) { HTMLWindow *window; @@ -944,9 +913,11 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan IMoniker *mon = NULL; HRESULT hres; - hres = create_mon_for_nschannel(This, &mon); - if(FAILED(hres)) + hres = CreateURLMoniker(NULL, This->uri->wine_url, &mon); + if(FAILED(hres)) { + WARN("CreateURLMoniker failed: %08x\n", hres); return NS_ERROR_UNEXPECTED; + } if(is_doc_channel) set_current_mon(window, mon);

1 0

Nikolay Sivov : msxml3/tests: Store test data as a table for :: nodeTypedValue() tests.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: af4377f86a8991ed672080531da58fd38b8e93a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4377f86a8991ed672080531… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 17 00:12:42 2010 +0400 msxml3/tests: Store test data as a table for ::nodeTypedValue() tests. --- dlls/msxml3/tests/domdoc.c | 456 ++++++++++++-------------------------------- 1 files changed, 119 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af4377f86a8991ed67208…

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
86
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 September 2010