December 2019 - Wine-Commits

Nikolay Sivov : ole32/tests: Add some tests for item moniker ParseDisplayName().
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: 1b5f14d73285aaaa3982a3d8171680df85a04840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5f14d73285aaaa3982a3d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 23 14:22:27 2019 +0300 ole32/tests: Add some tests for item moniker ParseDisplayName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 99 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1daf46ce5d..9a61be4f47 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -252,6 +252,7 @@ struct test_moniker IMoniker IMoniker_iface; IROTData IROTData_iface; IOleItemContainer IOleItemContainer_iface; + IParseDisplayName IParseDisplayName_iface; LONG refcount; BOOL no_IROTData; @@ -272,6 +273,51 @@ static struct test_moniker *impl_from_IOleItemContainer(IOleItemContainer *iface return CONTAINING_RECORD(iface, struct test_moniker, IOleItemContainer_iface); } +static struct test_moniker *impl_from_IParseDisplayName(IParseDisplayName *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IParseDisplayName_iface); +} + +static HRESULT WINAPI test_moniker_parse_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IParseDisplayName)) + { + *obj = iface; + IParseDisplayName_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_moniker_parse_AddRef(IParseDisplayName *iface) +{ + struct test_moniker *moniker = impl_from_IParseDisplayName(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI test_moniker_parse_Release(IParseDisplayName *iface) +{ + struct test_moniker *moniker = impl_from_IParseDisplayName(iface); + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI test_moniker_parse_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, LPOLESTR displayname, ULONG *eaten, IMoniker **out) +{ + return E_NOTIMPL; +} + +static const IParseDisplayNameVtbl test_moniker_parse_vtbl = +{ + test_moniker_parse_QueryInterface, + test_moniker_parse_AddRef, + test_moniker_parse_Release, + test_moniker_parse_ParseDisplayName, +}; + static HRESULT WINAPI test_item_container_QueryInterface(IOleItemContainer *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IOleItemContainer) || @@ -314,12 +360,20 @@ static HRESULT WINAPI test_item_container_EnumObjects(IOleItemContainer *iface, static HRESULT WINAPI test_item_container_LockContainer(IOleItemContainer *iface, BOOL lock) { - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI test_item_container_GetObject(IOleItemContainer *iface, LPOLESTR item, DWORD bind_speed, IBindCtx *pbc, REFIID riid, void **obj) { + struct test_moniker *moniker = impl_from_IOleItemContainer(iface); + + if (IsEqualIID(riid, &IID_IParseDisplayName)) + { + *obj = &moniker->IParseDisplayName_iface; + IOleItemContainer_AddRef(iface); + } + return 0x8bee0000 | bind_speed; } @@ -658,6 +712,7 @@ static struct test_moniker *create_test_moniker(void) obj->IMoniker_iface.lpVtbl = &MonikerVtbl; obj->IROTData_iface.lpVtbl = &ROTDataVtbl; obj->IOleItemContainer_iface.lpVtbl = &test_item_container_vtbl; + obj->IParseDisplayName_iface.lpVtbl = &test_moniker_parse_vtbl; obj->refcount = 1; return obj; @@ -1899,7 +1954,7 @@ static void test_item_moniker(void) IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; - DWORD hash; + DWORD hash, eaten; IBindCtx *bindctx; IMoniker *inverse; IUnknown *unknown; @@ -1907,6 +1962,7 @@ static void test_item_moniker(void) static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; struct test_moniker *container_moniker; + WCHAR displayname[16] = L"display name"; IEnumMoniker *enummoniker; WCHAR *display_name; BIND_OPTS bind_opts; @@ -2076,10 +2132,43 @@ todo_wine hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); - IMoniker_Release(&container_moniker->IMoniker_iface); - + /* BindToStorage() */ hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* ParseDisplayName() */ + hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, displayname, &eaten, &moniker2); + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 0; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 1; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 2499; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 2500; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); + + IMoniker_Release(&container_moniker->IMoniker_iface); IBindCtx_Release(bindctx);

1 0

Nikolay Sivov : ole32/tests: Use heap-based object for custom moniker.
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: b1fe1077d963a6261e23c1d9be1bd379bb5d1360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fe1077d963a6261e23c1d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 23 14:22:25 2019 +0300 ole32/tests: Use heap-based object for custom moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 138 +++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 73 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 42bc094522..2e1e00adc8 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -34,6 +34,7 @@ #include "initguid.h" #include "wine/test.h" +#include "wine/heap.h" #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) @@ -246,9 +247,30 @@ static const IUnknownVtbl HeapUnknown_Vtbl = HeapUnknown_Release }; +struct test_moniker +{ + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG refcount; + + BOOL no_IROTData; +}; + +static struct test_moniker *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IMoniker_iface); +} + +static struct test_moniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IROTData_iface); +} + static HRESULT WINAPI -MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { + struct test_moniker *moniker = impl_from_IMoniker(iface); + if (!ppvObject) return E_INVALIDARG; @@ -260,7 +282,11 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IMoniker, riid)) *ppvObject = iface; if (IsEqualIID(&IID_IROTData, riid)) + { CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); + if (!moniker->no_IROTData) + *ppvObject = &moniker->IROTData_iface; + } if ((*ppvObject)==0) return E_NOINTERFACE; @@ -273,13 +299,20 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI Moniker_AddRef(IMoniker* iface) { - return 2; + struct test_moniker *moniker = impl_from_IMoniker(iface); + return InterlockedIncrement(&moniker->refcount); } static ULONG WINAPI Moniker_Release(IMoniker* iface) { - return 1; + struct test_moniker *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); + + if (!refcount) + heap_free(moniker); + + return refcount; } static HRESULT WINAPI @@ -457,53 +490,25 @@ Moniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) return S_FALSE; } -static const IMonikerVtbl MonikerNoROTDataVtbl = -{ - MonikerNoROTData_QueryInterface, - Moniker_AddRef, - Moniker_Release, - Moniker_GetClassID, - Moniker_IsDirty, - Moniker_Load, - Moniker_Save, - Moniker_GetSizeMax, - Moniker_BindToObject, - Moniker_BindToStorage, - Moniker_Reduce, - Moniker_ComposeWith, - Moniker_Enum, - Moniker_IsEqual, - Moniker_Hash, - Moniker_IsRunning, - Moniker_GetTimeOfLastChange, - Moniker_Inverse, - Moniker_CommonPrefixWith, - Moniker_RelativePathTo, - Moniker_GetDisplayName, - Moniker_ParseDisplayName, - Moniker_IsSystemMoniker -}; - -static IMoniker MonikerNoROTData = { &MonikerNoROTDataVtbl }; - -static IMoniker Moniker; - static HRESULT WINAPI ROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - return IMoniker_QueryInterface(&Moniker, riid, ppvObject); + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppvObject); } static ULONG WINAPI ROTData_AddRef(IROTData *iface) { - return 2; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); } static ULONG WINAPI ROTData_Release(IROTData* iface) { - return 1; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_Release(&moniker->IMoniker_iface); } static HRESULT WINAPI @@ -529,35 +534,6 @@ static IROTDataVtbl ROTDataVtbl = ROTData_GetComparisonData }; -static IROTData ROTData = { &ROTDataVtbl }; - -static HRESULT WINAPI -Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - if (!ppvObject) - return E_INVALIDARG; - - *ppvObject = 0; - - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - if (IsEqualIID(&IID_IROTData, riid)) - { - CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); - *ppvObject = &ROTData; - } - - if ((*ppvObject)==0) - return E_NOINTERFACE; - - IMoniker_AddRef(iface); - - return S_OK; -} - static const IMonikerVtbl MonikerVtbl = { Moniker_QueryInterface, @@ -585,7 +561,17 @@ static const IMonikerVtbl MonikerVtbl = Moniker_IsSystemMoniker }; -static IMoniker Moniker = { &MonikerVtbl }; +static struct test_moniker *create_test_moniker(void) +{ + struct test_moniker *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + obj->IMoniker_iface.lpVtbl = &MonikerVtbl; + obj->IROTData_iface.lpVtbl = &ROTDataVtbl; + obj->refcount = 1; + + return obj; +} static void test_ROT(void) { @@ -594,6 +580,7 @@ static void test_ROT(void) '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; IMoniker *pMoniker = NULL; + struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; DWORD dwCookie; static const char *methods_register_no_ROTData[] = @@ -634,19 +621,22 @@ static void test_ROT(void) hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); + test_moniker = create_test_moniker(); + test_moniker->no_IROTData = TRUE; + expected_method_list = methods_register_no_ROTData; external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie); - ok_ole_success(hr, IRunningObjectTable_Register); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + &test_moniker->IMoniker_iface, &dwCookie); + ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok(external_connections == 1, "external_connections = %d\n", external_connections); ok_more_than_one_lock(); expected_method_list = methods_isrunning_no_ROTData; - hr = IRunningObjectTable_IsRunning(pROT, &MonikerNoROTData); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -658,15 +648,16 @@ static void test_ROT(void) expected_method_list = methods_register; /* try with our own moniker */ + test_moniker->no_IROTData = FALSE; hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &Moniker, &dwCookie); + (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok_more_than_one_lock(); expected_method_list = methods_isrunning; - hr = IRunningObjectTable_IsRunning(pROT, &Moniker); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -719,6 +710,7 @@ static void test_ROT(void) ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); + IMoniker_Release(&test_moniker->IMoniker_iface); IRunningObjectTable_Release(pROT); }

1 0

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

Dec. 23, 2019

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

Nikolay Sivov : dwrite/tests: Improve coverage of IsMonospacedFont() tests.
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: ab9ac59cb247d35066a9e85401c28efd59335da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9ac59cb247d35066a9e854… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 23 09:11:28 2019 +0300 dwrite/tests: Improve coverage of IsMonospacedFont() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 130 +++++++++++++++++++++++++++++++---------------- 1 file changed, 87 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index da75a7b70c..68e2c03baf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2018 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2019 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') #define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') -#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') @@ -1961,7 +1961,7 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET memset(metrics, 0, sizeof(*metrics)); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2600,7 +2600,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "Failed to create font face, %#x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); @@ -4900,67 +4900,111 @@ static void test_GetDesignGlyphMetrics(void) DELETE_FONTFILE(path); } +static BOOL get_expected_is_monospaced(IDWriteFontFace1 *fontface, const DWRITE_PANOSE *panose) +{ + BOOL exists, is_monospaced = FALSE; + const TT_POST *tt_post; + void *post_context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace1_TryGetFontTable(fontface, MS_POST_TAG, (const void **)&tt_post, &size, + &post_context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (tt_post) + { + is_monospaced = !!tt_post->fixed_pitch; + IDWriteFontFace1_ReleaseFontTable(fontface, post_context); + } + + if (!is_monospaced) + is_monospaced |= panose->text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED; + + return is_monospaced; +} + static void test_IsMonospacedFont(void) { - static const WCHAR courierW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; IDWriteFontCollection *collection; - IDWriteFactory *factory; - UINT32 index; - BOOL exists; + IDWriteFactory1 *factory; + UINT32 count, i; HRESULT hr; ULONG ref; - factory = create_factory(); + factory = create_factory_iid(&IID_IDWriteFactory1); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (!factory) + { + win_skip("IsMonospacedFont() is not supported.\n"); + return; + } - exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(collection, courierW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (exists) { + hr = IDWriteFactory1_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get font collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; IDWriteFontFamily *family; - IDWriteFont1 *font1; - IDWriteFont *font; + UINT32 font_count, j; + WCHAR nameW[256]; - hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFontFamily_Release(family); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); - if (hr == S_OK) { + font_count = IDWriteFontFamily_GetFontCount(family); + + for (j = 0; j < font_count; ++j) + { + BOOL is_monospaced_font, is_monospaced_face, is_monospaced_expected; IDWriteFontFace1 *fontface1; IDWriteFontFace *fontface; - BOOL is_monospaced; + DWRITE_PANOSE panose; + IDWriteFont1 *font1; + IDWriteFont *font; - is_monospaced = IDWriteFont1_IsMonospacedFont(font1); - ok(is_monospaced, "got %d\n", is_monospaced); + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void **)&font1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFont_Release(font); hr = IDWriteFont1_CreateFontFace(font1, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - ok(hr == S_OK, "got 0x%08x\n", hr); - is_monospaced = IDWriteFontFace1_IsMonospacedFont(fontface1); - ok(is_monospaced, "got %d\n", is_monospaced); - IDWriteFontFace1_Release(fontface1); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IDWriteFontFace_Release(fontface); + + is_monospaced_font = IDWriteFont1_IsMonospacedFont(font1); + is_monospaced_face = IDWriteFontFace1_IsMonospacedFont(fontface1); + ok(is_monospaced_font == is_monospaced_face, "Unexpected monospaced flag.\n"); + + IDWriteFont1_GetPanose(font1, &panose); + + /* FIXME: failures disabled on Wine for now */ + is_monospaced_expected = get_expected_is_monospaced(fontface1, &panose); + todo_wine_if(is_monospaced_expected != is_monospaced_face) + ok(is_monospaced_expected == is_monospaced_face, "Unexpected is_monospaced flag %d for %s, font %d.\n", + is_monospaced_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace1_Release(fontface1); IDWriteFont1_Release(font1); } - else - win_skip("IsMonospacedFont() is not supported.\n"); - IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); } - else - skip("Courier New font not found.\n"); IDWriteFontCollection_Release(collection); - ref = IDWriteFactory_Release(factory); + ref = IDWriteFactory1_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } @@ -6276,7 +6320,7 @@ static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) hr = IDWriteFont1_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { @@ -7211,7 +7255,7 @@ static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) UINT32 size; HRESULT hr; - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); if (tt_os2) @@ -7848,7 +7892,7 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) {

1 0

Alexandre Julliard : d3d8: Remove redundant includes.
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: b1bb52ad682cd93d02825fe8d9467f39c7920b53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1bb52ad682cd93d02825fe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 23 11:30:54 2019 +0100 d3d8: Remove redundant includes. They cause warnings because NONAMELESSUNION has to be defined first. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 --------- dlls/d3d8/directx.c | 8 -------- 2 files changed, 17 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d4fc80272e..bcd25e9245 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -19,15 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <math.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "wingdi.h" -#include "wine/debug.h" - #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 742117bd71..9a9abeccca 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -20,14 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/debug.h" - #include "d3d8_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d8);

1 0

Jeff Smith : include: Declare _STGMEDIUM_UNION type except when it violates C spec.
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: 6cfda676f7e0d1d2ab75a01aa66c0269659218de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfda676f7e0d1d2ab75a01a… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sun Dec 22 23:56:36 2019 -0600 include: Declare _STGMEDIUM_UNION type except when it violates C spec. Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..a86ceb8b1d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* When NONAMELESSUNION is not defined, the presence of _STGMEDIUM_UNION + * violates the C spec, but is necessary for C++. Avoid C spec violation. */ + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM;

1 0

Martin Storsjo : msvcrt: Only export __p__* functions on i386.
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: a873f78bf194b0f6b121c41e908e1dce781c8411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a873f78bf194b0f6b121c41e… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Dec 20 23:06:30 2019 +0200 msvcrt: Only export __p__* functions on i386. The previous specification, -arch=win32, is incorrect - these functions aren't available on arm. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++++----------------------- dlls/msvcrt20/msvcrt20.spec | 48 +++++++++++++++++++------------------- dlls/msvcrt40/msvcrt40.spec | 50 ++++++++++++++++++++-------------------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b9..4f55bcb45a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc -@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv -@ cdecl -arch=win32 __p___initenv() -@ cdecl -arch=win32 __p___mb_cur_max() -@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv -@ cdecl -arch=win32 __p___winitenv() -@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln -@ cdecl -arch=win32 __p__amblksiz() -@ cdecl -arch=win32 __p__commode() -@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight -@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias -@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ -@ stub -arch=win32 __p__fileinfo() -@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=i386 __p___argc() MSVCRT___p___argc +@ cdecl -arch=i386 __p___argv() MSVCRT___p___argv +@ cdecl -arch=i386 __p___initenv() +@ cdecl -arch=i386 __p___mb_cur_max() +@ cdecl -arch=i386 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=i386 __p___winitenv() +@ cdecl -arch=i386 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=i386 __p__amblksiz() +@ cdecl -arch=i386 __p__commode() +@ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=i386 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=i386 __p__environ() MSVCRT___p__environ +@ stub -arch=i386 __p__fileinfo() +@ cdecl -arch=i386 __p__fmode() MSVCRT___p__fmode @ cdecl -arch=i386 __p__iob() __iob_func -@ stub -arch=win32 __p__mbcasemap() -@ cdecl -arch=win32 __p__mbctype() -@ cdecl -arch=win32 __p__osver() -@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype -@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr -@ stub -arch=win32 __p__pwctype() -@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone -@ cdecl -arch=win32 __p__tzname() -@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron -@ cdecl -arch=win32 __p__winmajor() -@ cdecl -arch=win32 __p__winminor() -@ cdecl -arch=win32 __p__winver() -@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=i386 __p__mbcasemap() +@ cdecl -arch=i386 __p__mbctype() +@ cdecl -arch=i386 __p__osver() +@ cdecl -arch=i386 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=i386 __p__pwctype() +@ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=i386 __p__tzname() +@ cdecl -arch=i386 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=i386 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=i386 __p__winmajor() +@ cdecl -arch=i386 __p__winminor() +@ cdecl -arch=i386 __p__winver() +@ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 002966affd..5384c0dea8 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -808,32 +808,32 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc -@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv -@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv -@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv -@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv -@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln -@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode -@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight -@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ -@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc +@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv +@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode +@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ +@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode @ cdecl -arch=i386 __p__iob() msvcrt.__p__iob -@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype -@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver -@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype -@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver +@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone -@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname -@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron -@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor -@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor -@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver -@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver +@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index bb2ad1916e..c2cee6cfde 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -886,33 +886,33 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc -@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv -@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv -@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv -@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv -@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln -@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode -@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight -@ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias -@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ -@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc +@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv +@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode +@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias +@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ +@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode @ cdecl -arch=i386 __p__iob() msvcrt.__p__iob -@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype -@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver -@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype -@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver +@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone -@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname -@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron -@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor -@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor -@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver -@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver +@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __set_app_type(long) msvcrt.__set_app_type @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr

1 0

Nikolay Sivov : dwrite/tests: Add IsColorFont() tests.
by Alexandre Julliard Dec. 23, 2019

Dec. 23, 2019

Module: wine Branch: master Commit: 3f754db537c569466863b4160ffd9437ad2a3231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f754db537c569466863b416… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 23 09:11:29 2019 +0300 dwrite/tests: Add IsColorFont() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 68e2c03baf..d7bcfb1f0a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9546,6 +9546,109 @@ static void test_font_resource(void) ok(ref == 0, "Factory wasn't released, %u.\n", ref); } +static BOOL get_expected_is_color(IDWriteFontFace2 *fontface) +{ + void *context; + UINT32 size; + BOOL exists; + void *data; + HRESULT hr; + + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_CPAL_TAG, (const void **)&data, &size, &context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (context) + IDWriteFontFace2_ReleaseFontTable(fontface, context); + + if (exists) + { + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_COLR_TAG, (const void **)&data, &size, &context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (context) + IDWriteFontFace2_ReleaseFontTable(fontface, context); + } + + return exists; +} + +static void test_IsColorFont(void) +{ + IDWriteFontCollection *collection; + IDWriteFactory2 *factory; + UINT32 count, i; + ULONG refcount; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory2); + + if (!factory) + { + win_skip("IsColorFont() is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get font collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 font_count, j; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); + + font_count = IDWriteFontFamily_GetFontCount(family); + + for (j = 0; j < font_count; ++j) + { + BOOL is_color_font, is_color_face, is_color_expected; + IDWriteFontFace2 *fontface2; + IDWriteFontFace *fontface; + IDWriteFont2 *font2; + IDWriteFont *font; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont2, (void **)&font2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFont2_CreateFontFace(font2, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void **)&fontface2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFontFace_Release(fontface); + + is_color_font = IDWriteFont2_IsColorFont(font2); + is_color_face = IDWriteFontFace2_IsColorFont(fontface2); + ok(is_color_font == is_color_face, "Unexpected color flag.\n"); + + is_color_expected = get_expected_is_color(fontface2); + ok(is_color_expected == is_color_face, "Unexpected is_color flag %d for %s, font %d.\n", + is_color_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace2_Release(fontface2); + IDWriteFont2_Release(font2); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(collection); + refcount = IDWriteFactory2_Release(factory); + ok(refcount == 0, "Factory not released, refcount %u.\n", refcount); +} + START_TEST(font) { IDWriteFactory *factory; @@ -9614,6 +9717,7 @@ START_TEST(font) test_AnalyzeContainerType(); test_fontsetbuilder(); test_font_resource(); + test_IsColorFont(); IDWriteFactory_Release(factory); }

1 0

Alexandre Julliard : Wine release 5.0-rc2
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: website Branch: master Commit: c9fd79667b19324fc4af6abd191bbf1eb0c34079 URL: https://source.winehq.org/git/website.git/?a=commit;h=c9fd79667b19324fc4af6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 21:07:39 2019 +0100 Wine release 5.0-rc2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019122001.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019122001.xml b/news/en/2019122001.xml new file mode 100644 index 00000000..14a35b53 --- /dev/null +++ b/news/en/2019122001.xml @@ -0,0 +1,12 @@ +<news> +<date>December 20, 2019</date> +<title>Wine 5.0-rc2 Released</title> +<body> + The Wine development release 5.0-rc2 is now available. + <a href="{$root}/announce/5.0-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Damjan Jovanovic : wineserver: Avoid spurious FD_WRITE on repeated calls to WSAEventSelect().
by Alexandre Julliard Dec. 20, 2019

Dec. 20, 2019

Module: wine Branch: master Commit: b4a1d80ae35d35f5c170e101922bf1563488be18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4a1d80ae35d35f5c170e101… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Dec 20 04:16:05 2019 +0200 wineserver: Avoid spurious FD_WRITE on repeated calls to WSAEventSelect(). Repeated calls to WSAEventSelect() with FD_WRITE deliver spurious FD_WRITE events, as the flag isn't held, resulting in us unnecessarily polling the socket for writability, despite the fact FD_WRITE should only be delivered (1) initially on socket creation, and (2) after send[to]() fails with EWOULDBLOCK and buffer space becomes available. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 5 ++--- server/sock.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc63f..fa9d081185 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3053,9 +3053,8 @@ static void test_WSAEnumNetworkEvents(void) } else { - todo_wine_if (i != 0) /* Remove when fixed */ - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); } for (k = 0; k < FD_MAX_EVENTS; k++) { diff --git a/server/sock.c b/server/sock.c index 1a53ce4b09..29542cd01f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1228,7 +1228,7 @@ DECL_HANDLER(set_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; old_event = sock->event; sock->mask = req->mask; - sock->hmask &= ~req->mask; /* re-enable held events */ + sock->hmask &= (FD_WRITE | ~req->mask); /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0