wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Francois Gouget : po: Remove English strings from the Hungarian shell folder translations.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: fc0d21aa221582874d50a0f2f0c8bd1aa22d3f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0d21aa221582874d50a0f2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 2 10:11:37 2012 +0100 po: Remove English strings from the Hungarian shell folder translations. --- po/hu.po | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/po/hu.po b/po/hu.po index af92eef..d4b264c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8244,7 +8244,7 @@ msgstr "" #: shell32.rc:202 msgid "Favorites" -msgstr "Favorites" +msgstr "" #: shell32.rc:203 msgid "StartUp" @@ -8252,15 +8252,15 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" -msgstr "My Music" +msgstr "" #: shell32.rc:206 msgid "My Videos" -msgstr "My Videos" +msgstr "" #: shell32.rc:207 #, fuzzy @@ -8270,15 +8270,15 @@ msgstr "Asztal" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8286,11 +8286,11 @@ msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 #, fuzzy @@ -8299,7 +8299,7 @@ msgstr "Egyszerű név" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "Documents" +msgstr "" #: shell32.rc:217 #, fuzzy @@ -8308,20 +8308,19 @@ msgstr "Start Menu\\Programs\\Administrative Tools" #: shell32.rc:218 msgid "Music" -msgstr "Music" +msgstr "" #: shell32.rc:219 msgid "Pictures" -msgstr "Pictures" +msgstr "" #: shell32.rc:220 msgid "Videos" -msgstr "Videos" +msgstr "" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Francois Gouget : po: Remove/fix a couple of invalid Hungarian translations .
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: c86703e2c08ae1fcf827563f2488d77c3eafbb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86703e2c08ae1fcf827563f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 2 10:10:29 2012 +0100 po: Remove/fix a couple of invalid Hungarian translations. --- po/hu.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/hu.po b/po/hu.po index 3a0eba5..af92eef 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9519,7 +9519,7 @@ msgstr "Digi&tális" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "Font" +msgstr "&Betűtípus..." #: clock.rc:34 msgid "&Without Titlebar" @@ -13832,7 +13832,7 @@ msgstr "Mindig &legfelül" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Információ..." +msgstr "" #: winhlp32.rc:64 #, fuzzy

1 0

Francois Gouget : po: Mark an incorrect Czech translation as fuzzy.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: e0d12246f82908f4ff99275f22627ff6d85f6557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d12246f82908f4ff99275f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 2 10:07:19 2012 +0100 po: Mark an incorrect Czech translation as fuzzy. --- po/cs.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/cs.po b/po/cs.po index 432e699..4ea8434 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13649,6 +13649,7 @@ msgid "Error while selecting new font." msgstr "Chyba při volbě nového písma." #: winefile.rc:95 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Francois Gouget : po: Remove English strings (invalid even) from the Bulgarian shell folder translations.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 1b9ce7651d4bcb1faef3c4c1c3f65e4bdd67cbe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9ce7651d4bcb1faef3c4c1c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 2 10:04:40 2012 +0100 po: Remove English strings (invalid even) from the Bulgarian shell folder translations. --- po/bg.po | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/po/bg.po b/po/bg.po index cc7ff6f..8bd36c5 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7958,7 +7958,7 @@ msgstr "Моите документи" #: shell32.rc:202 msgid "Favorites" -msgstr "Favorites" +msgstr "" #: shell32.rc:203 msgid "StartUp" @@ -7966,15 +7966,15 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" -msgstr "My Music" +msgstr "" #: shell32.rc:206 msgid "My Videos" -msgstr "My Video" +msgstr "" #: shell32.rc:207 #, fuzzy @@ -7984,15 +7984,15 @@ msgstr "Работен плот" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8000,11 +8000,11 @@ msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 #, fuzzy @@ -8013,29 +8013,27 @@ msgstr "Копиране на файлове..." #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "Documents" +msgstr "" #: shell32.rc:217 -#, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programs\\Administrative Tools" +msgstr "" #: shell32.rc:218 msgid "Music" -msgstr "Documents\\My Music" +msgstr "" #: shell32.rc:219 msgid "Pictures" -msgstr "Documents\\My Pictures" +msgstr "" #: shell32.rc:220 msgid "Videos" -msgstr "Documents\\My Video" +msgstr "" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Stefan Dösinger : ddraw/tests: Add some IDirect3DViewport interface tests.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: acf82ff1f5cfa02e3adc66e1222b9e60cf0019fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf82ff1f5cfa02e3adc66e12… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 2 12:56:00 2012 +0100 ddraw/tests: Add some IDirect3DViewport interface tests. --- dlls/ddraw/tests/ddraw1.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 89 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 88 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/refcount.c | 3 + 4 files changed, 272 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acf82ff1f5cfa02e3adc6…

1 0

Marcel Hasler : dinput: Support INFINITE as number of effect iterations.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: c47677fee50b4f3c5a3844d9cfb8ea200b83c472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47677fee50b4f3c5a3844d9c… Author: Marcel Hasler <mahasler(a)gmail.com> Date: Tue Jan 31 00:36:56 2012 +0100 dinput: Support INFINITE as number of effect iterations. --- dlls/dinput/effect_linuxinput.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index c224bd8..ca43b17 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -29,6 +29,7 @@ # include <linux/input.h> # undef SW_MAX #endif +#include <limits.h> #include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -518,7 +519,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Start( event.type = EV_FF; event.code = This->effect.id; - event.value = dwIterations; + event.value = min( dwIterations, INT_MAX ); if (write(*(This->fd), &event, sizeof(event)) == -1) { FIXME("Unable to write event. Assuming device disconnected.\n"); return DIERR_INPUTLOST;

1 0

Juan Lang : crypt32: Test and correct CryptVerifyCertificateSignature.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 441f7b6d9eefa8ee05fd265e14079b5290f21784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441f7b6d9eefa8ee05fd265e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 1 20:15:27 2012 -0800 crypt32: Test and correct CryptVerifyCertificateSignature. --- dlls/crypt32/cert.c | 4 ++- dlls/crypt32/tests/cert.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 63107e1..557a17b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2239,8 +2239,10 @@ BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, PCERT_PUBLIC_KEY_INFO pPublicKey) { + CRYPT_DATA_BLOB blob = { cbEncoded, (BYTE *)pbEncoded }; + return CryptVerifyCertificateSignatureEx(hCryptProv, dwCertEncodingType, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, (void *)pbEncoded, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &blob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pPublicKey, 0, NULL); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 8239af8..759b0da 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1765,6 +1765,73 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, DWORD size = 0; BOOL ret; + if (!pCryptEncodeObjectEx) + { + win_skip("no CryptEncodeObjectEx support\n"); + return; + } + ret = CryptVerifyCertificateSignature(0, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CryptVerifyCertificateSignature(csp, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, NULL, 0, + NULL); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), + "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08x\n", GetLastError()); + info.ToBeSigned.cbData = toBeSigned->cbData; + info.ToBeSigned.pbData = toBeSigned->pbData; + info.SignatureAlgorithm.pszObjId = (LPSTR)sigOID; + info.SignatureAlgorithm.Parameters.cbData = 0; + info.Signature.cbData = sigLen; + info.Signature.pbData = (BYTE *)sig; + info.Signature.cUnusedBits = 0; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &cert, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (cert) + { + PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; + DWORD pubKeySize; + + if (0) + { + /* Crashes prior to Vista */ + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, + cert, size, NULL); + } + CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + (LPSTR)sigOID, 0, NULL, NULL, &pubKeySize); + pubKeyInfo = HeapAlloc(GetProcessHeap(), 0, pubKeySize); + if (pubKeyInfo) + { + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, + X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, pubKeyInfo, + &pubKeySize); + ok(ret, "CryptExportKey failed: %08x\n", GetLastError()); + if (ret) + { + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, + cert, size, pubKeyInfo); + ok(ret, "CryptVerifyCertificateSignature failed: %08x\n", + GetLastError()); + } + HeapFree(GetProcessHeap(), 0, pubKeyInfo); + } + LocalFree(cert); + } +} + +static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, + LPCSTR sigOID, const BYTE *sig, DWORD sigLen) +{ + CERT_SIGNED_CONTENT_INFO info; + LPBYTE cert = NULL; + DWORD size = 0; + BOOL ret; + if (!pCryptVerifyCertificateSignatureEx) { win_skip("no CryptVerifyCertificateSignatureEx support\n"); @@ -1875,6 +1942,7 @@ static void testCertSigs(void) testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, &sigSize); testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); + testVerifyCertSigEx(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Aric Stewart : usp10: We do not yet shape hangul properly so allow for SSA_LINK flags to take effect .
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 17cd9d3325994a6862706d4946c55d8f1e35adf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cd9d3325994a6862706d494… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 1 14:52:35 2012 -0600 usp10: We do not yet shape hangul properly so allow for SSA_LINK flags to take effect. --- dlls/usp10/usp10.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f2b863..cad234f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1856,6 +1856,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } } + /* FIXME: When we properly shape Hangul remove this check */ + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) analysis->pItem[i].a.fNoGlyphIndex = TRUE;

1 0

Andrew Eikum : winecoreaudio: Improve underrun handling.
by Alexandre Julliard 01 Feb '12

01 Feb '12

Module: wine Branch: master Commit: 57bb0898f353d34a22a2d895a1433877e9a61ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57bb0898f353d34a22a2d895a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 1 09:08:51 2012 -0600 winecoreaudio: Improve underrun handling. --- dlls/winecoreaudio.drv/mmdevdrv.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a940cbf..42d8d18 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,7 +138,7 @@ struct ACImpl { UINT32 getbuf_last; int playing; - Float64 highest_sampletime; + Float64 highest_sampletime, next_sampletime; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -564,8 +564,13 @@ static UINT64 get_current_aqbuffer_position(ACImpl *This, int mode) else ret = This->highest_sampletime - bufinfo->start_sampletime; - if(mode == BUFPOS_ABSOLUTE) - ret += bufinfo->start_pos; + if(mode == BUFPOS_ABSOLUTE){ + ret = This->written_frames - (bufinfo->len_frames - ret); + while((head = list_next(&This->queued_bufinfos, &bufinfo->entry))){ + bufinfo = LIST_ENTRY(head, QueuedBufInfo, entry); + ret -= bufinfo->len_frames; + } + } TRACE("%llu frames (%s)\n", ret, mode == BUFPOS_ABSOLUTE ? "absolute" : "relative"); @@ -1851,7 +1856,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( { ACImpl *This = impl_from_IAudioRenderClient(iface); AQBuffer *buf; - AudioTimeStamp start_time; + AudioTimeStamp start_time, req_time = {0}, *passed_time = NULL; OSStatus sc; TRACE("(%p)->(%u, %x)\n", This, frames, flags); @@ -1896,8 +1901,22 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buf = This->public_buffer->mUserData; buf->used = TRUE; + + if(list_empty(&This->queued_bufinfos)){ + sc = AudioQueueGetCurrentTime(This->aqueue, NULL, &req_time, NULL); + if(sc == noErr) + passed_time = &req_time; + else + TRACE("AudioQueueGetCurrentTime failed: %lx\n", sc); + }else{ + req_time.mSampleTime = This->next_sampletime; + req_time.mFlags = kAudioTimeStampSampleTimeValid; + passed_time = &req_time; + } + sc = AudioQueueEnqueueBufferWithParameters(This->aqueue, - This->public_buffer, 0, NULL, 0, 0, 0, NULL, NULL, &start_time); + This->public_buffer, 0, NULL, 0, 0, 0, NULL, passed_time, + &start_time); if(sc != noErr){ OSSpinLockUnlock(&This->lock); ERR("Unable to enqueue buffer: %lx\n", sc); @@ -1914,6 +1933,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( bufinfo->len_frames = frames; list_add_tail(&This->queued_bufinfos, &bufinfo->entry); + + This->next_sampletime = start_time.mSampleTime + bufinfo->len_frames; }else WARN("Start time didn't contain valid SampleTime member\n");

1 0

Alexandre Julliard : winealsa: Avoid memory leak with snd_card_get_name.
by Alexandre Julliard 01 Feb '12

01 Feb '12

Module: wine Branch: master Commit: 19015ae19eaf6f479bd6ef7eb07004d5292826f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19015ae19eaf6f479bd6ef7eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 16:55:53 2012 +0100 winealsa: Avoid memory leak with snd_card_get_name. --- dlls/winealsa.drv/mmdevdrv.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0bedcc5..7621423 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -363,7 +363,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; - const char *cardname; + char *cardname; WCHAR *cardnameW; snd_ctl_t *ctl; DWORD len; @@ -376,24 +376,28 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, continue; } - if((err = snd_card_get_name(card, (char **)&cardname)) < 0){ + if(snd_card_get_name(card, &cardname) < 0) { + /* FIXME: Should be localized */ + static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; WARN("Unable to get card name for ALSA device %s: %d (%s)\n", cardpath, err, snd_strerror(err)); - /* FIXME: Should be localized */ - cardname = "Unknown soundcard"; - } + alsa_get_card_devices(stream, ids, keys, num, ctl, card, nameW); + }else{ + len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); + cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); - cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!cardnameW){ - snd_ctl_close(ctl); - return E_OUTOFMEMORY; - } - MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); + if(!cardnameW){ + free(cardname); + snd_ctl_close(ctl); + return E_OUTOFMEMORY; + } + MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW); + alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW); - HeapFree(GetProcessHeap(), 0, cardnameW); + HeapFree(GetProcessHeap(), 0, cardnameW); + free(cardname); + } snd_ctl_close(ctl); }

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 February 2012