October 2010 - Wine-commits

Stefan Oberhumer : ntdll: Fix 64 bit issue within NTDLL_mergesort().
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 98134a8c5a3a641d31156828297a1d9e5fb31be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98134a8c5a3a641d311568282… Author: Stefan Oberhumer <stefan(a)obssys.com> Date: Sat Oct 2 00:31:03 2010 +0200 ntdll: Fix 64 bit issue within NTDLL_mergesort(). --- dlls/ntdll/misc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2d7c0a7..39b0ad3 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -255,11 +255,11 @@ double CDECL NTDLL_tan( double d ) /* Merge Sort. Algorithm taken from http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm */ static void -NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), - int left, int right ) +NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), + size_t left, size_t right ) { if(right>left) { - int i, j, k, m; + size_t i, j, k, m; m=(right+left)/2; NTDLL_mergesort( arr, barr, elemsize, compar, left, m); NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);

1 0

Thomas Mullaly : urlmon: Restructured how ports are canonicalized.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: d8263344efd2349afbf8347edaba792d95e12b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8263344efd2349afbf8347ed… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 29 20:24:01 2010 -0400 urlmon: Restructured how ports are canonicalized. --- dlls/urlmon/uri.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c34c418..7aa62ca 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2764,8 +2764,6 @@ static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOO USHORT default_port = 0; DWORD i; - uri->has_port = FALSE; - /* Check if the scheme has a default port. */ for(i = 0; i < sizeof(default_ports)/sizeof(default_ports[0]); ++i) { if(default_ports[i].scheme == data->scheme_type) { @@ -2775,8 +2773,7 @@ static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOO } } - if(data->port || has_default_port) - uri->has_port = TRUE; + uri->has_port = data->has_port || has_default_port; /* Possible cases: * 1) Has a port which is the default port. @@ -2784,38 +2781,42 @@ static BOOL canonicalize_port(const parse_data *data, Uri *uri, DWORD flags, BOO * 3) Doesn't have a port, but, scheme has a default port. * 4) No port. */ - if(has_default_port && data->port && data->port_value == default_port) { + if(has_default_port && data->has_port && data->port_value == default_port) { /* If it's the default port and this flag isn't set, don't do anything. */ if(flags & Uri_CREATE_NO_CANONICALIZE) { - /* Copy the original port over. */ - if(!computeOnly) { + if(!computeOnly) uri->canon_uri[uri->canon_len] = ':'; - memcpy(uri->canon_uri+uri->canon_len+1, data->port, data->port_len*sizeof(WCHAR)); + ++uri->canon_len; + + if(data->port) { + /* Copy the original port over. */ + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->port, data->port_len*sizeof(WCHAR)); + uri->canon_len += data->port_len; + } else { + if(!computeOnly) + uri->canon_len += ui2str(uri->canon_uri+uri->canon_len, data->port_value); + else + uri->canon_len += ui2str(NULL, data->port_value); } - uri->canon_len += data->port_len+1; } uri->port = default_port; - } else if(data->port) { + } else if(data->has_port) { if(!computeOnly) uri->canon_uri[uri->canon_len] = ':'; ++uri->canon_len; - if(flags & Uri_CREATE_NO_CANONICALIZE) { + if(flags & Uri_CREATE_NO_CANONICALIZE && data->port) { /* Copy the original over without changes. */ if(!computeOnly) memcpy(uri->canon_uri+uri->canon_len, data->port, data->port_len*sizeof(WCHAR)); uri->canon_len += data->port_len; } else { - const WCHAR formatW[] = {'%','u',0}; - INT len = 0; if(!computeOnly) - len = sprintfW(uri->canon_uri+uri->canon_len, formatW, data->port_value); - else { - WCHAR tmp[6]; - len = sprintfW(tmp, formatW, data->port_value); - } - uri->canon_len += len; + uri->canon_len += ui2str(uri->canon_uri+uri->canon_len, data->port_value); + else + uri->canon_len += ui2str(NULL, data->port_value); } uri->port = data->port_value;

1 0

Thomas Mullaly : urlmon: Restructured how the path component is validated in a IUriBuilder.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: e1280919b8ac6dfc530351df60397365d16992f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1280919b8ac6dfc530351df6… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Sep 30 22:40:44 2010 -0400 urlmon: Restructured how the path component is validated in a IUriBuilder. --- dlls/urlmon/uri.c | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 7aa62ca..04482e1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3734,8 +3734,11 @@ static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags) static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD flags) { const WCHAR *ptr = NULL; + const WCHAR *component; const WCHAR **pptr; DWORD expected_len; + BOOL check_len = TRUE; + BOOL valid = FALSE; if(builder->path) { ptr = builder->path; @@ -3744,29 +3747,30 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD builder->uri && builder->uri->path_start > -1) { ptr = builder->uri->canon_uri+builder->uri->path_start; expected_len = builder->uri->path_len; + } else { + static const WCHAR nullW[] = {0}; + ptr = nullW; + check_len = FALSE; } - if(ptr) { - BOOL valid = FALSE; - const WCHAR *component = ptr; - pptr = &ptr; - - /* How the path is validated depends on what type of - * URI it is. - */ - valid = data->is_opaque ? - parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags); + component = ptr; + pptr = &ptr; - if(!valid || expected_len != data->path_len) { - TRACE("(%p %p %x): Invalid path componet %s.\n", builder, data, flags, - debugstr_wn(component, expected_len)); - return INET_E_INVALID_URL; - } + /* How the path is validated depends on what type of + * URI it is. + */ + valid = data->is_opaque ? + parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags); - TRACE("(%p %p %x): Valid path component %s len=%d.\n", builder, data, flags, - debugstr_wn(data->path, data->path_len), data->path_len); + if(!valid || (check_len && expected_len != data->path_len)) { + TRACE("(%p %p %x): Invalid path componet %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; } + TRACE("(%p %p %x): Valid path component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + return S_OK; }

1 0

Thomas Mullaly : urlmon: canonicalize_path_hierarchical should prepend a '/ ' if needed.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: bc3f8bb0c7c47fa07ffada45fbe926b13f89d593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3f8bb0c7c47fa07ffada45f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Sep 30 22:47:01 2010 -0400 urlmon: canonicalize_path_hierarchical should prepend a '/' if needed. --- dlls/urlmon/uri.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 04482e1..726ee3f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2921,6 +2921,13 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, } } + if(!is_file && *(data->path) && *(data->path) != '/') { + /* Prepend a '/' to the path if it doesn't have one. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = '/'; + ++uri->canon_len; + } + for(; ptr < data->path+data->path_len; ++ptr) { if(*ptr == '%') { const WCHAR *tmp = ptr;

1 0

Thomas Mullaly : urlmon: Implemented canonicalization of IUriBuilder components.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: d2a0da17c7df90593d73e1cecef7d419ac4322ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a0da17c7df90593d73e1cec… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Oct 1 15:47:59 2010 -0400 urlmon: Implemented canonicalization of IUriBuilder components. --- dlls/urlmon/tests/uri.c | 136 +++++++++++++++++------------------- dlls/urlmon/uri.c | 180 ++++++++++++++++++++++++++-------------------- 2 files changed, 166 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2a0da17c7df90593d73e…

1 0

Thomas Mullaly : urlmon: Fixed memory leak in error path of CreateUri.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: dfaabee3e80f96088e49bfb550c4bdb72bf65931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaabee3e80f96088e49bfb55… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Oct 2 15:25:43 2010 -0400 urlmon: Fixed memory leak in error path of CreateUri. --- dlls/urlmon/uri.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f3220f8..9f78e28 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3421,14 +3421,12 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->canon_size = len; if(!canonicalize_scheme(data, uri, flags, FALSE)) { ERR("(%p %p %x): Unable to canonicalize the scheme of the URI.\n", data, uri, flags); - heap_free(uri->canon_uri); return E_INVALIDARG; } uri->scheme_type = data->scheme_type; if(!canonicalize_hierpart(data, uri, flags, FALSE)) { ERR("(%p %p %x): Unable to canonicalize the heirpart of the URI\n", data, uri, flags); - heap_free(uri->canon_uri); return E_INVALIDARG; } @@ -4928,12 +4926,11 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU if(dwFlags & ~supported_flags) FIXME("Ignoring unsupported flag(s) %x\n", dwFlags & ~supported_flags); - ret = heap_alloc(sizeof(Uri)); - if(!ret) + ret = create_uri_obj(); + if(!ret) { + *ppURI = NULL; return E_OUTOFMEMORY; - - ret->lpIUriVtbl = &UriVtbl; - ret->ref = 1; + } /* Explicitly set the default flags if it doesn't cause a flag conflict. */ apply_default_flags(&dwFlags); @@ -4955,8 +4952,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /* Validate and parse the URI into it's components. */ if(!parse_uri(&data, dwFlags)) { /* Encountered an unsupported or invalid URI */ - SysFreeString(ret->raw_uri); - heap_free(ret); + IUri_Release(URI(ret)); *ppURI = NULL; return E_INVALIDARG; } @@ -4964,8 +4960,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /* Canonicalize the URI. */ hr = canonicalize_uri(&data, ret, dwFlags); if(FAILED(hr)) { - SysFreeString(ret->raw_uri); - heap_free(ret); + IUri_Release(URI(ret)); *ppURI = NULL; return hr; }

1 0

Nick Bowler : dsound: Restore old format on SetFormat failure.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 681d54462017bbca7317f4a3b9efeffee88df8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=681d54462017bbca7317f4a3b… Author: Nick Bowler <nbowler(a)draconx.ca> Date: Sun Oct 3 11:52:00 2010 -0400 dsound: Restore old format on SetFormat failure. --- dlls/dsound/primary.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 8a054f8..aa8450f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -441,10 +441,17 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP return DS_OK; } +static DWORD DSOUND_GetFormatSize(LPCWAVEFORMATEX wfex) +{ + if (wfex->wFormatTag == WAVE_FORMAT_PCM) + return sizeof(WAVEFORMATEX); + else + return sizeof(WAVEFORMATEX) + wfex->cbSize; +} + LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) { - DWORD size = wfex->wFormatTag == WAVE_FORMAT_PCM ? - sizeof(WAVEFORMATEX) : sizeof(WAVEFORMATEX) + wfex->cbSize; + DWORD size = DSOUND_GetFormatSize(wfex); LPWAVEFORMATEX pwfx = HeapAlloc(GetProcessHeap(),0,size); if (pwfx == NULL) { WARN("out of memory\n"); @@ -501,11 +508,10 @@ static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE device->pwfx = DSOUND_CopyFormat(wfex); if (device->pwfx == NULL) { device->pwfx = oldpwfx; + oldpwfx = NULL; err = DSERR_OUTOFMEMORY; goto done; } - /* TODO: on failure below (bad format?), reinstall oldpwfx */ - HeapFree(GetProcessHeap(), 0, oldpwfx); if (!(device->drvdesc.dwFlags & DSDDESC_DOMMSYSTEMSETFORMAT) && device->hwbuf) { err = IDsDriverBuffer_SetFormat(device->hwbuf, device->pwfx); @@ -520,9 +526,12 @@ static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE } if (err != DSERR_BUFFERLOST && FAILED(err)) { + DWORD size = DSOUND_GetFormatSize(oldpwfx); WARN("IDsDriverBuffer_SetFormat failed\n"); - if (!forced) + if (!forced) { + CopyMemory(device->pwfx, oldpwfx, size); err = DS_OK; + } goto done; } @@ -599,6 +608,7 @@ done: RtlReleaseResource(&(device->buffer_list_lock)); /* **** */ + HeapFree(GetProcessHeap(), 0, oldpwfx); return err; }

1 0

Austin English : iphlpapi: Remove stray code (clang).
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: d994917fc651f7e9e53a18836065c4a4d60f74f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d994917fc651f7e9e53a18836… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 3 17:21:38 2010 -0700 iphlpapi: Remove stray code (clang). --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2410aca..f48470c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -174,7 +174,7 @@ static void testGetNumberOfInterfaces(void) /* Crashes on Vista */ if (0) { - apiReturn = gGetNumberOfInterfaces(NULL), numInterfaces; + apiReturn = gGetNumberOfInterfaces(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) return; ok(apiReturn == ERROR_INVALID_PARAMETER,

1 0

Austin English : iphlpapi: Avoid using %n (clang).
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: 0ed04f87dd94aa0a7a4d6bf9a93ed73c4da4371c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed04f87dd94aa0a7a4d6bf9a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 3 17:31:03 2010 -0700 iphlpapi: Avoid using %n (clang). --- dlls/iphlpapi/iphlpapi_main.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 081de0e..1329466 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -654,12 +654,7 @@ static char *debugstr_ipv4(const in_addr_t *in_addr, char *buf) if (addrp == (const BYTE *)in_addr + sizeof(*in_addr) - 1) sprintf(p, "%d", *addrp); else - { - int n; - - sprintf(p, "%d.%n", *addrp, &n); - p += n; - } + p += sprintf(p, "%d.", *addrp); } return buf; } @@ -685,10 +680,7 @@ static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) } else { - int n; - - sprintf(p, "%x:%n", ntohs(addr->u.Word[i]), &n); - p += n; + p += sprintf(p, "%x:", ntohs(addr->u.Word[i])); in_zero = FALSE; } }

1 0

Austin English : psapi/tests: Remove an ugly macro.
by Alexandre Julliard 04 Oct '10

04 Oct '10

Module: wine Branch: master Commit: cad2aaff2b8fd194ac868f7c43c079c551cb6609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad2aaff2b8fd194ac868f7c4… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 3 17:53:03 2010 -0700 psapi/tests: Remove an ugly macro. --- dlls/psapi/tests/psapi_main.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 55eb937..b9b8f2a 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -25,13 +25,6 @@ #include "wine/test.h" #include "psapi.h" -#define expect_eq_d(expected, actual) \ - do { \ - int value = (actual); \ - ok((expected) == value, "Expected " #actual " to be %d (" #expected ") is %d\n", \ - (expected), value); \ - } while (0) - #define PSAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hpsapi, #func); \ if(!p ## func) { \ @@ -223,7 +216,7 @@ static void test_GetProcessImageFileName(void) ret = pGetProcessImageFileNameW(hpQI, szImgPathW, sizeof(szImgPathW)/sizeof(WCHAR)); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); - expect_eq_d(lstrlenW(szImgPathW), ret); + ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); /* boundary values of 'size' */ w32_err(pGetProcessImageFileNameW(hpQI, szImgPathW, ret), ERROR_INSUFFICIENT_BUFFER); @@ -232,7 +225,7 @@ static void test_GetProcessImageFileName(void) ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ret + 1); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); - expect_eq_d(lstrlenW(szImgPathW), ret); + ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW)); } static void test_GetModuleFileNameEx(void)

1 0