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

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

Feb. 5, 2018

Module: wine Branch: master Commit: 7153b5593e9a4f7c35950672610f951df2c3753f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7153b5593e9a4f7c35950672… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:46 2018 +0100 riched20: Get rid of the FREE_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/editor.c | 13 ++++++------- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/style.c | 2 +- dlls/riched20/writer.c | 7 +++---- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index daafe80..da7d62b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2147,7 +2147,7 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, nLen+1, NULL, NULL); - FREE_OBJ(p); + heap_free(p); return nChars; } } @@ -3160,10 +3160,9 @@ void ME_DestroyEditor(ME_TextEditor *editor) } OleUninitialize(); - FREE_OBJ(editor->pBuffer); - FREE_OBJ(editor->pCursors); - - FREE_OBJ(editor); + heap_free(editor->pBuffer); + heap_free(editor->pCursors); + heap_free(editor); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -4305,7 +4304,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); - FREE_OBJ( tmp ); + heap_free(tmp); }else{ FINDTEXTW *ft = (FINDTEXTW *)lParam; r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); @@ -4323,7 +4322,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); - FREE_OBJ( tmp ); + heap_free(tmp); }else{ FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7d4a8ef..55e259a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -27,7 +27,6 @@ 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 FREE_OBJ(ptr) heap_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index d321446..7cb9927 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -174,7 +174,7 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) heap_free( item->member.run.clusters ); ME_ReleaseStyle(item->member.run.style); } - FREE_OBJ(item); + heap_free(item); } ME_DisplayItem *ME_MakeDI(ME_DIType type) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 120bcf8..3033157 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5383,7 +5383,7 @@ void ME_DeleteReObject(REOBJECT* reo) if (reo->poleobj) IOleObject_Release(reo->poleobj); if (reo->pstg) IStorage_Release(reo->pstg); if (reo->polesite) IOleClientSite_Release(reo->polesite); - FREE_OBJ(reo); + heap_free(reo); } void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 4f08b3b..5462580 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -425,7 +425,7 @@ void ME_DestroyStyle(ME_Style *s) s->font_cache = NULL; } ScriptFreeCache( &s->script_cache ); - FREE_OBJ(s); + heap_free(s); } void ME_AddRefStyle(ME_Style *s) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 5494afe..de0bb8d 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -101,7 +101,7 @@ ME_StreamOutFree(ME_OutStream *pStream) LONG written = pStream->written; TRACE("total length = %u\n", written); - FREE_OBJ(pStream); + heap_free(pStream); return written; } @@ -1148,8 +1148,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nSize = WideCharToMultiByte(nCodePage, 0, get_text( &cursor.pRun->member.run, cursor.nOffset ), nLen, NULL, 0, NULL, NULL); if (nSize > nBufLen) { - FREE_OBJ(buffer); - buffer = ALLOC_N_OBJ(char, nSize); + buffer = heap_realloc(buffer, nSize); nBufLen = nSize; } WideCharToMultiByte(nCodePage, 0, get_text( &cursor.pRun->member.run, cursor.nOffset ), @@ -1163,7 +1162,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); } - FREE_OBJ(buffer); + heap_free(buffer); return success; }

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: f9016830a67ec9258a48b17d83e55d99c8068a99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9016830a67ec9258a48b17d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:45 2018 +0100 riched20: Use the global HeapAlloc() wrappers. 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/editor.h | 15 --------------- dlls/riched20/editstr.h | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index aba3026..7d4a8ef 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,21 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( me_heap, 0, len ); -} - -static inline BOOL heap_free( void *ptr ) -{ - return HeapFree( me_heap, 0, ptr ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) -{ - return HeapReAlloc( me_heap, 0, ptr, len ); -} - #define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) #define FREE_OBJ(ptr) heap_free(ptr) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2bf680e..a37c4de 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -48,6 +48,7 @@ #include "usp10.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #ifdef __i386__

1 0

Nikolay Sivov : user32: Fix names returned with GetClassName().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: a21b16d8cb0f0acefc0f1cb6ea646c5ddf752c48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21b16d8cb0f0acefc0f1cb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:29:44 2018 +0300 user32: Fix names returned with GetClassName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 39 +++++++++++++++++++++++++++------------ dlls/user32/tests/class.c | 2 -- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index fd9af7f..8fba5bf 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -61,6 +61,7 @@ typedef struct tagCLASS HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ WCHAR name[MAX_ATOM_LEN + 1]; + WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */ } CLASS; static struct list class_list = LIST_INIT( class_list ); @@ -324,7 +325,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -337,6 +338,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) ULONG module_offset; } *wndclass; + if (basename_offset) + *basename_offset = 0; + if (IS_INTRESOURCE( name )) return name; @@ -348,6 +352,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) return name; wndclass = (struct wndclass_redirect_data *)data.lpData; + if (basename_offset) + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); } @@ -366,7 +373,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name ); + name = CLASS_GetVersionedName( name, NULL ); for (;;) { @@ -408,7 +415,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) * * The real RegisterClass() functionality. */ -static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local, +static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local, DWORD style, INT classExtra, INT winExtra ) { CLASS *classPtr; @@ -428,7 +435,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local if (!classPtr) return NULL; classPtr->atomName = get_int_atom_value( name ); - if (!classPtr->atomName && name) strcpyW( classPtr->name, name ); + classPtr->basename = classPtr->name; + if (!classPtr->atomName && name) + { + strcpyW( classPtr->name, name ); + classPtr->basename += basename_offset; + } else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); SERVER_START_REQ( create_class ) @@ -476,7 +488,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; - if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, + if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, descr->style, 0, descr->extra ))) return; if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); @@ -632,14 +644,15 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { + UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name ); - classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name, &basename_offset ); + classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else { - classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, instance, + classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -672,6 +685,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; + UINT basename_offset; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -686,8 +700,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName ); - if (!(classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset ); + if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -739,7 +753,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className ); + className = CLASS_GetVersionedName( className, NULL ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); @@ -1155,7 +1169,8 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) } else { - lstrcpynW( buffer, class->name, count ); + /* Return original name class was registered with. */ + lstrcpynW( buffer, class->basename, count ); release_class_ptr( class ); ret = strlenW( buffer ); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 13d7b9d..9ae306e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1250,7 +1250,6 @@ static void test_actctx_classes(void) ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); -todo_wine ok(!strcmp(buff, testclass), "Unexpected class name.\n"); ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); @@ -1270,7 +1269,6 @@ todo_wine ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); -todo_wine ok(!strcmp(buff, testclass), "Unexpected class name.\n"); DestroyWindow(hwnd); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf0e3c7..f1cc0a8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,7 +269,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c3360f9..b13032b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1338,7 +1338,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className); + className = CLASS_GetVersionedName(className, NULL); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName),

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_device_prepare_index_buffer().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 2e027f866825f7fb6a69f90c88e95e3bfbc5f6dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e027f866825f7fb6a69f90c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:56 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_device_prepare_index_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 28bb2fb..75fd6c4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3650,15 +3650,22 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; }

1 0

Hans Leidekker : wbemprox: Add more Win32_ComputerSystemProduct properties.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 7c0025b60851b67cae036ce74403e41d4088da9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0025b60851b67cae036ce7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 5 16:08:15 2018 +0100 wbemprox: Add more Win32_ComputerSystemProduct properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 24 +++++++++++++++++- dlls/wbemprox/tests/query.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93bea52..dd5b9ac 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -331,6 +331,8 @@ static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR prop_settingidW[] = {'S','e','t','t','i','n','g','I','D',0}; +static const WCHAR prop_skunumberW[] = + {'S','K','U','N','u','m','b','e','r',0}; static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = @@ -377,6 +379,8 @@ static const WCHAR prop_uuidW[] = {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; +static const WCHAR prop_vendorW[] = + {'V','e','n','d','o','r',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; static const WCHAR prop_videoarchitectureW[] = @@ -440,7 +444,11 @@ static const struct column col_compsys[] = static const struct column col_compsysproduct[] = { { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, - { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_nameW, CIM_STRING|COL_FLAG_KEY }, + { prop_skunumberW, CIM_STRING }, + { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_vendorW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_datafile[] = { @@ -738,9 +746,15 @@ static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; static const WCHAR compsysproduct_identifyingnumberW[] = {'0',0}; +static const WCHAR compsysproduct_nameW[] = + {'W','i','n','e',0}; static const WCHAR compsysproduct_uuidW[] = {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', 'd','e','a','d','d','e','a','d','d','e','a','d',0}; +static const WCHAR compsysproduct_vendorW[] = + {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; +static const WCHAR compsysproduct_versionW[] = + {'1','.','0',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -830,7 +844,11 @@ struct record_computersystem struct record_computersystemproduct { const WCHAR *identifyingnumber; + const WCHAR *name; + const WCHAR *skunumber; const WCHAR *uuid; + const WCHAR *vendor; + const WCHAR *version; }; struct record_datafile { @@ -1417,7 +1435,11 @@ static enum fill_status fill_compsysproduct( struct table *table, const struct e rec = (struct record_computersystemproduct *)table->data; rec->identifyingnumber = compsysproduct_identifyingnumberW; + rec->name = compsysproduct_nameW; + rec->skunumber = NULL; rec->uuid = get_compsysproduct_uuid(); + rec->vendor = compsysproduct_vendorW; + rec->version = compsysproduct_versionW; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 79b09c0..7f2e864 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1223,7 +1223,18 @@ static void test_OperatingSystem( IWbemServices *services ) static void test_ComputerSystemProduct( IWbemServices *services ) { - static const WCHAR uuidW[] = {'U','U','I','D',0}; + static const WCHAR identifyingnumberW[] = + {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR skunumberW[] = + {'S','K','U','N','u','m','b','e','r',0}; + static const WCHAR uuidW[] = + {'U','U','I','D',0}; + static const WCHAR vendorW[] = + {'V','e','n','d','o','r',0}; + static const WCHAR versionW[] = + {'V','e','r','s','i','o','n',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; @@ -1247,13 +1258,57 @@ static void test_ComputerSystemProduct( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); + hr = IWbemClassObject_Get( obj, identifyingnumberW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "identifyingnumber %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, nameW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, skunumberW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); hr = IWbemClassObject_Get( obj, uuidW, 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); VariantClear( &value ); + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, vendorW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "vendor %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, versionW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "version %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0

Hans Leidekker : wbemprox: Add more Win32_BIOS properties.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: bc07327c15d27360417811064fd218b8e0cd0001 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc07327c15d2736041781106… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 5 16:08:16 2018 +0100 wbemprox: Add more Win32_BIOS properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 10 +++++++++- dlls/wbemprox/tests/query.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index dd5b9ac..b699724 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -335,6 +335,10 @@ static const WCHAR prop_skunumberW[] = {'S','K','U','N','u','m','b','e','r',0}; static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; +static const WCHAR prop_smbiosmajorversionW[] = + {'S','M','B','I','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_smbiosminorversionW[] = + {'S','M','B','I','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sidW[] = @@ -418,6 +422,8 @@ static const struct column col_bios[] = { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING }, { prop_smbiosbiosversionW, CIM_STRING }, + { prop_smbiosmajorversionW, CIM_UINT16, VT_I4 }, + { prop_smbiosminorversionW, CIM_UINT16, VT_I4 }, { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = @@ -818,6 +824,8 @@ struct record_bios const WCHAR *releasedate; const WCHAR *serialnumber; const WCHAR *smbiosbiosversion; + UINT16 smbiosmajorversion; + UINT16 smbiosminorversion; const WCHAR *version; }; struct record_cdromdrive @@ -1113,7 +1121,7 @@ static const struct record_baseboard data_baseboard[] = static const struct record_bios data_bios[] = { { bios_descriptionW, NULL, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, - bios_smbiosbiosversionW, bios_versionW } + bios_smbiosbiosversionW, 1, 0, bios_versionW } }; static const struct record_param data_param[] = { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7f2e864..c2d0eba 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -288,6 +288,8 @@ static void test_Win32_Bios( IWbemServices *services ) static const WCHAR releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; static const WCHAR smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; + static const WCHAR smbiosmajorversionW[] = {'S','M','B','I','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR smbiosminorversionW[] = {'S','M','B','I','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; @@ -367,6 +369,22 @@ static void test_Win32_Bios( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, smbiosmajorversionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get bios major version %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "bios major version: %u\n", V_I4( &val ) ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, smbiosminorversionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get bios minor version %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "bios minor version: %u\n", V_I4( &val ) ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get version %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) );

1 0

Hans Leidekker : wbemprox: Add more Win32_Processor properties.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 4f640fa9b693b8d730817f76fefc909e49106b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f640fa9b693b8d730817f76… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 5 16:08:17 2018 +0100 wbemprox: Add more Win32_Processor properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 21 ++++++++ dlls/wbemprox/tests/query.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f640fa9b693b8d73081…

1 0

Henri Verbeet : d3d11: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 600d6b0199015039909981196196175b3fd76a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=600d6b019901503990998119… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:57 2018 +0330 d3d11: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 6 +++--- dlls/d3d11/buffer.c | 6 +++--- dlls/d3d11/d3d11_private.h | 8 +------ dlls/d3d11/device.c | 6 +++--- dlls/d3d11/inputlayout.c | 11 +++++----- dlls/d3d11/shader.c | 52 +++++++++++++++++++++++----------------------- dlls/d3d11/state.c | 28 ++++++++++++------------- dlls/d3d11/texture.c | 12 +++++------ dlls/d3d11/view.c | 24 ++++++++++----------- 9 files changed, 73 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=600d6b01990150399099…

1 0

Nikolay Sivov : comctl32/edit: Fix class style mask.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 73cd9809f3fd979f8c3a5fc4fb67af380b85fc06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cd9809f3fd979f8c3a5fc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:30:10 2018 +0300 comctl32/edit: Fix class style mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index a01b75b..9f065f6 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5007,7 +5007,7 @@ void EDIT_Register(void) WNDCLASSW wndClass; memset(&wndClass, 0, sizeof(wndClass)); - wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS; + wndClass.style = CS_PARENTDC | CS_GLOBALCLASS | CS_DBLCLKS; wndClass.lpfnWndProc = EDIT_WindowProc; wndClass.cbClsExtra = 0; #ifdef __i386__ diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 46bb431..bef92b8 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -345,7 +345,7 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno if (GetClassInfoA( 0, name, &wc )) { -todo_wine +todo_wine_if(strcmp(name, "Edit")) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n",

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: 8d3b7e943b4b3ee83d696cfffb09cbec9914ba1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d3b7e943b4b3ee83d696cff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:58 2018 +0100 spoolss: Use the global HeapAlloc() wrappers. 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/spoolss/router.c | 1 + dlls/spoolss/spoolss.h | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 3d239b4..764721b 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -31,6 +31,7 @@ #include "spoolss.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(spoolss); diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h index 67b3891..b4a8853 100644 --- a/dlls/spoolss/spoolss.h +++ b/dlls/spoolss/spoolss.h @@ -23,20 +23,3 @@ BOOL backend_load_all(void) DECLSPEC_HIDDEN; void backend_unload_all(void) DECLSPEC_HIDDEN; - -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -}

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: c03b41c8960335dbe4dfefb1118da872328c5b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c03b41c8960335dbe4dfefb1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 23:59:48 2018 +0100 riched20: Get rid of the ALLOC_N_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/editor.c | 8 ++++---- dlls/riched20/editor.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 53d0950..c442512 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2136,7 +2136,7 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); } else { int nChars; - WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); + WCHAR *p = heap_alloc((nLen+1) * sizeof(*p)); if (!p) return 0; nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, @@ -3021,7 +3021,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) * or paragraph selection. */ ed->nCursors = 4; - ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); + ed->pCursors = heap_alloc(ed->nCursors * sizeof(*ed->pCursors)); ME_SetCursorToStart(ed, &ed->pCursors[0]); ed->pCursors[1] = ed->pCursors[0]; ed->pCursors[2] = ed->pCursors[0]; @@ -4295,7 +4295,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); WCHAR *tmp; - if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); heap_free(tmp); @@ -4313,7 +4313,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); WCHAR *tmp; - if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); heap_free(tmp); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6215068..0db5326 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,8 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -#define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) - #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN)

1 0

Henri Verbeet : wined3d: Implement wined3d_buffer_create_ib() on top of wined3d_buffer_create().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: c0f92bd318cf336a0182f36db55b1bd277aafeda URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0f92bd318cf336a0182f36d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:55 2018 +0330 wined3d: Implement wined3d_buffer_create_ib() on top of wined3d_buffer_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12e4396..593d886 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1491,29 +1491,17 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { - struct wined3d_buffer *object; - HRESULT hr; + struct wined3d_buffer_desc desc; TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", device, size, usage, pool, parent, parent_ops, buffer); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *buffer = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } - - if (FAILED(hr = buffer_init(object, device, size, usage | WINED3DUSAGE_STATICDECL, WINED3DFMT_UNKNOWN, - resource_access_from_pool(pool), WINED3D_BIND_INDEX_BUFFER, NULL, parent, parent_ops))) - { - WARN("Failed to initialize buffer, hr %#x\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created buffer %p.\n", object); - *buffer = object; + desc.byte_width = size; + desc.usage = usage | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = resource_access_from_pool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - return WINED3D_OK; + return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); }

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: 4b0b149a06e05f8f681d38bf1a7bb6fd7a7a3af9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0b149a06e05f8f681d38bf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:54 2018 +0100 scrrun: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/dictionary.c | 1 + dlls/scrrun/filesystem.c | 1 + dlls/scrrun/scrrun_private.h | 10 ---------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 7ebf4a4..681274e 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2acef84..228a5e9 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 3312876..5083d30 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -46,14 +46,4 @@ struct provideclassinfo { extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif

1 0

Thomas Faber : user32: Handle HeapReAlloc failure in RemoveMenu.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 7ee4588c0a919e28d1e29baaf327c8492c89b1e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee4588c0a919e28d1e29baa… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Feb 3 10:47:01 2018 +0100 user32: Handle HeapReAlloc failure in RemoveMenu. The array size is being decreased so failure is not critical here, but it can still happen, e.g. when DPH is in use. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 38deaef..f4194ed 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3989,14 +3989,16 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) } else { + MENUITEM *new_items; while(nPos < menu->nItems) { *item = *(item+1); item++; nPos++; } - menu->items = HeapReAlloc( GetProcessHeap(), 0, menu->items, - menu->nItems * sizeof(MENUITEM) ); + new_items = HeapReAlloc( GetProcessHeap(), 0, menu->items, + menu->nItems * sizeof(MENUITEM) ); + if (new_items) menu->items = new_items; } return TRUE; }

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: 82825d9cfc7d60f00ba9a1f86b5836dbf88ffc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82825d9cfc7d60f00ba9a1f8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:53 2018 +0100 msxml3: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/msxml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 1c05215..94ef66b 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #ifndef __WINE_CONFIG_H @@ -164,31 +165,11 @@ const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; /* memory allocation functions */ -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 void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Daniel Lehman : kernel32: Change error return from GlobalFree.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: fe09e2dba66095f1494946226c911a2acc65c9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe09e2dba66095f149494622… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 30 12:18:02 2018 -0800 kernel32: Change error return from GlobalFree. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 4 ++-- dlls/kernel32/tests/heap.c | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index fd6414a..e68420a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -784,8 +784,8 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) } __EXCEPT_PAGE_FAULT { - ERR("(%p): Page fault occurred ! Caused by bug ?\n", hmem); - SetLastError( ERROR_INVALID_PARAMETER ); + ERR("invalid handle %p\n", hmem); + SetLastError(ERROR_INVALID_HANDLE); hreturned = hmem; } __ENDTRY diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 67dc8b6..fefd3e7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -208,7 +208,7 @@ static void test_heap(void) ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); - + GlobalFree(gbl); /* invalid handles are caught in windows: */ SetLastError(MAGIC_DEAD); @@ -217,6 +217,18 @@ static void test_heap(void) "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); SetLastError(MAGIC_DEAD); + hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ + ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + hsecond, GetLastError(), LongToHandle(0xdeadbeef)); + SetLastError(MAGIC_DEAD); + hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ + ok( (hsecond == LongToHandle(0xdeadbee0)) && + ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), + "returned %p with 0x%08x (expected %p with ERROR_NOACCESS)\n", + hsecond, GetLastError(), LongToHandle(0xdeadbee0)); + + SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " @@ -250,7 +262,7 @@ static void test_heap(void) ok(mem == NULL, "Expected NULL, got %p\n", mem); /* invalid free */ - if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ + if (sizeof(void *) != 8) /* crashes on 64-bit */ { SetLastError(MAGIC_DEAD); mem = GlobalFree(gbl);

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: f9ddf9ad6d8bf2e0f93f77a64f4b07be04f7cf1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9ddf9ad6d8bf2e0f93f77a6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:56 2018 +0100 oledb32: Use the global HeapAlloc() wrappers. 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/oledb32/convert.c | 1 + dlls/oledb32/datainit.c | 1 + dlls/oledb32/dslocator.c | 1 + dlls/oledb32/errorinfo.c | 1 + dlls/oledb32/oledb_private.h | 20 -------------------- dlls/oledb32/rowpos.c | 1 + 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 22609ae..5bad105 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -31,6 +31,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 650c220..7d78e9f 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -29,6 +29,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f530d2e..d397e47 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -33,6 +33,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index e1c3204..f1c9cd1 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -32,6 +32,7 @@ #include "oledb_private.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 6f2bf76..4e285b5 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -26,27 +26,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) DECLSPEC_HIDDEN; -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 void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c1cee12..46904d3 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -28,6 +28,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb);

1 0

André Hentschel : ws2_32/tests: Test with less socket pairs.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 57b76f0d1a8a6f3e58a320e00f933e1e061a3934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b76f0d1a8a6f3e58a320e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 2 20:35:53 2018 +0100 ws2_32/tests: Test with less socket pairs. about 400 lines less in output Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3bc3d66..17b59a4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1181,7 +1181,7 @@ static void test_WithWSAStartup(void) struct { SOCKET src, dst, dup_src, dup_dst; - } pairs[128]; + } pairs[32]; DWORD error; res = WSAStartup( version, &data );

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: 1a9c63fe9f05fa628b5347e611237eb72eae1f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9c63fe9f05fa628b5347e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:51 2018 +0100 qcap: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 1 + dlls/qcap/qcap_main.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 0287271..32f3b56 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -29,6 +29,7 @@ #include "qcap_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h index f4684c1..69d94bf 100644 --- a/dlls/qcap/qcap_main.h +++ b/dlls/qcap/qcap_main.h @@ -59,19 +59,4 @@ enum YUV_Format { void YUV_Init(void) DECLSPEC_HIDDEN; void YUV_To_RGB24(enum YUV_Format format, unsigned char *target, const unsigned char *source, int width, int height) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* _QCAP_MAIN_H_DEFINED */

1 0

Henri Verbeet : wined3d: Replace the CPU access flags in struct wined3d_buffer_desc with resource access flags.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 8623bd3b6b03b298866ad25ae5f02ae40c95ead7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8623bd3b6b03b298866ad25a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:53 2018 +0330 wined3d: Replace the CPU access flags in struct wined3d_buffer_desc with resource access flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 4 +++- dlls/wined3d/buffer.c | 5 +---- include/wine/wined3d.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index ffa95a1..544e5a8 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -452,7 +452,9 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev wined3d_desc.byte_width = buffer->desc.ByteWidth; wined3d_desc.usage = wined3d_usage_from_d3d11(0, buffer->desc.Usage); wined3d_desc.bind_flags = buffer->desc.BindFlags; - wined3d_desc.cpu_access_flags = buffer->desc.CPUAccessFlags; + if (~buffer->desc.CPUAccessFlags & (D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ)) + FIXME("Ignoring CPU access flags %#x.\n", buffer->desc.CPUAccessFlags); + wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; wined3d_desc.misc_flags = buffer->desc.MiscFlags; wined3d_desc.structure_byte_stride = buffer->desc.StructureByteStride; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4baa123..53462a6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1426,11 +1426,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - FIXME("Ignoring access flags (pool).\n"); - if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, - WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP, - desc->bind_flags, data, parent, parent_ops))) + desc->access, desc->bind_flags, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c27cf48..72168e5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1969,9 +1969,9 @@ struct wined3d_blt_fx struct wined3d_buffer_desc { unsigned int byte_width; - DWORD usage; + unsigned int usage; unsigned int bind_flags; - unsigned int cpu_access_flags; + unsigned int access; unsigned int misc_flags; unsigned int structure_byte_stride; };

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: d186f681fba5542fd2a202db3d5479a78b636c9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d186f681fba5542fd2a202db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:59 2018 +0100 taskschd: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/taskschd_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index ee7e59e..6c7f916 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -20,6 +20,7 @@ #define __WINE_TASKSCHD_PRIVATE_H__ #include "wine/unicode.h" +#include "wine/heap.h" HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; HRESULT TaskDefinition_create(ITaskDefinition **obj) DECLSPEC_HIDDEN; @@ -31,26 +32,6 @@ HRESULT RegisteredTaskCollection_create(const WCHAR *path, IRegisteredTaskCollec WCHAR *get_full_path(const WCHAR *parent, const WCHAR *path) DECLSPEC_HIDDEN; -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); -} - static inline WCHAR *heap_strdupW(const WCHAR *src) { WCHAR *dst;

1 0

Henri Verbeet : wined3d: Implement wined3d_buffer_create_vb() on top of wined3d_buffer_create().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 1377e7a6088b269bb7a90717a70e02d0a8d204d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1377e7a6088b269bb7a90717… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:54 2018 +0330 wined3d: Implement wined3d_buffer_create_vb() on top of wined3d_buffer_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 53462a6..12e4396 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1464,8 +1464,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { - struct wined3d_buffer *object; - HRESULT hr; + struct wined3d_buffer_desc desc; TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", device, size, usage, pool, parent, parent_ops, buffer); @@ -1479,25 +1478,14 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return WINED3DERR_INVALIDCALL; } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *buffer = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } - - if (FAILED(hr = buffer_init(object, device, size, usage, WINED3DFMT_UNKNOWN, - resource_access_from_pool(pool), WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops))) - { - WARN("Failed to initialize buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + desc.byte_width = size; + desc.usage = usage; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = resource_access_from_pool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - TRACE("Created buffer %p.\n", object); - *buffer = object; - - return WINED3D_OK; + return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); } HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool,

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: 6a21434a7553fa807419446e83428a90cd23ea6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a21434a7553fa807419446e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:52 2018 +0100 sapi: Use the global HeapAlloc() wrappers. 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/sapi/sapi_private.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 5f78d12..b069222 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -18,22 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

André Hentschel : ws2_32/tests: Don' t test WSAGetLastError() value on success.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 67b690dba94d9671a8b5b33e51bf3102133ec100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b690dba94d9671a8b5b33e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 2 20:34:26 2018 +0100 ws2_32/tests: Don't test WSAGetLastError() value on success. This cuts the test output from around 1600 to around 1100 lines Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e188724..3bc3d66 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1250,7 +1250,8 @@ static void test_WithWSAStartup(void) res = getsockname(sock, (struct sockaddr *)&saddr, &size); error = WSAGetLastError(); ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); - ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); + if (res == SOCKET_ERROR) + ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); } }

1 0

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

Feb. 5, 2018

Module: wine Branch: master Commit: d6e503a20a9260004597e2fc6afb9845a8ccb144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e503a20a9260004597e2fc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:50 2018 +0100 pdh: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 0d7c5ef..fb131bd 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -32,6 +32,7 @@ #include "winperf.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -47,21 +48,6 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = }; static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; -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 BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *pdh_strdup( const WCHAR *src ) { WCHAR *dst;

1 0