May 2019 - Wine-commits - list.winehq.org

Huw Davies : kernel32: Move the implementation of GetTickCount() to kernel32.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 13e11d3fcbcf8790e031c4bc52f5f550b1377b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e11d3fcbcf8790e031c4bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 30 09:49:08 2019 +0100 kernel32: Move the implementation of GetTickCount() to kernel32. Fixes regression caused by 3e927c4aec9dbeef930b83f62ee0651b8c147247. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47265 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/time.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/ntdll_misc.h | 4 ---- dlls/ntdll/time.c | 2 +- 5 files changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5f3f1fa..c01f132 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -858,8 +858,8 @@ @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stdcall GetTickCount() ntdll.NtGetTickCount -@ stdcall -ret64 GetTickCount64() ntdll.NtGetTickCount +@ stdcall GetTickCount() +@ stdcall -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 00fcc6b..737affc 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -38,6 +38,9 @@ #elif defined(HAVE_MACHINE_LIMITS_H) #include <machine/limits.h> #endif +#ifdef __APPLE__ +# include <mach/mach_time.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -64,6 +67,33 @@ static inline LONGLONG filetime_to_longlong( const FILETIME *ft ) return (((LONGLONG)ft->dwHighDateTime) << 32) + ft->dwLowDateTime; } +#define TICKSPERSEC 10000000 +#define TICKSPERMSEC 10000 + +/* return a monotonic time counter, in Win32 ticks */ +static inline ULONGLONG monotonic_counter(void) +{ + LARGE_INTEGER counter; + +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) + struct timespec ts; +#ifdef CLOCK_MONOTONIC_RAW + if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + if (!clock_gettime( CLOCK_MONOTONIC, &ts )) + return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; +#endif + + NtQueryPerformanceCounter( &counter, NULL ); + return counter.QuadPart; +} + static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; @@ -1528,3 +1558,30 @@ BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) RtlQueryUnbiasedInterruptTime(time); return TRUE; } + +/****************************************************************************** + * GetTickCount64 (KERNEL32.@) + */ +ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} + +/*********************************************************************** + * GetTickCount (KERNEL32.@) + * + * Get the number of milliseconds the system has been running. + * + * PARAMS + * None. + * + * RETURNS + * The current tick count. + * + * NOTES + * The value returned will wrap around every 2^32 milliseconds. + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) +{ + return monotonic_counter() / TICKSPERMSEC; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 050ebc7..aeb9735 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -194,7 +194,7 @@ @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent -@ stdcall -ret64 NtGetTickCount() get_tick_count64 +@ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(long) @ stub NtImpersonateClientOfPort @@ -1142,7 +1142,7 @@ @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent -@ stdcall -private -ret64 ZwGetTickCount() get_tick_count64 +@ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 2d83f54..3463ebd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -268,8 +268,4 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); /* string functions */ int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); - -/* time functions */ -ULONGLONG WINAPI get_tick_count64( void ); -#define NtGetTickCount get_tick_count64 #endif diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 41e4563..20de627 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -557,7 +557,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH get_tick_count64(void) +ULONG WINAPI NtGetTickCount(void) { return monotonic_counter() / TICKSPERMSEC; }

1 0

Lukáš Krejčí : mciqtz32: Don' t overflow seek times during multiplication.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 1d9a3f6d12322891a2af4aadd66a92ea66479233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d9a3f6d12322891a2af4aad… Author: Lukáš Krejčí <lskrejci(a)gmail.com> Date: Wed May 29 08:42:10 2019 +0200 mciqtz32: Don't overflow seek times during multiplication. Seek times are of type REFERENCE_TIME (64-bit), but the multiplication is done in DWORD (32-bit). Signed-off-by: Lukáš Krejčí <lskrejci(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 1aec326..ec4a8b5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -422,20 +422,19 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms wma->mci_flags = dwFlags; IMediaSeeking_GetTimeFormat(wma->seek, &format); if (dwFlags & MCI_FROM) { + wma->seek_start = lpParms->dwFrom; if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - wma->seek_start = lpParms->dwFrom * 10000; - else - wma->seek_start = lpParms->dwFrom; + wma->seek_start *= 10000; + start_flags = AM_SEEKING_AbsolutePositioning; } else { wma->seek_start = 0; start_flags = AM_SEEKING_NoPositioning; } if (dwFlags & MCI_TO) { + wma->seek_stop = lpParms->dwTo; if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) - wma->seek_stop = lpParms->dwTo * 10000; - else - wma->seek_stop = lpParms->dwTo; + wma->seek_stop *= 10000; } else { wma->seek_stop = 0; IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop);

1 0

Alexandre Julliard : d3dxof: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 4def57920c5f48294238df42edb4859bedae001c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4def57920c5f48294238df42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:18:25 2019 +0200 d3dxof: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/Makefile.in | 2 ++ dlls/d3dxof/d3dxof.c | 1 - dlls/d3dxof/parsing.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index 93032ad..b7a97be 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3dxof.dll IMPORTLIB = d3dxof IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dxof.c \ main.c \ diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 90c9192..e16b0d8 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f1e0982..7d31627 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "wine/debug.h" #define COBJMACROS

1 0

Alexandre Julliard : davclnt: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: fcd598940fa3d069be23e6cfbe7b04729bc3f1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd598940fa3d069be23e6cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:19:03 2019 +0200 davclnt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/davclnt/Makefile.in | 2 ++ dlls/davclnt/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in index 73af482..70dea6f 100644 --- a/dlls/davclnt/Makefile.in +++ b/dlls/davclnt/Makefile.in @@ -1,4 +1,6 @@ MODULE = davclnt.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 8e0bf84..485de92 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : dbgeng: Build with msvcrt.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 3fd3df9a09eec0ccd20c97de96c3748f9cf2e56a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd3df9a09eec0ccd20c97de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:19:11 2019 +0200 dbgeng: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in index c2639c5..55600e2 100644 --- a/dlls/dbgeng/Makefile.in +++ b/dlls/dbgeng/Makefile.in @@ -2,4 +2,6 @@ MODULE = dbgeng.dll IMPORTLIB = dbgeng DELAYIMPORTS = version +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = dbgeng.c

1 0

Zebediah Figura : quartz/tests: Add more tests for aggregation.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 09f59571a6b24125c15f5bba5ab5b179f33414f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f59571a6b24125c15f5bba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:53 2019 -0500 quartz/tests: Add more tests for aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avidec.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avisplit.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/filesource.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/waveparser.c | 96 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 672 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f59571a6b24125c15f…

1 0

Zebediah Figura : qcap/audiorecord: Fix aggregation support.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: e19235f12bc1afdec7271ba45b1985f1dd2d5596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19235f12bc1afdec7271ba4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:54 2019 -0500 qcap/audiorecord: Fix aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index bc1b452..f789da2 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -68,7 +68,7 @@ static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, LPVOI AudioRecord *This = impl_from_IUnknown(iface); if (IsEqualIID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; + *ppv = &This->IUnknown_iface; } else if (IsEqualIID(riid, &IID_IPersist)) { TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); *ppv = &This->filter.IBaseFilter_iface; @@ -275,5 +275,5 @@ IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr) (DWORD_PTR)(__FILE__ ": AudioRecord.csFilter"), &AudioRecordFuncs); *phr = S_OK; - return (IUnknown*)&This->filter.IBaseFilter_iface; + return &This->IUnknown_iface; }

1 0

Zebediah Figura : qcap/tests: Add more tests for aggregation.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 5e1ed74c9f749087f54f70d31f3f1b3809712c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e1ed74c9f749087f54f70d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:55 2019 -0500 qcap/tests: Add more tests for aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 103 ++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avico.c | 95 ++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/avimux.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 301 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e1ed74c9f749087f54f…

1 0

Zebediah Figura : strmbase: Reimplement BaseFilterImpl_QueryInterface() using a callback.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 4b839bdd6aa02abe8dcf2565f59900e9f199a5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b839bdd6aa02abe8dcf2565… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:56 2019 -0500 strmbase: Reimplement BaseFilterImpl_QueryInterface() using a callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 24 ++++++++++++++++++------ include/wine/strmbase.h | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index cf8000f..1af955f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -27,20 +27,32 @@ static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface); } -HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter *iface, REFIID iid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + BaseFilter *filter = impl_from_IBaseFilter(iface); + HRESULT hr; + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - *ppv = NULL; + *out = NULL; + + if (filter->pFuncsTable->filter_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->filter_query_interface(filter, iid, out))) + { + return hr; + } - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter)) + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IPersist) + || IsEqualIID(iid, &IID_IMediaFilter) + || IsEqualIID(iid, &IID_IBaseFilter)) { - *ppv = iface; + *out = iface; IBaseFilter_AddRef(iface); return S_OK; } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); return E_NOINTERFACE; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9bc13de..1d36f13 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -172,6 +172,7 @@ typedef struct BaseFilterFuncTable { IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); void (*filter_destroy)(BaseFilter *iface); + HRESULT (*filter_query_interface)(BaseFilter *iface, REFIID iid, void **out); } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Alexandre Julliard : msvcrt/tests: Don' t use win_skip for functions that are not exported on 64-bit.
by Alexandre Julliard 30 May '19

30 May '19

Module: wine Branch: master Commit: 4685e88de8ed52ea3537c22c09393fd818e7f50a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4685e88de8ed52ea3537c22c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 12:01:55 2019 +0200 msvcrt/tests: Don't use win_skip for functions that are not exported on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/data.c | 3 +-- dlls/msvcrt/tests/environ.c | 4 ++-- dlls/msvcrt/tests/locale.c | 2 +- dlls/msvcrt/tests/time.c | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 9aacac7..b0acc60 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -153,9 +153,8 @@ static void test___getmainargs(void) new_argv = *p___p___argv(); ok(new_argc == 4, "*__p___argc() = %d\n", new_argc); ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv); - }else { - win_skip("__p___argc or __p___argv is not available\n"); } + else skip("__p___argc or __p___argv is not available\n"); mode = 0; __getmainargs(&argc, &argv, &envp, 1, &mode); diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 11b79f0..b8e0ae6 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -97,7 +97,7 @@ static void test__environ(void) "Expected _environ pointers to be identical\n" ); } else - win_skip( "__p__environ() is not available\n" ); + skip( "__p__environ() is not available\n" ); if (p_get_environ) { @@ -163,7 +163,7 @@ static void test__wenviron(void) "Expected _wenviron pointers to be NULL\n" ); } else - win_skip( "__p__wenviron() is not available\n" ); + skip( "__p__wenviron() is not available\n" ); if (p_get_wenviron) { diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index ff77759..08abac0 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -759,7 +759,7 @@ static void test___mb_cur_max_func(void) /* for older Windows */ if (!p__p___mb_cur_max) - win_skip("Skipping __p___mb_cur_max tests\n"); + skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index e9edb57..2b1c781 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -577,7 +577,7 @@ static void test_daylight(void) if (!p___p__daylight) { - win_skip("__p__daylight not available\n"); + skip("__p__daylight not available\n"); return; } @@ -829,7 +829,7 @@ static void test__tzset(void) int ret; if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { - win_skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); return; }

1 0