January 2012 - Wine-Commits

Piotr Caban : urlmon: Fixed UriBuilderFactory IUnknown implementation.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: e6b2b580bf31b0111fb63f1a5f9d2fa0c4d7936d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b2b580bf31b0111fb63f1a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 12 15:34:20 2012 +0100 urlmon: Fixed UriBuilderFactory IUnknown implementation. --- dlls/urlmon/uri.c | 34 +++------------------------------- 1 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 55488d9..d334b9e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5034,47 +5034,19 @@ static inline Uri* impl_from_IUriBuilderFactory(IUriBuilderFactory *iface) static HRESULT WINAPI UriBuilderFactory_QueryInterface(IUriBuilderFactory *iface, REFIID riid, void **ppv) { Uri *This = impl_from_IUriBuilderFactory(iface); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUriBuilderFactory_iface; - }else if(IsEqualGUID(&IID_IUriBuilderFactory, riid)) { - TRACE("(%p)->(IID_IUriBuilderFactory %p)\n", This, ppv); - *ppv = &This->IUriBuilderFactory_iface; - }else if(IsEqualGUID(&IID_IUri, riid)) { - TRACE("(%p)->(IID_IUri %p)\n", This, ppv); - *ppv = &This->IUri_iface; - }else { - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + return IUri_QueryInterface(&This->IUri_iface, riid, ppv); } static ULONG WINAPI UriBuilderFactory_AddRef(IUriBuilderFactory *iface) { Uri *This = impl_from_IUriBuilderFactory(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + return IUri_AddRef(&This->IUri_iface); } static ULONG WINAPI UriBuilderFactory_Release(IUriBuilderFactory *iface) { Uri *This = impl_from_IUriBuilderFactory(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) - destory_uri_obj(This); - - return ref; + return IUri_Release(&This->IUri_iface); } static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *iface,

1 0

Rico Schüller : d3dx9/tests: Reset effect parameter value data after each try.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 7825fa833ff9ff719dcd7abb30d4024c9c583d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7825fa833ff9ff719dcd7abb3… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 12 13:37:15 2012 +0100 d3dx9/tests: Reset effect parameter value data after each try. --- dlls/d3dx9_36/tests/effect.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f5a9856..6e60e2e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1570,6 +1570,38 @@ static void test_effect_parameter_value_GetTestGroup(const struct test_effect_pa test_effect_parameter_value_GetMatrixTransposeArray(res, effect, res_value, parameter, i); } +static void test_effect_parameter_value_ResetValue(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + + if (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR + || res_desc->Class == D3DXPC_MATRIX_ROWS) + { + hr = effect->lpVtbl->SetValue(effect, parameter, res_value, res_desc->Bytes); + ok(hr == D3D_OK, "%u - %s: SetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + /* nothing to do */ + switch (res_desc->Type) + { + case D3DXPT_PIXELSHADER: + case D3DXPT_VERTEXSHADER: + case D3DXPT_TEXTURE2D: + case D3DXPT_STRING: + break; + + default: + ok(0, "Type is %u, this should not happen!\n", res_desc->Type); + break; + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -1642,6 +1674,8 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) "%u - %s: Warning: Array size to small\n", i, res_full_name); test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); /* SetBool */ bvalue = 1; @@ -1658,6 +1692,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) i, res_full_name, hr, D3DERR_INVALIDCALL); } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetBool() test.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 5f01e930148dba9659064e9e4db3fa583fdc0aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f01e930148dba9659064e9e4… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 12 13:37:12 2012 +0100 d3dx9/tests: Add effect parameter value SetBool() test. --- dlls/d3dx9_36/tests/effect.c | 80 +++++++++++++++++++++++++++++++++++------- 1 files changed, 67 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b9830d2..f5a9856 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -98,6 +98,36 @@ static inline BOOL get_bool(LPCVOID data) return (*(BOOL *)data) ? TRUE : FALSE; } +static void set_number(LPVOID outdata, D3DXPARAMETER_TYPE outtype, LPCVOID indata, D3DXPARAMETER_TYPE intype) +{ + switch (outtype) + { + case D3DXPT_FLOAT: + *(FLOAT *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(indata); + break; + + case D3DXPT_INT: + *(INT *)outdata = get_int(intype, indata); + break; + + case D3DXPT_PIXELSHADER: + case D3DXPT_VERTEXSHADER: + case D3DXPT_TEXTURE2D: + case D3DXPT_STRING: + *(INT *)outdata = 0x12345678; + break; + + default: + ok(0, "Unhandled type %x.\n", outtype); + *(INT *)outdata = 0; + break; + } +} + static const char effect_desc[] = "Technique\n" "{\n" @@ -1522,6 +1552,24 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes } } +static void test_effect_parameter_value_GetTestGroup(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + test_effect_parameter_value_GetValue(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetBool(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetBoolArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetInt(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetIntArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetFloat(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetFloatArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetVector(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetVectorArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrix(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrixArray(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrixTranspose(res, effect, res_value, parameter, i); + test_effect_parameter_value_GetMatrixTransposeArray(res, effect, res_value, parameter, i); +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -1554,6 +1602,8 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) UINT res_value_offset = res[k].value_offset; D3DXHANDLE parameter; D3DXPARAMETER_DESC pdesc; + BOOL bvalue; + DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1591,19 +1641,23 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) (res_desc->Elements ? res_desc->Bytes / 4 / res_desc->Elements : 0), "%u - %s: Warning: Array size to small\n", i, res_full_name); - test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetIntArray(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetFloat(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetMatrixArray(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetMatrixTranspose(&res[k], effect, &blob[res_value_offset], parameter, i); - test_effect_parameter_value_GetMatrixTransposeArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetBool */ + bvalue = 1; + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetBool(effect, parameter, bvalue); + if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) + { + set_number(expected_value, res_desc->Type, &bvalue, D3DXPT_BOOL); + ok(hr == D3D_OK, "%u - %s: SetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetBool failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value object test.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 834d797339db4d18c75651c7534f6bf128b1c613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834d797339db4d18c75651c75… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 12 13:37:05 2012 +0100 d3dx9/tests: Add effect parameter value object test. --- dlls/d3dx9_36/tests/effect.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d0cdf4e..f36262d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -744,6 +744,51 @@ struct test_effect_parameter_value_result test_effect_parameter_value_result_int {"i44_2", {"i44_2", NULL, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 4, 4, 2, 0, 0, 0, 128}, 699}, }; +/* + * fxc.exe /Tfx_2_0 + */ +#if 0 +string s = "test"; +string s_2[2] = {"test1", "test2"}; +texture2D tex; +Vertexshader v; +Vertexshader v_2[2]; +Pixelshader p; +Pixelshader p_2[2]; +technique t { pass p { } } +#endif +static const DWORD test_effect_parameter_value_blob_object[] = +{ +0xfeff0901, 0x00000100, 0x00000000, 0x00000004, 0x00000004, 0x0000001c, 0x00000000, 0x00000000, +0x00000001, 0x00000002, 0x00000073, 0x00000004, 0x00000004, 0x00000040, 0x00000000, 0x00000002, +0x00000002, 0x00000003, 0x00000004, 0x00325f73, 0x00000007, 0x00000004, 0x00000060, 0x00000000, +0x00000000, 0x00000004, 0x00000004, 0x00786574, 0x00000010, 0x00000004, 0x00000080, 0x00000000, +0x00000000, 0x00000005, 0x00000002, 0x00000076, 0x00000010, 0x00000004, 0x000000a4, 0x00000000, +0x00000002, 0x00000006, 0x00000007, 0x00000004, 0x00325f76, 0x0000000f, 0x00000004, 0x000000c4, +0x00000000, 0x00000000, 0x00000008, 0x00000002, 0x00000070, 0x0000000f, 0x00000004, 0x000000e8, +0x00000000, 0x00000002, 0x00000009, 0x0000000a, 0x00000004, 0x00325f70, 0x00000002, 0x00000070, +0x00000002, 0x00000074, 0x00000007, 0x00000001, 0x00000007, 0x0000000b, 0x00000004, 0x00000018, +0x00000000, 0x00000000, 0x00000024, 0x00000038, 0x00000000, 0x00000000, 0x00000048, 0x0000005c, +0x00000000, 0x00000000, 0x00000068, 0x0000007c, 0x00000000, 0x00000000, 0x00000088, 0x0000009c, +0x00000000, 0x00000000, 0x000000ac, 0x000000c0, 0x00000000, 0x00000000, 0x000000cc, 0x000000e0, +0x00000000, 0x00000000, 0x000000f8, 0x00000000, 0x00000001, 0x000000f0, 0x00000000, 0x00000000, +0x0000000a, 0x00000000, 0x00000009, 0x00000000, 0x0000000a, 0x00000000, 0x00000008, 0x00000000, +0x00000006, 0x00000000, 0x00000007, 0x00000000, 0x00000005, 0x00000000, 0x00000004, 0x00000000, +0x00000002, 0x00000006, 0x74736574, 0x00000031, 0x00000003, 0x00000006, 0x74736574, 0x00000032, +0x00000001, 0x00000005, 0x74736574, 0x00000000, +}; + +struct test_effect_parameter_value_result test_effect_parameter_value_result_object[] = +{ + {"s", {"s", NULL, D3DXPC_OBJECT, D3DXPT_STRING, 0, 0, 0, 0, 0, 0, sizeof(LPCSTR)}, 0}, + {"s_2", {"s_2", NULL, D3DXPC_OBJECT, D3DXPT_STRING, 0, 0, 2, 0, 0, 0, 2 * sizeof(LPCSTR)}, 0}, + {"tex", {"tex", NULL, D3DXPC_OBJECT, D3DXPT_TEXTURE2D, 0, 0, 0, 0, 0, 0, sizeof(LPDIRECT3DBASETEXTURE9)}, 0}, + {"v", {"v", NULL, D3DXPC_OBJECT, D3DXPT_VERTEXSHADER, 0, 0, 0, 0, 0, 0, sizeof(LPDIRECT3DVERTEXSHADER9)}, 0}, + {"v_2", {"v_2", NULL, D3DXPC_OBJECT, D3DXPT_VERTEXSHADER, 0, 0, 2, 0, 0, 0, 2 * sizeof(LPDIRECT3DVERTEXSHADER9)}, 0}, + {"p", {"p", NULL, D3DXPC_OBJECT, D3DXPT_PIXELSHADER, 0, 0, 0, 0, 0, 0, sizeof(LPDIRECT3DPIXELSHADER9)}, 0}, + {"p_2", {"p_2", NULL, D3DXPC_OBJECT, D3DXPT_PIXELSHADER, 0, 0, 2, 0, 0, 0, 2 * sizeof(LPDIRECT3DPIXELSHADER9)}, 0}, +}; + #define ADD_PARAMETER_VALUE(x) {\ test_effect_parameter_value_blob_ ## x,\ sizeof(test_effect_parameter_value_blob_ ## x),\ @@ -762,6 +807,7 @@ test_effect_parameter_value_data[] = { ADD_PARAMETER_VALUE(float), ADD_PARAMETER_VALUE(int), + ADD_PARAMETER_VALUE(object), }; #undef ADD_PARAMETER_VALUE @@ -799,6 +845,31 @@ static void test_effect_parameter_value_GetValue(const struct test_effect_parame i, res_full_name, l, value[l], 0xabababab); } } + else if (res_desc->Class == D3DXPC_OBJECT) + { + switch (res_desc->Type) + { + case D3DXPT_PIXELSHADER: + case D3DXPT_VERTEXSHADER: + case D3DXPT_TEXTURE2D: + ok(hr == D3D_OK, "%u - %s: GetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < (res_desc->Elements ? res_desc->Elements : 1); ++l) + { + IUnknown *unk = *((IUnknown **)value + l); + if (unk) IUnknown_Release(unk); + } + break; + + case D3DXPT_STRING: + ok(hr == D3D_OK, "%u - %s: GetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + break; + + default: + ok(0, "Type is %u, this should not happen!\n", res_desc->Type); + break; + } + } else { ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetValue failed, got %#x, expected %#x\n",

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value int test.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: a3d3834233983923e4e12a608ec42eb73698233d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d3834233983923e4e12a608… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 12 13:36:57 2012 +0100 d3dx9/tests: Add effect parameter value int test. --- dlls/d3dx9_36/tests/effect.c | 231 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 231 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3d3834233983923e4e12…

1 0

Piotr Caban : urlmon: Added Uri IPersistStream_Save implementation.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 3694ab67e538533560c3ddf3c98c9f7cfe712f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3694ab67e538533560c3ddf3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 12 15:34:58 2012 +0100 urlmon: Added Uri IPersistStream_Save implementation. --- dlls/urlmon/uri.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 158 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 741732b..4c6747d 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "wine/debug.h" @@ -5132,8 +5134,8 @@ static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *pCl static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) { Uri *This = impl_from_IPersistStream(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + TRACE("(%p)\n", This); + return S_FALSE; } static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) @@ -5143,18 +5145,168 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) return E_NOTIMPL; } +struct persist_uri { + DWORD size; + DWORD unk1[2]; + DWORD create_flags; + DWORD unk2[3]; + DWORD fields_no; + BYTE data[1]; +}; + +static inline BYTE* persist_stream_add_strprop(Uri *This, BYTE *p, DWORD type, DWORD len, WCHAR *data) +{ + len *= sizeof(WCHAR); + *(DWORD*)p = type; + p += sizeof(DWORD); + *(DWORD*)p = len+sizeof(WCHAR); + p += sizeof(DWORD); + memcpy(p, data, len); + p += len; + *(WCHAR*)p = 0; + return p+sizeof(WCHAR); +} + static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *pStm, BOOL fClearDirty) { Uri *This = impl_from_IPersistStream(iface); - FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); - return E_NOTIMPL; + ULARGE_INTEGER size; + struct persist_uri *data; + BYTE *p; + HRESULT hres; + + TRACE("(%p)->(%p %x)\n", This, pStm, fClearDirty); + + if(!pStm) + return E_INVALIDARG; + + hres = IPersistStream_GetSizeMax(&This->IPersistStream_iface, &size); + if(FAILED(hres)) + return hres; + + data = heap_alloc_zero(size.u.LowPart); + if(!data) + return E_OUTOFMEMORY; + + data->size = size.u.LowPart; + data->create_flags = This->create_flags; + + data->fields_no = 1; + p = persist_stream_add_strprop(This, data->data, Uri_PROPERTY_RAW_URI, + SysStringLen(This->raw_uri), This->raw_uri); + if(This->scheme_type!=URL_SCHEME_HTTP && This->scheme_type!=URL_SCHEME_HTTPS + && This->scheme_type!=URL_SCHEME_FTP) { + hres = IStream_Write(pStm, data, data->size-2, NULL); + heap_free(data); + return hres; + } + + if(This->fragment_len) { + data->fields_no++; + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_FRAGMENT, + This->fragment_len, This->canon_uri+This->fragment_start); + } + + if(This->host_len) { + data->fields_no++; + if(This->host_type == Uri_HOST_IPV6) + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_HOST, + This->host_len-2, This->canon_uri+This->host_start+1); + else + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_HOST, + This->host_len, This->canon_uri+This->host_start); + } + + if(This->userinfo_split > -1) { + data->fields_no++; + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_PASSWORD, + This->userinfo_len-This->userinfo_split-1, + This->canon_uri+This->userinfo_start+This->userinfo_split+1); + } + + if(This->path_len) { + data->fields_no++; + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_PATH, + This->path_len, This->canon_uri+This->path_start); + } + + if(This->has_port) { + data->fields_no++; + *(DWORD*)p = Uri_PROPERTY_PORT; + p += sizeof(DWORD); + *(DWORD*)p = sizeof(DWORD); + p += sizeof(DWORD); + *(DWORD*)p = This->port; + p += sizeof(DWORD); + } + + if(This->query_len) { + data->fields_no++; + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_QUERY, + This->query_len, This->canon_uri+This->query_start); + } + + if(This->scheme_len) { + data->fields_no++; + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_SCHEME_NAME, + This->scheme_len, This->canon_uri+This->scheme_start); + } + + if(This->userinfo_start>-1 && This->userinfo_split!=0) { + data->fields_no++; + if(This->userinfo_split > -1) + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_USER_NAME, + This->userinfo_split, This->canon_uri+This->userinfo_start); + else + p = persist_stream_add_strprop(This, p, Uri_PROPERTY_USER_NAME, + This->userinfo_len, This->canon_uri+This->userinfo_start); + } + + hres = IStream_Write(pStm, data, data->size-2, NULL); + heap_free(data); + return hres; } static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *pcbSize) { Uri *This = impl_from_IPersistStream(iface); - FIXME("(%p)->(%p)\n", This, pcbSize); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pcbSize); + + if(!pcbSize) + return E_INVALIDARG; + + pcbSize->u.LowPart = 2+(SysStringLen(This->raw_uri)+1)*sizeof(WCHAR) + + 2*sizeof(DWORD) + sizeof(struct persist_uri); + pcbSize->u.HighPart = 0; + if(This->scheme_type!=URL_SCHEME_HTTP && This->scheme_type!=URL_SCHEME_HTTPS + && This->scheme_type!=URL_SCHEME_FTP) + return S_OK; + + if(This->fragment_len) + pcbSize->u.LowPart += (This->fragment_len+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + if(This->host_len) { + if(This->host_type == Uri_HOST_IPV6) + pcbSize->u.LowPart += (This->host_len-1)*sizeof(WCHAR) + 2*sizeof(DWORD); + else + pcbSize->u.LowPart += (This->host_len+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + } + if(This->userinfo_split > -1) + pcbSize->u.LowPart += (This->userinfo_len-This->userinfo_split)*sizeof(WCHAR) + 2*sizeof(DWORD); + if(This->path_len) + pcbSize->u.LowPart += (This->path_len+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + if(This->has_port) + pcbSize->u.LowPart += 3*sizeof(DWORD); + if(This->query_len) + pcbSize->u.LowPart += (This->query_len+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + if(This->scheme_len) + pcbSize->u.LowPart += (This->scheme_len+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + if(This->userinfo_start>-1 && This->userinfo_split!=0) { + if(This->userinfo_split > -1) + pcbSize->u.LowPart += (This->userinfo_split+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + else + pcbSize->u.LowPart += (This->userinfo_len+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + } + return S_OK; } static const IPersistStreamVtbl PersistStreamVtbl = {

1 0

Jacek Caban : mshtml: Get rid of wrapped nsIURI in nsWineURI.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: d42079700245bdd662c8c52325770d49a4633340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42079700245bdd662c8c5232… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 15:37:23 2012 +0100 mshtml: Get rid of wrapped nsIURI in nsWineURI. --- dlls/mshtml/nsio.c | 56 +++++++++++---------------------------------------- 1 files changed, 12 insertions(+), 44 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2ea7efd..8e7bdec 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -58,7 +58,6 @@ struct nsWineURI { LONG ref; - nsIURI *nsuri; NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; @@ -140,7 +139,7 @@ BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } -static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -1766,7 +1765,7 @@ static nsresult NSAPI nsURI_QueryInterface(nsIURL *iface, nsIIDRef riid, void ** } TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); - return This->nsuri ? nsIURI_QueryInterface(This->nsuri, riid, result) : NS_NOINTERFACE; + return NS_NOINTERFACE; } static nsrefcnt NSAPI nsURI_AddRef(nsIURL *iface) @@ -1791,8 +1790,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) windowref_release(This->window_ref); if(This->container) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); - if(This->nsuri) - nsIURI_Release(This->nsuri); if(This->uri) IUri_Release(This->uri); heap_free(This); @@ -1848,13 +1845,7 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p)\n", This, aPrePath); - - if(This->nsuri) - return nsIURI_GetPrePath(This->nsuri, aPrePath); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p)\n", This, aPrePath); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2255,7 +2246,6 @@ static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool * static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) { nsWineURI *This = impl_from_nsIURL(iface); - nsIURI *nsuri = NULL; nsWineURI *wine_uri; nsresult nsres; @@ -2264,15 +2254,7 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - if(This->nsuri) { - nsres = nsIURI_Clone(This->nsuri, &nsuri); - if(NS_FAILED(nsres)) { - WARN("Clone failed: %08x\n", nsres); - return nsres; - } - } - - nsres = create_nsuri(This->uri, nsuri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2347,13 +2329,7 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginCharset) { nsWineURI *This = impl_from_nsIURL(iface); - - TRACE("(%p)->(%p)\n", This, aOriginCharset); - - if(This->nsuri) - return nsIURI_GetOriginCharset(This->nsuri, aOriginCharset); - - FIXME("default action not implemented\n"); + FIXME("(%p)->(%p)\n", This, aOriginCharset); return NS_ERROR_NOT_IMPLEMENTED; } @@ -2450,7 +2426,7 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, NULL, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -2815,14 +2791,13 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_Init }; -static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) { nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); ret->nsIURL_iface.lpVtbl = &nsURLVtbl; ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl; ret->ref = 1; - ret->nsuri = nsuri; ret->is_mutable = TRUE; set_uri_nscontainer(ret, container); @@ -2847,7 +2822,7 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, NULL, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2904,7 +2879,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, NULL, window, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3178,7 +3153,6 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * WCHAR new_spec[INTERNET_MAX_URL_LENGTH]; HTMLWindow *window = NULL; const char *spec = NULL; - nsIURI *uri = NULL; IUri *urlmon_uri; nsresult nsres; HRESULT hres; @@ -3218,16 +3192,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * WARN("CreateUri failed: %08x\n", hres); } - nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); - if(NS_FAILED(nsres)) - TRACE("NewURI failed: %08x\n", nsres); - - if(FAILED(hres)) { - *_retval = uri; - return nsres; - } + if(FAILED(hres)) + return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); - nsres = create_nsuri(urlmon_uri, uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIURI_Release(&base_wine_uri->nsIURL_iface);

1 0

Jacek Caban : jscript: Fixed jscript tests on some broken versions.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 5561ee635c02a794cde8811d6c84f4a0cf9b93bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5561ee635c02a794cde8811d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:48:00 2012 +0100 jscript: Fixed jscript tests on some broken versions. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 152329b..7c81328 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -644,7 +644,7 @@ static void test_aggregation(void) &IID_IUnknown, (void**)&unk); ok(hres == CLASS_E_NOAGGREGATION || broken(E_INVALIDARG) /* win2k */, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); - ok(!unk, "unk = %p\n", unk); + ok(!unk || broken(unk != NULL), "unk = %p\n", unk); } static BOOL check_jscript(void)

1 0

Jacek Caban : jscript: Don't use break in finally block on pre-IE8 jscript.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: e7bb8813a9ed674e2b40163966abd96f9c525c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bb8813a9ed674e2b4016396… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:43:25 2012 +0100 jscript: Don't use break in finally block on pre-IE8 jscript. --- dlls/jscript/tests/lang.js | 51 +++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 58d4599..a035ebe 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -842,34 +842,37 @@ ok(!("nonexistent" in obj1), "nonexistent added to obj1 by for..in loop"); var i, j; -tmp = ""; -i = 0; -while(true) { - tmp += "1"; - for(i = 1; i < 3; i++) { - switch(i) { - case 1: - tmp += "2"; - continue; - case 2: - tmp += "3"; - try { - throw null; - }finally { - tmp += "4"; - break; +/* Previous versions have broken finally block implementation */ +if(ScriptEngineMinorVersion() >= 8) { + tmp = ""; + i = 0; + while(true) { + tmp += "1"; + for(i = 1; i < 3; i++) { + switch(i) { + case 1: + tmp += "2"; + continue; + case 2: + tmp += "3"; + try { + throw null; + }finally { + tmp += "4"; + break; + } + default: + ok(false, "unexpected state"); } - default: - ok(false, "unexpected state"); + tmp += "5"; + } + with({prop: "6"}) { + tmp += prop; + break; } - tmp += "5"; - } - with({prop: "6"}) { - tmp += prop; - break; } + ok(tmp === "123456", "tmp = " + tmp); } -ok(tmp === "123456", "tmp = " + tmp); tmp = ""; i = 0;

1 0

Rico Schüller : d3dx9/tests: Add special handling test .
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: cb8c013366b628dae36485ad39d6e9d91bdca46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8c013366b628dae36485ad3… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 12 13:37:08 2012 +0100 d3dx9/tests: Add special handling test. --- dlls/d3dx9_36/tests/effect.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f36262d..b9830d2 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -789,6 +789,48 @@ struct test_effect_parameter_value_result test_effect_parameter_value_result_obj {"p_2", {"p_2", NULL, D3DXPC_OBJECT, D3DXPT_PIXELSHADER, 0, 0, 2, 0, 0, 0, 2 * sizeof(LPDIRECT3DPIXELSHADER9)}, 0}, }; +/* + * fxc.exe /Tfx_2_0 + */ +#if 0 +float3 f3 = {-3.1, 153.2, 283.3}; +float3 f3min = {-31.1, -31.2, -31.3}; +float3 f3max = {320.1, 320.2, 320.3}; +float4 f4 = {-4.1, 154.2, 284.3, 34.4}; +float4 f4min = {-41.1, -41.2, -41.3, -41.4}; +float4 f4max = {420.1, 42.20, 420.3, 420.4}; +technique t { pass p { } } +#endif +static const DWORD test_effect_parameter_value_blob_special[] = +{ +0xfeff0901, 0x00000150, 0x00000000, 0x00000003, 0x00000001, 0x0000002c, 0x00000000, 0x00000000, +0x00000003, 0x00000001, 0xc0466666, 0x43193333, 0x438da666, 0x00000003, 0x00003366, 0x00000003, +0x00000001, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0xc1f8cccd, 0xc1f9999a, +0xc1fa6666, 0x00000006, 0x696d3366, 0x0000006e, 0x00000003, 0x00000001, 0x00000090, 0x00000000, +0x00000000, 0x00000003, 0x00000001, 0x43a00ccd, 0x43a0199a, 0x43a02666, 0x00000006, 0x616d3366, +0x00000078, 0x00000003, 0x00000001, 0x000000c8, 0x00000000, 0x00000000, 0x00000004, 0x00000001, +0xc0833333, 0x431a3333, 0x438e2666, 0x4209999a, 0x00000003, 0x00003466, 0x00000003, 0x00000001, +0x000000fc, 0x00000000, 0x00000000, 0x00000004, 0x00000001, 0xc2246666, 0xc224cccd, 0xc2253333, +0xc225999a, 0x00000006, 0x696d3466, 0x0000006e, 0x00000003, 0x00000001, 0x00000134, 0x00000000, +0x00000000, 0x00000004, 0x00000001, 0x43d20ccd, 0x4228cccd, 0x43d22666, 0x43d23333, 0x00000006, +0x616d3466, 0x00000078, 0x00000002, 0x00000070, 0x00000002, 0x00000074, 0x00000006, 0x00000001, +0x00000001, 0x00000001, 0x00000004, 0x00000020, 0x00000000, 0x00000000, 0x00000034, 0x00000050, +0x00000000, 0x00000000, 0x00000068, 0x00000084, 0x00000000, 0x00000000, 0x0000009c, 0x000000b8, +0x00000000, 0x00000000, 0x000000d0, 0x000000ec, 0x00000000, 0x00000000, 0x00000108, 0x00000124, +0x00000000, 0x00000000, 0x00000148, 0x00000000, 0x00000001, 0x00000140, 0x00000000, 0x00000000, +0x00000000, 0x00000000, +}; + +struct test_effect_parameter_value_result test_effect_parameter_value_result_special[] = +{ + {"f3", {"f3", NULL, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 0, 0, 0, 0, 12}, 10}, + {"f3min", {"f3min", NULL, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 0, 0, 0, 0, 12}, 22}, + {"f3max", {"f3max", NULL, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 3, 0, 0, 0, 0, 12}, 35}, + {"f4", {"f4", NULL, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 0, 0, 0, 0, 16}, 48}, + {"f4min", {"f4min", NULL, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 0, 0, 0, 0, 16}, 61}, + {"f4max", {"f4max", NULL, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 0, 0, 0, 0, 16}, 75}, +}; + #define ADD_PARAMETER_VALUE(x) {\ test_effect_parameter_value_blob_ ## x,\ sizeof(test_effect_parameter_value_blob_ ## x),\ @@ -808,6 +850,7 @@ test_effect_parameter_value_data[] = ADD_PARAMETER_VALUE(float), ADD_PARAMETER_VALUE(int), ADD_PARAMETER_VALUE(object), + ADD_PARAMETER_VALUE(special), }; #undef ADD_PARAMETER_VALUE

1 0