December 2020 - Wine-Commits

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from errno.c functions.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: eeada5682b68ae2400271dbda0634be186f962b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeada5682b68ae2400271dbd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:23 2020 +0100 msvcrt: Remove MSVCRT_ prefix from errno.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 10 ++-- dlls/msvcr100/msvcr100.spec | 28 +++++----- dlls/msvcr110/msvcr110.spec | 28 +++++----- dlls/msvcr120/msvcr120.spec | 28 +++++----- dlls/msvcr70/msvcr70.spec | 16 +++--- dlls/msvcr71/msvcr71.spec | 16 +++--- dlls/msvcr80/msvcr80.spec | 28 +++++----- dlls/msvcr90/msvcr90.spec | 28 +++++----- dlls/msvcrt/ctype.c | 4 +- dlls/msvcrt/dir.c | 62 +++++++++++----------- dlls/msvcrt/environ.c | 28 +++++----- dlls/msvcrt/errno.c | 52 +++++++++--------- dlls/msvcrt/file.c | 126 ++++++++++++++++++++++---------------------- dlls/msvcrt/heap.c | 18 +++---- dlls/msvcrt/math.c | 100 +++++++++++++++++------------------ dlls/msvcrt/mbcs.c | 28 +++++----- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.h | 9 ++-- dlls/msvcrt/msvcrt.spec | 24 ++++----- dlls/msvcrt/printf.h | 4 +- dlls/msvcrt/process.c | 10 ++-- dlls/msvcrt/string.c | 50 +++++++++--------- dlls/msvcrt/thread.c | 6 +-- dlls/msvcrt/time.c | 46 ++++++++-------- dlls/msvcrt/wcs.c | 70 ++++++++++++------------ dlls/msvcrtd/msvcrtd.spec | 12 ++--- dlls/ucrtbase/ucrtbase.spec | 38 ++++++------- 27 files changed, 434 insertions(+), 437 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eeada5682b68ae240027…

1 0

Piotr Caban : Revert "msvcrt: Avoid conflict with mingw __iob_func declaration.".
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: ebfe14d596c129a37dbbccac36142094db41ff44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebfe14d596c129a37dbbccac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:44 2020 +0100 Revert "msvcrt: Avoid conflict with mingw __iob_func declaration.". This reverts commit 873a90e6f36b9acc74eb637a230ffee491398cd0. It's no longer needed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5cbdecb22d1..5d54188e17f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -27,7 +27,6 @@ */ -#define __iob_func mingw___iob_func #include <stdarg.h> #include <stdio.h> #include <sys/types.h>

1 0

Piotr Caban : msvcrt: Use fpclass constants from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 480e25a5f6ae432f4688c79dbf7f0008a740aab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=480e25a5f6ae432f4688c79d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:59 2020 +0100 msvcrt: Use fpclass constants from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 34 +++++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 12 ------------ 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 5cbf2068aa6..b7a62d9cf2c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -218,13 +218,13 @@ int CDECL MSVCRT__fpclassf( float num ) switch (e) { case 0: - if (u.i << 1) return s ? MSVCRT__FPCLASS_ND : MSVCRT__FPCLASS_PD; - return s ? MSVCRT__FPCLASS_NZ : MSVCRT__FPCLASS_PZ; + if (u.i << 1) return s ? _FPCLASS_ND : _FPCLASS_PD; + return s ? _FPCLASS_NZ : _FPCLASS_PZ; case 0xff: - if (u.i << 9) return ((u.i >> 22) & 1) ? MSVCRT__FPCLASS_QNAN : MSVCRT__FPCLASS_SNAN; - return s ? MSVCRT__FPCLASS_NINF : MSVCRT__FPCLASS_PINF; + if (u.i << 9) return ((u.i >> 22) & 1) ? _FPCLASS_QNAN : _FPCLASS_SNAN; + return s ? _FPCLASS_NINF : _FPCLASS_PINF; default: - return s ? MSVCRT__FPCLASS_NN : MSVCRT__FPCLASS_PN; + return s ? _FPCLASS_NN : _FPCLASS_PN; } } @@ -1419,13 +1419,13 @@ int CDECL MSVCRT__fpclass(double num) switch (e) { case 0: - if (u.i << 1) return s ? MSVCRT__FPCLASS_ND : MSVCRT__FPCLASS_PD; - return s ? MSVCRT__FPCLASS_NZ : MSVCRT__FPCLASS_PZ; + if (u.i << 1) return s ? _FPCLASS_ND : _FPCLASS_PD; + return s ? _FPCLASS_NZ : _FPCLASS_PZ; case 0x7ff: - if (u.i << 12) return ((u.i >> 51) & 1) ? MSVCRT__FPCLASS_QNAN : MSVCRT__FPCLASS_SNAN; - return s ? MSVCRT__FPCLASS_NINF : MSVCRT__FPCLASS_PINF; + if (u.i << 12) return ((u.i >> 51) & 1) ? _FPCLASS_QNAN : _FPCLASS_SNAN; + return s ? _FPCLASS_NINF : _FPCLASS_PINF; default: - return s ? MSVCRT__FPCLASS_NN : MSVCRT__FPCLASS_PN; + return s ? _FPCLASS_NN : _FPCLASS_PN; } } @@ -2285,7 +2285,7 @@ double CDECL MSVCRT__y0(double num) if (!isfinite(num)) *_errno() = EDOM; retval = unix_funcs->y0( num ); - if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) + if (MSVCRT__fpclass(retval) == _FPCLASS_NINF) { *_errno() = EDOM; retval = NAN; @@ -2302,7 +2302,7 @@ double CDECL MSVCRT__y1(double num) if (!isfinite(num)) *_errno() = EDOM; retval = unix_funcs->y1( num ); - if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) + if (MSVCRT__fpclass(retval) == _FPCLASS_NINF) { *_errno() = EDOM; retval = NAN; @@ -2319,7 +2319,7 @@ double CDECL MSVCRT__yn(int order, double num) if (!isfinite(num)) *_errno() = EDOM; retval = unix_funcs->yn( order, num ); - if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF) + if (MSVCRT__fpclass(retval) == _FPCLASS_NINF) { *_errno() = EDOM; retval = NAN; @@ -2351,8 +2351,8 @@ float CDECL MSVCRT_nearbyintf(float num) double CDECL MSVCRT_nexttoward(double num, double next) { double ret = unix_funcs->nexttoward(num, next); - if (!(MSVCRT__fpclass(ret) & (MSVCRT__FPCLASS_PN | MSVCRT__FPCLASS_NN - | MSVCRT__FPCLASS_SNAN | MSVCRT__FPCLASS_QNAN)) && !isinf(num)) + if (!(MSVCRT__fpclass(ret) & (_FPCLASS_PN | _FPCLASS_NN + | _FPCLASS_SNAN | _FPCLASS_QNAN)) && !isinf(num)) { *_errno() = ERANGE; } @@ -2365,8 +2365,8 @@ double CDECL MSVCRT_nexttoward(double num, double next) float CDECL MSVCRT_nexttowardf(float num, double next) { float ret = unix_funcs->nexttowardf( num, next ); - if (!(MSVCRT__fpclass(ret) & (MSVCRT__FPCLASS_PN | MSVCRT__FPCLASS_NN - | MSVCRT__FPCLASS_SNAN | MSVCRT__FPCLASS_QNAN)) && !isinf(num)) + if (!(MSVCRT__fpclass(ret) & (_FPCLASS_PN | _FPCLASS_NN + | _FPCLASS_SNAN | _FPCLASS_QNAN)) && !isinf(num)) { *_errno() = ERANGE; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 511640fb1f4..bfa01e21901 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -626,18 +626,6 @@ struct MSVCRT__stat64 { #define MSVCRT__O_U16TEXT 0x20000 #define MSVCRT__O_U8TEXT 0x40000 -/* fpclass constants */ -#define MSVCRT__FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ -#define MSVCRT__FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */ -#define MSVCRT__FPCLASS_NINF 0x0004 /* Negative Infinity */ -#define MSVCRT__FPCLASS_NN 0x0008 /* Negative Normal */ -#define MSVCRT__FPCLASS_ND 0x0010 /* Negative Denormal */ -#define MSVCRT__FPCLASS_NZ 0x0020 /* Negative Zero */ -#define MSVCRT__FPCLASS_PZ 0x0040 /* Positive Zero */ -#define MSVCRT__FPCLASS_PD 0x0080 /* Positive Denormal */ -#define MSVCRT__FPCLASS_PN 0x0100 /* Positive Normal */ -#define MSVCRT__FPCLASS_PINF 0x0200 /* Positive Infinity */ - /* fpclassify constants */ #define MSVCRT_FP_INFINITE 1 #define MSVCRT_FP_NAN 2

1 0

Piotr Caban : msvcrt: Use FILE from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 926179938308b49a2ede5e9196d28535cfec782c URL: https://source.winehq.org/git/wine.git/?a=commit;h=926179938308b49a2ede5e91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:39 2020 +0100 msvcrt: Use FILE from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 236 +++++++++++++++++++++++++------------------------- dlls/msvcrt/msvcrt.h | 54 ++++++------ dlls/msvcrt/process.c | 12 +-- dlls/msvcrt/scanf.c | 20 ++--- dlls/msvcrt/scanf.h | 10 +-- 5 files changed, 165 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=926179938308b49a2ede…

1 0

Nikolay Sivov : mf/topoloader: Add copier transform automatically for D3D-aware outputs.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 79776e45407f700b4ab0434d5d440516ecde5e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79776e45407f700b4ab0434d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:29 2020 +0300 mf/topoloader: Add copier transform automatically for D3D-aware outputs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/copier.c | 8 ++++ dlls/mf/mf_private.h | 2 + dlls/mf/tests/mf.c | 1 - dlls/mf/topology.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 125 insertions(+), 1 deletion(-) diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index ba8e316f7e9..cbdac97292b 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -561,6 +561,14 @@ static const IMFTransformVtbl sample_copier_transform_vtbl = sample_copier_transform_ProcessOutput, }; +BOOL mf_is_sample_copier_transform(IUnknown *transform) +{ + return transform->lpVtbl == (IUnknownVtbl *)&sample_copier_transform_vtbl; +} + +/*********************************************************************** + * MFCreateSampleCopierMFT (mf.@) + */ HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) { struct sample_copier *object; diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 66d970dfce5..0c4dde0c4fc 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -79,3 +79,5 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } + +extern BOOL mf_is_sample_copier_transform(IUnknown *transform) DECLSPEC_HIDDEN; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2cb45668cb..8272064466f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2213,7 +2213,6 @@ static void test_topology_loader_evr(void) hr = IMFTopology_GetNodeCount(full_topology, &node_count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(node_count == 3, "Unexpected node count %u.\n", node_count); for (i = 0; i < node_count; ++i) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 825b9d538f3..e33dbc2efc7 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2364,6 +2364,119 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, return hr; } +static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) +{ + IMFAttributes *attributes; + unsigned int d3d_aware = 0; + IUnknown *object = NULL; + + if (FAILED(IMFTopologyNode_GetObject(node, &object))) + return FALSE; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFAttributes, (void **)&attributes))) + { + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); + IMFAttributes_Release(attributes); + } + + if (!d3d_aware) + d3d_aware = mf_is_sample_copier_transform(object); + + IUnknown_Release(object); + + return !!d3d_aware; +} + +static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, unsigned int upstream_output, + IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform **copier) +{ + IMFMediaType *input_type = NULL, *output_type = NULL; + IMFTransform *transform; + HRESULT hr; + + if (FAILED(hr = MFCreateSampleCopierMFT(&transform))) + return hr; + + if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &input_type))) + WARN("Failed to get upstream media type hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = MFGetTopoNodeCurrentType(downstream_node, downstream_input, FALSE, &output_type))) + WARN("Failed to get downstream media type hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) + WARN("Input type wasn't accepted, hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0))) + WARN("Output type wasn't accepted, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + *copier = transform; + IMFTransform_AddRef(*copier); + } + + if (input_type) + IMFMediaType_Release(input_type); + if (output_type) + IMFMediaType_Release(output_type); + + IMFTransform_Release(transform); + + return hr; +} + +static HRESULT topology_loader_connect_copier(struct topoloader_context *context, IMFTopologyNode *upstream_node, + unsigned int upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform *copier) +{ + IMFTopologyNode *copier_node; + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &copier_node))) + return hr; + + IMFTopologyNode_SetObject(copier_node, (IUnknown *)copier); + IMFTopology_AddNode(context->output_topology, copier_node); + IMFTopologyNode_ConnectOutput(upstream_node, upstream_output, copier_node, 0); + IMFTopologyNode_ConnectOutput(copier_node, 0, downstream_node, downstream_input); + + IMFTopologyNode_Release(copier_node); + + return S_OK; +} + +/* Right now this should be used for output nodes only. */ +static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context *context, + IMFTopologyNode *node) +{ + IMFTopologyNode *upstream_node; + unsigned int upstream_output; + IMFStreamSink *stream_sink; + IMFTransform *copier = NULL; + HRESULT hr = S_OK; + + IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + + if (topology_loader_is_node_d3d_aware(node)) + { + if (SUCCEEDED(IMFTopologyNode_GetInput(node, 0, &upstream_node, &upstream_output))) + { + if (!topology_loader_is_node_d3d_aware(upstream_node)) + { + if (SUCCEEDED(hr = topology_loader_create_copier(upstream_node, upstream_output, node, 0, &copier))) + { + hr = topology_loader_connect_copier(context, upstream_node, upstream_output, node, 0, copier); + IMFTransform_Release(copier); + } + } + IMFTopologyNode_Release(upstream_node); + } + } + + IMFStreamSink_Release(stream_sink); + + return hr; +} + static void topology_loader_resolve_complete(struct topoloader_context *context) { MF_TOPOLOGY_TYPE node_type; @@ -2383,6 +2496,8 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) /* Set MF_TOPONODE_STREAMID for all outputs. */ if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); + + topology_loader_connect_d3d_aware_input(context, node); } else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) {

1 0

Piotr Caban : msvcrt: Use status word flags from public header.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 09d018c73d4dbaeddf19333e9c5c6fae51d4c1ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=09d018c73d4dbaeddf19333e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:55 2020 +0100 msvcrt: Use status word flags from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 72 ++++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 14 ---------- 2 files changed, 36 insertions(+), 50 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 1eaa82624b9..5cbf2068aa6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1640,12 +1640,12 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { __asm__ __volatile__( "fstsw %0" : "=m" (fpword) ); flags = 0; - if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; - if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; - if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; - if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; - if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; - if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + if (fpword & 0x1) flags |= _SW_INVALID; + if (fpword & 0x2) flags |= _SW_DENORMAL; + if (fpword & 0x4) flags |= _SW_ZERODIVIDE; + if (fpword & 0x8) flags |= _SW_OVERFLOW; + if (fpword & 0x10) flags |= _SW_UNDERFLOW; + if (fpword & 0x20) flags |= _SW_INEXACT; *x86_sw = flags; } @@ -1655,12 +1655,12 @@ void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); flags = 0; - if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; - if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; - if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; - if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; - if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; - if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + if (fpword & 0x1) flags |= _SW_INVALID; + if (fpword & 0x2) flags |= _SW_DENORMAL; + if (fpword & 0x4) flags |= _SW_ZERODIVIDE; + if (fpword & 0x8) flags |= _SW_OVERFLOW; + if (fpword & 0x10) flags |= _SW_UNDERFLOW; + if (fpword & 0x20) flags |= _SW_INEXACT; *sse2_sw = flags; } else *sse2_sw = 0; @@ -1686,12 +1686,12 @@ unsigned int CDECL _statusfp(void) ULONG_PTR fpsr; __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; - if (fpsr & 0x2) flags |= MSVCRT__SW_ZERODIVIDE; - if (fpsr & 0x4) flags |= MSVCRT__SW_OVERFLOW; - if (fpsr & 0x8) flags |= MSVCRT__SW_UNDERFLOW; - if (fpsr & 0x10) flags |= MSVCRT__SW_INEXACT; - if (fpsr & 0x80) flags |= MSVCRT__SW_DENORMAL; + if (fpsr & 0x1) flags |= _SW_INVALID; + if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpsr & 0x4) flags |= _SW_OVERFLOW; + if (fpsr & 0x8) flags |= _SW_UNDERFLOW; + if (fpsr & 0x10) flags |= _SW_INEXACT; + if (fpsr & 0x80) flags |= _SW_DENORMAL; #else FIXME( "not implemented\n" ); #endif @@ -1708,22 +1708,22 @@ unsigned int CDECL _clearfp(void) unsigned long fpword; __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); - if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; - if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; - if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; - if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; - if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; - if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + if (fpword & 0x1) flags |= _SW_INVALID; + if (fpword & 0x2) flags |= _SW_DENORMAL; + if (fpword & 0x4) flags |= _SW_ZERODIVIDE; + if (fpword & 0x8) flags |= _SW_OVERFLOW; + if (fpword & 0x10) flags |= _SW_UNDERFLOW; + if (fpword & 0x20) flags |= _SW_INEXACT; if (sse2_supported) { __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - if (fpword & 0x1) flags |= MSVCRT__SW_INVALID; - if (fpword & 0x2) flags |= MSVCRT__SW_DENORMAL; - if (fpword & 0x4) flags |= MSVCRT__SW_ZERODIVIDE; - if (fpword & 0x8) flags |= MSVCRT__SW_OVERFLOW; - if (fpword & 0x10) flags |= MSVCRT__SW_UNDERFLOW; - if (fpword & 0x20) flags |= MSVCRT__SW_INEXACT; + if (fpword & 0x1) flags |= _SW_INVALID; + if (fpword & 0x2) flags |= _SW_DENORMAL; + if (fpword & 0x4) flags |= _SW_ZERODIVIDE; + if (fpword & 0x8) flags |= _SW_OVERFLOW; + if (fpword & 0x10) flags |= _SW_UNDERFLOW; + if (fpword & 0x20) flags |= _SW_INEXACT; fpword &= ~0x3f; __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); } @@ -1731,12 +1731,12 @@ unsigned int CDECL _clearfp(void) ULONG_PTR fpsr; __asm__ __volatile__( "mrs %0, fpsr" : "=r" (fpsr) ); - if (fpsr & 0x1) flags |= MSVCRT__SW_INVALID; - if (fpsr & 0x2) flags |= MSVCRT__SW_ZERODIVIDE; - if (fpsr & 0x4) flags |= MSVCRT__SW_OVERFLOW; - if (fpsr & 0x8) flags |= MSVCRT__SW_UNDERFLOW; - if (fpsr & 0x10) flags |= MSVCRT__SW_INEXACT; - if (fpsr & 0x80) flags |= MSVCRT__SW_DENORMAL; + if (fpsr & 0x1) flags |= _SW_INVALID; + if (fpsr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpsr & 0x4) flags |= _SW_OVERFLOW; + if (fpsr & 0x8) flags |= _SW_UNDERFLOW; + if (fpsr & 0x10) flags |= _SW_INEXACT; + if (fpsr & 0x80) flags |= _SW_DENORMAL; fpsr &= ~0x9f; __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); #else diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 56963ad39ab..511640fb1f4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -626,20 +626,6 @@ struct MSVCRT__stat64 { #define MSVCRT__O_U16TEXT 0x20000 #define MSVCRT__O_U8TEXT 0x40000 -/* _statusfp bit flags */ -#define MSVCRT__SW_INEXACT 0x00000001 /* inexact (precision) */ -#define MSVCRT__SW_UNDERFLOW 0x00000002 /* underflow */ -#define MSVCRT__SW_OVERFLOW 0x00000004 /* overflow */ -#define MSVCRT__SW_ZERODIVIDE 0x00000008 /* zero divide */ -#define MSVCRT__SW_INVALID 0x00000010 /* invalid */ - -#define MSVCRT__SW_UNEMULATED 0x00000040 /* unemulated instruction */ -#define MSVCRT__SW_SQRTNEG 0x00000080 /* square root of a neg number */ -#define MSVCRT__SW_STACKOVERFLOW 0x00000200 /* FP stack overflow */ -#define MSVCRT__SW_STACKUNDERFLOW 0x00000400 /* FP stack underflow */ - -#define MSVCRT__SW_DENORMAL 0x00080000 /* denormal status bit */ - /* fpclass constants */ #define MSVCRT__FPCLASS_SNAN 0x0001 /* Signaling "Not a Number" */ #define MSVCRT__FPCLASS_QNAN 0x0002 /* Quiet "Not a Number" */

1 0

Nikolay Sivov : dwrite/font: Reimplement HasVerticalGlyphVariants() flag using general shaping logic.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: feefc6a908eaac6484bde7ebfbdbe7cff546554b URL: https://source.winehq.org/git/wine.git/?a=commit;h=feefc6a908eaac6484bde7eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:02 2020 +0300 dwrite/font: Reimplement HasVerticalGlyphVariants() flag using general shaping logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/opentype.c | 175 +++++++++++++++++-------------------------- dlls/dwrite/tests/font.c | 9 ++- 4 files changed, 74 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=feefc6a908eaac6484bd…

1 0

Daniel Lehman : ntdll: Handle 64-bit addresses in +seh traces on x64.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: bd02a82d9c41ef680709637acaee579852488142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd02a82d9c41ef680709637a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Nov 26 15:22:18 2020 -0800 ntdll: Handle 64-bit addresses in +seh traces on x64. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a332f961908..a3dba815c1f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -241,11 +241,11 @@ static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) TRACE( "scope table at %p\n", table ); for (i = 0; i < table->Count; i++) - TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, - base + table->ScopeRecord[i].BeginAddress, - base + table->ScopeRecord[i].EndAddress, - base + table->ScopeRecord[i].HandlerAddress, - base + table->ScopeRecord[i].JumpTarget ); + TRACE( " %u: %p-%p handler %p target %p\n", i, + (char *)base + table->ScopeRecord[i].BeginAddress, + (char *)base + table->ScopeRecord[i].EndAddress, + (char *)base + table->ScopeRecord[i].HandlerAddress, + (char *)base + table->ScopeRecord[i].JumpTarget ); } @@ -384,8 +384,8 @@ static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_C frame.Handler = nested_exception_handler; __wine_push_frame( &frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, context, dispatch ); TRACE( "handler at %p returned %u\n", dispatch->LanguageHandler, res ); @@ -445,7 +445,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -480,8 +480,8 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex /* hack: call wine handlers registered in the tib list */ else while ((ULONG64)teb_frame < context.Rsp) { - TRACE( "found wine frame %p rsp %lx handler %p\n", - teb_frame, context.Rsp, teb_frame->Handler ); + TRACE( "found wine frame %p rsp %p handler %p\n", + teb_frame, (void *)context.Rsp, teb_frame->Handler ); dispatch.EstablisherFrame = (ULONG64)teb_frame; switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) { @@ -521,9 +521,9 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; - TRACE( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", + TRACE( "code=%x flags=%x addr=%p ip=%p tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, - context->Rip, GetCurrentThreadId() ); + (void *)context->Rip, GetCurrentThreadId() ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) TRACE( " info[%d]=%016lx\n", c, rec->ExceptionInformation[c] ); @@ -780,7 +780,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, unsigned int i, prolog_offset; BOOL mach_frame = FALSE; - TRACE( "type %x rip %lx rsp %lx\n", type, pc, context->Rsp ); + TRACE( "type %x rip %p rsp %p\n", type, (void *)pc, (void *)context->Rsp ); if (TRACE_ON(seh)) dump_unwind_info( base, function ); frame = *frame_ret = context->Rsp; @@ -944,8 +944,8 @@ static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dis frame.dispatch = dispatch; __wine_push_frame( &frame.frame ); - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); + TRACE( "calling handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + dispatch->LanguageHandler, rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); res = dispatch->LanguageHandler( rec, (void *)dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); TRACE( "handler %p returned %x\n", dispatch->LanguageHandler, res ); @@ -1162,7 +1162,7 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) teb_frame = __wine_pop_frame( teb_frame ); } - TRACE( "returning to %lx stack %lx\n", context->Rip, context->Rsp ); + TRACE( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); NtSetContextThread( GetCurrentThread(), context ); } @@ -1226,7 +1226,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); rec->ExceptionFlags |= EH_STACK_INVALID; break; @@ -1236,7 +1236,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec { if (end_frame && (dispatch.EstablisherFrame > (ULONG64)end_frame)) { - ERR( "invalid end frame %lx/%p\n", dispatch.EstablisherFrame, end_frame ); + ERR( "invalid end frame %p/%p\n", (void *)dispatch.EstablisherFrame, end_frame ); raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EH_TARGET_UNWIND; @@ -1381,7 +1381,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, return ExceptionContinueExecution; } } - TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + TRACE( "unwinding to target %p\n", (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); RtlUnwindEx( frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); } @@ -1471,7 +1471,7 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) { - ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); break; }

1 0

Nikolay Sivov : dwrite/gdiinterop: Use consistent trace format for the bitmap render target.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: 061372438e5c1d838643b467946da9f8641f0f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=061372438e5c1d838643b467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:15:00 2020 +0300 dwrite/gdiinterop: Use consistent trace format for the bitmap render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 116 +++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=061372438e5c1d838643…

1 0

Nikolay Sivov : mfplat: Remove duplicated attribute from tracing.
by Alexandre Julliard Dec. 1, 2020

Dec. 1, 2020

Module: wine Branch: master Commit: c512748e2252c69d1ebabd509fad7d8cd03592a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c512748e2252c69d1ebabd50… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 1 15:16:23 2020 +0300 mfplat: Remove duplicated attribute from tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6394784593e..e4cd1c397ad 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1579,7 +1579,6 @@ const char *debugstr_attr(const GUID *guid) X(MF_SA_D3D_AWARE), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), - X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_MT_AM_FORMAT_TYPE), X(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME),

1 0