wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Jared Smudde : winemine: Load main icon in the about window.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 3966affe064c7b98a7b4c052b6a6696fe74c8830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3966affe064c7b98a7b4c052b… Author: Jared Smudde <computerwhiz02(a)hotmail.com> Date: Thu Sep 24 21:13:46 2015 -0500 winemine: Load main icon in the about window. --- programs/winemine/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 91b2092..7ccae07 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -1003,7 +1003,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara LoadStringW( board.hInst, IDS_APPNAME, appname, sizeof(appname)/sizeof(WCHAR) ); LoadStringW( board.hInst, IDS_ABOUT, other, sizeof(other)/sizeof(WCHAR) ); ShellAboutW( hWnd, appname, other, - LoadImageA( board.hInst, "WINEMINE", IMAGE_ICON, 48, 48, LR_SHARED )); + LoadImageW(board.hInst, MAKEINTRESOURCEW(IDI_WINEMINE), IMAGE_ICON, 48, 48, LR_SHARED)); return 0; } default:

1 0

Huw Davies : fonts: Fix the version in the name table to match the Version : line.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: c51aee637b7f15853218f719426ba6ff0d275a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51aee637b7f15853218f7194… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 25 16:05:10 2015 +0100 fonts: Fix the version in the name table to match the Version: line. The (not so) recently updated fontforge parses the name table for this in preference to the Version: line. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- fonts/symbol.sfd | 2 +- fonts/symbol.ttf | Bin 26040 -> 26028 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index f77a64b..f5b8bee 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -71,7 +71,7 @@ ShortTable: maxp 16 0 0 EndShort -LangName: 1033 "" "" "Regular" "WineSymbol:Version 0.001" "" "Version 0.001 February 3, 2009, initial release" "" "" "Wine" "Jon Parshall for CodeWeavers" "" "http://www.winehq.org" "http://www.codeweavers.com" "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.+AAoACgAA-This program 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.+AAoACgAA-A copy of the GNU Lesser General Public License is included in the Wine distribution in the file COPYING.LIB. If you did not receive this copy, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." "http://www.gnu.org/licenses/lgpl.html" +LangName: 1033 "" "" "Regular" "WineSymbol:Version 1.1" "" "Version 1.1 February 3, 2009, initial release" "" "" "Wine" "Jon Parshall for CodeWeavers" "" "http://www.winehq.org" "http://www.codeweavers.com" "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.+AAoACgAA-This program 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.+AAoACgAA-A copy of the GNU Lesser General Public License is included in the Wine distribution in the file COPYING.LIB. If you did not receive this copy, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." "http://www.gnu.org/licenses/lgpl.html" GaspTable: 1 65535 2 0 Encoding: Custom UnicodeInterp: none diff --git a/fonts/symbol.ttf b/fonts/symbol.ttf index 0f3313b..1fd5b4e 100644 Binary files a/fonts/symbol.ttf and b/fonts/symbol.ttf differ

1 0

Sebastian Lackner : xaudio2_7/tests: Remove duplicate call to test_DeviceDetails.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 9bb215979c8c23dc2956fbb13d082008f6dd8c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb215979c8c23dc2956fbb13… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 24 22:01:51 2015 +0200 xaudio2_7/tests: Remove duplicate call to test_DeviceDetails. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/xaudio2_7/tests/xaudio2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index e8f4fbc..2cea7af 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -775,7 +775,6 @@ START_TEST(xaudio2) has_devices = test_DeviceDetails(xa27); if(has_devices){ - test_DeviceDetails(xa27); test_simple_streaming((IXAudio2*)xa27); test_buffer_callbacks((IXAudio2*)xa27); test_looping((IXAudio2*)xa27);

1 0

Andrew Eikum : xaudio2: Implement IXAudio2SourceVoice frequency functions.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: eae93c1f412c9c55ac6319938fdf15444b8e7a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae93c1f412c9c55ac6319938… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 25 12:39:40 2015 -0500 xaudio2: Implement IXAudio2SourceVoice frequency functions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/tests/xaudio2.c | 8 ++++++++ dlls/xaudio2_7/xaudio_dll.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index aabb70e..e8f4fbc 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -467,6 +467,14 @@ static void test_buffer_callbacks(IXAudio2 *xa) XA2CALL_0(StartEngine); ok(hr == S_OK, "StartEngine failed: %08x\n", hr); + if(xaudio27){ + hr = IXAudio27SourceVoice_SetSourceSampleRate((IXAudio27SourceVoice*)src, 48000); + todo_wine ok(hr == S_OK, "SetSourceSampleRate failed: %08x\n", hr); + }else{ + hr = IXAudio2SourceVoice_SetSourceSampleRate(src, 48000); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetSourceSampleRate should have failed: %08x\n", hr); + } + while(1){ if(xaudio27) IXAudio27SourceVoice_GetState((IXAudio27SourceVoice*)src, &state); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 5c67ffb..8b41cbb 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -797,14 +797,32 @@ static HRESULT WINAPI XA2SRC_SetFrequencyRatio(IXAudio2SourceVoice *iface, float Ratio, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat r; + TRACE("%p, %f, 0x%x\n", This, Ratio, OperationSet); + + if(Ratio < XAUDIO2_MIN_FREQ_RATIO) + r = XAUDIO2_MIN_FREQ_RATIO; + else if (Ratio > XAUDIO2_MAX_FREQ_RATIO) + r = XAUDIO2_MAX_FREQ_RATIO; + else + r = Ratio; + + alSourcef(This->al_src, AL_PITCH, r); + return S_OK; } static void WINAPI XA2SRC_GetFrequencyRatio(IXAudio2SourceVoice *iface, float *pRatio) { + ALfloat ratio; XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, %p\n", This, pRatio); + + alGetSourcef(This->al_src, AL_PITCH, &ratio); + + *pRatio = ratio; } static HRESULT WINAPI XA2SRC_SetSourceSampleRate( @@ -812,7 +830,20 @@ static HRESULT WINAPI XA2SRC_SetSourceSampleRate( UINT32 NewSourceSampleRate) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + TRACE("%p, %u\n", This, NewSourceSampleRate); + + EnterCriticalSection(&This->lock); + + if(This->nbufs){ + LeaveCriticalSection(&This->lock); + return XAUDIO2_E_INVALID_CALL; + } + + This->fmt->nSamplesPerSec = NewSourceSampleRate; + + LeaveCriticalSection(&This->lock); + return S_OK; }

1 0

Andrew Eikum : xaudio2: Don't report mid-buffer positions.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 80be4dad87c38d706979b7f457762458171af12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80be4dad87c38d706979b7f45… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 24 14:34:14 2015 -0500 xaudio2: Don't report mid-buffer positions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 4f8c76b..5c67ffb 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -776,13 +776,9 @@ static void WINAPI XA2SRC_GetState(IXAudio2SourceVoice *iface, EnterCriticalSection(&This->lock); - if(!(Flags & XAUDIO2_VOICE_NOSAMPLESPLAYED)){ - ALint bufpos = 0; - - alGetSourcei(This->al_src, AL_SAMPLE_OFFSET, &bufpos); - - pVoiceState->SamplesPlayed = This->played_frames + bufpos; - }else + if(!(Flags & XAUDIO2_VOICE_NOSAMPLESPLAYED)) + pVoiceState->SamplesPlayed = This->played_frames; + else pVoiceState->SamplesPlayed = 0; if(This->nbufs)

1 0

Andrew Eikum : xaudio2: Fix mmdevapi buffer size calculation.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 2decbcc05f62dd58cfe978a7f1edc187b74f72dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2decbcc05f62dd58cfe978a7f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 24 14:33:05 2015 -0500 xaudio2: Fix mmdevapi buffer size calculation. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ccbcd21..4f8c76b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1798,7 +1798,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, HRESULT hr; WAVEFORMATEX *fmt; ALCint attrs[7]; - REFERENCE_TIME period; + REFERENCE_TIME period, bufdur; TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This, ppMasteringVoice, inputChannels, inputSampleRate, flags, @@ -1885,18 +1885,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, CoTaskMemFree(fmt); - hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_EVENTCALLBACK, inputSampleRate /* 1s buffer */, - 0, &This->fmt.Format, NULL); + hr = IAudioClient_GetDevicePeriod(This->aclient, &period, NULL); if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); + WARN("GetDevicePeriod failed: %08x\n", hr); hr = XAUDIO2_E_DEVICE_INVALIDATED; goto exit; } - hr = IAudioClient_GetDevicePeriod(This->aclient, &period, NULL); + /* 3 periods or 0.1 seconds */ + bufdur = max(3 * period, 1000000); + + hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, bufdur, + 0, &This->fmt.Format, NULL); if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); + WARN("Initialize failed: %08x\n", hr); hr = XAUDIO2_E_DEVICE_INVALIDATED; goto exit; }

1 0

Piotr Caban : msvcrt: Only create locale categories that have changed in setlocale function.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: f9bae3e5a27c56a02378cd1348dbb1cea57b5dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9bae3e5a27c56a02378cd134… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 24 16:16:16 2015 +0200 msvcrt: Only create locale categories that have changed in setlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 434 ++++++++++++++++++++++++++++----------------------- 1 file changed, 236 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9bae3e5a27c56a02378c…

1 0

Piotr Caban : msvcrt: Use create_locinfo helper in setlocale implementation.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: f075043273ab1dcb30c5d030d445fa15dabb4187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f075043273ab1dcb30c5d030d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 24 16:16:02 2015 +0200 msvcrt: Use create_locinfo helper in setlocale implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 120 +++++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f075043273ab1dcb30c5d…

1 0

Piotr Caban : msvcrt: Add create_locinfo helper function.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: ca8ef840ad55f3ceff99b50653efb5015f2e9dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8ef840ad55f3ceff99b5065… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 24 16:15:54 2015 +0200 msvcrt: Add create_locinfo helper function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 527 ++++++++++++++++++++++++++------------------------- 1 file changed, 271 insertions(+), 256 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca8ef840ad55f3ceff99b…

1 0

Piotr Caban : msvcrt: Pass pthreadlocinfo to set_lc_locale_name function.
by Alexandre Julliard 25 Sep '15

25 Sep '15

Module: wine Branch: master Commit: 905daf251a6d383a894ff34113f80c603d041e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905daf251a6d383a894ff3411… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 24 16:15:50 2015 +0200 msvcrt: Pass pthreadlocinfo to set_lc_locale_name function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b5fca6e..6320d3a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -830,9 +830,9 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) } #if _MSVCR_VER >= 110 -static inline BOOL set_lc_locale_name(MSVCRT__locale_t loc, int cat) +static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) { - LCID lcid = loc->locinfo->lc_handle[cat]; + LCID lcid = locinfo->lc_handle[cat]; WCHAR buf[100]; int len; @@ -843,14 +843,14 @@ static inline BOOL set_lc_locale_name(MSVCRT__locale_t loc, int cat) if(LocaleNameToLCID(buf, 0) != lcid) len = LCIDToLocaleName(lcid, buf, 100, 0); - if(!len || !(loc->locinfo->lc_name[cat] = MSVCRT_malloc(len*sizeof(MSVCRT_wchar_t)))) + if(!len || !(locinfo->lc_name[cat] = MSVCRT_malloc(len*sizeof(MSVCRT_wchar_t)))) return FALSE; - memcpy(loc->locinfo->lc_name[cat], buf, len*sizeof(MSVCRT_wchar_t)); + memcpy(locinfo->lc_name[cat], buf, len*sizeof(MSVCRT_wchar_t)); return TRUE; } #else -static inline BOOL set_lc_locale_name(MSVCRT__locale_t loc, int cat) +static inline BOOL set_lc_locale_name(MSVCRT_pthreadlocinfo locinfo, int cat) { return TRUE; } @@ -1013,7 +1013,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) loc->locinfo->lc_collate_cp = loc->locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage; - if(!set_lc_locale_name(loc, MSVCRT_LC_COLLATE)) { + if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_COLLATE)) { MSVCRT__free_locale(loc); return NULL; } @@ -1063,7 +1063,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) for(j=cp_info.LeadByte[i]; j<=cp_info.LeadByte[i+1]; j++) loc->locinfo->ctype1[j+1] |= MSVCRT__LEADBYTE; - if(!set_lc_locale_name(loc, MSVCRT_LC_CTYPE)) { + if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_CTYPE)) { MSVCRT__free_locale(loc); return NULL; } @@ -1301,7 +1301,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } #endif - if(!set_lc_locale_name(loc, MSVCRT_LC_MONETARY)) { + if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_MONETARY)) { MSVCRT__free_locale(loc); return NULL; } @@ -1434,7 +1434,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } #endif - if(!set_lc_locale_name(loc, MSVCRT_LC_NUMERIC)) { + if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_NUMERIC)) { MSVCRT__free_locale(loc); return NULL; } @@ -1476,7 +1476,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return NULL; } - if(!set_lc_locale_name(loc, MSVCRT_LC_TIME)) { + if(!set_lc_locale_name(loc->locinfo, MSVCRT_LC_TIME)) { MSVCRT__free_locale(loc); return NULL; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2015