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

Rémi Bernon : winedbg: Support qXfer:threads:read request.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: c2a381fbed6e823344fc6e76a1d1d20509ffd3c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2a381fbed6e823344fc6e76… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:46 2020 +0200 winedbg: Support qXfer:threads:read request. As we don't report fork/vfork/exec events, this allows gdb to request the list of known threads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0c154d0b21..2bc6963992 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1522,6 +1522,24 @@ static void packet_query_libraries(struct gdb_context* gdbctx) packet_reply_add(gdbctx, "</library-list>"); } +static void packet_query_threads(struct gdb_context* gdbctx) +{ + struct dbg_process* process = gdbctx->process; + struct dbg_thread* thread; + + packet_reply_add(gdbctx, "<threads>"); + LIST_FOR_EACH_ENTRY(thread, &process->threads, struct dbg_thread, entry) + { + packet_reply_add(gdbctx, "<thread "); + packet_reply_add(gdbctx, "id=\""); + packet_reply_val(gdbctx, thread->tid, 4); + packet_reply_add(gdbctx, "\" name=\""); + packet_reply_add(gdbctx, thread->name); + packet_reply_add(gdbctx, "\"/>"); + } + packet_reply_add(gdbctx, "</threads>"); +} + static enum packet_return packet_query(struct gdb_context* gdbctx) { int off, len; @@ -1614,6 +1632,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) packet_reply_open(gdbctx); packet_reply_add(gdbctx, "QStartNoAckMode+;"); packet_reply_add(gdbctx, "qXfer:libraries:read+;"); + packet_reply_add(gdbctx, "qXfer:threads:read+;"); if (*target_xml) packet_reply_add(gdbctx, "PacketSize=400;qXfer:features:read+"); packet_reply_close(gdbctx); return packet_done; @@ -1655,6 +1674,16 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_done; } + if (sscanf(gdbctx->in_packet, "Xfer:threads:read::%x,%x", &off, &len) == 2) + { + if (!gdbctx->process) return packet_error; + + packet_reply_open_xfer(gdbctx); + packet_query_threads(gdbctx); + packet_reply_close_xfer(gdbctx, off, len); + return packet_done; + } + if (*target_xml && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) return packet_reply(gdbctx, target_xml); break;

1 0

Rémi Bernon : winedbg: Add gdb feature names to the register maps.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: 6bfaa76caae76274f0d99de79d9bc18bafe80d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bfaa76caae76274f0d99de7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:47 2020 +0200 winedbg: Add gdb feature names to the register maps. In order not to repeat the features, registers are expected to be ordered and grouped by feature. If feature name is set only on the first register of a new feature. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 36 +++++------ programs/winedbg/be_arm64.c | 70 ++++++++++----------- programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 85 ++++++++++++------------- programs/winedbg/be_ppc.c | 146 ++++++++++++++++++++++--------------------- programs/winedbg/be_x86_64.c | 117 +++++++++++++++++----------------- 6 files changed, 230 insertions(+), 225 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bfaa76caae76274f0d9…

1 0

Rémi Bernon : winedbg: Add gdb register names to the register maps.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: a650b3d80a4004874d2ca845df45e8c7cdf6e27c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a650b3d80a4004874d2ca845… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:48 2020 +0200 winedbg: Add gdb register names to the register maps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 36 +++++------ programs/winedbg/be_arm64.c | 70 ++++++++++----------- programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 86 ++++++++++++------------- programs/winedbg/be_ppc.c | 146 +++++++++++++++++++++---------------------- programs/winedbg/be_x86_64.c | 118 +++++++++++++++++----------------- 6 files changed, 229 insertions(+), 228 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a650b3d80a4004874d2c…

1 0

Rémi Bernon : winedbg: Add gdb register types to the register maps.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: 771463adbdbedff7baa9e3242c7fd24bb79db034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=771463adbdbedff7baa9e324… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:49 2020 +0200 winedbg: Add gdb register types to the register maps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 36 ++++++------- programs/winedbg/be_arm64.c | 70 ++++++++++++------------- programs/winedbg/be_cpu.h | 1 + programs/winedbg/be_i386.c | 86 +++++++++++++++---------------- programs/winedbg/be_ppc.c | 78 ++++++++++++++-------------- programs/winedbg/be_x86_64.c | 118 +++++++++++++++++++++---------------------- 6 files changed, 195 insertions(+), 194 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=771463adbdbedff7baa9…

1 0

Rémi Bernon : winedbg: Support qXfer:features:read request.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: 99b7e2bb32caa407bc53fcf29f6c6900c639f857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99b7e2bb32caa407bc53fcf2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 3 15:35:50 2020 +0200 winedbg: Support qXfer:features:read request. This reports the full register sets to gdb, telling it about custom offsets and sizes. It will make the gdb specific register length not required anymore. We also have to report architecture specific vector types and flags that are normally builtin in gdb as it does not load them anymore when custom register set is reported. This makes gdb stop using its incorrect heuristics and actually request the library list, it now correctly gets PE modules information and is able to correctly use debug info from mixed modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 168 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 131 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99b7e2bb32caa407bc53…

1 0

Zebediah Figura : ntdll: Synchronize ZwSetLdtEntries spec entry with NtSetLdtEntries.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: 883679031bcdc653bf54846a8830de145d87274d URL: https://source.winehq.org/git/wine.git/?a=commit;h=883679031bcdc653bf54846a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 14:37:12 2020 -0500 ntdll: Synchronize ZwSetLdtEntries spec entry with NtSetLdtEntries. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 873eef55d0..e61a2578da 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1350,7 +1350,7 @@ @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken @ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion -@ stdcall -private ZwSetLdtEntries(long long long long long long) NtSetLdtEntries +@ stdcall -private ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread

1 0

Zebediah Figura : quartz: Return void from basic_video_init().
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: a17d43d67d523121993746ef1f303af1ef81b03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17d43d67d523121993746ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 23:20:44 2020 -0500 quartz: Return void from basic_video_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 2 +- dlls/quartz/video.c | 4 +--- dlls/quartz/videorenderer.c | 4 +--- dlls/quartz/vmr9.c | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 946daeb484..8563edeaae 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -214,7 +214,7 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_SetTargetRect pfnSetTargetRect; } BaseControlVideoFuncTable; -HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, +void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index f59c2dee0c..0f400df481 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -647,13 +647,11 @@ static const IBasicVideoVtbl basic_video_vtbl = basic_video_IsUsingDefaultDestination }; -HRESULT basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, +void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; video->pFilter = filter; video->pPin = pin; video->pFuncsTable = func_table; - - return S_OK; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 73c23603f8..cdb496ba29 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -716,10 +716,8 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) if (FAILED(hr)) goto fail; - hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); - if (FAILED(hr)) - goto fail; if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 07a3dbc241..bdf709cafc 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2326,10 +2326,8 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow))) goto fail; - hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter, + basic_video_init(&object->baseControlVideo, &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); - if (FAILED(hr)) - goto fail; object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL);

1 0

Zebediah Figura : quartz: Get rid of BaseControlVideo_Destroy().
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: 25240a210cc9ac001c880015a0be13676169dda3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25240a210cc9ac001c880015… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 23:20:45 2020 -0500 quartz: Get rid of BaseControlVideo_Destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 - dlls/quartz/video.c | 5 ----- dlls/quartz/videorenderer.c | 1 - 3 files changed, 7 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 8563edeaae..c108e5e4e6 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -216,6 +216,5 @@ typedef struct BaseControlVideoFuncTable void basic_video_init(BaseControlVideo *video, struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) DECLSPEC_HIDDEN; -HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) DECLSPEC_HIDDEN; #endif /* __QUARTZ_PRIVATE_INCLUDED__ */ diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 0f400df481..11baee261d 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -27,11 +27,6 @@ static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface) return CONTAINING_RECORD(iface, BaseControlVideo, IBasicVideo_iface); } -HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) -{ - return S_OK; -} - static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) { LONG VideoWidth, VideoHeight; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index cdb496ba29..0b4db6eaec 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -244,7 +244,6 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) struct video_renderer *filter = impl_from_strmbase_renderer(iface); BaseControlWindow_Destroy(&filter->baseControlWindow); - BaseControlVideo_Destroy(&filter->baseControlVideo); CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); free(filter);

1 0

Zebediah Figura : quartz: Get rid of the BaseControlWindow typedef.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: 64e33d11734305bbbbdc553c03741378466f13e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64e33d11734305bbbbdc553c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 23:20:46 2020 -0500 quartz: Get rid of the BaseControlWindow typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 8 ++-- dlls/quartz/videorenderer.c | 2 +- dlls/quartz/vmr9.c | 2 +- dlls/quartz/window.c | 94 ++++++++++++++++++++++---------------------- 4 files changed, 53 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64e33d11734305bbbbdc…

1 0

Zebediah Figura : quartz: Get rid of the BaseWindowFuncTable typedef.
by Alexandre Julliard 03 Apr '20

03 Apr '20

Module: wine Branch: master Commit: f9653494a9a6c9b4eff6563a4428b42b4d4423b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9653494a9a6c9b4eff6563a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 2 23:20:47 2020 -0500 quartz: Get rid of the BaseWindowFuncTable typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 10 +++++----- dlls/quartz/videorenderer.c | 6 +++--- dlls/quartz/vmr9.c | 5 +++-- dlls/quartz/window.c | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index cf696f7936..dafdc82d06 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -93,21 +93,21 @@ typedef struct tagBaseWindow LONG Width; LONG Height; - const struct BaseWindowFuncTable* pFuncsTable; + const struct video_window_ops *pFuncsTable; } BaseWindow; typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); -typedef struct BaseWindowFuncTable +struct video_window_ops { /* Required */ BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ BaseWindow_OnSize pfnOnSize; -} BaseWindowFuncTable; +}; -HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable) DECLSPEC_HIDDEN; +HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const struct video_window_ops *pFuncsTable) DECLSPEC_HIDDEN; HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow) DECLSPEC_HIDDEN; HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) DECLSPEC_HIDDEN; @@ -126,7 +126,7 @@ struct video_window }; HRESULT video_window_init(struct video_window *window, const IVideoWindowVtbl *vtbl, - struct strmbase_filter *filter, struct strmbase_pin *pin, const BaseWindowFuncTable *func_table) DECLSPEC_HIDDEN; + struct strmbase_filter *filter, struct strmbase_pin *pin, const struct video_window_ops *ops) DECLSPEC_HIDDEN; void video_window_unregister_class(void) DECLSPEC_HIDDEN; HRESULT WINAPI BaseControlWindow_Destroy(struct video_window *window) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ef27a8a87d..24d734892c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -344,7 +344,8 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_pin_query_interface = video_renderer_pin_query_interface, }; -static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { +static const struct video_window_ops window_ops = +{ VideoRenderer_GetDefaultRect, VideoRenderer_OnSize }; @@ -710,8 +711,7 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) object->IOverlay_iface.lpVtbl = &overlay_vtbl; hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, - &object->renderer.filter, &object->renderer.sink.pin, - &renderer_BaseWindowFuncTable); + &object->renderer.filter, &object->renderer.sink.pin, &window_ops); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3db6a82f6a..3778a8cee0 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -689,7 +689,8 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) return TRUE; } -static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { +static const struct video_window_ops window_ops = +{ VMR9_GetDefaultRect, VMR9_OnSize, }; @@ -2319,7 +2320,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IOverlay_iface.lpVtbl = &overlay_vtbl; hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable, - &object->renderer.filter, &object->renderer.sink.pin, &renderer_BaseWindowFuncTable); + &object->renderer.filter, &object->renderer.sink.pin, &window_ops); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 1144d2e340..7aaf2ea2f8 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -84,7 +84,7 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM return DefWindowProcW(hwnd, message, wparam, lparam); } -HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable) +HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const struct video_window_ops *pFuncsTable) { if (!pFuncsTable) return E_INVALIDARG; @@ -153,7 +153,7 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) HRESULT video_window_init(struct video_window *pControlWindow, const IVideoWindowVtbl *lpVtbl, struct strmbase_filter *owner, - struct strmbase_pin *pPin, const BaseWindowFuncTable *pFuncsTable) + struct strmbase_pin *pPin, const struct video_window_ops *pFuncsTable) { HRESULT hr;

1 0