September 2010 - Wine-commits

Henri Verbeet : wined3d: Move the vertex declaration to wined3d_state.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: e31ea51bab250f2ea65f8d608da637f65ee29042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31ea51bab250f2ea65f8d608… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 17 11:59:41 2010 +0200 wined3d: Move the vertex declaration to wined3d_state. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 22 +++++++++++++--------- dlls/wined3d/stateblock.c | 23 ++++++++++++++--------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 7 +++---- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4660333..31ef339 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -467,7 +467,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * analyse the strided streams in depth, just set them up for no conversion. Return decl changed * if we used conversion before */ - if (!((IWineD3DVertexDeclarationImpl *) device->stateBlock->vertexDecl)->half_float_conv_needed) + if (!device->stateBlock->state.vertex_declaration->half_float_conv_needed) { if (This->conversion_map) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7bf601b..3a54f42 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -177,7 +177,7 @@ void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) { /* We need to deal with frequency data! */ - IWineD3DVertexDeclarationImpl *declaration = (IWineD3DVertexDeclarationImpl *)This->stateBlock->vertexDecl; + IWineD3DVertexDeclarationImpl *declaration = This->stateBlock->state.vertex_declaration; unsigned int i; stream_info->use_map = 0; @@ -426,7 +426,7 @@ void device_update_stream_info(IWineD3DDeviceImpl *device, const struct wined3d_ if (vs && !stream_info->position_transformed) { - if (((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->half_float_conv_needed && !fixup) + if (stateblock->state.vertex_declaration->half_float_conv_needed && !fixup) { TRACE("Using drawStridedSlow with vertex shaders for FLOAT16 conversion.\n"); device->useDrawStridedSlow = TRUE; @@ -3164,14 +3164,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, R static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration* pDecl) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DVertexDeclaration *oldDecl = This->updateStateBlock->vertexDecl; + IWineD3DVertexDeclaration *oldDecl = (IWineD3DVertexDeclaration *)This->updateStateBlock->state.vertex_declaration; TRACE("(%p) : pDecl=%p\n", This, pDecl); if (pDecl) IWineD3DVertexDeclaration_AddRef(pDecl); if (oldDecl) IWineD3DVertexDeclaration_Release(oldDecl); - This->updateStateBlock->vertexDecl = pDecl; + This->updateStateBlock->state.vertex_declaration = (IWineD3DVertexDeclarationImpl *)pDecl; This->updateStateBlock->changed.vertexDecl = TRUE; if (This->isRecordingState) { @@ -3192,7 +3192,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetVertexDeclaration(IWineD3DDevice* if TRACE("(%p) : ppDecl=%p\n", This, ppDecl); - *ppDecl = This->stateBlock->vertexDecl; + *ppDecl = (IWineD3DVertexDeclaration *)This->stateBlock->state.vertex_declaration; if (*ppDecl) IWineD3DVertexDeclaration_AddRef(*ppDecl); return WINED3D_OK; } @@ -4671,7 +4671,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitive(IWineD3DDevice *iface, UI TRACE("(%p) : start %u, count %u\n", This, StartVertex, vertex_count); - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } @@ -4709,7 +4710,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice *if return WINED3DERR_INVALIDCALL; } - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } @@ -4749,7 +4751,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, TRACE("(%p) : vertex count %u, pVtxData %p, stride %u\n", This, vertex_count, pVertexStreamZeroData, VertexStreamZeroStride); - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } @@ -4792,7 +4795,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * TRACE("(%p) : index count %u, pidxdata %p, IdxFmt %u, pVtxdata %p, stride=%u.\n", This, index_count, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); - if(!This->stateBlock->vertexDecl) { + if (!This->stateBlock->state.vertex_declaration) + { WARN("(%p) : Called without a valid vertex declaration set\n", This); return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c06e14b..ac5accb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -492,7 +492,8 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; - if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + if (This->state.vertex_declaration) + IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)This->state.vertex_declaration); for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { @@ -731,13 +732,17 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->IndexFmt = targetStateBlock->IndexFmt; } - if (This->changed.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl) + if (This->changed.vertexDecl && This->state.vertex_declaration != targetStateBlock->state.vertex_declaration) { - TRACE("Updating vertex declaration from %p to %p.\n", This->vertexDecl, targetStateBlock->vertexDecl); + TRACE("Updating vertex declaration from %p to %p.\n", + This->state.vertex_declaration, targetStateBlock->state.vertex_declaration); - if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); - if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); - This->vertexDecl = targetStateBlock->vertexDecl; + if (targetStateBlock->state.vertex_declaration) + IWineD3DVertexDeclaration_AddRef( + (IWineD3DVertexDeclaration *)targetStateBlock->state.vertex_declaration); + if (This->state.vertex_declaration) + IWineD3DVertexDeclaration_Release((IWineD3DVertexDeclaration *)This->state.vertex_declaration); + This->state.vertex_declaration = targetStateBlock->state.vertex_declaration; } if (This->changed.material && memcmp(&targetStateBlock->state.material, @@ -989,9 +994,9 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) IWineD3DDevice_SetBaseVertexIndex(device, This->baseVertexIndex); } - if (This->changed.vertexDecl && This->vertexDecl) + if (This->changed.vertexDecl && This->state.vertex_declaration) { - IWineD3DDevice_SetVertexDeclaration(device, This->vertexDecl); + IWineD3DDevice_SetVertexDeclaration(device, (IWineD3DVertexDeclaration *)This->state.vertex_declaration); } if (This->changed.material) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 994c1e2..9457bf4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2897,7 +2897,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } else if (stateblock->state.render_states[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) { - if (use_vs(stateblock) || ((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->position_transformed) + if (use_vs(stateblock) || stateblock->state.vertex_declaration->position_transformed) { settings->fog = FOG_LINEAR; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c54be90..10ddc4a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2349,6 +2349,8 @@ struct wined3d_stream_state struct wined3d_state { + IWineD3DVertexDeclarationImpl *vertex_declaration; + IWineD3DBaseTextureImpl *textures[MAX_COMBINED_SAMPLERS]; DWORD sampler_states[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; @@ -2376,9 +2378,6 @@ struct IWineD3DStateBlockImpl SAVEDSTATES changed; struct wined3d_state state; - /* Vertex Shader Declaration */ - IWineD3DVertexDeclaration *vertexDecl; - IWineD3DVertexShader *vertexShader; /* Vertex Shader Constants */ @@ -3036,7 +3035,7 @@ static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) * stateblock->vertexShader implies a vertex declaration instead of ddraw * style strided data. */ return (stateblock->vertexShader - && !((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->position_transformed + && !stateblock->state.vertex_declaration->position_transformed && stateblock->device->vs_selected_mode != SHADER_NONE); }

1 0

Jacek Caban : include: Added more d3d9 error codes.
by Alexandre Julliard 18 Sep '10

18 Sep '10

Module: wine Branch: master Commit: 5b15c0dfac250d13db6218aff605fe78a21716dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b15c0dfac250d13db6218aff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 13:29:57 2010 +0200 include: Added more d3d9 error codes. --- include/d3d9.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 3f9ebf2..0310240 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -96,6 +96,18 @@ #define D3DERR_WASSTILLDRAWING MAKE_D3DHRESULT(540) #define D3DOK_NOAUTOGEN MAKE_D3DSTATUS(2159) +#define D3DERR_DEVICEREMOVED MAKE_D3DHRESULT(2160) +#define D3DERR_DEVICEHUNG MAKE_D3DHRESULT(2164) +#define S_NOT_RESIDENT MAKE_D3DSTATUS(2165) +#define S_RESIDENT_IN_SHARED_MEMORY MAKE_D3DSTATUS(2166) +#define S_PRESENT_MODE_CHANGED MAKE_D3DSTATUS(2167) +#define S_PRESENT_OCCLUDED MAKE_D3DSTATUS(2168) +#define D3DERR_UNSUPPORTEDOVERLAY MAKE_D3DHRESULT(2171) +#define D3DERR_UNSUPPORTEDOVERLAYFORMAT MAKE_D3DHRESULT(2172) +#define D3DERR_CANNOTPROTECTCONTENT MAKE_D3DHRESULT(2173) +#define D3DERR_UNSUPPORTEDCRYPTO MAKE_D3DHRESULT(2174) +#define D3DERR_PRESENT_STATISTICS_DISJOINT MAKE_D3DHRESULT(2180) + /***************************************************************************** * Predeclare the interfaces

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

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

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

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

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

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

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