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

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_update_sub_resource().
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: e4721f0c1e85aacc1770080cfec77d85f75587f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4721f0c1e85aacc1770080c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 8 23:45:10 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_update_sub_resource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 ++++---- dlls/wined3d/device.c | 13 ++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 6 +++--- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1f64a89ec8f..9845f93eebf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1253,7 +1253,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_box wined3d_box; @@ -1265,7 +1265,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, + wined3d_device_context_update_sub_resource(context->wined3d_context, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, 0); wined3d_mutex_unlock(); } @@ -2704,7 +2704,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11D ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch, UINT flags) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_resource *wined3d_resource; struct wined3d_box wined3d_box; @@ -2717,7 +2717,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11D wined3d_resource = wined3d_resource_from_d3d11_resource(resource); wined3d_mutex_lock(); - wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, subresource_idx, + wined3d_device_context_update_sub_resource(context->wined3d_context, wined3d_resource, subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch, flags); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bd92632e306..b1f7568842e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5085,16 +5085,15 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev return WINED3D_OK; } -void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch, unsigned int flags) +void CDECL wined3d_device_context_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags) { unsigned int width, height, depth; struct wined3d_box b; - TRACE("device %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, " - "flags %#x.\n", - device, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch, flags); + TRACE("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", + context, resource, sub_resource_idx, debug_box(box), data, row_pitch, depth_pitch, flags); if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -5149,7 +5148,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str wined3d_resource_wait_idle(resource); - wined3d_device_context_emit_update_sub_resource(&device->cs->c, resource, + wined3d_device_context_emit_update_sub_resource(context, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1055bbda0ce..cff4fd86b1a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -156,7 +156,6 @@ @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_show_cursor(ptr long) -@ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) @@ -190,6 +189,7 @@ @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) +@ cdecl wined3d_device_context_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) @ cdecl wined3d_output_get_adapter(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bb0f24e8226..c6c97da4fbe 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2533,9 +2533,6 @@ void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); -void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, - unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, - unsigned int depth_pitch, unsigned int flags); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); @@ -2607,6 +2604,9 @@ void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports); +void __cdecl wined3d_device_context_update_sub_resource(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, + const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags); HRESULT __cdecl wined3d_output_find_closest_matching_mode(const struct wined3d_output *output, struct wined3d_display_mode *mode);

1 0

Henri Verbeet : wined3d: Use the client area dimensions instead of the backbuffer dimensions for the Vulkan swapchain.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: 3aa566610c7b6b3ef7d4d2668534d340437ad886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa566610c7b6b3ef7d4d266… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 9 12:31:12 2021 +0200 wined3d: Use the client area dimensions instead of the backbuffer dimensions for the Vulkan swapchain. Often these are the same, and even when not, the minimum/maximum image extents will often end up forcing the swapchain dimensions to be the same as the client area. However, some implementations will allow the swapchain to be created with dimensions different from the client area, but then return VK_SUBOPTIMAL_KHR from vkQueuePresentKHR(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 92df08461d9..10e12a11482 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -884,6 +884,7 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc VkSurfaceKHR vk_surface; VkBool32 supported; VkFormat vk_format; + RECT client_rect; VkResult vr; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -931,21 +932,23 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc WARN("Image count %u is not supported (%u-%u).\n", desc->backbuffer_count, surface_caps.minImageCount, surface_caps.maxImageCount); - width = desc->backbuffer_width; + GetClientRect(swapchain_vk->s.win_handle, &client_rect); + + width = client_rect.right - client_rect.left; if (width < surface_caps.minImageExtent.width) width = surface_caps.minImageExtent.width; else if (width > surface_caps.maxImageExtent.width) width = surface_caps.maxImageExtent.width; - height = desc->backbuffer_height; + height = client_rect.bottom - client_rect.top; if (height < surface_caps.minImageExtent.height) height = surface_caps.minImageExtent.height; else if (height > surface_caps.maxImageExtent.height) height = surface_caps.maxImageExtent.height; - if (width != desc->backbuffer_width || height != desc->backbuffer_height) + if (width != client_rect.right - client_rect.left || height != client_rect.bottom - client_rect.top) WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", - desc->backbuffer_width, desc->backbuffer_height, + client_rect.right - client_rect.left, client_rect.bottom - client_rect.top, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height);

1 0

Tag wine-6.6 : Alexandre Julliard : Release 6.6
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: refs/tags/wine-6.6 Tag: a0641c634883eeed8b5fa7c8ec230c0ea6889971 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a0641c634883eeed8b5fa7c8ec2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 21:51:46 2021 +0200 Release 6.6

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IDispatch support for IDHTMLEdit.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: 657bdb3687dbc606b70c1d54a140a82d39a2ac5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=657bdb3687dbc606b70c1d54… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 8 09:13:15 2021 +0200 dhtmled.ocx: Add IDispatch support for IDHTMLEdit. This makes RSSedit to work, no error dialog is shown. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/Makefile.in | 2 +- dlls/dhtmled.ocx/dhtmled_private.h | 1 + dlls/dhtmled.ocx/edit.c | 112 ++++++++++++++++++++++++++++++++++--- dlls/dhtmled.ocx/main.c | 10 +++- 4 files changed, 114 insertions(+), 11 deletions(-) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in index bbe397dc401..47d57f5b1f9 100644 --- a/dlls/dhtmled.ocx/Makefile.in +++ b/dlls/dhtmled.ocx/Makefile.in @@ -1,5 +1,5 @@ MODULE = dhtmled.ocx -IMPORTS = uuid ole32 user32 gdi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dhtmled.ocx/dhtmled_private.h b/dlls/dhtmled.ocx/dhtmled_private.h index 5a9e89b9977..763f1f4fd1b 100644 --- a/dlls/dhtmled.ocx/dhtmled_private.h +++ b/dlls/dhtmled.ocx/dhtmled_private.h @@ -17,3 +17,4 @@ */ extern HRESULT dhtml_edit_create(REFIID iid, void **out); +void release_typelib(void); diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index b96630c73e5..4d39f247be0 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -25,6 +25,78 @@ WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); +typedef enum tid_t { + NULL_tid, + IDHTMLEdit_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IDHTMLEdit +}; + +static HRESULT load_typelib(void) +{ + ITypeLib *tl; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_DHTMLEDLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hr)) { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hr; +} + +void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hr; + + if (!typelib) + hr = load_typelib(); + if (!typelib) + return hr; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + return hr; + } + + if (InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + typedef struct { IDHTMLEdit IDHTMLEdit_iface; @@ -239,33 +311,55 @@ static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) static HRESULT WINAPI DHTMLEdit_GetTypeInfoCount(IDHTMLEdit *iface, UINT *count) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%p) stub\n", This, count); - *count = 0; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, count); + *count = 1; + return S_OK; } static HRESULT WINAPI DHTMLEdit_GetTypeInfo(IDHTMLEdit *iface, UINT type_index, LCID lcid, ITypeInfo **type_info) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%u, %08x, %p) stub\n", This, type_index, lcid, type_info); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%u, %08x, %p)\n", This, type_index, lcid, type_info); + + hr = get_typeinfo(IDHTMLEdit_tid, type_info); + if (SUCCEEDED(hr)) + ITypeInfo_AddRef(*type_info); + return hr; } static HRESULT WINAPI DHTMLEdit_GetIDsOfNames(IDHTMLEdit *iface, REFIID iid, OLECHAR **names, UINT name_count, LCID lcid, DISPID *disp_ids) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%s, %p, %u, %08x, %p) stub\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); - return E_NOTIMPL; + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%s, %p, %u, %08x, %p)\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); + + hr = get_typeinfo(IDHTMLEdit_tid, &ti); + if (FAILED(hr)) + return hr; + + return ITypeInfo_GetIDsOfNames(ti, names, name_count, disp_ids); } static HRESULT WINAPI DHTMLEdit_Invoke(IDHTMLEdit *iface, DISPID member, REFIID iid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *ret, EXCEPINFO *exception_info, UINT *error_index) { DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); - FIXME("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p) stub\n", + ITypeInfo *ti; + HRESULT hr; + + TRACE("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p)\n", This, member, debugstr_guid(iid), lcid, flags, params, ret, exception_info, error_index); - return E_NOTIMPL; + + hr = get_typeinfo(IDHTMLEdit_tid, &ti); + if (FAILED(hr)) + return hr; + + return ITypeInfo_Invoke(ti, iface, member, flags, params, ret, exception_info, error_index); } static HRESULT WINAPI DHTMLEdit_ExecCommand(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, OLECMDEXECOPT options, diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c index b7409cf61a5..999341d43cf 100644 --- a/dlls/dhtmled.ocx/main.c +++ b/dlls/dhtmled.ocx/main.c @@ -20,10 +20,14 @@ #define COBJMACROS +#include "oaidl.h" +#include "ocidl.h" +#include "docobj.h" +#include "mshtml.h" +#include "rpcproxy.h" #include "initguid.h" #include "dhtmled.h" #include "dhtmled_private.h" -#include "rpcproxy.h" #include "wine/debug.h" @@ -107,6 +111,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, VOID *reserved) DisableThreadLibraryCalls(instance); dhtmled_instance = instance; break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; } return TRUE;

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IConnectionPoint stub to IDHTMLEdit.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: 79428afae5a33a99871d43f3e203bd3d51efdf9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79428afae5a33a99871d43f3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 8 09:13:16 2021 +0200 dhtmled.ocx: Add IConnectionPoint stub to IDHTMLEdit. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 4d39f247be0..a24a886ebc8 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -97,7 +97,17 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) return S_OK; } -typedef struct +typedef struct DHTMLEditImpl DHTMLEditImpl; +typedef struct ConnectionPoint ConnectionPoint; + +struct ConnectionPoint +{ + IConnectionPoint IConnectionPoint_iface; + DHTMLEditImpl *dhed; + const IID *riid; +}; + +struct DHTMLEditImpl { IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; @@ -113,9 +123,10 @@ typedef struct IServiceProvider IServiceProvider_iface; IOleClientSite *client_site; + ConnectionPoint conpt; SIZEL extent; LONG ref; -} DHTMLEditImpl; +}; static inline DHTMLEditImpl *impl_from_IDHTMLEdit(IDHTMLEdit *iface) { @@ -1592,6 +1603,88 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = ConnectionPointContainer_FindConnectionPoint }; +static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); +} + +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID iid, LPVOID *out) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + if (IsEqualGUID(&IID_IUnknown, iid) || IsEqualGUID(&IID_IConnectionPoint, iid)) + { + *out = &This->IConnectionPoint_iface; + DHTMLEdit_AddRef(&This->dhed->IDHTMLEdit_iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(&This->dhed->IConnectionPointContainer_iface); +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(&This->dhed->IConnectionPointContainer_iface); +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("%p, %p\n", This, iid); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **container) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("%p, %p\n", This, container); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("%p, %p, %p\n", This, unk_sink, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("%p, %d\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, + IEnumConnections **points) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + FIXME("%p, %p\n", This, points); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = { + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + static HRESULT WINAPI DataObject_QueryInterface(IDataObject *iface, REFIID iid, LPVOID *out) { return dhtml_edit_qi(impl_from_IDataObject(iface), iid, out); @@ -1752,6 +1845,10 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->client_site = NULL; This->ref = 1; + This->conpt.dhed = This; + This->conpt.riid = &DIID__DHTMLEditEvents; + This->conpt.IConnectionPoint_iface.lpVtbl = &ConnectionPointVtbl; + hdc = GetDC(0); dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); dpi_y = GetDeviceCaps(hdc, LOGPIXELSY);

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Implement IConnectionPointContainer_FindConnectionPoint.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: 0dbe8346ee8fe861b19f5887b3805e4ca0706a2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbe8346ee8fe861b19f5887… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 8 09:13:17 2021 +0200 dhtmled.ocx: Implement IConnectionPointContainer_FindConnectionPoint. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index a24a886ebc8..37c585b8a64 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -1587,10 +1587,23 @@ static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionP } static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, - REFIID riid, IConnectionPoint **ppCP) + REFIID riid, IConnectionPoint **point) { DHTMLEditImpl *This = impl_from_IConnectionPointContainer(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), point); + + if (!point) + return E_POINTER; + + if (IsEqualGUID(riid, This->conpt.riid)) + { + *point = &This->conpt.IConnectionPoint_iface; + IConnectionPoint_AddRef(*point); + return S_OK; + } + + FIXME("unsupported connection point %s\n", debugstr_guid(riid)); return CONNECT_E_NOCONNECTION; } @@ -1815,7 +1828,6 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; - HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This;

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Implement IViewObjectEx_GetViewStatus function.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: ed5bf860381d7166833e788c22bfc1e183091c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed5bf860381d7166833e788c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 8 09:13:18 2021 +0200 dhtmled.ocx: Implement IViewObjectEx_GetViewStatus function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 37c585b8a64..9e08a4f5c95 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -1336,9 +1336,10 @@ static HRESULT WINAPI ViewObjectEx_GetViewStatus(IViewObjectEx *iface, DWORD *st { DHTMLEditImpl *This = impl_from_IViewObjectEx(iface); - FIXME("(%p)->(%p)\n", This, status); + TRACE("(%p)->(%p)\n", This, status); - return E_NOTIMPL; + *status = VIEWSTATUS_OPAQUE | VIEWSTATUS_SOLIDBKGND; + return S_OK; } static HRESULT WINAPI ViewObjectEx_QueryHitPoint(IViewObjectEx *iface, DWORD aspect, const RECT *bounds,

1 0

Francois Gouget : winetest/build-index: Delete obsolete test unit HTML files.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: ac55e068a5e73c18eb0ae8806436d3e017172e0b URL: https://source.winehq.org/git/tools.git/?a=commit;h=ac55e068a5e73c18eb0ae88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:38:27 2021 +0200 winetest/build-index: Delete obsolete test unit HTML files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/winetest/build-index b/winetest/build-index index f2e3dcf..91c7c92 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -341,6 +341,22 @@ EOF } } +# And delete obsolete test files +opendir(DIR, "data/tests") or die "could not open the 'data/tests' directory: $!"; +foreach my $entry (readdir(DIR)) +{ + next if ($entry eq "." or $entry eq ".."); + my $test = $entry; + $test =~ s/\.html$//; + next if ($alltests{$test}); + if (!unlink "data/tests/$entry") + { + error("could not delete 'data/tests/$entry': $!\n"); + } + +} +closedir(DIR); + # # Read each build's total.txt file

1 0

Francois Gouget : winetest/gather: Use the report platform as the column header.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: 4686519e3fa83b3eaa7c62b06316b73b481d4408 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4686519e3fa83b3eaa7c62b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:40:46 2021 +0200 winetest/gather: Use the report platform as the column header. A group index page may contain reports from different but related platforms, for instance Windows 8 and 8.1, or Windows 10 1507 and 1607. This allows immediately identifying a report's exact Windows version. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 302def4..51d4838 100755 --- a/winetest/gather +++ b/winetest/gather @@ -295,9 +295,12 @@ foreach my $file (glob "$builddir/*/summary.txt") { next; } - my $report = { group => $group}; - $report->{tag} = @tag?"@tag":""; - $report->{dir} = $dir; + my $report = { + id => $id, + group => $group, + tag => @tag ? "@tag" : "", + dir => $dir, + }; if (!open TEST, "<$file") { error("could not open '$file' for reading: $!\n"); next; @@ -523,7 +526,7 @@ sub build_header_footer($) if (!defined $msg) { $msg = <<"EOF"; - $group->{name} + $report->{id} <a href=\"$report->{dir}/version.html\">$report->{tag}</a> EOF chop $msg;

1 0

Francois Gouget : winetest: Allow overriding $workdir from the command line.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: tools Branch: master Commit: ff335cbef527852af9968bbf08ac4835370da9d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ff335cbef527852af9968bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 9 11:42:44 2021 +0200 winetest: Allow overriding $workdir from the command line. $workdir is typically already set in winetest.conf and modifying that file should not be necessary to use the --workdir option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/dissect | 5 ++--- winetest/gather | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 91c7c92..94453f4 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -113,7 +113,7 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Command line processing # -my $usage; +my ($opt_workdir, $usage); sub check_opt_val($$) { @@ -138,7 +138,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--help") { diff --git a/winetest/dissect b/winetest/dissect index c681c7d..12df56a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -28,7 +28,6 @@ # created to signal the change in the given build. # # To test this script: -# - Make sure $workdir is not set in winetest.conf # - Put a test report in queue/rep1/report # - Run ./dissect # - Examine the result in data/ @@ -112,7 +111,7 @@ sub short_date($) # Command line processing # -my ($update, $report, $usage); +my ($opt_workdir, $update, $report, $usage); sub check_opt_val($$) { @@ -137,7 +136,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--update") { diff --git a/winetest/gather b/winetest/gather index 51d4838..ae754d9 100755 --- a/winetest/gather +++ b/winetest/gather @@ -26,7 +26,6 @@ # level. # # To test this script: -# - Make sure $workdir is not set in winetest.conf # - After running dissect, run ./gather # - Examine the result in data/ # @@ -180,7 +179,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Command line processing # -my ($builddir, $usage); +my ($opt_workdir, $builddir, $usage); sub check_opt_val($$) { @@ -205,7 +204,7 @@ while (@ARGV) my $arg = shift @ARGV; if ($arg eq "--workdir") { - $workdir = check_opt_val($arg, $workdir); + $workdir = $opt_workdir = check_opt_val($arg, $opt_workdir); } elsif ($arg eq "--update") {

1 0