November 2019 - Wine-Commits

Hans Leidekker : shell32: Improve the stub for SHGetPropertyStoreForWindow.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: d7533e28df9ffa8303e8d53337dfe8d68e423eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7533e28df9ffa8303e8d533… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 1 14:13:00 2019 +0100 shell32: Improve the stub for SHGetPropertyStoreForWindow. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 112 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/appbar.c | 32 +++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 99ee110b3d..034805f6fb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -691,13 +691,123 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); } +struct window_prop_store +{ + IPropertyStore IPropertyStore_iface; + LONG ref; +}; + +static inline struct window_prop_store *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct window_prop_store, IPropertyStore_iface); +} + +static ULONG WINAPI window_prop_store_AddRef(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedIncrement(&store->ref); + TRACE("returning %d\n", ref); + return ref; +} + +static ULONG WINAPI window_prop_store_Release(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedDecrement(&store->ref); + if (!ref) heap_free(store); + TRACE("returning %d\n", ref); + return ref; +} + +static HRESULT WINAPI window_prop_store_QueryInterface(IPropertyStore *iface, REFIID iid, void **obj) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + TRACE("%p, %s, %p\n", iface, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPropertyStore)) + { + *obj = &store->IPropertyStore_iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_GetCount(IPropertyStore *iface, DWORD *count) +{ + FIXME("%p, %p\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) +{ + FIXME("%p, %u,%p\n", iface, prop, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetValue(IPropertyStore *iface, const PROPERTYKEY *key, PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_SetValue(IPropertyStore *iface, const PROPERTYKEY *key, const PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_Commit(IPropertyStore *iface) +{ + FIXME("%p\n", iface); + return S_OK; +} + +static const IPropertyStoreVtbl window_prop_store_vtbl = +{ + window_prop_store_QueryInterface, + window_prop_store_AddRef, + window_prop_store_Release, + window_prop_store_GetCount, + window_prop_store_GetAt, + window_prop_store_GetValue, + window_prop_store_SetValue, + window_prop_store_Commit +}; + +static HRESULT create_window_prop_store(IPropertyStore **obj) +{ + struct window_prop_store *store; + + if (!(store = heap_alloc(sizeof(*store)))) return E_OUTOFMEMORY; + store->IPropertyStore_iface.lpVtbl = &window_prop_store_vtbl; + store->ref = 1; + + *obj = &store->IPropertyStore_iface; + return S_OK; +} + /************************************************************************* * SHGetPropertyStoreForWindow [SHELL32.@] */ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) { + IPropertyStore *store; + HRESULT hr; + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); - return E_NOTIMPL; + + if ((hr = create_window_prop_store( &store )) != S_OK) return hr; + hr = IPropertyStore_QueryInterface( store, riid, ppv ); + IPropertyStore_Release( store ); + return hr; } /*************************************************************************/ diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 1505a40aeb..229d616c6f 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -21,6 +21,8 @@ #include <windows.h> #include "shellapi.h" +#define COBJMACROS +#include "propsys.h" #include "wine/test.h" @@ -30,6 +32,7 @@ static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); static HRESULT (WINAPI *pGetCurrentProcessExplicitAppUserModelID)(PWSTR*); +static HRESULT (WINAPI *pSHGetPropertyStoreForWindow)(HWND, REFIID, void **); typedef BOOL (*boolean_function)(void); @@ -433,6 +436,33 @@ todo_wine ok(appid == NULL, "got %p\n", appid); } +static void test_SHGetPropertyStoreForWindow(void) +{ + HRESULT hr; + IUnknown *unk; + IPropertyStore *store = NULL; + + if (!pSHGetPropertyStoreForWindow) + { + win_skip("SHGetPropertyStoreForWindow() is not supported.\n"); + return; + } + + unk = (IUnknown *)0xdeadbeef; + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IDispatch, (void **)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(unk == NULL, "got %p\n", unk); + + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IPropertyStore, (void **)&store); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (store) IPropertyStore_Release(store); + if (unk) IUnknown_Release(unk); +} + START_TEST(appbar) { HMODULE huser32, hshell32; @@ -441,10 +471,12 @@ START_TEST(appbar) hshell32 = GetModuleHandleA("shell32.dll"); pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); pGetCurrentProcessExplicitAppUserModelID = (void*)GetProcAddress(hshell32, "GetCurrentProcessExplicitAppUserModelID"); + pSHGetPropertyStoreForWindow = (void*)GetProcAddress(hshell32, "SHGetPropertyStoreForWindow"); register_testwindow_class(); test_setpos(); test_appbarget(); test_GetCurrentProcessExplicitAppUserModelID(); + test_SHGetPropertyStoreForWindow(); }

1 0

Fabian Maurer : find: Prevent hang by properly checking for EOF.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 93c98111aee7d96a1150657d9220d32f2f06e745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c98111aee7d96a1150657d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Nov 1 16:02:41 2019 +0100 find: Prevent hang by properly checking for EOF. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/find/find.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/find/find.c b/programs/find/find.c index 3794a8190f..34ca2801eb 100644 --- a/programs/find/find.c +++ b/programs/find/find.c @@ -36,7 +36,7 @@ static BOOL read_char_from_handle(HANDLE handle, char *char_out) if (buffer_pos >= buffer_max) { BOOL success = ReadFile(handle, buffer, 4096, &buffer_max, NULL); - if (!success) + if (!success || !buffer_max) return FALSE; buffer_pos = 0; }

1 0

Byeongsik Jeon : po: Update Korean tranlation.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: fde9de91dfb7eb50c0e912a930c6739526b93ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde9de91dfb7eb50c0e912a9… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Fri Nov 1 16:58:15 2019 +0900 po: Update Korean tranlation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 688 ++++++++++++++++++++++----------------------------------------- 1 file changed, 239 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fde9de91dfb7eb50c0e9…

1 0

Jacek Caban : vbscript: Add support for parameterized set statements.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: aad0340c8f339cd0a676d932e4c4d9394ccf2951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad0340c8f339cd0a676d932… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:37 2019 +0100 vbscript: Add support for parameterized set statements. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 15 +++++---------- dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index ad6454aa57..97360f9b22 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -872,23 +872,18 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) DISPPARAMS dp; HRESULT hres; - TRACE("%s\n", debugstr_w(arg)); - - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } + TRACE("%s %u\n", debugstr_w(arg), arg_cnt); - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; - vbstack_to_dp(ctx, 0, TRUE, &dp); - hres = assign_ident(ctx, ctx->instr->arg1.bstr, DISPATCH_PROPERTYPUTREF, &dp); + vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); + hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUTREF, &dp); if(FAILED(hres)) return hres; - stack_popn(ctx, 1); + stack_popn(ctx, arg_cnt + 1); return S_OK; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9354cae309..765a0353d1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -104,6 +104,8 @@ DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); +DEFINE_EXPECT(global_propargset_d); +DEFINE_EXPECT(global_propargset_i); DEFINE_EXPECT(global_testoptionalarg_i); DEFINE_EXPECT(global_testerrorobject_i); DEFINE_EXPECT(collectionobj_newenum_i); @@ -140,6 +142,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_GLOBALCALLBACK 1022 #define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_GLOBAL_THROWWITHDESC 1024 +#define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1101,6 +1104,7 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"RefObj", DISPID_GLOBAL_REFOBJ }, { L"propargput", DISPID_GLOBAL_PROPARGPUT, REF_EXPECT(global_propargput_d) }, { L"propargput1", DISPID_GLOBAL_PROPARGPUT1, REF_EXPECT(global_propargput1_d) }, + { L"propargset", DISPID_GLOBAL_PROPARGSET, REF_EXPECT(global_propargset_d) }, { L"counter", DISPID_GLOBAL_COUNTER }, { L"doubleAsString", DISPID_GLOBAL_DOUBLEASSTRING }, { L"testArray", DISPID_GLOBAL_TESTARRAY }, @@ -1389,6 +1393,27 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; + case DISPID_GLOBAL_PROPARGSET: + CHECK_EXPECT(global_propargset_i); + + ok(wFlags == DISPATCH_PROPERTYPUTREF, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) = %p\n", V_DISPATCH(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 0, "V_I2(psp->rgvargs+1) = %d\n", V_I2(pdp->rgvarg+1)); + + return S_OK; + case DISPID_GLOBAL_COUNTER: ok(pdp != NULL, "pdp == NULL\n"); todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); @@ -2835,6 +2860,12 @@ static void run_tests(void) CHECK_CALLED(global_propargput1_d); CHECK_CALLED(global_propargput1_i); + SET_EXPECT(global_propargset_d); + SET_EXPECT(global_propargset_i); + parse_script_a("set propargset (counter()) = testObj"); + CHECK_CALLED(global_propargset_d); + CHECK_CALLED(global_propargset_i); + SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); parse_script_a("dim x\nwith testObj\nx=1+.propget\nend with");

1 0

Ambrož Bizjak : ucrtbase: Implement t and j printf length modifiers.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 3b6b28bce5f2f05ba21d6ca5399517c22300aeeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b6b28bce5f2f05ba21d6ca5… Author: Ambrož Bizjak <abizjak.pro(a)gmail.com> Date: Fri Nov 1 19:40:04 2019 +0100 ucrtbase: Implement t and j printf length modifiers. Signed-off-by: Ambroz Bizjak <abizjak.pro(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++++- dlls/ucrtbase/tests/printf.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 346fb5ac5d..975977087d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -516,10 +516,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API } else if(*p == 'w') flags.WideString = *p++; #if _MSVCR_VER >= 140 - else if(*p == 'z') + else if(*p == 'z' || *p == 't') flags.IntegerNative = *p++; else if(*p == 'T') flags.NaturalString = *p++; + else if(*p == 'j') { + flags.IntegerDouble++; + p++; + } #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 769121ebd9..2af29322bf 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <errno.h> #include <math.h> +#include <inttypes.h> #include "windef.h" #include "winbase.h" @@ -637,24 +638,35 @@ static void test_printf_legacy_three_digit_exp(void) static void test_printf_c99(void) { - char buf[20]; + char buf[30]; /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted * as size_t size for integers. */ - if (sizeof(void*) == 8) { - vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", - (size_t) 0x12345678123456, 1); - ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, - buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); - ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); - } else { - vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", - (size_t) 0x123456, 1); - ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); - vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, - buf, sizeof(buf), "%zx %d", (size_t) 0x123456, 1); - ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + for (int i = 0; i < 2; i++) { + unsigned __int64 options = (i == 0) ? 0 : + UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY; + + /* z modifier accepts size_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%zx %d", SIZE_MAX, 1); + if (sizeof(size_t) == 8) + ok(!strcmp(buf, "ffffffffffffffff 1"), "buf = %s\n", buf); + else + ok(!strcmp(buf, "ffffffff 1"), "buf = %s\n", buf); + + /* j modifier with signed format accepts intmax_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%jd %d", INTMAX_MIN, 1); + ok(!strcmp(buf, "-9223372036854775808 1"), "buf = %s\n", buf); + + /* j modifier with unsigned format accepts uintmax_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%ju %d", UINTMAX_MAX, 1); + ok(!strcmp(buf, "18446744073709551615 1"), "buf = %s\n", buf); + + /* t modifier accepts ptrdiff_t argument */ + vsprintf_wrapper(options, buf, sizeof(buf), "%td %d", PTRDIFF_MIN, 1); + if (sizeof(ptrdiff_t) == 8) + ok(!strcmp(buf, "-9223372036854775808 1"), "buf = %s\n", buf); + else + ok(!strcmp(buf, "-2147483648 1"), "buf = %s\n", buf); } }

1 0

Alexandre Julliard : Release 4.19.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 6f2ef158b78f7d0a950c9398c26278d6523c112e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f2ef158b78f7d0a950c9398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:35:58 2019 +0100 Release 4.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 843 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 434 insertions(+), 430 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f2ef158b78f7d0a950c…

1 0

Piotr Caban : msvcrt: Add printf meaningless digits tests.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: f87b3750fc877935336cee2bbf8a6bf41e55836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87b3750fc877935336cee2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:46 2019 +0100 msvcrt: Add printf meaningless digits tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5ce4015440..ac5c37a59c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -248,6 +248,8 @@ static void test_sprintf( void ) { "%.0f", "-1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, -0.5 }, { "%.0f", "1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 0.5 }, { "%.0f", "2", 0, DOUBLE_ARG, 0, 0, 1.5 }, + { "%.30f", "0.333333333333333310000000000000", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 1.0/3.0 }, + { "%.30lf", "1.414213562373095100000000000000", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, sqrt(2) }, }; char buffer[100];

1 0

Piotr Caban : msvcrt: Add printf rounding tests.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 04a5beac69faef994a6706356c9ef67ff9d4c9ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a5beac69faef994a670635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:42 2019 +0100 msvcrt: Add printf rounding tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index bfdab8cc6b..5ce4015440 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -243,7 +243,11 @@ static void test_sprintf( void ) { "%C", "", 0, INT_ARG, 0x3042 }, { "a%Cb", "ab", 0, INT_ARG, 0x3042 }, { "%lld", "-8589934591", "1", ULONGLONG_ARG, 0, ((ULONGLONG)0xffffffff)*0xffffffff }, - { "%I32d", "1", "I32d", INT_ARG, 1 } + { "%I32d", "1", "I32d", INT_ARG, 1 }, + { "%.0f", "-2", 0, DOUBLE_ARG, 0, 0, -1.5 }, + { "%.0f", "-1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, -0.5 }, + { "%.0f", "1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 0.5 }, + { "%.0f", "2", 0, DOUBLE_ARG, 0, 0, 1.5 }, }; char buffer[100];

1 0

Piotr Caban : msvcrt: Move more printf tests to table.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 3798c0c4c92e588d8c217fbfb8b753eaa96c800d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3798c0c4c92e588d8c217fbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:38 2019 +0100 msvcrt: Move more printf tests to table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d62f09cc0f..bfdab8cc6b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -242,6 +242,8 @@ static void test_sprintf( void ) { "%C", "a", 0, INT_ARG, 'a' }, { "%C", "", 0, INT_ARG, 0x3042 }, { "a%Cb", "ab", 0, INT_ARG, 0x3042 }, + { "%lld", "-8589934591", "1", ULONGLONG_ARG, 0, ((ULONGLONG)0xffffffff)*0xffffffff }, + { "%I32d", "1", "I32d", INT_ARG, 1 } }; char buffer[100]; @@ -278,19 +280,6 @@ static void test_sprintf( void ) } } - r = p_sprintf(buffer, "%lld", ((ULONGLONG)0xffffffff)*0xffffffff); - ok( r == 1 || r == 11, "return count wrong %d\n", r); - if (r == 11) /* %ll works on Vista */ - ok(!strcmp(buffer, "-8589934591"), "Problem with \"ll\" interpretation '%s'\n", buffer); - else - ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation '%s'\n", buffer); - - r = p_sprintf(buffer, "%I32d", 1); - if (r == 1) - ok(!strcmp(buffer,"1"),"I32d failed, got '%s'\n",buffer); - else - ok(r == 4 && !strcmp(buffer,"I32d"),"I32d failed, got '%s',%d\n",buffer,r); - if (sizeof(void *) == 8) { r = p_sprintf(buffer, "%p", (void *)57); @@ -316,6 +305,10 @@ static void test_sprintf( void ) r = p_sprintf(buffer, "%Ix %d", (size_t)0x12345678123456,1); ok(!strcmp(buffer,"12345678123456 1"),"buffer = %s\n",buffer); ok( r==16, "return count wrong\n"); + + r = p_sprintf(buffer, "%p", 0); + ok(!strcmp(buffer,"0000000000000000"), "failed\n"); + ok( r==16, "return count wrong\n"); } else { @@ -342,6 +335,10 @@ static void test_sprintf( void ) r = p_sprintf(buffer, "%Ix %d", 0x123456, 1); ok(!strcmp(buffer,"123456 1"),"buffer = %s\n",buffer); ok( r==8, "return count wrong\n"); + + r = p_sprintf(buffer, "%p", 0); + ok(!strcmp(buffer,"00000000"), "failed\n"); + ok( r==8, "return count wrong\n"); } r = p_sprintf(buffer, "%.*s", 1, "foo"); @@ -367,18 +364,6 @@ static void test_sprintf( void ) ok( r==4, "return count wrong: %d\n", r); } - r = p_sprintf(buffer, "%p", 0); - if (sizeof(void *) == 8) - { - ok(!strcmp(buffer,"0000000000000000"), "failed\n"); - ok( r==16, "return count wrong\n"); - } - else - { - ok(!strcmp(buffer,"00000000"), "failed\n"); - ok( r==8, "return count wrong\n"); - } - r = p_sprintf(buffer, "%S", L"\x3042"); ok(r==-1 || broken(!r), "r = %d\n", r);

1 0

Daniel Lehman : wine.inf: Add Dynamic DST for US time zones.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: b796b9fba8fcc93921cb135889064bea34064fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b796b9fba8fcc93921cb1358… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 31 19:52:09 2019 -0700 wine.inf: Add Dynamic DST for US time zones. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0ae057dc4c..df74f28e66 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2808,6 +2808,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"MUI_Std",,"@tzres.dll,-50192" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"Std",,"Alaskan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time,"TZI",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2006",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"2007",1,1c,02,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Alaskan Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Display",,"Asia/Riyadh" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"Dlt",,"Arab Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Arab Standard Time,"MUI_Dlt",,"@tzres.dll,-41969" @@ -2953,6 +2957,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"MUI_Std",,"@tzres.dll,-17456" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"Std",,"Central Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time,"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2006",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"2007",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Dlt",,"Central Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-32801" @@ -3004,6 +3012,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"MUI_Std",,"@tzres.dll,-30800" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"Std",,"Eastern Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time,"TZI",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2006",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"2007",1,2c,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Eastern Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Display",,"Africa/Cairo" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"Dlt",,"Egypt Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Egypt Standard Time,"MUI_Dlt",,"@tzres.dll,-59425" @@ -3299,6 +3311,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Dlt",,"@tzres.dll HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"MUI_Std",,"@tzres.dll,-34352" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2006",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"2007",1,a4,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Display",,"America/Chihuahua" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"Dlt",,"Mountain Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-7249" @@ -3368,6 +3384,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Dlt",,"@tzres.dll, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"MUI_Std",,"@tzres.dll,-11232" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"Std",,"Pacific Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2006",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"2007",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time\Dynamic DST,"LastEntry",0x10001,"2007" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"MUI_Dlt",,"@tzres.dll,-15585"

1 0