wine-devel November 2017

wine-devel@winehq.org

68 participants
380 discussions

[PATCH] V2 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..a5967b7b6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0x60000) + { + case 0x60000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x40000: flags |= MSVCRT__RC_DOWN; break; + case 0x20000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x80000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x60000; break; + case MSVCRT__RC_DOWN: fpword |= 0x40000; break; + case MSVCRT__RC_UP: fpword |= 0x20000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x80000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

--- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..a5967b7b6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0x60000) + { + case 0x60000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x40000: flags |= MSVCRT__RC_DOWN; break; + case 0x20000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x80000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x60000; break; + case MSVCRT__RC_DOWN: fpword |= 0x40000; break; + case MSVCRT__RC_UP: fpword |= 0x20000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x80000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] kernel32: Handle zh-Hant and zh-Hans in LocaleNameToLCID.
by Zhiyi Zhang 11 Nov '17

11 Nov '17

I extended get_default_sublang() to work with LCIDs that have a script but no country. I also made a change in parse_locale_name(), because <LANG>-<SCRIPTS> is also a valid locale name form. Thanks to Alexandre for the suggestion. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- dlls/kernel32/locale.c | 34 ++++++++++++++++++++++++---------- dlls/kernel32/tests/locale.c | 24 +++++++++++------------- 2 files changed, 35 insertions(+), 23 deletions(-)

1 0

[PATCH] comdlg32/fontdlg: Allow setting value by typing it into the edit fields
by Fabian Maurer 11 Nov '17

11 Nov '17

The font-dialog allows the user to select a value from the combobox by typing it into its edit field. This operation seems unique to the fontdialog. It works case-insensitive and doesn't change the selection in the edit field. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comdlg32/fontdlg.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index c08b246e12..82992cb5a4 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -940,14 +940,37 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO int i; long l; HDC hdc; + BOOL cmb_selected_by_edit = FALSE; if (!lpcf) return FALSE; + if(HIWORD(wParam) == CBN_EDITCHANGE) + { + int idx; + WCHAR str_edit[256], str_cmb[256]; + int cmb = LOWORD(wParam); + + GetDlgItemTextW(hDlg, cmb, str_edit, sizeof(str_edit) / sizeof(str_edit[0])); + idx = SendDlgItemMessageW(hDlg, cmb, CB_FINDSTRING, -1, (LPARAM)str_edit); + if(idx != -1) + { + SendDlgItemMessageW(hDlg, cmb, CB_GETLBTEXT, idx, (LPARAM)str_cmb); + + /* Select listbox entry only if we have an exact match */ + if(lstrcmpiW(str_edit, str_cmb) == 0) + { + SendDlgItemMessageW(hDlg, cmb, CB_SETCURSEL, idx, 0); + SendDlgItemMessageW(hDlg, cmb, CB_SETEDITSEL, 0, -1); /* Remove edit field selection */ + cmb_selected_by_edit = TRUE; + } + } + } + TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam); switch (LOWORD(wParam)) { case cmb1: - if (HIWORD(wParam)==CBN_SELCHANGE) + if (HIWORD(wParam) == CBN_SELCHANGE || cmb_selected_by_edit) { INT pointsize; /* save current pointsize */ LONG pstyle; /* save current style */ @@ -998,7 +1021,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO case cmb2: case cmb3: case cmb5: - if (HIWORD(wParam)==CBN_SELCHANGE || HIWORD(wParam)== BN_CLICKED ) + if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == BN_CLICKED || cmb_selected_by_edit) { WCHAR str[256]; WINDOWINFO wininfo; -- 2.15.0

1 0

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM (try 3)
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/tests/writer.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..36cd967 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2203,28 +2203,35 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) +static BOOL get_fpword( unsigned long *ret ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); + *ret = LOWORD(fpword); + return TRUE; +#elif defined(__arm__) + unsigned long fpword; + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); *ret = fpword; return TRUE; #endif return FALSE; } -static void set_fpword( unsigned short fpword ) +static void set_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #endif } static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned long fpword; static const struct { double val; @@ -2318,10 +2325,17 @@ static void test_double(void) WsFreeWriter( writer ); return; } - ok( fpword == 0x27f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x27f, "got %04lx\n", fpword ); set_fpword( 0x1f7f ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); +#elif defined(__arm__) + ok( fpword == 0, "got %08lx\n", fpword ); + set_fpword( 0x00c00000 ); + get_fpword( &fpword ); + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); +#endif hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2337,8 +2351,13 @@ static void test_double(void) check_output( writer, "<t>100000000000000</t>", __LINE__ ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); set_fpword( 0x27f ); +#elif defined(__arm__) + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); + set_fpword( 0 ); +#endif WsFreeWriter( writer ); } -- 2.7.4

1 0

[PATCH 2/2] webservices/tests: Implement floating point handling for ARM (try 2)
by André Hentschel 11 Nov '17

11 Nov '17

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/webservices/tests/writer.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d1..9254be9 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2203,28 +2203,35 @@ static void test_text_types(void) WsFreeWriter( writer ); } -static BOOL get_fpword( unsigned short *ret ) +static BOOL get_fpword( unsigned long *ret ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - unsigned short fpword; + unsigned long fpword; __asm__ __volatile__( "fstcw %0" : "=m" (fpword) ); + *ret = fpword & 0xffff; + return TRUE; +#elif defined(__arm__) + unsigned long fpword; + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); *ret = fpword; return TRUE; #endif return FALSE; } -static void set_fpword( unsigned short fpword ) +static void set_fpword( unsigned long fpword ) { #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(__arm__) + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); #endif } static void test_double(void) { WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; - unsigned short fpword; + unsigned long fpword; static const struct { double val; @@ -2318,10 +2325,17 @@ static void test_double(void) WsFreeWriter( writer ); return; } - ok( fpword == 0x27f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x27f, "got %04lx\n", fpword ); set_fpword( 0x1f7f ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); +#elif defined(__arm__) + ok( fpword == 0, "got %08lx\n", fpword ); + set_fpword( 0x00c00000 ); + get_fpword( &fpword ); + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); +#endif hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2337,8 +2351,13 @@ static void test_double(void) check_output( writer, "<t>100000000000000</t>", __LINE__ ); get_fpword( &fpword ); - ok( fpword == 0x1f7f, "got %04x\n", fpword ); +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + ok( fpword == 0x1f7f, "got %04lx\n", fpword ); set_fpword( 0x27f ); +#elif defined(__arm__) + ok( fpword == 0x00c00000, "got %08lx\n", fpword ); + set_fpword( 0 ); +#endif WsFreeWriter( writer ); } -- 2.7.4

1 0

[PATCH 2/3] mlang: Fix font name of code page families.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 24 ++++++++--------- dlls/mlang/tests/mlang.c | 69 ++++++++++++------------------------------------ 2 files changed, 29 insertions(+), 64 deletions(-)

1 1

[PATCH 1/3] mlang/tests: Add more code pages test data.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 2086 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2086 insertions(+)

1 0

[1/3] mlang/tests: Add more code pages test data.
by Ziqing Hui 11 Nov '17

11 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/tests/mlang.c | 2086 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2086 insertions(+)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2017