March 2019 - Wine-Commits - list.winehq.org

Francois Gouget : kernel32/tests: A spelling fix in a win_skip() message.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 193df74fde62b65f5a214e9d8c547efd8ceb5647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=193df74fde62b65f5a214e9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:21 2019 +0100 kernel32/tests: A spelling fix in a win_skip() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 4c7df3d..3f30cce 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3680,7 +3680,7 @@ static void test_multiple_instances(void) if(!pCancelIoEx) { - win_skip("Skiping multiple instance tests on too old Windows\n"); + win_skip("Skipping multiple instance tests on too old Windows\n"); return; }

1 0

Zebediah Figura : quartz/systemclock: Get rid of the SystemClockImpl typedef.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: f55e90a508f5d2eb23a076008667156b8576adb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f55e90a508f5d2eb23a07600… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 16 09:11:50 2019 -0500 quartz/systemclock: Get rid of the SystemClockImpl typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 1a1361c..15f8ea0 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -36,7 +36,8 @@ struct advise_sink int cookie; }; -typedef struct SystemClockImpl { +struct system_clock +{ IReferenceClock IReferenceClock_iface; LONG ref; @@ -46,16 +47,16 @@ typedef struct SystemClockImpl { CRITICAL_SECTION cs; struct list sinks; -} SystemClockImpl; +}; -static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) +static inline struct system_clock *impl_from_IReferenceClock(IReferenceClock *iface) { - return CONTAINING_RECORD(iface, SystemClockImpl, IReferenceClock_iface); + return CONTAINING_RECORD(iface, struct system_clock, IReferenceClock_iface); } static DWORD WINAPI SystemClockAdviseThread(void *param) { - SystemClockImpl *clock = param; + struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; DWORD timeout = INFINITE; @@ -97,7 +98,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) } } -static void notify_thread(SystemClockImpl *clock) +static void notify_thread(struct system_clock *clock) { if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { @@ -110,7 +111,7 @@ static void notify_thread(SystemClockImpl *clock) static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IReferenceClock)) @@ -127,7 +128,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REF static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); ULONG refcount = InterlockedIncrement(&clock->ref); TRACE("%p increasing refcount to %u.\n", clock, refcount); @@ -137,7 +138,7 @@ static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); ULONG refcount = InterlockedDecrement(&clock->ref); TRACE("%p decreasing refcount to %u.\n", clock, refcount); @@ -161,7 +162,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); REFERENCE_TIME ret; HRESULT hr; @@ -186,7 +187,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", @@ -222,7 +223,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", @@ -257,7 +258,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) { - SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct system_clock *clock = impl_from_IReferenceClock(iface); struct advise_sink *sink; TRACE("clock %p, cookie %#lx.\n", clock, cookie); @@ -293,7 +294,7 @@ static const IReferenceClockVtbl SystemClock_Vtbl = HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) { - SystemClockImpl *object; + struct system_clock *object; TRACE("outer %p, out %p.\n", outer, out);

1 0

Zebediah Figura : quartz/systemclock: Clean up the remaining IUnknown methods.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 6f3238168ebad9f9955462309b4363577f6d10c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3238168ebad9f995546230… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 16 09:11:49 2019 -0500 quartz/systemclock: Clean up the remaining IUnknown methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index f22c781..1a1361c 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -108,29 +108,31 @@ static void notify_thread(SystemClockImpl *clock) SetEvent(clock->notify_event); } -static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - ULONG ref = InterlockedIncrement(&This->ref); +static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + TRACE("clock %p, iid %s, out %p.\n", clock, debugstr_guid(iid), out); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IReferenceClock)) + { + IReferenceClock_AddRef(iface); + *out = iface; + return S_OK; + } - return ref; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; } -static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REFIID riid, void** ppobj) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - TRACE("(%p, %s,%p)\n", This, debugstr_guid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IReferenceClock)) { - SystemClockImpl_AddRef(iface); - *ppobj = &This->IReferenceClock_iface; - return S_OK; - } - - *ppobj = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppobj); - return E_NOINTERFACE; +static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock *iface) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + ULONG refcount = InterlockedIncrement(&clock->ref); + + TRACE("%p increasing refcount to %u.\n", clock, refcount); + + return refcount; } static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface)

1 0

Michael Stefaniuc : sti/tests: Remove useless cast to self.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: cd6516eb943366dbadd80c34ad5d508b1138f7b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd6516eb943366dbadd80c34… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 20:37:17 2019 +0100 sti/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/tests/sti.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index fa4db8c..bd8b7b6 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -150,7 +150,7 @@ static void test_version_flag_versus_aw(void) if (SUCCEEDED(hr)) { ok(pUnknown == (IUnknown*)pStiW, "created interface was not IID_IStillImageW\n"); - IUnknown_Release((IUnknown*)pUnknown); + IUnknown_Release(pUnknown); } IUnknown_Release((IUnknown*)pStiW); }

1 0

Thomas Faber : riched20: Implement MSVC asm wrappers.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: b64511c00a5aa1896f402460a1b2de0cda957fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b64511c00a5aa1896f402460… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Mar 15 09:37:01 2019 +0100 riched20: Implement MSVC asm wrappers. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 23 +++++++++++++++++++++++ dlls/riched20/txtsrv.c | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index eaa6aae..d709502 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -502,6 +502,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -509,6 +519,7 @@ DECLSPEC_HIDDEN HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *i "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ #else /* __i386__ */ @@ -560,6 +571,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) #ifdef __i386__ /* thiscall functions are i386-specific */ #define STDCALL(func) (void *) __stdcall_ ## func +#ifdef _MSC_VER +#define DEFINE_STDCALL_WRAPPER(num,func,args) \ + __declspec(naked) HRESULT __stdcall_##func(void) \ + { \ + __asm pop eax \ + __asm pop ecx \ + __asm push eax \ + __asm mov eax, [ecx] \ + __asm jmp dword ptr [eax + 4*num] \ + } +#else /* _MSC_VER */ #define DEFINE_STDCALL_WRAPPER(num,func,args) \ extern HRESULT __stdcall_ ## func(void); \ __ASM_GLOBAL_FUNC(__stdcall_ ## func, \ @@ -568,6 +590,7 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) "pushl %eax\n\t" \ "movl (%ecx), %eax\n\t" \ "jmp *(4*(" #num "))(%eax)" ) +#endif /* _MSC_VER */ DEFINE_STDCALL_WRAPPER(3,ITextHostImpl_TxGetDC,4) DEFINE_STDCALL_WRAPPER(4,ITextHostImpl_TxReleaseDC,8) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 639a94f..37b866a 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -36,6 +36,16 @@ #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) (void *) __thiscall_ ## func +#ifdef _MSC_VER +#define DEFINE_THISCALL_WRAPPER(func,args) \ + __declspec(naked) HRESULT __thiscall_##func(void) \ + { \ + __asm pop eax \ + __asm push ecx \ + __asm push eax \ + __asm jmp func \ + } +#else /* _MSC_VER */ #define DEFINE_THISCALL_WRAPPER(func,args) \ extern HRESULT __thiscall_ ## func(void); \ __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ @@ -43,6 +53,8 @@ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) +#endif /* _MSC_VER */ + #else /* __i386__ */ #define THISCALL(func) func

1 0

Francois Gouget : mfplat/tests: A wording tweak in a win_skip() messages.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 82060ae8df98cca80016f796675e9adb1ae0c37d URL: https://source.winehq.org/git/wine.git/?a=commit;h=82060ae8df98cca80016f796… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:50:28 2019 +0100 mfplat/tests: A wording tweak in a win_skip() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38151d9..3a102e2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -825,7 +825,7 @@ static void test_MFCreateMFByteStreamOnStream(void) if (hr != S_OK) { - win_skip("Can not retrieve IMFAttributes interface from IMFByteStream\n"); + win_skip("Cannot retrieve IMFAttributes interface from IMFByteStream\n"); IStream_Release(stream); IMFByteStream_Release(bytestream); return;

1 0

Jacek Caban : jscript: Add Object.create implementation.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: b5058ada58587da848d37bd20436d61b646c3682 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5058ada58587da848d37bd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 16:14:44 2019 +0100 jscript: Add Object.create implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 12 ++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c4c3a6e..19d67b5 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -32,6 +32,7 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static const WCHAR createW[] = {'c','r','e','a','t','e',0}; static const WCHAR getOwnPropertyDescriptorW[] = {'g','e','t','O','w','n','P','r','o','p','e','r','t','y','D','e','s','c','r','i','p','t','o','r',0}; static const WCHAR getPrototypeOfW[] = @@ -521,6 +522,45 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi return hres; } +static HRESULT Object_create(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *proto = NULL, *obj; + HRESULT hres; + + if(!argc || (!is_object_instance(argv[0]) && !is_null(argv[0]))) { + FIXME("Invalid arg\n"); + return E_INVALIDARG; + } + + TRACE("(%s)\n", debugstr_jsval(argv[0])); + + if(argc > 1) { + FIXME("Unsupported properties argument %s\n", debugstr_jsval(argv[1])); + return E_NOTIMPL; + } + + if(argc && is_object_instance(argv[0])) { + if(get_object(argv[0])) + proto = to_jsdisp(get_object(argv[0])); + if(!proto) { + FIXME("Non-JS prototype\n"); + return E_NOTIMPL; + } + }else if(!is_null(argv[0])) { + FIXME("Invalid arg %s\n", debugstr_jsval(argc ? argv[0] : jsval_undefined())); + return E_INVALIDARG; + } + + if(r) { + hres = create_dispex(ctx, NULL, proto, &obj); + if(FAILED(hres)) + return hres; + *r = jsval_obj(obj); + } + return S_OK; +} + static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -547,6 +587,7 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl } static const builtin_prop_t ObjectConstr_props[] = { + {createW, Object_create, PROPF_ES5|PROPF_METHOD|2}, {definePropertiesW, Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {definePropertyW, Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {getOwnPropertyDescriptorW, Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 6cfee81..0ee2eff 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -637,6 +637,9 @@ function test_string_split() { } function test_getPrototypeOf() { + ok(Object.create.length === 2, "Object.create.length = " + Object.create.length); + ok(Object.getPrototypeOf.length === 1, "Object.getPrototypeOf.length = " + Object.getPrototypeOf.length); + ok(Object.getPrototypeOf(new Object()) === Object.prototype, "Object.getPrototypeOf(new Object()) !== Object.prototype"); @@ -660,6 +663,15 @@ function test_getPrototypeOf() { ok(Object.getPrototypeOf(Object.prototype) === null, "Object.getPrototypeOf(Object.prototype) !== null"); + obj = Object.create(proto = { test: 1 }); + ok(Object.getPrototypeOf(obj) === proto, + "Object.getPrototypeOf(obj) !== proto"); + ok(obj.test === 1, "obj.test = " + obj.test); + + obj = Object.create(null); + ok(!("toString" in obj), "toString is in obj"); + ok(Object.getPrototypeOf(obj) === null, "Object.getPrototypeOf(obj) = " + Object.getPrototypeOf(obj)); + next_test(); }

1 0

Piotr Caban : msvcrt: Fix long limits in _atol_l.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 58140f73a27646ee57e9b6fbd395f0a0ec03b74e URL: https://source.winehq.org/git/wine.git/?a=commit;h=58140f73a27646ee57e9b6fb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 16 14:48:08 2019 +0100 msvcrt: Fix long limits in _atol_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index fc827d8..f31ba60 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1094,11 +1094,11 @@ MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); - if(ret > LONG_MAX) { - ret = LONG_MAX; + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; *MSVCRT__errno() = MSVCRT_ERANGE; - } else if(ret < LONG_MIN) { - ret = LONG_MIN; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; *MSVCRT__errno() = MSVCRT_ERANGE; } return ret;

1 0

Francois Gouget : ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 7604174e5b9e9ca1ad3121f7ae3ae57bb120b070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7604174e5b9e9ca1ad3121f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 16 23:48:41 2019 +0100 ntoskrnl.exe/tests: Make vskip_(), win_skip_() and kmemcpy() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 7f2e68c..ae15df3 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -126,7 +126,7 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m __ms_va_end(args); } -void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +static void vskip_(const char *file, int line, const char *msg, __ms_va_list args) { const char *current_file; @@ -141,7 +141,7 @@ void vskip_(const char *file, int line, const char *msg, __ms_va_list args) skipped++; } -void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +static void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) { __ms_va_list args; __ms_va_start(args, msg); @@ -185,7 +185,7 @@ static unsigned int strlenW( const WCHAR *str ) return s - str; } -void *kmemcpy(void *dest, const void *src, SIZE_T n) +static void *kmemcpy(void *dest, const void *src, SIZE_T n) { const char *s = src; char *d = dest;

1 0

Francois Gouget : testbot/WineRunWineTest: Fix a typo in an error message.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: tools Branch: master Commit: b244390ccd9e35d6ea286e66d8f9b0d5022b60ab URL: https://source.winehq.org/git/tools.git/?a=commit;h=b244390ccd9e35d6ea286e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 18 17:00:16 2019 +0100 testbot/WineRunWineTest: Fix a typo in an error message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunWineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 8792be3..a74877a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -423,7 +423,7 @@ if (defined $FileName) my $Dst = $Step->FileType eq "patch" ? "patch.diff" : $FileName; if (!$TA->SendFile($Step->GetFullFileName(), "staging/$Dst", 0)) { - FatalTAError($TA, "Could send '$FileName' to the VM"); + FatalTAError($TA, "Could not send '$FileName' to the VM"); } }

1 0