February 2018 - Wine-Commits

Jacek Caban : mshtml: Expose IDOMMouseEvent to scripts.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 5711c85a20831ab662407038a47ac7fdffff8231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5711c85a20831ab662407038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:30:43 2018 +0100 mshtml: Expose IDOMMouseEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 16 +++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/events.js | 62 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c037709..8462bed 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1586,6 +1586,18 @@ static dispex_static_data_t DOMEvent_dispex = { DOMEvent_iface_tids }; +static const tid_t DOMMouseEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMMouseEvent_tid, + 0 +}; + +static dispex_static_data_t DOMMouseEvent_dispex = { + NULL, + DispDOMMouseEvent_tid, + DOMMouseEvent_iface_tids +}; + static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { dispex_static_data_t *dispex_data = &DOMEvent_dispex; @@ -1620,7 +1632,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) - time_epoch; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMMouseEvent, (void**)&event->mouse_event); - if(NS_FAILED(nsres)) + if(NS_SUCCEEDED(nsres)) + dispex_data = &DOMMouseEvent_dispex; + else event->mouse_event = NULL; init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 162367a..83c30e6 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -81,6 +81,7 @@ typedef struct EventTarget EventTarget; XDIID(DispCPlugins) \ XDIID(DispDOMChildrenCollection) \ XDIID(DispDOMEvent) \ + XDIID(DispDOMMouseEvent) \ XDIID(DispHTMLAnchorElement) \ XDIID(DispHTMLAreaElement) \ XDIID(DispHTMLAttributeCollection) \ @@ -128,6 +129,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ XIID(IDOMEvent) \ + XIID(IDOMMouseEvent) \ XIID(IDocumentEvent) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 30d23c7..fd7a268 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -592,6 +592,65 @@ function test_time_stamp() { next_test(); } +function test_mouse_event() { + var e; + + e = document.createEvent("MouseEvent"); + ok(e.screenX === 0, "screenX = " + e.screenX); + ok(e.screenY === 0, "screenY = " + e.screenY); + ok(e.clientX === 0, "clientX = " + e.clientX); + ok(e.clientY === 0, "clientY = " + e.clientY); + ok(e.ctrlKey === false, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === false, "altKey = " + e.altKey); + ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); + ok(e.metaKey === false, "metaKey = " + e.metaKey); + ok(e.button === 0, "button = " + e.button); + + e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); + ok(e.type === "test", "type = " + e.type); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.screenX === 2, "screenX = " + e.screenX); + ok(e.screenY === 3, "screenY = " + e.screenY); + ok(e.clientX === 4, "clientX = " + e.clientX); + ok(e.clientY === 5, "clientY = " + e.clientY); + ok(e.ctrlKey === false, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === false, "altKey = " + e.altKey); + ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); + ok(e.metaKey === false, "metaKey = " + e.metaKey); + ok(e.button === 1, "button = " + e.button); + + e.initMouseEvent("test", false, false, window, 9, 8, 7, 6, 5, true, true, true, true, 127, document); + ok(e.type === "test", "type = " + e.type); + ok(e.cancelable === false, "cancelable = " + e.cancelable); + ok(e.bubbles === false, "bubbles = " + e.bubbles); + ok(e.screenX === 8, "screenX = " + e.screenX); + ok(e.screenY === 7, "screenY = " + e.screenY); + ok(e.clientX === 6, "clientX = " + e.clientX); + ok(e.clientY === 5, "clientY = " + e.clientY); + ok(e.ctrlKey === true, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === true, "altKey = " + e.altKey); + ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); + ok(e.metaKey === true, "metaKey = " + e.metaKey); + ok(e.button === 127, "button = " + e.button); + + e.initEvent("testevent", true, true); + ok(e.type === "testevent", "type = " + e.type); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.screenX === 8, "screenX = " + e.screenX); + ok(e.screenY === 7, "screenY = " + e.screenY); + ok(e.clientX === 6, "clientX = " + e.clientX); + ok(e.clientY === 5, "clientY = " + e.clientY); + ok(e.ctrlKey === true, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === true, "altKey = " + e.altKey); + ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); + ok(e.metaKey === true, "metaKey = " + e.metaKey); + ok(e.button === 127, "button = " + e.button); + + next_test(); +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -605,5 +664,6 @@ var tests = [ test_dispatch_event, test_recursive_dispatch, test_time_stamp, - test_listener_order + test_listener_order, + test_mouse_event ];

1 0

Daniel Lehman : ole32: Return error from IStream Clone.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 8ec17b8e73f107af508a89cde51294e0d345bfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec17b8e73f107af508a89cd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 19 10:39:17 2018 -0800 ole32: Return error from IStream Clone. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_stream.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index a3abf46..1a5f061 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -23,7 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -604,7 +603,6 @@ static HRESULT WINAPI StgStreamImpl_Clone( IStream** ppstm) /* [out] */ { StgStreamImpl* This = impl_from_IStream(iface); - HRESULT hres; StgStreamImpl* new_stream; LARGE_INTEGER seek_pos; @@ -630,11 +628,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( seek_pos.QuadPart = This->currentPosition.QuadPart; - hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); - - assert (SUCCEEDED(hres)); - - return S_OK; + return IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); } /*

1 0

Jacek Caban : mshtml: Use DispDOMEvent for DOMEvent object.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: aa2be899a68e96ad2c8024dbeb3740b09092f696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2be899a68e96ad2c8024db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:29:50 2018 +0100 mshtml: Use DispDOMEvent for DOMEvent object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index eb27a24..0cf69fb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1476,7 +1476,7 @@ static const tid_t DOMEvent_iface_tids[] = { static dispex_static_data_t DOMEvent_dispex = { NULL, - IDOMEvent_tid, + DispDOMEvent_tid, DOMEvent_iface_tids }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ea38a66..162367a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -80,6 +80,7 @@ typedef struct EventTarget EventTarget; XDIID(DispCEventObj) \ XDIID(DispCPlugins) \ XDIID(DispDOMChildrenCollection) \ + XDIID(DispDOMEvent) \ XDIID(DispHTMLAnchorElement) \ XDIID(DispHTMLAreaElement) \ XDIID(DispHTMLAttributeCollection) \

1 0

Alexandre Julliard : ntdll: Get rid of the vm86 structure in the TEB.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 73d1b89a128de9aebc0256f77b1816102daf61fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d1b89a128de9aebc0256f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:16:44 2018 +0100 ntdll: Get rid of the vm86 structure in the TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 6 ------ include/winternl.h | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a980dc7..8a64338 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -226,9 +226,6 @@ struct debug_info /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ struct ntdll_thread_data { -#ifdef __i386__ - WINE_VM86_TEB_INFO __vm86; /* FIXME: placeholder for vm86 data from struct x86_thread_data */ -#endif struct debug_info *debug_info; /* info for debugstr functions */ void *start_stack; /* stack for thread startup */ int request_fd; /* fd for sending server requests */ @@ -239,9 +236,6 @@ struct ntdll_thread_data }; C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); -#ifdef __i386__ -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 ) == 0x1fc ); -#endif static inline struct ntdll_thread_data *ntdll_get_thread_data(void) { diff --git a/include/winternl.h b/include/winternl.h index 4c02873..2911ff6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2913,18 +2913,6 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) #ifdef __WINESRC__ -/* FIXME: private structure for vm86 mode, stored in teb->GdiTebBatch */ -typedef struct -{ - DWORD dpmi_vif; - DWORD vm86_pending; -} WINE_VM86_TEB_INFO; - -static inline WINE_VM86_TEB_INFO *get_vm86_teb_info(void) -{ - return (WINE_VM86_TEB_INFO *)&NtCurrentTeb()->GdiTebBatch; -} - /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */ typedef struct

1 0

Nikolay Sivov : wincodecs: Use static array for property bag descriptions.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 93afd254bb80d1f4c3e7601b5c2be14a1901a769 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93afd254bb80d1f4c3e7601b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 19:59:32 2018 +0300 wincodecs: Use static array for property bag descriptions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/jpegformat.c | 31 ++++++++++--------------------- dlls/windowscodecs/pngformat.c | 13 +++++-------- dlls/windowscodecs/propertybag.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 20 +++++++------------- dlls/windowscodecs/wincodecs_private.h | 2 +- 5 files changed, 25 insertions(+), 45 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ef050ba..6617ec7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1440,7 +1440,15 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; - PROPBAG2 opts[6] = {{0}}; + static const PROPBAG2 opts[6] = + { + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszImageQuality }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszBitmapTransform }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszLuminance }, + { PROPBAG2_TYPE_DATA, VT_I4 | VT_ARRAY, 0, 0, (LPOLESTR)wszChrominance }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszJpegYCrCbSubsampling }, + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszSuppressApp0 }, + }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1458,26 +1466,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - opts[0].pstrName = (LPOLESTR)wszImageQuality; - opts[0].vt = VT_R4; - opts[0].dwType = PROPBAG2_TYPE_DATA; - opts[1].pstrName = (LPOLESTR)wszBitmapTransform; - opts[1].vt = VT_UI1; - opts[1].dwType = PROPBAG2_TYPE_DATA; - opts[2].pstrName = (LPOLESTR)wszLuminance; - opts[2].vt = VT_I4|VT_ARRAY; - opts[2].dwType = PROPBAG2_TYPE_DATA; - opts[3].pstrName = (LPOLESTR)wszChrominance; - opts[3].vt = VT_I4|VT_ARRAY; - opts[3].dwType = PROPBAG2_TYPE_DATA; - opts[4].pstrName = (LPOLESTR)wszJpegYCrCbSubsampling; - opts[4].vt = VT_UI1; - opts[4].dwType = PROPBAG2_TYPE_DATA; - opts[5].pstrName = (LPOLESTR)wszSuppressApp0; - opts[5].vt = VT_BOOL; - opts[5].dwType = PROPBAG2_TYPE_DATA; - - hr = CreatePropertyBag2(opts, 6, ppIEncoderOptions); + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 1ab2c85..117761c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -2033,7 +2033,11 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; - PROPBAG2 opts[2]= {{0}}; + static const PROPBAG2 opts[2] = + { + { PROPBAG2_TYPE_DATA, VT_BOOL, 0, 0, (LPOLESTR)wszPngInterlaceOption }, + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszPngFilterOption }, + }; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -2051,13 +2055,6 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - opts[0].pstrName = (LPOLESTR)wszPngInterlaceOption; - opts[0].vt = VT_BOOL; - opts[0].dwType = PROPBAG2_TYPE_DATA; - opts[1].pstrName = (LPOLESTR)wszPngFilterOption; - opts[1].vt = VT_UI1; - opts[1].dwType = PROPBAG2_TYPE_DATA; - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (FAILED(hr)) { diff --git a/dlls/windowscodecs/propertybag.c b/dlls/windowscodecs/propertybag.c index 2f3015c..e9d1af9 100644 --- a/dlls/windowscodecs/propertybag.c +++ b/dlls/windowscodecs/propertybag.c @@ -213,7 +213,7 @@ static HRESULT WINAPI PropertyBag_CountProperties(IPropertyBag2 *iface, ULONG *p return S_OK; } -static HRESULT copy_propbag2(PROPBAG2 *dest, PROPBAG2 *src) +static HRESULT copy_propbag2(PROPBAG2 *dest, const PROPBAG2 *src) { dest->cfType = src->cfType; dest->clsid = src->clsid; @@ -278,7 +278,7 @@ static const IPropertyBag2Vtbl PropertyBag_Vtbl = { PropertyBag_LoadObject }; -HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, +HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, IPropertyBag2 **ppPropertyBag2) { UINT i; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a0eec53..f165e18 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1936,7 +1936,11 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, { TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); TiffFrameEncode *result; - + static const PROPBAG2 opts[2] = + { + { PROPBAG2_TYPE_DATA, VT_UI1, 0, 0, (LPOLESTR)wszTiffCompressionMethod }, + { PROPBAG2_TYPE_DATA, VT_R4, 0, 0, (LPOLESTR)wszCompressionQuality }, + }; HRESULT hr=S_OK; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1955,24 +1959,14 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (SUCCEEDED(hr)) { - PROPBAG2 opts[2]= {{0}}; - opts[0].pstrName = (LPOLESTR)wszTiffCompressionMethod; - opts[0].vt = VT_UI1; - opts[0].dwType = PROPBAG2_TYPE_DATA; - - opts[1].pstrName = (LPOLESTR)wszCompressionQuality; - opts[1].vt = VT_R4; - opts[1].dwType = PROPBAG2_TYPE_DATA; - - hr = CreatePropertyBag2(opts, 2, ppIEncoderOptions); - + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (SUCCEEDED(hr)) { VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; V_UNION(&v, bVal) = WICTiffCompressionDontCare; - hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, opts, &v); + hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr)) { diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 2249c13..8bba811 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -120,7 +120,7 @@ extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT heigh extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN; -extern HRESULT CreatePropertyBag2(PROPBAG2 *options, UINT count, +extern HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : wincodecs: Encoder options are optional for CreateNewFrame ().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 0be89601f57388e5788151d2176c0d24e9aaa76a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0be89601f57388e5788151d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 19:59:33 2018 +0300 wincodecs: Encoder options are optional for CreateNewFrame(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 7 +++++-- dlls/windowscodecs/icnsformat.c | 9 ++++++--- dlls/windowscodecs/jpegformat.c | 11 +++++++---- dlls/windowscodecs/pngformat.c | 11 +++++++---- dlls/windowscodecs/tests/converter.c | 18 ++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 2 +- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 48a8e27..047154e 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -508,8 +508,11 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (!This->stream) return WINCODEC_ERR_NOTINITIALIZED; - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); - if (FAILED(hr)) return hr; + if (ppIEncoderOptions) + { + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + if (FAILED(hr)) return hr; + } encode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameEncode)); if (!encode) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 14144f7..aa96404 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -617,9 +617,12 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, goto end; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); - if (FAILED(hr)) - goto end; + if (ppIEncoderOptions) + { + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + if (FAILED(hr)) + goto end; + } frameEncode = HeapAlloc(GetProcessHeap(), 0, sizeof(IcnsFrameEncode)); if (frameEncode == NULL) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6617ec7..433a031 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1466,11 +1466,14 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); - if (FAILED(hr)) + if (ppIEncoderOptions) { - LeaveCriticalSection(&This->lock); - return hr; + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } } This->frame_count = 1; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 117761c..26b5fd5 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -2055,11 +2055,14 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); - if (FAILED(hr)) + if (ppIEncoderOptions) { - LeaveCriticalSection(&This->lock); - return hr; + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } } This->frame_count = 1; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 704ae5d..80423dc 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,24 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls int i; hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + + /* Encoder options are optional. */ + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, NULL); + ok(SUCCEEDED(hr), "Failed to create encode frame, hr %#x.\n", hr); + + IStream_Release(stream); + IWICBitmapEncoder_Release(encoder); + IWICBitmapFrameEncode_Release(frameencode); + + hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f165e18..f125b07 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1957,7 +1957,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, hr = E_FAIL; } - if (SUCCEEDED(hr)) + if (ppIEncoderOptions && SUCCEEDED(hr)) { hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (SUCCEEDED(hr))

1 0

Nikolay Sivov : comctl32/toolbar: Fix a crash when tracing special button string identifier.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 2e8dfbb1ad71f24c41e8485a39df01bb9304127f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e8dfbb1ad71f24c41e8485a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 23:32:14 2018 +0300 comctl32/toolbar: Fix a crash when tracing special button string identifier. Based on patch by Mark Jansen <mark.jansen(a)reactos.org>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index f9a2220..a48fddf 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -284,9 +284,9 @@ TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) static void TOOLBAR_DumpTBButton(const TBBUTTON *tbb, BOOL fUnicode) { - TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx (%s)\n", - tbb->idCommand,tbb->iBitmap, tbb->fsState, tbb->fsStyle, tbb->dwData, tbb->iString, - (fUnicode ? wine_dbgstr_w((LPWSTR)tbb->iString) : wine_dbgstr_a((LPSTR)tbb->iString))); + TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%p, stringid=%p (%s)\n", tbb->idCommand, + tbb->iBitmap, tbb->fsState, tbb->fsStyle, (void *)tbb->dwData, (void *)tbb->iString, + tbb->iString != -1 ? (fUnicode ? debugstr_w((LPWSTR)tbb->iString) : debugstr_a((LPSTR)tbb->iString)) : ""); } static void

1 0

Michael Stefaniuc : gdiplus: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: fb12076e1a840faa5b5271731125a13e814dbd15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb12076e1a840faa5b527173… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:40:58 2018 +0100 gdiplus: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 76e5b9b..ea79f11 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -30,6 +30,7 @@ #include "objbase.h" #include "ocidl.h" #include "wincodecsdk.h" +#include "wine/heap.h" #include "wine/list.h" #include "gdiplus.h" @@ -49,25 +50,6 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml.idl: Added IDOMUIEvent declaration.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 0eeaac7a38d51dd79a2e86104e4422208fe107de URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eeaac7a38d51dd79a2e8610… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 18:16:09 2018 +0100 mshtml.idl: Added IDOMUIEvent declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index 42593dc..38e0bca 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -20168,6 +20168,35 @@ methods: WINE_IDOMEVENT_DISPINTERFACE_DECL; } +/***************************************************************************** + * IDOMUIEvent interface + */ +[ + odl, + oleautomation, + dual, + uuid(305106ca-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMUIEvent : IDispatch +{ + [propget, id(DISPID_IDOMUIEVENT_VIEW)] + HRESULT view([out, retval] IHTMLWindow2 **p); + + [propget, id(DISPID_IDOMUIEVENT_DETAIL)] + HRESULT detail([out, retval] long *p); + + [id(DISPID_IDOMUIEVENT_INITUIEVENT)] + HRESULT initUIEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] IHTMLWindow2 *view, + [in] long detail); +} + +/***************************************************************************** + * DispDOMUIEvent dispinterface + */ [ hidden, uuid(30590072-98b5-11cf-bb82-00aa00bdce0b)

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent key state getters implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 6a16a5f424fb8e8a296631b9fe34dc404366579d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a16a5f424fb8e8a296631b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:30:08 2018 +0100 mshtml: Added IDOMMouseEvent key state getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e4ba0ed..fbe44f5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1327,29 +1327,65 @@ static HRESULT WINAPI DOMMouseEvent_get_clientY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_ctrlKey(IDOMMouseEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetCtrlKey(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_shiftKey(IDOMMouseEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetShiftKey(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_altKey(IDOMMouseEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetAltKey(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_metaKey(IDOMMouseEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetMetaKey(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_button(IDOMMouseEvent *iface, USHORT *p)

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent position getters implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: feb957b2768e8864afc9946f1044cf251e311a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb957b2768e8864afc9946f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:29:59 2018 +0100 mshtml: Added IDOMMouseEvent position getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0cf69fb..e4ba0ed 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1263,29 +1263,65 @@ static HRESULT WINAPI DOMMouseEvent_Invoke(IDOMMouseEvent *iface, DISPID dispIdM static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 screen_x; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetScreenX(This->mouse_event, &screen_x); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = screen_x; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 screen_y; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetScreenY(This->mouse_event, &screen_y); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = screen_y; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 client_x; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetClientX(This->mouse_event, &client_x); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = client_x; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_clientY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 client_y; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetClientY(This->mouse_event, &client_y); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = client_y; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_ctrlKey(IDOMMouseEvent *iface, VARIANT_BOOL *p)

1 0

Jacek Caban : mshtml: Use IDOMMouseEvent instead of nsIDOMMouseEvent in IHTMLEventObj implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 65ce11478c2885ed2b248e6967479ba84fabb449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ce11478c2885ed2b248e69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:31:04 2018 +0100 mshtml: Use IDOMMouseEvent instead of nsIDOMMouseEvent in IHTMLEventObj implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 109 ++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 82 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8462bed..633c1f9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -411,6 +411,9 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL TRACE("(%p)->(%p)\n", This, p); + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_altKey(&This->event->IDOMMouseEvent_iface, p); + if(This->event) { nsIDOMKeyEvent *key_event; nsresult nsres; @@ -419,14 +422,6 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL if(NS_SUCCEEDED(nsres)) { nsIDOMKeyEvent_GetAltKey(key_event, &ret); nsIDOMKeyEvent_Release(key_event); - }else { - nsIDOMMouseEvent *mouse_event; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetAltKey(mouse_event, &ret); - nsIDOMMouseEvent_Release(mouse_event); - } } } @@ -441,6 +436,9 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO TRACE("(%p)->(%p)\n", This, p); + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_ctrlKey(&This->event->IDOMMouseEvent_iface, p); + if(This->event) { nsIDOMKeyEvent *key_event; nsresult nsres; @@ -449,14 +447,6 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO if(NS_SUCCEEDED(nsres)) { nsIDOMKeyEvent_GetCtrlKey(key_event, &ret); nsIDOMKeyEvent_Release(key_event); - }else { - nsIDOMMouseEvent *mouse_event; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetCtrlKey(mouse_event, &ret); - nsIDOMMouseEvent_Release(mouse_event); - } } } @@ -471,6 +461,9 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO TRACE("(%p)->(%p)\n", This, p); + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_shiftKey(&This->event->IDOMMouseEvent_iface, p); + if(This->event) { nsIDOMKeyEvent *key_event; nsresult nsres; @@ -479,14 +472,6 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO if(NS_SUCCEEDED(nsres)) { nsIDOMKeyEvent_GetShiftKey(key_event, &ret); nsIDOMKeyEvent_Release(key_event); - }else { - nsIDOMMouseEvent *mouse_event; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetShiftKey(mouse_event, &ret); - nsIDOMMouseEvent_Release(mouse_event); - } } } @@ -594,19 +579,15 @@ static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - INT16 button = 0; + USHORT button = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetButton(mouse_event, &button); - nsIDOMMouseEvent_Release(mouse_event); - } + if(This->event && This->event->mouse_event) { + HRESULT hres; + hres = IDOMMouseEvent_get_button(&This->event->IDOMMouseEvent_iface, &button); + if(FAILED(hres)) + return hres; } *p = button; @@ -698,44 +679,26 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG x = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_clientX(&This->event->IDOMMouseEvent_iface, p); - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetClientX(mouse_event, &x); - nsIDOMMouseEvent_Release(mouse_event); - } - } - - *p = x; + *p = 0; return S_OK; } static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG y = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetClientY(mouse_event, &y); - nsIDOMMouseEvent_Release(mouse_event); - } - } + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_clientY(&This->event->IDOMMouseEvent_iface, p); - *p = y; + *p = 0; return S_OK; } @@ -762,44 +725,26 @@ static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG x = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetScreenX(mouse_event, &x); - nsIDOMMouseEvent_Release(mouse_event); - } - } + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_screenX(&This->event->IDOMMouseEvent_iface, p); - *p = x; + *p = 0; return S_OK; } static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG y = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetScreenY(mouse_event, &y); - nsIDOMMouseEvent_Release(mouse_event); - } - } + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_screenY(&This->event->IDOMMouseEvent_iface, p); - *p = y; + *p = 0; return S_OK; }

1 0

Alexandre Julliard : winebuild: Stop building the DPMI event check routine.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 96c77a8cf65a8f9300cd45e08dfc3f74985dc62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c77a8cf65a8f9300cd45e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:16:13 2018 +0100 winebuild: Stop building the DPMI event check routine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/relay.c | 52 ------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4b78f68..1adbda0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -36,8 +36,6 @@ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */ -#define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ -#define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */ static void function_header( const char *name ) { @@ -749,53 +747,6 @@ static void BuildCallTo32CBClient( int isEx ) /******************************************************************* - * BuildPendingEventCheck - * - * Build a function that checks whether there are any - * pending DPMI events. - * - * Stack layout: - * - * (sp+12) long eflags - * (sp+6) long cs - * (sp+2) long ip - * (sp) word fs - * - * On entry to function, fs register points to a valid TEB. - * On exit from function, stack will be popped. - */ -static void BuildPendingEventCheck(void) -{ - /* Function header */ - - function_header( "DPMI_PendingEventCheck" ); - - /* Check for pending events. */ - - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", VM86_PENDING_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", DPMI_VIF_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - - /* Process pending events. */ - - output( "\tsti\n" ); - - /* Start cleanup. Restore fs register. */ - - output( "%s\n", asm_globl("DPMI_PendingEventCheck_Cleanup") ); - output( "\tpopw %%fs\n" ); - - /* Return from function. */ - - output( "%s\n", asm_globl("DPMI_PendingEventCheck_Return") ); - output( "\tiret\n" ); - - output_function_size( "DPMI_PendingEventCheck" ); -} - - -/******************************************************************* * output_asm_relays16 * * Build all the 16-bit relay callbacks @@ -833,9 +784,6 @@ void output_asm_relays16(void) /* CBClientThunkSLEx routine */ BuildCallTo32CBClient( 1 ); - /* Pending DPMI events check stub */ - BuildPendingEventCheck(); - output( "%s\n", asm_globl("__wine_call16_end") ); output_function_size( "__wine_spec_thunk_text_16" );

1 0

Alexandre Julliard : krnl386: Remove support for vm86 contexts.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 526b245237b9571beebac8a4653e7dd74c62c7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=526b245237b9571beebac8a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:13:07 2018 +0100 krnl386: Remove support for vm86 contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 6 ++-- dlls/krnl386.exe16/dosvm.c | 15 +++----- dlls/krnl386.exe16/fpu.c | 3 -- dlls/krnl386.exe16/instr.c | 7 ++-- dlls/krnl386.exe16/int15.c | 6 ---- dlls/krnl386.exe16/int21.c | 76 ++++++----------------------------------- dlls/krnl386.exe16/int2f.c | 72 ++++---------------------------------- dlls/krnl386.exe16/interrupts.c | 50 ++++++++++----------------- 8 files changed, 42 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=526b245237b9571beeba…

1 0

Alexandre Julliard : user32/tests: Fix pointer conversion warnings.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 2d0704f73a7cd1952b684b5920b2a34a71396ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0704f73a7cd1952b684b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 11:50:32 2018 +0100 user32/tests: Fix pointer conversion warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 19f220d..6b2b2bc 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1247,7 +1247,7 @@ enum defdlgproc_text static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - int mode = (int)GetPropA(hdlg, "test_mode"); + int mode = HandleToULong(GetPropA(hdlg, "test_mode")); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1290,7 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - int mode = (int)GetPropA(hdlg, "test_mode"); + int mode = HandleToULong(GetPropA(hdlg, "test_mode")); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1329,18 +1329,18 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; - SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_CONTEXT)); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); - SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_A)); ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); - SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_W)); ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); }

1 0

Józef Kucia : wined3d: Do not validate texture type in resolve_depth_buffer().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 89eaa4aa37c111bccbc17557ec0e13fdcd70100e URL: https://source.winehq.org/git/wine.git/?a=commit;h=89eaa4aa37c111bccbc17557… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:40 2018 +0100 wined3d: Do not validate texture type in resolve_depth_buffer(). It's validated in wined3d_texture_blt(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c415d1..2d1603f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1931,8 +1931,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) struct wined3d_rendertarget_view *src_view; RECT src_rect, dst_rect; - if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_texture || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) return; if (!(src_view = state->fb->depth_stencil))

1 0

Józef Kucia : wined3d: Add ARB_texture_multisample extension.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 416f8d2e864e96152b470d9bf6b0bc40d13fd1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=416f8d2e864e96152b470d9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:36 2018 +0100 wined3d: Add ARB_texture_multisample extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc..4a69b28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, + {"GL_ARB_texture_multisample", ARB_TEXTURE_MULTISAMPLE }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, @@ -2888,6 +2889,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_multisample */ + USE_GL_FUNC(glGetMultisamplefv); + USE_GL_FUNC(glSampleMaski); + USE_GL_FUNC(glTexImage2DMultisample); + USE_GL_FUNC(glTexImage3DMultisample); /* GL_ARB_texture_storage */ USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) @@ -3868,6 +3874,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_TEXTURE_MULTISAMPLE, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0894c94..1bbdaa2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -117,6 +117,7 @@ enum wined3d_gl_extension ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, + ARB_TEXTURE_MULTISAMPLE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_QUERY_LEVELS, ARB_TEXTURE_RECTANGLE,

1 0

Dmitry Timoshkov : kerberos: Calling InitializeSecurityContext without a token buffer is not an error.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: b8f0649851f5ed59b7a333f0e915be1b786fc5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0649851f5ed59b7a333f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 5 12:49:16 2018 +0800 kerberos: Calling InitializeSecurityContext without a token buffer is not an error. This patch makes Kerberos Authentication Tester work with https and dotnet40. Apparently that's a dotnet40 quirk that it passes not NULL input buffers but doesn't mark any of buffers as a token, dotnet20 passes NULL input. Note, that in order to make version 2.0 applications work (Kerberos Authentication Tester is such an application) with dotnet40+ one needs to add to the registry key [Software\\Microsoft\\.NETFramework] "OnlyUseLatestCLR"=dword:00000001 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8b5b612..1bba926 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -913,9 +913,13 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (!input) input_token.length = 0; else { - if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - input_token.length = input->pBuffers[idx].cbBuffer; - input_token.value = input->pBuffers[idx].pvBuffer; + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) + input_token.length = 0; + else + { + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } } if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Nikolay Sivov : comctl32/edit: Handle Ctrl-A shortcut as select all command.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: f7062d1d03c374bf8ba872f97e15261ee61ebaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7062d1d03c374bf8ba872f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:30:11 2018 +0300 comctl32/edit: Handle Ctrl-A shortcut as select all command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 9f065f6..86a0a58 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1477,12 +1477,15 @@ static void EDIT_InvalidateText(EDITSTATE *es, INT start, INT end) * In other words: this handler is OK * */ -static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) +static BOOL EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) { UINT old_start = es->selection_start; UINT old_end = es->selection_end; UINT len = get_text_length(es); + if (start == old_start && end == old_end) + return FALSE; + if (start == (UINT)-1) { start = es->selection_end; end = es->selection_end; @@ -1535,6 +1538,8 @@ static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) } } else EDIT_InvalidateText(es, start, old_end); + + return TRUE; } @@ -3365,6 +3370,16 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; + case 'A': + if (control) + { + if (EDIT_EM_SetSel(es, 0, get_text_length(es), FALSE)) + { + EDIT_NOTIFY_PARENT(es, EN_UPDATE); + EDIT_NOTIFY_PARENT(es, EN_CHANGE); + } + } + break; } return TRUE; }

1 0

Alexandre Julliard : krnl386: Remove support for DPMI real-mode calls.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: ed6bdb3c51cd4b8c94f9839806321703e7aa9765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6bdb3c51cd4b8c94f98398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:03:48 2018 +0100 krnl386: Remove support for DPMI real-mode calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosaspi.c | 234 ------------ dlls/krnl386.exe16/dosexe.h | 23 -- dlls/krnl386.exe16/dosvm.c | 105 +----- dlls/krnl386.exe16/instr.c | 2 - dlls/krnl386.exe16/int21.c | 16 +- dlls/krnl386.exe16/int2f.c | 20 +- dlls/krnl386.exe16/int31.c | 807 ++-------------------------------------- dlls/krnl386.exe16/interrupts.c | 190 ++-------- 9 files changed, 56 insertions(+), 1342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6bdb3c51cd4b8c94f9…

1 0

Alexandre Julliard : ntdll: Block signals during process-wide exit.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 4a5890811d21b58a81b79a4158f00354abadd88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5890811d21b58a81b79a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 16:43:34 2018 +0100 ntdll: Block signals during process-wide exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b36b265..c999d4b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -475,6 +475,7 @@ void WINAPI RtlExitUserThread( ULONG status ) if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) { LdrShutdownProcess(); + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); signal_exit_process( status ); }

1 0

Józef Kucia : wined3d: Implement ld2dms instruction.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: f2e614b1f898de74276bef8a612420b6fb2d5b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e614b1f898de74276bef8a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:39 2018 +0100 wined3d: Implement ld2dms instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 27 +++++++++++++++++++-------- dlls/wined3d/shader.c | 1 + 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 03684b6..6f54b31 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5975,15 +5975,14 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); } -/* FIXME: The current implementation does not handle multisample textures correctly. */ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + struct glsl_src_param coord_param, lod_param, sample_param; unsigned int resource_idx, sampler_idx, sampler_bind_idx; - struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; - BOOL has_lod_param; + BOOL has_lod_param, multisample; if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -5996,15 +5995,27 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) ERR("Invalid resource index %u.\n", resource_idx); return; } - has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER; + multisample = reg_maps->resource_info[resource_idx].type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS + || reg_maps->resource_info[resource_idx].type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY; + has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER + && !multisample; shader_glsl_get_sample_function(ins->ctx, resource_idx, sampler_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); - shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, - "%s", coord_param.param_str); + if (multisample) + { + shader_glsl_add_src_param(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &sample_param); + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, + NULL, NULL, NULL, &ins->texel_offset, "%s, %s", coord_param.param_str, sample_param.param_str); + } + else + { + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, + NULL, NULL, has_lod_param ? lod_param.param_str : NULL, &ins->texel_offset, + "%s", coord_param.param_str); + } shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -11149,7 +11160,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, - /* WINED3DSIH_LD2DMS */ NULL, + /* WINED3DSIH_LD2DMS */ shader_glsl_ld, /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw_structured, /* WINED3DSIH_LD_STRUCTURED */ shader_glsl_ld_raw_structured, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e59b9e5..c775df0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1676,6 +1676,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); } else if (ins.handler_idx == WINED3DSIH_LD + || ins.handler_idx == WINED3DSIH_LD2DMS || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_RESOURCE) || (ins.handler_idx == WINED3DSIH_RESINFO && ins.src[1].reg.type == WINED3DSPR_RESOURCE)) {

1 0

Józef Kucia : wined3d: Add support for multisample samplers.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 780ec0c1f932476c9a33cac8aa6adf78b74c2b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=780ec0c1f932476c9a33cac8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:38 2018 +0100 wined3d: Add support for multisample samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e18a99f..03684b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2591,6 +2591,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont sampler_type = "samplerCubeArray"; break; + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMS: + sampler_type = "sampler2DMS"; + break; + + case WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY: + sampler_type = "sampler2DMSArray"; + break; + default: sampler_type = "unsupported_sampler"; FIXME("Unhandled resource type %#x.\n", reg_maps->resource_info[entry->resource_idx].type); @@ -7446,6 +7454,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); if (gl_info->supported[ARB_TEXTURE_GATHER]) shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n"); + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + shader_addline(buffer, "#extension GL_ARB_texture_multisample : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])

1 0

Józef Kucia : wined3d: Add ARB_texture_storage_multisample extension.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: fea8cf8b36846fbf173f31fce2f82499f92f54a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea8cf8b36846fbf173f31fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:37 2018 +0100 wined3d: Add ARB_texture_storage_multisample extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4a69b28..000d0b7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -191,6 +191,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, + {"GL_ARB_texture_storage_multisample", ARB_TEXTURE_STORAGE_MULTISAMPLE}, {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, @@ -2898,6 +2899,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) USE_GL_FUNC(glTexStorage3D) + /* GL_ARB_texture_storage_multisample */ + USE_GL_FUNC(glTexStorage2DMultisample); + USE_GL_FUNC(glTexStorage3DMultisample); /* GL_ARB_texture_view */ USE_GL_FUNC(glTextureView) /* GL_ARB_timer_query */ @@ -3921,6 +3925,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, + {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1bbdaa2..a3dee24 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -124,6 +124,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, ARB_TEXTURE_STORAGE, + ARB_TEXTURE_STORAGE_MULTISAMPLE, ARB_TEXTURE_SWIZZLE, ARB_TEXTURE_VIEW, ARB_TIMER_QUERY,

1 0

Michael Stefaniuc : riched20: Get rid of the ALLOC_OBJ macro.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 965dc38175fdeef4a674b17977c5ad77d2e9d660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=965dc38175fdeef4a674b179… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:47 2018 +0100 riched20: Get rid of the ALLOC_OBJ macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 ++++---------- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 4 ++-- dlls/riched20/style.c | 2 +- dlls/riched20/table.c | 4 ++-- dlls/riched20/writer.c | 8 ++------ 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 8a99394..d676a1b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -484,7 +484,7 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, MERF_GRAPHICS); - di->member.run.ole_obj = ALLOC_OBJ(*reo); + di->member.run.ole_obj = heap_alloc(sizeof(*reo)); ME_CopyReObject(di->member.run.ole_obj, reo); ME_ReleaseStyle(pStyle); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index da7d62b..53d0950 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -261,9 +261,7 @@ static inline BOOL is_version_nt(void) } static ME_TextBuffer *ME_MakeText(void) { - - ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); - + ME_TextBuffer *buf = heap_alloc(sizeof(*buf)); ME_DisplayItem *p1 = ME_MakeDI(diTextStart); ME_DisplayItem *p2 = ME_MakeDI(diTextEnd); @@ -606,8 +604,7 @@ void ME_RTFParAttrHook(RTF_Info *info) if (!info->editor->bEmulateVersion10) /* v4.1 */ { while (info->rtfParam > info->nestingLevel) { - RTFTable *tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(tableDef, sizeof(RTFTable)); + RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); tableDef->parent = info->tableDef; info->tableDef = tableDef; @@ -641,10 +638,7 @@ void ME_RTFParAttrHook(RTF_Info *info) { RTFTable *tableDef; if (!info->tableDef) - { - info->tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(info->tableDef, sizeof(RTFTable)); - } + info->tableDef = heap_alloc_zero(sizeof(*info->tableDef)); tableDef = info->tableDef; RTFFlushOutputBuffer(info); if (tableDef->tableRowStart && @@ -2993,7 +2987,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { - ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); + ME_TextEditor *ed = heap_alloc(sizeof(*ed)); int i; DWORD props; LONG selbarwidth; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 55e259a..6215068 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,7 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -#define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 7cb9927..58b64e8 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -179,8 +179,8 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) ME_DisplayItem *ME_MakeDI(ME_DIType type) { - ME_DisplayItem *item = ALLOC_OBJ(ME_DisplayItem); - ZeroMemory(item, sizeof(ME_DisplayItem)); + ME_DisplayItem *item = heap_alloc_zero(sizeof(*item)); + item->type = type; item->prev = item->next = NULL; return item; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 5462580..48d57e8 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -113,7 +113,7 @@ void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { - ME_Style *s = ALLOC_OBJ(ME_Style); + ME_Style *s = heap_alloc(sizeof(*s)); assert(style->cbSize == sizeof(CHARFORMAT2W)); s->fmt = *style; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index d2cab9a..4cd77eb 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -637,8 +637,8 @@ void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) { - RTFTable *tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(tableDef, sizeof(RTFTable)); + RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); + if (!editor->bEmulateVersion10) /* v4.1 */ tableDef->gapH = 10; return tableDef; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index de0bb8d..aad2e44 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -57,15 +57,11 @@ ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars); static ME_OutStream* ME_StreamOutInit(ME_TextEditor *editor, EDITSTREAM *stream) { - ME_OutStream *pStream = ALLOC_OBJ(ME_OutStream); + ME_OutStream *pStream = heap_alloc_zero(sizeof(*pStream)); + pStream->stream = stream; pStream->stream->dwError = 0; - pStream->pos = 0; - pStream->written = 0; - pStream->nFontTblLen = 0; pStream->nColorTblLen = 1; - pStream->nNestingLevel = 0; - memset(&pStream->cur_fmt, 0, sizeof(pStream->cur_fmt)); pStream->cur_fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; pStream->cur_fmt.bUnderlineType = CFU_UNDERLINE; return pStream;

1 0