January 2016 - Wine-Commits

Nikolay Sivov : dwrite: Keep underlines in separate list.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: c0fb6f436baa74e9c60d7adf7acb135bc8c51bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fb6f436baa74e9c60d7adf7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 12 23:12:06 2016 +0300 dwrite: Keep underlines in separate list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 097adee..344523c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -102,6 +102,7 @@ struct layout_range_attr_value { enum layout_range_kind { LAYOUT_RANGE_REGULAR, + LAYOUT_RANGE_UNDERLINE, LAYOUT_RANGE_STRIKETHROUGH, LAYOUT_RANGE_EFFECT, LAYOUT_RANGE_SPACING, @@ -121,7 +122,6 @@ struct layout_range { FLOAT fontsize; DWRITE_FONT_STRETCH stretch; IDWriteInlineObject *object; - BOOL underline; BOOL pair_kerning; IDWriteFontCollection *collection; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; @@ -234,6 +234,7 @@ struct dwrite_textlayout { UINT32 len; struct dwrite_textformat_data format; struct list strike_ranges; + struct list underline_ranges; struct list typographies; struct list effects; struct list spacing; @@ -1627,7 +1628,7 @@ static BOOL is_same_layout_attrvalue(struct layout_range_header const *h, enum l case LAYOUT_RANGE_ATTR_EFFECT: return range_iface->iface == value->u.effect; case LAYOUT_RANGE_ATTR_UNDERLINE: - return range->underline == value->u.underline; + return range_bool->value == value->u.underline; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: return range_bool->value == value->u.strikethrough; case LAYOUT_RANGE_ATTR_PAIR_KERNING: @@ -1664,12 +1665,12 @@ static inline BOOL is_same_layout_attributes(struct layout_range_header const *h left->stretch == right->stretch && left->fontsize == right->fontsize && left->object == right->object && - left->underline == right->underline && left->pair_kerning == right->pair_kerning && left->collection == right->collection && !strcmpiW(left->locale, right->locale) && !strcmpW(left->fontfamily, right->fontfamily); } + case LAYOUT_RANGE_UNDERLINE: case LAYOUT_RANGE_STRIKETHROUGH: { struct layout_range_bool const *left = (struct layout_range_bool const*)hleft; @@ -1722,7 +1723,6 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * range->stretch = layout->format.stretch; range->fontsize = layout->format.fontsize; range->object = NULL; - range->underline = FALSE; range->pair_kerning = FALSE; range->fontfamily = heap_strdupW(layout->format.family_name); @@ -1739,6 +1739,7 @@ static struct layout_range_header *alloc_layout_range(struct dwrite_textlayout * h = &range->h; break; } + case LAYOUT_RANGE_UNDERLINE: case LAYOUT_RANGE_STRIKETHROUGH: { struct layout_range_bool *range; @@ -1813,6 +1814,7 @@ static struct layout_range_header *alloc_layout_range_from(struct layout_range_h ret = &range->h; break; } + case LAYOUT_RANGE_UNDERLINE: case LAYOUT_RANGE_STRIKETHROUGH: { struct layout_range_bool *strike = heap_alloc(sizeof(*strike)); @@ -1894,6 +1896,11 @@ static void free_layout_ranges_list(struct dwrite_textlayout *layout) free_layout_range(cur); } + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->underline_ranges, struct layout_range_header, entry) { + list_remove(&cur->entry); + free_layout_range(cur); + } + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &layout->strike_ranges, struct layout_range_header, entry) { list_remove(&cur->entry); free_layout_range(cur); @@ -1993,8 +2000,8 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: - changed = dest->underline != value->u.underline; - dest->underline = value->u.underline; + changed = dest_bool->value != value->u.underline; + dest_bool->value = value->u.underline; break; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: changed = dest_bool->value != value->u.strikethrough; @@ -2069,13 +2076,15 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo case LAYOUT_RANGE_ATTR_STRETCH: case LAYOUT_RANGE_ATTR_FONTSIZE: case LAYOUT_RANGE_ATTR_INLINE: - case LAYOUT_RANGE_ATTR_UNDERLINE: case LAYOUT_RANGE_ATTR_PAIR_KERNING: case LAYOUT_RANGE_ATTR_FONTCOLL: case LAYOUT_RANGE_ATTR_LOCALE: case LAYOUT_RANGE_ATTR_FONTFAMILY: ranges = &layout->ranges; break; + case LAYOUT_RANGE_ATTR_UNDERLINE: + ranges = &layout->underline_ranges; + break; case LAYOUT_RANGE_ATTR_STRIKETHROUGH: ranges = &layout->strike_ranges; break; @@ -2778,15 +2787,12 @@ static HRESULT WINAPI dwritetextlayout_GetUnderline(IDWriteTextLayout2 *iface, UINT32 position, BOOL *underline, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range *range; + struct layout_range_bool *range; TRACE("(%p)->(%u %p %p)\n", This, position, underline, r); - if (position >= This->len) - return S_OK; - - range = get_layout_range_by_pos(This, position); - *underline = range->underline; + range = (struct layout_range_bool*)get_layout_range_header_by_pos(&This->underline_ranges, position); + *underline = range->value; return return_range(&range->h, r); } @@ -4032,7 +4038,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { - struct layout_range_header *range, *strike, *effect, *spacing, *typography; + struct layout_range_header *range, *strike, *underline, *effect, *spacing, *typography; static const DWRITE_TEXT_RANGE r = { 0, ~0u }; HRESULT hr; @@ -4057,6 +4063,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * list_init(&layout->runs); list_init(&layout->ranges); list_init(&layout->strike_ranges); + list_init(&layout->underline_ranges); list_init(&layout->effects); list_init(&layout->spacing); list_init(&layout->typographies); @@ -4081,12 +4088,14 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * range = alloc_layout_range(layout, &r, LAYOUT_RANGE_REGULAR); strike = alloc_layout_range(layout, &r, LAYOUT_RANGE_STRIKETHROUGH); + underline = alloc_layout_range(layout, &r, LAYOUT_RANGE_UNDERLINE); effect = alloc_layout_range(layout, &r, LAYOUT_RANGE_EFFECT); spacing = alloc_layout_range(layout, &r, LAYOUT_RANGE_SPACING); typography = alloc_layout_range(layout, &r, LAYOUT_RANGE_TYPOGRAPHY); - if (!range || !strike || !effect || !spacing || !typography) { + if (!range || !strike || !effect || !spacing || !typography || !underline) { free_layout_range(range); free_layout_range(strike); + free_layout_range(underline); free_layout_range(effect); free_layout_range(spacing); free_layout_range(typography); @@ -4096,6 +4105,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * list_add_head(&layout->ranges, &range->entry); list_add_head(&layout->strike_ranges, &strike->entry); + list_add_head(&layout->underline_ranges, &underline->entry); list_add_head(&layout->effects, &effect->entry); list_add_head(&layout->spacing, &spacing->entry); list_add_head(&layout->typographies, &typography->entry);

1 0

Andrew Eikum : xaudio2_2: Use shared source.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 279b35354dc15e6bde02c8106491affc0f76205a URL: http://source.winehq.org/git/wine.git/?a=commit;h=279b35354dc15e6bde02c8106… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:20 2016 -0600 xaudio2_2: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_2/Makefile.in | 7 ++++- dlls/xaudio2_2/xaudio2_2.spec | 2 +- dlls/xaudio2_2/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_2/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index 8bd9e35..ddfce47 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} enable_xaudio2_4=${enable_xaudio2_4:-no} enable_xaudio2_5=${enable_xaudio2_5:-no} diff --git a/configure.ac b/configure.ac index 9ee7b74..60e2f28 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_2=${enable_xaudio2_2:-no} enable_xaudio2_3=${enable_xaudio2_3:-no} enable_xaudio2_4=${enable_xaudio2_4:-no} enable_xaudio2_5=${enable_xaudio2_5:-no} diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index 9470199..77f21bd 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=2 MODULE = xaudio2_2.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_2/xaudio2_2.spec b/dlls/xaudio2_2/xaudio2_2.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_2/xaudio2_2.spec +++ b/dlls/xaudio2_2/xaudio2_2.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_2/xaudio_classes.idl b/dlls/xaudio2_2/xaudio_classes.idl deleted file mode 100644 index 1d49ffb..0000000 --- a/dlls/xaudio2_2/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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 - */ - -#pragma makedep register - -[ - helpstring("XAudio2.2 Class"), - threading(both), - uuid(b802058a-464a-42db-bc10-b650d6f2586a) -] -coclass XAudio22 { interface IXAudio22; } - -[ - helpstring("XAudio2.2 AudioReverb Class"), - threading(both), - uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51) -] -coclass AudioReverb22 { interface IXAPO; } - -[ - helpstring("XAudio2.2 AudioVolumeMeter Class"), - threading(both), - uuid(f5ca7b34-8055-42c0-b836-216129eb7e30) -] -coclass AudioVolumeMeter22 { interface IXAPO; } diff --git a/dlls/xaudio2_2/xaudio_dll.c b/dlls/xaudio2_2/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_2/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 5ec42fd..27b74c9 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -211,3 +211,26 @@ coclass AudioReverb23 { interface IXAPO; } ] coclass AudioVolumeMeter23 { interface IXAPO; } #endif /* XAUDIO2_VER == 3 */ + +#if XAUDIO2_VER == 2 +[ + helpstring("XAudio2.2 Class"), + threading(both), + uuid(b802058a-464a-42db-bc10-b650d6f2586a) +] +coclass XAudio22 { interface IXAudio22; } + +[ + helpstring("XAudio2.2 AudioReverb Class"), + threading(both), + uuid(629cf0de-3ecc-41e7-9926-f7e43eebec51) +] +coclass AudioReverb22 { interface IXAPO; } + +[ + helpstring("XAudio2.2 AudioVolumeMeter Class"), + threading(both), + uuid(f5ca7b34-8055-42c0-b836-216129eb7e30) +] +coclass AudioVolumeMeter22 { interface IXAPO; } +#endif /* XAUDIO2_VER == 2 */

1 0

Andrew Eikum : xaudio2_4: Use shared source.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 2fa2d7f7380bdcdcb96f6f3241d2070dc3f65c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa2d7f7380bdcdcb96f6f324… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:13 2016 -0600 xaudio2_4: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_4/Makefile.in | 7 ++++- dlls/xaudio2_4/xaudio2_4.spec | 2 +- dlls/xaudio2_4/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_4/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index b0c8919..09a718d 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_4=${enable_xaudio2_4:-no} enable_xaudio2_5=${enable_xaudio2_5:-no} enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} diff --git a/configure.ac b/configure.ac index 94e7cc8..6eedfb6 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_4=${enable_xaudio2_4:-no} enable_xaudio2_5=${enable_xaudio2_5:-no} enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index 9a9f19b..a909a41 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=4 MODULE = xaudio2_4.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_4/xaudio2_4.spec b/dlls/xaudio2_4/xaudio2_4.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_4/xaudio2_4.spec +++ b/dlls/xaudio2_4/xaudio2_4.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_4/xaudio_classes.idl b/dlls/xaudio2_4/xaudio_classes.idl deleted file mode 100644 index 3486de3..0000000 --- a/dlls/xaudio2_4/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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 - */ - -#pragma makedep register - -[ - helpstring("XAudio2.4 Class"), - threading(both), - uuid(03219e78-5bc3-44d1-b92e-f63d89cc6526) -] -coclass XAudio24 { interface IXAudio27; } - -[ - helpstring("XAudio2.4 AudioReverb Class"), - threading(both), - uuid(8bb7778b-645b-4475-9a73-1de3170bd3af) -] -coclass AudioReverb24 { interface IXAPO; } - -[ - helpstring("XAudio2.4 AudioVolumeMeter Class"), - threading(both), - uuid(c7338b95-52b8-4542-aa79-42eb016c8c1c) -] -coclass AudioVolumeMeter24 { interface IXAPO; } diff --git a/dlls/xaudio2_4/xaudio_dll.c b/dlls/xaudio2_4/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_4/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 783b0ca..699766c 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -165,3 +165,26 @@ coclass AudioReverb25 { interface IXAPO; } ] coclass AudioVolumeMeter25 { interface IXAPO; } #endif /* XAUDIO2_VER == 5 */ + +#if XAUDIO2_VER == 4 +[ + helpstring("XAudio2.4 Class"), + threading(both), + uuid(03219e78-5bc3-44d1-b92e-f63d89cc6526) +] +coclass XAudio24 { interface IXAudio27; } + +[ + helpstring("XAudio2.4 AudioReverb Class"), + threading(both), + uuid(8bb7778b-645b-4475-9a73-1de3170bd3af) +] +coclass AudioReverb24 { interface IXAPO; } + +[ + helpstring("XAudio2.4 AudioVolumeMeter Class"), + threading(both), + uuid(c7338b95-52b8-4542-aa79-42eb016c8c1c) +] +coclass AudioVolumeMeter24 { interface IXAPO; } +#endif /* XAUDIO2_VER == 4 */

1 0

Andrew Eikum : xaudio2_5: Use shared source.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 8f06cc63fdc7e4923cf3a334b5758abf7b77c883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f06cc63fdc7e4923cf3a334b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:09 2016 -0600 xaudio2_5: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_5/Makefile.in | 7 ++++- dlls/xaudio2_5/xaudio2_5.spec | 2 +- dlls/xaudio2_5/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_5/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index a46e6bb..b0c8919 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_5=${enable_xaudio2_5:-no} enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} diff --git a/configure.ac b/configure.ac index 84a0ac6..94e7cc8 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_5=${enable_xaudio2_5:-no} enable_xaudio2_6=${enable_xaudio2_6:-no} enable_xaudio2_7=${enable_xaudio2_7:-no} enable_xaudio2_8=${enable_xaudio2_8:-no} diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index 6cc0565..ad6955c 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=5 MODULE = xaudio2_5.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_5/xaudio2_5.spec b/dlls/xaudio2_5/xaudio2_5.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_5/xaudio2_5.spec +++ b/dlls/xaudio2_5/xaudio2_5.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_5/xaudio_classes.idl b/dlls/xaudio2_5/xaudio_classes.idl deleted file mode 100644 index f3c0b0a..0000000 --- a/dlls/xaudio2_5/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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 - */ - -#pragma makedep register - -[ - helpstring("XAudio2.5 Class"), - threading(both), - uuid(4c9b6dde-6809-46e6-a278-9b6a97588670) -] -coclass XAudio25 { interface IXAudio27; } - -[ - helpstring("XAudio2.5 AudioReverb Class"), - threading(both), - uuid(d06df0d0-8518-441e-822f-5451d5c595b8) -] -coclass AudioReverb25 { interface IXAPO; } - -[ - helpstring("XAudio2.5 AudioVolumeMeter Class"), - threading(both), - uuid(2139e6da-c341-4774-9ac3-b4e026347f64) -] -coclass AudioVolumeMeter25 { interface IXAPO; } diff --git a/dlls/xaudio2_5/xaudio_dll.c b/dlls/xaudio2_5/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_5/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 0dc2104..783b0ca 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -142,3 +142,26 @@ coclass AudioReverb26 { interface IXAPO; } ] coclass AudioVolumeMeter26 { interface IXAPO; } #endif /* XAUDIO2_VER == 6 */ + +#if XAUDIO2_VER == 5 +[ + helpstring("XAudio2.5 Class"), + threading(both), + uuid(4c9b6dde-6809-46e6-a278-9b6a97588670) +] +coclass XAudio25 { interface IXAudio27; } + +[ + helpstring("XAudio2.5 AudioReverb Class"), + threading(both), + uuid(d06df0d0-8518-441e-822f-5451d5c595b8) +] +coclass AudioReverb25 { interface IXAPO; } + +[ + helpstring("XAudio2.5 AudioVolumeMeter Class"), + threading(both), + uuid(2139e6da-c341-4774-9ac3-b4e026347f64) +] +coclass AudioVolumeMeter25 { interface IXAPO; } +#endif /* XAUDIO2_VER == 5 */

1 0

Andrew Eikum : mscoree: Set config path for default app domain.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 4d44363e604858a93da3dcb41fd91938fdc4c227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d44363e604858a93da3dcb41… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 08:36:07 2016 -0600 mscoree: Set config path for default app domain. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 75 +++++++++++++++++++++++++++++++++++------- dlls/mscoree/metahost.c | 2 ++ dlls/mscoree/mscoree_private.h | 5 +-- 3 files changed, 69 insertions(+), 13 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ec9d54d..e437cc2 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -104,8 +104,11 @@ end: return res; } -static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, MonoDomain **result) +static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *config_path, MonoDomain **result) { + WCHAR config_dir[MAX_PATH]; + WCHAR base_dir[MAX_PATH]; + char *base_dirA, *config_pathA, *slash; HRESULT res=S_OK; EnterCriticalSection(&This->lock); @@ -114,6 +117,48 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, MonoDomain **resu res = RuntimeHost_AddDomain(This, &This->default_domain); + if (!config_path) + { + DWORD len = sizeof(config_dir)/sizeof(*config_dir); + + static const WCHAR machine_configW[] = {'\\','C','O','N','F','I','G','\\','m','a','c','h','i','n','e','.','c','o','n','f','i','g',0}; + + res = ICLRRuntimeInfo_GetRuntimeDirectory(&This->version->ICLRRuntimeInfo_iface, + config_dir, &len); + if (FAILED(res)) + goto end; + + lstrcatW(config_dir, machine_configW); + + config_path = config_dir; + } + + config_pathA = WtoA(config_path); + if (!config_pathA) + { + res = E_OUTOFMEMORY; + goto end; + } + + GetModuleFileNameW(NULL, base_dir, sizeof(base_dir) / sizeof(*base_dir)); + base_dirA = WtoA(base_dir); + if (!base_dirA) + { + HeapFree(GetProcessHeap(), 0, config_pathA); + res = E_OUTOFMEMORY; + goto end; + } + + slash = strrchr(base_dirA, '\\'); + if (slash) + *slash = 0; + + TRACE("setting base_dir: %s, config_path: %s\n", base_dirA, config_pathA); + mono_domain_set_config(This->default_domain, base_dirA, config_pathA); + + HeapFree(GetProcessHeap(), 0, config_pathA); + HeapFree(GetProcessHeap(), 0, base_dirA); + end: *result = This->default_domain; @@ -241,7 +286,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) MonoDomain *domain; MonoObject *dummy; - hr = RuntimeHost_GetDefaultDomain(This, &domain); + hr = RuntimeHost_GetDefaultDomain(This, NULL, &domain); if (FAILED(hr)) { ERR("Cannot get domain, hr=%x\n", hr); @@ -371,7 +416,7 @@ static HRESULT WINAPI corruntimehost_Start( TRACE("%p\n", This); - return RuntimeHost_GetDefaultDomain(This, &dummy); + return RuntimeHost_GetDefaultDomain(This, NULL, &dummy); } static HRESULT WINAPI corruntimehost_Stop( @@ -401,7 +446,7 @@ static HRESULT WINAPI corruntimehost_GetDefaultDomain( TRACE("(%p)\n", iface); - hr = RuntimeHost_GetDefaultDomain(This, &domain); + hr = RuntimeHost_GetDefaultDomain(This, NULL, &domain); if (SUCCEEDED(hr)) { @@ -459,7 +504,7 @@ static HRESULT WINAPI corruntimehost_CreateDomainSetup( TRACE("(%p)\n", iface); - hr = RuntimeHost_GetDefaultDomain(This, &domain); + hr = RuntimeHost_GetDefaultDomain(This, NULL, &domain); if (SUCCEEDED(hr)) hr = RuntimeHost_CreateManagedInstance(This, classnameW, domain, &obj); @@ -625,7 +670,7 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* TRACE("(%p,%s,%s,%s,%s)\n", iface, debugstr_w(pwzAssemblyPath), debugstr_w(pwzTypeName), debugstr_w(pwzMethodName), debugstr_w(pwzArgument)); - hr = RuntimeHost_GetDefaultDomain(This, &domain); + hr = RuntimeHost_GetDefaultDomain(This, NULL, &domain); if (SUCCEEDED(hr)) { @@ -717,7 +762,7 @@ HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, MonoObject *obj; if (!domain) - hr = RuntimeHost_GetDefaultDomain(This, &domain); + hr = RuntimeHost_GetDefaultDomain(This, NULL, &domain); if (SUCCEEDED(hr)) { @@ -921,7 +966,7 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); if (SUCCEEDED(hr)) - hr = RuntimeHost_GetDefaultDomain(host, &domain); + hr = RuntimeHost_GetDefaultDomain(host, NULL, &domain); if (SUCCEEDED(hr)) { @@ -1077,7 +1122,15 @@ __int32 WINAPI _CorExeMain(void) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); if (SUCCEEDED(hr)) - hr = RuntimeHost_GetDefaultDomain(host, &domain); + { + WCHAR config_file[MAX_PATH]; + static const WCHAR dotconfig[] = {'.','c','o','n','f','i','g',0}; + + strcpyW(config_file, filename); + strcatW(config_file, dotconfig); + + hr = RuntimeHost_GetDefaultDomain(host, config_file, &domain); + } if (SUCCEEDED(hr)) { @@ -1157,7 +1210,7 @@ void runtimehost_uninit(void) } } -HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, RuntimeHost** result) +HRESULT RuntimeHost_Construct(CLRRuntimeInfo *runtime_version, RuntimeHost** result) { RuntimeHost *This; @@ -1342,7 +1395,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) hr = ICLRRuntimeInfo_GetRuntimeHost(info, &host); if (SUCCEEDED(hr)) - hr = RuntimeHost_GetDefaultDomain(host, &domain); + hr = RuntimeHost_GetDefaultDomain(host, NULL, &domain); if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6b53cde..e3a724c 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -79,6 +79,7 @@ MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_spac MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); static void (CDECL *mono_config_parse)(const char *filename); MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); +void (CDECL *mono_domain_set_config)(MonoDomain *domain,const char *base_dir,const char *config_file_name); static void (CDECL *mono_free)(void *); static MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); @@ -179,6 +180,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_open); + LOAD_MONO_FUNCTION(mono_domain_set_config); LOAD_MONO_FUNCTION(mono_free); LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 9a7678d..0c59c42 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -70,7 +70,7 @@ struct RuntimeHost { ICorRuntimeHost ICorRuntimeHost_iface; ICLRRuntimeHost ICLRRuntimeHost_iface; - const CLRRuntimeInfo *version; + CLRRuntimeInfo *version; struct list domains; MonoDomain *default_domain; CRITICAL_SECTION lock; @@ -143,6 +143,7 @@ extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HI extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN; extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN; extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name) DECLSPEC_HIDDEN; +extern void (CDECL *mono_domain_set_config)(MonoDomain *domain,const char *base_dir,const char *config_file_name) DECLSPEC_HIDDEN; extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version) DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) DECLSPEC_HIDDEN; @@ -164,7 +165,7 @@ extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) /* loaded runtime interfaces */ extern void expect_no_runtimes(void) DECLSPEC_HIDDEN; -extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, RuntimeHost** result) DECLSPEC_HIDDEN; +extern HRESULT RuntimeHost_Construct(CLRRuntimeInfo *runtime_version, RuntimeHost** result) DECLSPEC_HIDDEN; extern void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : xaudio2_3: Use shared source.
by Alexandre Julliard Jan. 13, 2016

Jan. 13, 2016

Module: wine Branch: master Commit: 1a08e07e2b2da954edec03227a94046f58d78ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a08e07e2b2da954edec03227… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 12 13:31:17 2016 -0600 xaudio2_3: Use shared source. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/xaudio2_3/Makefile.in | 7 ++++- dlls/xaudio2_3/xaudio2_3.spec | 2 +- dlls/xaudio2_3/xaudio_classes.idl | 42 ------------------------------ dlls/xaudio2_3/xaudio_dll.c | 54 --------------------------------------- dlls/xaudio2_7/xaudio_classes.idl | 23 +++++++++++++++++ 7 files changed, 32 insertions(+), 98 deletions(-) diff --git a/configure b/configure index 09a718d..8bd9e35 100755 --- a/configure +++ b/configure @@ -13719,6 +13719,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + enable_xaudio2_3=${enable_xaudio2_3:-no} enable_xaudio2_4=${enable_xaudio2_4:-no} enable_xaudio2_5=${enable_xaudio2_5:-no} enable_xaudio2_6=${enable_xaudio2_6:-no} diff --git a/configure.ac b/configure.ac index 6eedfb6..9ee7b74 100644 --- a/configure.ac +++ b/configure.ac @@ -1662,6 +1662,7 @@ fi if test "x$ac_cv_have_openalsoft" != xyes then WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + enable_xaudio2_3=${enable_xaudio2_3:-no} enable_xaudio2_4=${enable_xaudio2_4:-no} enable_xaudio2_5=${enable_xaudio2_5:-no} enable_xaudio2_6=${enable_xaudio2_6:-no} diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index 0e9e2f3..ed6f3e1 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,7 +1,12 @@ +EXTRADEFS = -DXAUDIO2_VER=3 MODULE = xaudio2_3.dll -IMPORTS = ole32 +IMPORTS = advapi32 kernel32 ole32 user32 uuid +EXTRALIBS = $(OPENAL_LIBS) +PARENTSRC = ../xaudio2_7 C_SRCS = \ + compat.c \ + xapofx.c \ xaudio_dll.c IDL_SRCS = xaudio_classes.idl diff --git a/dlls/xaudio2_3/xaudio2_3.spec b/dlls/xaudio2_3/xaudio2_3.spec index cb263d4..b16365d 100644 --- a/dlls/xaudio2_3/xaudio2_3.spec +++ b/dlls/xaudio2_3/xaudio2_3.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) xaudio2_7.DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xaudio2_3/xaudio_classes.idl b/dlls/xaudio2_3/xaudio_classes.idl deleted file mode 100644 index ebd8548..0000000 --- a/dlls/xaudio2_3/xaudio_classes.idl +++ /dev/null @@ -1,42 +0,0 @@ -/* - * COM Classes for xaudio - * - * Copyright 2015 Andrew Eikum for CodeWeavers - * - * 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 - */ - -#pragma makedep register - -[ - helpstring("XAudio2.3 Class"), - threading(both), - uuid(4c5e637a-16c7-4de3-9c46-5ed22181962d) -] -coclass XAudio23 { interface IXAudio27; } - -[ - helpstring("XAudio2.3 AudioReverb Class"), - threading(both), - uuid(9cab402c-1d37-44b4-886d-fa4f36170a4c) -] -coclass AudioReverb23 { interface IXAPO; } - -[ - helpstring("XAudio2.3 AudioVolumeMeter Class"), - threading(both), - uuid(e180344b-ac83-4483-959e-18a5c56a5e19) -] -coclass AudioVolumeMeter23 { interface IXAPO; } diff --git a/dlls/xaudio2_3/xaudio_dll.c b/dlls/xaudio2_3/xaudio_dll.c deleted file mode 100644 index e55861c..0000000 --- a/dlls/xaudio2_3/xaudio_dll.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015 Andrew Eikum for CodeWeavers - * - * 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 <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "rpcproxy.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinstance; - DisableThreadLibraryCalls(hinstance); - break; - } - return TRUE; -} - -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -} - -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources(instance); -} - -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources(instance); -} diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2_7/xaudio_classes.idl index 699766c..5ec42fd 100644 --- a/dlls/xaudio2_7/xaudio_classes.idl +++ b/dlls/xaudio2_7/xaudio_classes.idl @@ -188,3 +188,26 @@ coclass AudioReverb24 { interface IXAPO; } ] coclass AudioVolumeMeter24 { interface IXAPO; } #endif /* XAUDIO2_VER == 4 */ + +#if XAUDIO2_VER == 3 +[ + helpstring("XAudio2.3 Class"), + threading(both), + uuid(4c5e637a-16c7-4de3-9c46-5ed22181962d) +] +coclass XAudio23 { interface IXAudio27; } + +[ + helpstring("XAudio2.3 AudioReverb Class"), + threading(both), + uuid(9cab402c-1d37-44b4-886d-fa4f36170a4c) +] +coclass AudioReverb23 { interface IXAPO; } + +[ + helpstring("XAudio2.3 AudioVolumeMeter Class"), + threading(both), + uuid(e180344b-ac83-4483-959e-18a5c56a5e19) +] +coclass AudioVolumeMeter23 { interface IXAPO; } +#endif /* XAUDIO2_VER == 3 */

1 0

André Hentschel : configure: Check for MinGW even when cross compiling.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: bbcb77cda539788d50dfa35b5583534aa9e8d71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbcb77cda539788d50dfa35b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 11 22:24:13 2016 +0100 configure: Check for MinGW even when cross compiling. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 91c21aa..a46e6bb 100755 --- a/configure +++ b/configure @@ -8750,7 +8750,7 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL CROSSTARGET="" -if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" then case "$host_cpu" in arm*) diff --git a/configure.ac b/configure.ac index 6535b4a..84a0ac6 100644 --- a/configure.ac +++ b/configure.ac @@ -943,7 +943,7 @@ test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDL dnl Check for cross compiler to build test programs AC_SUBST(CROSSTARGET,"") -if test "$cross_compiling" = "no" -a "x$enable_tests" != xno -a "$LIBEXT" != "dll" +if test "x$enable_tests" != xno -a "$LIBEXT" != "dll" then WINE_CHECK_MINGW_PROG(CROSSCC,false) if test "$CROSSCC" != "false"

1 0

Jacek Caban : mshtml: Skip unused named args in Invoke calls.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 8a20cf4cf82d005f0cecd786fde201aafd541573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a20cf4cf82d005f0cecd786f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 20:49:24 2016 +0100 mshtml: Skip unused named args in Invoke calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ff4e28a..3980daf 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -617,6 +617,7 @@ static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { + DISPPARAMS params = {dp->rgvarg+dp->cNamedArgs, NULL, dp->cArgs-dp->cNamedArgs, 0}; ITypeInfo *ti; IUnknown *unk; UINT argerr=0; @@ -634,7 +635,7 @@ static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_FAIL; } - hres = ITypeInfo_Invoke(ti, unk, func->id, flags, dp, res, ei, &argerr); + hres = ITypeInfo_Invoke(ti, unk, func->id, flags, &params, res, ei, &argerr); IUnknown_Release(unk); return hres; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 2511939..73b1185 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1926,6 +1926,23 @@ static void test_func(IDispatchEx *obj) hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); ok(hres == S_OK || broken(E_ACCESSDENIED), "InvokeEx failed: %08x\n", hres); if(SUCCEEDED(hres)) { + DISPID named_args[2] = { DISPID_THIS, 0xdeadbeef }; + VARIANT args[2]; + + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.rgdispidNamedArgs = named_args; + dp.cNamedArgs = 2; + dp.cArgs = 2; + dp.rgvarg = &var; + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)obj; + V_VT(args+1) = VT_I4; + V_I4(args+1) = 3; + hres = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); ok(!strcmp_wa(V_BSTR(&var), "[object]"), "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var);

1 0

Jacek Caban : mshtml: Added IHTMLDocument2:: get_defaultCharset implementation.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: 5910925728d4ad103d42c3d281134db48001ac93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5910925728d4ad103d42c3d28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 12 14:42:46 2016 +0100 mshtml: Added IHTMLDocument2::get_defaultCharset implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 ++++-- dlls/mshtml/main.c | 53 +++++++++++++++++++++++++++++++++----------- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87be653..784a578 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -921,8 +921,11 @@ static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BST static HRESULT WINAPI HTMLDocument_get_defaultCharset(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = charset_string_from_cp(GetACP()); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLDocument_get_mimeType(IHTMLDocument2 *iface, BSTR *p) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 0b6f6ac..8a366bd 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -54,25 +54,35 @@ static HDC display_dc; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; -UINT cp_from_charset_string(BSTR charset) +static BOOL ensure_mlang(void) { - MIMECSETINFO info; + IMultiLanguage2 *new_mlang; HRESULT hres; - if(!mlang) { - IMultiLanguage2 *new_mlang; - - hres = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, - &IID_IMultiLanguage2, (void**)&new_mlang); - if(FAILED(hres)) { - ERR("Could not create CMultiLanguage instance\n"); - return CP_UTF8; - } + if(mlang) + return TRUE; - if(InterlockedCompareExchangePointer((void**)&mlang, new_mlang, NULL)) - IMultiLanguage2_Release(new_mlang); + hres = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMultiLanguage2, (void**)&new_mlang); + if(FAILED(hres)) { + ERR("Could not create CMultiLanguage instance\n"); + return FALSE; } + if(InterlockedCompareExchangePointer((void**)&mlang, new_mlang, NULL)) + IMultiLanguage2_Release(new_mlang); + + return TRUE; +} + +UINT cp_from_charset_string(BSTR charset) +{ + MIMECSETINFO info; + HRESULT hres; + + if(!ensure_mlang()) + return CP_UTF8; + hres = IMultiLanguage2_GetCharsetInfo(mlang, charset, &info); if(FAILED(hres)) { FIXME("GetCharsetInfo failed: %08x\n", hres); @@ -82,6 +92,23 @@ UINT cp_from_charset_string(BSTR charset) return info.uiInternetEncoding; } +BSTR charset_string_from_cp(UINT cp) +{ + MIMECPINFO info; + HRESULT hres; + + if(!ensure_mlang()) + return SysAllocString(NULL); + + hres = IMultiLanguage2_GetCodePageInfo(mlang, cp, GetUserDefaultUILanguage(), &info); + if(FAILED(hres)) { + ERR("GetCodePageInfo failed: %08x\n", hres); + return SysAllocString(NULL); + } + + return SysAllocString(info.wszWebCharset); +} + static void thread_detach(void) { thread_data_t *thread_data; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2f03501..f57dff2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1271,6 +1271,7 @@ static inline void windowref_release(windowref_t *ref) } UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; +BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Initialize dest VARIANT before VariantCopy call.
by Alexandre Julliard Jan. 12, 2016

Jan. 12, 2016

Module: wine Branch: master Commit: f2ceadc6e6e6b7906400b6df84ac385d263cf394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ceadc6e6e6b7906400b6df8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 12 15:43:53 2016 +0100 mshtml: Initialize dest VARIANT before VariantCopy call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ad016b9..df2d9a4 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1468,8 +1468,10 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var HRESULT hres; hres = dispex_get_dprop_ref(&event_target->dispex, event_info[eid].attr_name, FALSE, &v); - if(SUCCEEDED(hres) && V_VT(v) != VT_EMPTY) + if(SUCCEEDED(hres) && V_VT(v) != VT_EMPTY) { + V_VT(var) = VT_EMPTY; return VariantCopy(var, v); + } data = get_event_target_data(event_target, FALSE); if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) {

1 0