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

Zebediah Figura : quartz/vmr9: Signal state change completion only after PresentImage() has been called.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: d3ef27f7561a8fa47c675c8d537ce153ba3bebd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ef27f7561a8fa47c675c8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:08 2020 -0500 quartz/vmr9: Signal state change completion only after PresentImage() has been called. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 5 +++++ dlls/quartz/tests/vmr9.c | 5 +++++ dlls/quartz/videorenderer.c | 1 + dlls/quartz/vmr9.c | 1 + dlls/strmbase/renderer.c | 2 -- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index e703ea2430..c64d5e2987 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -38,6 +38,11 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) { + struct null_renderer *filter = impl_from_strmbase_renderer(iface); + + if (filter->renderer.filter.state == State_Paused) + SetEvent(filter->renderer.state_event); + return S_OK; } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e630deb8d7..a2fd5b7686 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2943,6 +2943,11 @@ static void test_renderless_present(IFilterGraph2 *graph, IMemInputPin *input) thread = send_frame(input); hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Atelier Sophie uses the VMR in renderless mode, calls + * IMediaControl::Run() from a stopped state and expects that + * IMediaControl::GetState() returns S_OK only after PresentImage() has + * been called. */ + ok(allocator_got_PresentImage == 1, "Got %u calls to PresentImage().\n", allocator_got_PresentImage); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index eb6accf2d3..2ad479a630 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -111,6 +111,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->current_sample = pSample; + SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.csRenderLock); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a3f5501106..00cd6bbce8 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -315,6 +315,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi if (filter->renderer.filter.state == State_Paused) { + SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.csRenderLock); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b6d552b3b0..dde56b7a34 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -193,8 +193,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } EnterCriticalSection(&filter->csRenderLock); - if (filter->filter.state == State_Paused) - SetEvent(filter->state_event); if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) {

1 0

Zebediah Figura : quartz/tests: Add tests for IMediaSeeking::GetCurrentPosition() and EC_COMPLETE interaction.
by Alexandre Julliard 21 Jul '20

21 Jul '20

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

Zebediah Figura : quartz: Return the stop position from GetCurrentPosition() after all filters return EC_COMPLETE.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 8c9d60c308c20e92bbbb204008082dad7ad160c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9d60c308c20e92bbbb2040… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 17:49:10 2020 -0500 quartz: Return the stop position from GetCurrentPosition() after all filters return EC_COMPLETE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 15 +++++++++++++-- dlls/quartz/tests/filtergraph.c | 5 ++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 22d7f7b445..7d6463c1f3 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -219,10 +219,11 @@ struct filter_graph /* Respectively: the last timestamp at which we started streaming, and the * current offset within the stream. */ REFERENCE_TIME stream_start, stream_elapsed; - + REFERENCE_TIME stream_stop; LONGLONG current_pos; unsigned int needs_async_run : 1; + unsigned int got_ec_complete : 1; }; struct enum_filters @@ -1739,6 +1740,7 @@ static void update_render_count(struct filter_graph *graph) /* Perform the paused -> running transition. The caller must hold graph->cs. */ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_start) { + REFERENCE_TIME stream_stop; struct filter *filter; HRESULT hr = S_OK; @@ -1757,6 +1759,9 @@ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_sta stream_start += 200 * 10000; } + if (SUCCEEDED(IMediaSeeking_GetStopPosition(&graph->IMediaSeeking_iface, &stream_stop))) + graph->stream_stop = stream_stop; + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { HRESULT filter_hr = IBaseFilter_Run(filter->filter, stream_start); @@ -2322,7 +2327,11 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG EnterCriticalSection(&graph->cs); - if (graph->state == State_Running && graph->refClock) + if (graph->got_ec_complete) + { + ret = graph->stream_stop; + } + else if (graph->state == State_Running && graph->refClock) { REFERENCE_TIME time; IReferenceClock_GetTime(graph->refClock, &time); @@ -4982,6 +4991,7 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) graph->state = State_Stopped; graph->needs_async_run = 0; work = graph->async_run_work; + graph->got_ec_complete = 0; /* Update the current position, probably to synchronize multiple streams. */ IMediaSeeking_SetPositions(&graph->IMediaSeeking_iface, &graph->current_pos, @@ -5281,6 +5291,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo PostMessageW(This->notif.hWnd, This->notif.msg, 0, This->notif.instance); } This->CompletionStatus = EC_COMPLETE; + This->got_ec_complete = 1; SetEvent(This->hEventCompletion); } } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1eecd0483b..9219b30cec 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -530,7 +530,6 @@ static void test_media_event(IFilterGraph2 *graph) hr = IMediaSeeking_GetCurrentPosition(seeking, &current); ok(hr == S_OK, "GetCurrentPosition() failed: %#x\n", hr); -todo_wine ok(current == stop, "expected %s, got %s\n", wine_dbgstr_longlong(stop), wine_dbgstr_longlong(current)); hr = IMediaControl_Stop(control); @@ -4512,7 +4511,7 @@ static void test_graph_seeking(void) 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)); + 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); @@ -4535,7 +4534,7 @@ static void test_graph_seeking(void) 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)); + 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);

1 0

Piotr Caban : comctl32: Fix non printable characters handling in SB_SETTEXT.
by Alexandre Julliard 21 Jul '20

21 Jul '20

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: Add _wctype table.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 144803a54571a6a514b06f4719ff6215eb325e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=144803a54571a6a514b06f47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:08 2020 +0200 msvcrt: Add _wctype table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/ctype.c | 74 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 12 files changed, 85 insertions(+), 11 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 6a68274479..ec984da1e8 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -96,7 +96,7 @@ @ cdecl _wcsupr_s(wstr long) ucrtbase._wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) ucrtbase._wcsupr_s_l @ cdecl _wcsxfrm_l(ptr wstr long ptr) ucrtbase._wcsxfrm_l -@ stub _wctype +@ extern _wctype ucrtbase._wctype @ cdecl is_wctype(long long) ucrtbase.is_wctype @ cdecl isalnum(long) ucrtbase.isalnum @ cdecl isalpha(long) ucrtbase.isalpha diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6451fda152..df3f1784e5 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1531,7 +1531,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -# extern _wctype +@ extern _wctype MSVCRT__wctype @ cdecl _wdupenv_s(ptr ptr wstr) @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index abfbb846b3..e449b14f29 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1889,7 +1889,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -# extern _wctype +@ extern _wctype MSVCRT__wctype @ cdecl _wdupenv_s(ptr ptr wstr) @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 00a1c3e49e..5c3bcfe9b9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1913,7 +1913,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -# extern _wctype +@ extern _wctype MSVCRT__wctype @ cdecl _wdupenv_s(ptr ptr wstr) @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e622f95af1..0cfd4bbf5e 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1606,7 +1606,7 @@ @ cdecl _wctime64_s(ptr long ptr) msvcr120._wctime64_s @ cdecl _wctomb_l(ptr long ptr) msvcr120._wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) msvcr120._wctomb_s_l -# extern _wctype +@ extern _wctype msvcr120._wctype @ extern _wenviron msvcr120._wenviron @ cdecl _wfdopen(long wstr) msvcr120._wfdopen @ cdecl _wfindfirst32(wstr ptr) msvcr120._wfindfirst32 diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2649034abd..12ca4ac47c 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -610,7 +610,7 @@ @ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime64(ptr) MSVCRT__wctime64 -# extern _wctype +@ extern _wctype MSVCRT__wctype @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 9d3e2b2ebe..009b3237c8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -606,7 +606,7 @@ @ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime64(ptr) MSVCRT__wctime64 -# extern _wctype +@ extern _wctype MSVCRT__wctype @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aaa1b499c5..121b1110ee 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1210,7 +1210,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -# extern _wctype +@ extern _wctype MSVCRT__wctype @ cdecl _wdupenv_s(ptr ptr wstr) @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9267c5b1dd..ca44f28932 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1186,7 +1186,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -# extern _wctype +@ extern _wctype MSVCRT__wctype @ cdecl _wdupenv_s(ptr ptr wstr) @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index e051c01521..b8e41a2c4d 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -51,6 +51,80 @@ WORD MSVCRT__ctype [257] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +#if _MSVCR_VER <= 110 +# define B110 MSVCRT__BLANK +#else +# define B110 0 +#endif + +#if _MSVCR_VER == 120 +# define D120 0 +#else +# define D120 4 +#endif + +#if _MSVCR_VER >= 140 +# define S140 MSVCRT__SPACE +# define L140 MSVCRT__LOWER | 0x100 +# define C140 MSVCRT__CONTROL +#else +# define S140 0 +# define L140 0 +# define C140 0 +#endif +WORD MSVCRT__wctype[257] = +{ + 0, + /* 00 */ + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0028 | B110, 0x0028, 0x0028, 0x0028, 0x0028, 0x0020, 0x0020, + /* 10 */ + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + /* 20 */ + 0x0048, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + /* 30 */ + 0x0084, 0x0084, 0x0084, 0x0084, 0x0084, 0x0084, 0x0084, 0x0084, + 0x0084, 0x0084, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + /* 40 */ + 0x0010, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0181, 0x0101, + 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, + /* 50 */ + 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, + 0x0101, 0x0101, 0x0101, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + /* 60 */ + 0x0010, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0182, 0x0102, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + /* 70 */ + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0102, 0x0102, 0x0102, 0x0010, 0x0010, 0x0010, 0x0010, 0x0020, + /* 80 */ + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 | S140, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + /* 90 */ + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, + /* a0 */ + 0x0008 | B110, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + 0x0010, 0x0010, 0x0010 | L140, 0x0010, 0x0010, 0x0010 | C140, 0x0010, 0x0010, + /* b0 */ + 0x0010, 0x0010, 0x0010 | D120, 0x0010 | D120, 0x0010, 0x0010 | L140, 0x0010, 0x0010, + 0x0010, 0x0010 | D120, 0x0010 | L140, 0x0010, 0x0010, 0x0010, 0x0010, 0x0010, + /* c0 */ + 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, + 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, + /* d0 */ + 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0010, + 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0101, 0x0102, + /* e0 */ + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, + /* f0 */ + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0010, + 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102 +}; + /********************************************************************* * __p__pctype (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1d26169cc1..58149de285 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1141,7 +1141,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -# extern _wctype +@ extern _wctype MSVCRT__wctype @ extern _wenviron MSVCRT__wenviron @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8493ae79ba..7aebd81e02 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2062,7 +2062,7 @@ @ cdecl _wctime64_s(ptr long ptr) MSVCRT__wctime64_s @ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -@ stub _wctype +@ extern _wctype MSVCRT__wctype @ cdecl _wdupenv_s(ptr ptr wstr) @ varargs _wexecl(wstr wstr) @ varargs _wexecle(wstr wstr)

1 0

Piotr Caban : msvcrt: Export _pwctype table.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: d0c795596b6453fd9fd36815d8143ba947c15af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0c795596b6453fd9fd36815… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:16 2020 +0200 msvcrt: Export _pwctype table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/ctype.c | 2 ++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 13 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index df3f1784e5..0a0d06b4da 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1243,7 +1243,7 @@ @ cdecl _putwch(long) @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_crt(ptr long) MSVCRT_realloc @ cdecl _recalloc(ptr long long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e449b14f29..171cd49652 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1600,7 +1600,7 @@ @ cdecl _putwch(long) @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_crt(ptr long) MSVCRT_realloc @ cdecl _recalloc(ptr long long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5c3bcfe9b9..01608639b5 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1610,7 +1610,7 @@ @ cdecl _putwch(long) @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_crt(ptr long) MSVCRT_realloc @ cdecl _recalloc(ptr long long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0cfd4bbf5e..100599e2b2 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1336,7 +1336,7 @@ @ cdecl _putw(long ptr) msvcr120._putw @ cdecl _putwc_nolock(long ptr) msvcr120._putwc_nolock @ cdecl _putws(wstr) msvcr120._putws -# extern _pwctype +@ extern _pwctype msvcr120._pwctype @ cdecl _read(long ptr long) msvcr120._read @ cdecl _realloc_crt(ptr long) msvcr120._realloc_crt @ cdecl _recalloc(ptr long long) msvcr120._recalloc diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 12ca4ac47c..627bcbb72e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -497,7 +497,7 @@ @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 009b3237c8..bae1f7fcdb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -492,7 +492,7 @@ @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _resetstkoflw() MSVCRT__resetstkoflw @ cdecl _rmdir(str) MSVCRT__rmdir diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 121b1110ee..fff542a337 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -917,7 +917,7 @@ @ cdecl _putwch(long) @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_crt(ptr long) MSVCRT_realloc @ cdecl _recalloc(ptr long long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ca44f28932..8854495454 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -893,7 +893,7 @@ @ cdecl _putwch(long) @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_crt(ptr long) MSVCRT_realloc @ cdecl _recalloc(ptr long long) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index b8e41a2c4d..3789cd7d75 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -125,6 +125,8 @@ WORD MSVCRT__wctype[257] = 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102, 0x0102 }; +WORD *MSVCRT__pwctype = MSVCRT__wctype + 1; + /********************************************************************* * __p__pctype (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 58149de285..c88e146461 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -862,7 +862,7 @@ @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putwch(long) @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read # stub _realloc_dbg(ptr long long str long) @ cdecl _resetstkoflw() MSVCRT__resetstkoflw diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 69c6775eac..f06a53cc60 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1089,7 +1089,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putw(long ptr) msvcrt._putw @ cdecl _putws(wstr) msvcrt._putws -# extern _pwctype +@ extern _pwctype msvcrt._pwctype @ cdecl _read(long ptr long) msvcrt._read @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f1e73bc4ba..f0d966acd7 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1183,7 +1183,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putw(long ptr) msvcrt._putw @ cdecl _putws(wstr) msvcrt._putws -# extern _pwctype +@ extern _pwctype msvcrt._pwctype @ cdecl _read(long ptr long) msvcrt._read @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 45f5888922..7b082494d7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -472,7 +472,7 @@ @ cdecl _putenv(str) @ cdecl _putw(long ptr) MSVCRT__putw @ cdecl _putws(wstr) MSVCRT__putws -# extern _pwctype +@ extern _pwctype MSVCRT__pwctype @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_dbg(ptr long) MSVCRT_realloc @ cdecl _rmdir(str) MSVCRT__rmdir

1 0

Piotr Caban : msvcrt: Don't use get_char_typeW in _iswctype_l.
by Alexandre Julliard 21 Jul '20

21 Jul '20

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

Piotr Caban : msvcrt: Copy wcslen implementation from ntdll.
by Alexandre Julliard 21 Jul '20

21 Jul '20

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: Copy wcscpy implementation from ntdll.
by Alexandre Julliard 21 Jul '20

21 Jul '20

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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_static_sampler_desc structure to vkd3d_shader_static_sampler_desc.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: vkd3d Branch: master Commit: 62113ff8285f577e7d134879bbf4a7487f0d215f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62113ff8285f577e7d13487… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 15:37:59 2020 +0430 vkd3d-shader: Rename the vkd3d_static_sampler_desc structure to vkd3d_shader_static_sampler_desc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 6 +++--- libs/vkd3d-shader/dxbc.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 631cbf5..1c01735 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -401,7 +401,7 @@ enum vkd3d_shader_static_border_colour VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), }; -struct vkd3d_static_sampler_desc +struct vkd3d_shader_static_sampler_desc { enum vkd3d_shader_filter filter; enum vkd3d_shader_texture_address_mode address_u; @@ -498,7 +498,7 @@ struct vkd3d_root_signature_desc unsigned int parameter_count; const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; - const struct vkd3d_static_sampler_desc *static_samplers; + const struct vkd3d_shader_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; }; @@ -564,7 +564,7 @@ struct vkd3d_root_signature_desc1 unsigned int parameter_count; const struct vkd3d_root_parameter1 *parameters; unsigned int static_sampler_count; - const struct vkd3d_static_sampler_desc *static_samplers; + const struct vkd3d_shader_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 303bedd..5ddfc20 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2528,7 +2528,7 @@ static int shader_parse_root_parameters1(struct root_signature_parser_context *c } static int shader_parse_static_samplers(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_static_sampler_desc *sampler_descs) + unsigned int offset, unsigned int count, struct vkd3d_shader_static_sampler_desc *sampler_descs) { const char *ptr; unsigned int i; @@ -2629,7 +2629,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_0->static_sampler_count = count; if (v_1_0->static_sampler_count) { - struct vkd3d_static_sampler_desc *samplers; + struct vkd3d_shader_static_sampler_desc *samplers; if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_0->static_samplers = samplers; @@ -2713,7 +2713,7 @@ static unsigned int versioned_root_signature_get_static_sampler_count(const stru return desc->u.v_1_1.static_sampler_count; } -static const struct vkd3d_static_sampler_desc *versioned_root_signature_get_static_samplers( +static const struct vkd3d_shader_static_sampler_desc *versioned_root_signature_get_static_samplers( const struct vkd3d_versioned_root_signature_desc *desc) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2970,7 +2970,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co static int shader_write_static_samplers(struct root_signature_writer_context *context, const struct vkd3d_versioned_root_signature_desc *desc) { - const struct vkd3d_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); + const struct vkd3d_shader_static_sampler_desc *samplers = versioned_root_signature_get_static_samplers(desc); unsigned int i; for (i = 0; i < versioned_root_signature_get_static_sampler_count(desc); ++i) @@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter *parameters = NULL; - struct vkd3d_static_sampler_desc *samplers = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) @@ -3385,7 +3385,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; - struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_root_parameter1 *parameters = NULL; int ret;

1 0