January 2016 - Wine-Commits

Andrew Eikum : x3daudio1_2: Use shared source.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: 07fb596afc2f41cea28677dc864389c3f54df3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fb596afc2f41cea28677dc8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:35 2016 -0600 x3daudio1_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/x3daudio1_2/Makefile.in | 4 +++- dlls/x3daudio1_2/main.c | 37 ------------------------------------- dlls/x3daudio1_2/x3daudio1_2.spec | 4 ++-- 5 files changed, 7 insertions(+), 40 deletions(-) diff --git a/configure b/configure index 462543f..f259186 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_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} enable_x3daudio1_5=${enable_x3daudio1_5:-no} diff --git a/configure.ac b/configure.ac index 5e0f131..326c0ca 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_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} enable_x3daudio1_5=${enable_x3daudio1_5:-no} diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in index 6632115..d5de11b 100644 --- a/dlls/x3daudio1_2/Makefile.in +++ b/dlls/x3daudio1_2/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=2 -DXAUDIO2_VER=2 MODULE = x3daudio1_2.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_2/main.c b/dlls/x3daudio1_2/main.c deleted file mode 100644 index d71c54a..0000000 --- a/dlls/x3daudio1_2/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2015 Alex Henrie - * - * 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" - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID 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/x3daudio1_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_2/x3daudio1_2.spec +++ b/dlls/x3daudio1_2/x3daudio1_2.spec @@ -1,2 +1,2 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate -@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

1 0

Andrew Eikum : x3daudio1_1: Use shared source.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: c3562ee7ea1933235b8b3b663cb869427ae0c142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3562ee7ea1933235b8b3b663… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:38 2016 -0600 x3daudio1_1: 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/x3daudio1_1/Makefile.in | 4 +++- dlls/x3daudio1_1/main.c | 36 ------------------------------------ dlls/x3daudio1_1/x3daudio1_1.spec | 4 ++-- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/configure b/configure index f259186..134fc6d 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_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} diff --git a/configure.ac b/configure.ac index 326c0ca..baa9dd8 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_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} enable_x3daudio1_4=${enable_x3daudio1_4:-no} diff --git a/dlls/x3daudio1_1/Makefile.in b/dlls/x3daudio1_1/Makefile.in index 3d90eaa..d866dc3 100644 --- a/dlls/x3daudio1_1/Makefile.in +++ b/dlls/x3daudio1_1/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=1 -DXAUDIO2_VER=1 MODULE = x3daudio1_1.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_1/main.c b/dlls/x3daudio1_1/main.c deleted file mode 100644 index 9fc9bd2..0000000 --- a/dlls/x3daudio1_1/main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2015 Austin English - * - * 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" - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID 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/x3daudio1_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_1/x3daudio1_1.spec +++ b/dlls/x3daudio1_1/x3daudio1_1.spec @@ -1,2 +1,2 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate -@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

1 0

Andrew Eikum : x3daudio1_0: Use shared source.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: 5ada3cea45356c964ba19017d9fb5f4f9538b63a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ada3cea45356c964ba19017d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:41 2016 -0600 x3daudio1_0: 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/x3daudio1_0/Makefile.in | 4 +++- dlls/x3daudio1_0/main.c | 36 ------------------------------------ dlls/x3daudio1_0/x3daudio1_0.spec | 4 ++-- 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/configure b/configure index 134fc6d..e279b96 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_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} diff --git a/configure.ac b/configure.ac index baa9dd8..6eac752 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_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} enable_x3daudio1_3=${enable_x3daudio1_3:-no} diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in index 16d2868..9b4ce21 100644 --- a/dlls/x3daudio1_0/Makefile.in +++ b/dlls/x3daudio1_0/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=0 -DXAUDIO2_VER=0 MODULE = x3daudio1_0.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_0/main.c b/dlls/x3daudio1_0/main.c deleted file mode 100644 index 52a5e3d..0000000 --- a/dlls/x3daudio1_0/main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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 - */ -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID 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/x3daudio1_0/x3daudio1_0.spec b/dlls/x3daudio1_0/x3daudio1_0.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_0/x3daudio1_0.spec +++ b/dlls/x3daudio1_0/x3daudio1_0.spec @@ -1,2 +1,2 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate -@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

1 0

Nikolay Sivov : dwrite: Implement support for underlines.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: c5fce83f3db14858f38cc9cf460ceade450d6b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5fce83f3db14858f38cc9cf4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 15 00:24:23 2016 +0300 dwrite: Implement support for underlines. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 192 ++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 33 +++++++- 2 files changed, 203 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5fce83f3db14858f38cc…

1 0

Akihiro Sagawa : gdi32: Add a helper function to calculate the glyph advance metric.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: f0831ecd2fe3328e4c0b0a2acdad4254cd6dba04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0831ecd2fe3328e4c0b0a2ac… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 13 23:09:06 2016 +0900 gdi32: Add a helper function to calculate the glyph advance metric. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 114 ++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f7cd0ee..8550020 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6444,6 +6444,57 @@ static BOOL check_unicode_tategaki(WCHAR uchar) return (orientation == 1 || orientation == 3); } +static FT_Vector get_advance_metric(GdiFont *incoming_font, GdiFont *font, + const FT_Glyph_Metrics *metrics, + const FT_Matrix *transMat, BOOL vertical_metrics) +{ + FT_Vector adv; + FT_Fixed base_advance, em_scale = 0; + BOOL fixed_pitch_full = FALSE; + + if (vertical_metrics) + base_advance = metrics->vertAdvance; + else + base_advance = metrics->horiAdvance; + + adv.x = base_advance; + adv.y = 0; + + /* In fixed-pitch font, we adjust the fullwidth character advance so that + they have double halfwidth character width. E.g. if the font is 19 ppem, + we return 20 (not 19) for fullwidth characters as we return 10 for + halfwidth characters. */ + if(FT_IS_SCALABLE(incoming_font->ft_face) && + (incoming_font->potm || get_outline_text_metrics(incoming_font)) && + !font->fake_bold && + !(incoming_font->potm->otmTextMetrics.tmPitchAndFamily & TMPF_FIXED_PITCH)) { + UINT avg_advance; + em_scale = MulDiv(incoming_font->ppem, 1 << 16, + incoming_font->ft_face->units_per_EM); + avg_advance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); + fixed_pitch_full = (avg_advance > 0 && + (base_advance + 63) >> 6 == + pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)); + if (fixed_pitch_full && !transMat) + adv.x = (avg_advance * 2) << 6; + } + + if (transMat) { + pFT_Vector_Transform(&adv, transMat); + if (fixed_pitch_full && adv.y == 0) { + FT_Vector vec; + vec.x = incoming_font->ntmAvgWidth; + vec.y = 0; + pFT_Vector_Transform(&vec, transMat); + adv.x = (pFT_MulFix(vec.x, em_scale) * 2) << 6; + } + } + + adv.x = (adv.x + 63) & -64; + adv.y = -((adv.y + 63) & -64); + return adv; +} + static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int buflen, char *buf) { TTPOLYGONHEADER *pph; @@ -6656,7 +6707,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; FT_Error err; - INT left, right, top = 0, bottom = 0, adv; + INT left, right, top = 0, bottom = 0; + FT_Vector adv; INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; @@ -6668,8 +6720,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL tategaki = (font->name[0] == '@'); BOOL vertical_metrics; UINT original_index; - LONG avgAdvance = 0; - FT_Fixed em_scale; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -6868,32 +6918,13 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } - em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); - - if(FT_IS_SCALABLE(incoming_font->ft_face) && !font->fake_bold) { - TEXTMETRICW tm; - if (get_text_metrics(incoming_font, &tm) && - !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); - if (avgAdvance && - (metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) - TRACE("Fixed-pitch full-width character detected\n"); - else - avgAdvance = 0; /* cancel this feature */ - } - } - if(!needsTransform) { left = (INT)(metrics.horiBearingX) & -64; right = (INT)((metrics.horiBearingX + metrics.width) + 63) & -64; - if (!avgAdvance) - adv = (INT)(metrics.horiAdvance + 63) >> 6; - else - adv = (INT)avgAdvance * 2; - top = (metrics.horiBearingY + 63) & -64; bottom = (metrics.horiBearingY - metrics.height) & -64; - gm.gmCellIncX = adv; + adv = get_advance_metric(incoming_font, font, &metrics, NULL, vertical_metrics); + gm.gmCellIncX = adv.x >> 6; gm.gmCellIncY = 0; origin_x = left; origin_y = top; @@ -6949,36 +6980,11 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - if (vertical_metrics) - vec.x = metrics.vertAdvance; - else - vec.x = metrics.horiAdvance; - vec.y = 0; - pFT_Vector_Transform(&vec, &transMat); - gm.gmCellIncY = -((vec.y+63) >> 6); - if (!avgAdvance || vec.y) - gm.gmCellIncX = (vec.x+63) >> 6; - else { - vec.x = incoming_font->ntmAvgWidth; - vec.y = 0; - pFT_Vector_Transform(&vec, &transMat); - gm.gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; - } + adv = get_advance_metric(incoming_font, font, &metrics, &transMat, vertical_metrics); + gm.gmCellIncX = adv.x >> 6; + gm.gmCellIncY = adv.y >> 6; - if (vertical_metrics) - vec.x = metrics.vertAdvance; - else - vec.x = metrics.horiAdvance; - vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); - if (!avgAdvance || vec.y) - adv = (vec.x+63) >> 6; - else { - vec.x = incoming_font->ntmAvgWidth; - vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); - adv = pFT_MulFix(vec.x, em_scale) * 2; - } + adv = get_advance_metric(incoming_font, font, &metrics, &transMatUnrotated, vertical_metrics); vec.x = lsb; vec.y = 0; @@ -7001,7 +7007,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmptGlyphOrigin.x = origin_x >> 6; gm.gmptGlyphOrigin.y = origin_y >> 6; if (!abc->abcB) abc->abcB = 1; - abc->abcC = adv - abc->abcA - abc->abcB; + abc->abcC = (adv.x >> 6) - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", gm.gmBlackBoxX, gm.gmBlackBoxY, wine_dbgstr_point(&gm.gmptGlyphOrigin),

1 0

Alexandre Julliard : xaudio2: Remove unnecessary kernel32 imports.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: 668e9754469c8e824fc9dcb7a16533ceb4c87ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=668e9754469c8e824fc9dcb7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 15:10:25 2016 +0900 xaudio2: Remove unnecessary kernel32 imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_0/Makefile.in | 2 +- dlls/xaudio2_1/Makefile.in | 2 +- dlls/xaudio2_2/Makefile.in | 2 +- dlls/xaudio2_3/Makefile.in | 2 +- dlls/xaudio2_4/Makefile.in | 2 +- dlls/xaudio2_5/Makefile.in | 2 +- dlls/xaudio2_6/Makefile.in | 2 +- dlls/xaudio2_7/Makefile.in | 2 +- dlls/xaudio2_8/Makefile.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_0/Makefile.in b/dlls/xaudio2_0/Makefile.in index c0e31e3..cf15c7b 100644 --- a/dlls/xaudio2_0/Makefile.in +++ b/dlls/xaudio2_0/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=0 MODULE = xaudio2_0.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_1/Makefile.in b/dlls/xaudio2_1/Makefile.in index 7aab503..32a5a62 100644 --- a/dlls/xaudio2_1/Makefile.in +++ b/dlls/xaudio2_1/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=1 MODULE = xaudio2_1.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_2/Makefile.in b/dlls/xaudio2_2/Makefile.in index 77f21bd..f20de2d 100644 --- a/dlls/xaudio2_2/Makefile.in +++ b/dlls/xaudio2_2/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=2 MODULE = xaudio2_2.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_3/Makefile.in b/dlls/xaudio2_3/Makefile.in index ed6f3e1..ca749f2 100644 --- a/dlls/xaudio2_3/Makefile.in +++ b/dlls/xaudio2_3/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=3 MODULE = xaudio2_3.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_4/Makefile.in b/dlls/xaudio2_4/Makefile.in index a909a41..0b74f68 100644 --- a/dlls/xaudio2_4/Makefile.in +++ b/dlls/xaudio2_4/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=4 MODULE = xaudio2_4.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_5/Makefile.in b/dlls/xaudio2_5/Makefile.in index ad6955c..09356c9 100644 --- a/dlls/xaudio2_5/Makefile.in +++ b/dlls/xaudio2_5/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=5 MODULE = xaudio2_5.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_6/Makefile.in b/dlls/xaudio2_6/Makefile.in index b1e7584..e0ef588 100644 --- a/dlls/xaudio2_6/Makefile.in +++ b/dlls/xaudio2_6/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=6 MODULE = xaudio2_6.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7 diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in index 8baddfd..2f2e232 100644 --- a/dlls/xaudio2_7/Makefile.in +++ b/dlls/xaudio2_7/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=7 MODULE = xaudio2_7.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) C_SRCS = \ diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in index cf16eb7..d4efc41 100644 --- a/dlls/xaudio2_8/Makefile.in +++ b/dlls/xaudio2_8/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DXAUDIO2_VER=8 MODULE = xaudio2_8.dll -IMPORTS = advapi32 kernel32 ole32 user32 uuid +IMPORTS = advapi32 ole32 user32 uuid EXTRALIBS = $(OPENAL_LIBS) PARENTSRC = ../xaudio2_7

1 0

Nikolay Sivov : ole2disp: Implement SafeArrayAccessData()/ SafeArrayUnaccessData().
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: cfbac8d2ed4b79b42952e9cc99f656cfe967088a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbac8d2ed4b79b42952e9cc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 23:34:17 2016 +0300 ole2disp: Implement SafeArrayAccessData()/SafeArrayUnaccessData(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2disp.dll16/ole2disp.c | 43 +++++++++++++++++++++++++++++---- dlls/ole2disp.dll16/ole2disp.dll16.spec | 4 +-- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index af6f03c..d61b5e8 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -89,6 +89,15 @@ static ULONG safearray_getcellcount(const SAFEARRAY16 *sa) return cells; } +static HRESULT safearray_lock(SAFEARRAY16 *sa) +{ + if (sa->cLocks == 0xffff) + return E_UNEXPECTED; + + sa->cLocks++; + return S_OK; +} + /****************************************************************************** * SafeArrayGetDim [OLE2DISP.17] */ @@ -117,11 +126,7 @@ HRESULT WINAPI SafeArrayLock16(SAFEARRAY16 *sa) if (!sa) return E_INVALIDARG16; - if (sa->cLocks == 0xffff) - return E_UNEXPECTED; - - sa->cLocks++; - return S_OK; + return safearray_lock(sa); } /****************************************************************************** @@ -142,6 +147,34 @@ HRESULT WINAPI SafeArrayUnlock16(SAFEARRAY16 *sa) } /****************************************************************************** + * SafeArrayAccessData [OLE2DISP.23] + */ +HRESULT WINAPI SafeArrayAccessData16(SAFEARRAY16 *sa, SEGPTR *data) +{ + HRESULT hr; + + TRACE("(%p, %p)\n", sa, data); + + /* arguments are not tested, it crashes if any of them is NULL */ + + hr = safearray_lock(sa); + if (FAILED(hr)) + return hr; + + *data = sa->pvData; + return S_OK; +} + +/****************************************************************************** + * SafeArrayUnaccessData [OLE2DISP.24] + */ +HRESULT WINAPI SafeArrayUnaccessData16(SAFEARRAY16 *sa) +{ + TRACE("(%p)\n", sa); + return SafeArrayUnlock16(sa); +} + +/****************************************************************************** * SafeArrayAllocDescriptor [OLE2DISP.38] */ HRESULT WINAPI SafeArrayAllocDescriptor16(UINT16 dims, SEGPTR *ret) diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index b0db920..4ee52e1 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -20,8 +20,8 @@ 20 stub SAFEARRAYGETLBOUND 21 pascal SafeArrayLock(ptr) SafeArrayLock16 22 pascal SafeArrayUnlock(ptr) SafeArrayUnlock16 -23 stub SAFEARRAYACCESSDATA -24 stub SAFEARRAYUNACCESSDATA +23 pascal SafeArrayAccessData(ptr ptr) SafeArrayAccessData16 +24 pascal SafeArrayUnaccessData(ptr) SafeArrayUnaccessData16 25 stub SAFEARRAYGETELEMENT 26 stub SAFEARRAYPUTELEMENT 27 stub SAFEARRAYCOPY

1 0

Andrew Eikum : winegstreamer: Add TRACEs and improve formatting.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: 99894cf37cf9616800c33c47a102f58338f448a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99894cf37cf9616800c33c47a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 13:22:11 2016 -0600 winegstreamer: Add TRACEs and improve formatting. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 269 ++++++++++++++++++++++++++++----------- dlls/winegstreamer/gsttffilter.c | 130 +++++++++++++++---- dlls/winegstreamer/main.c | 6 +- 3 files changed, 305 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99894cf37cf9616800c33…

1 0

Andrew Eikum : winegstreamer: Update to use gstreamer-1.0.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: e8311270ab7e01b8c58ec615f039335bd166882a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8311270ab7e01b8c58ec615f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 13:23:04 2016 -0600 winegstreamer: Update to use gstreamer-1.0. Based on initial work by Rafał Mużyło. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 93 +++---- configure.ac | 17 +- dlls/winegstreamer/gst_cbs.c | 93 +++---- dlls/winegstreamer/gst_cbs.h | 67 +++--- dlls/winegstreamer/gst_private.h | 4 +- dlls/winegstreamer/gstdemux.c | 507 ++++++++++++++++++++------------------- dlls/winegstreamer/gsttffilter.c | 201 ++++++++-------- dlls/winegstreamer/main.c | 4 +- 8 files changed, 464 insertions(+), 522 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8311270ab7e01b8c58ec…

1 0

Andrew Eikum : x3daudio1_6: Use shared source.
by Alexandre Julliard Jan. 15, 2016

Jan. 15, 2016

Module: wine Branch: master Commit: 76af4bdd7b9d39f51d5de8a085d1d91779dbb672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76af4bdd7b9d39f51d5de8a08… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 14 11:38:23 2016 -0600 x3daudio1_6: 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/x3daudio1_6/Makefile.in | 4 +++- dlls/x3daudio1_6/main.c | 42 --------------------------------------- dlls/x3daudio1_6/x3daudio1_6.spec | 4 ++-- 5 files changed, 7 insertions(+), 45 deletions(-) diff --git a/configure b/configure index 031ed41..e87d306 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_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} diff --git a/configure.ac b/configure.ac index 9f2c24e..8ef64f5 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_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_2=${enable_xapofx1_2:-no} diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in index ad59b8f..177fb8d 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,4 +1,6 @@ +EXTRADEFS = -DX3DAUDIO1_VER=6 -DXAUDIO2_VER=6 MODULE = x3daudio1_6.dll +PARENTSRC = ../xaudio2_7 C_SRCS = \ - main.c + x3daudio.c diff --git a/dlls/x3daudio1_6/main.c b/dlls/x3daudio1_6/main.c deleted file mode 100644 index d39863c..0000000 --- a/dlls/x3daudio1_6/main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2015 Austin English - * - * 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 "x3daudio.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -} diff --git a/dlls/x3daudio1_6/x3daudio1_6.spec b/dlls/x3daudio1_6/x3daudio1_6.spec index 30da23c..0d6caa0 100644 --- a/dlls/x3daudio1_6/x3daudio1_6.spec +++ b/dlls/x3daudio1_6/x3daudio1_6.spec @@ -1,2 +1,2 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate -@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) +@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize

1 0