October 2019 - Wine-Commits

Louis Lenders : include: Add restrictederrorinfo.idl.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: a619828053b9d9bd25f03c4ca338c965f06a95bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a619828053b9d9bd25f03c4c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 22 02:54:31 2019 +0000 include: Add restrictederrorinfo.idl. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/restrictederrorinfo.idl | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d4676f0fdd..c31fb50d74 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -549,6 +549,7 @@ SOURCES = \ reason.h \ regstr.h \ restartmanager.h \ + restrictederrorinfo.idl \ richedit.h \ richole.idl \ rmxfguid.h \ diff --git a/include/restrictederrorinfo.idl b/include/restrictederrorinfo.idl new file mode 100644 index 0000000000..e444256a04 --- /dev/null +++ b/include/restrictederrorinfo.idl @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +[ + object, + uuid(82ba7092-4c88-427d-a7bc-16dd93feb67e), + pointer_default(unique) +] +interface IRestrictedErrorInfo : IUnknown +{ + HRESULT GetErrorDetails ( + [out] BSTR *desc, + [out] HRESULT *error, + [out] BSTR *restricted_desc, + [out] BSTR *sid); + + HRESULT GetReference ([out] BSTR *reference); +}

1 0

Zebediah Figura : quartz/filtergraph: Store the current position and return it in IMediaSeeking::GetCurrentPosition().
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 539fa6922b068440d3f3669cfa219d234e0c611e URL: https://source.winehq.org/git/wine.git/?a=commit;h=539fa6922b068440d3f3669c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 16:54:48 2019 -0500 quartz/filtergraph: Store the current position and return it in IMediaSeeking::GetCurrentPosition(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 41 +++++++++++++++++++++++++++-------------- dlls/quartz/tests/filtergraph.c | 12 ++++++------ dlls/wmp/tests/media.c | 4 +--- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 966f427b15..f7ca192c13 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -210,6 +210,8 @@ typedef struct _IFilterGraphImpl { HANDLE message_thread, message_thread_ret; DWORD message_thread_id; + + LONGLONG current_pos; } IFilterGraphImpl; struct enum_filters @@ -2505,27 +2507,32 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON return hr; } -static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) +static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) { - IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - LONGLONG time = 0; + IFilterGraphImpl *graph = impl_from_IMediaSeeking(iface); + LONGLONG ret = graph->current_pos; + + TRACE("graph %p, current %p.\n", graph, current); - if (!pCurrent) + if (!current) return E_POINTER; - EnterCriticalSection(&This->cs); - if (This->state == State_Running && This->refClock && This->start_time >= 0) + EnterCriticalSection(&graph->cs); + + if (graph->state == State_Running && graph->refClock && graph->start_time >= 0) { - IReferenceClock_GetTime(This->refClock, &time); + REFERENCE_TIME time; + IReferenceClock_GetTime(graph->refClock, &time); if (time) - time -= This->start_time; + ret += time - graph->start_time; } - if (This->pause_time > 0) - time += This->pause_time; - *pCurrent = time; - LeaveCriticalSection(&This->cs); - TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); + if (graph->pause_time > 0) + ret += graph->pause_time; + LeaveCriticalSection(&graph->cs); + + TRACE("Returning %s.\n", wine_dbgstr_longlong(ret)); + *current = ret; return S_OK; } @@ -2586,7 +2593,8 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&seeking))) continue; - filter_hr = IMediaSeeking_SetPositions(seeking, &current, current_flags, &stop, stop_flags); + filter_hr = IMediaSeeking_SetPositions(seeking, &current, + current_flags | AM_SEEKING_ReturnTime, &stop, stop_flags); IMediaSeeking_Release(seeking); if (SUCCEEDED(filter_hr)) { @@ -2596,6 +2604,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * *current_ptr = current; if (stop_ptr && (stop_flags & AM_SEEKING_ReturnTime)) *stop_ptr = stop; + graph->current_pos = current; } else if (filter_hr != E_NOTIMPL) { @@ -5220,7 +5229,10 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); if (graph->state == State_Running && graph->refClock && graph->start_time >= 0) + { IReferenceClock_GetTime(graph->refClock, &graph->pause_time); + graph->current_pos += graph->pause_time - graph->start_time; + } else graph->pause_time = -1; @@ -5714,6 +5726,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0; fimpl->version = 0; + fimpl->current_pos = 0; if (threaded) { diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index bffbc82b98..d5e205ef79 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3838,12 +3838,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(time == 12340000, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(time == 12340000, "Got time %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(current)); + ok(current == 12340000, "Got time %s.\n", wine_dbgstr_longlong(current)); ok(stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(stop)); current = 0x123; @@ -3908,12 +3908,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(abs(time - 1234 * 10000) < 40 * 10000, + ok(abs(time - 1234 * 10000) < 40 * 10000, "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(abs(current - 1234 * 10000) < 40 * 10000, + ok(abs(current - 1234 * 10000) < 40 * 10000, "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); @@ -3921,12 +3921,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 40 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 40 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index fee18fd556..9857a7e7ae 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -413,9 +413,7 @@ static BOOL test_wmp(void) duration = 0.0; hres = IWMPControls_get_currentPosition(controls, &duration); ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres); - /* builtin quartz does not handle this currently and resets to 0.0, works - * with native quartz */ - todo_wine ok(duration >= 1.05 /* save some fp errors */, "unexpected value %f\n", duration); + ok(duration >= 1.05 /* save some fp errors */, "unexpected value %f\n", duration); hres = IWMPPlayer4_get_currentMedia(player4, &media); ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres);

1 0

Zebediah Figura : quartz/filtergraph: Pause the graph even if AM_SEEKING_NoFlush is used.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 13dbe644ce0789c79a682df0e4643ba56b01dd23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13dbe644ce0789c79a682df0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 16:54:50 2019 -0500 quartz/filtergraph: Pause the graph even if AM_SEEKING_NoFlush is used. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 182ea5a2be..9750e6fe84 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2583,7 +2583,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * EnterCriticalSection(&graph->cs); state = graph->state; - if (state == State_Running && !(current_flags & AM_SEEKING_NoFlush)) + if (state == State_Running) IMediaControl_Pause(&graph->IMediaControl_iface); LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) @@ -2616,7 +2616,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * if ((current_flags & 0x7) != AM_SEEKING_NoPositioning) graph->pause_time = graph->start_time = -1; - if (state == State_Running && !(current_flags & AM_SEEKING_NoFlush)) + if (state == State_Running) IMediaControl_Run(&graph->IMediaControl_iface); LeaveCriticalSection(&graph->cs); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4b9b3b675c..3ef610d76b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3917,6 +3917,14 @@ static void test_graph_seeking(void) "Expected about 1234ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); + /* This remains true even if NoFlush is specified. */ + current = 1000 * 10000; + stop = 8000 * 10000; + hr = IMediaSeeking_SetPositions(seeking, &current, + AM_SEEKING_AbsolutePositioning | AM_SEEKING_NoFlush, + &stop, AM_SEEKING_AbsolutePositioning | AM_SEEKING_NoFlush); + ok(hr == S_OK, "Got hr %#x.\n", hr); + Sleep(100); hr = IMediaSeeking_GetCurrentPosition(seeking, &time); @@ -3928,7 +3936,7 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(abs(current - 1334 * 10000) < 40 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); - ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Pause(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3946,7 +3954,7 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(abs(current - 1334 * 10000) < 40 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); - ok(stop == 9000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); + ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/filtergraph: Clarify stream time tracking.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 524783dfeb27424591b2c6e775bf8acf06a414df URL: https://source.winehq.org/git/wine.git/?a=commit;h=524783dfeb27424591b2c6e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 21 16:54:51 2019 -0500 quartz/filtergraph: Clarify stream time tracking. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 46 ++++++++++++++++++++--------------------- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9750e6fe84..d5442e21fc 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -202,8 +202,6 @@ typedef struct _IFilterGraphImpl { int nItfCacheEntries; BOOL defaultclock; GUID timeformatseek; - REFERENCE_TIME start_time; - REFERENCE_TIME pause_time; LONG recursioncount; IUnknown *pSite; LONG version; @@ -211,6 +209,10 @@ typedef struct _IFilterGraphImpl { HANDLE message_thread, message_thread_ret; DWORD message_thread_id; + /* Respectively: the last timestamp at which we started streaming, and the + * current offset within the stream. */ + REFERENCE_TIME stream_start, stream_elapsed; + LONGLONG current_pos; } IFilterGraphImpl; @@ -2519,16 +2521,14 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG EnterCriticalSection(&graph->cs); - if (graph->state == State_Running && graph->refClock && graph->start_time >= 0) + if (graph->state == State_Running && graph->refClock) { REFERENCE_TIME time; IReferenceClock_GetTime(graph->refClock, &time); if (time) - ret += time - graph->start_time; + ret += time - graph->stream_start; } - if (graph->pause_time > 0) - ret += graph->pause_time; LeaveCriticalSection(&graph->cs); TRACE("Returning %s.\n", wine_dbgstr_longlong(ret)); @@ -2613,8 +2613,11 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * } } - if ((current_flags & 0x7) != AM_SEEKING_NoPositioning) - graph->pause_time = graph->start_time = -1; + if ((current_flags & 0x7) != AM_SEEKING_NoPositioning && graph->refClock) + { + IReferenceClock_GetTime(graph->refClock, &graph->stream_start); + graph->stream_elapsed = 0; + } if (state == State_Running) IMediaControl_Run(&graph->IMediaControl_iface); @@ -5232,13 +5235,13 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) if (graph->defaultclock && !graph->refClock) IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); - if (graph->state == State_Running && graph->refClock && graph->start_time >= 0) + if (graph->state == State_Running && graph->refClock) { - IReferenceClock_GetTime(graph->refClock, &graph->pause_time); - graph->current_pos += graph->pause_time - graph->start_time; + REFERENCE_TIME time; + IReferenceClock_GetTime(graph->refClock, &time); + graph->stream_elapsed += time - graph->stream_start; + graph->current_pos += graph->stream_elapsed; } - else - graph->pause_time = -1; SendFilterMessage(graph, SendPause, 0); graph->state = State_Paused; @@ -5250,6 +5253,7 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) { IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); + REFERENCE_TIME stream_start = start; TRACE("graph %p, start %s.\n", graph, wine_dbgstr_longlong(start)); @@ -5267,19 +5271,13 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) if (!start && graph->refClock) { - REFERENCE_TIME now; - IReferenceClock_GetTime(graph->refClock, &now); + IReferenceClock_GetTime(graph->refClock, &graph->stream_start); + stream_start = graph->stream_start - graph->stream_elapsed; if (graph->state == State_Stopped) - graph->start_time = now + 500000; - else if (graph->pause_time >= 0) - graph->start_time += now - graph->pause_time; - else - graph->start_time = now; + stream_start += 500000; } - else - graph->start_time = start; - SendFilterMessage(graph, SendRun, (DWORD_PTR)&graph->start_time); + SendFilterMessage(graph, SendRun, (DWORD_PTR)&stream_start); graph->state = State_Running; LeaveCriticalSection(&graph->cs); @@ -5726,7 +5724,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IFilterGraphImpl.cs"); fimpl->nItfCacheEntries = 0; memcpy(&fimpl->timeformatseek, &TIME_FORMAT_MEDIA_TIME, sizeof(GUID)); - fimpl->start_time = fimpl->pause_time = 0; + fimpl->stream_start = fimpl->stream_elapsed = 0; fimpl->punkFilterMapper2 = NULL; fimpl->recursioncount = 0; fimpl->version = 0; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 3ef610d76b..14f2dfaa7a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3947,12 +3947,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 40 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 40 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));

1 0

Alistair Leslie-Hughes : dinput: Detect more buttons as non-joysticks.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 1dfc36c379c9c4b9dc346961af38042a8bc99ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dfc36c379c9c4b9dc346961… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 21 22:42:31 2019 +0000 dinput: Detect more buttons as non-joysticks. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index e0c1331937..afdf659b4a 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -168,7 +168,7 @@ static INT find_joystick_devices(void) struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; SHORT btn_map[KEY_MAX - BTN_MISC + 1]; - BOOL is_stylus = FALSE; + BOOL non_js = FALSE; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) == -1) @@ -242,8 +242,9 @@ static INT find_joystick_devices(void) case BTN_DEAD: joydev.is_joystick = TRUE; break; + case BTN_MOUSE: case BTN_STYLUS: - is_stylus = TRUE; + non_js = TRUE; break; default: break; @@ -251,9 +252,9 @@ static INT find_joystick_devices(void) } } - if(is_stylus) + if(non_js) { - TRACE("Stylus detected. Skipping\n"); + TRACE("Non-joystick detected. Skipping\n"); close(fd); continue; }

1 0

Michael Stefaniuc : comctl32/tests: Constify some string holding variables / fields.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 2f4717de34288f20493413b3c2c91e0fa2f55b56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4717de34288f20493413b3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 22 01:24:30 2019 +0200 comctl32/tests: Constify some string holding variables / fields. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 83 +++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 4b5dfe6d96..087e4452cc 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -30,33 +30,20 @@ static HWND parent_wnd, child1_wnd, child2_wnd; static INT notify_format; static BOOL notify_query_received; -static WCHAR test_w[] = {'t', 'e', 's', 't', 0}; -static CHAR test_a[] = {'t', 'e', 's', 't', 0}; +static const CHAR test_a[] = "test"; +static const WCHAR test_w[] = L"test"; /* Double zero so that it's safe to cast it to WCHAR * */ -static CHAR te_a[] = {'t', 'e', 0, 0}; +static const CHAR te_a[] = {'t', 'e', 0, 0}; static WCHAR empty_w[] = {0}; static CHAR empty_a[] = {0}; -static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; -static WCHAR large_w[] = -{ - 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', 'e', - 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', 'e', 's', - 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', ' ', 'L', 'i', 'c', 'e', - 'n', 's', 'e', ' ', 'a', 'l', 'o', 'n', 'g', ' ', 'w', 'i', 't', 'h', ' ', 't', 'h', 'i', 's', ' ', '.', '.', '.', 0 -}; -static WCHAR large_truncated_65_w[65] = -{ - 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', - 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', - 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', 0 -}; -static WCHAR large_truncated_80_w[80] = -{ - 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', - 'i', 'v', 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', - 'N', 'U', ' ', 'L', 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', - 'b', 'l', 'i', 'c', ' ', 'L', 'i', 'c', 'e', 'n', 's', 'e', ' ', 'a', 'l', 'o', 'n', 'g', ' ', 'w' -}; +static const CHAR large_a[] = + "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static const WCHAR large_w[] = + L"You should have received a copy of the GNU Lesser General Public License along with this ..."; +static const WCHAR large_truncated_65_w[65] = + L"You should have received a copy of the GNU Lesser General Public"; +static const WCHAR large_truncated_80_w[80] = + L"You should have received a copy of the GNU Lesser General Public License along w"; static WCHAR buffer[64]; /* Text field conversion test behavior flags. */ @@ -96,26 +83,26 @@ static struct notify_test_info struct notify_test_send { /* Data sent to pager */ - WCHAR *send_text; + const WCHAR *send_text; INT send_text_size; INT send_text_max; /* Data expected by parent of pager */ - void *expect_text; + const void *expect_text; }; struct notify_test_receive { /* Data sent to pager */ - WCHAR *send_text; + const WCHAR *send_text; INT send_text_size; INT send_text_max; /* Data for parent to write */ - CHAR *write_pointer; - CHAR *write_text; + const CHAR *write_pointer; + const CHAR *write_text; INT write_text_size; INT write_text_max; /* Data when message returned */ - void *return_text; + const void *return_text; INT return_text_max; }; @@ -161,21 +148,21 @@ static const struct notify_test_receive test_dont_convert_receive_data[] = static const struct notify_test_tooltip { /* Data for parent to write */ - CHAR *write_sztext; + const CHAR *write_sztext; INT write_sztext_size; - CHAR *write_lpsztext; + const CHAR *write_lpsztext; HMODULE write_hinst; /* Data when message returned */ - WCHAR *return_sztext; + const WCHAR *return_sztext; INT return_sztext_size; - WCHAR *return_lpsztext; + const WCHAR *return_lpsztext; HMODULE return_hinst; /* Data expected by parent */ - CHAR *expect_sztext; + const CHAR *expect_sztext; /* Data send to parent */ - WCHAR *send_sztext; + const WCHAR *send_sztext; INT send_sztext_size; - WCHAR *send_lpsztext; + const WCHAR *send_lpsztext; } test_tooltip_data[] = { {NULL, 0, NULL, NULL, empty_w, -1, empty_w}, @@ -193,17 +180,17 @@ static const struct notify_test_tooltip static const struct notify_test_datetime_format { /* Data send to parent */ - WCHAR *send_pszformat; + const WCHAR *send_pszformat; /* Data expected by parent */ - CHAR *expect_pszformat; + const CHAR *expect_pszformat; /* Data for parent to write */ - CHAR *write_szdisplay; + const CHAR *write_szdisplay; INT write_szdisplay_size; - CHAR *write_pszdisplay; + const CHAR *write_pszdisplay; /* Data when message returned */ - WCHAR *return_szdisplay; + const WCHAR *return_szdisplay; INT return_szdisplay_size; - WCHAR *return_pszdisplay; + const WCHAR *return_pszdisplay; } test_datetime_format_data[] = { {test_w, test_a}, @@ -658,7 +645,7 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) else if(notify_test_info.unicode == HDN_GETDISPINFOW) *text = heap_strdup(receive_data->write_pointer); else - *text = receive_data->write_pointer; + *text = (char *)receive_data->write_pointer; if (text_max && receive_data->write_text_max != -1) *text_max = receive_data->write_text_max; break; } @@ -682,7 +669,7 @@ static void notify_tooltip_handler(NMTTDISPINFOA *nm) ok(!lstrcmpA(data->expect_sztext, nm->szText), "Sub test %d expect %s, got %s\n", notify_test_info.sub_test_id, data->expect_sztext, nm->szText); if (data->write_sztext) memcpy(nm->szText, data->write_sztext, data->write_sztext_size); - if (data->write_lpsztext) nm->lpszText = data->write_lpsztext; + if (data->write_lpsztext) nm->lpszText = (char *)data->write_lpsztext; if (data->write_hinst) nm->hinst = data->write_hinst; } @@ -1106,8 +1093,8 @@ static void test_wm_notify_header(HWND pager) HD_TEXTFILTERW hdtf = {0}; hdi.mask = HDI_TEXT | HDI_FILTER; - hdi.pszText = test_w; - hdtf.pszText = test_w; + hdi.pszText = (WCHAR *)test_w; + hdtf.pszText = (WCHAR *)test_w; nmh.pitem = &hdi; nmh.pitem->pvFilter = &hdtf; send_notify(pager, HDN_BEGINDRAG, HDN_BEGINDRAG, (LPARAM)&nmh, TRUE); @@ -1142,7 +1129,7 @@ static void test_wm_notify_tooltip(HWND pager) memset(&nmttdi, 0, sizeof(nmttdi)); if (data->send_sztext) memcpy(nmttdi.szText, data->send_sztext, data->send_sztext_size); - if (data->send_lpsztext) nmttdi.lpszText = data->send_lpsztext; + if (data->send_lpsztext) nmttdi.lpszText = (WCHAR *)data->send_lpsztext; send_notify(pager, TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE); if (data->return_sztext) {

1 0

Michael Stefaniuc : comctl32/tests: Get rid of variables holding empty strings.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: f8979fee1fa2e6aeed5a5026465dffa680c0848f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8979fee1fa2e6aeed5a5026… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 22 01:24:32 2019 +0200 comctl32/tests: Get rid of variables holding empty strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 3 +-- dlls/comctl32/tests/pager.c | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 111545d298..3fe208c321 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3240,7 +3240,6 @@ static void test_cue_banner(void) static WCHAR getcuetestW[5] = {'T',0}; static const WCHAR testcmp1W[] = {'T','e','s','t',0}; static const WCHAR testcmp2W[] = {'T','e','s',0}; - static const WCHAR emptyW[] = {0}; hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); @@ -3279,7 +3278,7 @@ static void test_cue_banner(void) ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); - ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)L""); ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 0e2c25b08a..30005c88fa 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -34,8 +34,6 @@ static const CHAR test_a[] = "test"; static const WCHAR test_w[] = L"test"; /* Double zero so that it's safe to cast it to WCHAR * */ static const CHAR te_a[] = {'t', 'e', 0, 0}; -static WCHAR empty_w[] = {0}; -static CHAR empty_a[] = {0}; static const CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; static const WCHAR large_w[] = @@ -132,17 +130,17 @@ static const struct notify_test_send test_dont_convert_send_data[] = static const struct notify_test_receive test_convert_receive_data[] = { - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, - {NULL, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), empty_a, 0, 0, 1, empty_w, 1}, + {L"", sizeof(L""), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, + {L"", sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, + {NULL, sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, + {L"", sizeof(L""), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, + {L"", sizeof(L""), ARRAY_SIZE(buffer), "", 0, 0, 1, L"", 1}, }; static const struct notify_test_receive test_dont_convert_receive_data[] = { - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_a, ARRAY_SIZE(buffer)}, - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_a, ARRAY_SIZE(buffer)}, + {L"", sizeof(L""), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_a, ARRAY_SIZE(buffer)}, + {L"", sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_a, ARRAY_SIZE(buffer)}, }; static const struct notify_test_tooltip @@ -165,15 +163,15 @@ static const struct notify_test_tooltip const WCHAR *send_lpsztext; } test_tooltip_data[] = { - {NULL, 0, NULL, NULL, empty_w, -1, empty_w}, + {NULL, 0, NULL, NULL, L"", -1, L""}, {test_a, sizeof(test_a), NULL, NULL, test_w, -1, test_w}, {test_a, sizeof(test_a), test_a, NULL, test_w, -1, test_w}, - {test_a, sizeof(test_a), (CHAR *)1, (HMODULE)0xdeadbeef, empty_w, -1, (WCHAR *)1, (HMODULE)0xdeadbeef}, + {test_a, sizeof(test_a), (CHAR *)1, (HMODULE)0xdeadbeef, L"", -1, (WCHAR *)1, (HMODULE)0xdeadbeef}, {test_a, sizeof(test_a), test_a, (HMODULE)0xdeadbeef, test_w, -1, test_w, (HMODULE)0xdeadbeef}, {NULL, 0, test_a, NULL, test_w, -1, test_w}, {test_a, 2, test_a, NULL, test_w, -1, test_w}, {NULL, 0, NULL, NULL, test_w, -1, test_w, NULL, test_a, test_w, sizeof(test_w)}, - {NULL, 0, NULL, NULL, empty_w, -1, empty_w, NULL, empty_a, NULL, 0, test_w}, + {NULL, 0, NULL, NULL, L"", -1, L"", NULL, "", NULL, 0, test_w}, {NULL, 0, large_a, NULL, large_truncated_80_w, sizeof(large_truncated_80_w), large_w} }; @@ -194,7 +192,7 @@ static const struct notify_test_datetime_format } test_datetime_format_data[] = { {test_w, test_a}, - {NULL, NULL, NULL, 0, test_a, empty_w, -1, test_w}, + {NULL, NULL, NULL, 0, test_a, L"", -1, test_w}, {NULL, NULL, test_a, sizeof(test_a), NULL, test_w, -1, test_w}, {NULL, NULL, test_a, 2, test_a, (WCHAR *)te_a, -1, test_w}, {NULL, NULL, NULL, 0, large_a, NULL, 0, large_w}

1 0

Jacek Caban : vbscript: Implement String function.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: ea5dbc13292102993f0d6e0e27b265b4449be5ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea5dbc13292102993f0d6e0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 15:54:13 2019 +0200 vbscript: Implement String function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 34 +++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 28 ++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 364ff0c02c..0de1559592 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -24,6 +24,7 @@ #include "mshtmhst.h" #include "objsafe.h" +#include "wchar.h" #include "wine/debug.h" @@ -1543,10 +1544,37 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return S_OK; } -static HRESULT Global_String(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_String(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + WCHAR ch; + int cnt; + HRESULT hres; + + TRACE("%s %s\n", debugstr_variant(args), debugstr_variant(args + 1)); + + hres = to_int(args, &cnt); + if(FAILED(hres)) + return hres; + if(cnt < 0) + return E_INVALIDARG; + + if(V_VT(args + 1) != VT_BSTR) { + FIXME("Unsupported argument %s\n", debugstr_variant(args+1)); + return E_NOTIMPL; + } + if(!SysStringLen(V_BSTR(args + 1))) + return E_INVALIDARG; + ch = V_BSTR(args + 1)[0]; + + if(res) { + BSTR str = SysAllocStringLen(NULL, cnt); + if(!str) + return E_OUTOFMEMORY; + wmemset(str, ch, cnt); + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + } + return S_OK; } static HRESULT Global_InStr(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 49dd4959f7..5c9e219d60 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -548,6 +548,34 @@ Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +sub test_string(cnt, char, exp) + call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ + String(cnt, char) & """ expected """ & exp & """") +end sub + +test_string 3, "x", "xxx" +test_string 3, "xy", "xxx" +test_string 1, "z", "z" +test_string 0, "z", "" +test_string "3", "xy", "xxx" +test_string 3, Chr(3), Chr(3)&Chr(3)&Chr(3) + +call ok(getVT(String(0, "z")) = "VT_BSTR", "getVT(String(0,z)) = " & getVT(String(0, "z"))) + +sub test_string_error() + on error resume next + dim x + x = String(-2, "x") + call ok(err.number = 5, "err.number = " & err.number) + err.clear + x = String(3, "") + call ok(err.number = 5, "err.number = " & err.number) + err.clear + x = String(0, "") + call ok(err.number = 5, "err.number = " & err.number) +end sub +call test_string_error + Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) End Sub

1 0

Zhiyi Zhang : winex11.drv: Implement X11DRV_D3DKMTSetVidPnSourceOwner.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: e08dd25f32a0f6ccf7b20b34c42db7822b017606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e08dd25f32a0f6ccf7b20b34… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 22 16:39:06 2019 +0800 winex11.drv: Implement X11DRV_D3DKMTSetVidPnSourceOwner. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 138 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index b5f6f75a83..2ea43e3025 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -600,7 +600,7 @@ static void test_D3DKMTSetVidPnSourceOwner(void) if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + win_skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); return; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 0040dbb430..a833b3c208 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -472,7 +472,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_UnrealizePalette, /* pUnrealizePalette */ NULL, /* pWidenPath */ NULL, /* pD3DKMTCheckVidPnExclusiveOwnership */ - NULL, /* pD3DKMTSetVidPnSourceOwner */ + X11DRV_D3DKMTSetVidPnSourceOwner, /* pD3DKMTSetVidPnSourceOwner */ X11DRV_wine_get_wgl_driver, /* wine_get_wgl_driver */ X11DRV_wine_get_vulkan_driver, /* wine_get_vulkan_driver */ GDI_PRIORITY_GRAPHICS_DRV /* priority */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 135faa8989..8930690f45 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -149,6 +149,7 @@ extern BOOL CDECL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern INT CDECL X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) DECLSPEC_HIDDEN; extern BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 21807af3f1..ac5ba66324 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -42,6 +42,8 @@ #include <X11/extensions/Xrender.h> #endif +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -52,6 +54,8 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/library.h" +#include "wine/list.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); @@ -96,6 +100,25 @@ static int (*old_error_handler)( Display *, XErrorEvent * ); static BOOL use_xim = TRUE; static char input_style[20]; +static CRITICAL_SECTION x11drv_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &x11drv_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_section") } +}; +static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +struct d3dkmt_vidpn_source +{ + D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */ + D3DDDI_VIDEO_PRESENT_SOURCE_ID id; /* VidPN present source id */ + D3DKMT_HANDLE device; /* Kernel mode device context */ + struct list entry; /* List entry */ +}; + +static struct list d3dkmt_vidpn_sources = LIST_INIT( d3dkmt_vidpn_sources ); /* VidPN source information list */ + #define IS_OPTION_TRUE(ch) \ ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') #define IS_OPTION_FALSE(ch) \ @@ -739,3 +762,118 @@ BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_p } return FALSE; /* let user32 handle it */ } + +/********************************************************************** + * X11DRV_D3DKMTSetVidPnSourceOwner + */ +NTSTATUS CDECL X11DRV_D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +{ + struct d3dkmt_vidpn_source *source, *source2; + NTSTATUS status = STATUS_SUCCESS; + BOOL found; + UINT i; + + TRACE("(%p)\n", desc); + + EnterCriticalSection( &x11drv_section ); + + /* Check parameters */ + for (i = 0; i < desc->VidPnSourceCount; ++i) + { + LIST_FOR_EACH_ENTRY( source, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->id == desc->pVidPnSourceId[i]) + { + /* Same device */ + if (source->device == desc->hDevice) + { + if ((source->type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + && (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_SHARED + || desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EMULATED)) + || (source->type == D3DKMT_VIDPNSOURCEOWNER_EMULATED + && desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE)) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } + /* Different devices */ + else + { + if ((source->type == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + || source->type == D3DKMT_VIDPNSOURCEOWNER_EMULATED) + && (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE + || desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EMULATED)) + { + status = STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE; + goto done; + } + } + } + } + + /* On Windows, it seems that all video present sources are owned by DMM clients, so any attempt to set + * D3DKMT_VIDPNSOURCEOWNER_SHARED come back STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE */ + if (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_SHARED) + { + status = STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE; + goto done; + } + + /* FIXME: D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI unsupported */ + if (desc->pType[i] == D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI || desc->pType[i] > D3DKMT_VIDPNSOURCEOWNER_EMULATED) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } + + /* Remove owner */ + if (!desc->VidPnSourceCount && !desc->pType && !desc->pVidPnSourceId) + { + LIST_FOR_EACH_ENTRY_SAFE( source, source2, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->device == desc->hDevice) + { + list_remove( &source->entry ); + heap_free( source ); + } + } + goto done; + } + + /* Add owner */ + for (i = 0; i < desc->VidPnSourceCount; ++i) + { + found = FALSE; + LIST_FOR_EACH_ENTRY( source, &d3dkmt_vidpn_sources, struct d3dkmt_vidpn_source, entry ) + { + if (source->device == desc->hDevice && source->id == desc->pVidPnSourceId[i]) + { + found = TRUE; + break; + } + } + + if (found) + source->type = desc->pType[i]; + else + { + source = heap_alloc( sizeof( *source ) ); + if (!source) + { + status = STATUS_NO_MEMORY; + goto done; + } + + source->id = desc->pVidPnSourceId[i]; + source->type = desc->pType[i]; + source->device = desc->hDevice; + list_add_tail( &d3dkmt_vidpn_sources, &source->entry ); + } + } + +done: + LeaveCriticalSection( &x11drv_section ); + return status; +}

1 0

Jacek Caban : vbscript: Implement RegExp.Replace.
by Alexandre Julliard Oct. 22, 2019

Oct. 22, 2019

Module: wine Branch: master Commit: 7639a850c93ec95f6edc262aaaa4251331f9315b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7639a850c93ec95f6edc262a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 15:54:20 2019 +0200 vbscript: Implement RegExp.Replace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/regexp.vbs | 35 +++++++- dlls/vbscript/vbregexp.c | 177 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 206 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 834be2101c..6569b98956 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -18,7 +18,7 @@ Option Explicit -Dim x, matches, match, submatch +Dim x, matches, match, submatch, r Set x = CreateObject("vbscript.regexp") Call ok(getVT(x.Pattern) = "VT_BSTR", "getVT(RegExp.Pattern) = " & getVT(x.Pattern)) @@ -191,4 +191,37 @@ Call ok(match.Value = "", "match.Value = " & match.Value) matches = x.test("test") Call ok(matches = true, "matches = " & matches) +dim test_global + +sub test_replace(pattern, string, rep, exp) + dim x, re + set re = new regexp + re.pattern = pattern + re.global = test_global + x = re.replace(string, rep) + call ok(x = exp, "replace returned " & x & " expected " & exp) +end sub + +test_global = true +test_replace "xxx", "xxxx", "y", "yx" +test_replace "\[([^\[]+)\]", "- [test] -", "success", "- success -" +test_replace "\[([^\[]+)\]", "[test] [test]", "aa", "aa aa" +test_replace "(\&(\d))", "abc &1 123", "$'", "abc 123 123" +test_replace "(\&(\d))", "abc &1 123", "$`", "abc abc 123" +test_replace "(\&(\d))", "abc &1 123", "$3", "abc $3 123" +test_replace "\[([^\[]+)\]", "- [test] -", true, "- -1 -" +test_replace "\[([^\[]+)\]", "- [test] -", 6, "- 6 -" +test_replace "(\$(\d))", "$1,$2", "$$1-$1$2", "$1-$11,$1-$22" +test_replace "b", "abc", "x$&z", "axbzc" + +test_global = false +test_replace "\[([^\[]+)\]", "[test] [test]", "aa", "aa [test]" + +set r = new regexp +x = r.replace("xxx", "y") +call ok(x = "yxxx", "x = " & x) +r.global = true +x = r.replace("xxx", "y") +call ok(x = "yxyxyxy", "x = " & x) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 3400e81066..4edf9dcbfe 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -19,6 +19,7 @@ #include "vbscript.h" #include "regexp.h" #include "vbsregexp55.h" +#include "wchar.h" #include "wine/debug.h" @@ -1432,13 +1433,179 @@ static HRESULT WINAPI RegExp2_Test(IRegExp2 *iface, BSTR sourceString, VARIANT_B return hres; } -static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR sourceString, - VARIANT replaceVar, BSTR *pDestString) +typedef struct { + WCHAR *buf; + DWORD size; + DWORD len; +} strbuf_t; + +static BOOL strbuf_ensure_size(strbuf_t *buf, unsigned len) +{ + WCHAR *new_buf; + DWORD new_size; + + if(len <= buf->size) + return TRUE; + + new_size = buf->size ? buf->size<<1 : 16; + if(new_size < len) + new_size = len; + if(buf->buf) + new_buf = heap_realloc(buf->buf, new_size*sizeof(WCHAR)); + else + new_buf = heap_alloc(new_size*sizeof(WCHAR)); + if(!new_buf) + return FALSE; + + buf->buf = new_buf; + buf->size = new_size; + return TRUE; +} + +static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) +{ + if(!len) + return S_OK; + + if(!strbuf_ensure_size(buf, buf->len+len)) + return E_OUTOFMEMORY; + + memcpy(buf->buf+buf->len, str, len*sizeof(WCHAR)); + buf->len += len; + return S_OK; +} + +static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT replaceVar, BSTR *ret) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(sourceString), - debugstr_variant(&replaceVar), pDestString); - return E_NOTIMPL; + const WCHAR *cp, *prev_cp = NULL, *ptr, *prev_ptr; + size_t match_len = 0, source_len, replace_len; + strbuf_t buf = { NULL, 0, 0 }; + match_state_t *state = NULL; + heap_pool_t *mark; + VARIANT strv; + BSTR replace; + HRESULT hres; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(source), debugstr_variant(&replaceVar), ret); + + if(This->pattern) { + if(!This->regexp) { + This->regexp = regexp_new(NULL, &This->pool, This->pattern, + lstrlenW(This->pattern), This->flags, FALSE); + if(!This->regexp) + return E_OUTOFMEMORY; + }else { + hres = regexp_set_flags(&This->regexp, NULL, &This->pool, This->flags); + if(FAILED(hres)) + return hres; + } + } + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeType(&strv, &replaceVar, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + replace = V_BSTR(&strv); + replace_len = SysStringLen(replace); + source_len = SysStringLen(source); + + mark = heap_pool_mark(&This->pool); + cp = source; + if(This->regexp && !(state = alloc_match_state(This->regexp, &This->pool, cp))) + hres = E_OUTOFMEMORY; + + while(SUCCEEDED(hres)) { + if(This->regexp) { + prev_cp = cp; + hres = regexp_execute(This->regexp, NULL, &This->pool, source, source_len, state); + if(hres != S_OK) break; + cp = state->cp; + match_len = state->match_len; + }else if(prev_cp) { + if(cp == source + source_len) + break; + prev_cp = cp++; + }else { + prev_cp = cp; + } + + hres = strbuf_append(&buf, prev_cp, cp - prev_cp - match_len); + if(FAILED(hres)) + break; + + prev_ptr = replace; + while((ptr = wmemchr(prev_ptr, '$', replace + replace_len - prev_ptr))) { + hres = strbuf_append(&buf, prev_ptr, ptr - prev_ptr); + if(FAILED(hres)) + break; + + switch(ptr[1]) { + case '$': + hres = strbuf_append(&buf, ptr, 1); + prev_ptr = ptr + 2; + break; + case '&': + hres = strbuf_append(&buf, cp - match_len, match_len); + prev_ptr = ptr + 2; + break; + case '`': + hres = strbuf_append(&buf, source, cp - source - match_len); + prev_ptr = ptr + 2; + break; + case '\'': + hres = strbuf_append(&buf, cp, source + source_len - cp); + prev_ptr = ptr + 2; + break; + default: { + DWORD idx; + + if(!iswdigit(ptr[1])) { + hres = strbuf_append(&buf, ptr, 1); + prev_ptr = ptr + 1; + break; + } + + idx = ptr[1] - '0'; + if(iswdigit(ptr[2]) && idx * 10 + (ptr[2] - '0') <= state->paren_count) { + idx = idx * 10 + (ptr[2] - '0'); + prev_ptr = ptr + 3; + }else if(idx && idx <= state->paren_count) { + prev_ptr = ptr + 2; + }else { + hres = strbuf_append(&buf, ptr, 1); + prev_ptr = ptr + 1; + break; + } + + if(state->parens[idx - 1].index != -1) + hres = strbuf_append(&buf, source + state->parens[idx - 1].index, + state->parens[idx - 1].length); + break; + } + } + if(FAILED(hres)) + break; + } + if(SUCCEEDED(hres)) + hres = strbuf_append(&buf, prev_ptr, replace + replace_len - prev_ptr); + if(FAILED(hres)) + break; + + if(!(This->flags & REG_GLOB)) + break; + } + + if(SUCCEEDED(hres)) { + hres = strbuf_append(&buf, cp, source + source_len - cp); + if(SUCCEEDED(hres) && !(*ret = SysAllocStringLen(buf.buf, buf.len))) + hres = E_OUTOFMEMORY; + } + + heap_pool_clear(mark); + heap_free(buf.buf); + SysFreeString(replace); + return hres; } static const IRegExp2Vtbl RegExp2Vtbl = {

1 0