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

Ziqing Hui : windowscodecs/tests: Add tests for DdsDecoder_Wine_Initialize().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 2b2341cb3663bc8970612b856f51250a891bb6d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b2341cb3663bc8970612b85… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Jul 10 17:09:20 2020 +0800 windowscodecs/tests: Add tests for DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 38 +++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 9bdf0bdb94..ecf7de0bc4 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -170,6 +170,7 @@ static struct test_data { UINT expected_frame_count; const GUID *expected_pixel_format; WICDdsParameters expected_parameters; + BOOL wine_init; } test_data[] = { { test_dds_image, sizeof(test_dds_image), 1, &GUID_WICPixelFormat32bppPBGRA, { 4, 4, 1, 1, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture2D, WICDdsAlphaModePremultiplied } }, @@ -227,17 +228,39 @@ static IWICBitmapDecoder *create_decoder(void) return decoder; } -static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRESULT expected, int index) +static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRESULT expected, int index, BOOL wine_init) { HRESULT hr; + IWICWineDecoder *wine_decoder; hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); if (index == -1) { ok(hr == S_OK, "Decoder initialize failed, hr %#x\n", hr); } else { - todo_wine_if(index == 1 || index == 3) + todo_wine_if(wine_init) ok(hr == expected, "Test %u: Expected hr %#x, got %#x\n", index, expected, hr); } + + if (hr != S_OK && wine_init) { + hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICWineDecoder, (void **)&wine_decoder); + if (index == -1) { + ok(hr == S_OK || broken(hr != S_OK), "QueryInterface failed, hr %#x\n", hr); + } else { + ok(hr == S_OK || broken(hr != S_OK), "Test %u: QueryInterface failed, hr %#x\n", index, hr); + } + if (hr == S_OK) { + hr = IWICWineDecoder_Initialize(wine_decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); + if (index == -1) { + todo_wine + ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); + } else { + todo_wine + ok(hr == S_OK, "Test %u: Initialize failed, hr %#x\n", index, hr); + } + + } + } + return hr; } @@ -279,14 +302,15 @@ static void test_dds_decoder_initialize(void) void *data; UINT size; HRESULT expected; + BOOL wine_init; } test_data[] = { { test_dds_image, sizeof(test_dds_image), S_OK }, - { test_dds_uncompressed, sizeof(test_dds_uncompressed), WINCODEC_ERR_BADHEADER }, { test_dds_mipmaps, sizeof(test_dds_mipmaps), S_OK }, - { test_dds_cube, sizeof(test_dds_cube), WINCODEC_ERR_BADHEADER }, { test_dds_volume, sizeof(test_dds_volume), S_OK }, { test_dds_array, sizeof(test_dds_array), S_OK }, { test_dds_dxt3, sizeof(test_dds_dxt3), S_OK }, + { test_dds_uncompressed, sizeof(test_dds_uncompressed), WINCODEC_ERR_BADHEADER, TRUE }, + { test_dds_cube, sizeof(test_dds_cube), WINCODEC_ERR_BADHEADER, TRUE }, { test_dds_bad_magic, sizeof(test_dds_bad_magic), WINCODEC_ERR_UNKNOWNIMAGEFORMAT }, { test_dds_bad_header, sizeof(test_dds_bad_header), WINCODEC_ERR_BADHEADER }, { &byte, sizeof(byte), WINCODEC_ERR_STREAMREAD }, @@ -313,7 +337,7 @@ static void test_dds_decoder_initialize(void) decoder = create_decoder(); if (!decoder) goto next; - init_decoder(decoder, stream, test_data[i].expected, i); + init_decoder(decoder, stream, test_data[i].expected, i, test_data[i].wine_init); next: if (decoder) IWICBitmapDecoder_Release(decoder); @@ -399,7 +423,7 @@ static void test_dds_decoder_image_parameters(void) hr = IWICDdsDecoder_GetParameters(dds_decoder, NULL); ok(hr == E_INVALIDARG, "Test %u: GetParameters got unexpected hr %#x\n", i, hr); - hr = init_decoder(decoder, stream, S_OK, -1); + hr = init_decoder(decoder, stream, S_OK, -1, test_data[i].wine_init); if (hr != S_OK) goto next; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); @@ -690,7 +714,7 @@ static void test_dds_decoder(void) if (!stream) goto next; decoder = create_decoder(); if (!decoder) goto next; - hr = init_decoder(decoder, stream, S_OK, -1); + hr = init_decoder(decoder, stream, S_OK, -1, test_data[i].wine_init); if (hr != S_OK) goto next; test_dds_decoder_global_properties(decoder);

1 0

Paul Gofman : ntdll: Stop search on mmap() error in try_map_free_area().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 5498ebd8c0aaa651ce6823cccdf572a3f551deba URL: https://source.winehq.org/git/wine.git/?a=commit;h=5498ebd8c0aaa651ce6823cc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 10 14:39:20 2020 +0300 ntdll: Stop search on mmap() error in try_map_free_area(). The anon mmap errors do not depend on start address hint. Ignoring them makes the search take incredible time until it fails. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 4e5b1acf0b..20bf5ff066 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1009,8 +1009,14 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step, return start; TRACE( "Found free area is already mapped, start %p.\n", start ); - if (ptr != (void *)-1) - munmap( ptr, size ); + if (ptr == (void *)-1) + { + ERR( "wine_anon_mmap() error %s, range %p-%p, unix_prot %#x.\n", + strerror(errno), start, (char *)start + size, unix_prot ); + return NULL; + } + + munmap( ptr, size ); if ((step > 0 && (char *)end - (char *)start < step) || (step < 0 && (char *)start - (char *)base < -step) ||

1 0

Paul Gofman : ntdll: Use MAP_FIXED_NOREPLACE flag in try_map_free_area() if available.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: fdb3d9ae320363c1bd9fa716b167a7ad313e638b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdb3d9ae320363c1bd9fa716… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 10 14:39:21 2020 +0300 ntdll: Use MAP_FIXED_NOREPLACE flag in try_map_free_area() if available. Avoids actual mapping followed by unmapping back if the memory range is already mapped. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 20bf5ff066..63efb74382 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -175,6 +175,9 @@ static struct list teb_list = LIST_INIT( teb_list ); #ifndef MAP_TRYFIXED #define MAP_TRYFIXED 0 #endif +#ifndef MAP_FIXED_NOREPLACE +#define MAP_FIXED_NOREPLACE 0 +#endif #ifdef _WIN64 /* on 64-bit the page protection bytes use a 2-level table */ static const size_t pages_vprot_shift = 20; @@ -1005,18 +1008,19 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step, while (start && base <= start && (char*)start + size <= (char*)end) { - if ((ptr = wine_anon_mmap( start, size, unix_prot, 0 )) == start) + if ((ptr = wine_anon_mmap( start, size, unix_prot, MAP_FIXED_NOREPLACE )) == start) return start; TRACE( "Found free area is already mapped, start %p.\n", start ); - if (ptr == (void *)-1) + if (ptr == (void *)-1 && errno != EEXIST) { ERR( "wine_anon_mmap() error %s, range %p-%p, unix_prot %#x.\n", strerror(errno), start, (char *)start + size, unix_prot ); return NULL; } - munmap( ptr, size ); + if (ptr != (void *)-1) + munmap( ptr, size ); if ((step > 0 && (char *)end - (char *)start < step) || (step < 0 && (char *)start - (char *)base < -step) ||

1 0

Rémi Bernon : mmdevapi: Support new AUDCLNT_* creation flags.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 2e1934598d035b852bcceb8ef01eac181d8415ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1934598d035b852bcceb8e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 10 14:13:44 2020 -0500 mmdevapi: Support new AUDCLNT_* creation flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25173 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45700 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 6 ++++-- dlls/wineandroid.drv/mmdevdrv.c | 6 ++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++-- dlls/wineoss.drv/mmdevdrv.c | 6 ++++-- dlls/winepulse.drv/mmdevdrv.c | 6 ++++-- include/audiosessiontypes.h | 2 ++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 09f98dc7b8..714d6ab9b1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1264,8 +1264,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index b4d8564256..eac55f9e29 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -813,8 +813,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index acfa01c3d6..860d33fa3b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1323,8 +1323,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a08e7f561b..0c97b85f3a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1055,8 +1055,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)){ - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 463d3d5a71..23c34a50f6 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1590,8 +1590,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_STREAMFLAGS_RATEADJUST | AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE | - AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED)) { - TRACE("Unknown flags: %08x\n", flags); + AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | + AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | + AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) { + FIXME("Unknown flags: %08x\n", flags); return E_INVALIDARG; } diff --git a/include/audiosessiontypes.h b/include/audiosessiontypes.h index 2f78574353..81c6526575 100644 --- a/include/audiosessiontypes.h +++ b/include/audiosessiontypes.h @@ -34,9 +34,11 @@ typedef enum _AUDCLNT_SHAREMODE #define AUDCLNT_STREAMFLAGS_EVENTCALLBACK 0x00040000 #define AUDCLNT_STREAMFLAGS_NOPERSIST 0x00080000 #define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000 +#define AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY 0x08000000 #define AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED 0x10000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE 0x20000000 #define AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED 0x40000000 +#define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000 typedef enum _AudioSessionState {

1 0

Michael Stefaniuc : dmime: Reimplement the reference list parser.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 199af0b73286da8690ce6f40efd44b9ba54b57d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=199af0b73286da8690ce6f40… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 12 23:40:22 2020 +0200 dmime: Reimplement the reference list parser. Bits and pieces from a patch by Alistair Leslie-Hughes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/Makefile.in | 1 - dlls/dmime/dmobject.c | 41 +++++++++++ dlls/dmime/dmobject.h | 4 ++ dlls/dmime/dmutils.c | 163 ------------------------------------------- dlls/dmime/dmutils.h | 5 -- dlls/dmime/segtriggertrack.c | 10 ++- 6 files changed, 52 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=199af0b73286da8690ce…

1 0

Piotr Caban : msvcrt: Move big numbers implementation to new file.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: ec148864d6a6d47b319fe8bc79ae30d25d01c8ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec148864d6a6d47b319fe8bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 11 18:41:13 2020 +0200 msvcrt: Move big numbers implementation to new file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/bnum.h | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/string.c | 116 +------------------------------------------ 2 files changed, 138 insertions(+), 114 deletions(-) diff --git a/dlls/msvcrt/bnum.h b/dlls/msvcrt/bnum.h new file mode 100644 index 0000000000..b66ebf04ec --- /dev/null +++ b/dlls/msvcrt/bnum.h @@ -0,0 +1,136 @@ +/* + * Copyright 2020 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_BNUM_H +#define __WINE_BNUM_H + +#define EXP_BITS 11 +#define MANT_BITS 53 + +static const int p10s[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 }; + +#define LIMB_DIGITS 9 /* each DWORD stores up to 9 digits */ +#define LIMB_MAX 1000000000 /* 10^9 */ +#define BNUM_IDX(i) ((i) & 127) +/* bnum represents real number with fixed decimal point (after 2 limbs) */ +struct bnum { + DWORD data[128]; /* circular buffer, base 10 number */ + int b; /* least significant digit position */ + int e; /* most significant digit position + 1 */ +}; + +/* Returns integral part of bnum */ +static inline ULONGLONG bnum_to_mant(struct bnum *b) +{ + ULONGLONG ret = (ULONGLONG)b->data[BNUM_IDX(b->e-1)] * LIMB_MAX; + if(b->b != b->e-1) ret += b->data[BNUM_IDX(b->e-2)]; + return ret; +} + +/* Returns TRUE if new most significant limb was added */ +static inline BOOL bnum_lshift(struct bnum *b, int shift) +{ + DWORD rest = 0; + ULONGLONG tmp; + int i; + + /* The limbs number can change by up to 1 so shift <= 29 */ + assert(shift <= 29); + + for(i=b->b; i<b->e; i++) { + tmp = ((ULONGLONG)b->data[BNUM_IDX(i)] << shift) + rest; + rest = tmp / LIMB_MAX; + b->data[BNUM_IDX(i)] = tmp % LIMB_MAX; + + if(i == b->b && !b->data[BNUM_IDX(i)]) + b->b++; + } + + if(rest) { + b->data[BNUM_IDX(b->e)] = rest; + b->e++; + + if(BNUM_IDX(b->b) == BNUM_IDX(b->e)) { + if(b->data[BNUM_IDX(b->b)]) b->data[BNUM_IDX(b->b+1)] |= 1; + b->b++; + } + return TRUE; + } + return FALSE; +} + +/* Returns TRUE if most significant limb was removed */ +static inline BOOL bnum_rshift(struct bnum *b, int shift) +{ + DWORD tmp, rest = 0; + BOOL ret = FALSE; + int i; + + /* Compute LIMB_MAX << shift without accuracy loss */ + assert(shift <= 9); + + for(i=b->e-1; i>=b->b; i--) { + tmp = b->data[BNUM_IDX(i)] & ((1<<shift)-1); + b->data[BNUM_IDX(i)] = (b->data[BNUM_IDX(i)] >> shift) + rest; + rest = (LIMB_MAX >> shift) * tmp; + if(i==b->e-1 && !b->data[BNUM_IDX(i)]) { + b->e--; + ret = TRUE; + } + } + + if(rest) { + if(BNUM_IDX(b->b-1) == BNUM_IDX(b->e)) { + if(rest) b->data[BNUM_IDX(b->b)] |= 1; + } else { + b->b--; + b->data[BNUM_IDX(b->b)] = rest; + } + } + return ret; +} + +static inline void bnum_mult(struct bnum *b, int mult) +{ + DWORD rest = 0; + ULONGLONG tmp; + int i; + + assert(mult <= LIMB_MAX); + + for(i=b->b; i<b->e; i++) { + tmp = ((ULONGLONG)b->data[BNUM_IDX(i)] * mult) + rest; + rest = tmp / LIMB_MAX; + b->data[BNUM_IDX(i)] = tmp % LIMB_MAX; + + if(i == b->b && !b->data[BNUM_IDX(i)]) + b->b++; + } + + if(rest) { + b->data[BNUM_IDX(b->e)] = rest; + b->e++; + + if(BNUM_IDX(b->b) == BNUM_IDX(b->e)) { + if(b->data[BNUM_IDX(b->b)]) b->data[BNUM_IDX(b->b+1)] |= 1; + b->b++; + } + } +} + +#endif /* __WINE_BNUM_H */ diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 1e3e0d15bf..62ec54607e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -32,6 +32,7 @@ #include <limits.h> #include <errno.h> #include "msvcrt.h" +#include "bnum.h" #include "winnls.h" #include "wine/debug.h" @@ -353,8 +354,6 @@ enum round { 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); @@ -572,120 +571,9 @@ static double strtod16(MSVCRT_wchar_t get(void *ctx), void unget(void *ctx), } #endif -#define LIMB_DIGITS 9 /* each DWORD stores up to 9 digits */ -#define LIMB_MAX 1000000000 /* 10^9 */ -#define BNUM_IDX(i) ((i) & 127) -/* bnum represents real number with fixed decimal point (after 2 limbs) */ -struct bnum { - DWORD data[128]; /* circular buffer, base 10 number */ - int b; /* least significant digit position */ - int e; /* most significant digit position + 1 */ -}; - -/* Returns integral part of bnum */ -static inline ULONGLONG bnum_to_mant(struct bnum *b) -{ - ULONGLONG ret = (ULONGLONG)b->data[BNUM_IDX(b->e-1)] * LIMB_MAX; - if(b->b != b->e-1) ret += b->data[BNUM_IDX(b->e-2)]; - return ret; -} - -/* Returns TRUE if new most significant limb was added */ -static inline BOOL bnum_lshift(struct bnum *b, int shift) -{ - DWORD rest = 0; - ULONGLONG tmp; - int i; - - /* The limbs number can change by up to 1 so shift <= 29 */ - assert(shift <= 29); - - for(i=b->b; i<b->e; i++) { - tmp = ((ULONGLONG)b->data[BNUM_IDX(i)] << shift) + rest; - rest = tmp / LIMB_MAX; - b->data[BNUM_IDX(i)] = tmp % LIMB_MAX; - - if(i == b->b && !b->data[BNUM_IDX(i)]) - b->b++; - } - - if(rest) { - b->data[BNUM_IDX(b->e)] = rest; - b->e++; - - if(BNUM_IDX(b->b) == BNUM_IDX(b->e)) { - if(b->data[BNUM_IDX(b->b)]) b->data[BNUM_IDX(b->b+1)] |= 1; - b->b++; - } - return TRUE; - } - return FALSE; -} - -/* Returns TRUE if most significant limb was removed */ -static inline BOOL bnum_rshift(struct bnum *b, int shift) -{ - DWORD tmp, rest = 0; - BOOL ret = FALSE; - int i; - - /* Compute LIMB_MAX << shift without accuracy loss */ - assert(shift <= 9); - - for(i=b->e-1; i>=b->b; i--) { - tmp = b->data[BNUM_IDX(i)] & ((1<<shift)-1); - b->data[BNUM_IDX(i)] = (b->data[BNUM_IDX(i)] >> shift) + rest; - rest = (LIMB_MAX >> shift) * tmp; - if(i==b->e-1 && !b->data[BNUM_IDX(i)]) { - b->e--; - ret = TRUE; - } - } - - if(rest) { - if(BNUM_IDX(b->b-1) == BNUM_IDX(b->e)) { - if(rest) b->data[BNUM_IDX(b->b)] |= 1; - } else { - b->b--; - b->data[BNUM_IDX(b->b)] = rest; - } - } - return ret; -} - -static inline void bnum_mult(struct bnum *b, int mult) -{ - DWORD rest = 0; - ULONGLONG tmp; - int i; - - assert(mult <= LIMB_MAX); - - for(i=b->b; i<b->e; i++) { - tmp = ((ULONGLONG)b->data[BNUM_IDX(i)] * mult) + rest; - rest = tmp / LIMB_MAX; - b->data[BNUM_IDX(i)] = tmp % LIMB_MAX; - - if(i == b->b && !b->data[BNUM_IDX(i)]) - b->b++; - } - - if(rest) { - b->data[BNUM_IDX(b->e)] = rest; - b->e++; - - if(BNUM_IDX(b->b) == BNUM_IDX(b->e)) { - if(b->data[BNUM_IDX(b->b)]) b->data[BNUM_IDX(b->b+1)] |= 1; - b->b++; - } - } -} - double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), void *ctx, MSVCRT_pthreadlocinfo locinfo, int *err) { - static const int p10s[] = { 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000 }; - #if _MSVCR_VER >= 140 MSVCRT_wchar_t _infinity[] = { 'i', 'n', 'f', 'i', 'n', 'i', 't', 'y', 0 }; MSVCRT_wchar_t _nan[] = { 'n', 'a', 'n', 0 }; @@ -869,7 +757,7 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), return make_double(sign, 0, b.data[BNUM_IDX(b.e-1)], ROUND_ZERO, err); off = (dp - limb_digits) % LIMB_DIGITS; if(off < 0) off += LIMB_DIGITS; - if(off) bnum_mult(&b, p10s[off-1]); + if(off) bnum_mult(&b, p10s[off]); if(!err) err = MSVCRT__errno(); if(dp-1 > MSVCRT_DBL_MAX_10_EXP)

1 0

Piotr Caban : msvcrt: Reimplement floating point numbers printing.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 1bc6f0c86174cf1b5e47f1f1324a3f733e0658a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc6f0c86174cf1b5e47f1f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 11 18:44:11 2020 +0200 msvcrt: Reimplement floating point numbers printing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37913 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 413 +++++++++++++++++++++++++++++++++--------- dlls/msvcrt/tests/printf.c | 4 +- dlls/oleaut32/tests/vartype.c | 8 +- 3 files changed, 329 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bc6f0c86174cf1b5e47…

1 0

Piotr Caban : ucrtbase: Add more printf tests.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: d5f1c549503e2800d94c251edd27087f570ae104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f1c549503e2800d94c251e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 11 18:44:23 2020 +0200 ucrtbase: Add more printf tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 9d925a06e1..7b754e13fd 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -758,6 +758,57 @@ static void test_printf_fp(void) { "%#.0a", -0.5, { "-0x1.p-1" }}, { "%#.0a", 0.5, { "0x1.p-1" }}, { "%#.0a", 1.5, { "0x1.p+0" }}, + + { "%f", 0, { "0.000000" }}, + { "%e", 0, { "0.000000e+00", NULL, "0.000000e+000" }}, + { "%g", 0, { "0" }}, + { "%21f", 0, { " 0.000000" }}, + { "%20e", 0, { " 0.000000e+00", NULL, " 0.000000e+000" }}, + { "%20g", 0, { " 0" }}, + { "%.21f", 0, { "0.000000000000000000000" }}, + { "%.20e", 0, { "0.00000000000000000000e+00", NULL, "0.00000000000000000000e+000" }}, + { "%.20g", 0, { "0" }}, + { "%.021f", 0, { "0.000000000000000000000" }}, + { "%.020e", 0, { "0.00000000000000000000e+00", NULL, "0.00000000000000000000e+000" }}, + { "%.020g", 0, { "0" }}, + { "%#.21f", 0, { "0.000000000000000000000" }}, + { "%#.20e", 0, { "0.00000000000000000000e+00", NULL, "0.00000000000000000000e+000" }}, + { "%#.20g", 0, { "0.00000000000000000000" }}, + + { "%f", 123, { "123.000000" }}, + { "%e", 123, { "1.230000e+02", NULL, "1.230000e+002" }}, + { "%g", 123, { "123" }}, + { "%21f", 123, { " 123.000000" }}, + { "%20e", 123, { " 1.230000e+02", NULL, " 1.230000e+002" }}, + { "%20g", 123, { " 123" }}, + { "%.21f", 123, { "123.000000000000000000000" }}, + { "%.20e", 123, { "1.23000000000000000000e+02", NULL, "1.23000000000000000000e+002" }}, + { "%.20g", 123, { "123" }}, + { "%.021f", 123, { "123.000000000000000000000" }}, + { "%.020e", 123, { "1.23000000000000000000e+02", NULL, "1.23000000000000000000e+002" }}, + { "%.020g", 123, { "123" }}, + { "%#.21f", 123, { "123.000000000000000000000" }}, + { "%#.20e", 123, { "1.23000000000000000000e+02", NULL, "1.23000000000000000000e+002" }}, + { "%#.20g", 123, { "123.00000000000000000" }}, + + { "%f", -765, { "-765.000000" }}, + { "%e", -765, { "-7.650000e+02", NULL, "-7.650000e+002" }}, + { "%g", -765, { "-765" }}, + { "%21f", -765, { " -765.000000" }}, + { "%20e", -765, { " -7.650000e+02", NULL, " -7.650000e+002" }}, + { "%20g", -765, { " -765" }}, + { "%.21f", -765, { "-765.000000000000000000000" }}, + { "%.20e", -765, { "-7.65000000000000000000e+02", NULL, "-7.65000000000000000000e+002" }}, + { "%.20g", -765, { "-765" }}, + { "%.021f", -765, { "-765.000000000000000000000" }}, + { "%.020e", -765, { "-7.65000000000000000000e+02", NULL, "-7.65000000000000000000e+002" }}, + { "%.020g", -765, { "-765" }}, + { "%#.21f", -765, { "-765.000000000000000000000" }}, + { "%#.20e", -765, { "-7.65000000000000000000e+02", NULL, "-7.65000000000000000000e+002" }}, + { "%#.20g", -765, { "-765.00000000000000000" }}, + { "%.30f", 1.0/3.0, { "0.333333333333333314829616256247" }}, + { "%.30lf", sqrt(2), { "1.414213562373095145474621858739" }}, + { "%.0g", 9.8949714229143402e-05, { "0.0001" }}, }; const char *res = NULL;

1 0

Serge Gautherie : msvcrt: Remove extra pointers on lldiv() implementation and test.
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: 0a835c8da9e7aa5bc1d9f43ae785ce441757d18d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a835c8da9e7aa5bc1d9f43a… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 11 20:02:45 2020 +0200 msvcrt: Remove extra pointers on lldiv() implementation and test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 9 +++++---- dlls/ucrtbase/tests/misc.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e9154795d..ae4a267e03 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2114,11 +2114,12 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) /********************************************************************* * lldiv (MSVCR100.@) */ -MSVCRT_lldiv_t* CDECL MSVCRT_lldiv(MSVCRT_lldiv_t *ret, - MSVCRT_longlong num, MSVCRT_longlong denom) +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) { - ret->quot = num / denom; - ret->rem = num % denom; + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; return ret; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cd100cf1a9..e4928b194f 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -520,12 +520,19 @@ static void test__sopen_s(void) static void test_lldiv(void) { - static lldiv_t* (CDECL *p_lldiv)(lldiv_t*,LONGLONG,LONGLONG) = (void*)lldiv; lldiv_t r; - p_lldiv(&r, (LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + r = lldiv(((LONGLONG)0x111 << 32) + 0x222, (LONGLONG)1 << 32); ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x69CF0012 << 32) + 0x0033E78A, 0x30); + ok(r.quot == ((LONGLONG)0x02345000 << 32) + 0x600114D2, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == 0x2A, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x243A5678 << 32) + 0x9ABCDEF0, (LONGLONG)0x12 << 48); + ok(r.quot == 0x0203, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == ((LONGLONG)0x00045678 << 32) + 0x9ABCDEF0, "rem = %s\n", wine_dbgstr_longlong(r.rem)); } static void test_isblank(void)

1 0

Zebediah Figura : msdmo/tests: Add tests for DMOGetTypes().
by Alexandre Julliard 13 Jul '20

13 Jul '20

Module: wine Branch: master Commit: d36553f290cdaaee58e1d4c63c2848776fb65f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36553f290cdaaee58e1d4c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 13 09:38:01 2020 -0500 msdmo/tests: Add tests for DMOGetTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/tests/msdmo.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 68de11f21a..14653ea8d7 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -117,9 +117,59 @@ static void test_DMOEnum(void) IEnumDMO_Release(enum_dmo); } +static void test_DMOGetTypes(void) +{ + static const DMO_PARTIAL_MEDIATYPE input_types[] = + { + {{0x1111}, {0x2222}}, + {{0x1111}, {0x3333}}, + }; + ULONG input_count, output_count; + DMO_PARTIAL_MEDIATYPE types[3]; + HRESULT hr; + + hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, + ARRAY_SIZE(input_types), input_types, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOGetTypes(&GUID_unknowndmo, 0, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!input_count, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 1, &input_count, types, 0, &output_count, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(input_count == 1, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + todo_wine ok(!memcmp(types, input_types, sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 2, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + memset(types, 0, sizeof(types)); + hr = DMOGetTypes(&GUID_unknowndmo, 2, &input_count, types, 0, &output_count, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(input_count == 2, "Got input count %u.\n", input_count); + ok(!output_count, "Got output count %u.\n", output_count); + ok(!memcmp(types, input_types, 2 * sizeof(DMO_PARTIAL_MEDIATYPE)), "Types didn't match.\n"); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + START_TEST(msdmo) { test_DMOUnregister(); test_DMOGetName(); test_DMOEnum(); + test_DMOGetTypes(); }

1 0