December 2019 - Wine-commits

Zhiyi Zhang : winhttp: Initialize a return variable.
by Alexandre Julliard 24 Dec '19

24 Dec '19

Module: wine Branch: master Commit: 80a8c8d259411c8649b4bb60367041aa0d5d75b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a8c8d259411c8649b4bb60… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 24 17:18:07 2019 +0800 winhttp: Initialize a return variable. When getaddrinfo() failed in detect_autoproxyconfig_url_dns(), an undefined variable is passed to WinHttpDetectAutoProxyConfigUrl(), causing applications to receive a wrong url. This is a regression from 4ad4173e3a715d5bd27bedc164718cef9cafe0a4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48349 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 22aa285a44..e647d71faf 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1427,7 +1427,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static WCHAR *detect_autoproxyconfig_url_dns(void) { char *fqdn, *domain, *p; - WCHAR *ret; + WCHAR *ret = NULL; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain )))

1 0

Zhiyi Zhang : include: Fix SetupDiOpenDeviceInterfaceRegKey() prototype.
by Alexandre Julliard 24 Dec '19

24 Dec '19

Module: wine Branch: master Commit: 2bdfcd5b5483ff7c6334c7107f8d189660bcf74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bdfcd5b5483ff7c6334c710… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 24 22:54:52 2019 +0800 include: Fix SetupDiOpenDeviceInterfaceRegKey() prototype. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/setupapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/setupapi.h b/include/setupapi.h index 818cc12599..48060edf91 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1615,7 +1615,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO, PCWSTR, HWND, DWORD, PSP_DEVINF BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO, PCWSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); #define SetupDiOpenDeviceInterface WINELIB_NAME_AW(SetupDiOpenDeviceInterface) -BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM); +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM); HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA);

1 0

Dmitry Timoshkov : ntdll: Use default casemap and codepage file names if the value in registry is empty.
by Alexandre Julliard 24 Dec '19

24 Dec '19

Module: wine Branch: master Commit: b95d2f553c37b80e0d89a811a1821016700e8510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95d2f553c37b80e0d89a811… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 24 17:55:51 2019 +0800 ntdll: Use default casemap and codepage file names if the value in registry is empty. This helps to keep compatibility with old prefixes being reused for wine-5.0. Old prefixes in their registry have [System\\CurrentControlSet\\Control\\Nls\\Codepage] "37"="" [System\\CurrentControlSet\\Control\\Nls\\Language] "0409"="" and this leads to LCMapString(LCMAP_LOWERCASE/LCMAP_UPPERCASE) return garbage. This is a regression caused by 94a3add0ea7889dbd26a4ded60ace1c40b02ed89. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d9e4e8086e..e3f562808b 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -218,7 +218,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) NtClose( handle ); } - if (!name) /* otherwise some hardcoded defaults */ + if (!name || !*name) /* otherwise some hardcoded defaults */ { switch (type) {

1 0

Erich E. Hoover : msvcrt: Fix [str|wcs]tod result being compared against FLT_MAX.
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 27b9a420ea87fd85c0c933b7db77a9efb22f94cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b9a420ea87fd85c0c933b7… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Dec 22 07:33:38 2019 -0700 msvcrt: Fix [str|wcs]tod result being compared against FLT_MAX. Also a more straightforward way of fixing the tests on i386 Linux. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48324 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/string.c | 14 ++++---------- dlls/msvcrt/tests/string.c | 5 ++++- dlls/msvcrt/wcs.c | 14 ++++---------- 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2ac7977182..c333ddc62f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -49,6 +49,8 @@ #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) #define MSVCRT_MB_LEN_MAX 5 +#define MSVCRT_FLT_MAX_10_EXP 38 +#define MSVCRT_FLT_MIN_10_EXP (-37) #define MSVCRT_DBL_MAX_10_EXP 308 #define MSVCRT_DBL_MIN_10_EXP (-307) #ifdef _WIN64 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 03d80a5dec..ae1ec4c796 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -571,10 +571,10 @@ static double MSVCRT_mul_pow10(double x, int exp) static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { - BOOL found_digit = FALSE, overflow, underflow; int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; + BOOL found_digit = FALSE; unsigned fpcontrol; const char *p; double ret; @@ -694,18 +694,12 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - /* if we have a simple case then just calculate the result directly */ - overflow = (exp3-exp1 > MSVCRT_DBL_MAX_10_EXP); - underflow = (exp3-exp1 < MSVCRT_DBL_MIN_10_EXP); - if(!overflow && !underflow) { - exp1 += exp3; - exp3 = 0; - } /* take the number without exponent and convert it into a double */ ret = MSVCRT_mul_pow10(d, exp1); /* shift the number to the representation where the first non-zero digit is in the ones place */ - if(overflow || underflow) - exp2 = (ret != 0.0 ? (int)log10(ret) : 0); + exp2 = (ret != 0.0 ? (int)round(log10(ret)) : 0); + if (exp3-exp2 >= MSVCRT_FLT_MIN_10_EXP && exp3-exp2 <= MSVCRT_FLT_MAX_10_EXP) + exp2 = 0; /* only bother to take this extra step with very small or very large numbers */ /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index beca47f1b6..fa2c8d6196 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1999,8 +1999,11 @@ static void test__strtod(void) strtod("-1d309", NULL); ok(errno == ERANGE, "errno = %x\n", errno); + d = strtod("3.4028234663852887e38", NULL); + ok(d <= FLT_MAX, "d = %e\n", d); + d = strtod("1.7976931348623158e+308", NULL); - ok(almost_equal(d, DBL_MAX), "d = %lf (%lf)\n", d, DBL_MAX); + ok(d == DBL_MAX, "d = %le\n", d); } static void test_mbstowcs(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 855e3d8593..6d03997d9e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -398,10 +398,10 @@ static double MSVCRT_mul_pow10(double x, int exp) double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, MSVCRT__locale_t locale) { - BOOL found_digit = FALSE, overflow, underflow; int exp1=0, exp2=0, exp3=0, sign=1; MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; + BOOL found_digit = FALSE; unsigned fpcontrol; const MSVCRT_wchar_t *p; double ret; @@ -490,18 +490,12 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT|MSVCRT__PC_64, MSVCRT__MCW_EM | MSVCRT__MCW_PC ); - /* if we have a simple case then just calculate the result directly */ - overflow = (exp3-exp1 > MSVCRT_DBL_MAX_10_EXP); - underflow = (exp3-exp1 < MSVCRT_DBL_MIN_10_EXP); - if(!overflow && !underflow) { - exp1 += exp3; - exp3 = 0; - } /* take the number without exponent and convert it into a double */ ret = MSVCRT_mul_pow10(d, exp1); /* shift the number to the representation where the first non-zero digit is in the ones place */ - if(overflow || underflow) - exp2 = (ret != 0.0 ? (int)log10(ret) : 0); + exp2 = (ret != 0.0 ? (int)round(log10(ret)) : 0); + if (exp3-exp2 >= MSVCRT_FLT_MIN_10_EXP && exp3-exp2 <= MSVCRT_FLT_MAX_10_EXP) + exp2 = 0; /* only bother to take this extra step with very small or very large numbers */ /* incorporate an additional shift to deal with floating point denormal values (if necessary) */ if(exp3-exp2 < MSVCRT_DBL_MIN_10_EXP) exp2 += exp3-exp2-MSVCRT_DBL_MIN_10_EXP;

1 0

Zebediah Figura : winegstreamer: Recognize the "video/x-cinepak" type.
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 826e2508e547d892851b6c140bbe940b14518321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=826e2508e547d892851b6c14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 23 09:44:31 2019 -0600 winegstreamer: Recognize the "video/x-cinepak" type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..e67efd58eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -853,12 +888,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n");

1 0

Steve Lhomme : include: Add dxgidebug.idl.
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 64822f2120edca44bdc3bff1e6feba35ea396014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64822f2120edca44bdc3bff1… Author: Steve Lhomme <robux4(a)gmail.com> Date: Tue Dec 17 11:50:52 2019 +0100 include: Add dxgidebug.idl. Signed-off-by: Steve Lhomme <robux4(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgidebug.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 2e9a921df7..cbad4d604f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -250,6 +250,7 @@ SOURCES = \ dxgi1_5.idl \ dxgi1_6.idl \ dxgicommon.idl \ + dxgidebug.idl \ dxgiformat.idl \ dxgitype.idl \ dxva.h \ diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl new file mode 100644 index 0000000000..2daeb674f9 --- /dev/null +++ b/include/dxgidebug.idl @@ -0,0 +1,43 @@ +/* + * Copyright 2015 Steve Lhomme + * + * 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 + */ + +import "oaidl.idl"; + +cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") +cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") +cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") +cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") + +typedef enum DXGI_DEBUG_RLO_FLAGS { + DXGI_DEBUG_RLO_SUMMARY = 0x0001, + DXGI_DEBUG_RLO_DETAIL = 0x0002, + DXGI_DEBUG_RLO_IGNORE_INTERNAL = 0x0004, + DXGI_DEBUG_RLO_ALL = 0x0007 +} DXGI_DEBUG_RLO_FLAGS; + +[ + object, + local, + uuid(119e7452-de9e-40fe-8806-88f90c12b441) +] +interface IDXGIDebug : IUnknown +{ + HRESULT ReportLiveObjects( + [in] GUID apiid, + [in] DXGI_DEBUG_RLO_FLAGS flags); +}

1 0

Steve Lhomme : include: Add D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT.
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 31085cc3e91dabbc69f1c5acb7129fc525ba3f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31085cc3e91dabbc69f1c5ac… Author: Steve Lhomme <robux4(a)gmail.com> Date: Tue Dec 17 11:51:34 2019 +0100 include: Add D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT. Signed-off-by: Steve Lhomme <robux4(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 78b4f33467..9ecb3af091 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -3793,6 +3793,12 @@ typedef enum D3D11_CREATE_DEVICE_FLAG { D3D11_CREATE_DEVICE_VIDEO_SUPPORT = 0x0800 } D3D11_CREATE_DEVICE_FLAG; +typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT +{ + D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT = 0x0001, + D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT = 0x0002, +} D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT; + const UINT D3D11_SDK_VERSION = 7; cpp_quote("#include <d3d10_1.h>")

1 0

Nikolay Sivov : include: Update DWRITE_FONT_PROPERTY_ID enum.
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 6a157b7e8fdb8966d7d8335123c7d070b75d1b68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a157b7e8fdb8966d7d83351… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 24 00:15:53 2019 +0300 include: Update DWRITE_FONT_PROPERTY_ID enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f7cb97dff6..54d204f39f 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -53,9 +53,9 @@ typedef enum DWRITE_RENDERING_MODE1 typedef enum DWRITE_FONT_PROPERTY_ID { DWRITE_FONT_PROPERTY_ID_NONE, - DWRITE_FONT_PROPERTY_ID_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, DWRITE_FONT_PROPERTY_ID_FULL_NAME, DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, @@ -65,7 +65,12 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH, DWRITE_FONT_PROPERTY_ID_STYLE, - DWRITE_FONT_PROPERTY_ID_TOTAL + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_TOTAL = DWRITE_FONT_PROPERTY_ID_STYLE + 1, + DWRITE_FONT_PROPERTY_ID_TOTAL_RS3 = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME + 1, + DWRITE_FONT_PROPERTY_ID_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_FACE_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, } DWRITE_FONT_PROPERTY_ID; typedef struct DWRITE_FONT_PROPERTY

1 0

Michael Stefaniuc : dmstyle: Avoid cloning the IStream in parse_style_form().
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 2ba39c89018717af8efc7d12c68204b35be329fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ba39c89018717af8efc7d12… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 20 23:55:36 2019 +0100 dmstyle: Avoid cloning the IStream in parse_style_form(). It can be an application provided IStream with unimplemented Clone() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/style.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5ebe6589d4..3e480028b9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -778,23 +778,21 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK ListCount[0] = 0; switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER save; struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + + /* Can be application provided IStream without Clone method */ liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek(pStm, liMove, STREAM_SEEK_CUR, &save); - hr = load_band(pClonedStream, &pBand); + hr = load_band(pStm, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { @@ -808,9 +806,9 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release it as it's inserted */ /** now safely move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - + liMove.QuadPart = save.QuadPart - liMove.QuadPart + ListSize[0]; + IStream_Seek(pStm, liMove, STREAM_SEEK_SET, NULL); + break; } default: {

1 0

Erich E. Hoover : ntdll: Drop support for floating point numbers in sscanf.
by Alexandre Julliard 23 Dec '19

23 Dec '19

Module: wine Branch: master Commit: 94675cd8e38496c63dc033e015783c589d764193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94675cd8e38496c63dc033e0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Dec 21 17:53:57 2019 -0700 ntdll: Drop support for floating point numbers in sscanf. Takes care of one more use of "long double". Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 140 ---------------------------------------------- dlls/ntdll/tests/string.c | 47 ++++++++++++++++ 2 files changed, 47 insertions(+), 140 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 1d6af8558c..709f0ebdbd 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -848,7 +848,6 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) int base; int h_prefix = 0; BOOLEAN l_prefix = FALSE; - BOOLEAN L_prefix = FALSE; BOOLEAN w_prefix = FALSE; BOOLEAN I64_prefix = FALSE; BOOLEAN prefix_finished = FALSE; @@ -881,7 +880,6 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) l_prefix = TRUE; break; case 'w': w_prefix = TRUE; break; - case 'L': L_prefix = TRUE; break; case 'I': if (*(format + 1) == '6' && *(format + 2) == '4') @@ -990,144 +988,6 @@ static int NTDLL_vsscanf( const char *str, const char *format, __ms_va_list ap) } } break; - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - { /* read a float */ - long double cur = 1, expcnt = 10; - ULONGLONG d, hlp; - int exp = 0; - BOOLEAN negative = FALSE; - /*unsigned fpcontrol;*/ - BOOLEAN negexp; - - /* skip initial whitespace */ - while (nch != '\0' && isspace( nch )) - nch = (consumed++, *str++); - - /* get sign */ - if (nch == '-' || nch == '+') - { - negative = (nch == '-'); - if (width > 0) width--; - if (width == 0) break; - nch = (consumed++, *str++); - } - - /* get first digit */ - if ('.' != nch) - { - if (!isdigit( nch )) break; - d = nch - '0'; - nch = (consumed++, *str++); - if (width > 0) width--; - /* read until no more digits */ - while (width != 0 && nch != '\0' && isdigit( nch )) - { - hlp = d * 10 + nch - '0'; - nch = (consumed++, *str++); - if (width > 0) width--; - if(d > (ULONGLONG)-1/10 || hlp < d) - { - exp++; - break; - } - else - d = hlp; - } - while (width != 0 && nch != '\0' && isdigit( nch )) - { - exp++; - nch = (consumed++, *str++); - if (width > 0) width--; - } - } - else - d = 0; /* Fix: .8 -> 0.8 */ - - /* handle decimals */ - if (width != 0 && nch == '.') - { - nch = (consumed++, *str++); - if (width > 0) width--; - - while (width != 0 && nch != '\0' && isdigit( nch )) - { - hlp = d * 10 + nch - '0'; - nch = (consumed++, *str++); - if (width > 0) width--; - if(d > (ULONGLONG)-1/10 || hlp < d) - break; - - d = hlp; - exp--; - } - while (width != 0 && nch != '\0' && isdigit( nch )) - { - nch = (consumed++, *str++); - if (width > 0) width--; - } - } - - /* handle exponent */ - if (width != 0 && (nch == 'e' || nch == 'E')) - { - int sign = 1, e = 0; - - nch = (consumed++, *str++); - if (width > 0) width--; - if (width != 0 && (nch == '+' || nch == '-')) - { - if(nch == '-') - sign = -1; - nch = (consumed++, *str++); - if (width > 0) width--; - } - - /* exponent digits */ - while (width != 0 && nch != '\0' && isdigit( nch )) - { - if (e > INT_MAX/10 || (e = e * 10 + nch - '0') < 0) - e = INT_MAX; - nch = (consumed++, *str++); - if (width > 0) width--; - } - e *= sign; - - if(exp < 0 && e < 0 && e+exp > 0) exp = INT_MIN; - else if(exp > 0 && e > 0 && e+exp < 0) exp = INT_MAX; - else exp += e; - } - - /*fpcontrol = _control87(0, 0); - _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff);*/ - - negexp = (exp < 0); - if (negexp) - exp = -exp; - /* update 'cur' with this exponent. */ - while (exp) - { - if(exp & 1) - cur *= expcnt; - exp /= 2; - expcnt = expcnt*expcnt; - } - cur = (negexp ? d/cur : d*cur); - - /*_control87(fpcontrol, 0xffffffff);*/ - - st = 1; - if (!suppress) - { - if (L_prefix || l_prefix) _SET_NUMBER_( double ); - else _SET_NUMBER_( float ); - } - } - break; /* According to msdn, * 's' reads a character string in a call to fscanf * and 'S' a wide character string and vice versa in a diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 5a2d8458c2..12027e8899 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -67,6 +67,8 @@ static int (__cdecl *p_tolower)(int); static int (__cdecl *p_toupper)(int); static int (__cdecl *p__strnicmp)(LPCSTR,LPCSTR,size_t); +static int (WINAPIV *p_sscanf)(const char *, const char *, ...); + static void InitFunctionPtrs(void) { hntdll = LoadLibraryA("ntdll.dll"); @@ -109,6 +111,8 @@ static void InitFunctionPtrs(void) p_tolower = (void *)GetProcAddress(hntdll, "tolower"); p_toupper = (void *)GetProcAddress(hntdll, "toupper"); p__strnicmp = (void *)GetProcAddress(hntdll, "_strnicmp"); + + p_sscanf = (void *)GetProcAddress(hntdll, "sscanf"); } /* if */ } @@ -1455,6 +1459,48 @@ static void test__strnicmp(void) ok(!ret, "_strnicmp returned %d\n", ret); } +static void test_sscanf(void) +{ + double d = 0.0; + float f = 0.0f; + int i = 0; + int ret; + + if (!p_sscanf) + { + win_skip("sscanf tests\n"); + return; + } + + ret = p_sscanf("10", "%d", &i); + ok(ret == 1, "ret = %d\n", ret); + ok(i == 10, "i = %d\n", i); + + ret = p_sscanf("10", "%f", &f); + ok(ret == 0 || broken(ret == 1) /* xp/2003 */, "ret = %d\n", ret); + ok(f == 0.0f, "f = %f\n", f); + + ret = p_sscanf("10", "%g", &f); + ok(ret == 0 || broken(ret == 1) /* xp/2003 */, "ret = %d\n", ret); + ok(f == 0.0f, "f = %f\n", f); + + ret = p_sscanf("10", "%e", &f); + ok(ret == 0 || broken(ret == 1) /* xp/2003 */, "ret = %d\n", ret); + ok(f == 0.0f, "f = %f\n", f); + + ret = p_sscanf("10", "%lf", &d); + ok(ret == 0 || broken(ret == 1) /* xp/2003 */, "ret = %d\n", ret); + ok(d == 0.0, "d = %lf\n", f); + + ret = p_sscanf("10", "%lg", &d); + ok(ret == 0 || broken(ret == 1) /* xp/2003 */, "ret = %d\n", ret); + ok(d == 0.0, "d = %lf\n", f); + + ret = p_sscanf("10", "%le", &d); + ok(ret == 0 || broken(ret == 1) /* xp/2003 */, "ret = %d\n", ret); + ok(d == 0.0, "d = %lf\n", f); +} + START_TEST(string) { InitFunctionPtrs(); @@ -1498,4 +1544,5 @@ START_TEST(string) test_tolower(); test_toupper(); test__strnicmp(); + test_sscanf(); }

1 0