January 2012 - Wine-commits

Austin English : msvcp60: Remove unnecessary assignments (LLVM/Clang).
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 79dd34993a4fcb0ffaf166b8ed1307db6b234960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dd34993a4fcb0ffaf166b8e… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 30 22:50:53 2012 -0600 msvcp60: Remove unnecessary assignments (LLVM/Clang). --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 96e7134..3138d06 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1411,7 +1411,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_replace_ch, 20) basic_string_char* __thiscall basic_string_char_replace_ch(basic_string_char *this, MSVCP_size_t off, MSVCP_size_t len, MSVCP_size_t count, char ch) { - char *ptr = this->ptr; + char *ptr; TRACE("%p %ld %ld %ld %c\n", this, off, len, count, ch); @@ -3107,7 +3107,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_replace_ch, 20) basic_string_wchar* __thiscall basic_string_wchar_replace_ch(basic_string_wchar *this, MSVCP_size_t off, MSVCP_size_t len, MSVCP_size_t count, wchar_t ch) { - wchar_t *ptr = this->ptr; + wchar_t *ptr; TRACE("%p %ld %ld %ld %c\n", this, off, len, count, ch);

1 0

Jacek Caban : urlmon: Relative URI without scheme may be treated as hierarchical.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 1aa9389eaf2fab4b67483e77021f635ee13e987d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa9389eaf2fab4b67483e770… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:42:44 2012 +0100 urlmon: Relative URI without scheme may be treated as hierarchical. --- dlls/urlmon/tests/uri.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 4 +- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9a27e59..9d9487a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4421,6 +4421,81 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL} } }, + { "//host.com/path/file.txt?query", Uri_CREATE_ALLOW_RELATIVE, S_OK, FALSE, + { + {"//host.com/path/file.txt?query",S_OK}, + {"host.com",S_OK}, + {"//host.com/path/file.txt?query",S_OK}, + {"host.com",S_OK}, + {".txt",S_OK}, + {"",S_FALSE}, + {"host.com",S_OK}, + {"",S_FALSE}, + {"/path/file.txt",S_OK}, + {"/path/file.txt?query",S_OK}, + {"?query",S_OK}, + {"//host.com/path/file.txt?query",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "//host/path/file.txt?query", Uri_CREATE_ALLOW_RELATIVE, S_OK, FALSE, + { + {"//host/path/file.txt?query",S_OK}, + {"host",S_OK}, + {"//host/path/file.txt?query",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"host",S_OK}, + {"",S_FALSE}, + {"/path/file.txt",S_OK}, + {"/path/file.txt?query",S_OK}, + {"?query",S_OK}, + {"//host/path/file.txt?query",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "//host", Uri_CREATE_ALLOW_RELATIVE, S_OK, FALSE, + { + {"//host/",S_OK}, + {"host",S_OK}, + {"//host/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"host",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"//host",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + } }; typedef struct _invalid_uri { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4cefaa0..653e22c 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -410,7 +410,7 @@ static void apply_default_flags(DWORD *flags) { * B.) It's an implicit file scheme. * C.) It's a known hierarchical scheme and it has two '\\' after the scheme name. * (the '\\' will be converted into "//" during canonicalization). - * D.) It's not a relative URI and "//" appears after the scheme name. + * D.) "//" appears after the scheme name (or at the beginning if no scheme is given). */ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data) { const WCHAR *start = *ptr; @@ -422,7 +422,7 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { *ptr += 2; return TRUE; - } else if(!data->is_relative && check_hierarchical(ptr)) + } else if(check_hierarchical(ptr)) return TRUE; *ptr = start;

1 0

Jacek Caban : urlmon: Properly handle relative URIs with specified host in combine_uri.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 051cb8e62534b7d1d3172913e0dd632430dd8fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=051cb8e62534b7d1d3172913e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:43:08 2012 +0100 urlmon: Properly handle relative URIs with specified host in combine_uri. --- dlls/urlmon/tests/uri.c | 69 ++++++++++++++++++++++++++++++++++++++++++---- dlls/urlmon/uri.c | 52 +++++++++++++++++++---------------- 2 files changed, 91 insertions(+), 30 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9d9487a..4b0e788 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -121,6 +121,7 @@ typedef struct _uri_dword_property { DWORD value; HRESULT expected; BOOL todo; + BOOL broken_combine_hres; } uri_dword_property; typedef struct _uri_properties { @@ -6693,6 +6694,60 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_MK,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://winehq.org/dir/test?querystring",0, + "//winehq.com/#hash",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.com/#hash",S_OK}, + {"winehq.com",S_OK}, + {"http://winehq.com/#hash",S_OK}, + {"winehq.com",S_OK}, + {"",S_FALSE}, + {"#hash",S_OK}, + {"winehq.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://winehq.com/#hash",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK,FALSE,TRUE}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://winehq.org/dir/test?querystring",0, + "//winehq.com/dir2/../dir/file.txt?query#hash",Uri_CREATE_ALLOW_RELATIVE, + 0,S_OK,FALSE, + { + {"http://winehq.com/dir/file.txt?query#hash",S_OK}, + {"winehq.com",S_OK}, + {"http://winehq.com/dir/file.txt?query#hash",S_OK}, + {"winehq.com",S_OK}, + {".txt",S_OK}, + {"#hash",S_OK}, + {"winehq.com",S_OK}, + {"",S_FALSE}, + {"/dir/file.txt",S_OK}, + {"/dir/file.txt?query",S_OK}, + {"?query",S_OK}, + {"http://winehq.com/dir/file.txt?query#hash",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK,FALSE,TRUE}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -10035,11 +10090,12 @@ static void test_CoInternetCombineIUri(void) { prop.value, received, i, j); } } else { - ok(hr == prop.expected, + ok(hr == prop.expected || broken(prop.broken_combine_hres && hr == S_FALSE), "Error: IUri_GetPropertyDWORD returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].dword_props[%d].\n", hr, prop.expected, i, j); - ok(prop.value == received, "Error: Expected %d, but got %d instead on uri_combine_tests[%d].dword_props[%d].\n", - prop.value, received, i, j); + if(!prop.broken_combine_hres || hr != S_FALSE) + ok(prop.value == received, "Error: Expected %d, but got %d instead on uri_combine_tests[%d].dword_props[%d].\n", + prop.value, received, i, j); } } } @@ -10351,11 +10407,12 @@ static void test_CoInternetCombineUrlEx(void) { prop.value, received, i, j); } } else { - ok(hr == prop.expected, + ok(hr == prop.expected || broken(prop.broken_combine_hres && hr == S_FALSE), "Error: IUri_GetPropertyDWORD returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].dword_props[%d].\n", hr, prop.expected, i, j); - ok(prop.value == received, "Error: Expected %d, but got %d instead on uri_combine_tests[%d].dword_props[%d].\n", - prop.value, received, i, j); + if(!prop.broken_combine_hres || hr != S_FALSE) + ok(prop.value == received, "Error: Expected %d, but got %d instead on uri_combine_tests[%d].dword_props[%d].\n", + prop.value, received, i, j); } } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 653e22c..2710c7c 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6427,6 +6427,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, Uri *ret; HRESULT hr; parse_data data; + Uri *proc_uri = base; DWORD create_flags = 0, len = 0; memset(&data, 0, sizeof(parse_data)); @@ -6483,35 +6484,38 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, create_flags |= Uri_CREATE_ALLOW_RELATIVE; } - if(base->authority_start > -1) { - if(base->userinfo_start > -1 && base->userinfo_split != 0) { - data.username = base->canon_uri+base->userinfo_start; - data.username_len = (base->userinfo_split > -1) ? base->userinfo_split : base->userinfo_len; + if(relative->authority_start > -1) + proc_uri = relative; + + if(proc_uri->authority_start > -1) { + if(proc_uri->userinfo_start > -1 && proc_uri->userinfo_split != 0) { + data.username = proc_uri->canon_uri+proc_uri->userinfo_start; + data.username_len = (proc_uri->userinfo_split > -1) ? proc_uri->userinfo_split : proc_uri->userinfo_len; } - if(base->userinfo_split > -1) { - data.password = base->canon_uri+base->userinfo_start+base->userinfo_split+1; - data.password_len = base->userinfo_len-base->userinfo_split-1; + if(proc_uri->userinfo_split > -1) { + data.password = proc_uri->canon_uri+proc_uri->userinfo_start+proc_uri->userinfo_split+1; + data.password_len = proc_uri->userinfo_len-proc_uri->userinfo_split-1; } - if(base->host_start > -1) { - data.host = base->canon_uri+base->host_start; - data.host_len = base->host_len; - data.host_type = base->host_type; + if(proc_uri->host_start > -1) { + data.host = proc_uri->canon_uri+proc_uri->host_start; + data.host_len = proc_uri->host_len; + data.host_type = proc_uri->host_type; } - if(base->has_port) { + if(proc_uri->has_port) { data.has_port = TRUE; - data.port_value = base->port; + data.port_value = proc_uri->port; } } else if(base->scheme_type != URL_SCHEME_FILE) data.is_opaque = TRUE; - if(relative->path_start == -1 || !relative->path_len) { - if(base->path_start > -1) { - data.path = base->canon_uri+base->path_start; - data.path_len = base->path_len; - } else if((base->path_start == -1 || !base->path_len) && !data.is_opaque) { + if(proc_uri == relative || relative->path_start == -1 || !relative->path_len) { + if(proc_uri->path_start > -1) { + data.path = proc_uri->canon_uri+proc_uri->path_start; + data.path_len = proc_uri->path_len; + } else if(!data.is_opaque) { /* Just set the path as a '/' if the base didn't have * one and if it's an hierarchical URI. */ @@ -6520,12 +6524,12 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, data.path_len = 1; } - if(relative->query_start > -1) { - data.query = relative->canon_uri+relative->query_start; - data.query_len = relative->query_len; - } else if(base->query_start > -1) { - data.query = base->canon_uri+base->query_start; - data.query_len = base->query_len; + if(relative->query_start > -1) + proc_uri = relative; + + if(proc_uri->query_start > -1) { + data.query = proc_uri->canon_uri+proc_uri->query_start; + data.query_len = proc_uri->query_len; } } else { const WCHAR *ptr, **pptr;

1 0

Jörg Höhle : winecoreaudio: Avoid deadlock in AudioClient_Stop.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: c99501197425ca0bbda04465da0c23ea76fe73a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99501197425ca0bbda04465d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 15 20:16:51 2012 +0100 winecoreaudio: Avoid deadlock in AudioClient_Stop. --- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 07359c0..52fdef0 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1440,8 +1440,12 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) if(This->event) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, - ca_period_cb, This, 0, This->period_ms, 0)) - ERR("Unable to create timer: %u\n", GetLastError()); + ca_period_cb, This, 0, This->period_ms, 0)){ + This->timer = NULL; + OSSpinLockUnlock(&This->lock); + WARN("Unable to create timer: %u\n", GetLastError()); + return E_OUTOFMEMORY; + } This->playing = StateInTransition; @@ -1467,6 +1471,8 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) ACImpl *This = impl_from_IAudioClient(iface); AudioTimeStamp tstamp; OSStatus sc; + HANDLE event = NULL; + BOOL wait = FALSE; TRACE("(%p)\n", This); @@ -1487,9 +1493,13 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) return S_OK; } - if(This->timer && This->timer != INVALID_HANDLE_VALUE){ - DeleteTimerQueueTimer(g_timer_q, This->timer, INVALID_HANDLE_VALUE); + if(This->timer){ + event = CreateEventW(NULL, TRUE, FALSE, NULL); + wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event); This->timer = NULL; + if(wait) + WARN("DeleteTimerQueueTimer error %u\n", GetLastError()); + wait = wait && GetLastError() == ERROR_IO_PENDING; } This->playing = StateInTransition; @@ -1506,6 +1516,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) OSSpinLockUnlock(&This->lock); + if(event && wait) + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + sc = AudioQueueFlush(This->aqueue); if(sc != noErr) WARN("Unable to flush audio queue: %lx\n", sc);

1 0

Jörg Höhle : winecoreaudio: Implement a lock-free callback design.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 4b888861f95d8199f420a8ab7c1c725be996fa26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b888861f95d8199f420a8ab7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jan 27 21:07:02 2012 +0100 winecoreaudio: Implement a lock-free callback design. --- dlls/winecoreaudio.drv/mmdevdrv.c | 131 +++++++++++++++++++++++-------------- 1 files changed, 81 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b888861f95d8199f420a…

1 0

Jörg Höhle : winecoreaudio: Fix the Start/Stop/ Reset cycle.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: f489cc97c7b6e704545ec6941b8dfa8bbe12165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f489cc97c7b6e704545ec6941… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jan 29 14:33:50 2012 +0100 winecoreaudio: Fix the Start/Stop/Reset cycle. --- dlls/winecoreaudio.drv/mmdevdrv.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 7dcaa53..a940cbf 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1459,6 +1459,11 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) return E_OUTOFMEMORY; } + if(This->dataflow == eCapture){ + UINT32 frames; /* enqueue packets */ + AudioCaptureClient_GetNextPacket(This, &frames); + } + This->playing = StateInTransition; sc = AudioQueueStart(This->aqueue, NULL); @@ -1523,12 +1528,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) }else WARN("GetCurrentTime failed: %lx\n", sc); - sc = AudioQueueFlush(This->aqueue); - if(sc != noErr){ - OSSpinLockUnlock(&This->lock); - WARN("Unable to flush audio queue: %lx\n", sc); - } - + /* Mac OS bug? Our capture callback is no more called past AQStop */ sc = AudioQueuePause(This->aqueue); if(sc != noErr){ OSSpinLockUnlock(&This->lock); @@ -1552,6 +1552,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) ACImpl *This = impl_from_IAudioClient(iface); OSStatus sc; QueuedBufInfo *bufinfo, *bufinfo2; + AQBuffer *buf; TRACE("(%p)\n", This); @@ -1572,8 +1573,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_BUFFER_OPERATION_PENDING; } - This->written_frames = 0; - This->inbuf_frames = 0; + avail_update(This); /* going to skip over inbuf_frames */ LIST_FOR_EACH_ENTRY_SAFE(bufinfo, bufinfo2, &This->queued_bufinfos, QueuedBufInfo, entry){ @@ -1588,6 +1588,18 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return E_FAIL; } + /* AQReset is synchronous */ + list_move_tail(&This->avail_buffers, &This->queued_buffers); + + if(This->dataflow == eRender){ + This->written_frames = 0; + }else{ + LIST_FOR_EACH_ENTRY(buf, &This->avail_buffers, AQBuffer, entry) + buf->buf->mAudioDataByteSize = 0; + This->written_frames += This->inbuf_frames; + } + This->inbuf_frames = 0; + OSSpinLockUnlock(&This->lock); return S_OK; @@ -1984,8 +1996,6 @@ static HRESULT AudioCaptureClient_GetNextPacket(ACImpl *This, UINT32 *frames) return S_OK; WARN("empty packet\n"); - /* fixme: for reasons not yet understood, the initially submitted - * packets are returned with 0 bytes. Resubmit them. */ buf->used = TRUE; sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); if(sc != noErr){

1 0

Jörg Höhle : mciwave: Always reach an end position expressed in milliseconds.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: bdf757838988148a10f98e660b9ccede5f5e7d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf757838988148a10f98e660… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 31 09:33:19 2012 +0100 mciwave: Always reach an end position expressed in milliseconds. --- dlls/mciwave/mciwave.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index effecf4..723b5fe 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -225,7 +225,7 @@ static void WAVE_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIWAVE* wmw, UINT wStat /************************************************************************** * WAVE_ConvertByteToTimeFormat [internal] */ -static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD lpRet) +static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val) { DWORD ret = 0; @@ -243,7 +243,6 @@ static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); } TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wmw->dwMciTimeFormat, ret); - *lpRet = 0; return ret; } @@ -257,6 +256,9 @@ static DWORD WAVE_ConvertTimeFormatToByte(WINE_MCIWAVE* wmw, DWORD val) switch (wmw->dwMciTimeFormat) { case MCI_FORMAT_MILLISECONDS: ret = MulDiv(val,wmw->lpWaveFormat->nAvgBytesPerSec,1000); + if (ret > wmw->ckWaveData.cksize && + val == WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize)) + ret = wmw->ckWaveData.cksize; break; case MCI_FORMAT_BYTES: ret = val; @@ -1484,7 +1486,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM return MCIERR_UNSUPPORTED_FUNCTION; } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ - lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize, &ret); + lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize); TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: @@ -1509,8 +1511,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, - (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition, - &ret); + (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition); TRACE("MCI_STATUS_POSITION %s => %lu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break;

1 0

Alexandre Julliard : psapi/tests: Don' t check data returned from a failing call.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 773c46b9295a489744767dca824b234b720c4566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773c46b9295a489744767dca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:43:03 2012 +0100 psapi/tests: Don't check data returned from a failing call. --- dlls/psapi/tests/psapi_main.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 71c3c95..e6e0cab 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -203,17 +203,20 @@ todo_wine todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); - ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); -todo_wine - ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); - szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ -todo_wine - ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); - if (szMapBaseName) + if (ret) { - GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); - ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), - "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); + todo_wine + ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); + szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ + todo_wine + ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); + if (szMapBaseName) + { + GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); + ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), + "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + } } GetTempPath(MAX_PATH, temp_path);

1 0

Piotr Caban : urlmon: Handle implicit file scheme in MapUrlToZone and GetSecurityId functions.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 804a9d80d85d85485e8d586271996edba0a7e3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804a9d80d85d85485e8d58627… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 31 14:11:20 2012 +0100 urlmon: Handle implicit file scheme in MapUrlToZone and GetSecurityId functions. --- dlls/urlmon/sec_mgr.c | 4 ++-- dlls/urlmon/tests/sec_mgr.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index d569f12..d8f1a2b 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -602,7 +602,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) memcpy(secur_url, url, size); } - hres = CreateUri(secur_url, 0, 0, &secur_uri); + hres = CreateUri(secur_url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &secur_uri); if(FAILED(hres)) { CoTaskMemFree(secur_url); return hres; @@ -805,7 +805,7 @@ static HRESULT get_security_id_for_url(LPCWSTR url, BYTE *secid, DWORD *secid_le if(FAILED(hres)) return hres == 0x80041001 ? E_INVALIDARG : hres; - hres = CreateUri(secur_url, 0, 0, &uri); + hres = CreateUri(secur_url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); CoTaskMemFree(secur_url); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2509d84..d0e89ce 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -105,6 +105,7 @@ static const WCHAR url14[] = {'z','i','p',':','t','e','s','t','i','n','g','.','c static const WCHAR url15[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','c','o','m','.','u','k',0}; static const WCHAR url16[] = {'f','i','l','e',':','/','/','/','c',':',0}; static const WCHAR url17[] = {'f','i','l','e',':','/','/','/','c',':','c','\\',0}; +static const WCHAR url18[] = {'c',':','\\','t','e','s','t','.','h','t','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -161,7 +162,8 @@ static struct secmgr_test { {url11,0, S_OK, sizeof(secid1), secid1, S_OK}, {url12,0, S_OK, sizeof(secid1), secid1, S_OK}, {url16,0, S_OK, sizeof(secid1), secid1, S_OK}, - {url17,0, S_OK, sizeof(secid1), secid1, S_OK} + {url17,0, S_OK, sizeof(secid1), secid1, S_OK}, + {url18,0, S_OK, sizeof(secid1), secid1, S_OK} }; static int strcmp_w(const WCHAR *str1, const WCHAR *str2)

1 0

Alexandre Julliard : winex11: Consider zero-size windows mapped even when they are positioned at 0, 0.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 4f0f7dec9927eba84a98acd63b22f1d843d672fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0f7dec9927eba84a98acd63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 17:28:34 2012 +0100 winex11: Consider zero-size windows mapped even when they are positioned at 0,0. --- dlls/winex11.drv/x11drv.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e3c4c3..78e7cd0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -648,8 +648,10 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) static inline BOOL is_window_rect_mapped( const RECT *rect ) { - return (rect->left < virtual_screen_rect.right && rect->top < virtual_screen_rect.bottom && - rect->right > virtual_screen_rect.left && rect->bottom > virtual_screen_rect.top); + return (rect->left < virtual_screen_rect.right && + rect->top < virtual_screen_rect.bottom && + max( rect->right, rect->left + 1 ) > virtual_screen_rect.left && + max( rect->bottom, rect->top + 1 ) > virtual_screen_rect.top); } static inline BOOL is_window_rect_fullscreen( const RECT *rect )

1 0