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

Jacek Caban : wineconsole: Use renderer handle instead of hConOut where possible.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 1f5a45e63ecff2f83eb927e253007bd75fb36c05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5a45e63ecff2f83eb927e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:47 2020 +0200 wineconsole: Use renderer handle instead of hConOut where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index ff38bafe2c..3f56bdb0ca 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -324,7 +324,7 @@ static void WCCURSES_ComputePositions(struct inner_data* data) data->curcfg.win_width, data->curcfg.win_height, x, y); pos.Left = pos.Top = 0; pos.Right = x - 1; pos.Bottom = y - 1; - SetConsoleWindowInfo(data->hConOut, FALSE, &pos); + SetConsoleWindowInfo(data->console, FALSE, &pos); return; /* we'll get called again upon event for new window size */ } if (PRIVATE(data)->pad) WCCURSES_PosCursor(data); diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 67531c0045..4476845154 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -687,7 +687,7 @@ static void WCUSER_CopySelectionToClipboard(const struct inner_data* data) LPWSTR end; DWORD count; - ReadConsoleOutputCharacterW(data->hConOut, p, w - 1, c, &count); + ReadConsoleOutputCharacterW(data->console, p, w - 1, c, &count); /* strip spaces from the end of the line */ end = p + w - 1; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7e39ed5e51..63fdb7e72f 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -70,7 +70,7 @@ static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) COORD size = { data->curcfg.sb_width, data->curcfg.sb_height }; COORD coord = { 0, upd_tp }; - if (ReadConsoleOutputW(data->hConOut, data->cells, size, coord, &region)) + if (ReadConsoleOutputW(data->console, data->cells, size, coord, &region)) data->fnRefresh(data, upd_tp, upd_bm); } @@ -186,7 +186,7 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* params.info.popup_attr = cfg->popup_attr; memcpy(params.info.color_map, cfg->color_map, sizeof(cfg->color_map)); - DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); + DeviceIoControl(data->console, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /****************************************************************** @@ -383,11 +383,11 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf * (no notification is sent when invariant operation is requested) */ cinfo.bVisible = !cfg->cursor_visible; - SetConsoleCursorInfo(data->hConOut, &cinfo); + SetConsoleCursorInfo(data->console, &cinfo); /* </FIXME> */ cinfo.bVisible = cfg->cursor_visible; /* this shall update (through notif) curcfg */ - SetConsoleCursorInfo(data->hConOut, &cinfo); + SetConsoleCursorInfo(data->console, &cinfo); } if (data->curcfg.history_size != cfg->history_size) { @@ -425,7 +425,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf params->info.font_weight = cfg->font_weight; params->info.font_pitch_family = cfg->font_pitch_family; memcpy(params + 1, cfg->face_name, len * sizeof(WCHAR)); - DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), + DeviceIoControl(data->console, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), NULL, 0, NULL, NULL); } } @@ -436,8 +436,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.def_attr = cfg->def_attr; screen_size = cfg->win_width * (cfg->win_height + 1); - FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); - SetConsoleTextAttribute(data->hConOut, cfg->def_attr); + FillConsoleOutputAttribute(data->console, cfg->def_attr, screen_size, top_left, &written); + SetConsoleTextAttribute(data->console, cfg->def_attr); } WINECON_SetColors(data, cfg); /* now let's look at the window / sb size changes... @@ -454,13 +454,13 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf #define ChgSBfWidth() do {c.X = cfg->sb_width; \ c.Y = data->curcfg.sb_height;\ - SetConsoleScreenBufferSize(data->hConOut, c);\ + SetConsoleScreenBufferSize(data->console, c);\ } while (0) #define ChgWinHPos() do {pos.Left = cfg->win_pos.X - data->curcfg.win_pos.X; \ pos.Top = 0; \ pos.Right = pos.Left + cfg->win_width - data->curcfg.win_width; \ pos.Bottom = 0; \ - SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ + SetConsoleWindowInfo(data->console, FALSE, &pos);\ } while (0) #define TstSBfHeight() (data->curcfg.sb_height != cfg->sb_height) #define TstWinVPos() (data->curcfg.win_height != cfg->win_height || data->curcfg.win_pos.Y != cfg->win_pos.Y) @@ -468,13 +468,13 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf /* since we're going to apply height after width is done, we use width as defined * in cfg, and not in data->curcfg because if won't be updated yet */ #define ChgSBfHeight() do {c.X = cfg->sb_width; c.Y = cfg->sb_height; \ - SetConsoleScreenBufferSize(data->hConOut, c); \ + SetConsoleScreenBufferSize(data->console, c); \ } while (0) #define ChgWinVPos() do {pos.Left = 0; \ pos.Top = cfg->win_pos.Y - data->curcfg.win_pos.Y; \ pos.Right = 0; \ pos.Bottom = pos.Top + cfg->win_height - data->curcfg.win_height; \ - SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ + SetConsoleWindowInfo(data->console, FALSE, &pos);\ } while (0) do @@ -582,7 +582,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); - if (!DeviceIoControl(data->hConOut, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &output_info, sizeof(output_info), NULL, NULL)) return FALSE; data->curcfg.cursor_size = output_info.cursor_size;

1 0

Myah Caron : amstream: Implement IMediaStreamFilter::GetDuration.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 17f766a853ede17e3f4365692c593d16c9e657cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=17f766a853ede17e3f436569… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Jul 28 16:13:59 2020 -0500 amstream: Implement IMediaStreamFilter::GetDuration. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 19 +++++- dlls/amstream/tests/amstream.c | 130 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180..b99cc4cda0 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,24 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("filter %p, duration %p.\n", filter, duration); + + EnterCriticalSection(&filter->cs); + + if (!(seeking = get_seeking(filter->seekable_stream))) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + hr = IMediaSeeking_GetDuration(seeking, duration); + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 68d2b9c18f..5402734b3d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -5099,6 +5099,135 @@ static void test_mediastreamfilter_set_positions(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_duration(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + struct testfilter source1, source2, source3; + IAMMediaStream *stream1, *stream2, *stream3; + IMediaStreamFilter *filter; + IPin *pin1, *pin2, *pin3; + IMediaSeeking *seeking; + IGraphBuilder *graph; + LONGLONG duration; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_FAIL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + source2.get_duration_hr = E_NOTIMPL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(duration == 0xdeadbeefdeadbeefULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5340,6 +5469,7 @@ START_TEST(amstream) test_mediastreamfilter_stop_pause_run(); test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); + test_mediastreamfilter_get_duration(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize();

1 0

Myah Caron : amstream: Implement IMediaStreamFilter::GetStopPosition.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: fc74e4b3dca5a8d4f22e53025a1f99ef1dff7fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc74e4b3dca5a8d4f22e5302… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Tue Jul 28 16:14:01 2020 -0500 amstream: Implement IMediaStreamFilter::GetStopPosition. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 19 +++++- dlls/amstream/tests/amstream.c | 139 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index b99cc4cda0..13fd30c3a5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -795,9 +795,24 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("filter %p, stop %p.\n", filter, stop); + + EnterCriticalSection(&filter->cs); + + if (!(seeking = get_seeking(filter->seekable_stream))) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + hr = IMediaSeeking_GetStopPosition(seeking, stop); + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 85dcac91ad..c5cdd7aaee 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -814,6 +814,7 @@ struct testfilter LONGLONG current_position; LONGLONG stop_position; HRESULT get_duration_hr; + HRESULT get_stop_position_hr; HRESULT set_positions_hr; HRESULT init_stream_hr; HRESULT cleanup_stream_hr; @@ -997,8 +998,12 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + if (SUCCEEDED(filter->get_stop_position_hr)) + *stop = 0x8000000000000000ULL; + + return filter->get_stop_position_hr; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -5307,6 +5312,135 @@ static void test_mediastreamfilter_get_duration(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_mediastreamfilter_get_stop_position(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + static const MSPID mspid1 = {0x88888888, 1}; + static const MSPID mspid2 = {0x88888888, 2}; + static const MSPID mspid3 = {0x88888888, 3}; + struct testfilter source1, source2, source3; + IAMMediaStream *stream1, *stream2, *stream3; + IMediaStreamFilter *filter; + IPin *pin1, *pin2, *pin3; + IMediaSeeking *seeking; + IGraphBuilder *graph; + LONGLONG stop; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioStream, NULL, CLSCTX_INPROC_SERVER, &IID_IAMMediaStream, (void **)&stream3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream1, NULL, 0, &mspid1, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream2, NULL, 0, &mspid2, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_Initialize(stream3, NULL, 0, &mspid3, STREAMTYPE_READ); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream1, &mspid1, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream2, &mspid2, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)stream3, &mspid3, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream2, &IID_IPin, (void **)&pin2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMediaStream_QueryInterface(stream3, &IID_IPin, (void **)&pin3); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source1); + testfilter_init(&source2); + testfilter_init(&source3); + source1.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source2.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + source3.IMediaSeeking_iface.lpVtbl = &testsource_seeking_vtbl; + hr = IGraphBuilder_AddFilter(graph, &source1.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source2.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + stop = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stop == 0x8000000000000000ULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + + source2.get_stop_position_hr = E_FAIL; + stop = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + + source2.get_stop_position_hr = E_NOTIMPL; + stop = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + + source2.IMediaSeeking_iface.lpVtbl = NULL; + stop = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &stop); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + ok(stop == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(stop)); + + IGraphBuilder_Disconnect(graph, pin2); + IGraphBuilder_Disconnect(graph, &source2.source.pin.IPin_iface); + IGraphBuilder_Disconnect(graph, pin3); + IGraphBuilder_Disconnect(graph, &source3.source.pin.IPin_iface); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMediaSeeking_Release(seeking); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin1); + ref = IAMMediaStream_Release(stream1); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin2); + ref = IAMMediaStream_Release(stream2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin3); + ref = IAMMediaStream_Release(stream3); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_mediastreamfilter_get_current_stream_time(void) { IMediaStreamFilter *filter; @@ -5550,6 +5684,7 @@ START_TEST(amstream) test_mediastreamfilter_support_seeking(); test_mediastreamfilter_set_positions(); test_mediastreamfilter_get_duration(); + test_mediastreamfilter_get_stop_position(); test_mediastreamfilter_get_current_stream_time(); CoUninitialize();

1 0

Shawn M. Chapla : gdiplus/tests: Fix 'LogicalDpiY' typos in metafile tests.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 7c2d5d40e57a918ece5353a2d6ff230b610b7113 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c2d5d40e57a918ece5353a2… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Jul 28 17:20:04 2020 -0400 gdiplus/tests: Fix 'LogicalDpiY' typos in metafile tests. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index e2d5171f8a..47978d64d8 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -500,7 +500,7 @@ static void test_empty(void) expect(100, header.Height); expect(28, header.EmfPlusHeaderSize); expect(96, header.LogicalDpiX); - expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); @@ -539,7 +539,7 @@ static void test_empty(void) expect(100, header.Height); expect(28, header.EmfPlusHeaderSize); expect(96, header.LogicalDpiX); - expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); @@ -586,7 +586,7 @@ static void test_empty(void) expect(100, header.Height); expect(28, header.EmfPlusHeaderSize); expect(96, header.LogicalDpiX); - expect(96, header.LogicalDpiX); + expect(96, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(0, U(header).EmfHeader.rclBounds.left); expect(0, U(header).EmfHeader.rclBounds.top); @@ -875,7 +875,7 @@ static void test_emfonly(void) expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); - expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(25, U(header).EmfHeader.rclBounds.left); expect(25, U(header).EmfHeader.rclBounds.top); @@ -971,7 +971,7 @@ static void test_emfonly(void) expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); - expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(25, U(header).EmfHeader.rclBounds.left); expect(25, U(header).EmfHeader.rclBounds.top); @@ -1018,7 +1018,7 @@ static void test_emfonly(void) expect(100, header.Height); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); - expect(0, header.LogicalDpiX); + expect(0, header.LogicalDpiY); expect(EMR_HEADER, U(header).EmfHeader.iType); expect(25, U(header).EmfHeader.rclBounds.left); expect(25, U(header).EmfHeader.rclBounds.top);

1 0

Dmitry Timoshkov : ieframe: Implement IOleObject::Advise().
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 0b941ea871482924c1e356b70fe3975fb984fd44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b941ea871482924c1e356b7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:16 2020 +0800 ieframe: Implement IOleObject::Advise(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 2 ++ dlls/ieframe/oleobject.c | 23 ++++++++++++++++++++--- dlls/ieframe/webbrowser.c | 3 +++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8d238863be..329cea2f7c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -199,6 +199,8 @@ struct WebBrowser { DWORD sink_aspects; DWORD sink_flags; + IOleAdviseHolder *advise_holder; + /* window context */ HWND frame_hwnd; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 62faaae6bd..9f5da4039d 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -760,11 +760,28 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, } static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, - DWORD* pdwConnection) + DWORD *pdwConnection) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%p, %p)\n", This, pAdvSink, pdwConnection); + + if(!pdwConnection) + return E_INVALIDARG; + + *pdwConnection = 0; + + if(!pAdvSink) + return E_INVALIDARG; + + if(!This->advise_holder) + hr = CreateOleAdviseHolder(&This->advise_holder); + + if(hr == S_OK) + hr = IOleAdviseHolder_Advise(This->advise_holder, pAdvSink, pdwConnection); + + return hr; } static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 356b0a2833..87b74b8e01 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -170,6 +170,9 @@ static ULONG WINAPI WebBrowser_Release(IUnknown *iface) if(This->sink) IAdviseSink_Release(This->sink); + if(This->advise_holder) + IOleAdviseHolder_Release(This->advise_holder); + if(This->doc_host.document) IUnknown_Release(This->doc_host.document);

1 0

Dmitry Timoshkov : ieframe: Implement IOleObject::EnumAdvise().
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: c08a89fc757ab84f242df46ce932dccd122d41df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08a89fc757ab84f242df46c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:22 2020 +0800 ieframe: Implement IOleObject::EnumAdvise(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 80568fbf8a..a3fa645334 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -799,8 +799,11 @@ static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **ppenumAdvise) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); - return S_OK; + + TRACE("(%p)->(%p): returning E_NOTIMPL\n", This, ppenumAdvise); + + *ppenumAdvise = NULL; + return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus)

1 0

Dmitry Timoshkov : ieframe: IOleObject::Close() should notify OnClose() advise sink.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: d4ba3d866db53aede9cc14b3f3e09045fce2e164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ba3d866db53aede9cc14b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:25 2020 +0800 ieframe: IOleObject::Close() should notify OnClose() advise sink. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index a3fa645334..031994caa5 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -610,6 +610,10 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) IOleClientSite_AddRef(This->client); hres = IOleObject_SetClientSite(iface, NULL); This->client_closed = client; + + if(This->advise_holder) + IOleAdviseHolder_SendOnClose(This->advise_holder); + return hres; }

1 0

Dmitry Timoshkov : ieframe/tests: Add some tests for IOleObject::Advise(), IOleObject::Unadvise() and IOleObject::EnumAdvise().
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: fbe3db119778f8a03f4b08906fc9c8e84830f395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbe3db119778f8a03f4b0890… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 29 16:57:32 2020 +0800 ieframe/tests: Add some tests for IOleObject::Advise(), IOleObject::Unadvise() and IOleObject::EnumAdvise(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 107 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3ec5921a32..e0af0d4642 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -47,6 +47,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(outer_test_iid,0x06d4cd6c,0x18dd,0x11ea,0x8e,0x76,0xfc,0xaa,0x14,0x72,0x2d,0xac); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -157,6 +158,7 @@ DEFINE_EXPECT(OnFocus_TRUE); DEFINE_EXPECT(OnFocus_FALSE); DEFINE_EXPECT(GetExternal); DEFINE_EXPECT(outer_QI_test); +DEFINE_EXPECT(Advise_OnClose); static const WCHAR wszItem[] = {'i','t','e','m',0}; @@ -184,6 +186,7 @@ static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ static DWORD dwl_flags; +static IAdviseSink test_sink; /* Returns true if the user interface is in English. Note that this does not * presume of the formatting of dates, numbers, etc. @@ -1834,12 +1837,16 @@ static void test_DoVerb(IWebBrowser2 *unk) IOleObject *oleobj; RECT rect = {0,0,1000,1000}; HRESULT hres; + DWORD connection; hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + SET_EXPECT(CanInPlaceActivate); SET_EXPECT(Site_GetWindow); SET_EXPECT(OnInPlaceActivate); @@ -1874,6 +1881,9 @@ static void test_DoVerb(IWebBrowser2 *unk) 0, (HWND)0xdeadbeef, &rect); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + IOleObject_Release(oleobj); } @@ -3681,6 +3691,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) }else { nav_back_todo = nav_forward_todo = TRUE; } + SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); CHECK_CALLED(Frame_SetActiveObject); @@ -3702,6 +3713,7 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) }else { nav_back_todo = nav_forward_todo = FALSE; } + CHECK_CALLED(Advise_OnClose); hres = IOleObject_GetClientSite(oo, &ocs); ok(hres == S_OK, "hres = %x\n", hres); @@ -3728,16 +3740,66 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) SET_EXPECT(OnFocus_FALSE); SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); + SET_EXPECT(Advise_OnClose); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); + CHECK_CALLED(Advise_OnClose); test_close = FALSE; IOleObject_Release(oo); } +static void test_Advise(IWebBrowser2 *wb) +{ + IOleObject *oleobj; + IEnumSTATDATA *data; + DWORD connection[2]; + HRESULT hres; + + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, 0); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + data = (void *)0xdeadbeef; + hres = IOleObject_EnumAdvise(oleobj, &data); + ok(hres == E_NOTIMPL, "EnumAdvise returned: %08x\n", hres); + ok(data == NULL, "got data %p\n", data); + + connection[0] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, NULL, &connection[0]); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + ok(connection[0] == 0, "got connection %u\n", connection[0]); + + hres = IOleObject_Advise(oleobj, &test_sink, NULL); + ok(hres == E_INVALIDARG, "Advise returned: %08x\n", hres); + + connection[0] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, &test_sink, &connection[0]); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(connection[0] != 0xdeadbeef, "got connection %u\n", connection[0]); + + connection[1] = 0xdeadbeef; + hres = IOleObject_Advise(oleobj, &test_sink, &connection[1]); + ok(hres == S_OK, "Advise returned: %08x\n", hres); + ok(connection[1] == connection[0] + 1, "got connection %u\n", connection[1]); + + hres = IOleObject_Unadvise(oleobj, connection[1]); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, connection[1]); + ok(hres == OLE_E_NOCONNECTION, "Unadvise returned: %08x\n", hres); + + hres = IOleObject_Unadvise(oleobj, connection[0]); + ok(hres == S_OK, "Unadvise returned: %08x\n", hres); + + IOleObject_Release(oleobj); +} + #define TEST_DOWNLOAD 0x0001 #define TEST_NOOLECMD 0x0002 #define TEST_NODOCHOST 0x0004 @@ -3756,7 +3818,9 @@ static void init_test(IWebBrowser2 *webbrowser, DWORD flags) static void test_WebBrowser(DWORD flags, BOOL do_close) { IWebBrowser2 *webbrowser; - ULONG ref; + IOleObject *oleobj; + HRESULT hres; + ULONG ref, connection; webbrowser = create_webbrowser(); if(!webbrowser) @@ -3764,6 +3828,12 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) init_test(webbrowser, flags); + hres = IWebBrowser2_QueryInterface(webbrowser, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_QueryStatusWB(webbrowser, FALSE); test_ExecWB(webbrowser, FALSE); test_QueryInterface(webbrowser); @@ -3781,6 +3851,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); test_OleObject(webbrowser, 2); + test_Advise(webbrowser); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3866,6 +3937,11 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ConnectionPoint(webbrowser, FALSE); test_IServiceProvider(webbrowser); + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IOleObject_Release(oleobj); + ref = IWebBrowser2_Release(webbrowser); ok(ref == 0 || broken(do_download && !do_close), "ref=%d, expected 0\n", ref); } @@ -3873,7 +3949,8 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) static void test_WebBrowserV1(void) { IWebBrowser2 *wb; - ULONG ref; + IOleObject *oleobj; + ULONG ref, connection; HRESULT hres; hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -3883,6 +3960,12 @@ static void test_WebBrowserV1(void) init_test(wb, 0); wb_version = 1; + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + + hres = IOleObject_Advise(oleobj, &test_sink, &connection); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + test_QueryStatusWB(wb, FALSE); test_ExecWB(wb, FALSE); test_QueryInterface(wb); @@ -3891,6 +3974,12 @@ static void test_WebBrowserV1(void) test_EnumVerbs(wb); test_Persist(wb, 1); test_OleObject(wb, 1); + test_Advise(wb); + + hres = IOleObject_Unadvise(oleobj, connection); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); + + IOleObject_Release(oleobj); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref); @@ -4038,6 +4127,9 @@ static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void return S_OK; } + if (IsEqualGUID(riid, &IID_IProxyManager)) + return E_NOINTERFACE; + ok(0, "unexpected call QI(%s)\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -4054,27 +4146,28 @@ static ULONG WINAPI sink_Release(IAdviseSink *iface) static void WINAPI sink_OnDataChange(IAdviseSink *iface, FORMATETC *format, STGMEDIUM *medium) { - trace("%p, %p, %p\n", iface, format, medium); + trace("OnDataChange(%p, %p, %p)\n", iface, format, medium); } static void WINAPI sink_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) { - trace("%p, %08x, %d\n", iface, aspect, index); + trace("OnViewChange(%p, %08x, %d)\n", iface, aspect, index); } static void WINAPI sink_OnRename(IAdviseSink *iface, IMoniker *moniker) { - trace("%p, %p\n", iface, moniker); + trace("OnRename(%p, %p) \n", iface, moniker); } static void WINAPI sink_OnSave(IAdviseSink *iface) { - trace("%p\n", iface); + trace("OnSave(%p)\n", iface); } static void WINAPI sink_OnClose(IAdviseSink *iface) { - trace("%p\n", iface); + trace("OnClose(%p)\n", iface); + CHECK_EXPECT(Advise_OnClose); } static const IAdviseSinkVtbl sink_vtbl =

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SCROLL ioctl.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 7ae370a5491b58eeec03961b09dcf5ae5e53e411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae370a5491b58eeec03961b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:36:05 2020 +0200 server: Introduce IOCTL_CONDRV_SCROLL ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 29 +++++++++---- server/console.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 135 insertions(+), 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 839db84ea5..a6df63155c 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -22,6 +22,7 @@ #define _INC_CONDRV #include "winioctl.h" +#include "wincon.h" /* common console input and output ioctls */ #define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -43,6 +44,7 @@ #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_DATA) /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) @@ -133,6 +135,16 @@ struct condrv_output_info_params struct condrv_output_info info; /* output info */ }; +#define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 +#define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 +#define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 +#define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 +#define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 +#define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 +#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 + /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params { @@ -145,15 +157,14 @@ struct condrv_fill_output_params unsigned short attr; /* attribute to write */ }; -#define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x0001 -#define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x0002 -#define SET_CONSOLE_OUTPUT_INFO_SIZE 0x0004 -#define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 -#define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 -#define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 -#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 -#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 -#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 +/* IOCTL_CONDRV_SCROLL params */ +struct condrv_scroll_params +{ + SMALL_RECT scroll; /* source rectangle */ + COORD origin; /* destination coordinates */ + SMALL_RECT clip; /* clipping rectangle */ + char_info_t fill; /* empty character info */ +}; /* IOCTL_CONDRV_GET_RENDERER_EVENTS result */ struct condrv_renderer_event diff --git a/server/console.c b/server/console.c index 8bd3e94e65..f924ddc06b 100644 --- a/server/console.c +++ b/server/console.c @@ -1446,7 +1446,85 @@ static int fill_console_output( struct screen_buffer *screen_buffer, char_info_t /* scroll parts of a screen buffer */ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, - int w, int h ) + int w, int h, const rectangle_t *clip, char_info_t fill ) +{ + struct condrv_renderer_event evt; + rectangle_t src, dst; + int x, y; + + src.left = max( xsrc, clip->left ); + src.top = max( ysrc, clip->top ); + src.right = min( xsrc + w - 1, clip->right ); + src.bottom = min( ysrc + h - 1, clip->bottom ); + + dst.left = xdst; + dst.top = ydst; + dst.right = xdst + w - 1; + dst.bottom = ydst + h - 1; + + if (dst.left < clip->left) + { + xsrc += clip->left - dst.left; + w -= clip->left - dst.left; + dst.left = clip->left; + } + if (dst.top < clip->top) + { + ysrc += clip->top - dst.top; + h -= clip->top - dst.top; + dst.top = clip->top; + } + if (dst.right > clip->right) w -= dst.right - clip->right; + if (dst.bottom > clip->bottom) h -= dst.bottom - clip->bottom; + + if (w > 0 && h > 0) + { + if (ysrc < ydst) + { + for (y = h; y > 0; y--) + { + memcpy( &screen_buffer->data[(dst.top + y - 1) * screen_buffer->width + dst.left], + &screen_buffer->data[(ysrc + y - 1) * screen_buffer->width + xsrc], + w * sizeof(screen_buffer->data[0]) ); + } + } + else + { + for (y = 0; y < h; y++) + { + /* we use memmove here because when psrc and pdst are the same, + * copies are done on the same row, so the dst and src blocks + * can overlap */ + memmove( &screen_buffer->data[(dst.top + y) * screen_buffer->width + dst.left], + &screen_buffer->data[(ysrc + y) * screen_buffer->width + xsrc], + w * sizeof(screen_buffer->data[0]) ); + } + } + } + + for (y = src.top; y <= src.bottom; y++) + { + int left = src.left; + int right = src.right; + if (dst.top <= y && y <= dst.bottom) + { + if (dst.left <= src.left) left = max( left, dst.right + 1 ); + if (dst.left >= src.left) right = min( right, dst.left - 1 ); + } + for (x = left; x <= right; x++) screen_buffer->data[y * screen_buffer->width + x] = fill; + } + + /* FIXME: this could be enhanced, by signalling scroll */ + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); + evt.u.update.top = min( src.top, dst.top ); + evt.u.update.bottom = max( src.bottom, dst.bottom ); + console_input_events_append( screen_buffer->input, &evt ); +} + +/* scroll parts of a screen buffer */ +static void scroll_console_output_req( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, + int w, int h ) { int j; char_info_t *psrc, *pdst; @@ -1811,6 +1889,40 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return !get_error(); } + case IOCTL_CONDRV_SCROLL: + { + const struct condrv_scroll_params *params = get_req_data(); + rectangle_t clip; + if (get_req_data_size() != sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (console_input_is_bare( screen_buffer->input ) || !screen_buffer->input) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; + } + clip.left = max( params->clip.Left, 0 ); + clip.top = max( params->clip.Top, 0 ); + clip.right = min( params->clip.Right, screen_buffer->width - 1 ); + clip.bottom = min( params->clip.Bottom, screen_buffer->height - 1 ); + if (clip.left > clip.right || clip.top > clip.bottom || params->scroll.Left < 0 || params->scroll.Top < 0 || + params->scroll.Right >= screen_buffer->width || params->scroll.Bottom >= screen_buffer->height || + params->scroll.Right < params->scroll.Left || params->scroll.Top > params->scroll.Bottom || + params->origin.X < 0 || params->origin.X >= screen_buffer->width || params->origin.Y < 0 || + params->origin.Y >= screen_buffer->height) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + scroll_console_output( screen_buffer, params->scroll.Left, params->scroll.Top, params->origin.X, params->origin.Y, + params->scroll.Right - params->scroll.Left + 1, params->scroll.Bottom - params->scroll.Top + 1, + &clip, params->fill ); + return !get_error(); + } + default: set_error( STATUS_INVALID_HANDLE ); return 0; @@ -2182,8 +2294,8 @@ DECL_HANDLER(move_console_output) release_object( screen_buffer ); return; } - scroll_console_output( screen_buffer, req->x_src, req->y_src, req->x_dst, req->y_dst, - req->w, req->h ); + scroll_console_output_req( screen_buffer, req->x_src, req->y_src, req->x_dst, req->y_dst, + req->w, req->h ); release_object( screen_buffer ); } }

1 0

Zebediah Figura : wpp: Correct the spelling of "ellipsis".
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 047827b1c9f92c31350bca6179d2b22093e4721c URL: https://source.winehq.org/git/wine.git/?a=commit;h=047827b1c9f92c31350bca61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 28 16:32:19 2020 -0500 wpp: Correct the spelling of "ellipsis". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppl.l | 2 +- libs/wpp/ppy.y | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index a68124355b..566cf2f73f 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -522,7 +522,7 @@ void pp_writestring(const char *format, ...) <pp_macro>{ws}+ ; <pp_macro>{cident} ppy_lval.cptr = pp_xstrdup(ppy_text); return tIDENT; <pp_macro>, return ','; -<pp_macro>"..." return tELIPSIS; +<pp_macro>"..." return tELLIPSIS; <pp_macro>(\\\r?)|(\n)|(.)|(\.\.?) ppy_error("Argument identifier expected"); <pp_macro>\\\r?\n newline(0); diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index eb4f15a4b8..a6c0957994 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -140,7 +140,7 @@ static int nmacro_args; %token tRCINCLUDE %token tIF tIFDEF tIFNDEF tELSE tELIF tENDIF tDEFINED tNL %token tINCLUDE tLINE tGCCLINE tERROR tWARNING tPRAGMA tPPIDENT -%token tUNDEF tMACROEND tCONCAT tELIPSIS tSTRINGIZE +%token tUNDEF tMACROEND tCONCAT tELLIPSIS tSTRINGIZE %token <cptr> tIDENT tLITERAL tMACRO tDEFINE %token <cptr> tDQSTRING tSQSTRING tIQSTRING %token <uint> tUINT @@ -333,7 +333,7 @@ allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } ; emargs : margs { $$ = $1; } - | margs ',' tELIPSIS { $$ = add_new_marg(NULL, arg_list); nmacro_args *= -1; } + | margs ',' tELLIPSIS { $$ = add_new_marg(NULL, arg_list); nmacro_args *= -1; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3, arg_single); }

1 0