December 2011 - Wine-Commits

Alexandre Julliard : appwiz.cpl: Make the Gecko URL a proper link.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 8a3d0dc5341bac01829ecf306c724018797da3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3d0dc5341bac01829ecf306… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 20:07:10 2011 +0100 po: Update German translation. --- po/de.po | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/po/de.po b/po/de.po index ac7f043..0c1bf12 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-29 18:54+0100\n" +"PO-Revision-Date: 2011-12-01 20:05+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2184,38 +2184,32 @@ msgid "Default MidiOut Device" msgstr "Standard MidiOut - Gerät" #: dinput.rc:40 -#, fuzzy msgid "Configure Devices" -msgstr "Kon&figurieren" +msgstr "Geräte konfigurieren" #: dinput.rc:45 msgid "Reset" -msgstr "" +msgstr "Rücksetzen" #: dinput.rc:48 -#, fuzzy msgid "Player" -msgstr "Abspielen" +msgstr "Player" #: dinput.rc:49 -#, fuzzy msgid "Device" -msgstr "De&vice:" +msgstr "Gerät" #: dinput.rc:50 -#, fuzzy msgid "Actions" -msgstr "Aktion" +msgstr "Aktionen" #: dinput.rc:51 -#, fuzzy msgid "Mapping" msgstr "Zuordnung" #: dinput.rc:53 -#, fuzzy msgid "Sort Assigned" -msgstr "Bereits zugewiesen\n" +msgstr "Zugewiesene sortieren" #: dinput.rc:34 msgid "Action" @@ -6507,9 +6501,8 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "Eigenschaften für %s" +msgstr "Einstellungen für %s" #: serialui.rc:28 msgid "Baud Rate"

1 0

Alexandre Julliard : comctl32: Fix text wrapping in syslink when an item starts in the middle of a line.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 682b03731cb8139f3e1b3e143c1841a03ee19e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682b03731cb8139f3e1b3e143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 1 20:30:16 2011 +0100 comctl32: Fix text wrapping in syslink when an item starts in the middle of a line. --- dlls/comctl32/syslink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 823c7ac..42fb987 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -606,7 +606,7 @@ static PDOC_ITEM SYSLINK_GetPrevLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Cur * SYSLINK_WrapLine * Tries to wrap a line. */ -static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int *LineLen, +static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int x, int *LineLen, int nFit, LPSIZE Extent) { int i; @@ -625,7 +625,7 @@ static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int *LineLen, { Extent->cx = 0; Extent->cy = 0; - i = max( nFit, 1 ); + if (x == SL_LEFTMARGIN) i = max( nFit, 1 ); } } *LineLen = i; @@ -722,7 +722,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) if(n != 0) { - Wrap = SYSLINK_WrapLine(tx, infoPtr->BreakChar, &LineLen, nFit, &szDim); + Wrap = SYSLINK_WrapLine(tx, infoPtr->BreakChar, x, &LineLen, nFit, &szDim); if(LineLen == 0) {

1 0

Alexandre Julliard : appwiz.cpl: Convert dialogs to po files.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: b247174ea7aae3cf4dd77cb73c409ed26ba7dc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b247174ea7aae3cf4dd77cb73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 1 20:17:33 2011 +0100 appwiz.cpl: Convert dialogs to po files. --- dlls/appwiz.cpl/Bg.rc | 35 --------- dlls/appwiz.cpl/Ca.rc | 85 -------------------- dlls/appwiz.cpl/Da.rc | 86 --------------------- dlls/appwiz.cpl/De.rc | 86 --------------------- dlls/appwiz.cpl/En.rc | 82 -------------------- dlls/appwiz.cpl/Es.rc | 85 -------------------- dlls/appwiz.cpl/Fr.rc | 86 --------------------- dlls/appwiz.cpl/He.rc | 86 --------------------- dlls/appwiz.cpl/Hu.rc | 83 -------------------- dlls/appwiz.cpl/It.rc | 83 -------------------- dlls/appwiz.cpl/Ja.rc | 85 -------------------- dlls/appwiz.cpl/Ko.rc | 84 -------------------- dlls/appwiz.cpl/Lt.rc | 83 -------------------- dlls/appwiz.cpl/Makefile.in | 29 +------- dlls/appwiz.cpl/Nl.rc | 83 -------------------- dlls/appwiz.cpl/No.rc | 83 -------------------- dlls/appwiz.cpl/Pl.rc | 81 ------------------- dlls/appwiz.cpl/Pt.rc | 151 ------------------------------------ dlls/appwiz.cpl/Ro.rc | 83 -------------------- dlls/appwiz.cpl/Ru.rc | 84 -------------------- dlls/appwiz.cpl/Si.rc | 83 -------------------- dlls/appwiz.cpl/Sr.rc | 147 ----------------------------------- dlls/appwiz.cpl/Sv.rc | 85 -------------------- dlls/appwiz.cpl/Tr.rc | 35 --------- dlls/appwiz.cpl/Uk.rc | 84 -------------------- dlls/appwiz.cpl/Zh.rc | 140 --------------------------------- dlls/appwiz.cpl/appwiz.rc | 57 ++++++++++++++ po/ar.po | 164 ++++++++++++++++++++++++++++++---------- po/bg.po | 175 ++++++++++++++++++++++++++++++++---------- po/ca.po | 172 ++++++++++++++++++++++++++++++++---------- po/cs.po | 170 +++++++++++++++++++++++++++++++---------- po/da.po | 172 +++++++++++++++++++++++++++++++---------- po/de.po | 173 ++++++++++++++++++++++++++++++++---------- po/el.po | 164 ++++++++++++++++++++++++++++++---------- po/en.po | 160 +++++++++++++++++++++++++++++---------- po/en_US.po | 171 +++++++++++++++++++++++++++++++---------- po/eo.po | 172 +++++++++++++++++++++++++++++++---------- po/es.po | 174 ++++++++++++++++++++++++++++++++---------- po/fa.po | 164 ++++++++++++++++++++++++++++++---------- po/fi.po | 178 +++++++++++++++++++++++++++++++++---------- po/fr.po | 173 ++++++++++++++++++++++++++++++++---------- po/he.po | 169 +++++++++++++++++++++++++++++++---------- po/hi.po | 161 +++++++++++++++++++++++++++++---------- po/hu.po | 175 ++++++++++++++++++++++++++++++++---------- po/it.po | 173 ++++++++++++++++++++++++++++++++---------- po/ja.po | 171 +++++++++++++++++++++++++++++++---------- po/ko.po | 171 +++++++++++++++++++++++++++++++---------- po/lt.po | 171 +++++++++++++++++++++++++++++++---------- po/ml.po | 161 +++++++++++++++++++++++++++++---------- po/nb_NO.po | 171 +++++++++++++++++++++++++++++++---------- po/nl.po | 174 ++++++++++++++++++++++++++++++++---------- po/or.po | 161 +++++++++++++++++++++++++++++---------- po/pa.po | 161 +++++++++++++++++++++++++++++---------- po/pl.po | 173 ++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 173 ++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 173 ++++++++++++++++++++++++++++++++---------- po/rm.po | 168 ++++++++++++++++++++++++++++++---------- po/ro.po | 174 ++++++++++++++++++++++++++++++++---------- po/ru.po | 174 ++++++++++++++++++++++++++++++++---------- po/sk.po | 170 +++++++++++++++++++++++++++++++---------- po/sl.po | 174 ++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 172 +++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 172 +++++++++++++++++++++++++++++++---------- po/sv.po | 172 +++++++++++++++++++++++++++++++---------- po/te.po | 161 +++++++++++++++++++++++++++++---------- po/th.po | 165 ++++++++++++++++++++++++++++++---------- po/tr.po | 175 ++++++++++++++++++++++++++++++++---------- po/uk.po | 170 +++++++++++++++++++++++++++++++---------- po/wa.po | 170 +++++++++++++++++++++++++++++++---------- po/wine.pot | 160 +++++++++++++++++++++++++++++---------- po/zh_CN.po | 165 +++++++++++++++++++++++++++++---------- po/zh_TW.po | 164 +++++++++++++++++++++++++++++---------- 72 files changed, 5853 insertions(+), 4047 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b247174ea7aae3cf4dd77…

1 0

Frédéric Delanoy : msvfw32: Fix a displayed label .
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

1 0

Dmitry Timoshkov : kernel32: Add a bunch of VirtualProtect tests on a memory-mapped file.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: d7e428a40a480c54e015cf503a4cd21faad1b5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e428a40a480c54e015cf503… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 29 13:54:44 2011 +0800 kernel32: Add a bunch of VirtualProtect tests on a memory-mapped file. --- dlls/kernel32/tests/virtual.c | 187 +++++++++++++++++++++++++++++++++------- 1 files changed, 154 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e428a40a480c54e015c…

1 0

Aric Stewart : usp10: Turn off dlig feature for hebrew. It is not used by default.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 5ed8160ec73b081285ebd776e0c835bcca45142b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed8160ec73b081285ebd776e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:08:36 2011 -0600 usp10: Turn off dlig feature for hebrew. It is not used by default. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 66d65c2..3911c1c 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -365,7 +365,7 @@ static const char* required_arabic_features[] = static OPENTYPE_FEATURE_RECORD hebrew_features[] = { - { MS_MAKE_TAG('d','l','i','g'), 1}, + { MS_MAKE_TAG('d','l','i','g'), 0}, }; static OPENTYPE_FEATURE_RECORD syriac_features[] =

1 0

Nikolay Sivov : shlwapi: Partially implement SHRegCreateUSKeyW.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 191bc054a52f06b06337c5d154097f2679a39cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191bc054a52f06b06337c5d15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 20:19:29 2011 +0300 shlwapi: Partially implement SHRegCreateUSKeyW. --- dlls/shlwapi/reg.c | 47 ++++++++++++++++++++++++++++--- dlls/shlwapi/tests/shreg.c | 66 ++++++++++++++++++++++++++++---------------- 2 files changed, 84 insertions(+), 29 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 09fce55..26f83bf 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -235,12 +235,49 @@ LONG WINAPI SHRegCreateUSKeyA(LPCSTR pszPath, REGSAM samDesired, HUSKEY hRelativ * * See SHRegCreateUSKeyA. */ -LONG WINAPI SHRegCreateUSKeyW(LPCWSTR pszPath, REGSAM samDesired, HUSKEY hRelativeUSKey, - PHUSKEY phNewUSKey, DWORD dwFlags) +LONG WINAPI SHRegCreateUSKeyW(LPCWSTR path, REGSAM samDesired, HUSKEY relative_key, + PHUSKEY new_uskey, DWORD flags) { - FIXME("(%s, 0x%08x, %p, %p, 0x%08x) stub\n", debugstr_w(pszPath), samDesired, - hRelativeUSKey, phNewUSKey, dwFlags); - return ERROR_SUCCESS; + LONG ret = ERROR_CALL_NOT_IMPLEMENTED; + SHUSKEY *ret_key; + + TRACE("(%s, 0x%08x, %p, %p, 0x%08x)\n", debugstr_w(path), samDesired, + relative_key, new_uskey, flags); + + if (!new_uskey) return ERROR_INVALID_PARAMETER; + + *new_uskey = NULL; + + if (flags & ~SHREGSET_FORCE_HKCU) + { + FIXME("unsupported flags 0x%08x\n", flags); + return ERROR_SUCCESS; + } + + ret_key = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret_key)); + lstrcpynW(ret_key->lpszPath, path, sizeof(ret_key->lpszPath)/sizeof(WCHAR)); + + if (relative_key) + { + ret_key->HKCUstart = SHRegDuplicateHKey(REG_GetHKEYFromHUSKEY(relative_key, REG_HKCU)); + ret_key->HKLMstart = SHRegDuplicateHKey(REG_GetHKEYFromHUSKEY(relative_key, REG_HKLM)); + } + else + { + ret_key->HKCUstart = HKEY_CURRENT_USER; + ret_key->HKLMstart = HKEY_LOCAL_MACHINE; + } + + if (flags & SHREGSET_FORCE_HKCU) + { + ret = RegCreateKeyExW(ret_key->HKCUstart, path, 0, NULL, 0, samDesired, NULL, &ret_key->HKCUkey, NULL); + if (ret == ERROR_SUCCESS) + *new_uskey = ret_key; + else + HeapFree(GetProcessHeap(), 0, ret_key); + } + + return ret; } /************************************************************************* diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 3cee765..3634041 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -33,12 +33,11 @@ #define REG_CURRENT_VERSION "Software\\Microsoft\\Windows\\CurrentVersion\\explorer" static HMODULE hshlwapi; -typedef DWORD (WINAPI *SHCopyKeyA_func)(HKEY,LPCSTR,HKEY,DWORD); -static SHCopyKeyA_func pSHCopyKeyA; -typedef DWORD (WINAPI *SHRegGetPathA_func)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); -static SHRegGetPathA_func pSHRegGetPathA; -typedef LSTATUS (WINAPI *SHRegGetValueA_func)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); -static SHRegGetValueA_func pSHRegGetValueA; + +static DWORD (WINAPI *pSHCopyKeyA)(HKEY,LPCSTR,HKEY,DWORD); +static DWORD (WINAPI *pSHRegGetPathA)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); +static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); +static LSTATUS (WINAPI *pSHRegCreateUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD); static char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; static char sTestpath2[] = "%FOO%\\subdir1"; @@ -444,28 +443,47 @@ static void test_SHDeleteKey(void) ok( 0, "Could not set up SHDeleteKey test\n"); } +static void test_SHRegCreateUSKeyW(void) +{ + static const WCHAR subkeyW[] = {'s','u','b','k','e','y',0}; + LONG ret; + + if (!pSHRegCreateUSKeyW) + { + win_skip("SHRegCreateUSKeyW not available\n"); + return; + } + + ret = pSHRegCreateUSKeyW(subkeyW, KEY_ALL_ACCESS, NULL, NULL, SHREGSET_FORCE_HKCU); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); +} + START_TEST(shreg) { - HKEY hkey = create_test_entries(); + HKEY hkey = create_test_entries(); - if (!hkey) return; + if (!hkey) return; - hshlwapi = GetModuleHandleA("shlwapi.dll"); + hshlwapi = GetModuleHandleA("shlwapi.dll"); - /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ - if(!GetProcAddress(hshlwapi, "SHCreateStreamOnFileEx")){ - win_skip("Too old shlwapi version\n"); - return; - } + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(hshlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return; + } + + pSHCopyKeyA = (void*)GetProcAddress(hshlwapi,"SHCopyKeyA"); + pSHRegGetPathA = (void*)GetProcAddress(hshlwapi,"SHRegGetPathA"); + pSHRegGetValueA = (void*)GetProcAddress(hshlwapi,"SHRegGetValueA"); + pSHRegCreateUSKeyW = (void*)GetProcAddress(hshlwapi, "SHRegCreateUSKeyW"); + + test_SHGetValue(); + test_SHRegGetValue(); + test_SHQueryValueEx(); + test_SHGetRegPath(); + test_SHCopyKey(); + test_SHDeleteKey(); + test_SHRegCreateUSKeyW(); - pSHCopyKeyA=(SHCopyKeyA_func)GetProcAddress(hshlwapi,"SHCopyKeyA"); - pSHRegGetPathA=(SHRegGetPathA_func)GetProcAddress(hshlwapi,"SHRegGetPathA"); - pSHRegGetValueA=(SHRegGetValueA_func)GetProcAddress(hshlwapi,"SHRegGetValueA"); - test_SHGetValue(); - test_SHRegGetValue(); - test_SHQueryValueEx(); - test_SHGetRegPath(); - test_SHCopyKey(); - test_SHDeleteKey(); - delete_key( hkey, "Software\\Wine", "Test" ); + delete_key( hkey, "Software\\Wine", "Test" ); }

1 0

Andrew Eikum : wineoss.drv: Remove volume setting support.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 65381d1c376585277d30bdfdde9cc2aa17c15392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65381d1c376585277d30bdfdd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 1 10:57:11 2011 -0600 wineoss.drv: Remove volume setting support. --- dlls/wineoss.drv/mmdevdrv.c | 105 ++++-------------------------------------- 1 files changed, 10 insertions(+), 95 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 51ae720..b46b60e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -165,7 +165,6 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT oss_setvol(ACImpl *This, UINT32 index); static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -993,8 +992,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->initted = TRUE; - oss_setvol(This, -1); - LeaveCriticalSection(&This->lock); return S_OK; @@ -2405,83 +2402,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = AudioSessionControl_SetDuckingPreference }; -/* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT oss_setvol(ACImpl *This, UINT32 index) -{ - int setreq, getreq; - unsigned int vol; - unsigned short l; - float level; - - if(index == (UINT32)-1){ - HRESULT ret = S_OK; - UINT32 i; - for(i = 0; i < This->fmt->nChannels; ++i){ - HRESULT hr; - hr = oss_setvol(This, i); - if(FAILED(hr)) - ret = hr; - } - return ret; - } - - if(index > 1) - /* OSS doesn't support volume control past the first two channels */ - return S_OK; - - if(This->dataflow == eRender){ - setreq = SNDCTL_DSP_SETPLAYVOL; - getreq = SNDCTL_DSP_GETPLAYVOL; - }else if(This->dataflow == eCapture){ - setreq = SNDCTL_DSP_SETRECVOL; - getreq = SNDCTL_DSP_GETRECVOL; - }else - return E_UNEXPECTED; - - if(ioctl(This->fd, getreq, &vol) < 0){ - if(errno == EINVAL) - /* device doesn't support this call */ - return S_OK; - - WARN("GET[REC|PLAY]VOL failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - level = This->session->master_vol * This->session->channel_vols[index] * - This->vols[index]; - l = level * 100; - if(index == 0) - vol = l | (vol & 0xFF00); - else - vol = (vol & 0xFF) | (l << 8); - - if(ioctl(This->fd, setreq, &vol) < 0){ - if(errno == EINVAL) - /* device doesn't support this call */ - return S_OK; - - WARN("SET[REC|PLAY]VOL failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - return S_OK; -} - -static HRESULT oss_session_setvol(AudioSession *session, UINT32 index) -{ - HRESULT ret = S_OK; - ACImpl *client; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ - HRESULT hr; - hr = oss_setvol(client, index); - if(FAILED(hr)) - ret = hr; - } - - return ret; -} - static HRESULT WINAPI SimpleAudioVolume_QueryInterface( ISimpleAudioVolume *iface, REFIID riid, void **ppv) { @@ -2520,7 +2440,6 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -2534,11 +2453,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; - ret = oss_session_setvol(session, -1); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&session->lock); - return ret; + return S_OK; } static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( @@ -2667,7 +2586,6 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT ret; TRACE("(%p)->(%d, %f)\n", This, index, level); @@ -2681,11 +2599,11 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; - ret = oss_setvol(This, index); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&This->lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( @@ -2711,7 +2629,6 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( { ACImpl *This = impl_from_IAudioStreamVolume(iface); int i; - HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -2726,11 +2643,11 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = oss_setvol(This, -1); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&This->lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( @@ -2824,7 +2741,6 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2842,11 +2758,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; - ret = oss_session_setvol(session, index); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&session->lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( @@ -2875,7 +2791,6 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; int i; - HRESULT ret; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -2894,11 +2809,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - ret = oss_session_setvol(session, -1); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&session->lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes(

1 0

Andrew Eikum : wineoss.drv: Add period to latency calculation.
by Alexandre Julliard Dec. 1, 2011

Dec. 1, 2011

Module: wine Branch: master Commit: 3cc871b0b08094319f4a9eb6a8c07a6ae456fe05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc871b0b08094319f4a9eb6a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 1 10:57:18 2011 -0600 wineoss.drv: Add period to latency calculation. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b46b60e..bb3297b 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1055,6 +1055,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, }else *latency = 10000; /* OSS doesn't provide input latency */ + /* pretend we process audio in Period chunks, so max latency includes + * the period time */ + *latency += DefaultPeriod; + LeaveCriticalSection(&This->lock); return S_OK;

1 0