December 2020 - Wine-commits

Nikolay Sivov : mf/topoloader: Add copier transform automatically for D3D-aware outputs.
by Alexandre Julliard 01 Dec '20

01 Dec '20

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

Gabriel Ivăncescu : winex11.drv: Always enable minimize/maximize functions for minimized windows.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 688fe7068c689050d1100e0b2702367eb3180c53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=688fe7068c689050d1100e0b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 13 15:26:18 2020 +0200 winex11.drv: Always enable minimize/maximize functions for minimized windows. A window without a minimize or maximize box can still be programmatically minimized by the Windows API. However, some WMs will refuse to change the state and not allow it to be maximized again, despite it being minimized, due to lacking those functions, thus not sending WM_STATE change notifications when clicking the minimized window on the taskbar. Heroes of Might and Magic V does this, for example, when losing focus. It minimizes itself. When maximizing it by clicking on the taskbar it won't send a WM_STATE change notification (since it was never changed) and fail to maximize properly, showing a black screen (the game will still think it is minimized). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ba722721ad2..f46cbfb088a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -752,6 +752,10 @@ static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_s if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + + /* The window can be programmatically minimized even without + a minimize box button. Allow the WM to restore it. */ + if (style & WS_MINIMIZE) mwm_hints.functions |= MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE; } }

1 0

Akihiro Sagawa : ntdll: Add a timezone mapping rule for North Korea Standard Time.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 22612bcff5ecc7ece4acc4325aa8b19e6129b2cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=22612bcff5ecc7ece4acc432… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Nov 30 22:00:34 2020 +0900 ntdll: Add a timezone mapping rule for North Korea Standard Time. Otherwise, another UTC+9 timezone matches to the timezone. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50213 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 8add2cabd4f..a889b2e020c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1742,12 +1742,31 @@ static BOOL match_tz_info( const RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, match_tz_date(&tzi->DaylightDate, &reg_tzi->DaylightDate)); } +static BOOL match_past_tz_bias( time_t past_time, LONG past_bias ) +{ + LONG bias; + struct tm *tm; + if (!past_time) return TRUE; + + tm = gmtime( &past_time ); + bias = (LONG)(mktime(tm) - past_time) / 60; + return bias == past_bias; +} + static BOOL match_tz_name( const char *tz_name, const RTL_DYNAMIC_TIME_ZONE_INFORMATION *reg_tzi ) { - static const struct { WCHAR key_name[32]; const char *short_name; } mapping[] = + static const struct { + WCHAR key_name[32]; + const char *short_name; + time_t past_time; + LONG past_bias; + } + mapping[] = { + { {'N','o','r','t','h',' ','K','o','r','e','a',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, + "KST", 1451606400 /* 2016-01-01 00:00:00 UTC */, -510 }, { {'K','o','r','e','a',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, - "KST" }, + "KST", 1451606400 /* 2016-01-01 00:00:00 UTC */, -540 }, { {'T','o','k','y','o',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, "JST" }, { {'Y','a','k','u','t','s','k',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0 }, @@ -1759,7 +1778,8 @@ static BOOL match_tz_name( const char *tz_name, const RTL_DYNAMIC_TIME_ZONE_INFO for (i = 0; i < ARRAY_SIZE(mapping); i++) { if (!wcscmp( mapping[i].key_name, reg_tzi->TimeZoneKeyName )) - return !strcmp( mapping[i].short_name, tz_name ); + return !strcmp( mapping[i].short_name, tz_name ) + && match_past_tz_bias( mapping[i].past_time, mapping[i].past_bias ); } return TRUE; }

1 0

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from errno.c functions.
by Alexandre Julliard 01 Dec '20

01 Dec '20

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 : msvcrt: Remove MSVCRT_ prefix from heap.c functions.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: d784dbb89993d0565ea132109b110cc9500c97f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d784dbb89993d0565ea13210… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:32 2020 +0100 msvcrt: Remove MSVCRT_ prefix from heap.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 20 ++--- dlls/msvcr100/msvcr100.spec | 58 +++++++-------- dlls/msvcr110/msvcr110.spec | 58 +++++++-------- dlls/msvcr120/msvcr120.spec | 58 +++++++-------- dlls/msvcr70/msvcr70.spec | 38 +++++----- dlls/msvcr71/msvcr71.spec | 38 +++++----- dlls/msvcr80/msvcr80.spec | 60 +++++++-------- dlls/msvcr90/msvcr90.spec | 58 +++++++-------- dlls/msvcrt/console.c | 4 +- dlls/msvcrt/cpp.c | 44 +++++------ dlls/msvcrt/data.c | 6 +- dlls/msvcrt/dir.c | 12 +-- dlls/msvcrt/environ.c | 4 +- dlls/msvcrt/errno.c | 14 ++-- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/exit.c | 8 +- dlls/msvcrt/file.c | 56 +++++++------- dlls/msvcrt/heap.c | 56 +++++++------- dlls/msvcrt/locale.c | 174 ++++++++++++++++++++++---------------------- dlls/msvcrt/main.c | 16 ++-- dlls/msvcrt/math.c | 8 +- dlls/msvcrt/mbcs.c | 8 +- dlls/msvcrt/msvcrt.h | 12 +-- dlls/msvcrt/msvcrt.spec | 52 ++++++------- dlls/msvcrt/process.c | 104 +++++++++++++------------- dlls/msvcrt/scheduler.c | 46 ++++++------ dlls/msvcrt/string.c | 2 +- dlls/msvcrt/thread.c | 8 +- dlls/msvcrt/time.c | 24 +++--- dlls/msvcrt/wcs.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 42 +++++------ dlls/ucrtbase/ucrtbase.spec | 38 +++++----- 32 files changed, 562 insertions(+), 568 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d784dbb89993d0565ea1…

1 0

Piotr Caban : msvcrt: Use FILE from public header.
by Alexandre Julliard 01 Dec '20

01 Dec '20

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

Piotr Caban : Revert "msvcrt: Avoid conflict with mingw __iob_func declaration.".
by Alexandre Julliard 01 Dec '20

01 Dec '20

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 __utimbuf{32,64} from public header.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: 2d471db92f0df5d0682369651c0cbb94312cc988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d471db92f0df5d068236965… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:47 2020 +0100 msvcrt: Use __utimbuf{32,64} from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++-- dlls/msvcr70/msvcr70.spec | 9 ++++--- dlls/msvcr71/msvcr71.spec | 9 ++++--- dlls/msvcrt/file.c | 64 ++++++++--------------------------------------- dlls/msvcrt/msvcrt.h | 12 --------- dlls/msvcrt/msvcrt.spec | 9 ++++--- dlls/msvcrtd/msvcrtd.spec | 9 ++++--- 7 files changed, 38 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d471db92f0df5d06823…

1 0

Piotr Caban : msvcrt: Use ctype definition from public header.
by Alexandre Julliard 01 Dec '20

01 Dec '20

Module: wine Branch: master Commit: eabef91a9701ac72c91e64d946d31d829da92d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabef91a9701ac72c91e64d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 1 13:51:51 2020 +0100 msvcrt: Use ctype definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 104 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/msvcrt.h | 12 ------ dlls/msvcrt/wcs.c | 28 +++++++------- 4 files changed, 68 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eabef91a9701ac72c91e…

1 0

Piotr Caban : msvcrt: Use status word flags from public header.
by Alexandre Julliard 01 Dec '20

01 Dec '20

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