wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

André Hentschel : user.exe: Remove dead assignment ( clang).
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: f12e6a11d80008f8341c90e2f84bcac0b368defb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12e6a11d80008f8341c90e2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 13 20:33:24 2011 +0200 user.exe: Remove dead assignment (clang). --- dlls/user.exe16/user.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 030dd0d..01125ff 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2506,7 +2506,6 @@ INT16 WINAPI wvsprintf16( LPSTR buffer, LPCSTR spec, VA_LIST16 args ) /* wsprintf16 ignores null characters */ if (*p != '\0') p++; else if (format.width > 1) *p++ = ' '; - else len = 0; break; case WPR_STRING: if (len) memcpy( p, lpcstr_view, len );

1 0

Andrew Eikum : winmm: Implement waveIn* on top of MMDevAPI.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 8cd5f12e6b09ac31667448ca063182cc444a0f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd5f12e6b09ac31667448ca0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:35 2011 -0500 winmm: Implement waveIn* on top of MMDevAPI. --- dlls/winmm/waveform.c | 659 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 602 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cd5f12e6b09ac3166744…

1 0

Andrew Eikum : winmm: Remove driver implementation of waveIn*.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: b3ab657c3b905cc597751a5d7a423b8305109deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ab657c3b905cc597751a5d7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:32 2011 -0500 winmm: Remove driver implementation of waveIn*. --- dlls/winmm/waveform.c | 230 ++++++------------------------------------------- 1 files changed, 27 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3ab657c3b905cc597751…

1 0

Andrew Eikum : winmm: Support WAVE_MAPPED flag in waveOut*.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 58bd405778b19097679a23394817d53485c7bc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bd405778b19097679a23394… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:28 2011 -0500 winmm: Support WAVE_MAPPED flag in waveOut*. --- dlls/winmm/waveform.c | 44 +++++++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 254bf21..57c6add 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -615,6 +615,11 @@ static UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, return dwRet; } +static inline BOOL WINMM_IsMapper(UINT device) +{ + return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); +} + static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_out) { @@ -644,15 +649,24 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels, /* ACM can convert from src->dst, so try to find a device * that supports dst */ - for(i = 0; i < g_outmmdevices_count; ++i){ + if(WINMM_IsMapper(info->req_device)){ + for(i = 0; i < g_outmmdevices_count; ++i){ + WINMM_OpenInfo l_info = *info; + l_info.req_device = i; + l_info.format = &target; + mr = WOD_Open(&l_info); + if(mr == MMSYSERR_NOERROR){ + info->handle = l_info.handle; + break; + } + } + }else{ WINMM_OpenInfo l_info = *info; - l_info.req_device = i; + l_info.flags &= ~WAVE_MAPPED; l_info.format = &target; mr = WOD_Open(&l_info); - if(mr == MMSYSERR_NOERROR){ + if(mr == MMSYSERR_NOERROR) info->handle = l_info.handle; - break; - } } if(mr != MMSYSERR_NOERROR) return WAVERR_BADFORMAT; @@ -684,8 +698,17 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) /* try to find a direct match */ if(is_out){ WINMM_OpenInfo l_info = *info; - for(i = 0; i < g_outmmdevices_count; ++i){ - l_info.req_device = i; + if(WINMM_IsMapper(info->req_device)){ + for(i = 0; i < g_outmmdevices_count; ++i){ + l_info.req_device = i; + mr = WOD_Open(&l_info); + if(mr == MMSYSERR_NOERROR){ + info->handle = l_info.handle; + return mr; + } + } + }else{ + l_info.flags &= ~WAVE_MAPPED; mr = WOD_Open(&l_info); if(mr == MMSYSERR_NOERROR){ info->handle = l_info.handle; @@ -940,11 +963,6 @@ error: return ret; } -static inline BOOL WINMM_IsMapper(UINT device) -{ - return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); -} - static LRESULT WOD_Open(WINMM_OpenInfo *info) { WINMM_MMDevice *mmdevice; @@ -955,7 +973,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) TRACE("(%u, %p, %08x)\n", info->req_device, info, info->flags); - if(WINMM_IsMapper(info->req_device)) + if(WINMM_IsMapper(info->req_device) || (info->flags & WAVE_MAPPED)) return WINMM_MapDevice(info, TRUE); if(info->req_device >= g_outmmdevices_count)

1 0

Andrew Eikum : dsound: Request that WinMM perform audio conversion if the hardware doesn' t support the requested format.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: ca4ee7f60fef3c620c66dfa5cb3773b4073143f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4ee7f60fef3c620c66dfa5c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:20:25 2011 -0500 dsound: Request that WinMM perform audio conversion if the hardware doesn't support the requested format. --- dlls/dsound/capture.c | 2 +- dlls/dsound/primary.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index f089313..174355a 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -942,7 +942,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return err; } } else { - DWORD flags = CALLBACK_FUNCTION; + DWORD flags = CALLBACK_FUNCTION | WAVE_MAPPED; err = mmErr(waveInOpen(&(device->hwi), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_capture_callback, (DWORD_PTR)device, flags)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index aa8450f..8a87c96 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -125,7 +125,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) if (device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMOPEN) { - DWORD flags = CALLBACK_FUNCTION; + DWORD flags = CALLBACK_FUNCTION | WAVE_MAPPED; if (device->driver) flags |= WAVE_DIRECTSOUND;

1 0

Andrew Eikum : mmdevapi: Only enumerate devices that can be opened during initialization.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 2174717fbd01565f7ba1596078cf0c0ccfc02504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2174717fbd01565f7ba159607… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jul 13 14:30:45 2011 -0500 mmdevapi: Only enumerate devices that can be opened during initialization. --- dlls/winealsa.drv/mmdevdrv.c | 18 +++++++++++++++--- dlls/wineoss.drv/mmdevdrv.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index eda8435..080887a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -229,19 +229,22 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; snd_pcm_info_t *info; + snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : + SND_PCM_STREAM_CAPTURE); info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); if(!info) return E_OUTOFMEMORY; snd_pcm_info_set_subdevice(info, 0); - snd_pcm_info_set_stream(info, - flow == eRender ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE); + snd_pcm_info_set_stream(info, stream); device = -1; for(err = snd_ctl_pcm_next_device(ctl, &device); device != -1 && err >= 0; err = snd_ctl_pcm_next_device(ctl, &device)){ const char *devname; + char devnode[32]; + snd_pcm_t *handle; snd_pcm_info_set_device(info, device); @@ -255,6 +258,15 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, continue; } + sprintf(devnode, "hw:%d,%d", card, device); + if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open, pretending it doesn't exist: %d (%s)\n", + devnode, err, snd_strerror(err)); + continue; + } + + snd_pcm_close(handle); + if(ids && keys){ DWORD len, cardlen; @@ -286,7 +298,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, HeapFree(GetProcessHeap(), 0, ids[*num]); return E_OUTOFMEMORY; } - sprintf(keys[*num], "hw:%d,%d", card, device); + memcpy(keys[*num], devnode, sizeof(devnode)); } ++(*num); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 2b631f9..32e9354 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -285,6 +285,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, *def_index = -1; for(i = 0; i < sysinfo.numaudios; ++i){ oss_audioinfo ai = {0}; + int fd; ai.dev = i; if(ioctl(mixer_fd, SNDCTL_AUDIOINFO, &ai) < 0){ @@ -293,6 +294,17 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, continue; } + if(flow == eRender) + fd = open(ai.devnode, O_WRONLY, 0); + else + fd = open(ai.devnode, O_RDONLY, 0); + if(fd < 0){ + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)", + ai.devnode, errno, strerror(errno)); + continue; + } + close(fd); + if((flow == eCapture && (ai.caps & PCM_CAP_INPUT)) || (flow == eRender && (ai.caps & PCM_CAP_OUTPUT))){ size_t len;

1 0

Akihiro Sagawa : po: Add message contexts for 'Desktop' and update Japanese translation.
by Alexandre Julliard 14 Jul '11

14 Jul '11

1 0

Akihiro Sagawa : po: Add message contexts for 'Restore' and update Japanese translation.
by Alexandre Julliard 14 Jul '11

14 Jul '11

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: 8c74dc708a5b21058370da8ba3351d567c7d0ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c74dc708a5b21058370da8ba… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 13 23:48:39 2011 +0900 po: Update Japanese translation. --- po/ja.po | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/po/ja.po b/po/ja.po index df81c05..88105c7 100644 --- a/po/ja.po +++ b/po/ja.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-06-20 22:04+0900\n" +"PO-Revision-Date: 2011-07-13 21:47+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -6368,7 +6368,7 @@ msgstr "元のサイズに戻す(&R)" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "消去(&E)" #: shell32.rc:95 msgid "E&xplore" @@ -6749,44 +6749,40 @@ msgid "There is no Windows program configured to open this type of file." msgstr "このファイルの種類に関連付けられた Windows プログラムはありません。" #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "'%1' を削除しますか?" +msgstr "'%1' を完全に削除しますか?" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "これら %1 ファイルを削除しますか?" +msgstr "これら %1 項目を完全に削除しますか?" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "ファイルの削除の確認" +msgstr "削除の確認" #: shell32.rc:258 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"ファイルは既に存在します。\n" -"上書きしますか?" +"ファイルは %1 にすでに存在します。\n" +"\n" +"既存のファイルを置き換えますか?" #: shell32.rc:259 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"ファイルは既に存在します。\n" -"上書きしますか?" +"フォルダは %1 にすでに存在します。\n" +"\n" +"既存のフォルダを置き換えますか?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "ファイルの上書きの確認" +msgstr "上書きの確認" #: shell32.rc:277 msgid "" @@ -8447,9 +8443,8 @@ msgid "Wine Explorer" msgstr "Wine エクスプローラ" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "場所" +msgstr "場所:" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9546,7 +9541,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "選択したレジストリキー以下をテキストファイルに出力" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9586,6 +9580,7 @@ msgstr "" "ルを開始します。\n" "/ProgIDOpen 直後に指定した progID を利用して文書を開きます。\n" "/L エンドユーザライセンスを表示します。\n" +"/? このヘルプを表示し、終了します。\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "Start は完全に無保証です。詳細は /L オプションをつけて起動してください。\n"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Jul '11

14 Jul '11

Module: wine Branch: master Commit: d598445bf1467028bd3e5baab0120f08327961ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d598445bf1467028bd3e5baab… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jul 5 21:11:04 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2d22ae1..c6f4269 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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-06-18 15:20+0300\n" +"PO-Revision-Date: 2011-07-13 22:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6377,7 +6377,7 @@ msgstr "&Atkurti" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "&Išvalyti" #: shell32.rc:95 msgid "E&xplore" @@ -6762,44 +6762,40 @@ msgid "There is no Windows program configured to open this type of file." msgstr "Jokia Windows programa nėra sukonfigūruota atidaryti šio tipo failų." #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "Ar tikrai norite pašalinti „%1“?" +msgstr "Ar tikrai norite negrįžtamai pašalinti „%1“?" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "Ar tikrai norite pašalinti šiuos %1 elementus?" +msgstr "Ar tikrai norite negrįžtamai pašalinti šiuos %1 elementus?" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "Patvirtinti failo šalinimą" +msgstr "Patvirtinti šalinimą" #: shell32.rc:258 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"Failas jau egzistuoja.\n" +"Failas jau egzistuoja adresu %1.\n" +"\n" "Ar norite jį pakeisti?" #: shell32.rc:259 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"Failas jau egzistuoja.\n" +"Aplankas jau egzistuoja adresu %1.\n" +"\n" "Ar norite jį pakeisti?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "Patvirtinti failo perrašymą" +msgstr "Patvirtinti perrašymą" #: shell32.rc:277 msgid "" @@ -8465,9 +8461,8 @@ msgid "Wine Explorer" msgstr "Wine naršyklė" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "Vieta" +msgstr "Vieta:" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9565,7 +9560,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9604,10 +9598,10 @@ msgstr "" "/Unix Naudoti Unix failo vardą ir paleisti failą kaip windows " "naršyklėje.\n" "/L Parodyti galutinio naudotojo licenciją.\n" +"/? Parodyti šį pranešimą ir išeiti.\n" "\n" "start.exe versija 0.2 (C) 2003, Dan Kegel\n" -"Start pateikiama BE JOKIŲ GARANTIJŲ; detales rasite paleidę su /L " -"parametru.\n" +"Start pateikiama BE JOKIŲ GARANTIJŲ; detales rasite paleidę su /L parametru.\n" "Ši programa yra laisva programinė įranga; galite ją platinti\n" "tam tikromis sąlygomis; paleiskite „start /L“ išsamiai informacijai gauti.\n"

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
84
Older →

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 July 2011