December 2019 - Wine-Commits

Jacek Caban : msvcrt: Provide exp2 in importlib.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: bdf905d661cd3cd61fb2dbaa5ddd9e641f421ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf905d661cd3cd61fb2dbaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 6 14:48:11 2019 +0100 msvcrt: Provide exp2 in importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mathf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/mathf.c b/dlls/msvcrt/mathf.c index 9f27e64122..4aff6d7008 100644 --- a/dlls/msvcrt/mathf.c +++ b/dlls/msvcrt/mathf.c @@ -37,3 +37,7 @@ float sqrtf(float x) { return sqrt(x); } float floorf(float x) { return floor(x); } float ceilf(float x) { return ceil(x); } #endif + +#if _MSVCR_VER < 120 +double exp2(double x) { return pow(2.0, x); } +#endif

1 0

Jacek Caban : makedep: Build implib cross object files with -fno-builtin.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 55f803c81bb61f7a927d4803687632d7be112e14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f803c81bb61f7a927d4803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 6 14:48:04 2019 +0100 makedep: Build implib cross object files with -fno-builtin. We want to be specific about used function and not want optimizations to interfere. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index d0e963f759..825c83aed4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3093,6 +3093,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines ); output_filenames( extra_cross_cflags ); + if (source->file->flags & FLAG_C_IMPLIB) output_filename( "-fno-builtin" ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" ); output( "\n" );

1 0

Alexandre Julliard : kernel32: Move the CompareString functions to kernelbase.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 098e71ad61e0112389bf5f214b531311005f5cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=098e71ad61e0112389bf5f21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 12:47:47 2019 +0100 kernel32: Move the CompareString functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/locale.c | 198 ------------------------- dlls/kernelbase/kernelbase.spec | 10 +- dlls/kernelbase/locale.c | 312 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 322 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=098e71ad61e0112389bf…

1 0

Alexandre Julliard : kernelbase: Directly use the wctype table for the IsChar* functions.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: c7c8016b70f2af228f3b858fe816cb14cf7f6754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c8016b70f2af228f3b858f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 10:08:23 2019 +0100 kernelbase: Directly use the wctype table for the IsChar* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/string.c | 91 ------------------------------ 2 files changed, 140 insertions(+), 91 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2dbcb0db17..950e9e230d 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2901,6 +2901,146 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultUILanguage(void) } +/****************************************************************************** + * IsCharAlphaA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_ALPHA); +} + + +/****************************************************************************** + * IsCharAlphaW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_ALPHA); +} + + +/****************************************************************************** + * IsCharAlphaNumericA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & (C1_ALPHA | C1_DIGIT)); +} + + +/****************************************************************************** + * IsCharAlphaNumericW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & (C1_ALPHA | C1_DIGIT)); +} + + +/****************************************************************************** + * IsCharBlankW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharBlankW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_BLANK); +} + + +/****************************************************************************** + * IsCharCntrlW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharCntrlW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_CNTRL); +} + + +/****************************************************************************** + * IsCharDigitW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharDigitW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_DIGIT); +} + + +/****************************************************************************** + * IsCharLowerA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_LOWER); +} + + +/****************************************************************************** + * IsCharLowerW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_LOWER); +} + + +/****************************************************************************** + * IsCharPunctW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharPunctW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_PUNCT); +} + + +/****************************************************************************** + * IsCharSpaceA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_SPACE); +} + + +/****************************************************************************** + * IsCharSpaceW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_SPACE); +} + + +/****************************************************************************** + * IsCharUpperA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_UPPER); +} + + +/****************************************************************************** + * IsCharUpperW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_UPPER); +} + + +/****************************************************************************** + * IsCharXDigitW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharXDigitW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_XDIGIT); +} + + /****************************************************************************** * IsDBCSLeadByte (kernelbase.@) */ diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 668fd4fa37..9a4d8c0827 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -33,13 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); ((ch) >= 'A' && (ch) <= 'F') || \ ((ch) >= 'a' && (ch) <= 'f')) -static WORD get_char_type(WCHAR ch) -{ - WORD type = 0; - GetStringTypeW(CT_CTYPE1, &ch, 1, &type); - return type; -} - static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) { char str1[3], str2[3]; @@ -219,90 +212,6 @@ DWORD WINAPI StrCmpNICW(const WCHAR *str, const WCHAR *cmp, DWORD len) return StrCmpNIW(str, cmp, len); } -BOOL WINAPI IsCharBlankW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_BLANK); -} - -BOOL WINAPI IsCharCntrlW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_CNTRL); -} - -BOOL WINAPI IsCharDigitW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_DIGIT); -} - -BOOL WINAPI IsCharPunctW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_PUNCT); -} - -BOOL WINAPI IsCharSpaceA(CHAR c) -{ - WORD type; - return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &type) && (type & C1_SPACE); -} - -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_SPACE); -} - -BOOL WINAPI IsCharXDigitW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_XDIGIT); -} - -BOOL WINAPI IsCharAlphaA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharAlphaW(wch); -} - -BOOL WINAPI IsCharAlphaW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_ALPHA); -} - -BOOL WINAPI IsCharLowerA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharLowerW(wch); -} - -BOOL WINAPI IsCharLowerW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_LOWER); -} - -BOOL WINAPI IsCharAlphaNumericA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharAlphaNumericW(wch); -} - -BOOL WINAPI IsCharAlphaNumericW(WCHAR ch) -{ - return !!(get_char_type(ch) & (C1_ALPHA | C1_DIGIT)); -} - -BOOL WINAPI IsCharUpperA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharUpperW(wch); -} - -BOOL WINAPI IsCharUpperW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_UPPER); -} - char * WINAPI StrChrA(const char *str, WORD ch) { TRACE("%s, %#x\n", wine_dbgstr_a(str), ch);

1 0

Francois Gouget : user32: Fix the spelling of a TRACE() message.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: ba1aa243783eb9b798d1cf9c47741c4f363bba0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1aa243783eb9b798d1cf9c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:42:47 2019 +0100 user32: Fix the spelling of a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index aad5274973..f759bd10f9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1397,7 +1397,7 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f if (flags & PLACE_MAX) make_point_onscreen( &wp.ptMaxPosition ); if (flags & PLACE_RECT) make_rect_onscreen( &wp.rcNormalPosition ); - TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x ajusted to min %d,%d max %d,%d normal %s\n", + TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x adjusted to min %d,%d max %d,%d normal %s\n", hwnd, wndpl->ptMinPosition.x, wndpl->ptMinPosition.y, wndpl->ptMaxPosition.x, wndpl->ptMaxPosition.y, wine_dbgstr_rect(&wndpl->rcNormalPosition), flags,

1 0

Francois Gouget : user32/tests: Avoid a couple of unneeded strlen() calls.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 6ccd78e35f1452276155f26e7f3756a8e08007d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccd78e35f1452276155f26e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:41:53 2019 +0100 user32/tests: Avoid a couple of unneeded strlen() calls. Note that DeviceString is an array field and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 567870e3d1..47e01b1a6a 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -71,7 +71,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de int device_id; int subsys_id; int revision_id; - size_t length; HDC hdc; adapter_count++; @@ -87,9 +86,8 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); /* DeviceString */ - length = strlen(device->DeviceString); - ok(broken(length == 0) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ - length > 0, "#%d: expect DeviceString not empty\n", index); + ok(broken(!*device->DeviceString) || /* XP on Testbot will return an empty string, whereas XP on real machine doesn't. Probably a bug in virtual adapter driver */ + *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ if (index == 0) @@ -139,7 +137,7 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(!strcmp(monitor_name, device->DeviceName), "#%d: expect %s, got %s\n", monitor_index, monitor_name, device->DeviceName); /* DeviceString */ - ok(strlen(device->DeviceString) > 0, "#%d: expect DeviceString not empty\n", monitor_index); + ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ if (adapter_index == 0 && monitor_index == 0)

1 0

Alistair Leslie-Hughes : msado15: Support all interfaces in _Recordset QueryInterface.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: c123637b2d999e8429c9e1d727f75a7d6799a061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c123637b2d999e8429c9e1d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 8 23:25:51 2019 +0000 msado15: Support all interfaces in _Recordset QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index bf0ca6e90f..52282c7e82 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -67,8 +67,13 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualGUID( riid, &IID__Recordset ) || IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown )) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Recordset15) || + IsEqualIID(riid, &IID_Recordset20) || + IsEqualIID(riid, &IID_Recordset21) || + IsEqualIID(riid, &IID__Recordset)) { *obj = iface; }

1 0

Francois Gouget : kernel32/tests: Trace LastError when GetPhysicallyInstalledSystemMemory() fails.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 7eb54616ff7e0fe22dd45c18c29be2e0c279fe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eb54616ff7e0fe22dd45c18… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:46:36 2019 +0100 kernel32/tests: Trace LastError when GetPhysicallyInstalledSystemMemory() fails. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 38fae0eede..3c697f3195 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1206,7 +1206,7 @@ static void test_GetPhysicallyInstalledSystemMemory(void) total_memory = 0; ret = pGetPhysicallyInstalledSystemMemory(&total_memory); - ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed\n"); + ok(ret, "GetPhysicallyInstalledSystemMemory unexpectedly failed (%u)\n", GetLastError()); ok(total_memory != 0, "expected total_memory != 0\n"); memstatus.dwLength = sizeof(memstatus);

1 0

Alexandre Julliard : kernel32: Move GetStringType functions to kernelbase.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: 1b46da5c05ba0c1ab27506af27e31f0d0e7d3795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b46da5c05ba0c1ab27506af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 20:29:27 2019 +0100 kernel32: Move GetStringType functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/locale.c | 141 ++------------------------------- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 117 +++++++++++++++++++++++++++ dlls/{kernel32 => kernelbase}/wctype.c | 0 tools/make_unicode | 2 +- 8 files changed, 132 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b46da5c05ba0c1ab275…

1 0

Francois Gouget : user32/tests: Fix the spelling of an ok() message.
by Alexandre Julliard Dec. 9, 2019

Dec. 9, 2019

Module: wine Branch: master Commit: cca965d94e1029e914224821441b1c20d5b0feec URL: https://source.winehq.org/git/wine.git/?a=commit;h=cca965d94e1029e914224821… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:47:28 2019 +0100 user32/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 6bebfe95f4..aaa51d560a 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -591,7 +591,7 @@ static void test_inputdesktop(void) /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); - ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); + ok(old_thread_desk != NULL, "GetThreadDesktop failed!\n"); memset(name, 0, sizeof(name)); ret = GetUserObjectInformationA(old_thread_desk, UOI_NAME, name, 1024, NULL); ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name);

1 0