July 2020 - Wine-Commits - list.winehq.org

Jacek Caban : server: Allow creating screen buffer using NtCreateFile.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 2e5b8ffcc9ab8ac750e6fb2ac32eadeb6698540d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e5b8ffcc9ab8ac750e6fb2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:56:57 2020 +0200 server: Allow creating screen buffer using NtCreateFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/server/console.c b/server/console.c index df84334448..9f102968a1 100644 --- a/server/console.c +++ b/server/console.c @@ -525,7 +525,7 @@ static void generate_sb_initial_events( struct console_input *console_input ) console_input_events_append( console_input, &evt ); } -static struct screen_buffer *create_console_output( struct console_input *console_input, int fd ) +static struct object *create_console_output( struct console_input *console_input, int fd ) { struct screen_buffer *screen_buffer; int i; @@ -592,7 +592,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol console_input->active = (struct screen_buffer*)grab_object( screen_buffer ); generate_sb_initial_events( console_input ); } - return screen_buffer; + return &screen_buffer->obj; } /* free the console for this process */ @@ -1809,10 +1809,11 @@ static void console_device_dump( struct object *obj, int verbose ) static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { - static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; - static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; - static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; - static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; + static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; + static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; + static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; + static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; if (name->len == sizeof(current_inW) && !memcmp( name->str, current_inW, name->len )) { @@ -1848,6 +1849,17 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return create_console_input_events(); } + if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) + { + if (!current->process->console) + { + set_error( STATUS_INVALID_HANDLE ); + return NULL; + } + name->len = 0; + return create_console_output( current->process->console, -1 ); + } + return NULL; } @@ -2056,9 +2068,9 @@ DECL_HANDLER(get_console_input_history) /* creates a screen buffer */ DECL_HANDLER(create_console_output) { - struct console_input* console; - struct screen_buffer* screen_buffer; - int fd; + struct console_input *console; + struct object *screen_buffer; + int fd; if (req->fd != -1) {

1 0

Jacek Caban : kernelbase: Use NtCreateFile in CreateConsoleScreenBuffer.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: e613d81d815d96a04eca42eea5faec71bdd459d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e613d81d815d96a04eca42ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:57:06 2020 +0200 kernelbase: Use NtCreateFile in CreateConsoleScreenBuffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ dlls/kernelbase/console.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 49869948e9..dd8cc2c188 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3290,6 +3290,12 @@ static void test_FreeConsole(void) (GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_FILE_NOT_FOUND /* winxp */)), "CreateFileA failed: %u\n", GetLastError()); + handle = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE, + "CreateConsoleScreenBuffer returned: %p (%u)\n", handle, GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d1fc8a4de1..262db40003 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -326,7 +326,11 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s SECURITY_ATTRIBUTES *sa, DWORD flags, void *data ) { - HANDLE ret = INVALID_HANDLE_VALUE; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + IO_STATUS_BLOCK iosb; + UNICODE_STRING name; + HANDLE handle; + NTSTATUS status; TRACE( "(%x,%x,%p,%x,%p)\n", access, share, sa, flags, data ); @@ -336,18 +340,13 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s return INVALID_HANDLE_VALUE; } - SERVER_START_REQ( create_console_output ) - { - req->handle_in = 0; - req->access = access; - req->attributes = (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0; - req->share = share; - req->fd = -1; - if (!wine_server_call_err( req )) - ret = console_handle_map( wine_server_ptr_handle( reply->handle_out )); - } - SERVER_END_REQ; - return ret; + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\ScreenBuffer" ); + attr.ObjectName = &name; + attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; + status = NtCreateFile( &handle, access, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0 ); + return set_ntstatus( status ) ? handle : INVALID_HANDLE_VALUE; }

1 0

Zebediah Figura : quartz/tests: Add tests for IMediaSeeking::GetCurrentPosition() and EC_COMPLETE interaction.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: a6d539381e23fa117367033618b4ab340c7c7620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d539381e23fa1173670336… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:09 2020 -0500 quartz/tests: Add tests for IMediaSeeking::GetCurrentPosition() and EC_COMPLETE interaction. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index bd6562b0ed..1eecd0483b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3939,6 +3939,7 @@ static void test_graph_seeking(void) LONGLONG time, current, stop, earliest, latest; IFilterGraph2 *graph = create_graph(); + IMediaEventSink *eventsink; IMediaControl *control; IMediaSeeking *seeking; IMediaFilter *filter; @@ -3976,6 +3977,7 @@ static void test_graph_seeking(void) IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking); IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); + IFilterGraph2_QueryInterface(graph, &IID_IMediaEventSink, (void **)&eventsink); hr = IMediaSeeking_GetCapabilities(seeking, &caps); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4482,9 +4484,66 @@ static void test_graph_seeking(void) hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* GetCurrentPositions() will return the stop position once all renderers + * report EC_COMPLETE. Atelier Sophie depends on this behaviour. */ + + hr = IFilterGraph2_SetDefaultSyncSource(graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filter1.seek_stop = 5000 * 10000; + filter2.seek_stop = 6000 * 10000; + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time < 5000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter1.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time < 5000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter2.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filter1.seek_hr = filter2.seek_hr = E_NOTIMPL; + filter1.seek_stop = filter2.seek_stop = 0xdeadbeef; + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time < 5000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter1.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(eventsink, EC_COMPLETE, S_OK, (LONG_PTR)&filter2.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(time == 6000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(time)); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaFilter_Release(filter); IMediaControl_Release(control); IMediaSeeking_Release(seeking); + IMediaEventSink_Release(eventsink); ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref);

1 0

Serge Gautherie : winapi_test: Remove useless winbase.h for wininet test.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 0c3fd2238e306b50c3672124a563e9aee83170bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c3fd2238e306b50c3672124… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:57 2020 +0200 winapi_test: Remove useless winbase.h for wininet test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 2e344cd1eb..c53ea5da23 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1595,7 +1595,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h -winbase.h + wininet.h %include

1 0

Serge Gautherie : winapi_test: Remove useless common headers for shlwapi test.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: d67b1fe51c6cb397709c1f147b5c3c121eedc589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67b1fe51c6cb397709c1f14… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:34:35 2020 +0200 winapi_test: Remove useless common headers for shlwapi test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 7741fe30f3..2e344cd1eb 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1229,10 +1229,8 @@ Unit tests for data structure packing %header -basetsd.h winnt.h -windef.h -wtypes.h + shlwapi.h %include

1 0

Serge Gautherie : winapi_test: Add a blank line between common and specific headers.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: db11d6dcca89a6d10ad66976af8e84a633aff88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db11d6dcca89a6d10ad66976… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Jul 18 04:35:19 2020 +0200 winapi_test: Add a blank line between common and specific headers. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/tests.dat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index c53ea5da23..e6a09923af 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -11,6 +11,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + wingdi.h %include @@ -472,6 +473,7 @@ basetsd.h winnt.h windef.h winbase.h + timezoneapi.h %include @@ -1053,6 +1055,7 @@ winnt.h windef.h wtypes.h guiddef.h + shellapi.h shtypes.h shlobj.h @@ -1265,6 +1268,7 @@ Unit tests for data structure packing winnt.h windef.h guiddef.h + urlmon.h %include @@ -1322,6 +1326,7 @@ basetsd.h winnt.h windef.h winbase.h + wingdi.h winuser.h @@ -1737,6 +1742,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + mmsystem.h digitalv.h

1 0

Piotr Caban : comctl32: Fix non printable characters handling in SB_SETTEXT.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 1bd27e50d25fd057a57fec89f06d6e20176c5ef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd27e50d25fd057a57fec89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:00 2020 +0200 comctl32: Fix non printable characters handling in SB_SETTEXT. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 2 +- dlls/comctl32/tests/status.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cad56c7e2a..f76f6262cc 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -744,7 +744,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, if (ntext) { idx = ntext; while (*idx) { - if(!iswprint(*idx)) + if(*idx < ' ' && *idx != '\t') *idx = ' '; idx++; } diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index c7d9989218..f7eec88c61 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -261,6 +261,7 @@ static void test_status_control(void) char ch; char chstr[10] = "Inval id"; COLORREF crColor = RGB(0,0,0); + WCHAR wbuf[20]; hWndStatus = create_status_control(WS_VISIBLE | SBT_TOOLTIPS, 0); @@ -316,28 +317,33 @@ static void test_status_control(void) expect(2,borders[2]); /* Test resetting text with different characters */ + r = SendMessageA(hWndStatus, SB_SETPARTS, 4, (LPARAM)nParts); + expect(TRUE,r); r = SendMessageA(hWndStatus, SB_SETTEXTA, 0, (LPARAM)"First(a)Again"); expect(TRUE,r); r = SendMessageA(hWndStatus, SB_SETTEXTA, 1, (LPARAM)"Invalid\tChars\\7\7"); - expect(TRUE,r); + expect(TRUE,r); r = SendMessageA(hWndStatus, SB_SETTEXTA, 2, (LPARAM)"InvalidChars\\n\n"); - expect(TRUE,r); + expect(TRUE,r); + r = SendMessageW(hWndStatus, SB_SETTEXTW, 3, (LPARAM)L"Non printable\x80"); + expect(TRUE,r); /* Get text again */ r = SendMessageA(hWndStatus, SB_GETTEXTA, 0, (LPARAM) charArray); ok(strcmp(charArray,"First(a)Again") == 0, "Expected First(a)Again, got %s\n", charArray); - expect(11,LOWORD(r)); - expect(0,HIWORD(r)); + ok(r == 11, "r = %d\n", r); + r = SendMessageA(hWndStatus, SB_GETTEXTA, 1, (LPARAM) charArray); ok(strcmp(charArray,"Invalid\tChars\\7 ") == 0, "Expected Invalid\tChars\\7 , got %s\n", charArray); + ok(r == 16, "r = %d\n", r); - expect(16,LOWORD(r)); - expect(0,HIWORD(r)); r = SendMessageA(hWndStatus, SB_GETTEXTA, 2, (LPARAM) charArray); ok(strcmp(charArray,"InvalidChars\\n ") == 0, "Expected InvalidChars\\n , got %s\n", charArray); + ok(r == 15, "r = %d\n", r); - expect(15,LOWORD(r)); - expect(0,HIWORD(r)); + r = SendMessageW(hWndStatus, SB_GETTEXTW, 3, (LPARAM) wbuf); + ok(wcscmp(wbuf, L"Non printable\x80") == 0, "got %s\n", wine_dbgstr_w(wbuf)); + ok(r == 14, "r = %d\n", r); /* test more nonprintable chars */ for(ch = 0x00; ch < 0x7F; ch++) {

1 0

Piotr Caban : msvcrt: Copy wcscpy implementation from ntdll.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: cf580265e36c33f29c389c85c076a6539bad62de URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf580265e36c33f29c389c85… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:33 2020 +0200 msvcrt: Copy wcscpy implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 ++++++++++ dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 12 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 3acd20e1f6..45491455d0 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -508,7 +508,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) MSVCRT_wcslen diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0a0d06b4da..e37c0dbe5e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1859,7 +1859,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 171cd49652..8f1d9f9397 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2217,7 +2217,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 01608639b5..731e001ac2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2452,7 +2452,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 627bcbb72e..2aa111cab5 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -854,7 +854,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) MSVCRT_wcslen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index bae1f7fcdb..da6827789e 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -850,7 +850,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) MSVCRT_wcslen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fff542a337..1847a93c71 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1539,7 +1539,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8854495454..8a53cf47a5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1512,7 +1512,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c88e146461..ac1269c53f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1486,7 +1486,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index affded2438..b553f27d27 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2162,6 +2162,16 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con return 0; } +/*********************************************************************** + * wcscpy (MSVCRT.@) + */ +MSVCRT_wchar_t* __cdecl MSVCRT_wcscpy( MSVCRT_wchar_t *dst, const MSVCRT_wchar_t *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return dst; +} + /****************************************************************** * wcsncpy (MSVCRT.@) */ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 7b082494d7..0f6af7cce7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -806,7 +806,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl wcslen(wstr) MSVCRT_wcslen diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7aebd81e02..2367e5a08d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1816,7 +1816,7 @@ @ cdecl _o_wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl _o_wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl _o_wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl _o_wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl _o_wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl _o_wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl _o_wcsftime(ptr long wstr ptr) MSVCRT_wcsftime @ cdecl _o_wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s @@ -2559,7 +2559,7 @@ @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -@ cdecl wcscpy(ptr wstr) ntdll.wcscpy +@ cdecl wcscpy(ptr wstr) MSVCRT_wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime

1 0

Piotr Caban : msvcrt: Copy wcslen implementation from ntdll.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: a88d75f4f610080e0f59e71d4c49684917984ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=a88d75f4f610080e0f59e71d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:27 2020 +0200 msvcrt: Copy wcslen implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4be3de5b2d..affded2438 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2658,9 +2658,11 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcsrchr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t c /*********************************************************************** * wcslen (MSVCRT.@) */ -int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) +MSVCRT_size_t CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) { - return strlenW(str); + const MSVCRT_wchar_t *s = str; + while (*s) s++; + return s - str; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use get_char_typeW in _iswctype_l.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 068a419e4219c5bb5d8156ff9177676d9c174021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=068a419e4219c5bb5d8156ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:20 2020 +0200 msvcrt: Don't use get_char_typeW in _iswctype_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 14 ++++++++++++-- dlls/ucrtbase/tests/misc.c | 10 ++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9395b7ecac..7e854704b1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -314,6 +314,7 @@ extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; extern BOOL initial_locale DECLSPEC_HIDDEN; +extern WORD *MSVCRT__pwctype; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5188d4f860..4be3de5b2d 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1919,7 +1919,17 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate */ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) { - return (get_char_typeW(wc) & 0xffff) & type; + WORD ct; + + if (wc == MSVCRT_WEOF) return 0; + if (wc < 256) return MSVCRT__pwctype[wc] & type; + + if (!GetStringTypeW(CT_CTYPE1, &wc, 1, &ct)) + { + ERR("GetStringTypeW failed for %x\n", wc); + return 0; + } + return ct & type; } /********************************************************************* @@ -1927,7 +1937,7 @@ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__l */ INT CDECL MSVCRT_iswctype( MSVCRT_wchar_t wc, MSVCRT_wctype_t type ) { - return (get_char_typeW(wc) & 0xfff) & type; + return MSVCRT__iswctype_l( wc, type, NULL ); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index e4928b194f..a5f78925fd 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -557,17 +557,15 @@ static void test_isblank(void) for(c = 0; c <= 0xffff; c++) { if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { if(c == '\t') - todo_wine ok(!_iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); + ok(!_iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(_iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); ok(iswblank(c), "%d should be blank\n", c); ok(_iswblank_l(c, NULL), "%d should be blank\n", c); } else { - todo_wine_if(c == 0xa0) { - ok(!_iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); - ok(!iswblank(c), "%d shouldn't be blank\n", c); - ok(!_iswblank_l(c, NULL), "%d shouldn't be blank\n", c); - } + ok(!_iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!iswblank(c), "%d shouldn't be blank\n", c); + ok(!_iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } }

1 0