January 2014 - Wine-Commits

Ken Thomases : ntdll: On Mac, store the dyld image info address in the PEB.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: f512cf479ae5b623c8cf2e1858b10a71e3b45501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f512cf479ae5b623c8cf2e185… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 4 16:07:55 2013 -0600 ntdll: On Mac, store the dyld image info address in the PEB. (cherry picked from commit 22cf68e1bc079c05ad4bf9397c48f6065019d5e3) --- dlls/ntdll/thread.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 703e83c..ca5c8f9 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -186,6 +186,23 @@ done: return status; } +#ifdef __APPLE__ +#include <mach/mach.h> +#include <mach/mach_error.h> + +static ULONG get_dyld_image_info_addr(void) +{ + ULONG ret = 0; +#ifdef TASK_DYLD_INFO + struct task_dyld_info dyld_info; + mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; + if (task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &size) == KERN_SUCCESS) + ret = dyld_info.all_image_info_addr; +#endif + return ret; +} +#endif /* __APPLE__ */ + /*********************************************************************** * thread_init * @@ -245,6 +262,9 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); InitializeListHead( &tls_links ); +#ifdef __APPLE__ + peb->Reserved[0] = get_dyld_image_info_addr(); +#endif /* allocate and initialize the initial TEB */

1 0

Huw Davies : ntdll: Don' t reduce the size of the local buffer when we come to read another batch of entries.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ed2a34bf31616ade3f866fa38119f175008e0580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2a34bf31616ade3f866fa38… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 3 13:06:21 2013 +0000 ntdll: Don't reduce the size of the local buffer when we come to read another batch of entries. In the wildcard case, we can't know how much to reduce it by anyway. (cherry picked from commit fed9f67bc4e40cecf2fc560004b8d9cd0a4329e3) --- dlls/ntdll/directory.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index e6e1795..3e30129 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1848,9 +1848,6 @@ static int read_directory_getdirentries( int fd, IO_STATUS_BLOCK *io, void *buff continue; } if (size < initial_size) break; /* already restarted once, give up now */ - size = min( size, length - io->Information ); - /* if size is too small don't bother to continue */ - if (size < max_dir_info_size(class) && last_info) break; restart_last_info = last_info; restart_info_pos = io->Information; restart:

1 0

Huw Davies : kernel32: Give the non-wildcard case a chance of succeeding first time around.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 2d2d46b2f1dd2cb3dfd52d1557e1948a5a8bbf56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2d46b2f1dd2cb3dfd52d155… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 4 14:28:55 2013 +0000 kernel32: Give the non-wildcard case a chance of succeeding first time around. (cherry picked from commit 67545ed54c94e3541ae28f8c0e6dcf91dc87f4eb) --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 89e0fad..3239696 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1952,7 +1952,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, IO_STATUS_BLOCK io; BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; - info->data_size = has_wildcard ? 8192 : max_entry_size; + info->data_size = has_wildcard ? 8192 : max_entry_size * 2; while (info->data_size) {

1 0

Andrew Eikum : dsound: Don' t change play position if IAudioClient methods fail.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 50abdd8053aa7994fa7a319f87ad4bf838843df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50abdd8053aa7994fa7a319f8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:41 2013 -0600 dsound: Don't change play position if IAudioClient methods fail. (cherry picked from commit ace3c315b891fbfc801ab20303dce08ad1c76e63) --- dlls/dsound/mixer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 282808e..43b7dca 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -605,8 +605,6 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) if(!prebuf_bytes) return; - device->in_mmdev_bytes += prebuf_bytes; - if(prebuf_bytes + read_offs_bytes > device->buflen){ DWORD chunk_bytes = device->buflen - read_offs_bytes; prebuf_frames = chunk_bytes / device->pwfx->nBlockAlign; @@ -631,6 +629,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; + /* check if anything wrapped */ if(prebuf_bytes > 0){ prebuf_frames = prebuf_bytes / device->pwfx->nBlockAlign; @@ -648,6 +648,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) WARN("ReleaseBuffer failed: %08x\n", hr); return; } + device->in_mmdev_bytes += prebuf_frames * device->pwfx->nBlockAlign; } TRACE("in_mmdev_bytes now = %i\n", device->in_mmdev_bytes);

1 0

Andrew Eikum : winecoreaudio.drv: Don' t return 0 absolute position if AudioQueue call fails.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: deca08bc93d54a6f06462d80640fa75b1fc00ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca08bc93d54a6f06462d806… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 21 12:42:35 2013 -0600 winecoreaudio.drv: Don't return 0 absolute position if AudioQueue call fails. Some failures are temporary, for example if the user reconfigures their audio setup while playing audio. Returning 0 could have bad "going backward in time" effects which can break audio even after the call starts to succeed again. (cherry picked from commit f53dd40ad881cc7f887c0587d42f70bb07ddd2e0) --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 92be329..7a0b3ff 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -681,6 +681,8 @@ static UINT64 get_current_aqbuffer_position(ACImpl *This, int mode) if(sc != noErr){ if(sc != kAudioQueueErr_InvalidRunState) WARN("Unable to get current time: %lx\n", sc); + if(mode == BUFPOS_ABSOLUTE) + return This->highest_sampletime; return 0; }

1 0

Ken Thomases : winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 64e939c2d41d3245b8b782b1ef105404cd5a093d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e939c2d41d3245b8b782b1e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 16:52:07 2013 -0600 winemac: Take WS_EX_TOOLWINDOW into account when computing how much of a window is replaced by the Mac decorations. (cherry picked from commit f6a8c5b50e9562ffea41dfbfe6749b21d4acdb5a) --- dlls/winemac.drv/window.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9007610..d2bacfa 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -137,7 +137,11 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT struct macdrv_window_features wf; get_cocoa_window_features(data, style, ex_style, &wf); - if (wf.title_bar) style_mask |= WS_CAPTION; + if (wf.title_bar) + { + style_mask |= WS_CAPTION; + ex_style_mask |= WS_EX_TOOLWINDOW; + } if (wf.shadow) { style_mask |= WS_DLGFRAME | WS_THICKFRAME;

1 0

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

Jan. 10, 2014

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

Hans Leidekker : advapi32: Forward LogonUserA to LogonUserW.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

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

Hans Leidekker : mlang: Improve IMLangLineBreakConsole:: BreakLineA for the ASCII codepage.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 791b047b9f864b64f2a56196b26da08d50e62573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b047b9f864b64f2a56196b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 10:59:23 2013 +0100 mlang: Improve IMLangLineBreakConsole::BreakLineA for the ASCII codepage. (cherry picked from commit 8c08faba490d821c61033eaec606e8862fe0964b) --- dlls/mlang/mlang.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d28f811..72c136d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -36,6 +36,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "mlang.h" +#include "mimeole.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -44,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mlang); #include "initguid.h" -#define CP_UNICODE 1200 - static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); @@ -3484,10 +3483,28 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( LONG* pcchLine, LONG* pcchSkip) { + LONG i, line = cchSrc, skip = 0; + FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); - *pcchLine = cchSrc; - *pcchSkip = 0; + if (uCodePage == CP_USASCII && cchSrc > cMaxColumns) + { + for (line = cMaxColumns, i = cMaxColumns - 1; i >= 0; i--) + { + if (pszSrc[i] == ' ') + { + while (i >= 0 && pszSrc[i] == ' ') + { + i--; + line--; + skip++; + } + break; + } + } + } + *pcchLine = line; + *pcchSkip = skip; return S_OK; }

1 0

Daniel Lehman : msvcrt: Return wall-clock time from clock().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: ed8357ee890e359fb3660cd1b39a31ec353a1af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8357ee890e359fb3660cd1b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 27 16:42:53 2011 -0700 msvcrt: Return wall-clock time from clock(). (cherry picked from commit 15b35f4d37e4bdd8d2b44b772e800a8ffade7ab6) --- dlls/msvcrt/time.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4c21380..11a5df9 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -30,6 +30,7 @@ #include "mtdll.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -709,19 +710,23 @@ int CDECL _wstrtime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size) */ MSVCRT_clock_t CDECL MSVCRT_clock(void) { - FILETIME ftc, fte, ftk, ftu; - ULONGLONG utime, ktime; - - MSVCRT_clock_t clock; + static LONGLONG start_time; + LARGE_INTEGER systime; - GetProcessTimes(GetCurrentProcess(), &ftc, &fte, &ftk, &ftu); + if(!start_time) { + KERNEL_USER_TIMES pti; - ktime = ((ULONGLONG)ftk.dwHighDateTime << 32) | ftk.dwLowDateTime; - utime = ((ULONGLONG)ftu.dwHighDateTime << 32) | ftu.dwLowDateTime; - - clock = (utime + ktime) / (TICKSPERSEC / MSVCRT_CLOCKS_PER_SEC); + /* while Linux's clock returns user time, Windows' clock + * returns wall-clock time from process start. cache the + * process start time since it won't change and to avoid + * wineserver round-trip overhead */ + if(NtQueryInformationProcess(GetCurrentProcess(), ProcessTimes, &pti, sizeof(pti), NULL)) + return -1; + start_time = pti.CreateTime.QuadPart; + } - return clock; + NtQuerySystemTime(&systime); + return (systime.QuadPart - start_time) * MSVCRT_CLOCKS_PER_SEC / TICKSPERSEC; } /*********************************************************************

1 0

Nikolay Sivov : scrrun: Implement BuildPath method.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 9d26384beb0a2f80a9b766a01e220013cece3899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d26384beb0a2f80a9b766a01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 17 11:49:53 2013 +0400 scrrun: Implement BuildPath method. (cherry picked from commit 70bb23a9acc6abb73005dc221c65c9c682a2d868) --- dlls/scrrun/filesystem.c | 57 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4f0b163..5b94e8f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -713,11 +713,62 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * } static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, - BSTR Name, BSTR *pbstrResult) + BSTR Name, BSTR *Result) { - FIXME("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), pbstrResult); + BSTR ret; - return E_NOTIMPL; + TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + ret[path_len] = 0; + strcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + static const WCHAR bsW[] = {'\\',0}; + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + strcpyW(ret, Path); + if (Path[path_len-1] != ':') + strcatW(ret, bsW); + strcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + strcpyW(ret, Path); + strcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path,

1 0

Rico Schüller : shell32: Use lParam for BFFM_SETOKTEXT.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: fbdeeaa57f28850ddac2068e72f95fbe04cda09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdeeaa57f28850ddac2068e7… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 22 10:35:44 2013 +0100 shell32: Use lParam for BFFM_SETOKTEXT. (cherry picked from commit 5f15a5633c338352aed17474eaa9acec2fe07a1d) --- dlls/shell32/brsfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index a14c172..a849682 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1027,8 +1027,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_SETOKTEXT: /* unicode only */ - TRACE("Set OK text %s\n", debugstr_w((LPWSTR)wParam)); - SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)wParam); + TRACE("Set OK text %s\n", debugstr_w((LPWSTR)lParam)); + SetWindowTextW(GetDlgItem(hWnd, 1), (LPWSTR)lParam); break; case BFFM_SETSELECTIONA:

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 Jan. 10, 2014

Jan. 10, 2014

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

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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

Nikolay Sivov : ntdll: Allow NULL return length argument in NtAdjustPrivilegesToken().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 2007dcf8696998488eacc1c9670699011d4dd4d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2007dcf8696998488eacc1c96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 09:38:09 2013 +0400 ntdll: Allow NULL return length argument in NtAdjustPrivilegesToken(). (cherry picked from commit fd65b0a1c3f5f981cc110ca9e6a0edb6323e1296) --- dlls/advapi32/security.c | 5 +++-- dlls/ntdll/nt.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 359b1e2..a77bad4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -611,8 +611,9 @@ AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges, { NTSTATUS status; - TRACE("\n"); - + TRACE("(%p %d %p %d %p %p)\n", TokenHandle, DisableAllPrivileges, NewState, BufferLength, + PreviousState, ReturnLength); + status = NtAdjustPrivilegesToken(TokenHandle, DisableAllPrivileges, NewState, BufferLength, PreviousState, ReturnLength); diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 1eff375..39139c9 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -223,7 +223,7 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( ret = wine_server_call( req ); if (PreviousState) { - *ReturnLength = reply->len + FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ); + if (ReturnLength) *ReturnLength = reply->len + FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ); PreviousState->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES); } }

1 0

Alexandre Julliard : configure: Update FreeType configure checks for the changed headers location.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 71d262f626d793e58b656508553ce9ccd243d891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d262f626d793e58b6565085… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 30 11:22:25 2013 +0100 configure: Update FreeType configure checks for the changed headers location. (cherry picked from commit 67f9b6e3c5d2397446d39ab454f691c1ee46d2c0) --- configure | 78 +++++++++++++++---------------------------------- configure.ac | 40 +++++++------------------ dlls/gdi32/freetype.c | 62 +++++++++++++-------------------------- include/config.h.in | 33 --------------------- 4 files changed, 54 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71d262f626d793e58b656…

1 0

Henri Verbeet : wined3d: Reimplement wined3d_ftoa().
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: b114a134134db73f1ac5aa693d8ff09b85d4411e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b114a134134db73f1ac5aa693… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 22 10:45:00 2013 +0100 wined3d: Reimplement wined3d_ftoa(). The current implementation is not precise enough when the FPU is in REAL4 mode, which also happens to be the mode d3d9 sets by default. Doing the same thing with integer math is a huge pain, so just replace the decimal separator instead. (cherry picked from commit 12f16f2127ffce9a05eedf008c3aa3732751a7e3) --- dlls/wined3d/utils.c | 47 +++++++---------------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2ee4b95..a4b650d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3731,51 +3731,18 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) IntersectRect(rect, rect, &state->scissor_rect); } -/* This should be equivalent to using the %.8e format specifier, but always - * using '.' as decimal separator. This doesn't handle +/-INF or NAN, since - * the GLSL and ARB parsers wouldn't be able to handle those anyway. */ +/* Print a floating point value with the %.8e format specifier, always using + * '.' as decimal separator. */ void wined3d_ftoa(float value, char *s) { - int x, frac, exponent; - const char *sign = ""; - double d; + int idx = 1; - d = value; if (copysignf(1.0f, value) < 0.0f) - { - d = -d; - sign = "-"; - } - - if (d == 0.0f) - { - x = 0; - frac = 0; - exponent = 0; - } - else - { - double t, diff; - - exponent = floorf(log10f(d)); - d /= pow(10.0, exponent); - - x = d; - t = (d - x) * 100000000; - frac = t; - diff = t - frac; - - if ((diff > 0.5) || (diff == 0.5 && (frac & 1))) - { - if (++frac >= 100000000) - { - frac = 0; - ++x; - } - } - } + ++idx; - sprintf(s, "%s%d.%08de%+03d", sign, x, frac, exponent); + sprintf(s, "%.8e", value); + if (isfinite(value)) + s[idx] = '.'; } void wined3d_release_dc(HWND window, HDC dc)

1 0

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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

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

Jan. 10, 2014

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

Hans Leidekker : advapi32: Return a fake handle from LogonUserW.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 1395dc1cf5a9cf959467b0cdeb2ae8a6b7ff16df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1395dc1cf5a9cf959467b0cde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:31:54 2013 +0100 advapi32: Return a fake handle from LogonUserW. (cherry picked from commit 02970b578eb3bd46810508f622437e107abc541d) --- dlls/advapi32/advapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 7025a21..860c728 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -280,6 +280,7 @@ BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPa FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_w(lpszUsername), debugstr_w(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); + *phToken = (HANDLE *)0xdeadbeef; return TRUE; }

1 0

Jacek Caban : widl: Include resource id in typelib path if not default.
by Alexandre Julliard Jan. 10, 2014

Jan. 10, 2014

Module: wine Branch: stable Commit: 4d9a68589d2ba85d5cbe58584cb1dd5131f4ed25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9a68589d2ba85d5cbe58584… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 12 17:30:45 2013 +0100 widl: Include resource id in typelib path if not default. (cherry picked from commit 318931bd46e3c526b2ec5e2d5bcecaa704e123be) --- tools/widl/register.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index d8b34d9..9a4f219 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -280,6 +280,8 @@ void output_typelib_regscript( const typelib_t *typelib ) const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); unsigned int flags = 0; + char id_part[12] = ""; + expr_t *expr; if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ if (is_attr( typelib->attrs, ATTR_CONTROL )) flags |= 2; /* LIBFLAG_FCONTROL */ @@ -295,8 +297,11 @@ void output_typelib_regscript( const typelib_t *typelib ) put_str( indent, "'%u.%u' = s '%s'\n", MAJORVERSION(version), MINORVERSION(version), descr ? descr : typelib->name ); put_str( indent++, "{\n" ); - put_str( indent, "'%x' { %s = s '%%MODULE%%' }\n", - lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32" ); + expr = get_attrp( typelib->attrs, ATTR_ID ); + if (expr) + sprintf(id_part, "\\%d", expr->cval); + put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", + lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32", id_part ); put_str( indent, "FLAGS = s '%u'\n", flags ); put_str( --indent, "}\n" ); put_str( --indent, "}\n" );

1 0