wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Ken Thomases : kernel32: On Mac, construct locale string from language and country codes.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 21acb71e4248ffc9b675caaf83ac8f399f91adce URL: http://source.winehq.org/git/wine.git/?a=commit;h=21acb71e4248ffc9b675caaf8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 9 15:02:55 2009 -0600 kernel32: On Mac, construct locale string from language and country codes. Don't rely on CFLocaleGetIdentifier(), whose result may not be sensible to the C library. --- dlls/kernel32/locale.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f1e6370..ac33e78 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2929,16 +2929,27 @@ void LOCALE_Init(void) CFArrayRef preferred_locales, all_locales; CFStringRef user_language_string_ref = NULL; char user_locale[50]; - char* p; CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); - CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref ); + CFStringRef user_locale_lang_ref = CFLocaleGetValue( user_locale_ref, kCFLocaleLanguageCode ); + CFStringRef user_locale_country_ref = CFLocaleGetValue( user_locale_ref, kCFLocaleCountryCode ); + CFStringRef user_locale_string_ref; + + if (user_locale_country_ref) + { + user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@.UTF-8"), + user_locale_lang_ref, user_locale_country_ref); + } + else + { + user_locale_string_ref = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.UTF-8"), + user_locale_lang_ref); + } CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); CFRelease( user_locale_ref ); - /* Strip modifiers because setlocale() can't parse them. */ - if ((p = strchr( user_locale, '@' ))) *p = 0; - if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" ); + CFRelease( user_locale_string_ref ); + unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); TRACE( "setting locale to '%s'\n", user_locale );

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_Description1.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 317d95a9db5337c19a12a24a21502f4b44e8d8a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=317d95a9db5337c19a12a24a2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:04 2009 +0100 dsound: Clean up DSPROPERTY_Description1. --- dlls/dsound/propset.c | 205 ++++++------------------------------------------- 1 files changed, 25 insertions(+), 180 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index aaf70aa..0645610 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -186,186 +186,6 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( return hr; } -static HRESULT DSPROPERTY_Description1( - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) -{ - HRESULT err; - GUID dev_guid; - PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA ppd; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", - pPropData,cbPropData,pcbReturned); - - ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA) pPropData; - - if (!ppd) { - WARN("invalid parameter: pPropData\n"); - return DSERR_INVALIDPARAM; - } - - TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId)); - if ( IsEqualGUID( &ppd->DeviceId , &GUID_NULL) ) { - /* default device of type specified by ppd->DataFlow */ - if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) { - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n"); - } else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) { - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n"); - } else { - TRACE("DataFlow=Unknown(%d)\n", ppd->DataFlow); - } - FIXME("(pPropData=%p,cbPropData=%d,pcbReturned=%p) GUID_NULL not implemented!\n", - pPropData,cbPropData,pcbReturned); - return E_PROP_ID_UNSUPPORTED; - } - - ppd->Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - GetDeviceID(&ppd->DeviceId, &dev_guid); - - if ( IsEqualGUID( &ppd->DeviceId, &DSDEVID_DefaultPlayback) || - IsEqualGUID( &ppd->DeviceId, &DSDEVID_DefaultVoicePlayback) ) { - ULONG wod; - unsigned int wodn; - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n"); - ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - wodn = waveOutGetNumDevs(); - for (wod = 0; wod < wodn; wod++) { - if (IsEqualGUID( &dev_guid, &DSOUND_renderer_guids[wod] ) ) { - DSDRIVERDESC desc; - ppd->WaveDeviceId = wod; - ppd->Devnode = wod; - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSDRIVER drv = NULL; - lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA)); - lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA)); - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - break; - } else { - WARN("waveOutMessage(DRV_QUERYDSOUNDDESC) failed\n"); - return E_PROP_ID_UNSUPPORTED; - } - } - } - } else if ( IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) || - IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoiceCapture) ) { - ULONG wid; - unsigned int widn; - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n"); - ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - widn = waveInGetNumDevs(); - for (wid = 0; wid < widn; wid++) { - if (IsEqualGUID( &dev_guid, &DSOUND_capture_guids[wid] ) ) { - DSDRIVERDESC desc; - ppd->WaveDeviceId = wid; - ppd->Devnode = wid; - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSCDRIVER drv; - lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA)); - lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA)); - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&drv,0)); - if (err == DS_OK && drv) - ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - break; - } else { - WARN("waveInMessage(DRV_QUERYDSOUNDDESC) failed\n"); - return E_PROP_ID_UNSUPPORTED; - } - } - } - } else { - BOOL found = FALSE; - ULONG wod; - unsigned int wodn; - /* given specific device so try the render devices first */ - wodn = waveOutGetNumDevs(); - for (wod = 0; wod < wodn; wod++) { - if (IsEqualGUID( &ppd->DeviceId, &DSOUND_renderer_guids[wod] ) ) { - DSDRIVERDESC desc; - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n"); - ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - ppd->WaveDeviceId = wod; - ppd->Devnode = wod; - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSDRIVER drv = NULL; - lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA)); - lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA)); - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - found = TRUE; - break; - } else { - WARN("waveOutMessage(DRV_QUERYDSOUNDDESC) failed\n"); - return E_PROP_ID_UNSUPPORTED; - } - } - } - - if (found == FALSE) { - ULONG wid; - unsigned int widn; - /* given specific device so try the capture devices next */ - widn = waveInGetNumDevs(); - for (wid = 0; wid < widn; wid++) { - if (IsEqualGUID( &ppd->DeviceId, &DSOUND_capture_guids[wid] ) ) { - DSDRIVERDESC desc; - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n"); - ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - ppd->WaveDeviceId = wid; - ppd->Devnode = wid; - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSDRIVER drv = NULL; - lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA)); - lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA)); - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - found = TRUE; - break; - } else { - WARN("waveInMessage(DRV_QUERYDSOUNDDESC) failed\n"); - return E_PROP_ID_UNSUPPORTED; - } - } - } - - if (found == FALSE) { - WARN("device not found\n"); - return E_PROP_ID_UNSUPPORTED; - } - } - } - - if (pcbReturned) { - *pcbReturned = cbPropData; - TRACE("*pcbReturned=%d\n", *pcbReturned); - } - - return S_OK; -} - static HRESULT DSPROPERTY_DescriptionW( LPVOID pPropData, ULONG cbPropData, @@ -659,6 +479,31 @@ static HRESULT DSPROPERTY_DescriptionA( return hr; } +static HRESULT DSPROPERTY_Description1( + LPVOID pPropData, + ULONG cbPropData, + PULONG pcbReturned) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data; + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *ppd = pPropData; + HRESULT hr; + + if (pcbReturned) + *pcbReturned = sizeof(*ppd); + if (!pPropData) + return S_OK; + + data.DeviceId = ppd->DeviceId; + data.DataFlow = ppd->DataFlow; + hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL); + if (FAILED(hr)) + return hr; + DSPROPERTY_descWto1(&data, ppd); + HeapFree(GetProcessHeap(), 0, data.Module); + HeapFree(GetProcessHeap(), 0, data.Interface); + return hr; +} + static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( LPKSPROPERTYSET iface, REFGUID guidPropSet,

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_DescriptionA.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: a5bf8b6b423f5e26f8845cdc82fdd8d8ef15c948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5bf8b6b423f5e26f8845cdc8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:03 2009 +0100 dsound: Clean up DSPROPERTY_DescriptionA. --- dlls/dsound/propset.c | 266 +++++-------------------------------------------- 1 files changed, 26 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5bf8b6b423f5e26f8845…

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_Enumerate1.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: d0b43b86dd820a6065bd0d8294d8e822f65f00e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b43b86dd820a6065bd0d829… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:02 2009 +0100 dsound: Clean up DSPROPERTY_Enumerate1. --- dlls/dsound/propset.c | 128 ++++++++++++++++++------------------------------- 1 files changed, 46 insertions(+), 82 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index c257eea..6c62325 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -702,88 +702,6 @@ static HRESULT DSPROPERTY_DescriptionW( return S_OK; } -static HRESULT DSPROPERTY_Enumerate1( - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) -{ - PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA) pPropData; - HRESULT err; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", - pPropData,cbPropData,pcbReturned); - - if (ppd) { - if (ppd->Callback) { - unsigned devs, wod, wid; - DSDRIVERDESC desc; - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data; - - devs = waveOutGetNumDevs(); - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - data.WaveDeviceId = wod; - data.DeviceId = DSOUND_renderer_guids[wod]; - lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA)); - lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA)); - - MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) ); - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - - devs = waveInGetNumDevs(); - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - data.WaveDeviceId = wid; - data.DeviceId = DSOUND_capture_guids[wid]; - lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA)); - lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA)); - - MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) ); - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - - return S_OK; - } - } - - if (pcbReturned) { - *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); - } - - return E_PROP_ID_UNSUPPORTED; -} - static HRESULT DSPROPERTY_EnumerateW( LPVOID pPropData, ULONG cbPropData, @@ -874,6 +792,21 @@ static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA return TRUE; } +static void DSPROPERTY_descWto1(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) +{ + data1->DeviceId = dataW->DeviceId; + lstrcpynW(data1->ModuleW, dataW->Module, sizeof(data1->ModuleW)/sizeof(*data1->ModuleW)); + lstrcpynW(data1->DescriptionW, dataW->Description, sizeof(data1->DescriptionW)/sizeof(*data1->DescriptionW)); + WideCharToMultiByte(CP_ACP, 0, data1->DescriptionW, -1, data1->DescriptionA, sizeof(data1->DescriptionA)-1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, data1->ModuleW, -1, data1->ModuleA, sizeof(data1->ModuleA)-1, NULL, NULL); + data1->DescriptionA[sizeof(data1->DescriptionA)-1] = 0; + data1->ModuleA[sizeof(data1->ModuleA)-1] = 0; + data1->Type = dataW->Type; + data1->DataFlow = dataW->DataFlow; + data1->WaveDeviceId = data1->Devnode = dataW->WaveDeviceId; +} + static BOOL CALLBACK DSPROPERTY_enumWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *descW, void *data) { DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA descA; @@ -909,6 +842,37 @@ static HRESULT DSPROPERTY_EnumerateA( return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned); } +static BOOL CALLBACK DSPROPERTY_enumWto1(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *descW, void *data) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA desc1; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA *ppd = data; + BOOL ret; + + DSPROPERTY_descWto1(descW, &desc1); + ret = ppd->Callback(&desc1, ppd->Context); + return ret; +} + +static HRESULT DSPROPERTY_Enumerate1( + LPVOID pPropData, + ULONG cbPropData, + PULONG pcbReturned) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA *ppd = pPropData; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data; + + if (!ppd || !ppd->Callback) + { + WARN("Invalid ppd %p\n", ppd); + return E_PROP_ID_UNSUPPORTED; + } + + data.Callback = DSPROPERTY_enumWto1; + data.Context = ppd; + + return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned); +} + static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( LPKSPROPERTYSET iface, REFGUID guidPropSet,

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_EnumerateA.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 4ecc5e661382c5614a6e4da5ac6dd32d151c3aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecc5e661382c5614a6e4da5a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:01 2009 +0100 dsound: Clean up DSPROPERTY_EnumerateA. --- dlls/dsound/propset.c | 173 ++++++++++++++++++------------------------------- 1 files changed, 63 insertions(+), 110 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 1dd94c4..c257eea 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -784,116 +784,6 @@ static HRESULT DSPROPERTY_Enumerate1( return E_PROP_ID_UNSUPPORTED; } -static HRESULT DSPROPERTY_EnumerateA( - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) -{ - PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA ppd = pPropData; - HRESULT err; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", - pPropData,cbPropData,pcbReturned); - - if (ppd) { - if (ppd->Callback) { - unsigned devs, wod, wid; - DSDRIVERDESC desc; - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data; - - devs = waveOutGetNumDevs(); - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - DWORD size; - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0)); - if (err == DS_OK) { - WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size); - if (nameW) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size)); - if (err == DS_OK) { - CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR)); - if (szInterface) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - data.WaveDeviceId = wod; - data.DeviceId = DSOUND_renderer_guids[wod]; - data.Description = desc.szDesc; - data.Module = desc.szDrvname; - WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL ); - data.Interface = szInterface; - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - HeapFree(GetProcessHeap(),0,szInterface); - } - } - HeapFree(GetProcessHeap(),0,nameW); - } - } - } - - devs = waveInGetNumDevs(); - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - DWORD size; - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDEVICEINTERFACESIZE,(DWORD_PTR)&size,0)); - if (err == DS_OK) { - WCHAR * nameW = HeapAlloc(GetProcessHeap(),0,size); - if (nameW) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDEVICEINTERFACE,(DWORD_PTR)nameW,size)); - if (err == DS_OK) { - CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,size/sizeof(WCHAR)); - if (szInterface) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - data.WaveDeviceId = wid; - data.DeviceId = DSOUND_capture_guids[wid]; - data.Description = desc.szDesc; - data.Module = desc.szDrvname; - WideCharToMultiByte( CP_ACP, 0, nameW, size/sizeof(WCHAR), szInterface, size/sizeof(WCHAR), NULL, NULL ); - data.Interface = szInterface; - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - HeapFree(GetProcessHeap(),0,szInterface); - } - } - HeapFree(GetProcessHeap(),0,nameW); - } - } - } - - return S_OK; - } - } - - if (pcbReturned) { - *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); - } - - return E_PROP_ID_UNSUPPORTED; -} - static HRESULT DSPROPERTY_EnumerateW( LPVOID pPropData, ULONG cbPropData, @@ -956,6 +846,69 @@ static HRESULT DSPROPERTY_EnumerateW( return S_OK; } +static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA *dataA) +{ + DWORD modlen, desclen; + static char Interface[] = "Interface"; + + modlen = WideCharToMultiByte(CP_ACP, 0, dataW->Module, -1, NULL, 0, NULL, NULL); + desclen = WideCharToMultiByte(CP_ACP, 0, dataW->Description, -1, NULL, 0, NULL, NULL); + dataA->Type = dataW->Type; + dataA->DataFlow = dataW->DataFlow; + dataA->DeviceId = dataW->DeviceId; + dataA->WaveDeviceId = dataW->WaveDeviceId; + dataA->Interface = Interface; + dataA->Module = HeapAlloc(GetProcessHeap(), 0, modlen); + dataA->Description = HeapAlloc(GetProcessHeap(), 0, desclen); + if (!dataA->Module || !dataA->Description) + { + HeapFree(GetProcessHeap(), 0, dataA->Module); + HeapFree(GetProcessHeap(), 0, dataA->Description); + dataA->Module = dataA->Description = NULL; + return FALSE; + } + + WideCharToMultiByte(CP_ACP, 0, dataW->Module, -1, dataA->Module, modlen, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, dataW->Description, -1, dataA->Description, desclen, NULL, NULL); + return TRUE; +} + +static BOOL CALLBACK DSPROPERTY_enumWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *descW, void *data) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA descA; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA *ppd = data; + BOOL ret; + + ret = DSPROPERTY_descWtoA(descW, &descA); + if (!ret) + return FALSE; + ret = ppd->Callback(&descA, ppd->Context); + HeapFree(GetProcessHeap(), 0, descA.Module); + HeapFree(GetProcessHeap(), 0, descA.Description); + return ret; +} + +static HRESULT DSPROPERTY_EnumerateA( + LPVOID pPropData, + ULONG cbPropData, + PULONG pcbReturned) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA *ppd = pPropData; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data; + + if (!ppd || !ppd->Callback) + { + WARN("Invalid ppd %p\n", ppd); + return E_PROP_ID_UNSUPPORTED; + } + + data.Callback = DSPROPERTY_enumWtoA; + data.Context = ppd; + + return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned); +} + static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( LPKSPROPERTYSET iface, REFGUID guidPropSet,

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_EnumerateW.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 773acf41573cca62e01200b6cd4b5e0208180115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773acf41573cca62e01200b6c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:00 2009 +0100 dsound: Clean up DSPROPERTY_EnumerateW. --- dlls/dsound/propset.c | 143 +++++++++++++++---------------------------------- 1 files changed, 43 insertions(+), 100 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index d484839..1dd94c4 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -900,117 +900,60 @@ static HRESULT DSPROPERTY_EnumerateW( PULONG pcbReturned ) { PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA ppd = pPropData; - HRESULT err; + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data; + BOOL ret; + int widn, wodn, i; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); - if (ppd) { - if (ppd->Callback) { - unsigned devs, wod, wid; - DSDRIVERDESC desc; - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data; - - devs = waveOutGetNumDevs(); - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200); - WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200); - if (wDescription && wModule) { - DWORD size; - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0)); - if (err == DS_OK) { - WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size); - if (wInterface) { - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - data.WaveDeviceId = wod; - data.DeviceId = DSOUND_renderer_guids[wod]; - - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); - - data.Description = wDescription; - data.Module = wModule; - data.Interface = wInterface; - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - HeapFree(GetProcessHeap(),0,wInterface); - } - } - HeapFree(GetProcessHeap(),0,wDescription); - HeapFree(GetProcessHeap(),0,wModule); - } - } - - devs = waveInGetNumDevs(); - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - WCHAR * wDescription = HeapAlloc(GetProcessHeap(),0,0x200); - WCHAR * wModule = HeapAlloc(GetProcessHeap(),0,0x200); - if (wDescription && wModule) { - DWORD size; - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0)); - if (err == DS_OK) { - WCHAR * wInterface = HeapAlloc(GetProcessHeap(),0,size); - if (wInterface) { - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)wInterface, size)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - data.WaveDeviceId = wid; - data.DeviceId = DSOUND_capture_guids[wid]; - - MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, wDescription, 0x100 ); - MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, wModule, 0x100 ); + if (pcbReturned) + *pcbReturned = 0; - data.Description = wDescription; - data.Module = wModule; - data.Interface = wInterface; - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); + if (!ppd || !ppd->Callback) + { + WARN("Invalid ppd %p\n", ppd); + return E_PROP_ID_UNSUPPORTED; + } - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - HeapFree(GetProcessHeap(),0,wInterface); - } - } - HeapFree(GetProcessHeap(),0,wDescription); - HeapFree(GetProcessHeap(),0,wModule); - } - } + wodn = waveOutGetNumDevs(); + widn = waveInGetNumDevs(); + data.DeviceId = DSOUND_renderer_guids[0]; + for (i = 0; i < wodn; ++i) + { + HRESULT hr; + data.DeviceId.Data4[7] = i; + hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL); + if (FAILED(hr)) + { + ERR("DescriptionW failed!\n"); return S_OK; } + ret = ppd->Callback(&data, ppd->Context); + HeapFree(GetProcessHeap(), 0, data.Module); + HeapFree(GetProcessHeap(), 0, data.Description); + if (!ret) + return S_OK; } - if (pcbReturned) { - *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); + data.DeviceId = DSOUND_capture_guids[0]; + for (i = 0; i < widn; ++i) + { + HRESULT hr; + data.DeviceId.Data4[7] = i; + hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL); + if (FAILED(hr)) + { + ERR("DescriptionW failed!\n"); + return S_OK; + } + ret = ppd->Callback(&data, ppd->Context); + HeapFree(GetProcessHeap(), 0, data.Module); + HeapFree(GetProcessHeap(), 0, data.Description); + if (!ret) + return S_OK; } - - return E_PROP_ID_UNSUPPORTED; + return S_OK; } static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_DescriptionW.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 2e95764e76b3cdc2e31549f8b1553f6c8624b009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e95764e76b3cdc2e31549f8b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:57:59 2009 +0100 dsound: Clean up DSPROPERTY_DescriptionW. --- dlls/dsound/propset.c | 283 ++++++++++++------------------------------------- 1 files changed, 69 insertions(+), 214 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e95764e76b3cdc2e3154…

1 0

Maarten Lankhorst : dsound: Implement DSPROPERTY_WaveDeviceMappingA on top of *W.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 0d34e5c6a42b17b77b76d52c8279b5e58909163c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d34e5c6a42b17b77b76d52c8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:57:58 2009 +0100 dsound: Implement DSPROPERTY_WaveDeviceMappingA on top of *W. --- dlls/dsound/propset.c | 92 +++++++++++++++++-------------------------------- 1 files changed, 32 insertions(+), 60 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 3cf65e5..f2c66ca 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -88,13 +88,13 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) return ref; } -static HRESULT DSPROPERTY_WaveDeviceMappingA( +static HRESULT DSPROPERTY_WaveDeviceMappingW( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) { HRESULT hr = DSERR_INVALIDPARAM; - PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA ppd; + PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd; TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", pPropData,cbPropData,pcbReturned); @@ -111,15 +111,15 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n"); wodn = waveOutGetNumDevs(); for (wod = 0; wod < wodn; wod++) { - WAVEOUTCAPSA capsA; + WAVEOUTCAPSW capsW; MMRESULT res; - res = waveOutGetDevCapsA(wod, &capsA, sizeof(capsA)); + res = waveOutGetDevCapsW(wod, &capsW, sizeof(capsW)); if (res == MMSYSERR_NOERROR) { - if (lstrcmpA(capsA.szPname, ppd->DeviceName) == 0) { + if (lstrcmpW(capsW.szPname, ppd->DeviceName) == 0) { ppd->DeviceId = DSOUND_renderer_guids[wod]; hr = DS_OK; TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId), - ppd->DeviceName); + debugstr_w(ppd->DeviceName)); break; } } @@ -130,15 +130,15 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n"); widn = waveInGetNumDevs(); for (wid = 0; wid < widn; wid++) { - WAVEINCAPSA capsA; + WAVEINCAPSW capsW; MMRESULT res; - res = waveInGetDevCapsA(wid, &capsA, sizeof(capsA)); + res = waveInGetDevCapsW(wid, &capsW, sizeof(capsW)); if (res == MMSYSERR_NOERROR) { - if (lstrcmpA(capsA.szPname, ppd->DeviceName) == 0) { + if (lstrcmpW(capsW.szPname, ppd->DeviceName) == 0) { ppd->DeviceId = DSOUND_capture_guids[wid]; - TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId), - ppd->DeviceName); hr = DS_OK; + TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId), + debugstr_w(ppd->DeviceName)); break; } } @@ -146,67 +146,39 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA( } if (pcbReturned) - *pcbReturned = cbPropData; + *pcbReturned = cbPropData; return hr; } -static HRESULT DSPROPERTY_WaveDeviceMappingW( +static HRESULT DSPROPERTY_WaveDeviceMappingA( LPVOID pPropData, ULONG cbPropData, PULONG pcbReturned ) { - HRESULT hr = DSERR_INVALIDPARAM; - PDSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA ppd; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", - pPropData,cbPropData,pcbReturned); + DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A_DATA *ppd = pPropData; + DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W_DATA data; + DWORD len; + HRESULT hr; - ppd = pPropData; + TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", + pPropData,cbPropData,pcbReturned); - if (!ppd) { - WARN("invalid parameter: pPropData\n"); - return DSERR_INVALIDPARAM; + if (!ppd || !ppd->DeviceName) { + WARN("invalid parameter: ppd=%p\n", ppd); + return DSERR_INVALIDPARAM; } - if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) { - ULONG wod; - unsigned int wodn; - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n"); - wodn = waveOutGetNumDevs(); - for (wod = 0; wod < wodn; wod++) { - WAVEOUTCAPSW capsW; - MMRESULT res; - res = waveOutGetDevCapsW(wod, &capsW, sizeof(capsW)); - if (res == MMSYSERR_NOERROR) { - if (lstrcmpW(capsW.szPname, ppd->DeviceName) == 0) { - ppd->DeviceId = DSOUND_renderer_guids[wod]; - hr = DS_OK; - TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId), - debugstr_w(ppd->DeviceName)); - break; - } - } - } - } else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) { - ULONG wid; - unsigned int widn; - TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n"); - widn = waveInGetNumDevs(); - for (wid = 0; wid < widn; wid++) { - WAVEINCAPSW capsW; - MMRESULT res; - res = waveInGetDevCapsW(wid, &capsW, sizeof(capsW)); - if (res == MMSYSERR_NOERROR) { - if (lstrcmpW(capsW.szPname, ppd->DeviceName) == 0) { - ppd->DeviceId = DSOUND_capture_guids[wid]; - hr = DS_OK; - TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId), - debugstr_w(ppd->DeviceName)); - break; - } - } - } - } + data.DataFlow = ppd->DataFlow; + len = MultiByteToWideChar(CP_ACP, 0, ppd->DeviceName, -1, NULL, 0); + data.DeviceName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!data.DeviceName) + return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, ppd->DeviceName, -1, data.DeviceName, len); + + hr = DSPROPERTY_WaveDeviceMappingW(&data, cbPropData, pcbReturned); + HeapFree(GetProcessHeap(), 0, data.DeviceName); + ppd->DeviceId = data.DeviceId; if (pcbReturned) *pcbReturned = cbPropData;

1 0

Jacek Caban : jscript: Fixed tests on some Windows.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 7705fe64d6fc785f3838d4b0e488e971317cba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7705fe64d6fc785f3838d4b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 10 01:16:02 2009 +0100 jscript: Fixed tests on some Windows. --- dlls/jscript/tests/regexp.js | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index ff00285..7f5f907 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -377,8 +377,11 @@ re.lastIndex = 3; re.lastIndex = "test"; ok(re.lastIndex === "test", "re.lastIndex = " + re.lastIndex + " expected 'test'"); m = re.exec(" a a "); -ok(re.lastIndex === 2, "re.lastIndex = " + re.lastIndex + " expected 2"); -ok(m.index === 1, "m.index = " + m.index + " expected 1"); +ok(re.lastIndex === 2 || re.lastIndex === 0, "re.lastIndex = " + re.lastIndex + " expected 2 or 0"); +if(re.lastIndex != 0) + ok(m.index === 1, "m.index = " + m.index + " expected 1"); +else + ok(m === null, "m = " + m + " expected null"); re.lastIndex = 0; re.lastIndex = 3.9;

1 0

Jacek Caban : jscript: Added Function constructor tests.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 13d6e57e7286251d6bfde5c31001fd93be6a65a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d6e57e7286251d6bfde5c31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 10 01:15:44 2009 +0100 jscript: Added Function constructor tests. --- dlls/jscript/tests/api.js | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 80bdf88..7ad2984 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1431,6 +1431,51 @@ callTest3.apply(null); tmp = Number.prototype.toString.call(3); ok(tmp === "3", "Number.prototype.toString.call(3) = " + tmp); +var func = new Function("return 3;"); + +tmp = func(); +ok(tmp === 3, "func() = " + tmp); +ok(func.call() === 3, "func.call() = " + tmp); +ok(func.length === 0, "func.length = " + func.length); +tmp = func.toString(); +ok(tmp === "function anonymous() {\nreturn 3;\n}", "func.toString() = " + tmp); + +func = new Function("x", "return x+2;"); +tmp = func(1); +ok(tmp === 3, "func(1) = " + tmp); +tmp = func.toString(); +ok(tmp === "function anonymous(x) {\nreturn x+2;\n}", "func.toString() = " + tmp); + +tmp = (new Function("x ", "return x+2;")).toString(); +ok(tmp === "function anonymous(x ) {\nreturn x+2;\n}", "func.toString() = " + tmp); + +func = new Function("x", "y", "return x+y"); +tmp = func(1,3); +ok(tmp === 4, "func(1,3) = " + tmp); +tmp = func.toString(); +ok(tmp === "function anonymous(x, y) {\nreturn x+y\n}", "func.toString() = " + tmp); + +func = new Function(" x, \ty", "\tz", "return x+y+z;"); +tmp = func(1,3,2); +ok(tmp === 6, "func(1,3,2) = " + tmp); +ok(func.length === 3, "func.length = " + func.length); +tmp = func.toString(); +ok(tmp === "function anonymous( x, \ty, \tz) {\nreturn x+y+z;\n}", "func.toString() = " + tmp); + +func = new Function(); +tmp = func(); +ok(tmp === undefined, "func() = " + tmp); +tmp = func.toString(); +ok(tmp == "function anonymous() {\n\n}", "func.toString() = " + tmp); + +func = (function() { + var tmp = 3; + return new Function("return tmp;"); + })(); +tmp = 2; +tmp = func(); +ok(tmp === 2, "func() = " + tmp); + var date = new Date(); date = new Date(100);

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 December 2009