wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Paul Gofman : d3dx9: Factor out {lock|unlock}_surface() functions.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: f61d1b1d7b7ac73203e4e1e9aadc66464ed282ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f61d1b1d7b7ac73203e4e1e9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jan 14 21:45:08 2019 +0100 d3dx9: Factor out {lock|unlock}_surface() functions. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 33be8439fc95ca8f005bd3a2b6790c101842c02e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/surface.c | 75 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 11a0ee1a2f..2d00cd1dcd 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -199,6 +199,53 @@ static const struct { { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; +static HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 **temp_surface) +{ + IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; + HRESULT hr; + + *temp_surface = NULL; + if (FAILED(hr = IDirect3DSurface9_LockRect(surface, lock, NULL, D3DLOCK_READONLY))) + { + IDirect3DSurface9_GetDevice(surface, &device); + IDirect3DSurface9_GetDesc(surface, &desc); + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(device, desc.Width, desc.Height, + desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, temp_surface, NULL))) + { + IDirect3DDevice9_Release(device); + return hr; + } + + if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, surface, NULL, *temp_surface, NULL, D3DTEXF_NONE))) + hr = IDirect3DSurface9_LockRect(*temp_surface, lock, NULL, D3DLOCK_READONLY); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + WARN("Failed to lock surface %p, usage %#x, pool %#x.\n", + surface, desc.Usage, desc.Pool); + IDirect3DSurface9_Release(*temp_surface); + *temp_surface = NULL; + return hr; + } + } + return hr; +} + +static HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 *temp_surface) +{ + HRESULT hr; + + if (!temp_surface) + return IDirect3DSurface9_UnlockRect(surface); + + hr = IDirect3DSurface9_UnlockRect(temp_surface); + IDirect3DSurface9_Release(temp_surface); + return hr; +} + static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_format) { unsigned int i; @@ -1924,7 +1971,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { - IDirect3DSurface9 *surface = src_surface; + IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; D3DSURFACE_DESC src_desc; @@ -1979,32 +2026,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, src_rect = &s; } - if (FAILED(IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY))) - { - IDirect3DSurface9_GetDevice(src_surface, &device); - if (FAILED(IDirect3DDevice9_CreateRenderTarget(device, src_desc.Width, src_desc.Height, - src_desc.Format, D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL))) - { - IDirect3DDevice9_Release(device); - return D3DXERR_INVALIDDATA; - } - - if (SUCCEEDED(hr = IDirect3DDevice9_StretchRect(device, src_surface, NULL, surface, NULL, D3DTEXF_NONE))) - hr = IDirect3DSurface9_LockRect(surface, &lock, NULL, D3DLOCK_READONLY); - IDirect3DDevice9_Release(device); - if (FAILED(hr)) - { - IDirect3DSurface9_Release(surface); - return D3DXERR_INVALIDDATA; - } - } + if (FAILED(lock_surface(src_surface, &lock, &temp_surface))) + return D3DXERR_INVALIDDATA; hr = D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, lock.pBits, src_desc.Format, lock.Pitch, src_palette, src_rect, filter, color_key); - IDirect3DSurface9_UnlockRect(surface); - if (surface != src_surface) - IDirect3DSurface9_Release(surface); + if (FAILED(unlock_surface(src_surface, &lock, temp_surface))) + return D3DXERR_INVALIDDATA; return hr; }

1 0

Zebediah Figura : quartz/tests: Fix some tests on w7u.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 190fb605c34ac1365076dff0a6560ddb42ca1ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=190fb605c34ac1365076dff0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 13:19:18 2019 -0600 quartz/tests: Fix some tests on w7u. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 22ddb63746..568d74a26a 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1048,9 +1048,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 4); + memset(data, 0x55, IMediaSample_GetSize(sample)); - hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + hr = IMediaSample_SetActualDataLength(sample, IMediaSample_GetSize(sample)); ok(hr == S_OK, "Got hr %#x.\n", hr); start_time = 0; @@ -1350,6 +1350,10 @@ static void test_connect_pin(void) { vih.bmiHeader.biBitCount = 24; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + /* w7u is also rather buggy with its allocator. Requesting a size of + * 32 * 16 * 4 succeeds and returns that size from SetProperties(), but + * the actual samples only have a size of 32 * 16 * 3. */ + req_props.cbBuffer = 32 * 16 * 3; } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface);

1 0

Zebediah Figura : quartz/tests: Relax some more timings.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 239a6392a74bdd71c96b5a63c7a02057b193879b URL: https://source.winehq.org/git/wine.git/?a=commit;h=239a6392a74bdd71c96b5a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 13:09:05 2019 -0600 quartz/tests: Relax some more timings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4b233dbcff..ca4503117a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3163,7 +3163,7 @@ todo_wine check_filter_state(graph, State_Paused); Sleep(600); - start_time += 600 * 10000; + start_time += 550 * 10000; hr = IMediaFilter_Run(filter, 0); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3929,12 +3929,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); @@ -3947,12 +3947,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));

1 0

Francois Gouget : userenv/tests: Windows 10 1809 changed GetUserProfileDirectory().
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 8ec8a56a24dabc56d6a244268822e7bedc2fe785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec8a56a24dabc56d6a24426… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:25:20 2019 +0100 userenv/tests: Windows 10 1809 changed GetUserProfileDirectory(). It is no longer possible to get the required buffer size in the ANSI version, and the Unicode one requires a NULL buffer. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/userenv.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index f6cfcc79ec..a91edeef26 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -303,7 +303,7 @@ static void test_get_profiles_dir(void) static void test_get_user_profile_dir(void) { BOOL ret; - DWORD error, len; + DWORD error, len, len2; HANDLE token; char *dirA; WCHAR *dirW; @@ -351,18 +351,23 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryA( token, dirA, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); - ok(len, "expected len > 0\n"); - HeapFree( GetProcessHeap(), 0, dirA ); - - dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - SetLastError( 0xdeadbeef ); - ret = GetUserProfileDirectoryA( token, dirA, &len ); - ok(ret, "expected success %u\n", GetLastError()); - ok(len, "expected len > 0\n"); - ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); - trace("%s\n", dirA); HeapFree( GetProcessHeap(), 0, dirA ); + if (error == ERROR_INSUFFICIENT_BUFFER) + { + ok(len, "expected len > 0\n"); + + dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, dirA, &len ); + ok(ret, "expected success %u\n", GetLastError()); + ok(len, "expected len > 0\n"); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + trace("%s\n", dirA); + HeapFree( GetProcessHeap(), 0, dirA ); + } + else + ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, + "unexpected error %u\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); @@ -400,6 +405,19 @@ static void test_get_user_profile_dir(void) ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); HeapFree( GetProcessHeap(), 0, dirW ); + len2 = 0; + dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR) ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, dirW, &len2 ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + HeapFree( GetProcessHeap(), 0, dirW ); + if (error == ERROR_INSUFFICIENT_BUFFER) + ok(len2 == len, "expected %d, got %d\n", len, len2); + else + ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, + "unexpected error %u\n", error); + CloseHandle( token ); }

1 0

Zhang Shuai : dssenh/tests: Add keylength tests for enhanced and schannel providers.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 9c641c38794ae4d51ee058d22f83d2fcbea127d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c641c38794ae4d51ee058d2… Author: Zhang Shuai <wxsxsdz(a)gmail.com> Date: Fri Nov 22 08:38:59 2019 +0000 dssenh/tests: Add keylength tests for enhanced and schannel providers. Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b62f592f5f..aa99acded0 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -261,7 +261,7 @@ static const struct keylength_test dssDH_keylength[] = { }; static const struct keylength_test dssENH_keylength[] = { - /* min 512 max 1024 (AT_KEYEXCHANGE max 4096), increment by 64*/ + /* min 512 max 1024 (AT_KEYEXCHANGE, CALG_DH_EPHEM, CALG_DH_SF max 4096), increment by 64*/ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 512 << 16, TRUE}, {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ @@ -285,12 +285,16 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_EPHEM, 768 << 16, TRUE}, {CALG_DH_EPHEM, 1024 << 16, TRUE}, {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 1088 << 16, TRUE}, + {CALG_DH_EPHEM, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 512 << 16, TRUE}, {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ {CALG_DH_SF, 768 << 16, TRUE}, {CALG_DH_SF, 1024 << 16, TRUE}, {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 1088 << 16, TRUE}, + {CALG_DH_SF, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */

1 0

Alistair Leslie-Hughes : dmloader: Stop after find first matching object.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 4aee9ba5ad1c7df34a06fe2bbe39ae33fd8ffcee URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aee9ba5ad1c7df34a06fe2b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 22 08:22:35 2019 +0000 dmloader: Stop after find first matching object. This stops a crash in Legoland on startup when finding cached objects. Placing a break in each of the if's causes the wrong object to be loaded. The help states it looks at each type in order. So, we might have to loop the cache multiple times to ensure that when an object has flag DMUS_OBJ_OBJECT, it's preferred over a DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH match. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0da8323e7e..69a438765d 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -208,6 +208,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac TRACE(": not loaded yet\n"); pObjectEntry = pExistingEntry; } + break; } else if ((pDesc->dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) && (pExistingEntry->Desc.dwValidData & (DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH)) &&

1 0

Zebediah Figura : quartz/tests: Fix an invalid free.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: b909b2c5cf5f43ad204ee874a30cafcf0815e490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b909b2c5cf5f43ad204ee874… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 10:21:32 2019 -0600 quartz/tests: Fix an invalid free. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d0ae25a969..c5a455afb2 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1340,6 +1340,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, filter, NULL); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); for (i = 0; i < ARRAY_SIZE(subtype_tests); ++i) { @@ -1411,8 +1412,6 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); - IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); - test_allocator(input); hr = IMemInputPin_GetAllocator(input, &allocator);

1 0

Piotr Caban : ucrtbase: Fix hexadecimal floats parsing in strtod.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: c953c36d11ee6f83b8b33e9ec1d7664ff5e680ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c953c36d11ee6f83b8b33e9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 16:41:30 2019 +0100 ucrtbase: Fix hexadecimal floats parsing in strtod. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 263 +++++++++++++++++++++++++++++++++++++------ dlls/ucrtbase/tests/string.c | 15 ++- 2 files changed, 239 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 10249592bb..fa5f7022c1 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -325,6 +325,221 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } } +#if _MSVCR_VER >= 140 + +enum round { + ROUND_ZERO, /* only used when dropped part contains only zeros */ + ROUND_DOWN, + ROUND_EVEN, + ROUND_UP +}; + +static double make_double(int sign, int exp, ULONGLONG m, enum round round, int *err) +{ +#define EXP_BITS 11 +#define MANT_BITS 53 + ULONGLONG bits = 0; + + TRACE("%c %s *2^%d (round %d)\n", sign == -1 ? '-' : '+', wine_dbgstr_longlong(m), exp, round); + if (!m) return sign * 0.0; + + /* make sure that we don't overflow modifying exponent */ + if (exp > 1<<EXP_BITS) + { + if (err) *err = MSVCRT_ERANGE; + return sign * INFINITY; + } + if (exp < -(1<<EXP_BITS)) + { + if (err) *err = MSVCRT_ERANGE; + return sign * 0.0; + } + exp += MANT_BITS - 1; + + /* normalize mantissa */ + while(m < (ULONGLONG)1 << (MANT_BITS-1)) + { + m <<= 1; + exp--; + } + while(m >= (ULONGLONG)1 << MANT_BITS) + { + if (m & 1 || round != ROUND_ZERO) + { + if (!(m & 1)) round = ROUND_DOWN; + else if(round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + m >>= 1; + exp++; + } + + /* handle subnormal that falls into regular range due to rounding */ + exp += (1 << (EXP_BITS-1)) - 1; + if (!exp && (round == ROUND_UP || (round == ROUND_EVEN && m & 1))) + { + if (m + 1 >= (ULONGLONG)1 << MANT_BITS) + { + m++; + m >>= 1; + exp++; + round = ROUND_DOWN; + } + } + + /* handle subnormals */ + if (exp <= 0) + m >>= 1; + while(m && exp<0) + { + m >>= 1; + exp++; + } + + /* round mantissa */ + if (round == ROUND_UP || (round == ROUND_EVEN && m & 1)) + { + m++; + if (m >= (ULONGLONG)1 << MANT_BITS) + { + exp++; + m >>= 1; + } + } + + if (exp >= 1<<EXP_BITS) + { + if (err) *err = MSVCRT_ERANGE; + return sign * INFINITY; + } + if (!m || exp < 0) + { + if (err) *err = MSVCRT_ERANGE; + return sign * 0.0; + } + + if (sign == -1) bits |= (ULONGLONG)1 << (MANT_BITS + EXP_BITS - 1); + bits |= (ULONGLONG)exp << (MANT_BITS - 1); + bits |= m & (((ULONGLONG)1 << (MANT_BITS - 1)) - 1); + + TRACE("returning %s\n", wine_dbgstr_longlong(bits)); + return *((double*)&bits); +} + +static inline int hex2int(char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + else if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + return -1; +} + +static double strtod16(int sign, const char *p, char **end, + MSVCRT_pthreadlocinfo locinfo, int *err) +{ + enum round round = ROUND_ZERO; + BOOL found_digit = FALSE; + ULONGLONG m = 0; + int val, exp = 0; + + while(m < MSVCRT_UI64_MAX/16) + { + val = hex2int(*p); + if (val == -1) break; + found_digit = TRUE; + p++; + + m = m*16 + val; + } + while(1) + { + val = hex2int(*p); + if (val == -1) break; + p++; + exp += 4; + + if (val || round != ROUND_ZERO) + { + if (val < 8) round = ROUND_DOWN; + else if (val == 8 && round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + } + + if(*p == *locinfo->lconv->decimal_point) + p++; + else if (!found_digit) + { + if(end) *end = (char*)p - 1; + return 0.0; + } + + while(m <= MSVCRT_UI64_MAX/16) + { + val = hex2int(*p); + if (val == -1) break; + found_digit = TRUE; + p++; + + m = m*16 + val; + exp -= 4; + } + while(1) + { + val = hex2int(*p); + if (val == -1) break; + p++; + + if (val || round != ROUND_ZERO) + { + if (val < 8) round = ROUND_DOWN; + else if (val == 8 && round == ROUND_ZERO) round = ROUND_EVEN; + else round = ROUND_UP; + } + } + + if (!found_digit) + { + if(end) *end = (char*)p - 2; + return 0.0; + } + + if(*p=='p' || *p=='P') { + int e=0, s=1; + + p++; + if(*p == '-') { + s = -1; + p++; + } else if(*p == '+') + p++; + + if(*p>='0' && *p<='9') { + while(*p>='0' && *p<='9') { + if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) + e = INT_MAX; + p++; + } + e *= s; + + if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; + else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; + else exp += e; + } else { + if(*p=='-' || *p=='+') + p--; + p--; + } + } + + if (end) *end = (char*)p; + return make_double(sign, exp, m, round, err); +} +#endif + static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { MSVCRT_pthreadlocinfo locinfo; @@ -335,7 +550,6 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale double ret; long double lret=1, expcnt = 10; BOOL found_digit = FALSE, negexp; - int base = 10; if(err) *err = 0; @@ -379,33 +593,22 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return NAN; } - if(p[0] == '0' && MSVCRT__tolower_l(p[1], locale) == 'x') { - base = 16; - expcnt = 2; + if(p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { p += 2; + return strtod16(sign, p, end, locinfo, err); } #endif - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { - char c = *p++; - int val; + while(*p>='0' && *p<='9') { found_digit = TRUE; - if (c>='0' && c<='9') - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = 10 + c - 'a'; - else - val = 10 + c - 'A'; - hlp = d*base+val; - if(d>MSVCRT_UI64_MAX/base || hlp<d) { + hlp = d * 10 + *p++ - '0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; break; } else d = hlp; } - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { + while(*p>='0' && *p<='9') { exp++; p++; } @@ -413,25 +616,15 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale if(*p == *locinfo->lconv->decimal_point) p++; - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) { - char c = *p++; - int val; + while(*p>='0' && *p<='9') { found_digit = TRUE; - if (c>='0' && c<='9') - val = c - '0'; - else if (c >= 'a' && c <= 'f') - val = 10 + c - 'a'; - else - val = 10 + c - 'A'; - hlp = d*base+val; - if(d>MSVCRT_UI64_MAX/base || hlp<d) + hlp = d * 10 + *p++ - '0'; + if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; d = hlp; exp--; } - while((*p>='0' && *p<='9') || - (base == 16 && ((*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F')))) + while(*p>='0' && *p<='9') p++; if(!found_digit) { @@ -440,11 +633,7 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale return 0.0; } - if(base == 16) - exp *= 4; - - if((base == 10 && (*p=='e' || *p=='E' || *p=='d' || *p=='D')) || - (base == 16 && (*p=='p' || *p=='P'))) { + if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { int e=0, s=1; p++; diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index e4146c6fc4..bfa602c538 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -125,9 +125,9 @@ static void _test_strtod_str(int line, const char* string, double value, int len double d; d = p_strtod(string, &end); if (local_isnan(value)) - ok_(__FILE__, line)(local_isnan(d), "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(local_isnan(d), "d = %.16le (\"%s\")\n", d, string); else - ok_(__FILE__, line)(d == value, "d = %lf (\"%s\")\n", d, string); + ok_(__FILE__, line)(d == value, "d = %.16le (\"%s\")\n", d, string); ok_(__FILE__, line)(end == string + length, "incorrect end (%d, \"%s\")\n", (int)(end - string), string); } @@ -162,6 +162,17 @@ static void test_strtod(void) test_strtod_str("0x1.1p1", 2.125, 7); test_strtod_str("0x1.A", 1.625, 5); test_strtod_str("0x1p1a", 2, 5); + test_strtod_str("0xp3", 0, 1); + test_strtod_str("0x.", 0, 1); + test_strtod_str("0x.8", 0.5, 4); + test_strtod_str("0x.8p", 0.5, 4); + test_strtod_str("0x0p10000000000000000000000000", 0, 30); + test_strtod_str("0x1p-1026", 1.3906711615670009e-309, 9); + + test_strtod_str("0x1ffffffffffffe.80000000000000000000", 9007199254740990.0, 37); + test_strtod_str("0x1ffffffffffffe.80000000000000000001", 9007199254740991.0, 37); + test_strtod_str("0x1fffffffffffff.80000000000000000000", 9007199254740992.0, 37); + test_strtod_str("0x1fffffffffffff.80000000000000000001", 9007199254740992.0, 37); } static void test__memicmp(void)

1 0

Piotr Caban : msvcrt: Use isspace_l in string to number conversion functions.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: e2423823fc318b0e1a8818d659ac670f75670ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2423823fc318b0e1a8818d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 22 16:41:23 2019 +0100 msvcrt: Use isspace_l in string to number conversion functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a5c92497a9..4a7e6f4219 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1066,6 +1066,7 @@ int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); int __cdecl MSVCRT_isleadbyte(int); int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); +int __cdecl MSVCRT__isspace_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 346cba7e72..10249592bb 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -350,9 +350,8 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale else locinfo = locale->locinfo; - /* FIXME: use *_l functions */ p = str; - while(isspace(*p)) + while(MSVCRT__isspace_l((unsigned char)*p, locale)) p++; if(*p == '-') { @@ -957,7 +956,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - while(isspace(*nptr)) nptr++; + while(MSVCRT__isspace_l((unsigned char)*nptr, locale)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -1050,7 +1049,7 @@ int __cdecl MSVCRT_atoi(const char *str) if(!str) return 0; - while(isspace(*str)) str++; + while(MSVCRT__isspace_l((unsigned char)*str, NULL)) str++; if(*str == '+') { str++; @@ -1209,7 +1208,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0; if (!MSVCRT_CHECK_PMT(base <= 36)) return 0; - while(isspace(*nptr)) nptr++; + while(MSVCRT__isspace_l((unsigned char)*nptr, locale)) nptr++; if(*nptr == '-') { negative = TRUE;

1 0

Hans Leidekker : wininet: Add support for detecting the proxy config URL.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: a4357043ff9aa14f086207c239f0fc29c0a24b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4357043ff9aa14f086207c2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 22 16:32:25 2019 +0100 wininet: Add support for detecting the proxy config URL. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/internet.c | 201 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 173 insertions(+), 32 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 6eeb7cf85b..e1d4979d87 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -2,9 +2,9 @@ EXTRADEFS = -D_WINX32_ MODULE = wininet.dll IMPORTLIB = wininet IMPORTS = mpr shlwapi shell32 user32 ws2_32 advapi32 -DELAYIMPORTS = secur32 crypt32 cryptui +DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi EXTRAINCL = $(Z_CFLAGS) -EXTRALIBS = $(CORESERVICES_LIBS) $(Z_LIBS) +EXTRALIBS = $(Z_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 266100861d..3e8be9fa2b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -28,14 +28,6 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#endif - #include "winsock2.h" #include "ws2ipdef.h" @@ -56,6 +48,10 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "ws2tcpip.h" +#include "winternl.h" +#include "iphlpapi.h" +#include "dhcpcsdk.h" #include "wine/exception.h" @@ -2295,38 +2291,183 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -static WCHAR *get_proxy_autoconfig_url(void) +static IP_ADAPTER_ADDRESSES *get_adapters(void) { -#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + ULONG err, size = 1024, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | + GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_FRIENDLY_NAME; + IP_ADAPTER_ADDRESSES *tmp, *ret; - CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); - WCHAR *ret = NULL; - SIZE_T len; - const void *ref; + if (!(ret = heap_alloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = heap_realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + heap_free( ret ); + return NULL; +} + +static WCHAR *detect_proxy_autoconfig_url_dhcp(void) +{ + IP_ADAPTER_ADDRESSES *adapters, *ptr; + DHCPCAPI_PARAMS_ARRAY send_params, recv_params; + DHCPCAPI_PARAMS param; + WCHAR name[MAX_ADAPTER_NAME_LENGTH + 1], *ret = NULL; + DWORD err, size; + BYTE *tmp, *buf = NULL; + + if (!(adapters = get_adapters())) return NULL; + + memset( &send_params, 0, sizeof(send_params) ); + memset( &param, 0, sizeof(param) ); + param.OptionId = OPTION_MSFT_IE_PROXY; + recv_params.nParams = 1; + recv_params.Params = &param; + + for (ptr = adapters; ptr; ptr = ptr->Next) + { + MultiByteToWideChar( CP_ACP, 0, ptr->AdapterName, -1, name, ARRAY_SIZE(name) ); + TRACE( "adapter '%s' type %u dhcpv4 enabled %d\n", wine_dbgstr_w(name), ptr->IfType, ptr->Dhcpv4Enabled ); + + if (ptr->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; + /* FIXME: also skip adapters where DHCP is disabled */ + + size = 256; + if (!(buf = heap_alloc( size ))) goto done; + err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, + buf, &size, NULL ); + while (err == ERROR_MORE_DATA) + { + if (!(tmp = heap_realloc( buf, size ))) goto done; + buf = tmp; + err = DhcpRequestParams( DHCPCAPI_REQUEST_SYNCHRONOUS, NULL, name, NULL, send_params, recv_params, + buf, &size, NULL ); + } + if (err == ERROR_SUCCESS && param.nBytesData) + { + int len = MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, NULL, 0 ); + if ((ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, (const char *)param.Data, param.nBytesData, ret, len ); + ret[len] = 0; + } + TRACE("returning %s\n", debugstr_w(ret)); + break; + } + } - if (!settings) return NULL; +done: + heap_free( buf ); + heap_free( adapters ); + return ret; +} - if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) +static char *get_computer_name( COMPUTER_NAME_FORMAT format ) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( format, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = heap_alloc( size ))) return NULL; + if (!GetComputerNameExA( format, ret, &size )) { - CFRelease( settings ); + heap_free( ret ); return NULL; } - len = CFStringGetLength( ref ); - if (len) - ret = heap_alloc( (len+1) * sizeof(WCHAR) ); - if (ret) + return ret; +} + +static BOOL is_domain_suffix( const char *domain, const char *suffix ) +{ + int len_domain = strlen( domain ), len_suffix = strlen( suffix ); + + if (len_suffix > len_domain) return FALSE; + if (!_strnicmp( domain + len_domain - len_suffix, suffix, -1 )) return TRUE; + return FALSE; +} + +static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) +{ + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); +} + +static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) +{ + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR wpadW[] = {'/','w','p','a','d','.','d','a','t',0}; + char name[NI_MAXHOST]; + WCHAR *ret, *p; + int len; + + while (ai && ai->ai_family != AF_INET && ai->ai_family != AF_INET6) ai = ai->ai_next; + if (!ai) return NULL; + + if (!reverse_lookup( ai, name, sizeof(name) )) hostname = name; + + len = lstrlenW( httpW ) + strlen( hostname ) + lstrlenW( wpadW ); + if (!(ret = p = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + lstrcpyW( p, httpW ); + p += lstrlenW( httpW ); + while (*hostname) { *p++ = *hostname++; } + lstrcpyW( p, wpadW ); + return ret; +} + +static WCHAR *detect_proxy_autoconfig_url_dns(void) +{ + char *fqdn, *domain, *p; + WCHAR *ret; + + if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; + if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) + { + heap_free( fqdn ); + return NULL; + } + p = fqdn; + while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { - CFStringGetCharacters( ref, CFRangeMake(0, len), ret ); - ret[len] = 0; + char *name; + struct addrinfo *ai; + int res; + + if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) + { + heap_free( fqdn ); + heap_free( domain ); + return NULL; + } + strcpy( name, "wpad" ); + strcat( name, p ); + res = getaddrinfo( name, NULL, NULL, &ai ); + if (!res) + { + ret = build_wpad_url( name, ai ); + freeaddrinfo( ai ); + if (ret) + { + TRACE("returning %s\n", debugstr_w(ret)); + heap_free( name ); + break; + } + } + heap_free( name ); + p++; } - TRACE( "returning %s\n", debugstr_w(ret) ); - CFRelease( settings ); + heap_free( domain ); + heap_free( fqdn ); + return ret; +} + +static WCHAR *get_proxy_autoconfig_url(void) +{ + WCHAR *ret = detect_proxy_autoconfig_url_dhcp(); + if (!ret) ret = detect_proxy_autoconfig_url_dns(); return ret; -#else - static int once; - if (!once++) FIXME( "no support on this platform\n" ); - return NULL; -#endif } static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode)

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019