June 2012 - Wine-Commits - list.winehq.org

Aric Stewart : usp10: Properly handle fonts with scripts without a default language.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 6c43ef46d85bb37de5ce65a8ae6634e891e5cb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c43ef46d85bb37de5ce65a8a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 11 07:15:11 2012 -0500 usp10: Properly handle fonts with scripts without a default language. --- dlls/usp10/opentype.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 74046fd..1a5d3e4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -924,10 +924,15 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (!script->language_count) { + DWORD offset; const GSUB_Script* table = script->table; script->language_count = GET_BE_WORD(table->LangSysCount); - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.table = (const BYTE*)table + GET_BE_WORD(table->DefaultLangSys); + offset = GET_BE_WORD(table->DefaultLangSys); + if (offset) + { + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.table = (const BYTE*)table + offset; + } if (script->language_count) {

1 0

Józef Kucia : d3dx9/tests: Use inline functions instead of check_pixel_{1bpp, 2bpp, 4bpp} macros.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 0e532633e37bd066ceb1156f85e9075c79dea8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e532633e37bd066ceb1156f8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Jun 10 21:39:48 2012 +0200 d3dx9/tests: Use inline functions instead of check_pixel_{1bpp, 2bpp, 4bpp} macros. --- dlls/d3dx9_36/tests/surface.c | 196 +++++++++++++++++++++------------------- 1 files changed, 103 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e532633e37bd066ceb11…

1 0

Józef Kucia : d3dx9/tests: Improve test failure messages for check_{ref, release}.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: cda4738f52152a805138b607726466836a73d22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda4738f52152a805138b6077… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Jun 10 21:39:47 2012 +0200 d3dx9/tests: Improve test failure messages for check_{ref, release}. --- dlls/d3dx9_36/tests/core.c | 10 ++++++---- dlls/d3dx9_36/tests/surface.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa259ab..7f9ab44 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -29,16 +29,18 @@ static inline int get_ref(IUnknown *obj) return IUnknown_Release(obj); } -static inline void check_ref(IUnknown *obj, int exp) +#define check_ref(obj, exp) _check_ref(__LINE__, obj, exp) +static inline void _check_ref(unsigned int line, IUnknown *obj, int exp) { int ref = get_ref(obj); - ok (exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref); + ok_(__FILE__, line)(exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref); } -static inline void check_release(IUnknown *obj, int exp) +#define check_release(obj, exp) _check_release(__LINE__, obj, exp) +static inline void _check_release(unsigned int line, IUnknown *obj, int exp) { int ref = IUnknown_Release(obj); - ok (ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref); + ok_(__FILE__, line)(ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref); } #define admitted_error 0.0001f diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4b3b511..72d2509 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -30,16 +30,18 @@ static inline int get_ref(IUnknown *obj) return IUnknown_Release(obj); } -static inline void check_ref(IUnknown *obj, int exp) +#define check_ref(obj, exp) _check_ref(__LINE__, obj, exp) +static inline void _check_ref(unsigned int line, IUnknown *obj, int exp) { int ref = get_ref(obj); - ok (exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref); + ok_(__FILE__, line)(exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref); } -static inline void check_release(IUnknown *obj, int exp) +#define check_release(obj, exp) _check_release(__LINE__, obj, exp) +static inline void _check_release(unsigned int line, IUnknown *obj, int exp) { int ref = IUnknown_Release(obj); - ok (ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref); + ok_(__FILE__, line)(ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref); } /* 1x1 bmp (1 bpp) */

1 0

Józef Kucia : d3dx9: Add ID3DXRenderToEnvMap interface stub.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 35c13b0879163a5b9de99e00aa29f4ffbc8d94d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c13b0879163a5b9de99e00a… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Jun 10 21:29:14 2012 +0200 d3dx9: Add ID3DXRenderToEnvMap interface stub. --- dlls/d3dx9_36/render.c | 197 +++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/core.c | 4 +- 2 files changed, 195 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 9b691bc..7994a8b 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -315,7 +315,7 @@ static HRESULT WINAPI D3DXRenderToSurface_OnResetDevice(ID3DXRenderToSurface *if return D3D_OK; } -static const ID3DXRenderToSurfaceVtbl d3dx_render_to_surface_vtbl = +static const ID3DXRenderToSurfaceVtbl render_to_surface_vtbl = { /* IUnknown methods */ D3DXRenderToSurface_QueryInterface, @@ -354,7 +354,7 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, render = HeapAlloc(GetProcessHeap(), 0, sizeof(struct render_to_surface)); if (!render) return E_OUTOFMEMORY; - render->ID3DXRenderToSurface_iface.lpVtbl = &d3dx_render_to_surface_vtbl; + render->ID3DXRenderToSurface_iface.lpVtbl = &render_to_surface_vtbl; render->ref = 1; render->desc.Width = width; @@ -387,6 +387,172 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, return D3D_OK; } + +struct render_to_envmap +{ + ID3DXRenderToEnvMap ID3DXRenderToEnvMap_iface; + LONG ref; + + IDirect3DDevice9 *device; + D3DXRTE_DESC desc; +}; + +static inline struct render_to_envmap *impl_from_ID3DXRenderToEnvMap(ID3DXRenderToEnvMap *iface) +{ + return CONTAINING_RECORD(iface, struct render_to_envmap, ID3DXRenderToEnvMap_iface); +} + +static HRESULT WINAPI D3DXRenderToEnvMap_QueryInterface(ID3DXRenderToEnvMap *iface, + REFIID riid, + void **out) +{ + TRACE("iface %p, riid %s, out %p\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID3DXRenderToEnvMap) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI D3DXRenderToEnvMap_AddRef(ID3DXRenderToEnvMap *iface) +{ + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + ULONG ref = InterlockedIncrement(&render->ref); + + TRACE("%p increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI D3DXRenderToEnvMap_Release(ID3DXRenderToEnvMap *iface) +{ + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + ULONG ref = InterlockedDecrement(&render->ref); + + TRACE("%p decreasing refcount to %u\n", iface, ref); + + if (!ref) + { + IDirect3DDevice9_Release(render->device); + + HeapFree(GetProcessHeap(), 0, render); + } + + return ref; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_GetDevice(ID3DXRenderToEnvMap *iface, + IDirect3DDevice9 **device) +{ + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + + TRACE("(%p)->(%p)\n", iface, device); + + if (!device) return D3DERR_INVALIDCALL; + + IDirect3DDevice9_AddRef(render->device); + *device = render->device; + return D3D_OK; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_GetDesc(ID3DXRenderToEnvMap *iface, + D3DXRTE_DESC *desc) +{ + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + + TRACE("(%p)->(%p)\n", iface, desc); + + if (!desc) return D3DERR_INVALIDCALL; + + *desc = render->desc; + return D3D_OK; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_BeginCube(ID3DXRenderToEnvMap *iface, + IDirect3DCubeTexture9 *texture) +{ + FIXME("(%p)->(%p): stub\n", iface, texture); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_BeginSphere(ID3DXRenderToEnvMap *iface, + IDirect3DTexture9 *texture) +{ + FIXME("(%p)->(%p): stub\n", iface, texture); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_BeginHemisphere(ID3DXRenderToEnvMap *iface, + IDirect3DTexture9 *pos_z_texture, + IDirect3DTexture9 *neg_z_texture) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, pos_z_texture, neg_z_texture); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_BeginParabolic(ID3DXRenderToEnvMap *iface, + IDirect3DTexture9 *pos_z_texture, + IDirect3DTexture9 *neg_z_texture) +{ + FIXME("(%p)->(%p, %p): stub\n", iface, pos_z_texture, neg_z_texture); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_Face(ID3DXRenderToEnvMap *iface, + D3DCUBEMAP_FACES face, + DWORD filter) +{ + FIXME("(%p)->(%u, %#x): stub\n", iface, face, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface, + DWORD filter) +{ + FIXME("(%p)->(%#x): stub\n", iface, filter); + return E_NOTIMPL; +} + + +static HRESULT WINAPI D3DXRenderToEnvMap_OnLostDevice(ID3DXRenderToEnvMap *iface) +{ + FIXME("(%p)->(): stub\n", iface); + return D3D_OK; +} + +static HRESULT WINAPI D3DXRenderToEnvMap_OnResetDevice(ID3DXRenderToEnvMap *iface) +{ + FIXME("(%p)->(): stub\n", iface); + return D3D_OK; +} + +static const ID3DXRenderToEnvMapVtbl render_to_envmap_vtbl = +{ + /* IUnknown methods */ + D3DXRenderToEnvMap_QueryInterface, + D3DXRenderToEnvMap_AddRef, + D3DXRenderToEnvMap_Release, + /* ID3DXRenderToEnvMap methods */ + D3DXRenderToEnvMap_GetDevice, + D3DXRenderToEnvMap_GetDesc, + D3DXRenderToEnvMap_BeginCube, + D3DXRenderToEnvMap_BeginSphere, + D3DXRenderToEnvMap_BeginHemisphere, + D3DXRenderToEnvMap_BeginParabolic, + D3DXRenderToEnvMap_Face, + D3DXRenderToEnvMap_End, + D3DXRenderToEnvMap_OnLostDevice, + D3DXRenderToEnvMap_OnResetDevice +}; + HRESULT WINAPI D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device, UINT size, UINT mip_levels, @@ -395,10 +561,33 @@ HRESULT WINAPI D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device, D3DFORMAT depth_stencil_format, ID3DXRenderToEnvMap **out) { - FIXME("(%p, %u, %u, %#x, %d, %#x, %p): stub\n", device, size, mip_levels, + HRESULT hr; + struct render_to_envmap *render; + + TRACE("(%p, %u, %u, %#x, %d, %#x, %p)\n", device, size, mip_levels, format, depth_stencil, depth_stencil_format, out); if (!device || !out) return D3DERR_INVALIDCALL; - return E_NOTIMPL; + hr = D3DXCheckTextureRequirements(device, &size, &size, &mip_levels, + D3DUSAGE_RENDERTARGET, &format, D3DPOOL_DEFAULT); + if (FAILED(hr)) return hr; + + render = HeapAlloc(GetProcessHeap(), 0, sizeof(struct render_to_envmap)); + if (!render) return E_OUTOFMEMORY; + + render->ID3DXRenderToEnvMap_iface.lpVtbl = &render_to_envmap_vtbl; + render->ref = 1; + + render->desc.Size = size; + render->desc.MipLevels = mip_levels; + render->desc.Format = format; + render->desc.DepthStencil = depth_stencil; + render->desc.DepthStencilFormat = depth_stencil_format; + + IDirect3DDevice9_AddRef(device); + render->device = device; + + *out = &render->ID3DXRenderToEnvMap_iface; + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 3009f50..fa259ab 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -908,7 +908,7 @@ void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) const D3DXRTE_DESC *expected = &tests[i].expected_values; hr = D3DXCreateRenderToEnvMap(device, parameters->Size, parameters->MipLevels, parameters->Format, parameters->DepthStencil, parameters->DepthStencilFormat, &render); - todo_wine ok(hr == D3D_OK, "%d: D3DXCreateRenderToEnvMap returned %#x, expected %#x\n", i, hr, D3D_OK); + ok(hr == D3D_OK, "%d: D3DXCreateRenderToEnvMap returned %#x, expected %#x\n", i, hr, D3D_OK); if (SUCCEEDED(hr)) { hr = ID3DXRenderToEnvMap_GetDesc(render, &desc); @@ -930,7 +930,7 @@ void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) /* check device ref count */ ref_count = get_ref((IUnknown *)device); hr = D3DXCreateRenderToEnvMap(device, 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN, &render); - todo_wine check_ref((IUnknown *)device, ref_count + 1); + check_ref((IUnknown *)device, ref_count + 1); if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); }

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXCreateRenderToEnvMap.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: f072404f617ebc59de7d156ce338805202f74045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f072404f617ebc59de7d156ce… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Jun 10 21:29:13 2012 +0200 d3dx9/tests: Add tests for D3DXCreateRenderToEnvMap. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/render.c | 16 +++++++++++++ dlls/d3dx9_36/tests/core.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8d7143e..20a8abf 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -81,7 +81,7 @@ @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) -@ stub D3DXCreateRenderToEnvMap(ptr long long long long long ptr) +@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 35aed93..9b691bc 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -386,3 +386,19 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, *out = &render->ID3DXRenderToSurface_iface; return D3D_OK; } + +HRESULT WINAPI D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device, + UINT size, + UINT mip_levels, + D3DFORMAT format, + BOOL depth_stencil, + D3DFORMAT depth_stencil_format, + ID3DXRenderToEnvMap **out) +{ + FIXME("(%p, %u, %u, %#x, %d, %#x, %p): stub\n", device, size, mip_levels, + format, depth_stencil, depth_stencil_format, out); + + if (!device || !out) return D3DERR_INVALIDCALL; + + return E_NOTIMPL; +} diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index a19e570..3009f50 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -883,6 +883,57 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) test_ID3DXRenderToSurface_device_state(device); } +void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) +{ + int i; + HRESULT hr; + ULONG ref_count; + D3DXRTE_DESC desc; + ID3DXRenderToEnvMap *render; + static const struct { + D3DXRTE_DESC parameters; + D3DXRTE_DESC expected_values; + } tests[] = { + { { 0, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN }, { 1, 1, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN } }, + { { 256, 0, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN }, { 256, 9, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN } }, + { { 256, 4, D3DFMT_A8R8G8B8, FALSE, D3DFMT_D24S8 }, { 256, 4, D3DFMT_A8R8G8B8, FALSE, D3DFMT_D24S8 } }, + { { 256, 256, D3DFMT_UNKNOWN, FALSE, D3DFMT_R8G8B8 }, { 256, 9, D3DFMT_A8R8G8B8, FALSE, D3DFMT_R8G8B8 } }, + { { -1, -1, D3DFMT_A8R8G8B8, TRUE, D3DFMT_DXT1 }, { 256, 9, D3DFMT_A8R8G8B8, TRUE, D3DFMT_DXT1 } }, + { { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN }, { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN } } + }; + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + { + const D3DXRTE_DESC *parameters = &tests[i].parameters; + const D3DXRTE_DESC *expected = &tests[i].expected_values; + hr = D3DXCreateRenderToEnvMap(device, parameters->Size, parameters->MipLevels, parameters->Format, + parameters->DepthStencil, parameters->DepthStencilFormat, &render); + todo_wine ok(hr == D3D_OK, "%d: D3DXCreateRenderToEnvMap returned %#x, expected %#x\n", i, hr, D3D_OK); + if (SUCCEEDED(hr)) + { + hr = ID3DXRenderToEnvMap_GetDesc(render, &desc); + ok(hr == D3D_OK, "%d: GetDesc failed %#x\n", i, hr); + if (SUCCEEDED(hr)) + { + ok(desc.Size == expected->Size, "%d: Got size %u, expected %u\n", i, desc.Size, expected->Size); + ok(desc.MipLevels == expected->MipLevels, "%d: Got miplevels %u, expected %u\n", i, desc.MipLevels, expected->MipLevels); + ok(desc.Format == expected->Format, "%d: Got format %#x, expected %#x\n", i, desc.Format, expected->Format); + ok(desc.DepthStencil == expected->DepthStencil, "%d: Got depth stencil %d, expected %d\n", + i, expected->DepthStencil, expected->DepthStencil); + ok(desc.DepthStencilFormat == expected->DepthStencilFormat, "%d: Got depth stencil format %#x, expected %#x\n", + i, expected->DepthStencilFormat, expected->DepthStencilFormat); + } + check_release((IUnknown *)render, 0); + } + } + + /* check device ref count */ + ref_count = get_ref((IUnknown *)device); + hr = D3DXCreateRenderToEnvMap(device, 0, 0, D3DFMT_UNKNOWN, FALSE, D3DFMT_UNKNOWN, &render); + todo_wine check_ref((IUnknown *)device, ref_count + 1); + if (SUCCEEDED(hr)) ID3DXRenderToEnvMap_Release(render); +} + START_TEST(core) { HWND wnd; @@ -919,6 +970,7 @@ START_TEST(core) test_ID3DXFont(device); test_D3DXCreateRenderToSurface(device); test_ID3DXRenderToSurface(device); + test_D3DXCreateRenderToEnvMap(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Jacek Caban : wininet: Added InternetGetSecurityInfoByURL tests.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 1325c400c13dddc1078fc242e799653404345203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1325c400c13dddc1078fc242e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 10:22:54 2012 +0200 wininet: Added InternetGetSecurityInfoByURL tests. --- dlls/wininet/tests/Makefile.in | 2 +- dlls/wininet/tests/http.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index 2f58593..4d8473f 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wininet.dll -IMPORTS = wininet ws2_32 user32 advapi32 +IMPORTS = wininet crypt32 ws2_32 user32 advapi32 C_SRCS = \ ftp.c \ diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e7be839..fe986e4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wininet.h" +#include "winineti.h" #include "winsock.h" #include "wine/test.h" @@ -158,6 +159,7 @@ static const test_data_t test_data[] = { }; static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); +static BOOL (WINAPI *pInternetGetSecurityInfoByURLA)(LPSTR,PCCERT_CHAIN_CONTEXT*,DWORD*); static BOOL proxy_active(void) { @@ -2917,6 +2919,34 @@ static void test_cert_struct(HINTERNET req) release_cert_info(&info); } +#define test_security_info(a,b,c) _test_security_info(__LINE__,a,b,c) +static void _test_security_info(unsigned line, const char *urlc, DWORD error, DWORD ex_flags) +{ + char url[INTERNET_MAX_URL_LENGTH]; + const CERT_CHAIN_CONTEXT *chain; + DWORD flags; + BOOL res; + + if(!pInternetGetSecurityInfoByURLA) { + win_skip("pInternetGetSecurityInfoByURLA not available\n"); + return; + } + + strcpy(url, urlc); + chain = (void*)0xdeadbeef; + flags = 0xdeadbeef; + res = pInternetGetSecurityInfoByURLA(url, &chain, &flags); + if(error == ERROR_SUCCESS) { + ok_(__FILE__,line)(res, "InternetGetSecurityInfoByURLA failed: %u\n", GetLastError()); + ok_(__FILE__,line)(chain != NULL, "chain = NULL\n"); + ok_(__FILE__,line)(flags == ex_flags, "flags = %x\n", flags); + CertFreeCertificateChain(chain); + }else { + ok_(__FILE__,line)(!res && GetLastError() == error, + "InternetGetSecurityInfoByURLA returned: %x(%u), exected %u\n", res, GetLastError(), error); + } +} + #define test_secflags_option(a,b) _test_secflags_option(__LINE__,a,b) static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) { @@ -2987,6 +3017,7 @@ static void test_security_flags(void) } test_secflags_option(req, 0); + test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); @@ -3119,6 +3150,7 @@ static void test_security_flags(void) test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); + test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); test_secflags_option(req, 0x1800000|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA @@ -3156,6 +3188,7 @@ static void test_security_flags(void) |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); test_cert_struct(req); + test_security_info("https://test.winehq.org/data/some_file.html?q", 0, 0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -3226,6 +3259,10 @@ static void test_security_flags(void) close_async_handle(ses, hCompleteEvent, 2); CloseHandle(hCompleteEvent); + + test_security_info("http://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("file:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("xxx:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); } static void test_secure_connection(void) @@ -4009,6 +4046,7 @@ START_TEST(http) } pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); + pInternetGetSecurityInfoByURLA = (void*)GetProcAddress(hdll, "InternetGetSecurityInfoByURLA"); init_status_tests(); test_InternetCloseHandle();

1 0

Jacek Caban : wininet: Added InternetGetSecurityInfoByURL[AW] implementation.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 6c764fbd4758e1d9d9b2d97c324cc51fe2d09b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c764fbd4758e1d9d9b2d97c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 10:22:38 2012 +0200 wininet: Added InternetGetSecurityInfoByURL[AW] implementation. --- dlls/wininet/http.c | 16 +++++----- dlls/wininet/internet.c | 59 ++++++++++++++++++++++++++++++++++++++--- dlls/wininet/internet.h | 5 +++ dlls/wininet/netconnection.c | 13 +++++++-- 4 files changed, 77 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 620fcf7..0cec4fb 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -244,11 +244,13 @@ void server_release(server_t *server) list_remove(&server->entry); + if(server->cert_chain) + CertFreeCertificateChain(server->cert_chain); heap_free(server->name); heap_free(server); } -static server_t *get_server(const WCHAR *name, INTERNET_PORT port) +server_t *get_server(const WCHAR *name, INTERNET_PORT port, BOOL do_create) { server_t *iter, *server = NULL; @@ -262,13 +264,11 @@ static server_t *get_server(const WCHAR *name, INTERNET_PORT port) } } - if(!server) { - server = heap_alloc(sizeof(*server)); + if(!server && do_create) { + server = heap_alloc_zero(sizeof(*server)); if(server) { - server->addr_len = 0; server->ref = 2; /* list reference and return */ server->port = port; - server->security_flags = 0; list_init(&server->conn_pool); server->name = heap_strdupW(name); if(server->name) { @@ -1724,7 +1724,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort); + new_server = get_server(UrlComponents.lpszHostName, UrlComponents.nPort, TRUE); if(!new_server) return FALSE; @@ -3103,7 +3103,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if(port == INTERNET_INVALID_PORT_NUMBER) port = dwFlags & INTERNET_FLAG_SECURE ? INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; - request->server = get_server(session->hostName, port); + request->server = get_server(session->hostName, port, TRUE); if(!request->server) { WININET_Release(&request->hdr); return ERROR_OUTOFMEMORY; @@ -3931,7 +3931,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) if(!using_proxy && (strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort)) { server_t *new_server; - new_server = get_server(hostName, urlComponents.nPort); + new_server = get_server(hostName, urlComponents.nPort, TRUE); server_release(request->server); request->server = new_server; } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 118dcdd..2b659da 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -61,7 +61,6 @@ #include "winreg.h" #include "winuser.h" #include "wininet.h" -#include "winineti.h" #include "winnls.h" #include "wine/debug.h" #include "winerror.h" @@ -4419,8 +4418,18 @@ DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template */ BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags) { - FIXME("(%s %p %p)\n", debugstr_a(lpszURL), ppCertChain, pdwSecureFlags); - return FALSE; + WCHAR *url; + BOOL res; + + TRACE("(%s %p %p)\n", debugstr_a(lpszURL), ppCertChain, pdwSecureFlags); + + url = heap_strdupAtoW(lpszURL); + if(!url) + return FALSE; + + res = InternetGetSecurityInfoByURLW(url, ppCertChain, pdwSecureFlags); + heap_free(url); + return res; } /*********************************************************************** @@ -4428,8 +4437,48 @@ BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR lpszURL, PCCERT_CHAIN_CONTEXT *p */ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags) { - FIXME("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); - return FALSE; + WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH]; + URL_COMPONENTSW url = {sizeof(url)}; + server_t *server; + BOOL res = FALSE; + + TRACE("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); + + url.lpszHostName = hostname; + url.dwHostNameLength = sizeof(hostname)/sizeof(WCHAR); + + res = InternetCrackUrlW(lpszURL, 0, 0, &url); + if(!res || url.nScheme != INTERNET_SCHEME_HTTPS) { + SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); + return FALSE; + } + + if(url.nPort == INTERNET_INVALID_PORT_NUMBER) + url.nPort = INTERNET_DEFAULT_HTTPS_PORT; + + server = get_server(hostname, url.nPort, FALSE); + if(!server) { + SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); + return FALSE; + } + + if(server->cert_chain) { + const CERT_CHAIN_CONTEXT *chain_dup; + + chain_dup = CertDuplicateCertificateChain(server->cert_chain); + if(chain_dup) { + *ppCertChain = chain_dup; + *pdwSecureFlags = server->security_flags & _SECURITY_ERROR_FLAGS_MASK; + }else { + res = FALSE; + } + }else { + SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); + res = FALSE; + } + + server_release(server); + return res; } DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a25be32..e3fb530 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -47,6 +47,8 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ +#include "winineti.h" + extern HMODULE WININET_hModule DECLSPEC_HIDDEN; #ifndef INET6_ADDRSTRLEN @@ -63,6 +65,7 @@ typedef struct { LONG ref; DWORD security_flags; + const CERT_CHAIN_CONTEXT *cert_chain; struct list entry; struct list conn_pool; @@ -546,6 +549,8 @@ int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); + extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; extern void URLCacheContainers_DeleteAll(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 47b8453..a705cce 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -80,7 +80,6 @@ #include "winbase.h" #include "wininet.h" #include "winerror.h" -#include "wincrypt.h" #include "wine/debug.h" #include "internet.h" @@ -358,15 +357,23 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR } } - CertFreeCertificateChain(chain); - if(err) { WARN("failed %u\n", err); + CertFreeCertificateChain(chain); + if(conn->server->cert_chain) { + CertFreeCertificateChain(conn->server->cert_chain); + conn->server->cert_chain = NULL; + } if(conn->mask_errors) conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; return err; } + /* FIXME: Reuse cached chain */ + if(conn->server->cert_chain) + CertFreeCertificateChain(chain); + else + conn->server->cert_chain = chain; return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Add support for 64-bit registry components.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: f0ea60049c4c0a484f7006a14ca3375cb0fd9260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ea60049c4c0a484f7006a14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 15:36:03 2012 +0200 msi: Add support for 64-bit registry components. --- dlls/msi/action.c | 30 +++++++--- dlls/msi/msi_main.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 - dlls/msi/tests/install.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0ea60049c4c0a484f700…

1 0

Jacek Caban : urlmon: Use error dialog for ERROR_INTERNET_SEC_CERT_REV_FAILED error if IHttpSecurity returns S_FALSE .
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: 9af95b32433f2227c3d62b70dc7740a5fa0b81cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af95b32433f2227c3d62b70d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 16:14:45 2012 +0200 urlmon: Use error dialog for ERROR_INTERNET_SEC_CERT_REV_FAILED error if IHttpSecurity returns S_FALSE. --- dlls/urlmon/http.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index d5f2b33..c67d36e 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -129,6 +129,8 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) DWORD res; HRESULT hres; + TRACE("(%p %u)\n", This, error); + switch(error) { case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_SEC_CERT_CN_INVALID: @@ -162,6 +164,8 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) hres = IHttpSecurity_OnSecurityProblem(http_security, error); IHttpSecurity_Release(http_security); + TRACE("OnSecurityProblem returned %08x\n", hres); + if(hres != S_FALSE) { BOOL res = FALSE; @@ -195,15 +199,13 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) switch(error) { case ERROR_INTERNET_SEC_CERT_REV_FAILED: - if(hres == S_FALSE) { - hres = internet_error_to_hres(error); - }else { + if(hres != S_FALSE) { /* Silently ignore the error. We will get more detailed error from wininet anyway. */ set_security_flag(This, SECURITY_FLAG_IGNORE_REVOCATION); hres = RPC_E_RETRY; + break; } - break; - + /* fallthrough */ default: hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); if(SUCCEEDED(hres)) {

1 0

Aric Stewart : usp10: Corrections for ShapeCharGlyphProp_Thai.
by Alexandre Julliard June 11, 2012

June 11, 2012

Module: wine Branch: master Commit: f241014f46aedbae233409c4bfe0150d55c9e184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f241014f46aedbae233409c4b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 11 09:49:14 2012 -0500 usp10: Corrections for ShapeCharGlyphProp_Thai. --- dlls/usp10/shape.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index f2b41b1..36f6854 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -411,7 +411,7 @@ static const ScriptShapeData ShapingData[] = {{ tibetan_features, 2}, NULL, 0, NULL, ShapeCharGlyphProp_Tibet}, {{ phags_features, 3}, NULL, 0, ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, - {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, + {{ thai_features, 1}, NULL, 0, ContextualShape_Thai, NULL}, {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, @@ -2838,13 +2838,9 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - int i,k; + int i; int finaGlyph; INT dirL; - BYTE *spaces; - - spaces = HeapAlloc(GetProcessHeap(),0,cGlyphs); - memset(spaces,0,cGlyphs); if (!psa->fLogicalOrder && psa->fRTL) { @@ -2857,20 +2853,11 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS dirL = 1; } - for (i = 0; i < cGlyphs; i++) - { - for (k = 0; k < cChars; k++) - if (pwLogClust[k] == i) - { - if (pwcChars[k] == 0x0020) - spaces[i] = 1; - } - } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); for (i = 0; i < cGlyphs; i++) { + int k; int char_index[20]; int char_count = 0; @@ -2881,25 +2868,22 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS char_index[char_count++] = k; } + if (i == finaGlyph) + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; + else + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; + if (char_count == 0) continue; if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ - { - pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; pCharProp[char_index[0]].fCanGlyphAlone = 1; - } - else if (i == finaGlyph) - pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; - else - pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; /* handle Thai SARA AM (U+0E33) differently than GDEF */ if (char_count == 1 && pwcChars[char_index[0]] == 0x0e33) pGlyphProp[i].sva.fClusterStart = 0; } - HeapFree(GetProcessHeap(),0,spaces); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */

1 0