wine-devel May 2018

wine-devel@winehq.org

74 participants
631 discussions

[PATCH 1/3] d2d1: Add ID2D1Device stub.
by Henri Verbeet 19 May '18

19 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 +++ dlls/d2d1/{render_target.c => device.c} | 121 ++++++++++++++++++++++++++++++++ dlls/d2d1/factory.c | 14 +++- include/d2d1_1.idl | 61 +++++++++++++++- 5 files changed, 204 insertions(+), 4 deletions(-) rename dlls/d2d1/{render_target.c => device.c} (97%) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 20d3f26f6fa..4bfe3b5953d 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,12 +8,12 @@ C_SRCS = \ bitmap_render_target.c \ brush.c \ dc_render_target.c \ + device.c \ factory.c \ geometry.c \ hwnd_render_target.c \ layer.c \ mesh.c \ - render_target.c \ state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dbfb83c249e..21e2b8835a5 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,16 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/device.c similarity index 97% rename from dlls/d2d1/render_target.c rename to dlls/d2d1/device.c index 7afbc84ec56..f74e9f85201 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/device.c @@ -38,6 +38,11 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -3289,3 +3294,119 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 return S_OK; } + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Device) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c5..7810e957d4d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -375,9 +375,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb301dd4..2b1ef2e46ba 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0x0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 0x1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -50,6 +60,22 @@ typedef enum D2D1_UNIT_MODE D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, } D2D1_UNIT_MODE; +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0x0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 0x1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 0x2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0x0, + D2D1_COLOR_SPACE_SRGB = 0x1, + D2D1_COLOR_SPACE_SCRGB = 0x2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; typedef struct D2D1_STROKE_STYLE_PROPERTIES1 @@ -75,10 +101,43 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 D2D1_UNIT_MODE unitMode; } D2D1_DRAWING_STATE_DESCRIPTION1; +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + float rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + +[ + object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), local, ] -- 2.11.0

1 0

[PATCH 1/2] comctl32/taskdialog: Add a helper to initialize dialog data.
by Nikolay Sivov 19 May '18

19 May '18

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ba19ed51a6..644f60fbb8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -533,6 +533,11 @@ static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, WORD EndDialog(dialog_info->hwnd, command_id); } +static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) +{ + dialog_info->hwnd = hwnd; +} + static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; @@ -550,9 +555,10 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; - dialog_info->hwnd = hwnd; - SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); + taskdialog_init(dialog_info, hwnd); + + SetPropW(hwnd, taskdialog_info_propnameW, dialog_info); taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); break; case WM_SHOWWINDOW: -- 2.17.0

1 1

[PATCH] comctl32/listview: Don't invalidate when new style is same as old
by Alex Henrie 18 May '18

18 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This fixes most of https://bugs.winehq.org/show_bug.cgi?id=44845 With this patch, the horizontal scrollbar is still shown when it should not be, but the installer doesn't get stuck in a loop. dlls/comctl32/listview.c | 8 +++++--- dlls/comctl32/tests/listview.c | 8 ++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d63c23a659..200bf93be5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11108,14 +11108,13 @@ static void LISTVIEW_UpdateSize(LISTVIEW_INFO *infoPtr) static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { - UINT uNewView = lpss->styleNew & LVS_TYPEMASK; - UINT uOldView = lpss->styleOld & LVS_TYPEMASK; + UINT uNewView, uOldView; UINT style; TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); - if (wStyleType != GWL_STYLE) return 0; + if (wStyleType != GWL_STYLE || lpss->styleNew == infoPtr->dwStyle) return 0; infoPtr->dwStyle = lpss->styleNew; @@ -11127,6 +11126,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, ((lpss->styleNew & WS_VSCROLL) == 0)) ShowScrollBar(infoPtr->hwndSelf, SB_VERT, FALSE); + uNewView = lpss->styleNew & LVS_TYPEMASK; + uOldView = lpss->styleOld & LVS_TYPEMASK; + if (uNewView != uOldView) { HIMAGELIST himl; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c9a165c39c..c2d33c41f5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1781,6 +1781,7 @@ static void test_redraw(void) HDC hdc; BOOL res; DWORD r; + RECT rect; hwnd = create_listview_control(LVS_REPORT); subclass_header(hwnd); @@ -1838,6 +1839,13 @@ static void test_redraw(void) ReleaseDC(hwndparent, hdc); + /* test setting the window style to what it already was */ + UpdateWindow(hwnd); + SetWindowLongA(hwnd, GWL_STYLE, GetWindowLongA(hwnd, GWL_STYLE)); + GetUpdateRect(hwnd, &rect, FALSE); + ok(rect.left == 0 && rect.top == 0 && rect.right == 0 && rect.bottom == 0, + "Expected empty update rect, got %s\n", wine_dbgstr_rect(&rect)); + DestroyWindow(hwnd); } -- 2.17.0

2 1

[PATCH] include/winuser.h: Add DOF_* definitions.
by Gijs Vermeulen 18 May '18

18 May '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- For compiling Windows File Manager (WinFile) with winelib. See https://bugs.winehq.org/show_bug.cgi?id=45026 and https://bugs.winehq.org/attachment.cgi?id=61206 include/winuser.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winuser.h b/include/winuser.h index d0893a49c6..8e9e91bf65 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2158,6 +2158,13 @@ typedef struct tagDROPSTRUCT DWORD dwControlData; } DROPSTRUCT, *PDROPSTRUCT, *LPDROPSTRUCT; +#define DOF_EXECUTABLE 0x8001 +#define DOF_DOCUMENT 0x8002 +#define DOF_DIRECTORY 0x8003 +#define DOF_MULTIPLE 0x8004 +#define DOF_PROGMAN 0x0001 +#define DOF_SHELLDATA 0x0002 + /* modifiers for RegisterHotKey */ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002 -- 2.13.6

1 0

[PATCH] winedbg: Use gdb's default handling of breakpoints.
by Zebediah Figura 18 May '18

18 May '18

We're essentially doing the same thing, so there's no reason not to leave the handling entirely to gdb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winedbg/gdbproxy.c | 129 +------------------------------------------- 1 file changed, 2 insertions(+), 127 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3909cb5..3ecf629 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -72,13 +72,6 @@ #define GDBPXY_TRC_WIN32_ERROR 0x20 #define GDBPXY_TRC_COMMAND_FIXME 0x80 -struct gdb_ctx_Xpoint -{ - enum be_xpoint_type type; /* (-1) == be_xpoint_free means free */ - void* addr; - unsigned long val; -}; - struct gdb_context { /* gdb information */ @@ -105,8 +98,6 @@ struct gdb_context CONTEXT context; /* Win32 information */ struct dbg_process* process; -#define NUM_XPOINT 32 - struct gdb_ctx_Xpoint Xpoints[NUM_XPOINT]; /* Unix environment */ unsigned long wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ }; @@ -1570,28 +1561,6 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } -static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) -{ - /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ - - BOOL ret; - - ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); - if (ret) - { - struct gdb_ctx_Xpoint *xpt; - - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - char *xpt_addr = xpt->addr; - - if (xpt->type != be_xpoint_free && xpt_addr >= addr && xpt_addr < addr + blk_len) - buffer[xpt_addr - addr] = xpt->val; - } - } - return ret; -} - static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1608,7 +1577,8 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) + if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, + buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT); @@ -2163,97 +2133,6 @@ static enum packet_return packet_thread_alive(struct gdb_context* gdbctx) return packet_reply_error(gdbctx, ESRCH); } -static enum packet_return packet_remove_breakpoint(struct gdb_context* gdbctx) -{ - void* addr; - unsigned len; - struct gdb_ctx_Xpoint* xpt; - enum be_xpoint_type t; - - /* FIXME: check packet_len */ - if (gdbctx->in_packet[0] < '0' || gdbctx->in_packet[0] > '4' || - gdbctx->in_packet[1] != ',' || - sscanf(gdbctx->in_packet + 2, "%p,%x", &addr, &len) != 2) - return packet_error; - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Remove bp %p[%u] typ=%c\n", - addr, len, gdbctx->in_packet[0]); - switch (gdbctx->in_packet[0]) - { - case '0': t = be_xpoint_break; len = 0; break; - case '1': t = be_xpoint_watch_exec; break; - case '2': t = be_xpoint_watch_read; break; - case '3': t = be_xpoint_watch_write; break; - default: return packet_error; - } - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->addr == addr && xpt->type == t) - { - if (be_cpu->remove_Xpoint(gdbctx->process->handle, - gdbctx->process->process_io, &gdbctx->context, - t, xpt->addr, xpt->val, len)) - { - xpt->type = be_xpoint_free; - return packet_ok; - } - break; - } - } - return packet_error; -} - -static enum packet_return packet_set_breakpoint(struct gdb_context* gdbctx) -{ - void* addr; - unsigned len; - struct gdb_ctx_Xpoint* xpt; - enum be_xpoint_type t; - - /* FIXME: check packet_len */ - if (gdbctx->in_packet[0] < '0' || gdbctx->in_packet[0] > '4' || - gdbctx->in_packet[1] != ',' || - sscanf(gdbctx->in_packet + 2, "%p,%x", &addr, &len) != 2) - return packet_error; - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "Set bp %p[%u] typ=%c\n", - addr, len, gdbctx->in_packet[0]); - switch (gdbctx->in_packet[0]) - { - case '0': t = be_xpoint_break; len = 0; break; - case '1': t = be_xpoint_watch_exec; break; - case '2': t = be_xpoint_watch_read; break; - case '3': t = be_xpoint_watch_write; break; - default: return packet_error; - } - /* because of packet command handling, this should be made idempotent */ - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->addr == addr && xpt->type == t) - return packet_ok; /* nothing to do */ - } - /* really set the Xpoint */ - for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) - { - if (xpt->type == be_xpoint_free) - { - if (be_cpu->insert_Xpoint(gdbctx->process->handle, - gdbctx->process->process_io, &gdbctx->context, - t, addr, &xpt->val, len)) - { - xpt->addr = addr; - xpt->type = t; - return packet_ok; - } - fprintf(stderr, "cannot set xpoint\n"); - break; - } - } - /* no more entries... eech */ - fprintf(stderr, "Running out of spots for {break|watch}points\n"); - return packet_error; -} - /* =============================================== * * P A C K E T I N F R A S T R U C T U R E * * =============================================== * @@ -2287,8 +2166,6 @@ static struct packet_entry packet_entries[] = /*{'S', packet_step_signal}, hard(er) to implement */ {'T', packet_thread_alive}, {'v', packet_verbose}, - {'z', packet_remove_breakpoint}, - {'Z', packet_set_breakpoint}, }; static BOOL extract_packets(struct gdb_context* gdbctx) @@ -2578,8 +2455,6 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->in_trap = FALSE; gdbctx->trace = /*GDBPXY_TRC_PACKET | GDBPXY_TRC_COMMAND |*/ GDBPXY_TRC_COMMAND_ERROR | GDBPXY_TRC_COMMAND_FIXME | GDBPXY_TRC_WIN32_EVENT; gdbctx->process = NULL; - for (i = 0; i < NUM_XPOINT; i++) - gdbctx->Xpoints[i].type = -1; for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) gdbctx->wine_segs[i] = 0; -- 2.7.4

1 0