January 2014 - Wine-commits

Hans Leidekker : advapi32: Forward LogonUserA to LogonUserW.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: aba364a256d85e399d4a5e75922bc09693df5a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba364a256d85e399d4a5e759… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:32:55 2013 +0100 advapi32: Forward LogonUserA to LogonUserW. (cherry picked from commit 7519cddddbe602c57caa078b88396e5654d68c38) --- dlls/advapi32/advapi.c | 19 +++++++++++++++++-- dlls/advapi32/advapi32_misc.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 860c728..884b5d1 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -35,6 +35,8 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "advapi32_misc.h" + WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** @@ -268,10 +270,23 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) { - FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_a(lpszUsername), + WCHAR *usernameW = NULL, *domainW = NULL, *passwordW = NULL; + BOOL ret = FALSE; + + TRACE("%s %s %p 0x%08x 0x%08x %p\n", debugstr_a(lpszUsername), debugstr_a(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); - return TRUE; + if (lpszUsername && !(usernameW = strdupAW( lpszUsername ))) return FALSE; + if (lpszDomain && !(domainW = strdupAW( lpszUsername ))) goto done; + if (lpszPassword && !(passwordW = strdupAW( lpszPassword ))) goto done; + + ret = LogonUserW( usernameW, domainW, passwordW, dwLogonType, dwLogonProvider, phToken ); + +done: + heap_free( usernameW ); + heap_free( domainW ); + heap_free( passwordW ); + return ret; } BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword, diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index ace73f1..9dd48b8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -22,6 +22,7 @@ #include "ntsecapi.h" #include "winsvc.h" +#include "winnls.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -52,4 +53,15 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + #endif /* __WINE_ADVAPI32MISC_H */

1 0

Nikolay Sivov : oleaut32: Always set LIBFLAG_FHASDISKIMAGE when loading from file.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 5cd922c9f8847425f85b727c89e3fb367cf55756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd922c9f8847425f85b727c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 13 18:40:32 2013 +0400 oleaut32: Always set LIBFLAG_FHASDISKIMAGE when loading from file. (cherry picked from commit 7be2251cd673588814dc8b5cb7272424dfb82688) --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 18522a0..0db84ad 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3371,7 +3371,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); - pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->libflags = ((WORD) tlbHeader.flags & 0xffff) /* check mask */ | LIBFLAG_FHASDISKIMAGE; pTypeLibImpl->set_lcid = tlbHeader.lcid2; pTypeLibImpl->lcid = tlbHeader.lcid;

1 0

Qian Hong : msi: Get extension name by strrchrW instead of strchrW.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 262db8f8fc4aa7c8f60f24609f582ca1763994cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=262db8f8fc4aa7c8f60f24609… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Nov 13 19:51:51 2013 +0800 msi: Get extension name by strrchrW instead of strchrW. (cherry picked from commit 9612ed1ba64b1067ce9e1b17306b0ca490f711d7) --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d964787..cd5230a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3839,7 +3839,7 @@ static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) filename = msi_dup_record_field( row, 3 ); msi_reduce_to_long_filename( filename ); - extension = strchrW( filename, '.' ); + extension = strrchrW( filename, '.' ); if (!extension || strcmpiW( extension, szlnk )) { int len = strlenW( filename );

1 0

Daniel Lehman : msvcp90: Return last index in string:: find_last_not_of_cstr_substr if input is empty.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: f25731b8ece1d5612c849d8b21938a53d8ef75e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25731b8ece1d5612c849d8b2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Sep 12 16:13:47 2012 -0700 msvcp90: Return last index in string::find_last_not_of_cstr_substr if input is empty. (cherry picked from commit 90cb553e5eaec08187e325a5eb7ec8f3c393ac5b) --- dlls/msvcp90/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index fd7b131..2dae8ac 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1823,7 +1823,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_last_not_of_cstr_substr( TRACE("%p %p %lu %lu\n", this, find, off, len); - if(len>0 && this->size>0) { + if(this->size>0) { if(off >= this->size) off = this->size-1; @@ -3841,7 +3841,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_last_not_of_cstr_substr( TRACE("%p %p %lu %lu\n", this, find, off, len); - if(len>0 && this->size>0) { + if(this->size>0) { if(off >= this->size) off = this->size-1;

1 0

Daniel Lehman : oleaut32: Return FALSE from SystemTimeToVariantTime if day > 31 or year is negative.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: d3e86cc8c748ebccb14c6a3739236f875083aa1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e86cc8c748ebccb14c6a373… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jan 30 11:12:54 2012 -0800 oleaut32: Return FALSE from SystemTimeToVariantTime if day > 31 or year is negative. (cherry picked from commit 8306518424a24a19c9c88d87f98fd3ac0024415a) --- dlls/oleaut32/variant.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c343578..d4c6f6c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1312,6 +1312,10 @@ INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSt, double *pDateOut) if (lpSt->wMonth > 12) return FALSE; + if (lpSt->wDay > 31) + return FALSE; + if ((short)lpSt->wYear < 0) + return FALSE; ud.st = *lpSt; return VarDateFromUdate(&ud, 0, pDateOut) == S_OK;

1 0

Vincent Povirk : explorer: Use StrRetToStrW to convert STRRET result.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 1619a7efd90c73536f54720ef3053f75033961ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1619a7efd90c73536f54720ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 30 14:50:51 2013 -0500 explorer: Use StrRetToStrW to convert STRRET result. (cherry picked from commit cd1abd68c3bd48267f96403e9ed937e1a11911db) --- programs/explorer/explorer.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1df781c..d01a3c3 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -118,20 +118,13 @@ static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImag HICON icon; strret.uType=STRRET_WSTR; hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + if(SUCCEEDED(hres)) + hres = StrRetToStrW(&strret, pidl, &item->pszText); if(FAILED(hres)) { WINE_WARN("Could not get name for pidl\n"); return FALSE; } - switch(strret.uType) - { - case STRRET_WSTR: - item->pszText = strret.u.pOleStr; - break; - default: - WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType); - break; - } hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, &reserved,(void**)&extract_icon); if(SUCCEEDED(hres))

1 0

Vitaly Lipatov : ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 47913a59a9880b2cf87b82a442947091a1fe0847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47913a59a9880b2cf87b82a44… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Nov 18 19:00:10 2013 +0400 ipconfig: Distinguish between IPv4 and IPv6 addresses in normal mode. (cherry picked from commit 6ceb5644083bee2f26c87634dfc3ba86e771a01e) --- programs/ipconfig/ipconfig.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 30e50fd..11ff56b 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -186,8 +186,12 @@ static void print_basic_information(void) for (addr = p->FirstUnicastAddress; addr; addr = addr->Next) { - if (socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + if (addr->Address.lpSockaddr->sa_family == AF_INET && + socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) print_field(STRING_IP_ADDRESS, addr_buf); + else if (addr->Address.lpSockaddr->sa_family == AF_INET6 && + socket_address_to_string(addr_buf, sizeof(addr_buf)/sizeof(WCHAR), &addr->Address)) + print_field(STRING_IP6_ADDRESS, addr_buf); /* FIXME: Output corresponding subnet mask. */ }

1 0

Andrew Eikum : winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 7d8624a9162ecd15fa6d925282a536c754487c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8624a9162ecd15fa6d92528… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 18 14:23:02 2013 -0600 winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY. (cherry picked from commit 06c95af45726674847d12440d904568f59f627bc) --- dlls/winmm/waveform.c | 66 +++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 23adfc0..573411c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -879,7 +879,7 @@ static inline BOOL WINMM_IsMapper(UINT device) } static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, - WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_out) + WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_query, BOOL is_out) { WAVEFORMATEX target, *closer_fmt = NULL; HRESULT hr; @@ -915,6 +915,9 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, return mr; /* yes it can. initialize the audioclient and return success */ + if(is_query) + return MMSYSERR_NOERROR; + hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, &target, &device->parent->session); @@ -933,7 +936,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, return MMSYSERR_NOERROR; } -static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_out) +static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_query, BOOL is_out) { MMRESULT mr; WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)device->orig_fmt; @@ -947,13 +950,13 @@ static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_out) /* convert to PCM format if it's not already */ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, device->orig_fmt->nChannels, device->orig_fmt->nSamplesPerSec, - 16, is_out); + 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; mr = WINMM_TryDeviceMapping(device, device->orig_fmt, device->orig_fmt->nChannels, device->orig_fmt->nSamplesPerSec, - 8, is_out); + 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; }else{ @@ -962,90 +965,90 @@ static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_out) /* first try just changing bit depth and channels */ channels = device->orig_fmt->nChannels; mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, - device->orig_fmt->nSamplesPerSec, 16, is_out); + device->orig_fmt->nSamplesPerSec, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, - device->orig_fmt->nSamplesPerSec, 8, is_out); + device->orig_fmt->nSamplesPerSec, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; channels = (channels == 2) ? 1 : 2; mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, - device->orig_fmt->nSamplesPerSec, 16, is_out); + device->orig_fmt->nSamplesPerSec, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, - device->orig_fmt->nSamplesPerSec, 8, is_out); + device->orig_fmt->nSamplesPerSec, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; /* that didn't work, so now try different sample rates */ channels = device->orig_fmt->nChannels; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; channels = (channels == 2) ? 1 : 2; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; channels = device->orig_fmt->nChannels; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; channels = (channels == 2) ? 1 : 2; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; - mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_out); + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_query, is_out); if(mr == MMSYSERR_NOERROR) return mr; } @@ -1114,7 +1117,10 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, AUDCLNT_SHAREMODE_SHARED, device->orig_fmt, &closer_fmt); if(closer_fmt) CoTaskMemFree(closer_fmt); - ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr); + if((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !(info->flags & WAVE_FORMAT_DIRECT)) + ret = WINMM_MapDevice(device, TRUE, is_out); + else + ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr); goto error; } @@ -1123,7 +1129,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, AC_BUFLEN, 0, device->orig_fmt, &device->parent->session); if(FAILED(hr)){ if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !(info->flags & WAVE_FORMAT_DIRECT)){ - ret = WINMM_MapDevice(device, is_out); + ret = WINMM_MapDevice(device, FALSE, is_out); if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) goto error; }else{

1 0

Ken Thomases : winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window 's bounds.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: 33b077477ac8d875ef7fa56fbb91349741202000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b077477ac8d875ef7fa56fb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 15:35:37 2013 -0600 winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window's bounds. That fails with the dread "invalid drawable" message. (cherry picked from commit 682ed91017e6aa043feaf0c70a34118445e65d1e) --- dlls/winemac.drv/cocoa_opengl.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index b678cae..45799db 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,14 +123,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL windowHasDevice; + __block BOOL viewIsValidDrawable; macdrv_add_view_opengl_context(v, c); OnMainThread(^{ - windowHasDevice = [[view window] windowNumber] > 0; + viewIsValidDrawable = [[view window] windowNumber] > 0 && + !NSIsEmptyRect([view visibleRect]); }); - if (windowHasDevice) + if (viewIsValidDrawable) { [context setView:view]; [context setLatentView:nil];

1 0

Francois Gouget : po: Remove an extraneous full stop in an error message.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: e9d16f4ec21add59768ff5371f77f574b3ebe4bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d16f4ec21add59768ff5371… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 11:21:41 2013 +0100 po: Remove an extraneous full stop in an error message. (cherry picked from commit a81e58f38ee966bdcddeef89c92a06095c6ab63c) --- po/uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/uk.po b/po/uk.po index 145e92f..1acefe3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13865,7 +13865,7 @@ msgstr "Помилка: Командний рядок не підтримуєт #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Помилка: Псевдонім не знайдено.\n" +msgstr "Помилка: Псевдонім не знайдено\n" #: wmic.rc:27 msgid "Error: Invalid query\n"

1 0