October 2015 - Wine-Commits

Nikolay Sivov : gdi32: Improve structure layout of data returned by GetFontRealizationInfo().
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 819d36786e629f8e4189713dbb75d4eb94255e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=819d36786e629f8e4189713db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 21:13:57 2015 +0300 gdi32: Improve structure layout of data returned by GetFontRealizationInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 6 ++++-- dlls/gdi32/freetype.c | 5 +++++ dlls/gdi32/gdi_private.h | 3 ++- dlls/gdi32/tests/font.c | 7 +++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index cf81699..e178f33 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -783,7 +783,8 @@ struct font_realization_info { DWORD cache_num; DWORD instance_id; DWORD unk; - DWORD face_index; + WORD face_index; + WORD simulations; }; struct font_fileinfo { @@ -853,7 +854,8 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, return hr; } - hr = IDWriteFactory2_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, DWRITE_FONT_SIMULATIONS_NONE, + /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ + hr = IDWriteFactory2_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, info.simulations, fontface); IDWriteFontFile_Release(file); return hr; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 33e196c..95df22a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8282,6 +8282,11 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) { info->unk = 0; info->face_index = physdev->font->ft_face->face_index; + info->simulations = 0; + if (physdev->font->fake_bold) + info->simulations |= 0x1; + if (physdev->font->fake_italic) + info->simulations |= 0x2; } return TRUE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2e52e08..337fe27 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -284,7 +284,8 @@ struct font_realization_info DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ DWORD instance_id; /* identifies a realized font instance */ DWORD unk; /* unknown */ - DWORD face_index; /* face index in case of font collections */ + WORD face_index; /* face index in case of font collections */ + WORD simulations; /* 0 bit - bold simulation, 1 bit - oblique simulation */ }; extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fd9bda3..6eefc3b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4136,7 +4136,8 @@ static void test_RealizationInfo(void) DWORD cache_num; DWORD instance_id; DWORD unk; - DWORD face_index; + WORD face_index; + WORD simulations; }; struct realization_info_t @@ -4186,7 +4187,8 @@ static void test_RealizationInfo(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; - lf.lfWeight = FW_NORMAL; + lf.lfWeight = FW_BOLD; + lf.lfItalic = 1; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -4234,6 +4236,7 @@ static void test_RealizationInfo(void) ok(fri->flags == ri->flags, "flags mismatch\n"); ok(fri->cache_num == ri->cache_num, "cache_num mismatch\n"); ok(fri->instance_id == ri->instance_id, "instance id mismatch\n"); + ok(fri->simulations == 0x2, "got simulations flags 0x%04x\n", fri->simulations); ok(fri->face_index == 0, "got wrong face index %u\n", fri->face_index); ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n");

1 0

Daniel Lehman : vcomp120: Add vcomp120 stub dll.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 66808858aca1c385b157f1e182625a9153ee7de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66808858aca1c385b157f1e18… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 28 11:08:47 2015 -0700 vcomp120: Add vcomp120 stub dll. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/vcomp120/Makefile.in | 4 ++ dlls/vcomp120/main.c | 47 ++++++++++++++++++ dlls/vcomp120/vcomp120.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 168 insertions(+) diff --git a/configure b/configure index 2ba059a..872db31 100755 --- a/configure +++ b/configure @@ -1315,6 +1315,7 @@ enable_vbscript enable_vcomp enable_vcomp100 enable_vcomp110 +enable_vcomp120 enable_vcomp90 enable_vdmdbg enable_version @@ -17848,6 +17849,7 @@ wine_fn_config_dll vcomp enable_vcomp wine_fn_config_test dlls/vcomp/tests vcomp_test wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vcomp110 enable_vcomp110 +wine_fn_config_dll vcomp120 enable_vcomp120 wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib diff --git a/configure.ac b/configure.ac index 1e9bd66..e22b0ef 100644 --- a/configure.ac +++ b/configure.ac @@ -3361,6 +3361,7 @@ WINE_CONFIG_DLL(vcomp) WINE_CONFIG_TEST(dlls/vcomp/tests) WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vcomp110) +WINE_CONFIG_DLL(vcomp120) WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in new file mode 100644 index 0000000..833cd67 --- /dev/null +++ b/dlls/vcomp120/Makefile.in @@ -0,0 +1,4 @@ +MODULE = vcomp120.dll + +C_SRCS = \ + main.c diff --git a/dlls/vcomp120/main.c b/dlls/vcomp120/main.c new file mode 100644 index 0000000..f2f8b31 --- /dev/null +++ b/dlls/vcomp120/main.c @@ -0,0 +1,47 @@ +/* + * + * vcomp120 implementation + * + * Copyright 2012 André Hentschel + * Copyright 2015 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp120); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec new file mode 100644 index 0000000..87a7205 --- /dev/null +++ b/dlls/vcomp120/vcomp120.spec @@ -0,0 +1,113 @@ +@ stub C2VectParallel +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect +@ cdecl _vcomp_flush() vcomp._vcomp_flush +@ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ cdecl omp_in_parallel() vcomp.omp_in_parallel +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index 5d31939..7511ab7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -138,6 +138,7 @@ my @dll_groups = ], [ "vcomp", + "vcomp120", "vcomp110", "vcomp100", "vcomp90",

1 0

Sebastian Lackner : maintainers: Add section for OpenMP and threadpool implementation.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: d343371cbc5f09962ffddedaea222519e167df33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d343371cbc5f09962ffddedae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 08:44:35 2015 +0200 maintainers: Add section for OpenMP and threadpool implementation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 50999e7..20e6e1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -115,12 +115,21 @@ OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/oleaut32/typelib.c +OpenMP +M: Sebastian Lackner <sebastian(a)fds-team.de> +F: dlls/vcomp*/ + +Threadpool +M: Sebastian Lackner <sebastian(a)fds-team.de> +F: dlls/ntdll/threadpool.c + Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> +P: Sebastian Lackner <sebastian(a)fds-team.de> F: server/ Winemaker

1 0

Huw Davies : ole32: Add a stub for OleCreateFromFileEx.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 94ee4096ec4459105e8f22d39be843ae65980420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ee4096ec4459105e8f22d39… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:24 2015 +0100 ole32: Add a stub for OleCreateFromFileEx. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 2 ++ dlls/ole32/datacache.c | 2 +- dlls/ole32/ole2impl.c | 31 +++++++++++++++++++++++++++++++ dlls/ole32/ole2stubs.c | 11 ----------- dlls/ole32/ole32.spec | 4 ++-- include/ole2.h | 3 +++ 6 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index c63d645..857943a 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -315,6 +315,8 @@ extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HI extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; +extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 1076a37..2e2478a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -216,7 +216,7 @@ static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface ) return CONTAINING_RECORD(iface, DataCache, IAdviseSink_iface); } -static const char * debugstr_formatetc(const FORMATETC *formatetc) +const char *debugstr_formatetc(const FORMATETC *formatetc) { return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %d, lindex = %d, tymed = %d }", formatetc->cfFormat, formatetc->ptd, formatetc->dwAspect, diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 4be79a7..71b0145 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -233,6 +233,37 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, } /****************************************************************************** + * OleCreateFromFileEx [OLE32.@] + */ +HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, IAdviseSink *sink, + DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) +{ + ULONG i; + + FIXME("%s: stub!\n", debugstr_w(filename)); + TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), + debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); + TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); + for (i = 0; i < num_fmts; i++) + TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); + + return E_NOTIMPL; +} + +/****************************************************************************** + * OleCreateFromFile [OLE32.@] + */ +HRESULT WINAPI OleCreateFromFile(REFCLSID clsid, const OLECHAR *filename, REFIID iid, DWORD renderopt, + FORMATETC *fmt, IOleClientSite *client_site, IStorage *storage, void **obj) +{ + DWORD advf = ADVF_PRIMEFIRST; + + return OleCreateFromFileEx(clsid, filename, iid, 0, renderopt, fmt ? 1 : 0, fmt ? &advf : NULL, fmt, + NULL, NULL, client_site, storage, obj); +} + +/****************************************************************************** * OleDuplicateData [OLE32.@] * * Duplicates clipboard data. diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index ba32165..de35747 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -52,17 +52,6 @@ HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, } /****************************************************************************** - * OleCreateFromFile [OLE32.@] - */ -HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid, - DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj) -{ - FIXME("(not shown), stub!\n"); - return E_NOTIMPL; -} - - -/****************************************************************************** * OleGetIconOfClass [OLE32.@] */ HGLOBAL WINAPI OleGetIconOfClass(REFCLSID rclsid, LPOLESTR lpszLabel, BOOL fUseTypeAsLabel) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8c4e8e3..04c9f1e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -188,8 +188,8 @@ @ stub OleCreateEx @ stdcall OleCreateFromData(ptr ptr long ptr ptr ptr ptr) @ stdcall OleCreateFromDataEx(ptr ptr long long long ptr ptr ptr ptr ptr ptr ptr) -@ stdcall OleCreateFromFile(ptr ptr ptr long ptr ptr ptr ptr) -@ stub OleCreateFromFileEx +@ stdcall OleCreateFromFile(ptr wstr ptr long ptr ptr ptr ptr) +@ stdcall OleCreateFromFileEx(ptr wstr ptr long long long ptr ptr ptr ptr ptr ptr ptr) @ stdcall OleCreateLink(ptr ptr long ptr ptr ptr ptr) @ stub OleCreateLinkEx @ stdcall OleCreateLinkFromData(ptr ptr long ptr ptr ptr ptr) diff --git a/include/ole2.h b/include/ole2.h index a555c70..05c1b55 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -107,6 +107,9 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLab HRESULT WINAPI OleLockRunning(LPUNKNOWN pUnknown, BOOL fLock, BOOL fLastUnlockCloses); HRESULT WINAPI OleCreateFromFile(REFCLSID rclsid, LPCOLESTR lpszFileName, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); +HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, LPCOLESTR filename, REFIID iid, DWORD flags, + DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, LPFORMATETC fmts, IAdviseSink *sink, + DWORD *conns, LPOLECLIENTSITE client_site, LPSTORAGE storage, LPVOID* obj); HRESULT WINAPI OleCreateLink(LPMONIKER pmkLinkSrc, REFIID riid, DWORD renderopt, LPFORMATETC lpFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj); HRESULT WINAPI OleCreate(REFCLSID rclsid, REFIID riid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite,

1 0

Huw Davies : ole32: Implement OleCreateFromFileEx.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 09cd89c0cc667789611a5edbd35d47379f14527d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cd89c0cc667789611a5edbd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 11:13:25 2015 +0100 ole32: Implement OleCreateFromFileEx. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2impl.c | 76 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index 71b0145..cdc54be 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -97,7 +97,7 @@ static inline void init_fmtetc(FORMATETC *fmt, CLIPFORMAT cf, TYMED tymed) * * FIXME: CF_FILENAME. */ -static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) +static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL other_fmts) { static const UINT fmt_id[] = { CF_METAFILEPICT, CF_BITMAP, CF_DIB }; UINT i; @@ -107,7 +107,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) IPersistStorage *persist; CLSID clsid; - *src_cf = 0; + if (src_cf) *src_cf = 0; /* CF_EMBEDEDOBJECT */ init_fmtetc(&fmt, embedded_object_clipboard_format, TYMED_ISTORAGE); @@ -116,7 +116,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { - *src_cf = embedded_object_clipboard_format; + if (src_cf) *src_cf = embedded_object_clipboard_format; return hr; } @@ -127,18 +127,21 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) hr = IDataObject_GetDataHere(data, &fmt, &med); if(SUCCEEDED(hr)) { - *src_cf = embed_source_clipboard_format; + if (src_cf) *src_cf = embed_source_clipboard_format; return hr; } - for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) + if (other_fmts) { - init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); - hr = IDataObject_QueryGetData(data, &fmt); - if(SUCCEEDED(hr)) + for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) { - *src_cf = fmt_id[i]; - return hr; + init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); + hr = IDataObject_QueryGetData(data, &fmt); + if (SUCCEEDED(hr)) + { + if (src_cf) *src_cf = fmt_id[i]; + return hr; + } } } @@ -181,7 +184,7 @@ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, data, debugstr_guid(iid), flags, renderopt, num_cache_fmts, adv_flags, cache_fmts, sink, conns, client_site, stg, obj); - hr = get_storage(data, stg, &src_cf); + hr = get_storage(data, stg, &src_cf, TRUE); if(FAILED(hr)) return hr; hr = OleLoad(stg, iid, client_site, obj); @@ -239,16 +242,63 @@ HRESULT WINAPI OleCreateFromFileEx(REFCLSID clsid, const OLECHAR *filename, REFI DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, IAdviseSink *sink, DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) { + HRESULT hr; + IMoniker *mon; + IDataObject *data; + IUnknown *unk = NULL; + IOleCache *cache = NULL; ULONG i; - FIXME("%s: stub!\n", debugstr_w(filename)); TRACE("cls %s, %s, iid %s, flags %d, render opts %d, num fmts %d, adv flags %p, fmts %p\n", debugstr_guid(clsid), debugstr_w(filename), debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts); TRACE("sink %p, conns %p, client site %p, storage %p, obj %p\n", sink, conns, client_site, stg, obj); for (i = 0; i < num_fmts; i++) TRACE("\t%d: fmt %s adv flags %d\n", i, debugstr_formatetc(fmts + i), adv_flags[i]); - return E_NOTIMPL; + hr = CreateFileMoniker( filename, &mon ); + if (FAILED(hr)) return hr; + + hr = BindMoniker( mon, 0, &IID_IDataObject, (void**)&data ); + IMoniker_Release( mon ); + if (FAILED(hr)) return hr; + + hr = get_storage( data, stg, NULL, FALSE ); + if (FAILED(hr)) goto end; + + hr = OleLoad( stg, &IID_IUnknown, client_site, (void**)&unk ); + if (FAILED(hr)) goto end; + + if (renderopt == OLERENDER_FORMAT) + { + hr = IUnknown_QueryInterface( unk, &IID_IOleCache, (void**)&cache ); + if (FAILED(hr)) goto end; + + for (i = 0; i < num_fmts; i++) + { + STGMEDIUM med; + DWORD dummy_conn; + + memset( &med, 0, sizeof(med) ); + hr = IDataObject_GetData( data, fmts + i, &med ); + if (FAILED(hr)) goto end; + hr = IOleCache_Cache( cache, fmts + i, adv_flags[i], &dummy_conn ); + if (SUCCEEDED(hr)) + hr = IOleCache_SetData( cache, fmts + i, &med, TRUE ); + if (FAILED(hr)) + { + ReleaseStgMedium( &med ); + goto end; + } + } + } + + hr = IUnknown_QueryInterface( unk, iid, obj ); + +end: + if (cache) IOleCache_Release( cache ); + if (unk) IUnknown_Release( unk ); + IDataObject_Release( data ); + return hr; } /******************************************************************************

1 0

Michael Müller : advpack: Translate flags in LaunchINFSection.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 10ff131325dec995d20085322ee22b9c5b219358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ff131325dec995d20085322… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Oct 9 08:07:14 2015 +0200 advpack: Translate flags in LaunchINFSection. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/install.c | 6 +++++- dlls/advpack/tests/install.c | 4 ++++ include/advpub.h | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index f75eb01..dcd1dd7 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -776,7 +776,11 @@ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT sho str_flags = get_parameter(&cmdline_ptr, ',', TRUE); if (str_flags) - flags = atolW(str_flags); + { + DWORD inf_flags = atolW(str_flags); + if (inf_flags & LIS_QUIET) flags |= RSC_FLAG_QUIET; + if (inf_flags & LIS_NOGRPCONV) flags |= RSC_FLAG_NGCONV; + } ZeroMemory(&info, sizeof(ADVInfo)); diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 875e7d4..16593d1 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -190,6 +190,7 @@ static void test_LaunchINFSection(void) HRESULT hr; char cmdline[MAX_PATH]; static char file[] = "test.inf,DefaultInstall,4,0"; + static char file2[] = "test.inf,,1,0"; /* The 'No UI' flag seems to have no effect whatsoever on Windows. * So only do this test in interactive mode. @@ -220,6 +221,9 @@ static void test_LaunchINFSection(void) hr = pLaunchINFSection(NULL, NULL, file, 0); ok(hr == 0, "Expected 0, got %d\n", hr); + hr = pLaunchINFSection(NULL, NULL, file2, 0); + ok(hr == 0, "Expected 0, got %d\n", hr); + DeleteFileA("test.inf"); } diff --git a/include/advpub.h b/include/advpub.h index b213b1f..7823e0a 100644 --- a/include/advpub.h +++ b/include/advpub.h @@ -135,6 +135,10 @@ DECL_WINELIB_TYPE_AW(LPCSTRTABLE) #define RSC_FLAG_DELAYREGISTEROCX 0x00000200 #define RSC_FLAG_SETUPAPI 0x00000400 +/* Flags for LaunchINFSection */ +#define LIS_QUIET 0x00000001 +#define LIS_NOGRPCONV 0x00000002 + /* Flags for DelNode */ #define ADN_DEL_IF_EMPTY 0x00000001 #define ADN_DONT_DEL_SUBDIRS 0x00000002

1 0

Andrew Eikum : xaudio2_0: Fix registered XAudio20 CLSID.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: a3c340979664a2e8a27d37e8e5297efc980c50ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c340979664a2e8a27d37e8e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 8 10:35:20 2015 -0500 xaudio2_0: Fix registered XAudio20 CLSID. Thanks to Andrey Gusev for noticing during a bug retest. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_0/xaudio_classes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_0/xaudio_classes.idl b/dlls/xaudio2_0/xaudio_classes.idl index 4a81eb1..08693fc 100644 --- a/dlls/xaudio2_0/xaudio_classes.idl +++ b/dlls/xaudio2_0/xaudio_classes.idl @@ -23,7 +23,7 @@ [ helpstring("XAudio2.0 Class"), threading(both), - uuid(e21a7345-eb21-468e-be50-804db97cf708) + uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) ] coclass XAudio20 { interface IXAudio20; }

1 0

Sebastian Lackner : kernel32/tests: Add test to demonstrate a bug related to alertable waits.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: d94a6c770ae3bca1fabf3a9e89e4346c35707831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94a6c770ae3bca1fabf3a9e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 03:43:40 2015 +0200 kernel32/tests: Add test to demonstrate a bug related to alertable waits. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index a9d2377..e842bf3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2308,6 +2308,71 @@ static void test_srwlock_example(void) trace("number of total exclusive accesses is %d\n", srwlock_protected_value); } +static DWORD WINAPI alertable_wait_thread(void *param) +{ + HANDLE *semaphores = param; + LARGE_INTEGER timeout; + NTSTATUS status; + DWORD result; + + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForMultipleObjectsEx(1, &semaphores[1], TRUE, 1000, TRUE); + todo_wine + ok(result == WAIT_IO_COMPLETION, "expected WAIT_IO_COMPLETION, got %u\n", result); + result = WaitForMultipleObjectsEx(1, &semaphores[1], TRUE, 200, TRUE); + todo_wine + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + ReleaseSemaphore(semaphores[0], 1, NULL); + timeout.QuadPart = -10000000; + status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); + todo_wine + ok(status == STATUS_USER_APC, "expected STATUS_USER_APC, got %08x\n", status); + timeout.QuadPart = -2000000; + status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); + todo_wine + ok(status == STATUS_WAIT_0, "expected STATUS_WAIT_0, got %08x\n", status); + + return 0; +} + +static void CALLBACK alertable_wait_apc(ULONG_PTR userdata) +{ + HANDLE *semaphores = (void *)userdata; + ReleaseSemaphore(semaphores[1], 1, NULL); +} + +static void test_alertable_wait(void) +{ + HANDLE thread, semaphores[2]; + DWORD result; + + semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + thread = CreateThread(NULL, 0, alertable_wait_thread, semaphores, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + Sleep(100); /* ensure the thread is blocking in WaitForMultipleObjectsEx */ + result = QueueUserAPC(alertable_wait_apc, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + Sleep(100); /* ensure the thread is blocking in NtWaitForMultipleObjects */ + result = QueueUserAPC(alertable_wait_apc, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + CloseHandle(thread); + CloseHandle(semaphores[0]); + CloseHandle(semaphores[1]); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); @@ -2355,4 +2420,5 @@ START_TEST(sync) test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); + test_alertable_wait(); }

1 0

Hans Leidekker : webservices: Implement WsReadToStartElement.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 3ec48f1d9da7409101f9bfe392a03367552ce01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec48f1d9da7409101f9bfe39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:28 2015 +0200 webservices: Implement WsReadToStartElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 274 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 149 +++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 424 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ec48f1d9da7409101f9b…

1 0

Hans Leidekker : webservices: Implement WsReadEndElement.
by Alexandre Julliard Oct. 9, 2015

Oct. 9, 2015

Module: wine Branch: master Commit: 45ded33bc96d5981c182ea7bf01652e3b79b0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ded33bc96d5981c182ea7bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 9 10:19:30 2015 +0200 webservices: Implement WsReadEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 43 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index e4a377b..e48a8f2 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -833,6 +833,49 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } +static HRESULT read_endelement( struct reader *reader ) +{ + struct node *node; + unsigned int ch, skip; + + if (reader->state != READER_STATE_TEXT) return WS_E_INVALID_FORMAT; + + if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; + read_skip( reader, 2 ); + + for (;;) + { + if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if (ch == '>') + { + read_skip( reader, 1 ); + break; + } + if (!read_isnamechar( ch )) return WS_E_INVALID_FORMAT; + read_skip( reader, skip ); + } + + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + list_add_after( &reader->current->entry, &node->entry ); + reader->current = node; + reader->state = READER_STATE_ENDELEMENT; + return S_OK; +} + +/************************************************************************** + * WsReadEndElement [webservices.@] + */ +HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + return read_endelement( reader ); +} + /************************************************************************** * WsReadStartElement [webservices.@] */ diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4dce639..4a587e7 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -109,7 +109,7 @@ @ stub WsReadCharsUtf8 @ stub WsReadElement @ stub WsReadEndAttribute -@ stub WsReadEndElement +@ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension @ stub WsReadEnvelopeEnd @ stub WsReadEnvelopeStart

1 0