April 2014 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcp90: Fix the mbstowcs_s macro return value.
by Alexandre Julliard April 28, 2014

April 28, 2014

Module: wine Branch: master Commit: 91f2b04625682dd6cec46e9b9888a1164e6a94e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f2b04625682dd6cec46e9b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 28 15:34:01 2014 +0200 msvcp90: Fix the mbstowcs_s macro return value. --- dlls/msvcp90/msvcp90.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index f5e79f5..0d5e124 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -528,6 +528,6 @@ typedef struct { #if _MSVCP_VER < 80 #define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) #define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) -#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) )) +#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) ), 0) #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif

1 0

Piotr Caban : oleacc: Add AccessibleObjectFromWindow implementation.
by Alexandre Julliard April 28, 2014

April 28, 2014

Module: wine Branch: master Commit: 817222558d3e3dd09aba1f348f24eda22a32190b URL: http://source.winehq.org/git/wine.git/?a=commit;h=817222558d3e3dd09aba1f348… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 28 17:30:31 2014 +0200 oleacc: Add AccessibleObjectFromWindow implementation. --- dlls/oleacc/main.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 5a7afd90..c1e2bf8 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -217,9 +217,24 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { - FIXME("%p %d %s %p\n", hwnd, dwObjectID, + TRACE("%p %d %s %p\n", hwnd, dwObjectID, debugstr_guid( riid ), ppvObject ); - return E_NOTIMPL; + + if(!ppvObject) + return E_INVALIDARG; + *ppvObject = NULL; + + if(IsWindow(hwnd)) { + LRESULT lres; + + lres = SendMessageW(hwnd, WM_GETOBJECT, 0xffffffff, dwObjectID); + if(FAILED(lres)) + return lres; + else if(lres) + return ObjectFromLresult(lres, riid, 0, ppvObject); + } + + return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,

1 0

Alexandre Julliard : gdi32/tests: Don' t fetch the bits into the DIB itself.
by Alexandre Julliard April 28, 2014

April 28, 2014

Module: wine Branch: master Commit: 47ed5655c5c0b9a1fcd3f5db807e6573dcd60378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ed5655c5c0b9a1fcd3f5db8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 28 14:36:43 2014 +0200 gdi32/tests: Don't fetch the bits into the DIB itself. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index aa2be70..39ca454 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -838,7 +838,7 @@ static void test_dibsections(void) } pbmi->bmiHeader.biClrUsed = 173; memset( pbmi->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); - GetDIBits( hdc, hdib, 0, 1, bits, pbmi, DIB_RGB_COLORS ); + GetDIBits( hdc, hdib, 0, 1, NULL, pbmi, DIB_RGB_COLORS ); ok( pbmi->bmiHeader.biClrUsed == 0, "wrong colors %u\n", pbmi->bmiHeader.biClrUsed ); for (i = 0; i < 256; i++) {

1 0

Jacek Caban : mshtml: Introduce a new debugstr_mshtml_guid helper for printing GUIDs.
by Alexandre Julliard April 28, 2014

April 28, 2014

Module: wine Branch: master Commit: a36876e9d6e13abaf00f7230a973a35f346002a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36876e9d6e13abaf00f7230a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 28 11:06:08 2014 +0200 mshtml: Introduce a new debugstr_mshtml_guid helper for printing GUIDs. --- dlls/mshtml/htmldoc.c | 135 +++++++++++++++--------------------------- dlls/mshtml/main.c | 48 +++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 98 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a36876e9d6e13abaf00f7…

1 0

Nikolay Sivov : msxml3: Fixed attribute value string leak (Valgrind).
by Alexandre Julliard April 28, 2014

April 28, 2014

Module: wine Branch: master Commit: f9df8845361163c21c4ab8f126cf38813e52c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9df8845361163c21c4ab8f12… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:36:24 2014 +0400 msxml3: Fixed attribute value string leak (Valgrind). --- dlls/msxml3/element.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5e8822e..4fe53a8 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1284,7 +1284,11 @@ static HRESULT WINAPI domelem_setAttribute( xmlFree(local); if (ns) - return xmlStrEqual(ns->href, xml_value) ? S_OK : E_INVALIDARG; + { + int cmp = xmlStrEqual(ns->href, xml_value); + heap_free(xml_value); + return cmp ? S_OK : E_INVALIDARG; + } } if (!xmlSetNsProp(element, NULL, xml_name, xml_value))

1 0

Nikolay Sivov : oleaut32: Always free TLIBATTR in LoadRegTypeLib() ( Valgrind).
by Alexandre Julliard April 28, 2014

April 28, 2014

Module: wine Branch: master Commit: 0c0fe4efb404f26eb29fc29c287a5273c38147b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0fe4efb404f26eb29fc29c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 26 00:37:15 2014 +0400 oleaut32: Always free TLIBATTR in LoadRegTypeLib() (Valgrind). --- dlls/oleaut32/typelib.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4213ae6..4a16fca 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -542,12 +542,17 @@ HRESULT WINAPI LoadRegTypeLib( TLIBATTR *attr; res = ITypeLib_GetLibAttr(*ppTLib, &attr); - if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor)) + if (res == S_OK) { + BOOL mismatch = attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor; ITypeLib_ReleaseTLibAttr(*ppTLib, attr); - ITypeLib_Release(*ppTLib); - *ppTLib = NULL; - res = TYPE_E_LIBNOTREGISTERED; + + if (mismatch) + { + ITypeLib_Release(*ppTLib); + *ppTLib = NULL; + res = TYPE_E_LIBNOTREGISTERED; + } } } }

1 0

André Hentschel : Add WWN 368
by Jeremy Newman April 26, 2014

April 26, 2014

Module: website Branch: master Commit: d2118b287a56764d380849a0e7a136297835562c URL: http://source.winehq.org/git/website.git/?a=commit;h=d2118b287a56764d380849… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 26 16:46:21 2014 +0200 Add WWN 368 --- news/de/2014042501.xml | 11 + news/en/2014042501.xml | 11 + wwn/en/wn20140425_368.xml | 715 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 737 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d2118b287a56764d38…

1 0

Stefan Dösinger : ddraw/tests: Add a test for mipmap palettes.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: e2bf5163ecf2f56f58993bac7f8ca1abc0db0324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bf5163ecf2f56f58993bac7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:36:10 2014 +0200 ddraw/tests: Add a test for mipmap palettes. --- dlls/ddraw/tests/ddraw1.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 102 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2bf5163ecf2f56f58993…

1 0

Stefan Dösinger : ddraw: Only ddraw7 disallows SetPalette on sublevels.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: 590582e6bc1d7f901be9d559a0e9f501c08ece4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=590582e6bc1d7f901be9d559a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:36:09 2014 +0200 ddraw: Only ddraw7 disallows SetPalette on sublevels. --- dlls/ddraw/surface.c | 78 ++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 13458f6..b561af4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -447,6 +447,43 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } +static HRESULT WINAPI ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) +{ + struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); + struct ddraw_palette *prev; + + TRACE("iface %p, palette %p.\n", surface, palette); + + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + return DDERR_INVALIDPIXELFORMAT; + + wined3d_mutex_lock(); + + prev = surface->palette; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + if (prev) + prev->flags &= ~DDPCAPS_PRIMARYSURFACE; + if (palette_impl) + palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; + /* Update the wined3d frontbuffer if this is the primary. */ + if (surface->ddraw->wined3d_frontbuffer) + wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); + } + if (palette_impl) + IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); + if (prev) + IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); + surface->palette = palette_impl; + wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); + + wined3d_mutex_unlock(); + + return DD_OK; +} + static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; @@ -456,7 +493,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) /* The refcount test shows that the palette is detached when the surface * is destroyed. */ - IDirectDrawSurface7_SetPalette(&surface->IDirectDrawSurface7_iface, NULL); + ddraw_surface_set_palette(surface, NULL); /* Loop through all complex attached surfaces and destroy them. * @@ -4640,42 +4677,13 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *palette) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); - struct ddraw_palette *prev; TRACE("iface %p, palette %p.\n", iface, palette); - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) - return DDERR_INVALIDPIXELFORMAT; - if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - wined3d_mutex_lock(); - - prev = surface->palette; - if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - if (prev) - prev->flags &= ~DDPCAPS_PRIMARYSURFACE; - if (palette_impl) - palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; - /* Update the wined3d frontbuffer if this is the primary. */ - if (surface->ddraw->wined3d_frontbuffer) - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, - palette_impl ? palette_impl->wineD3DPalette : NULL); - } - if (palette_impl) - IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); - if (prev) - IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); - surface->palette = palette_impl; - wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); - - wined3d_mutex_unlock(); - - return DD_OK; + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDirectDrawPalette *palette) @@ -4684,7 +4692,7 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDirectDrawPalette *palette) @@ -4693,7 +4701,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDirectDrawPalette *palette) @@ -4702,7 +4710,7 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDirectDrawPalette *palette) @@ -4711,7 +4719,7 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } /**********************************************************

1 0

Piotr Caban : oleacc: Add ObjectFromLresult implementation.
by Alexandre Julliard April 25, 2014

April 25, 2014

Module: wine Branch: master Commit: d7000d70533d8a612e6095041e165dc7008b398d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7000d70533d8a612e6095041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 25 14:50:37 2014 +0200 oleacc: Add ObjectFromLresult implementation. --- dlls/oleacc/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 079b2aa..5a7afd90 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -46,8 +46,72 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject ) { - FIXME("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); - return E_NOTIMPL; + WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3]; + HANDLE server_proc, server_mapping, mapping; + DWORD proc_id, size; + IStream *stream; + HGLOBAL data; + void *view; + HRESULT hr; + WCHAR *p; + + TRACE("%ld %s %ld %p\n", result, debugstr_guid(riid), wParam, ppObject ); + + if(wParam) + FIXME("unsupported wParam = %lx\n", wParam); + + if(!ppObject) + return E_INVALIDARG; + *ppObject = NULL; + + if(result != (ATOM)result) + return E_FAIL; + + if(!GlobalGetAtomNameW(result, atom_str, sizeof(atom_str)/sizeof(WCHAR))) + return E_FAIL; + if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix))) + return E_FAIL; + p = atom_str + sizeof(lresult_atom_prefix)/sizeof(WCHAR); + proc_id = strtoulW(p, &p, 16); + if(*p != ':') + return E_FAIL; + server_mapping = ULongToHandle( strtoulW(p+1, &p, 16) ); + if(*p != ':') + return E_FAIL; + size = strtoulW(p+1, &p, 16); + if(*p != 0) + return E_FAIL; + + server_proc = OpenProcess(PROCESS_DUP_HANDLE, FALSE, proc_id); + if(!server_proc) + return E_FAIL; + + if(!DuplicateHandle(server_proc, server_mapping, GetCurrentProcess(), &mapping, + 0, FALSE, DUPLICATE_CLOSE_SOURCE|DUPLICATE_SAME_ACCESS)) + return E_FAIL; + CloseHandle(server_proc); + GlobalDeleteAtom(result); + + view = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(mapping); + if(!view) + return E_FAIL; + + data = GlobalAlloc(GMEM_FIXED, size); + memcpy(data, view, size); + UnmapViewOfFile(view); + if(!data) + return E_OUTOFMEMORY; + + hr = CreateStreamOnHGlobal(data, TRUE, &stream); + if(FAILED(hr)) { + GlobalFree(data); + return hr; + } + + hr = CoUnmarshalInterface(stream, riid, ppObject); + IStream_Release(stream); + return hr; } LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc )

1 0