January 2014 - Wine-commits

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 10 Jan '14

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

Nikolay Sivov : scrrun: Implement BuildPath method.
by Alexandre Julliard 10 Jan '14

10 Jan '14

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

Henri Verbeet : wined3d: Reimplement wined3d_ftoa().
by Alexandre Julliard 10 Jan '14

10 Jan '14

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

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

10 Jan '14

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

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

10 Jan '14

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

Hans Leidekker : advapi32: Perform a case-insensitive match on the credential target name.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: stable Commit: ed13665827ebc90f4726a366c048c6ee063d0664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed13665827ebc90f4726a366c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 14:35:38 2013 +0100 advapi32: Perform a case-insensitive match on the credential target name. (cherry picked from commit 0c56639a6aff582689f66e0273cecabd00212715) --- dlls/advapi32/cred.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e17dfb6..58dd72d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -746,7 +746,7 @@ static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; @@ -818,7 +818,7 @@ static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCH TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; HeapFree(GetProcessHeap(), 0, target_name);

1 0

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

10 Jan '14

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