November 2020 - Wine-Commits

Nikolay Sivov : evr/tests: Presenter should support IMFQualityAdviseLimits.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 22d934c078e2c54d93390eff3e336c43d28960a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d934c078e2c54d93390eff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:39 2020 +0300 evr/tests: Presenter should support IMFQualityAdviseLimits. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 34a69559b65..18822e1e4fa 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1154,6 +1154,7 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); check_interface(presenter, &IID_IMFQualityAdvise, TRUE); check_interface(presenter, &IID_IDirect3DDeviceManager9, TRUE); + todo_wine check_interface(presenter, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE);

1 0

Nikolay Sivov : evr/mixer: Set timestamp and duration for output samples.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 8e82c72083b9f5fcf2cde2ce26187c283ffc390f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e82c72083b9f5fcf2cde2ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:35 2020 +0300 evr/mixer: Set timestamp and duration for output samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 11 +++++++++++ dlls/evr/tests/evr.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 997c5054f12..ddf34d05f44 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1272,8 +1272,19 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D } if (SUCCEEDED(hr)) + { video_mixer_render(mixer, surface); + timestamp = duration = 0; + if (SUCCEEDED(IMFSample_GetSampleTime(mixer->inputs[0].sample, &timestamp))) + { + IMFSample_SetSampleTime(buffers->pSample, timestamp); + + IMFSample_GetSampleDuration(mixer->inputs[0].sample, &duration); + IMFSample_SetSampleDuration(buffers->pSample, duration); + } + } + if (SUCCEEDED(hr)) { for (i = 0; i < mixer->input_count; ++i) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c456bcf5653..c83ce0374eb 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2219,13 +2219,14 @@ static void test_mixer_samples(void) IMFDesiredSample *desired; IDirect3DDevice9 *device; IMFMediaType *video_type; - DWORD color, status; + DWORD count, flags, color, status; IMFTransform *mixer; - IMFSample *sample; + IMFSample *sample, *sample2; IDirect3D9 *d3d; HWND window; UINT token; HRESULT hr; + LONGLONG pts, duration; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -2395,6 +2396,57 @@ static void test_mixer_samples(void) hr = IMFTransform_ProcessInput(mixer, 5, sample, 0); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + /* ProcessOutput() sets sample time and duration. */ + hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetUINT32(sample2, &IID_IMFSample, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleFlags(sample2, 0x123); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleTime(sample2, &pts); + ok(hr == MF_E_NO_SAMPLE_TIMESTAMP, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleDuration(sample2, &duration); + ok(hr == MF_E_NO_SAMPLE_DURATION, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleTime(sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_SetSampleDuration(sample, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(buffers, 0, sizeof(buffers)); + buffers[0].pSample = sample2; + hr = IMFTransform_ProcessOutput(mixer, 0, 1, buffers, &status); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetSampleTime(sample2, &pts); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!pts, "Unexpected sample time.\n"); + + hr = IMFSample_GetSampleDuration(sample2, &duration); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!duration, "Unexpected duration\n"); + + /* Flags are not copied. */ + hr = IMFSample_GetSampleFlags(sample2, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(flags == 0x123, "Unexpected flags %#x.\n", flags); + + /* Attributes are not removed. */ + hr = IMFSample_GetCount(sample2, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + hr = IMFSample_GetCount(sample, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + + IMFSample_Release(sample2); + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_COMMAND_DRAIN, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : msvcrt: Import ilogb() from musl.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 48028c64ea58fb0196eec163e824229ba714db57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48028c64ea58fb0196eec163… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 09:59:54 2020 +0100 msvcrt: Import ilogb() from musl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- dlls/msvcrt/math.c | 53 +++++++++++++++++++++++++++++++++++++---------------- include/config.h.in | 6 ------ 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/configure b/configure index e6409e264f9..4846c93e270 100755 --- a/configure +++ b/configure @@ -19512,8 +19512,6 @@ for ac_func in \ expm1f \ fma \ fmaf \ - ilogb \ - ilogbf \ j0 \ j1 \ jn \ diff --git a/configure.ac b/configure.ac index f70329b41ae..d09fedccbb1 100644 --- a/configure.ac +++ b/configure.ac @@ -2698,8 +2698,6 @@ AC_CHECK_FUNCS(\ expm1f \ fma \ fmaf \ - ilogb \ - ilogbf \ j0 \ j1 \ jn \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f5e933fc188..6763b4a00dd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4402,32 +4402,53 @@ double CDECL MSVCR120_creal(_Dcomplex z) return z.x; } +/********************************************************************* + * ilogb (MSVCR120.@) + * + * Copied from musl: src/math/ilogb.c + */ int CDECL MSVCR120_ilogb(double x) { - if (!x) return MSVCRT_FP_ILOGB0; - if (isnan(x)) return MSVCRT_FP_ILOGBNAN; - if (isinf(x)) return MSVCRT_INT_MAX; + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; -#ifdef HAVE_ILOGB - return ilogb(x); -#else - return logb(x); -#endif + if (!e) + { + u.i <<= 12; + if (u.i == 0) return MSVCRT_FP_ILOGB0; + /* subnormal x */ + for (e = -0x3ff; u.i >> 63 == 0; e--, u.i <<= 1); + return e; + } + if (e == 0x7ff) return u.i << 12 ? MSVCRT_FP_ILOGBNAN : MSVCRT_INT_MAX; + return e - 0x3ff; } +/********************************************************************* + * ilogbf (MSVCR120.@) + * + * Copied from musl: src/math/ilogbf.c + */ int CDECL MSVCR120_ilogbf(float x) { - if (!x) return MSVCRT_FP_ILOGB0; - if (isnan(x)) return MSVCRT_FP_ILOGBNAN; - if (isinf(x)) return MSVCRT_INT_MAX; + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; -#ifdef HAVE_ILOGBF - return ilogbf(x); -#else - return logbf(x); -#endif + if (!e) + { + u.i <<= 9; + if (u.i == 0) return MSVCRT_FP_ILOGB0; + /* subnormal x */ + for (e = -0x7f; u.i >> 31 == 0; e--, u.i <<= 1); + return e; + } + if (e == 0xff) return u.i << 9 ? MSVCRT_FP_ILOGBNAN : MSVCRT_INT_MAX; + return e - 0x7f; } +/********************************************************************* + * ilogbl (MSVCR120.@) + */ int CDECL MSVCR120_ilogbl(LDOUBLE x) { return MSVCR120_ilogb(x); diff --git a/include/config.h.in b/include/config.h.in index 241fa7ede38..cd13b9d4bee 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -288,12 +288,6 @@ /* Define to 1 if you have the `if_nameindex' function. */ #undef HAVE_IF_NAMEINDEX -/* Define to 1 if you have the `ilogb' function. */ -#undef HAVE_ILOGB - -/* Define to 1 if you have the `ilogbf' function. */ -#undef HAVE_ILOGBF - /* Define to 1 if you have the <inet/mib2.h> header file. */ #undef HAVE_INET_MIB2_H

1 0

Michael Stefaniuc : userenv: Use wide-char string literals.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: d7e43c9e3108d5d6f78bc74d3dfa6a918ecfea16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e43c9e3108d5d6f78bc74d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:18 2020 +0100 userenv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/userenv_main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 045bac0cfe1..58e610f6c6e 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -418,7 +418,6 @@ BOOL WINAPI GetUserProfileDirectoryA( HANDLE hToken, LPSTR lpProfileDir, BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, LPDWORD lpcchSize ) { - static const WCHAR slashW[] = {'\\',0}; TOKEN_USER *t; WCHAR *userW = NULL, *dirW = NULL; DWORD len, dir_len, domain_len; @@ -459,7 +458,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, goto done; } lstrcpyW( lpProfileDir, dirW ); - lstrcatW( lpProfileDir, slashW ); + lstrcatW( lpProfileDir, L"\\" ); lstrcatW( lpProfileDir, userW ); *lpcchSize = len; ret = TRUE; @@ -533,11 +532,8 @@ end: return ret; } -static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; - BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) { - static const WCHAR ProfilesDirectory[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; LONG l; HKEY key; BOOL ret = FALSE; @@ -552,13 +548,15 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) return FALSE; } - l = RegOpenKeyExW(HKEY_LOCAL_MACHINE, ProfileListW, 0, KEY_READ, &key); + l = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, KEY_READ, &key); if (l) { SetLastError(l); return FALSE; } - l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, NULL, &len); + l = RegQueryValueExW(key, L"ProfilesDirectory", NULL, NULL, NULL, &len); if (l) { SetLastError(l); @@ -570,7 +568,7 @@ BOOL WINAPI GetProfilesDirectoryW( LPWSTR lpProfilesDir, LPDWORD lpcchSize ) SetLastError(ERROR_OUTOFMEMORY); goto end; } - l = RegQueryValueExW(key, ProfilesDirectory, NULL, NULL, + l = RegQueryValueExW(key, L"ProfilesDirectory", NULL, NULL, (BYTE *)unexpanded_profiles_dir, &len); if (l) {

1 0

Michael Stefaniuc : kernel32: Use wide-char string literals.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: c5ff8ff27ef5bdba70be0d8d633920e1821af50e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5ff8ff27ef5bdba70be0d8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:16 2020 +0100 kernel32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 54 ++++++++++++++++-------------------------------- dlls/kernel32/console.c | 5 +---- dlls/kernel32/debugger.c | 12 ++++------- dlls/kernel32/file.c | 4 +--- dlls/kernel32/lcformat.c | 3 +-- dlls/kernel32/module.c | 6 ++---- dlls/kernel32/process.c | 5 ++--- dlls/kernel32/profile.c | 41 ++++++++++++++---------------------- dlls/kernel32/resource.c | 3 +-- dlls/kernel32/volume.c | 4 ++-- 10 files changed, 47 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5ff8ff27ef5bdba70be…

1 0

Alexandre Julliard : msvcrt: Import fabs() from musl.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 44e122e04e2f37ef11cded89ab3a8fd2369b2b03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e122e04e2f37ef11cded89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 09:58:19 2020 +0100 msvcrt: Import fabs() from musl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 069a2f7f387..f5e933fc188 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -717,10 +717,14 @@ float CDECL MSVCRT_ceilf( float x ) /********************************************************************* * fabsf (MSVCRT.@) + * + * Copied from musl: src/math/fabsf.c */ float CDECL MSVCRT_fabsf( float x ) { - return fabsf(x); + union { float f; UINT32 i; } u = { x }; + u.i &= 0x7fffffff; + return u.f; } /********************************************************************* @@ -1610,10 +1614,14 @@ float CDECL MSVCRT_fmaf( float x, float y, float z ) /********************************************************************* * fabs (MSVCRT.@) + * + * Copied from musl: src/math/fabsf.c */ double CDECL MSVCRT_fabs( double x ) { - return fabs(x); + union { double f; UINT64 i; } u = { x }; + u.i &= ~0ull >> 1; + return u.f; } /*********************************************************************

1 0

Alexandre Julliard : jscript: Use the standard isfinite() function.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 061c747bfaeede8ee9566d9837c442f9415c80b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=061c747bfaeede8ee9566d98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 10:12:44 2020 +0100 jscript: Use the standard isfinite() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 1 - dlls/jscript/json.c | 2 +- dlls/jscript/jsutils.c | 5 ----- dlls/jscript/number.c | 8 ++++---- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 64f7bbda959..d5aafe65037 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -238,7 +238,7 @@ static HRESULT JSGlobal_isFinite(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(FAILED(hres)) return hres; - ret = is_finite(n); + ret = isfinite(n); } if(r) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index e1ab5e5824f..dfe087521db 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -364,7 +364,6 @@ HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HI HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; HRESULT double_to_string(double,jsstr_t**) DECLSPEC_HIDDEN; -BOOL is_finite(double) DECLSPEC_HIDDEN; static inline BOOL is_digit(WCHAR c) { diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 433c7858cb6..de10ceadd11 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -700,7 +700,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsval_t val) } case JSV_NUMBER: { double n = get_number(value); - if(is_finite(n)) { + if(isfinite(n)) { const WCHAR *ptr; jsstr_t *str; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 421116f171b..b12addda794 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -51,11 +51,6 @@ const char *debugstr_jsval(const jsval_t v) return NULL; } -BOOL is_finite(double n) -{ - return !isnan(n) && !isinf(n); -} - #define MIN_BLOCK_SIZE 128 #define ARENA_FREE_FILLER 0xaa diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 36384bf0621..fc6bfe10cc9 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -247,7 +247,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u val = number->value; - if(radix==10 || !is_finite(val)) { + if(radix==10 || !isfinite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres; @@ -373,7 +373,7 @@ static HRESULT Number_toFixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } val = number->value; - if(!is_finite(val)) { + if(!isfinite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres; @@ -414,7 +414,7 @@ static HRESULT Number_toExponential(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla } val = number->value; - if(!is_finite(val)) { + if(!isfinite(val)) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres; @@ -455,7 +455,7 @@ static HRESULT Number_toPrecision(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } val = number->value; - if(!is_finite(val) || !prec) { + if(!isfinite(val) || !prec) { hres = to_string(ctx, jsval_number(val), &str); if(FAILED(hres)) return hres;

1 0

Nikolay Sivov : evr/presenter: Add IDirect3DDeviceManager9 as a supported interface.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 81ba62654573ba624c394b2ed3559d022f9a7003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ba62654573ba624c394b2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:38 2020 +0300 evr/presenter: Add IDirect3DDeviceManager9 as a supported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 19 ++++++++++- 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 51792cdc2cd..ac81634f7ca 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -68,6 +68,7 @@ struct video_presenter IMFVideoPositionMapper IMFVideoPositionMapper_iface; IQualProp IQualProp_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IDirect3DDeviceManager9 IDirect3DDeviceManager9_iface; IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; @@ -152,6 +153,11 @@ static struct video_presenter *impl_from_IMFQualityAdvise(IMFQualityAdvise *ifac return CONTAINING_RECORD(iface, struct video_presenter, IMFQualityAdvise_iface); } +static struct video_presenter *impl_from_IDirect3DDeviceManager9(IDirect3DDeviceManager9 *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IDirect3DDeviceManager9_iface); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -480,6 +486,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IDirect3DDeviceManager9)) + { + *obj = &presenter->IDirect3DDeviceManager9_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -1486,6 +1496,85 @@ static const IMFQualityAdviseVtbl video_presenter_quality_advise_vtbl = video_presenter_quality_advise_DropTime, }; +static HRESULT WINAPI video_presenter_device_manager_QueryInterface(IDirect3DDeviceManager9 *iface, + REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_device_manager_AddRef(IDirect3DDeviceManager9 *iface) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_device_manager_Release(IDirect3DDeviceManager9 *iface) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_device_manager_ResetDevice(IDirect3DDeviceManager9 *iface, + IDirect3DDevice9 *device, UINT token) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_ResetDevice(presenter->device_manager, device, token); +} + +static HRESULT WINAPI video_presenter_device_manager_OpenDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE *hdevice) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_OpenDeviceHandle(presenter->device_manager, hdevice); +} + +static HRESULT WINAPI video_presenter_device_manager_CloseDeviceHandle(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_CloseDeviceHandle(presenter->device_manager, hdevice); +} + +static HRESULT WINAPI video_presenter_device_manager_TestDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_TestDevice(presenter->device_manager, hdevice); +} + +static HRESULT WINAPI video_presenter_device_manager_LockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + IDirect3DDevice9 **device, BOOL block) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_LockDevice(presenter->device_manager, hdevice, device, block); +} + +static HRESULT WINAPI video_presenter_device_manager_UnlockDevice(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + BOOL savestate) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_UnlockDevice(presenter->device_manager, hdevice, savestate); +} + +static HRESULT WINAPI video_presenter_device_manager_GetVideoService(IDirect3DDeviceManager9 *iface, HANDLE hdevice, + REFIID riid, void **service) +{ + struct video_presenter *presenter = impl_from_IDirect3DDeviceManager9(iface); + return IDirect3DDeviceManager9_GetVideoService(presenter->device_manager, hdevice, riid, service); +} + +static const IDirect3DDeviceManager9Vtbl video_presenter_device_manager_vtbl = +{ + video_presenter_device_manager_QueryInterface, + video_presenter_device_manager_AddRef, + video_presenter_device_manager_Release, + video_presenter_device_manager_ResetDevice, + video_presenter_device_manager_OpenDeviceHandle, + video_presenter_device_manager_CloseDeviceHandle, + video_presenter_device_manager_TestDevice, + video_presenter_device_manager_LockDevice, + video_presenter_device_manager_UnlockDevice, + video_presenter_device_manager_GetVideoService, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1558,6 +1647,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFQualityAdvise_iface.lpVtbl = &video_presenter_quality_advise_vtbl; object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; + object->IDirect3DDeviceManager9_iface.lpVtbl = &video_presenter_device_manager_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; object->src_rect.right = object->src_rect.bottom = 1.0f; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 55986414a70..34a69559b65 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1128,8 +1128,8 @@ static void test_default_presenter(void) IMFRateSupport *rate_support; IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; + IUnknown *unk, *unk2; HWND hwnd, hwnd2; - IUnknown *unk; DWORD flags; float rate; HRESULT hr; @@ -1153,6 +1153,7 @@ static void test_default_presenter(void) check_interface(presenter, &IID_IMFVideoPresenter, TRUE); check_interface(presenter, &IID_IMFVideoDeviceID, TRUE); check_interface(presenter, &IID_IMFQualityAdvise, TRUE); + check_interface(presenter, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE); @@ -1164,8 +1165,24 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + /* Query arbitrary supported interface back from device manager wrapper. */ + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_QueryInterface(dm, &IID_IQualProp, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IDirect3DDeviceManager9_QueryInterface(dm, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(unk == unk2, "Unexpected interface.\n"); + IUnknown_Release(unk2); + IUnknown_Release(unk); + IDirect3DDeviceManager9_Release(dm); + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_MIXER_SERVICE, &IID_IUnknown, (void **)&unk); ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/presenter: Fix error code for unsupported services.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: fcb08263a508d2d29e2f7bf16f376a3ef817208d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb08263a508d2d29e2f7bf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:37 2020 +0300 evr/presenter: Fix error code for unsupported services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 2 +- dlls/evr/tests/evr.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 84ef223e0fc..51792cdc2cd 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1258,7 +1258,7 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface FIXME("Unimplemented service %s.\n", debugstr_guid(service)); - return E_NOTIMPL; + return MF_E_UNSUPPORTED_SERVICE; } static const IMFGetServiceVtbl video_presenter_getservice_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 60d74d1a224..55986414a70 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1129,6 +1129,7 @@ static void test_default_presenter(void) IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; HWND hwnd, hwnd2; + IUnknown *unk; DWORD flags; float rate; HRESULT hr; @@ -1162,8 +1163,12 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); + check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_MIXER_SERVICE, &IID_IUnknown, (void **)&unk); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : msvcrt: Avoid long double type in $I10_OUTPUT().
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 1f27361894ab3160c1f57a0f7f384920af0b21e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f27361894ab3160c1f57a0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 10:13:31 2020 +0100 msvcrt: Avoid long double type in $I10_OUTPUT(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 43 ++++++++++------------- dlls/msvcrt/tests/misc.c | 90 +++++++++++++++++++++++++----------------------- 2 files changed, 64 insertions(+), 69 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3343f1e3ccf..7ad84a31858 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2390,20 +2390,29 @@ struct _I10_OUTPUT_DATA { */ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { - static const char inf_str[] = "1#INF"; - static const char nan_str[] = "1#QNAN"; - - /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. - * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. - * Assume long double uses 80 bit FP, never seen 128 bit FP. */ - long double ld = 0; + struct fpnum num; double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; - memcpy(&ld, &ld80, 10); - d = ld; + if ((ld80.x80[2] & 0x7fff) == 0x7fff) + { + if (ld80.x80[0] == 0 && ld80.x80[1] == 0x80000000) + strcpy( data->str, "1#INF" ); + else + strcpy( data->str, (ld80.x80[1] & 0x40000000) ? "1#QNAN" : "1#SNAN" ); + data->pos = 1; + data->sign = (ld80.x80[2] & 0x8000) ? '-' : ' '; + data->len = strlen(data->str); + return 0; + } + + num.sign = (ld80.x80[2] & 0x8000) ? -1 : 1; + num.exp = (ld80.x80[2] & 0x7fff) - 0x3fff - 63; + num.m = ld80.x80[0] | ((ULONGLONG)ld80.x80[1] << 32); + num.mod = FP_ROUND_EVEN; + fpnum_double( &num, &d ); TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) { @@ -2412,22 +2421,6 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 } else data->sign = ' '; - if(isinf(d)) { - data->pos = 1; - data->len = 5; - memcpy(data->str, inf_str, sizeof(inf_str)); - - return 0; - } - - if(isnan(d)) { - data->pos = 1; - data->len = 6; - memcpy(data->str, nan_str, sizeof(nan_str)); - - return 0; - } - if(flag&1) { int exp = 1+floor(log10(d)); diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index d77b6c8edfe..e262983e7e6 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -30,8 +30,11 @@ static inline BOOL almost_equal(double d1, double d2) { return FALSE; } +/* MS' "long double" is an 80 bit FP that takes 12 bytes*/ +struct uld { ULONG lo, hi, exp; }; + static int (__cdecl *prand_s)(unsigned int *); -static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*); +static int (__cdecl *pI10_OUTPUT)(struct uld, int, int, void*); static int (__cdecl *pstrerror_s)(char *, size_t, int); static int (__cdecl *p_get_doserrno)(int *); static int (__cdecl *p_get_errno)(int *); @@ -94,7 +97,7 @@ typedef struct _I10_OUTPUT_data { } I10_OUTPUT_data; typedef struct _I10_OUTPUT_test { - long double d; + struct uld d; int size; int flags; @@ -105,63 +108,62 @@ typedef struct _I10_OUTPUT_test { static const I10_OUTPUT_test I10_OUTPUT_tests[] = { /* arg3 = 0 */ - { 0.0, 10, 0, {0, ' ', 1, "0"}, 1, "" }, - { 1.0, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" }, - { -1.0, 10, 0, {1, '-', 1, "1"}, 1, "000000009" }, - { 1.23, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" }, - { 1e13, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" }, - { 1e30, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" }, - { 1e-13, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" }, - { 0.25, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" }, - { 1.0000001, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" }, + { { 0x00000000, 0x00000000, 0x0000 /* 0.0 */ }, 10, 0, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0x80000000, 0x3fff /* 1.0 */ }, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" }, + { { 0x00000000, 0x80000000, 0xbfff /* -1.0 */ }, 10, 0, {1, '-', 1, "1"}, 1, "000000009" }, + { { 0x0a3d7000, 0x9d70a3d7, 0x3fff /* 1.23 */ }, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" }, + { { 0x00000000, 0x9184e72a, 0x402a /* 1e13 */ }, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" }, + { { 0x04675000, 0xc9f2c9cd, 0x4062 /* 1e30 */ }, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" }, + { { 0x4bb41000, 0xe12e1342, 0x3fd3 /* 1e-13 */ }, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" }, + { { 0x00000000, 0x80000000, 0x3ffd /* 0.25 */ }, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" }, + { { 0xbf94d800, 0x800000d6, 0x3fff /* 1.0000001 */ }, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" }, + { { 0x00000000, 0x80000000, 0x7fff /* +inf */ }, 10, 0, {1, ' ', 5, "1#INF"}, 0, "" }, + { { 0x00000000, 0x80000000, 0xffff /* -inf */ }, 10, 0, {1, '-', 5, "1#INF"}, 0, "" }, + { { 0x00000001, 0x80000000, 0x7fff /* snan */ }, 10, 0, {1, ' ', 6, "1#SNAN"}, 0, "" }, + { { 0x00000001, 0x80000000, 0xffff /* snan */ }, 10, 0, {1, '-', 6, "1#SNAN"}, 0, "" }, + { { 0x00000000, 0xc0000000, 0x7fff /* qnan */ }, 10, 0, {1, ' ', 6, "1#QNAN"}, 0, "" }, + { { 0x00000000, 0x40000000, 0xffff /* qnan */ }, 10, 0, {1, '-', 6, "1#QNAN"}, 0, "" }, /* arg3 = 1 */ - { 0.0, 10, 1, {0, ' ', 1, "0"}, 1, "" }, - { 1.0, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" }, - { -1.0, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" }, - { 1.23, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" }, - { 1e13, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" }, - { 1e30, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" }, - { 1e-13, 10, 1, {0, ' ', 1, "0"}, 1, "" }, - { 1e-7, 10, 1, {-6, ' ', 1, "1"}, 1, "09" }, - { 0.25, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" }, - { 1.0000001, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" }, + { { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 10, 1, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0x80000000, 0x3fff /* 1 */ }, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" }, + { { 0x00000000, 0x80000000, 0xbfff /* -1 */ }, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" }, + { { 0x0a3d7000, 0x9d70a3d7, 0x3fff /* 1.23 */ }, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" }, + { { 0x00000000, 0x9184e72a, 0x402a /* 1e13 */ }, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" }, + { { 0x04675000, 0xc9f2c9cd, 0x4062 /* 1e30 */ }, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" }, + { { 0x4bb41000, 0xe12e1342, 0x3fd3 /* 1e-13 */ }, 10, 1, {0, ' ', 1, "0"}, 1, "" }, + { { 0xe57a4000, 0xd6bf94d5, 0x3fe7 /* 1e-7 */ }, 10, 1, {-6, ' ', 1, "1"}, 1, "09" }, + { { 0x00000000, 0x80000000, 0x3ffd /* 0.25 */ }, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" }, + { { 0xbf94d800, 0x800000d6, 0x3fff /* 1.0000001 */ }, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" }, + { { 0x00000000, 0x80000000, 0x7fff /* +inf */ }, 10, 1, {1, ' ', 5, "1#INF"}, 0, "" }, + { { 0x00000000, 0x80000000, 0xffff /* -inf */ }, 10, 1, {1, '-', 5, "1#INF"}, 0, "" }, + { { 0x00000001, 0x80000000, 0x7fff /* snan */ }, 10, 1, {1, ' ', 6, "1#SNAN"}, 0, "" }, + { { 0x00000000, 0xc0000000, 0x7fff /* qnan */ }, 10, 1, {1, ' ', 6, "1#QNAN"}, 0, "" }, + { { 0x00000000, 0x40000000, 0x7fff /* qnan */ }, 10, 1, {1, ' ', 6, "1#QNAN"}, 0, "" }, /* too small buffer */ - { 0.0, 0, 0, {0, ' ', 1, "0"}, 1, "" }, - { 0.0, 0, 1, {0, ' ', 1, "0"}, 1, "" }, - { 123.0, 2, 0, {3, ' ', 2, "12"}, 1, "" }, - { 123.0, 0, 0, {0, ' ', 1, "0"}, 1, "" }, - { 123.0, 2, 1, {3, ' ', 3, "123"}, 1, "09" }, - { 0.99, 1, 0, {1, ' ', 1, "1"}, 1, "" }, - { 1264567.0, 2, 0, {7, ' ', 2, "13"}, 1, "" }, - { 1264567.0, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" }, - { 1234567891.0, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" } + { { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 0, 0, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 0, 1, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 2, 0, {3, ' ', 2, "12"}, 1, "" }, + { { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 0, 0, {0, ' ', 1, "0"}, 1, "" }, + { { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 2, 1, {3, ' ', 3, "123"}, 1, "09" }, + { { 0x0a3d7000, 0xfd70a3d7, 0x3ffe /* 0.99 */ }, 1, 0, {1, ' ', 1, "1"}, 1, "" }, + { { 0x00000000, 0x9a5db800, 0x4013 /* 1264567.0 */ }, 2, 0, {7, ' ', 2, "13"}, 1, "" }, + { { 0x00000000, 0x9a5db800, 0x4013 /* 1264567.0 */ }, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" }, + { { 0x00000000, 0x932c05a6, 0x401d /* 1234567891.0 */ }, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" } }; static void test_I10_OUTPUT(void) { I10_OUTPUT_data out; - int i, j = sizeof(long double), ret; + int i, j, ret; if(!pI10_OUTPUT) { win_skip("I10_OUTPUT not available\n"); return; } - if (j != 12) - trace("sizeof(long double) = %d on this machine\n", j); for(i=0; i<ARRAY_SIZE(I10_OUTPUT_tests); i++) { memset(out.str, '#', sizeof(out.str)); - - if (sizeof(long double) == 12) - ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); - else { - /* MS' "long double" is an 80 bit FP that takes 12 bytes*/ - typedef struct { ULONG x80[3]; } uld; /* same calling convention */ - union { long double ld; uld ld12; } fp80; - int (__cdecl *pI10_OUTPUT12)(uld, int, int, void*) = (void*)pI10_OUTPUT; - fp80.ld = I10_OUTPUT_tests[i].d; - ret = pI10_OUTPUT12(fp80.ld12, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); - } + ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out); ok(ret == I10_OUTPUT_tests[i].ret, "%d: ret = %d\n", i, ret); ok(out.pos == I10_OUTPUT_tests[i].out.pos, "%d: out.pos = %hd\n", i, out.pos); ok(out.sign == I10_OUTPUT_tests[i].out.sign, "%d: out.size = %c\n", i, out.sign);

1 0