January 2012 - Wine-Commits

Alexandre Julliard : winex11: Reset clipping when a fullscreen window is unmapped.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: a534925a4817cf5afa8fd692f9502c91c95ad58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a534925a4817cf5afa8fd692f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 13:45:04 2012 +0100 winex11: Reset clipping when a fullscreen window is unmapped. --- dlls/winex11.drv/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fcf5e0e..a172cd2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2543,7 +2543,10 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || (!event_type && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) + { unmap_window( display, data ); + if (is_window_rect_fullscreen( &old_window_rect )) reset_clipping_window(); + } } /* don't change position if we are about to minimize or maximize a managed window */

1 0

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

Jan. 31, 2012

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

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

Jan. 31, 2012

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

Henri Verbeet : ddraw: AddAttachedSurface() just references whatever we pass it.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: 0d8e6719d524ad7bbaf616dff90a1ed6ca15937b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e6719d524ad7bbaf616dff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 21:19:48 2012 +0100 ddraw: AddAttachedSurface() just references whatever we pass it. --- dlls/ddraw/surface.c | 16 ++++++++-------- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 4 +++- dlls/ddraw/tests/ddraw7.c | 4 +++- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f4a4d56..ced64a9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1605,8 +1605,8 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa { return hr; } - ddraw_surface7_AddRef(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); return hr; } @@ -1624,9 +1624,9 @@ static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *ifa { return hr; } - ddraw_surface4_AddRef(&attachment_impl->IDirectDrawSurface4_iface); - ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); return hr; } static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) @@ -1670,8 +1670,8 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa { return hr; } - ddraw_surface3_AddRef(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); return hr; } @@ -1689,9 +1689,9 @@ static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *ifa { return hr; } - ddraw_surface2_AddRef(&attachment_impl->IDirectDrawSurface2_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); return hr; } @@ -1709,9 +1709,9 @@ static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *ifac { return hr; } - ddraw_surface1_AddRef(&attachment_impl->IDirectDrawSurface_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3542564..233d013 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -662,6 +662,7 @@ static void test_surface_interface_mismatch(void) IDirect3DMaterial *background = NULL; DDSURFACEDESC surface_desc; DWORD z_depth = 0; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -728,7 +729,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); + refcount = IDirectDrawSurface_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5fa6028..3a62f57 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -687,6 +687,7 @@ static void test_surface_interface_mismatch(void) IDirect3DMaterial2 *background = NULL; DDSURFACEDESC surface_desc; DWORD z_depth = 0; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -753,7 +754,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); + refcount = IDirectDrawSurface_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 34cab7f..b242f86 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -875,6 +875,7 @@ static void test_surface_interface_mismatch(void) IDirect3DViewport3 *viewport = NULL; DDSURFACEDESC2 surface_desc; DDPIXELFORMAT z_fmt; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -936,7 +937,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface4_Release(ds); + refcount = IDirectDrawSurface4_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8eb7098..0460a3f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -841,6 +841,7 @@ static void test_surface_interface_mismatch(void) IDirect3DDevice7 *device = NULL; DDSURFACEDESC2 surface_desc; DDPIXELFORMAT z_fmt; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -900,7 +901,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface7_Release(ds); + refcount = IDirectDrawSurface7_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup;

1 0

Henri Verbeet : wrc: Avoid an unused function warning when HAVE_LIBGETTEXTPO is not defined.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: 187065e1c34811f5876afca41e76d97e2a64116f URL: http://source.winehq.org/git/wine.git/?a=commit;h=187065e1c34811f5876afca41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 21:19:49 2012 +0100 wrc: Avoid an unused function warning when HAVE_LIBGETTEXTPO is not defined. --- tools/wrc/po.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 1d679ba..b4497c9 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -124,16 +124,6 @@ static char *get_message_context( char **msgid ) return context; } -static int string_has_context( const string_t *str ) -{ - char *id, *id_buffer, *context; - - id_buffer = id = convert_msgid_ascii( str, 1 ); - context = get_message_context( &id ); - free( id_buffer ); - return context != NULL; -} - static int control_has_title( const control_t *ctrl ) { if (!ctrl->title) return 0; @@ -819,6 +809,16 @@ static void add_po_menu( const resource_t *english, const resource_t *res ) add_po_menu_items( po, english_items, items, res->res.men->lvc.language ); } +static int string_has_context( const string_t *str ) +{ + char *id, *id_buffer, *context; + + id_buffer = id = convert_msgid_ascii( str, 1 ); + context = get_message_context( &id ); + free( id_buffer ); + return context != NULL; +} + static void add_pot_accel( po_file_t po, const resource_t *res ) { event_t *event = res->res.acc->events;

1 0

Austin English : wscript: Remove an unused variable (LLVM/Clang).
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: c02d0d85ea1ec16efa0190f169e158c580f52672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02d0d85ea1ec16efa0190f16… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 30 22:41:30 2012 -0600 wscript: Remove an unused variable (LLVM/Clang). --- programs/wscript/tests/run.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 315f51f..567bf45 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -341,7 +341,6 @@ static IClassFactory testobj_cf = { &ClassFactoryVtbl }; static void run_test(const char *file_name) { - SECURITY_ATTRIBUTES sa = {sizeof(sa), 0, TRUE}; char command[MAX_PATH]; STARTUPINFOA si = {sizeof(si)}; PROCESS_INFORMATION pi;

1 0

Austin English : dsound: Remove an unnecessary assignment (LLVM/Clang).
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

Module: wine Branch: master Commit: c6bda4dc172ccea50037464770513ef10edc7257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bda4dc172ccea5003746477… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 30 22:47:46 2012 -0600 dsound: Remove an unnecessary assignment (LLVM/Clang). --- dlls/dsound/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 23af6ce..7d0ea66 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -482,7 +482,7 @@ static LPBYTE DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT len) static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD fraglen) { INT len = fraglen, ilen; - BYTE *ibuf = dsb->buffer->memory + dsb->buf_mixpos, *volbuf; + BYTE *ibuf, *volbuf; DWORD oldpos, mixbufpos; TRACE("buf_mixpos=%d/%d sec_mixpos=%d/%d\n", dsb->buf_mixpos, dsb->tmp_buffer_len, dsb->sec_mixpos, dsb->buflen);

1 0

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

Jan. 31, 2012

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 Jan. 31, 2012

Jan. 31, 2012

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: Implement a lock-free callback design.
by Alexandre Julliard Jan. 31, 2012

Jan. 31, 2012

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