July 2011 - Wine-commits - list.winehq.org

Matteo Bruni : d3d9/tests: Fix some messages.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 9a790806bdfe6873de2af9c0a68271fcde093956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a790806bdfe6873de2af9c0a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 22 20:01:25 2011 +0200 d3d9/tests: Fix some messages. --- dlls/d3d9/tests/visual.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 761a385..7651069 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -940,19 +940,19 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xFF00FF00 /* A nice green */); - ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog color returned %#08x\n", hr); /* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Turning off vertex fog returned %08x\n", hr); /* Start = 0, end = 1. Should be default, but set them */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); if(IDirect3DDevice9_BeginScene(device) == D3D_OK) { @@ -966,7 +966,7 @@ static void fog_test(IDirect3DDevice9 *device) /* That makes it use the Z value */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %#08x\n", hr); /* Untransformed, vertex fog != none (or table fog != none): * Use the Z value as input into the equation */ @@ -1035,12 +1035,12 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %08x\n", hr); + ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %08x\n", hr); @@ -1154,7 +1154,7 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %08x\n", hr); + ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %08x\n", hr); }

1 0

Hans Leidekker : winhttp: Include the extra info part of the URL in the request.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 2295c6379692552ea86e952941784af1a3ecc17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2295c6379692552ea86e95294… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 07:57:17 2011 +0200 winhttp: Include the extra info part of the URL in the request. --- dlls/winhttp/request.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index af69a41..4da4508 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1,7 +1,7 @@ /* * Copyright 2004 Mike McCormack for CodeWeavers * Copyright 2006 Rob Shearman for CodeWeavers - * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2008, 2011 Hans Leidekker for CodeWeavers * Copyright 2009 Juan Lang * * This library is free software; you can redistribute it and/or @@ -2450,18 +2450,19 @@ static HRESULT WINAPI winhttp_request_Open( uc.dwSchemeLength = ~0u; uc.dwHostNameLength = ~0u; uc.dwUrlPathLength = ~0u; + uc.dwExtraInfoLength = ~0u; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); hostname[uc.dwHostNameLength] = 0; - if (!(path = heap_alloc( (uc.dwUrlPathLength + 1) * sizeof(WCHAR) ))) + if (!(path = heap_alloc( (uc.dwUrlPathLength + uc.dwExtraInfoLength + 1) * sizeof(WCHAR) ))) { heap_free( hostname ); return E_OUTOFMEMORY; } - memcpy( path, uc.lpszUrlPath, uc.dwUrlPathLength * sizeof(WCHAR) ); - path[uc.dwUrlPathLength] = 0; + memcpy( path, uc.lpszUrlPath, (uc.dwUrlPathLength + uc.dwExtraInfoLength) * sizeof(WCHAR) ); + path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags )))

1 0

Frédéric Delanoy : cmd: Add help for setlocal/ endlocal commands.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 093547e1581e50da44d62d9a60e305a8a0bf2fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=093547e1581e50da44d62d9a6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 25 17:40:46 2011 +0200 cmd: Add help for setlocal/endlocal commands. --- po/ar.po | 100 +++++++++++++++++++++++++++------------------ po/bg.po | 100 +++++++++++++++++++++++++++------------------ po/ca.po | 100 +++++++++++++++++++++++++++------------------ po/cs.po | 101 +++++++++++++++++++++++++++------------------ po/da.po | 101 +++++++++++++++++++++++++++------------------ po/de.po | 101 +++++++++++++++++++++++++++------------------ po/el.po | 100 +++++++++++++++++++++++++++------------------ po/en.po | 102 +++++++++++++++++++++++++++------------------ po/en_US.po | 110 +++++++++++++++++++++++++++++++------------------ po/eo.po | 100 +++++++++++++++++++++++++++------------------ po/es.po | 101 +++++++++++++++++++++++++++------------------ po/fa.po | 100 +++++++++++++++++++++++++++------------------ po/fi.po | 100 +++++++++++++++++++++++++++------------------ po/fr.po | 105 ++++++++++++++++++++++++++++------------------- po/he.po | 101 +++++++++++++++++++++++++++------------------ po/hi.po | 100 +++++++++++++++++++++++++++------------------ po/hu.po | 100 +++++++++++++++++++++++++++------------------ po/it.po | 101 +++++++++++++++++++++++++++------------------ po/ja.po | 101 +++++++++++++++++++++++++++------------------ po/ko.po | 101 +++++++++++++++++++++++++++------------------ po/lt.po | 101 +++++++++++++++++++++++++++------------------ po/ml.po | 100 +++++++++++++++++++++++++++------------------ po/nb_NO.po | 101 +++++++++++++++++++++++++++------------------ po/nl.po | 101 +++++++++++++++++++++++++++------------------ po/or.po | 100 +++++++++++++++++++++++++++------------------ po/pa.po | 100 +++++++++++++++++++++++++++------------------ po/pl.po | 101 +++++++++++++++++++++++++++------------------ po/pt_BR.po | 101 +++++++++++++++++++++++++++------------------ po/pt_PT.po | 101 +++++++++++++++++++++++++++------------------ po/rm.po | 100 +++++++++++++++++++++++++++------------------ po/ro.po | 101 +++++++++++++++++++++++++++------------------ po/ru.po | 101 +++++++++++++++++++++++++++------------------ po/sk.po | 100 +++++++++++++++++++++++++++------------------ po/sl.po | 101 +++++++++++++++++++++++++++------------------ po/sr_RS(a)cyrillic.po | 100 +++++++++++++++++++++++++++------------------ po/sr_RS(a)latin.po | 100 +++++++++++++++++++++++++++------------------ po/sv.po | 101 +++++++++++++++++++++++++++------------------ po/te.po | 100 +++++++++++++++++++++++++++------------------ po/th.po | 100 +++++++++++++++++++++++++++------------------ po/tr.po | 101 +++++++++++++++++++++++++++------------------ po/uk.po | 101 +++++++++++++++++++++++++++------------------ po/wa.po | 100 +++++++++++++++++++++++++++------------------ po/wine.pot | 100 +++++++++++++++++++++++++++------------------ po/zh_CN.po | 100 +++++++++++++++++++++++++++------------------ po/zh_TW.po | 100 +++++++++++++++++++++++++++------------------ programs/cmd/cmd.rc | 14 ++++++ 46 files changed, 2704 insertions(+), 1847 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=093547e1581e50da44d62…

1 0

Marcus Meissner : dinput: const REFGUID is doubled const (Coverity).
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 011a817e65351cdcd7095469fb7bd2c252f6937d URL: http://source.winehq.org/git/wine.git/?a=commit;h=011a817e65351cdcd7095469f… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 26 17:43:09 2011 +0200 dinput: const REFGUID is doubled const (Coverity). --- dlls/dinput/dinput_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 37b4673..d07295d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -874,7 +874,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); DIDEVICEINSTANCEA didevi; @@ -945,7 +945,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - static const REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; + static REFGUID guids[2] = { &GUID_SysKeyboard, &GUID_SysMouse }; static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; IDirectInputImpl *This = impl_from_IDirectInput8W(iface); DIDEVICEINSTANCEW didevi;

1 0

Jacek Caban : mshtml: Fixed tests on some old IEs.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 7c04ed36a463bc5ffdab6d748e5f9c1c6e03a591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c04ed36a463bc5ffdab6d748… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 12:56:59 2011 +0200 mshtml: Fixed tests on some old IEs. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index b33c8c8..3309a73 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2988,6 +2988,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember case 1026: case 1027: case 1034: + case 1035: case 1037: case 1047: case 1045:

1 0

Jacek Caban : urlmon: Store URI host len in parse_ipv4address before further parsing.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 8fcf7013bccbcdf6f26781f1e319b7591efa2ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcf7013bccbcdf6f26781f1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 26 13:57:50 2011 +0200 urlmon: Store URI host len in parse_ipv4address before further parsing. --- dlls/urlmon/tests/uri.c | 25 +++++++++++++++++++++++++ dlls/urlmon/uri.c | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a11b9d0..2fe67c2 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -997,6 +997,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "http://127.0.0.1:8000", 0, S_OK, FALSE, + { + {"http://127.0.0.1:8000/",S_OK}, + {"127.0.0.1:8000",S_OK}, + {"http://127.0.0.1:8000/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"127.0.0.1",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://127.0.0.1:8000",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_IPV4,S_OK,FALSE}, + {8000,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, /* Make sure it normalizes partial IPv4 addresses correctly. */ { "http://127.0/", 0, S_OK, FALSE, { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9928070..5dfa8b8 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1493,6 +1493,9 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) data->has_implicit_ip = TRUE; } + data->host_len = *ptr - data->host; + data->host_type = Uri_HOST_IPV4; + /* Check if what we found is the only part of the host name (if it isn't * we don't have an IPv4 address). */ @@ -1511,9 +1514,6 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) return FALSE; } - data->host_len = *ptr - data->host; - data->host_type = Uri_HOST_IPV4; - TRACE("(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d\n", ptr, data, flags, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type);

1 0

Andrew Eikum : mmdevapi: Try loading multiple audio drivers from the registry.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 9fc0377f64c9ba62390bcd505492bf940e66aba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc0377f64c9ba62390bcd505… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 26 07:58:43 2011 -0500 mmdevapi: Try loading multiple audio drivers from the registry. --- dlls/mmdevapi/main.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index f65ea3a..b262e07 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -45,6 +45,7 @@ #include "mmdevapi.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -99,16 +100,26 @@ static BOOL init_driver(void) return TRUE; if(RegOpenKeyW(HKEY_CURRENT_USER, drv_key, &key) == ERROR_SUCCESS){ - WCHAR driver_name[256]; + WCHAR driver_name[256], *p, *next; DWORD size = sizeof(driver_name); if(RegQueryValueExW(key, drv_value, 0, NULL, (BYTE*)driver_name, - &size) == ERROR_SUCCESS){ - BOOL ret = load_driver(driver_name); + &size) == ERROR_SUCCESS && driver_name[0] != '\0'){ RegCloseKey(key); - if(!ret) - ERR("Failed to load driver: %s\n", wine_dbgstr_w(driver_name)); - return ret; + + for(next = p = driver_name; next; p = next + 1){ + next = strchrW(p, ','); + if(next) + *next = '\0'; + + if(load_driver(p)) + return TRUE; + + TRACE("Failed to load driver: %s\n", wine_dbgstr_w(driver_name)); + } + + ERR("No drivers in the registry loaded successfully!\n"); + return FALSE; } RegCloseKey(key);

1 0

Piotr Caban : msvcrt: Fixed tmpnam and _wtmpname implementation.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: 5e9ee3b909f04d0b2272edd86b0ad630d785203b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9ee3b909f04d0b2272edd86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 26 11:13:37 2011 +0200 msvcrt: Fixed tmpnam and _wtmpname implementation. --- dlls/msvcrt/file.c | 2 ++ dlls/msvcrt/main.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 385771e..f1af1b7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3683,6 +3683,7 @@ char * CDECL MSVCRT_tmpnam(char *s) { size = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); memcpy(p, tmpstr, size); + p[size] = '\0'; if (GetFileAttributesA(s) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) break; @@ -3714,6 +3715,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_wtmpnam(MSVCRT_wchar_t *s) { size = msvcrt_int_to_base32_w(tmpnam_unique++, tmpstr); memcpy(p, tmpstr, size*sizeof(MSVCRT_wchar_t)); + p[size] = '\0'; if (GetFileAttributesW(s) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND) break; diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 5d6e37a..45191cd 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -74,6 +74,8 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->strerror_buffer); HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); HeapFree(GetProcessHeap(),0,tls->time_buffer); + HeapFree(GetProcessHeap(),0,tls->tmpnam_buffer); + HeapFree(GetProcessHeap(),0,tls->wtmpnam_buffer); if(tls->have_locale) { free_locinfo(tls->locinfo); free_mbcinfo(tls->mbcinfo);

1 0

Piotr Caban : msvcrt: Fix %f format handling in printf so it works with big floats.
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: d7b5c0b14f00bc14bde8e4d2626203fc478fc035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b5c0b14f00bc14bde8e4d26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 26 12:41:46 2011 +0200 msvcrt: Fix %f format handling in printf so it works with big floats. --- dlls/msvcrt/printf.h | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index ca7870c..fa3bdef 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -535,6 +535,19 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API } else if(flags.Format && strchr("aeEfgG", flags.Format)) { char float_fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; + double val = pf_args(args_ctx, pos, VT_R8, valist).get_double; + + if(flags.Format=='f') { + if(val>-10.0 && val<10.0) + i = 1; + else + i = 1 + log10(val<0 ? -val : val); + /* Default precision is 6, additional space for sign, separator and nullbyte is required */ + i += (flags.Precision==-1 ? 6 : flags.Precision) + 3; + + if(i > max_len) + max_len = i; + } if(max_len > sizeof(buf_a)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); @@ -543,7 +556,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_rebuild_format_string)(float_fmt, &flags); - sprintf(tmp, float_fmt, pf_args(args_ctx, pos, VT_R8, valist).get_double); + sprintf(tmp, float_fmt, val); if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') FUNC_NAME(pf_fixup_exponent)(tmp);

1 0

Michael Mc Donnell : d3dx/tests: Fixed double free (valgrind).
by Alexandre Julliard 26 Jul '11

26 Jul '11

Module: wine Branch: master Commit: d1e328a0f50d7bb8b213d362dc625700f2c65faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e328a0f50d7bb8b213d362d… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue Jul 26 14:51:45 2011 +0200 d3dx/tests: Fixed double free (valgrind). --- dlls/d3dx9_36/tests/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6522ff1..d4f4e3b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -5399,6 +5399,7 @@ static void test_convert_adjacency_to_point_reps(void) } HeapFree(GetProcessHeap(), 0, point_reps); + point_reps = NULL; if (i != 0) /* First mesh will be freed during cleanup */ mesh->lpVtbl->Release(mesh);

1 0