January 2012 - Wine-Commits

Alexandre Julliard : msvcrt: Don't name a local variable 'errno'.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 2a1ce301fa59ba3cc25d8615b8e96a8313b54fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1ce301fa59ba3cc25d8615b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 21:48:42 2012 +0100 msvcrt: Don't name a local variable 'errno'. --- dlls/msvcrt/errno.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 6094eae..bf65f27 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -130,7 +130,7 @@ static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL; /* INTERNAL: Set the crt and dos errno's from the OS error given. */ void msvcrt_set_errno(int err) { - int *errno = MSVCRT__errno(); + int *errno_ptr = MSVCRT__errno(); MSVCRT_ulong *doserrno = MSVCRT___doserrno(); *doserrno = err; @@ -138,7 +138,7 @@ void msvcrt_set_errno(int err) switch(err) { #define ERR_CASE(oserr) case oserr: -#define ERR_MAPS(oserr, crterr) case oserr: *errno = crterr; break +#define ERR_MAPS(oserr, crterr) case oserr: *errno_ptr = crterr; break ERR_CASE(ERROR_ACCESS_DENIED) ERR_CASE(ERROR_NETWORK_ACCESS_DENIED) ERR_CASE(ERROR_CANNOT_MAKE) @@ -184,7 +184,7 @@ void msvcrt_set_errno(int err) default: /* Remaining cases map to EINVAL */ /* FIXME: may be missing some errors above */ - *errno = MSVCRT_EINVAL; + *errno_ptr = MSVCRT_EINVAL; } }

1 0

Jacek Caban : urlmon.idl: Removed local attributes from IUri and IAuthenticate interfaces.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 11c72a685c46859c651c07b86f91f6d1942bbc66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c72a685c46859c651c07b86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 18:58:19 2012 +0100 urlmon.idl: Removed local attributes from IUri and IAuthenticate interfaces. --- include/urlmon.idl | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index a278be5..e09b9ac 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -355,7 +355,6 @@ interface IBindStatusCallbackEx : IBindStatusCallback * IAuthenticate interface */ [ - local, object, uuid(79EAC9D0-BAf9-11CE-8C82-00AA004BA90B), pointer_default(unique) @@ -1628,7 +1627,6 @@ typedef struct _tagPROTOCOLFILTERDATA { * IUri interface */ [ - local, object, uuid(a39ee748-6a27-4817-a6f2-13914bef5890), pointer_default(unique)

1 0

Francois Gouget : comdlg32: Remove some unused string resources that are not present on Windows.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: a2481a3f6b4d482e9902bc93a609ee002f84e0c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2481a3f6b4d482e9902bc93a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 6 09:57:08 2012 +0100 comdlg32: Remove some unused string resources that are not present on Windows. --- dlls/comdlg32/comdlg32.rc | 14 -- dlls/comdlg32/filedlgbrowser.h | 13 - po/ar.po | 444 ++++++++++++++++++-------------------- po/bg.po | 454 ++++++++++++++++++-------------------- po/ca.po | 442 ++++++++++++++++++-------------------- po/cs.po | 454 ++++++++++++++++++-------------------- po/da.po | 464 +++++++++++++++++++--------------------- po/de.po | 442 ++++++++++++++++++-------------------- po/el.po | 444 ++++++++++++++++++-------------------- po/en.po | 442 ++++++++++++++++++-------------------- po/en_US.po | 442 ++++++++++++++++++-------------------- po/eo.po | 464 +++++++++++++++++++--------------------- po/es.po | 454 ++++++++++++++++++-------------------- po/fa.po | 444 ++++++++++++++++++-------------------- po/fi.po | 444 ++++++++++++++++++-------------------- po/fr.po | 442 ++++++++++++++++++-------------------- po/he.po | 442 ++++++++++++++++++-------------------- po/hi.po | 444 ++++++++++++++++++-------------------- po/hu.po | 464 +++++++++++++++++++--------------------- po/it.po | 442 ++++++++++++++++++-------------------- po/ja.po | 442 ++++++++++++++++++-------------------- po/ko.po | 442 ++++++++++++++++++-------------------- po/lt.po | 442 ++++++++++++++++++-------------------- po/ml.po | 444 ++++++++++++++++++-------------------- po/nb_NO.po | 454 ++++++++++++++++++-------------------- po/nl.po | 442 ++++++++++++++++++-------------------- po/or.po | 444 ++++++++++++++++++-------------------- po/pa.po | 444 ++++++++++++++++++-------------------- po/pl.po | 442 ++++++++++++++++++-------------------- po/pt_BR.po | 452 ++++++++++++++++++-------------------- po/pt_PT.po | 462 +++++++++++++++++++--------------------- po/rm.po | 442 ++++++++++++++++++-------------------- po/ro.po | 472 +++++++++++++++++++--------------------- po/ru.po | 442 ++++++++++++++++++-------------------- po/sk.po | 444 ++++++++++++++++++-------------------- po/sl.po | 444 ++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 444 ++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 444 ++++++++++++++++++-------------------- po/sv.po | 444 ++++++++++++++++++-------------------- po/te.po | 444 ++++++++++++++++++-------------------- po/th.po | 444 ++++++++++++++++++-------------------- po/tr.po | 454 ++++++++++++++++++-------------------- po/uk.po | 444 ++++++++++++++++++-------------------- po/wa.po | 442 ++++++++++++++++++-------------------- po/wine.pot | 442 ++++++++++++++++++-------------------- po/zh_CN.po | 454 ++++++++++++++++++-------------------- po/zh_TW.po | 444 ++++++++++++++++++-------------------- 47 files changed, 9521 insertions(+), 10628 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2481a3f6b4d482e9902b…

1 0

Jacek Caban : ieframe: Added INewWindowManager stub implementation.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: dcbfd3d0a5a0be164e0faab932a0fd6afc3d25ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbfd3d0a5a0be164e0faab93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 6 13:00:22 2012 +0100 ieframe: Added INewWindowManager stub implementation. --- dlls/ieframe/client.c | 5 +++ dlls/ieframe/dochost.c | 1 + dlls/ieframe/ieframe.h | 7 ++++ dlls/ieframe/shellbrowser.c | 67 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index d74a303..6a567ae 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -685,6 +685,11 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IShellBrowser_QueryInterface(&This->browser_service->IShellBrowser_iface, riid, ppv); } + if(IsEqualGUID(&SID_SNewWindowManager, guidService)) { + TRACE("SID_SNewWindowManager service\n"); + return INewWindowManager_QueryInterface(&This->nwm.INewWindowManager_iface, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3585eb9..ebc5978 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -888,6 +888,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* c ConnectionPointContainer_Init(&This->cps, (IUnknown*)disp); IEHTMLWindow_Init(This); + NewWindowManager_Init(This); } void DocHost_Release(DocHost *This) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 5f4de0d..b7a7b02 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -89,6 +89,11 @@ typedef struct { DocHost *doc_host; } IEHTMLWindow; +typedef struct { + INewWindowManager INewWindowManager_iface; + DocHost *doc_host; +} NewWindowManager; + typedef struct _IDocHostContainerVtbl { ULONG (*addref)(DocHost*); @@ -145,6 +150,7 @@ struct DocHost { ConnectionPointContainer cps; IEHTMLWindow html_window; + NewWindowManager nwm; }; struct WebBrowser { @@ -233,6 +239,7 @@ void DocHost_Frame_Init(DocHost*) DECLSPEC_HIDDEN; void release_dochost_client(DocHost*) DECLSPEC_HIDDEN; void IEHTMLWindow_Init(DocHost*) DECLSPEC_HIDDEN; +void NewWindowManager_Init(DocHost*) DECLSPEC_HIDDEN; void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*) DECLSPEC_HIDDEN; BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 00ba786..b97f3f9 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -2,6 +2,7 @@ * Implementation of IShellBrowser interface * * Copyright 2011 Piotr Caban for CodeWeavers + * Copyright 2012 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -913,3 +914,69 @@ void detach_browser_service(ShellBrowser *sb) sb->doc_host = NULL; IShellBrowser_Release(&sb->IShellBrowser_iface); } + +static inline NewWindowManager *impl_from_INewWindowManager(INewWindowManager *iface) +{ + return CONTAINING_RECORD(iface, NewWindowManager, INewWindowManager_iface); +} + +static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) +{ + NewWindowManager *This = impl_from_INewWindowManager(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->INewWindowManager_iface; + }else if(IsEqualGUID(&IID_INewWindowManager, riid)) { + TRACE("(%p)->(IID_INewWindowManager %p)\n", This, ppv); + *ppv = &This->INewWindowManager_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI NewWindowManager_AddRef(INewWindowManager *iface) +{ + NewWindowManager *This = impl_from_INewWindowManager(iface); + + TRACE("(%p)\n", This); + + return IOleClientSite_AddRef(&This->doc_host->IOleClientSite_iface); +} + +static ULONG WINAPI NewWindowManager_Release(INewWindowManager *iface) +{ + NewWindowManager *This = impl_from_INewWindowManager(iface); + + TRACE("(%p)\n", This); + + return IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); +} + +static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *iface, LPCWSTR pszUrl, + LPCWSTR pszName, LPCWSTR pszUrlContext, LPCWSTR pszFeatures, BOOL fReplace, DWORD dwFlags, + DWORD dwUserActionTime) +{ + NewWindowManager *This = impl_from_INewWindowManager(iface); + FIXME("(%p)->(%s %s %s %s %x %x %d)\n", This, debugstr_w(pszUrl), debugstr_w(pszName), debugstr_w(pszUrlContext), + debugstr_w(pszFeatures), fReplace, dwFlags, dwUserActionTime); + return S_OK; +} + +static const INewWindowManagerVtbl NewWindowManagerVtbl = { + NewWindowManager_QueryInterface, + NewWindowManager_AddRef, + NewWindowManager_Release, + NewWindowManager_EvaluateNewWindow +}; + +void NewWindowManager_Init(DocHost *doc_host) +{ + doc_host->nwm.INewWindowManager_iface.lpVtbl = &NewWindowManagerVtbl; + doc_host->nwm.doc_host = doc_host; +}

1 0

Jörg Höhle : winmm: Ignore broken nBlockAlign and AvgBytes within PCMWAVEFORMAT.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: afe7bc06e69d66815aca73c8b1f3f1e170b7ab20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe7bc06e69d66815aca73c8b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 4 09:29:55 2012 +0100 winmm: Ignore broken nBlockAlign and AvgBytes within PCMWAVEFORMAT. --- dlls/winmm/waveform.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index b940b4f..fe07e9e 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -843,6 +843,19 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, passed_fmt = &fmt; memcpy(passed_fmt, info->format, sizeof(PCMWAVEFORMAT)); passed_fmt->cbSize = 0; + if(fmt.wBitsPerSample % 8 != 0){ + WARN("Fixing bad wBitsPerSample (%u)\n", fmt.wBitsPerSample); + fmt.wBitsPerSample = (fmt.wBitsPerSample + 7) & ~7; + } + /* winmm ignores broken blockalign and avgbytes */ + if(fmt.nBlockAlign != fmt.nChannels * fmt.wBitsPerSample/8){ + WARN("Fixing bad nBlockAlign (%u)\n", fmt.nBlockAlign); + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample/8; + } + if (fmt.nAvgBytesPerSec != fmt.nSamplesPerSec * fmt.nBlockAlign) { + WARN("Fixing bad nAvgBytesPerSec (%u)\n", fmt.nAvgBytesPerSec); + fmt.nAvgBytesPerSec = fmt.nSamplesPerSec * fmt.nBlockAlign; + } }else passed_fmt = info->format; @@ -909,8 +922,8 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, goto error; } - device->bytes_per_frame = info->format->nBlockAlign; - device->samples_per_sec = info->format->nSamplesPerSec; + device->bytes_per_frame = passed_fmt->nBlockAlign; + device->samples_per_sec = passed_fmt->nSamplesPerSec; device->played_frames = 0; device->last_clock_pos = 0;

1 0

Alexandre Julliard : winex11: Remove DIB locking calls from all graphics functions.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: bcc65899f8cba6f4eea6cdedb81908ff61674db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc65899f8cba6f4eea6cdedb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 6 17:54:41 2012 +0100 winex11: Remove DIB locking calls from all graphics functions. --- dlls/winex11.drv/dib.c | 18 ----------- dlls/winex11.drv/graphics.c | 71 ------------------------------------------- dlls/winex11.drv/text.c | 12 ------- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/xrender.c | 10 +----- 5 files changed, 1 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcc65899f8cba6f4eea6c…

1 0

Jörg Höhle : winealsa: Unify the checks for wBitsPerSample.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 76f655dbb0382cc18976be10c49d2346fb0c88c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f655dbb0382cc18976be10c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 00:26:29 2012 +0100 winealsa: Unify the checks for wBitsPerSample. --- dlls/winealsa.drv/mmdevdrv.c | 123 +++++++++++++----------------------------- 1 files changed, 38 insertions(+), 85 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cb118cff..09be694 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -718,6 +718,38 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } +static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) +{ + snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN; + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + if(fmt->wBitsPerSample == 8) + format = SND_PCM_FORMAT_U8; + else if(fmt->wBitsPerSample == 16) + format = SND_PCM_FORMAT_S16_LE; + else if(fmt->wBitsPerSample == 24) + format = SND_PCM_FORMAT_S24_3LE; + else if(fmt->wBitsPerSample == 32) + format = SND_PCM_FORMAT_S32_LE; + else + WARN("Unsupported bit depth: %u\n", fmt->wBitsPerSample); + }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + if(fmt->wBitsPerSample == 32) + format = SND_PCM_FORMAT_FLOAT_LE; + else if(fmt->wBitsPerSample == 64) + format = SND_PCM_FORMAT_FLOAT64_LE; + else + WARN("Unsupported float size: %u\n", fmt->wBitsPerSample); + }else + WARN("Unknown wave format: %04x\n", fmt->wFormatTag); + return format; +} + static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -808,7 +840,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, ACImpl *This = impl_from_IAudioClient(iface); snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_format_t format; - const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; unsigned int rate, alsa_period_us; int err, i; HRESULT hr = S_OK; @@ -878,36 +909,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - if(fmt->wBitsPerSample == 8) - format = SND_PCM_FORMAT_U8; - else if(fmt->wBitsPerSample == 16) - format = SND_PCM_FORMAT_S16_LE; - else if(fmt->wBitsPerSample == 24) - format = SND_PCM_FORMAT_S24_3LE; - else if(fmt->wBitsPerSample == 32) - format = SND_PCM_FORMAT_S32_LE; - else{ - WARN("Unsupported bit depth: %u\n", fmt->wBitsPerSample); - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->wBitsPerSample == 32) - format = SND_PCM_FORMAT_FLOAT_LE; - else if(fmt->wBitsPerSample == 64) - format = SND_PCM_FORMAT_FLOAT64_LE; - else{ - WARN("Unsupported float size: %u\n", fmt->wBitsPerSample); - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - }else{ - WARN("Unknown wave format: %04x\n", fmt->wFormatTag); + format = alsa_format(fmt); + if (format == SND_PCM_FORMAT_UNKNOWN){ hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } @@ -1205,6 +1208,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, { ACImpl *This = impl_from_IAudioClient(iface); snd_pcm_format_mask_t *formats = NULL; + snd_pcm_format_t format; HRESULT hr = S_OK; WAVEFORMATEX *closest = NULL; const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; @@ -1246,60 +1250,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, } snd_pcm_hw_params_get_format_mask(This->hw_params, formats); - - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - switch(fmt->wBitsPerSample){ - case 8: - if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_U8)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - break; - case 16: - if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S16_LE)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - break; - case 24: - if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S24_3LE)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - break; - case 32: - if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_S32_LE)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - break; - default: - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - switch(fmt->wBitsPerSample){ - case 32: - if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_FLOAT_LE)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - break; - case 64: - if(!snd_pcm_format_mask_test(formats, SND_PCM_FORMAT_FLOAT64_LE)){ - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - break; - default: - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; - goto exit; - } - }else{ + format = alsa_format(fmt); + if (format == SND_PCM_FORMAT_UNKNOWN || + !snd_pcm_format_mask_test(formats, format)){ hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; }

1 0

Jörg Höhle : winealsa: Check ValidBitsPerSample and support SND_PCM_FORMAT_S20_3LE.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 49aa7f9f2f78a63a803a57f7d5ea6872eb982eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=49aa7f9f2f78a63a803a57f7d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 07:07:15 2012 +0100 winealsa: Check ValidBitsPerSample and support SND_PCM_FORMAT_S20_3LE. --- dlls/winealsa.drv/mmdevdrv.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 09be694..a2a2a7d 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -736,6 +736,15 @@ static snd_pcm_format_t alsa_format(const WAVEFORMATEX *fmt) format = SND_PCM_FORMAT_S32_LE; else WARN("Unsupported bit depth: %u\n", fmt->wBitsPerSample); + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmt->wBitsPerSample != fmtex->Samples.wValidBitsPerSample){ + if(fmtex->Samples.wValidBitsPerSample == 20 && fmt->wBitsPerSample == 24) + format = SND_PCM_FORMAT_S20_3LE; + else{ + WARN("Unsupported ValidBits: %u\n", fmtex->Samples.wValidBitsPerSample); + format = SND_PCM_FORMAT_UNKNOWN; + } + } }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){

1 0

Stefan Leichter : hal: Add stub for HalTranslateBusAddress.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 3346d092e5d2053a3b5d0abdb46d00c8b185e79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3346d092e5d2053a3b5d0abdb… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jan 6 11:00:05 2012 +0100 hal: Add stub for HalTranslateBusAddress. --- dlls/hal/hal.c | 8 ++++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 3353d04..add9028 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -145,6 +145,14 @@ ULONG WINAPI HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, U return 0; } +BOOLEAN WINAPI HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, + PULONG AddressSpace, PPHYSICAL_ADDRESS TranslatedAddress) +{ + FIXME("(%d %d %s %p %p) stub!\n", InterfaceType, BusNumber, + wine_dbgstr_longlong(BusAddress.QuadPart), AddressSpace, TranslatedAddress); + return FALSE; +} + KIRQL WINAPI KeGetCurrentIrql(VOID) { FIXME( " stub!\n"); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 2a8c155..3046c65 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -58,7 +58,7 @@ @ stub HalStartNextProcessor @ stub HalStartProfileInterrupt @ stub HalStopProfileInterrupt -@ stub HalTranslateBusAddress +@ stdcall HalTranslateBusAddress(long long int64 ptr ptr) @ stub IoAssignDriveLetters @ stub IoFlushAdapterBuffers @ stub IoFreeAdapterChannel

1 0

Stefan Leichter : opengl32: Replace the remaining forwards of wgl functions to gdi32. dll in the spec file with wrapper function.
by Alexandre Julliard Jan. 6, 2012

Jan. 6, 2012

Module: wine Branch: master Commit: 03c7dfbd4d5cb847af1f905c0414832c2f61e4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c7dfbd4d5cb847af1f905c0… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jan 6 11:00:18 2012 +0100 opengl32: Replace the remaining forwards of wgl functions to gdi32.dll in the spec file with wrapper function. --- dlls/opengl32/opengl32.spec | 22 ++++---- dlls/opengl32/wgl.c | 113 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 3fcaa3c..a83a142 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -334,27 +334,27 @@ @ stdcall glVertex4sv( ptr ) wine_glVertex4sv @ stdcall glVertexPointer( long long long ptr ) wine_glVertexPointer @ stdcall glViewport( long long long long ) wine_glViewport -@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat -@ stdcall wglCopyContext(long long long) gdi32.wglCopyContext +@ stdcall wglChoosePixelFormat(long ptr) +@ stdcall wglCopyContext(long long long) @ stdcall wglCreateContext(long) @ stdcall wglCreateLayerContext(long long) -@ stdcall wglDeleteContext(long) gdi32.wglDeleteContext +@ stdcall wglDeleteContext(long) @ stdcall wglDescribeLayerPlane(long long long long ptr) -@ stdcall wglDescribePixelFormat(long long long ptr) gdi32.DescribePixelFormat -@ stdcall wglGetCurrentContext() gdi32.wglGetCurrentContext -@ stdcall wglGetCurrentDC() gdi32.wglGetCurrentDC +@ stdcall wglDescribePixelFormat(long long long ptr) +@ stdcall wglGetCurrentContext() +@ stdcall wglGetCurrentDC() @ stub wglGetDefaultProcAddress @ stdcall wglGetLayerPaletteEntries(long long long long ptr) -@ stdcall wglGetPixelFormat(long) gdi32.GetPixelFormat +@ stdcall wglGetPixelFormat(long) @ stdcall wglGetProcAddress(str) @ stdcall wglMakeCurrent(long long) @ stdcall wglRealizeLayerPalette(long long long) @ stdcall wglSetLayerPaletteEntries(long long long long ptr) -@ stdcall wglSetPixelFormat(long long ptr) gdi32.SetPixelFormat -@ stdcall wglShareLists(long long) gdi32.wglShareLists +@ stdcall wglSetPixelFormat(long long ptr) +@ stdcall wglShareLists(long long) @ stdcall wglSwapBuffers(long) @ stdcall wglSwapLayerBuffers(long long) -@ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA -@ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW +@ stdcall wglUseFontBitmapsA(long long long long) +@ stdcall wglUseFontBitmapsW(long long long long) @ stdcall wglUseFontOutlinesA(long long long long long long long ptr) @ stdcall wglUseFontOutlinesW(long long long long long long long ptr) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 74f3d88..cdd6686 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -48,8 +48,21 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); static struct { PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); + BOOL (WINAPI *p_SetPixelFormat)(HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); + BOOL (WINAPI *p_wglCopyContext)(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); + BOOL (WINAPI *p_wglDeleteContext)(HGLRC hglrc); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); + BOOL (WINAPI *p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); + BOOL (WINAPI *p_wglUseFontBitmapsA)(HDC hdc, DWORD first, DWORD count, DWORD listBase); + BOOL (WINAPI *p_wglUseFontBitmapsW)(HDC hdc, DWORD first, DWORD count, DWORD listBase); + HDC (WINAPI *p_wglGetCurrentDC)(void); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); + HGLRC (WINAPI *p_wglGetCurrentContext)(void); + INT (WINAPI *p_ChoosePixelFormat)(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd); + INT (WINAPI *p_DescribePixelFormat)(HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd); + INT (WINAPI *p_GetPixelFormat)(HDC hdc); + + /* Interal WGL function */ void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); @@ -116,6 +129,31 @@ void enter_gl(void) const GLubyte * WINAPI wine_glGetString( GLenum name ); /*********************************************************************** + * wglSetPixelFormat(OPENGL32.@) + */ +BOOL WINAPI wglSetPixelFormat( HDC hdc, INT iPixelFormat, + const PIXELFORMATDESCRIPTOR *ppfd) +{ + return wine_wgl.p_SetPixelFormat(hdc, iPixelFormat, ppfd); +} + +/*********************************************************************** + * wglCopyContext (OPENGL32.@) + */ +BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) +{ + return wine_wgl.p_wglCopyContext(hglrcSrc, hglrcDst, mask); +} + +/*********************************************************************** + * wglDeleteContext (OPENGL32.@) + */ +BOOL WINAPI wglDeleteContext(HGLRC hglrc) +{ + return wine_wgl.p_wglDeleteContext(hglrc); +} + +/*********************************************************************** * wglMakeCurrent (OPENGL32.@) */ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) @@ -124,6 +162,38 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) } /*********************************************************************** + * wglShareLists (OPENGL32.@) + */ +BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) +{ + return wine_wgl.p_wglShareLists(hglrc1, hglrc2); +} + +/*********************************************************************** + * wglUseFontBitmapsA (OPENGL32.@) + */ +BOOL WINAPI wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase) +{ + return wine_wgl.p_wglUseFontBitmapsA(hdc, first, count, listBase); +} + +/*********************************************************************** + * wglUseFontBitmapsW (OPENGL32.@) + */ +BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase) +{ + return wine_wgl.p_wglUseFontBitmapsW(hdc, first, count, listBase); +} + +/*********************************************************************** + * wglGetCurrentDC (OPENGL32.@) + */ +HDC WINAPI wglGetCurrentDC(void) +{ + return wine_wgl.p_wglGetCurrentDC(); +} + +/*********************************************************************** * wglCreateContext (OPENGL32.@) */ HGLRC WINAPI wglCreateContext(HDC hdc) @@ -132,6 +202,38 @@ HGLRC WINAPI wglCreateContext(HDC hdc) } /*********************************************************************** + * wglGetCurrentContext (OPENGL32.@) + */ +HGLRC WINAPI wglGetCurrentContext(void) +{ + return wine_wgl.p_wglGetCurrentContext(); +} + +/*********************************************************************** + * wglChoosePixelFormat (OPENGL32.@) + */ +INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) +{ + return wine_wgl.p_ChoosePixelFormat(hdc, ppfd); +} + +/*********************************************************************** + * wglDescribePixelFormat (OPENGL32.@) + */ +INT WINAPI wglDescribePixelFormat(HDC hdc, INT iPixelFormat, UINT nBytes, + LPPIXELFORMATDESCRIPTOR ppfd) +{ + return wine_wgl.p_DescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd); +} +/*********************************************************************** + * wglGetPixelFormat (OPENGL32.@) + */ +INT WINAPI wglGetPixelFormat(HDC hdc) +{ + return wine_wgl.p_GetPixelFormat(hdc); +} + +/*********************************************************************** * wglCreateLayerContext (OPENGL32.@) */ HGLRC WINAPI wglCreateLayerContext(HDC hdc, @@ -735,8 +837,19 @@ static BOOL process_attach(void) wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod_x11, "wine_tsx11_unlock" ); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); + wine_wgl.p_SetPixelFormat = (void *)GetProcAddress(mod_gdi32, "SetPixelFormat"); + wine_wgl.p_wglCopyContext = (void *)GetProcAddress(mod_gdi32, "wglCopyContext"); + wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod_gdi32, "wglDeleteContext"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); + wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod_gdi32, "wglShareLists"); + wine_wgl.p_wglUseFontBitmapsA = (void *)GetProcAddress(mod_gdi32, "wglUseFontBitmapsA"); + wine_wgl.p_wglUseFontBitmapsW = (void *)GetProcAddress(mod_gdi32, "wglUseFontBitmapsW"); + wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentDC"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); + wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentContext"); + wine_wgl.p_ChoosePixelFormat = (void *)GetProcAddress(mod_gdi32, "ChoosePixelFormat"); + wine_wgl.p_DescribePixelFormat = (void *)GetProcAddress(mod_gdi32, "DescribePixelFormat"); + wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); /* Interal WGL function */ wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv");

1 0