November 2011 - Wine-commits

Michael Mc Donnell : d3dx9/tests: Show D3DXMESH_VB_SHARE with new declaration should fail.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: be8dd2e876a6e8eaa4f3a6f35e982dacebd734dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8dd2e876a6e8eaa4f3a6f35… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Nov 9 13:44:46 2011 -0500 d3dx9/tests: Show D3DXMESH_VB_SHARE with new declaration should fail. --- dlls/d3dx9_36/tests/mesh.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c77f891..838e406 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9896,6 +9896,33 @@ static void test_clone_mesh(void) mesh_clone = NULL; } + /* The following test shows that it is not possible to share a vertex buffer + * with D3DXMESH_VB_SHARE and change the vertex declaration at the same + * time. It reuses the test data from test 2. + */ + hr = init_test_mesh(tc[2].num_faces, tc[2].num_vertices, + tc[2].create_options, + tc[2].declaration, + test_context->device, &mesh, + tc[2].vertices, tc[2].vertex_size, + tc[2].indices, tc[2].attributes); + if (FAILED(hr)) + { + skip("Couldn't initialize test mesh for D3DXMESH_VB_SHARE case." + " Got %x expected D3D_OK\n", hr); + goto cleanup; + } + + hr = mesh->lpVtbl->CloneMesh(mesh, tc[2].create_options | D3DXMESH_VB_SHARE, + tc[2].new_declaration, test_context->device, + &mesh_clone); + todo_wine ok(hr == D3DERR_INVALIDCALL, "CloneMesh D3DXMESH_VB_SHARE with new" + " declaration. Got %x, expected D3DERR_INVALIDCALL\n", + hr); + mesh->lpVtbl->Release(mesh); + mesh = NULL; + mesh_clone = NULL; + cleanup: if (vertices) mesh->lpVtbl->UnlockVertexBuffer(mesh); if (mesh) mesh->lpVtbl->Release(mesh);

1 0

Michael Mc Donnell : d3dx9: Return error if D3DXMESH_VB_SHARE and new declaration.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 8f5543c34e8b6d2c2480696744cf17fa2e712cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5543c34e8b6d2c248069674… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Nov 9 13:50:38 2011 -0500 d3dx9: Return error if D3DXMESH_VB_SHARE and new declaration. --- dlls/d3dx9_36/mesh.c | 5 ++++- dlls/d3dx9_36/tests/mesh.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d1693c4..ec77a37 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -707,7 +707,10 @@ static HRESULT WINAPI ID3DXMeshImpl_CloneMesh(ID3DXMesh *iface, DWORD options, C same_declaration = declaration_equals(declaration, orig_declaration); if (options & D3DXMESH_VB_SHARE) { - if (!same_declaration) goto error; + if (!same_declaration) { + hr = D3DERR_INVALIDCALL; + goto error; + } IDirect3DVertexBuffer9_AddRef(This->vertex_buffer); /* FIXME: refactor to avoid creating a new vertex buffer */ IDirect3DVertexBuffer9_Release(cloned_this->vertex_buffer); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 838e406..50e0e6b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9916,9 +9916,9 @@ static void test_clone_mesh(void) hr = mesh->lpVtbl->CloneMesh(mesh, tc[2].create_options | D3DXMESH_VB_SHARE, tc[2].new_declaration, test_context->device, &mesh_clone); - todo_wine ok(hr == D3DERR_INVALIDCALL, "CloneMesh D3DXMESH_VB_SHARE with new" - " declaration. Got %x, expected D3DERR_INVALIDCALL\n", - hr); + ok(hr == D3DERR_INVALIDCALL, "CloneMesh D3DXMESH_VB_SHARE with new" + " declaration. Got %x, expected D3DERR_INVALIDCALL\n", + hr); mesh->lpVtbl->Release(mesh); mesh = NULL; mesh_clone = NULL;

1 0

Andrew Eikum : urlmon: Improve parsing of SCHEME_MK URIs.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 31853fc203c175db96f70440b2ee5593f2dec6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=31853fc203c175db96f70440b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 15 08:32:26 2011 -0600 urlmon: Improve parsing of SCHEME_MK URIs. --- dlls/urlmon/tests/uri.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 15 +++++- 2 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3483878..327b9a2 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4316,7 +4316,32 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_WILDCARD,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } - } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/file.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, }; typedef struct _invalid_uri { @@ -6336,6 +6361,87 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir\\file.txt",0, + "relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::\\subdir\\file.txt",0, + "relative/path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:\\Some\\Bogus\\Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir\\file.txt",0, + "relative\\path.txt",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"",S_FALSE}, + {"mk:@MSITSTORE:C:/Some\\Bogus/Path.chm::/subdir/relative/path.txt",S_OK}, + {"mk",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_MK,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9fd0fe0..8f0e7e7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3086,6 +3086,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_mk = data->scheme_type == URL_SCHEME_MK; if(!data->path) { uri->path_start = -1; @@ -3095,6 +3096,12 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->path_start = uri->canon_len; + if(is_mk){ + /* hijack this flag for SCHEME_MK to tell the function when to start + * converting slashes */ + flags |= Uri_CREATE_FILE_USE_DOS_PATH; + } + /* For javascript: URIs, simply copy path part without any canonicalization */ if(data->scheme_type == URL_SCHEME_JAVASCRIPT) { if(!computeOnly) @@ -3137,13 +3144,15 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla ++uri->canon_len; do_default_action = FALSE; } else if(*ptr == '\\') { - if(is_file && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { + if((data->is_relative || is_mk || is_file) && !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Convert to a '/'. */ if(!computeOnly) uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; do_default_action = FALSE; } + } else if(is_mk && *ptr == ':' && ptr + 1 < data->path + data->path_len && *(ptr + 1) == ':') { + flags &= ~Uri_CREATE_FILE_USE_DOS_PATH; } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && !(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS)) { if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { @@ -3161,7 +3170,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla } } - if(data->scheme_type == URL_SCHEME_MK && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { + if(is_mk && !computeOnly && !(flags & Uri_CREATE_NO_CANONICALIZE)) { DWORD new_len = remove_dot_segments(uri->canon_uri + uri->path_start, uri->canon_len - uri->path_start); uri->canon_len = uri->path_start + new_len; @@ -5165,7 +5174,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU memset(&data, 0, sizeof(parse_data)); data.uri = ret->raw_uri; - /* Validate and parse the URI into it's components. */ + /* Validate and parse the URI into its components. */ if(!parse_uri(&data, dwFlags)) { /* Encountered an unsupported or invalid URI */ IUri_Release(&ret->IUri_iface);

1 0

Piotr Caban : msvcr90: Added __vswprintf_l implementation.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 6aea3dcf25a23438d4f08b67a4c6fd97daeb0c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aea3dcf25a23438d4f08b67a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 14:20:49 2011 +0100 msvcr90: Added __vswprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0925c1f..4b5b525 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -480,7 +480,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4cde658..5de5586 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -304,7 +304,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9d0d9e6..77e0e45 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -296,7 +296,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active -@ stub __vswprintf_l +@ cdecl __vswprintf_l(ptr wstr ptr ptr) msvcrt._vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index c3a837d..b6ae4c3 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -98,6 +98,8 @@ static int* (__cdecl *p_fpecode)(void); static int (__cdecl *p_configthreadlocale)(int); static void* (__cdecl *p_get_terminate)(void); static void* (__cdecl *p_get_unexpected)(void); +static int (__cdecl *p__vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list); +static int (__cdecl *p_vswprintf_l)(wchar_t*, const wchar_t*, _locale_t, __ms_va_list); /* type info */ @@ -264,6 +266,8 @@ static BOOL init(void) SET(p_configthreadlocale, "_configthreadlocale"); SET(p_get_terminate, "_get_terminate"); SET(p_get_unexpected, "_get_unexpected"); + SET(p__vswprintf_l, "__vswprintf_l"); + SET(p_vswprintf_l, "_vswprintf_l"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -981,6 +985,46 @@ static void test_getptd(void) ok(p_get_unexpected() == ptd->unexpected_handler, "ptd->unexpected_handler != _get_unexpected()\n"); } +static int __cdecl __vswprintf_l_wrapper(wchar_t *buf, + const wchar_t *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p__vswprintf_l(buf, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_l_wrapper(wchar_t *buf, + const wchar_t *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p_vswprintf_l(buf, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static void test__vswprintf_l(void) +{ + static const wchar_t format[] = {'t','e','s','t',0}; + + wchar_t buf[32]; + int ret; + + ret = __vswprintf_l_wrapper(buf, format, NULL); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(format)); + + ret = _vswprintf_l_wrapper(buf, format, NULL); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(buf, format, sizeof(format)), "buf = %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(format)); +} + START_TEST(msvcr90) { if(!init()) @@ -1001,4 +1045,5 @@ START_TEST(msvcr90) test__realloc_crt(); test_typeinfo(); test_getptd(); + test__vswprintf_l(); }

1 0

Stefan Dösinger : ddraw/tests: Mark a VMware failure broken.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 460e35aace89c39b102b3b2cadd024a5486f0d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460e35aace89c39b102b3b2ca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 14 23:08:06 2011 +0100 ddraw/tests: Mark a VMware failure broken. --- dlls/ddraw/tests/overlay.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index ded7c5a..64d0063 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -263,22 +263,27 @@ static void yv12_test(void) } hr = IDirectDrawSurface7_Blt(dst, NULL, surface, NULL, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); - - memset(&desc, 0, sizeof(desc)); - desc.dwSize = sizeof(desc); - hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); - - base = desc.lpSurface; - ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); - base += desc.dwHeight * desc.lPitch; - todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); - base += desc.dwHeight / 4 * desc.lPitch; - todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + /* VMware rejects YV12 blits. This behavior has not been seen on real hardware yet, so mark it broken */ + ok(hr == DD_OK || broken(hr == E_NOTIMPL), + "IDirectDrawSurface7_Blt returned 0x%08x, expected DD_OK\n", hr); - hr = IDirectDrawSurface7_Unlock(dst, NULL); - ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + if (SUCCEEDED(hr)) + { + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface7_Lock(dst, NULL, &desc, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned 0x%08x, expected DD_OK\n", hr); + + base = desc.lpSurface; + ok(base[0] == 0x10, "Y data is 0x%02x, expected 0x10\n", base[0]); + base += desc.dwHeight * desc.lPitch; + todo_wine ok(base[0] == 0x20, "V data is 0x%02x, expected 0x20\n", base[0]); + base += desc.dwHeight / 4 * desc.lPitch; + todo_wine ok(base[0] == 0x30, "U data is 0x%02x, expected 0x30\n", base[0]); + + hr = IDirectDrawSurface7_Unlock(dst, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr); + } IDirectDrawSurface7_Release(dst); cleanup:

1 0

Stefan Dösinger : ddraw: Add more tests and fixes for SetSurfaceDesc.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: c3d6061593601463ac96d632956b645c4c6342c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d6061593601463ac96d6329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Oct 15 15:41:17 2011 +0200 ddraw: Add more tests and fixes for SetSurfaceDesc. --- dlls/ddraw/surface.c | 37 ++++++++------------ dlls/ddraw/tests/dsurface.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46240f4..854ec3c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4033,6 +4033,19 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } + /* Tests show that only LPSURFACE and PIXELFORMAT can be set, and LPSURFACE is required + * for PIXELFORMAT to work */ + if (DDSD->dwFlags & ~(DDSD_LPSURFACE | DDSD_PIXELFORMAT)) + { + WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags); + return DDERR_INVALIDPARAMS; + } + if (!(DDSD->dwFlags & DDSD_LPSURFACE)) + { + WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); if (DDSD->dwFlags & DDSD_PIXELFORMAT) { @@ -4052,28 +4065,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_mutex_unlock(); return hr; } + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; } } - if (DDSD->dwFlags & DDSD_CKDESTOVERLAY) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_DESTOVERLAY, - (WINEDDCOLORKEY *)&DDSD->u3.ddckCKDestOverlay); - } - if (DDSD->dwFlags & DDSD_CKDESTBLT) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_DESTBLT, - (WINEDDCOLORKEY *)&DDSD->ddckCKDestBlt); - } - if (DDSD->dwFlags & DDSD_CKSRCOVERLAY) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_SRCOVERLAY, - (WINEDDCOLORKEY *)&DDSD->ddckCKSrcOverlay); - } - if (DDSD->dwFlags & DDSD_CKSRCBLT) - { - wined3d_surface_set_color_key(This->wined3d_surface, DDCKEY_SRCBLT, - (WINEDDCOLORKEY *)&DDSD->ddckCKSrcBlt); - } if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface); @@ -4089,10 +4083,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, break; /* Go on */ } } + /* DDSD->lpSurface is set by Lock() */ } - This->surface_desc = *DDSD; - wined3d_mutex_unlock(); return DD_OK; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 987801f..ca9d3b7 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4483,6 +4483,7 @@ static void set_surface_desc_test(void) IDirectDrawSurface *surface; IDirectDrawSurface3 *surface3; BYTE data[8*8*4]; + DWORD old_pitch; hr = IDirectDraw_CreateSurface(lpDD, NULL, &surface, NULL); ok(hr == DDERR_INVALIDPARAMS, "CreateSurface with a NULL DDSD returned %#x," @@ -4526,6 +4527,85 @@ static void set_surface_desc_test(void) " DDERR_INVALIDPARAMS(%#x)\n", hr, DDERR_INVALIDPARAMS); IDirectDrawSurface_Release(surface3); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 8; + ddsd.dwHeight = 8; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **) &surface3); + ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + IDirectDrawSurface_Release(surface); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + old_pitch = ddsd.lPitch; + + /* Setting width and height is an error */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.lpSurface = data; + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_LPSURFACE; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + reset_ddsd(&ddsd); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "IDirectDrawSurface3_GetSurfaceDesc failed, hr %#x.\n", hr); + ok(ddsd.dwWidth == 8, "SetSurfaceDesc: Expected width 8, got %u\n", ddsd.dwWidth); + ok(ddsd.dwHeight == 8, "SetSurfaceDesc: Expected height 8, got %u\n", ddsd.dwHeight); + + /* Setting the pitch is an error */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_PITCH; + ddsd.lPitch = 1024; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.dwFlags = DDSD_PITCH | DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.lPitch = old_pitch; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + /* Setting the pixelformat without lpsurface is an error, but with LPSURFACE it works */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_PIXELFORMAT; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DD_OK, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DD_OK); + + /* Can't set color keys */ + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CKSRCBLT; + ddsd.ddckCKSrcBlt.dwColorSpaceLowValue = 0x00ff0000; + ddsd.ddckCKSrcBlt.dwColorSpaceHighValue = 0x00ff0000; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc returned %#x, expected %#x\n", hr, DDERR_INVALIDPARAMS); + + IDirectDrawSurface_Release(surface3); } static BOOL fourcc_supported(DWORD fourcc, DWORD caps)

1 0

Stefan Dösinger : ddraw: Set correct HEL and HAL color models.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9e0baa55cec232656048c972e94a9dc2a15ec30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0baa55cec232656048c972e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 17 22:14:54 2011 +0200 ddraw: Set correct HEL and HAL color models. --- dlls/ddraw/ddraw.c | 7 +++++++ dlls/ddraw/tests/d3d.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8fdda89..5d4b008 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3968,6 +3968,9 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); hal_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); + /* RGB, RAMP and MMX devices have a HAL dcmColorModel of 0 */ + hal_desc.dcmColorModel = 0; + hr = callback((GUID *)&IID_IDirect3DRGBDevice, reference_description, device_name, &hal_desc, &hel_desc, context); if (hr != D3DENUMRET_OK) @@ -3983,11 +3986,15 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA TRACE("Enumerating HAL Direct3D device.\n"); hal_desc = device_desc1; hel_desc = device_desc1; + /* The hal device does not have the pow2 flag set in hel, but in hal. */ hel_desc.dpcLineCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); hel_desc.dpcTriCaps.dwTextureCaps &= ~(D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PERSPECTIVE); + /* HAL devices have a HEL dcmColorModel of 0 */ + hel_desc.dcmColorModel = 0; + hr = callback((GUID *)&IID_IDirect3DHALDevice, wined3d_description, device_name, &hal_desc, &hel_desc, context); if (hr != D3DENUMRET_OK) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 4cd9346..4a45867 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -804,10 +804,15 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "RGB Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "RGB Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "RGB Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_RGB, "RGB Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DHALDevice, Guid)) { trace("HAL Device %d\n", ver); + ok(hal->dcmColorModel == D3DCOLOR_RGB, "HAL Device %u hal caps has colormodel %u\n", ver, hel->dcmColorModel); + ok(hel->dcmColorModel == 0, "HAL Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DRefDevice, Guid)) { @@ -848,6 +853,10 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "Ramp Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "Ramp Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "Ramp Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_MONO, "Ramp Device %u hel caps has colormodel %u\n", + ver, hel->dcmColorModel); } else if(IsEqualGUID(&IID_IDirect3DMMXDevice, Guid)) { @@ -868,6 +877,9 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS "MMX Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); ok(hel->dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_PERSPECTIVE, "MMX Device %d hel tri caps does not have D3DPTEXTURECAPS_PERSPECTIVE set\n", ver); + + ok(hal->dcmColorModel == 0, "MMX Device %u hal caps has colormodel %u\n", ver, hal->dcmColorModel); + ok(hel->dcmColorModel == D3DCOLOR_RGB, "MMX Device %u hel caps has colormodel %u\n", ver, hel->dcmColorModel); } else {

1 0

Juan Lang : iphlpapi: Fix enumerating IPv6 addresses.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: d2236db8c1a8960579e29259dfe54998e20aff2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2236db8c1a8960579e29259d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 14 19:20:06 2011 -0800 iphlpapi: Fix enumerating IPv6 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a2bdea3..28185a8 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -770,12 +770,10 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); if (!ret) - { num_v4_gateways = count_v4_gateways(index, routeTable); - if (!(flags & GAA_FLAG_SKIP_UNICAST)) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); - } } + if (!ret && !(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } else {

1 0

Nikolay Sivov : msxml3: Support multiple IXMLDOMNamedNodeMap implementations.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: b6d3068c24e028bdc50d9583baaf83cb9a391311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d3068c24e028bdc50d9583b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 13 00:45:10 2011 +0300 msxml3: Support multiple IXMLDOMNamedNodeMap implementations. --- dlls/msxml3/element.c | 263 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 33 ++++-- dlls/msxml3/nodemap.c | 227 ++++--------------------------------- dlls/msxml3/pi.c | 71 +++++++++++- 4 files changed, 373 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6d3068c24e028bdc50d9…

1 0

Nikolay Sivov : msxml3: Added IDispatchEx support for IXMLDOMImplementation .
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 6d4c1931f994023731fc80e8038aea705ab0c406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4c1931f994023731fc80e80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 14 10:03:31 2011 +0300 msxml3: Added IDispatchEx support for IXMLDOMImplementation. --- dlls/msxml3/domimpl.c | 24 ++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 2ecf073..501d596 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domimpl { + DispatchEx dispex; IXMLDOMImplementation IXMLDOMImplementation_iface; LONG ref; } domimpl; @@ -67,6 +68,10 @@ static HRESULT WINAPI dimimpl_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { TRACE("Unsupported interface %s\n", debugstr_guid(riid)); @@ -97,6 +102,7 @@ static ULONG WINAPI dimimpl_Release( TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + release_dispex(&This->dispex); heap_free( This ); } @@ -122,13 +128,10 @@ static HRESULT WINAPI dimimpl_GetTypeInfo( ITypeInfo** ppTInfo ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMImplementation_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMImplementation_tid, ppTInfo); } static HRESULT WINAPI dimimpl_GetIDsOfNames( @@ -220,6 +223,18 @@ static const struct IXMLDOMImplementationVtbl dimimpl_vtbl = dimimpl_hasFeature }; +static const tid_t dimimpl_iface_tids[] = { + IXMLDOMImplementation_tid, + 0 +}; + +static dispex_static_data_t dimimpl_dispex = { + NULL, + IXMLDOMImplementation_tid, + NULL, + dimimpl_iface_tids +}; + IUnknown* create_doc_Implementation(void) { domimpl *This; @@ -230,6 +245,7 @@ IUnknown* create_doc_Implementation(void) This->IXMLDOMImplementation_iface.lpVtbl = &dimimpl_vtbl; This->ref = 1; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMImplementation_iface, &dimimpl_dispex); return (IUnknown*)&This->IXMLDOMImplementation_iface; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a79da43..dfad107 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10507,6 +10507,7 @@ static const DOMNodeType dispex_types_test[] = static void test_dispex(void) { const DOMNodeType *type = dispex_types_test; + IXMLDOMImplementation *impl; IXMLDOMNodeList *node_list; IXMLDOMParseError *error; IXMLDOMNamedNodeMap *map; @@ -10612,6 +10613,15 @@ static void test_dispex(void) IXMLDOMNamedNodeMap_Release(map); IXMLDOMElement_Release(elem); + /* IXMLDOMImplementation */ + hr = IXMLDOMDocument_get_implementation(doc, &impl); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMImplementation_QueryInterface(impl, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + IDispatchEx_Release(dispex); + IXMLDOMImplementation_Release(impl); + IXMLDOMDocument_Release(doc); /* IXMLHTTPRequest */

1 0