wine-devel January 2019

wine-devel@winehq.org

68 participants
552 discussions

Start a nNew thread

[PATCH v2] ping: Add Ctrl+C event handling
by Isira Seneviratne 23 Jan '19

23 Jan '19

1 0

[PATCH 1/2] shell32/autocomplete: Don't autoappend on Paste if ACO_AUTOAPPEND is off
by Gabriel Ivăncescu 23 Jan '19

23 Jan '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes a minor issue. dlls/shell32/autocomplete.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6c013a8..679ec29 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -761,7 +761,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ret; case WM_PASTE: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, autoappend_flag_yes); + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_MOUSEWHEEL: if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) -- 2.19.1

1 1

[PATCH v2 1/2] libs/port/mbtowc: Handle partially overlapped buffers
by Gabriel Ivăncescu 23 Jan '19

23 Jan '19

Cause of bug discovered by Jason Edmeades. Some applications partially overlap the two buffers, so don't assume they don't overlap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38558 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The code uses the same method as wcstombs now. libs/port/mbtowc.c | 65 +++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82..0994ade 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -65,34 +65,51 @@ static inline int mbstowcs_sbcs( const struct sbcs_table *table, int flags, ret = -1; } - for (;;) + while (srclen >= 16) { - switch(srclen) - { - default: - case 16: dst[15] = cp2uni[src[15]]; - case 15: dst[14] = cp2uni[src[14]]; - case 14: dst[13] = cp2uni[src[13]]; - case 13: dst[12] = cp2uni[src[12]]; - case 12: dst[11] = cp2uni[src[11]]; - case 11: dst[10] = cp2uni[src[10]]; - case 10: dst[9] = cp2uni[src[9]]; - case 9: dst[8] = cp2uni[src[8]]; - case 8: dst[7] = cp2uni[src[7]]; - case 7: dst[6] = cp2uni[src[6]]; - case 6: dst[5] = cp2uni[src[5]]; - case 5: dst[4] = cp2uni[src[4]]; - case 4: dst[3] = cp2uni[src[3]]; - case 3: dst[2] = cp2uni[src[2]]; - case 2: dst[1] = cp2uni[src[1]]; - case 1: dst[0] = cp2uni[src[0]]; - case 0: break; - } - if (srclen < 16) return ret; - dst += 16; + dst[0] = cp2uni[src[0]]; + dst[1] = cp2uni[src[1]]; + dst[2] = cp2uni[src[2]]; + dst[3] = cp2uni[src[3]]; + dst[4] = cp2uni[src[4]]; + dst[5] = cp2uni[src[5]]; + dst[6] = cp2uni[src[6]]; + dst[7] = cp2uni[src[7]]; + dst[8] = cp2uni[src[8]]; + dst[9] = cp2uni[src[9]]; + dst[10] = cp2uni[src[10]]; + dst[11] = cp2uni[src[11]]; + dst[12] = cp2uni[src[12]]; + dst[13] = cp2uni[src[13]]; + dst[14] = cp2uni[src[14]]; + dst[15] = cp2uni[src[15]]; src += 16; + dst += 16; srclen -= 16; } + + /* now handle the remaining characters */ + src += srclen; + dst += srclen; + switch (srclen) + { + case 15: dst[-15] = cp2uni[src[-15]]; + case 14: dst[-14] = cp2uni[src[-14]]; + case 13: dst[-13] = cp2uni[src[-13]]; + case 12: dst[-12] = cp2uni[src[-12]]; + case 11: dst[-11] = cp2uni[src[-11]]; + case 10: dst[-10] = cp2uni[src[-10]]; + case 9: dst[-9] = cp2uni[src[-9]]; + case 8: dst[-8] = cp2uni[src[-8]]; + case 7: dst[-7] = cp2uni[src[-7]]; + case 6: dst[-6] = cp2uni[src[-6]]; + case 5: dst[-5] = cp2uni[src[-5]]; + case 4: dst[-4] = cp2uni[src[-4]]; + case 3: dst[-3] = cp2uni[src[-3]]; + case 2: dst[-2] = cp2uni[src[-2]]; + case 1: dst[-1] = cp2uni[src[-1]]; + } + return ret; } /* mbstowcs for single-byte code page with char decomposition */ -- 2.19.1

1 1

[PATCH 2/2] widl: Use public HANDLE_PARAM_IS_* flags.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] widl: Fix HANDLE_PARAM_IS_RETURN flag handling.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH] rpcrt4: Fix comment about HANDLE_PARAM_IS_RETURN.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_stubless.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] mshtml.idl: Add IDOMCustomEvent declaration.
by Jacek Caban 23 Jan '19

23 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+)

1 0

[PATCH 2/2] msvcrt: Optimize toupper function when locale was never changed
by Piotr Caban 23 Jan '19

23 Jan '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 1/2] msvcrt: Optimize tolower function when locale was never changed
by Piotr Caban 23 Jan '19

23 Jan '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 4 +++- dlls/msvcrt/locale.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/string.c | 14 ++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-)

1 0

[PATCH] msvcp140: Export _Equivalent and port tests.
by Gijs Vermeulen 23 Jan '19

23 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46465 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 69 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 245389e61e..6a4eb14c04 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3638,7 +3638,7 @@ @ cdecl _Current_set(wstr) tr2_sys__Current_set_wchar @ extern _Denorm _Denorm @ cdecl _Dtest(ptr) _Dtest -@ stub _Equivalent +@ cdecl _Equivalent(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl _Exp(ptr double long) _Exp @ stub _FCosh @ extern _FDenorm _FDenorm diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index ac7154bec2..229741a52d 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -176,6 +176,7 @@ static void (__cdecl *p__Release_chore)(_Threadpool_chore*); static void (__cdecl *p_Close_dir)(void*); static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); +static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); static __int64 (__cdecl *p_Last_write_time)(WCHAR const*); static void (__cdecl *p_Set_last_write_time)(WCHAR const*, __int64); @@ -267,6 +268,7 @@ static BOOL init(void) SET(p_Close_dir, "_Close_dir"); SET(p_Current_get, "_Current_get"); SET(p_Current_set, "_Current_set"); + SET(p_Equivalent, "_Equivalent"); SET(p_File_size, "_File_size"); SET(p_Last_write_time, "_Last_write_time"); SET(p_Set_last_write_time, "_Set_last_write_time"); @@ -1360,6 +1362,72 @@ static void test__Winerror_map(void) } } +static void test_Equivalent(void) +{ + int val, i; + HANDLE file; + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH]; + static const WCHAR wine_test_dirW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + static const WCHAR f1W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + static const WCHAR f1W_backslash[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1',0}; + static const WCHAR f1W_subdir[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','.','/','f','1',0}; + static const WCHAR f1W_long[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','.','.','/','w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','1',0}; + static const WCHAR f2W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','f','2',0}; + static const WCHAR not_existW[] = + {'n','o','t','_','e','x','i','s','t','s','_','f','i','l','e',0}; + static const struct { + const WCHAR *path1; + const WCHAR *path2; + int equivalent; + } tests[] = { + { NULL, NULL, -1 }, + { NULL, f1W, 0 }, + { f1W, NULL, 0 }, + { f1W, wine_test_dirW, 0 }, + { wine_test_dirW, f1W, 0 }, + { wine_test_dirW, wine_test_dirW, -1 }, + { f1W_subdir, f2W, 0 }, + { f1W, f1W, 1 }, + { not_existW, f1W, 0 }, + { f1W_backslash, f1W_subdir, 1 }, + { not_existW, not_existW, -1 }, + { f1W, not_existW, 0 }, + { f1W_long, f1W, 1 } + }; + + memset(current_path, 0, MAX_PATH); + GetCurrentDirectoryW(MAX_PATH, current_path); + memset(temp_path, 0, MAX_PATH); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + CreateDirectoryW(wine_test_dirW, NULL); + + file = CreateFileW(f1W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + file = CreateFileW(f2W, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + for(i=0; i<ARRAY_SIZE(tests); i++) { + errno = 0xdeadbeef; + val = p_Equivalent(tests[i].path1, tests[i].path2); + ok(tests[i].equivalent == val, "_Equivalent(): test %d expect: %d, got %d\n", i+1, tests[i].equivalent, val); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + } + + ok(DeleteFileW(f1W), "expect wine_test_dir/f1 to exist\n"); + ok(DeleteFileW(f2W), "expect wine_test_dir/f2 to exist\n"); + ok(p_Remove_dir(wine_test_dirW), "expect wine_test_dir to exist\n"); + ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1383,5 +1451,6 @@ START_TEST(msvcp140) test_Last_write_time(); test__Winerror_message(); test__Winerror_map(); + test_Equivalent(); FreeLibrary(msvcp); } -- 2.20.1

2 2

← Newer
1
...
26
27
28
29
30
31
32
...
56
Older →

Jump to page:

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 January 2019