February 2015 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_texture2d_GetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: e5dd9b2a183c2df1a004f2b274900bf27760f95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dd9b2a183c2df1a004f2b27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:44 2015 +0100 d3d10core: Implement d3d10_texture2d_GetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 2 ++ dlls/d3d10core/texture.c | 16 ++++++++++++++-- dlls/d3d10core/utils.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 6a975c1..de84567 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -66,6 +66,8 @@ DWORD wined3d_usage_from_d3d10core(UINT bind_flags, enum D3D10_USAGE usage) DECL struct wined3d_resource *wined3d_resource_from_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; +HRESULT d3d10_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; HRESULT d3d10_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; HRESULT d3d10_set_private_data_interface(struct wined3d_private_store *store, diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 1c82bad..4b32f3d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -119,10 +119,22 @@ static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + IDXGISurface *dxgi_surface; + HRESULT hr; + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + if (texture->dxgi_surface + && SUCCEEDED(IUnknown_QueryInterface(texture->dxgi_surface, &IID_IDXGISurface, (void **)&dxgi_surface))) + { + hr = IDXGISurface_GetPrivateData(dxgi_surface, guid, data_size, data); + IDXGISurface_Release(dxgi_surface); + return hr; + } + + return d3d10_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture2d_SetPrivateData(ID3D10Texture2D *iface, diff --git a/dlls/d3d10core/utils.c b/dlls/d3d10core/utils.c index a5f539b..2515136 100644 --- a/dlls/d3d10core/utils.c +++ b/dlls/d3d10core/utils.c @@ -411,6 +411,35 @@ DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) } } +HRESULT d3d10_get_private_data(struct wined3d_private_store *store, + REFGUID guid, UINT *data_size, void *data) +{ + const struct wined3d_private_data *stored_data; + DWORD size_in; + + if (!data_size) + return E_INVALIDARG; + + if (!(stored_data = wined3d_private_store_get_private_data(store, guid))) + { + *data_size = 0; + return DXGI_ERROR_NOT_FOUND; + } + + size_in = *data_size; + *data_size = stored_data->size; + if (!data) + return S_OK; + if (size_in < stored_data->size) + return DXGI_ERROR_MORE_DATA; + + if (stored_data->flags & WINED3DSPD_IUNKNOWN) + IUnknown_AddRef(stored_data->content.object); + memcpy(data, stored_data->content.data, stored_data->size); + + return S_OK; +} + HRESULT d3d10_set_private_data(struct wined3d_private_store *store, REFGUID guid, UINT data_size, const void *data) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_query_SetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 14643cf8d44180b533cdaa7f61154feeec3a3129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14643cf8d44180b533cdaa7f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:45 2015 +0100 d3d10core: Implement d3d10_query_SetPrivateData(). --- dlls/d3d10core/async.c | 9 +++++++-- dlls/d3d10core/d3d10core_private.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 71a30cc..075a767 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -74,6 +74,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) if (!refcount) { ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -104,10 +105,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&query->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, @@ -207,11 +210,13 @@ HRESULT d3d10_query_init(struct d3d10_query *query, struct d3d10_device *device, query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; + wined3d_private_store_init(&query->private_store); if (FAILED(hr = wined3d_query_create(device->wined3d_device, query_type_map[desc->Query], query, &query->wined3d_query))) { WARN("Failed to create wined3d query, hr %#x.\n", hr); + wined3d_private_store_cleanup(&query->private_store); return hr; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index de84567..18c5ca1 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -304,6 +304,7 @@ struct d3d10_query ID3D10Query ID3D10Query_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_query *wined3d_query; BOOL predicate; ID3D10Device1 *device;

1 0

Henri Verbeet : d3d10core: Implement d3d10_query_SetPrivateDataInterface() .
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 9c97e156e84d1b94fc309a79686086ace5ab2eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c97e156e84d1b94fc309a796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:46 2015 +0100 d3d10core: Implement d3d10_query_SetPrivateDataInterface(). --- dlls/d3d10core/async.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 075a767..b64dba7 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -116,9 +116,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface, static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_query *query = impl_from_ID3D10Query(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&query->private_store, guid, data); } /* ID3D10Asynchronous methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_query_GetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 5dfb4c126655e0a25f6ec8d3ae1c12090ff10413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dfb4c126655e0a25f6ec8d3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:47 2015 +0100 d3d10core: Implement d3d10_query_GetPrivateData(). --- dlls/d3d10core/async.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index b64dba7..d6c3d81 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -96,10 +96,12 @@ static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_query *query = impl_from_ID3D10Query(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&query->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_SetPrivateData().
by Alexandre Julliard 24 Feb '15

24 Feb '15

Module: wine Branch: master Commit: 0d59cba5c915a5ad90b9052526a440bcd448ab5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d59cba5c915a5ad90b905252… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 23 17:59:48 2015 +0100 d3d10core: Implement d3d10_buffer_SetPrivateData(). --- dlls/d3d10core/buffer.c | 11 +++++++++-- dlls/d3d10core/d3d10core_private.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index c5d851e..ff94fbc 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -111,10 +111,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, @@ -206,6 +208,9 @@ struct d3d10_buffer *unsafe_impl_from_ID3D10Buffer(ID3D10Buffer *iface) static void STDMETHODCALLTYPE d3d10_buffer_wined3d_object_released(void *parent) { + struct d3d10_buffer *buffer = parent; + + wined3d_private_store_cleanup(&buffer->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -222,6 +227,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi buffer->ID3D10Buffer_iface.lpVtbl = &d3d10_buffer_vtbl; buffer->refcount = 1; + wined3d_private_store_init(&buffer->private_store); FIXME("Implement DXGI<->wined3d usage conversion\n"); @@ -237,6 +243,7 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi if (FAILED(hr)) { WARN("Failed to create wined3d buffer, hr %#x.\n", hr); + wined3d_private_store_cleanup(&buffer->private_store); return hr; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 18c5ca1..5544dc7 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -121,6 +121,7 @@ struct d3d10_buffer ID3D10Buffer ID3D10Buffer_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_buffer *wined3d_buffer; ID3D10Device1 *device; };

1 0

Julian Rüger : German translation for release 1.7.37
by Jeremy Newman 24 Feb '15

24 Feb '15

Module: website Branch: master Commit: e216935bed1cec33ee3970233baaad6aad0dc534 URL: http://source.winehq.org/git/website.git/?a=commit;h=e216935bed1cec33ee3970… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Feb 24 10:29:07 2015 +0100 German translation for release 1.7.37 --- news/de/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015022001.xml b/news/de/2015022001.xml new file mode 100644 index 0000000..c4d3850 --- /dev/null +++ b/news/de/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>20. Februar 2015</date> +<title>Wine 1.7.37 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.37 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.37">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Benachrichtigungen über Schnittstellen-Änderungen (Netzwerk).</li> + <li>Unterstützung der UTF-7 Kodierung.</li> + <li>Korrekturen von Grafikfehlern bei Kontrollelementen mit Themen.</li> + <li>Wininet ist jetzt auf Basis von Win32-Sockets implementiert.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Andrey Gusev : Ukrainian translation for release 1.7.37
by Jeremy Newman 23 Feb '15

23 Feb '15

Module: website Branch: master Commit: 4435848723a5f1c2c1dae7a893e84dd3991b2351 URL: http://source.winehq.org/git/website.git/?a=commit;h=4435848723a5f1c2c1dae7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Feb 21 11:33:34 2015 +0200 Ukrainian translation for release 1.7.37 --- news/uk/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015022001.xml b/news/uk/2015022001.xml new file mode 100644 index 0000000..68de295 --- /dev/null +++ b/news/uk/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>20 лютого 2015</date> +<title>Випущено Wine 1.7.37</title> +<body> + Розробницький реліз Wine 1.7.37 наразі доступний. + <a href="{$root}/announce/1.7.37">Що нового</a> в цьому релізі: +<ul> + <li>Інтерфейс повідомлень про зміни.</li> + <li>Підтримка кодування UTF-7.</li> + <li>Ряд графічних виправлень для елементів управління.</li> + <li>Реалізація Wininet поверх Win32 сокетів.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.37
by Jeremy Newman 23 Feb '15

23 Feb '15

Module: website Branch: master Commit: 707a69016c1c9a284a99a51cd4de5f1488a123f0 URL: http://source.winehq.org/git/website.git/?a=commit;h=707a69016c1c9a284a99a5… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 21 06:53:08 2015 +0100 Polish translation for release 1.7.37 --- news/pl/2015022001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015022001.xml b/news/pl/2015022001.xml new file mode 100644 index 0000000..8cfbc6b --- /dev/null +++ b/news/pl/2015022001.xml @@ -0,0 +1,16 @@ +<news> +<date>Luty 20, 2015</date> +<title>Wydano Wine 1.7.37</title> +<body> + Wydanie rozwojowe Wine 1.7.37 jest już dostępne. + <a href="{$root}/announce/1.7.37">Co nowego</a> w tym wydaniu: +<ul> + <li>Powiadomienia o zmianie interfejsu.</li> + <li>Wsparcie dla kodowania UTF-7.</li> + <li>Kilka graficznych poprawek dla ozdobionych elementów sterowania.</li> + <li>Wininet jest od teraz zaimplementowany na gniazdach Win32.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : msxml3: Declare debug channels only when needed (Clang).
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 10148677266c7fdd7f6f6a36bf1781ce6735760a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10148677266c7fdd7f6f6a36b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:41 2015 +0100 msxml3: Declare debug channels only when needed (Clang). --- dlls/msxml3/attribute.c | 4 ++-- dlls/msxml3/cdata.c | 4 ++-- dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/docfrag.c | 4 ++-- dlls/msxml3/doctype.c | 4 ++-- dlls/msxml3/domdoc.c | 4 ++-- dlls/msxml3/domimpl.c | 4 ++-- dlls/msxml3/element.c | 4 ++-- dlls/msxml3/entityref.c | 4 ++-- dlls/msxml3/httprequest.c | 4 ++-- dlls/msxml3/main.c | 4 ++-- dlls/msxml3/node.c | 4 ++-- dlls/msxml3/nodelist.c | 4 ++-- dlls/msxml3/nodemap.c | 4 ++-- dlls/msxml3/pi.c | 4 ++-- dlls/msxml3/saxreader.c | 4 ++-- dlls/msxml3/schema.c | 4 ++-- dlls/msxml3/selection.c | 4 ++-- dlls/msxml3/text.c | 4 ++-- dlls/msxml3/xdr.c | 4 ++-- dlls/msxml3/xmldoc.c | 4 ++-- dlls/msxml3/xmlelem.c | 4 ++-- dlls/msxml3/xmlview.c | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index bb0655c..637615b 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -39,10 +39,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const xmlChar xmlns[] = "xmlns"; typedef struct _domattr diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 2fcacff..c255b1b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { xmlnode node; diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 12a584d..0317c4f 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domcomment { xmlnode node; diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 1b56885..b2dd3e5 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domfrag { xmlnode node; diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 322b6c2..79d74d9 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -39,10 +39,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domdoctype { xmlnode node; diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2244172..71cf077 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -52,10 +52,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + /* not defined in older versions */ #define XML_SAVE_FORMAT 1 #define XML_SAVE_NO_DECL 2 diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index e286e57..74223d5 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domimpl { DispatchEx dispex; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 0de9c34..38d3b47 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -39,10 +39,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const xmlChar DT_prefix[] = "dt"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 1c0309a..5d5d424 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _entityref { xmlnode node; diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index cf53db4..aab41f7 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -48,10 +48,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; static const DWORD safety_supported_options = diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 81ce1f4..1905f57 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -56,12 +56,12 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - HINSTANCE MSXML_hInstance = NULL; #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) { enum __wine_debug_class dbcl; diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 92063be..1178e60 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -53,10 +53,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + #ifdef SONAME_LIBXSLT extern void* libxslt_handle; # define MAKE_FUNCPTR(f) extern typeof(f) * p##f diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index c68eefc..2c1d10e 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -48,10 +48,10 @@ * thus the child is inaccessible by an XPath query */ -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { DispatchEx dispex; diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 1eed3d5..2ad6f12 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -40,10 +40,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { DispatchEx dispex; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 96fb118..cea9570 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -38,10 +38,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _dom_pi { xmlnode node; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a926fed..5061413 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -45,10 +45,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef enum { FeatureUnknown = 0, diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index d694cb3..7a1f8b3 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -48,6 +48,8 @@ #include "msxml_private.h" +#ifdef HAVE_LIBXML2 + WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* We use a chained hashtable, which can hold any number of schemas @@ -58,8 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* This is just the number of buckets, should be prime */ #define DEFAULT_HASHTABLE_SIZE 17 -#ifdef HAVE_LIBXML2 - xmlDocPtr XDR_to_XSD_doc(xmlDocPtr xdr_doc, xmlChar const* nsURI); static const xmlChar XSD_schema[] = "schema"; diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 6a72550..b7c560a 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -52,10 +52,10 @@ * */ -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + int registerNamespaces(xmlXPathContextPtr ctxt); xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 411f6eb..3a12d4b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -40,10 +40,10 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct _domtext { xmlnode node; diff --git a/dlls/msxml3/xdr.c b/dlls/msxml3/xdr.c index fd7a9b7..b5e91bc 100644 --- a/dlls/msxml3/xdr.c +++ b/dlls/msxml3/xdr.c @@ -28,14 +28,14 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - /* Both XDR and XSD are valid XML * We just convert the doc tree, no need for a parser. */ #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static const xmlChar DT_prefix[] = "dt"; static const xmlChar DT_href[] = "urn:schemas-microsoft-com:datatypes"; static const xmlChar XDR_href[] = "urn:schemas-microsoft-com:xml-data"; diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 730ff6e..6f4c73e 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -42,10 +42,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + /* FIXME: IXMLDocument needs to implement * - IXMLError * - IPersistMoniker diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index e1ef0eb..96b2007 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -39,10 +39,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + static HRESULT XMLElementCollection_create( xmlNodePtr node, LPVOID *ppObj ); /********************************************************************** diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c index 4c7a142..2bf58f8 100644 --- a/dlls/msxml3/xmlview.c +++ b/dlls/msxml3/xmlview.c @@ -40,10 +40,10 @@ #include "msxml_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(msxml); - #ifdef HAVE_LIBXML2 +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + typedef struct { IPersistMoniker IPersistMoniker_iface;

1 0

Jacek Caban : mshtml: Added support for CONTEXT_MENU_TEXTSELECT context menu type.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 31d51d4865d0f361ea739ee097902444e604d035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d51d4865d0f361ea739ee09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 14:08:12 2015 +0100 mshtml: Added support for CONTEXT_MENU_TEXTSELECT context menu type. --- dlls/mshtml/nsembed.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8f3fceb..f4d14bc 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1490,9 +1490,21 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList switch(aContextFlags) { case CONTEXT_NONE: case CONTEXT_DOCUMENT: - case CONTEXT_TEXT: - dwID = CONTEXT_MENU_DEFAULT; + case CONTEXT_TEXT: { + nsISelection *selection; + + nsres = nsIDOMHTMLDocument_GetSelection(This->doc->basedoc.doc_node->nsdoc, &selection); + if(NS_SUCCEEDED(nsres) && selection) { + cpp_bool is_collapsed; + + /* FIXME: Check if the click was inside selection. */ + nsres = nsISelection_GetIsCollapsed(selection, &is_collapsed); + nsISelection_Release(selection); + if(NS_SUCCEEDED(nsres) && !is_collapsed) + dwID = CONTEXT_MENU_TEXTSELECT; + } break; + } case CONTEXT_IMAGE: case CONTEXT_IMAGE|CONTEXT_LINK: dwID = CONTEXT_MENU_IMAGE;

1 0