October 2017 - Wine-Commits

Fabian Maurer : dx8vb: Add DirectX8 coclass and IDirectX8 interface.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 6afba6c657a68cf3bff6358eb70bee3daa53d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afba6c657a68cf3bff6358eb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 23 19:40:46 2017 +0200 dx8vb: Add DirectX8 coclass and IDirectX8 interface. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/dx8vb.idl | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/dx8vb/dx8vb.idl b/dlls/dx8vb/dx8vb.idl index ecb0d48..8f4b93f 100644 --- a/dlls/dx8vb/dx8vb.idl +++ b/dlls/dx8vb/dx8vb.idl @@ -37,6 +37,26 @@ interface D3DXSkinMesh; interface D3DXSprite; interface D3DXRenderToSurface; interface Direct3DBaseTexture8; +interface DirectSound8; +interface DirectSoundCapture8; +interface DirectSoundEnum8; +interface DirectSoundEnum8; +interface DirectInput8; +interface DirectMusicLoader8; +interface DirectMusicComposer8; +interface DirectMusicPerformance8; +interface DirectXEvent8; +interface DirectPlayVoiceClient8; +interface DirectPlayVoiceServer8; +interface DirectPlayVoiceTest8; +interface DirectXFile; +interface DirectPlay8Peer; +interface DirectPlay8Server; +interface DirectPlay8Client; +interface DirectPlay8Address; +interface Direct3D8; +interface DirectPlay8LobbyClient; +interface DirectPlay8LobbiedApplication; typedef enum { D3DXIFF_BMP = 0, @@ -702,6 +722,87 @@ interface ID3DX8 : IUnknown { }; [ + object, + uuid(e7ff1301-96a5-11d3-ac85-00c04fc2c602), + helpstring("DirectX8 root object functions"), + local +] +interface IDirectX8 : IUnknown { + HRESULT DirectSoundCreate( + [in] BSTR guid, + [out, retval] DirectSound8 **ret + ); + HRESULT DirectSoundCaptureCreate( + [in] BSTR guid, + [out, retval] DirectSoundCapture8 **ret + ); + HRESULT GetDSEnum( + [out, retval] DirectSoundEnum8 **ret + ); + HRESULT GetDSCaptureEnum( + [out, retval] DirectSoundEnum8 **ret + ); + HRESULT DirectInputCreate( + [out, retval] DirectInput8 **ret + ); + HRESULT DirectMusicLoaderCreate( + [out, retval] DirectMusicLoader8 **ret + ); + HRESULT DirectMusicComposerCreate( + [out, retval] DirectMusicComposer8 **ret + ); + HRESULT DirectMusicPerformanceCreate( + [out, retval] DirectMusicPerformance8 **ret + ); + HRESULT CreateEvent( + [in] DirectXEvent8 *event, + [out, retval] LONG *h + ); + HRESULT SetEvent( + [in] LONG eventid + ); + HRESULT DestroyEvent( + [in] LONG eventid + ); + HRESULT CreateNewGuid( + [out, retval] BSTR *retGuid + ); + HRESULT DirectPlayVoiceClientCreate( + [out, retval] DirectPlayVoiceClient8 **ret + ); + HRESULT DirectPlayVoiceServerCreate( + [out, retval] DirectPlayVoiceServer8 **ret + ); + HRESULT DirectPlayVoiceTestCreate( + [out, retval] DirectPlayVoiceTest8 **ret + ); + HRESULT DirectXFileCreate( + [out, retval] DirectXFile **ret + ); + HRESULT DirectPlayPeerCreate( + [out, retval] DirectPlay8Peer **ret + ); + HRESULT DirectPlayServerCreate( + [out, retval] DirectPlay8Server **ret + ); + HRESULT DirectPlayClientCreate( + [out, retval] DirectPlay8Client **ret + ); + HRESULT DirectPlayAddressCreate( + [out, retval] DirectPlay8Address **ret + ); + HRESULT Direct3DCreate( + [out, retval] Direct3D8 **ret + ); + HRESULT DirectPlayLobbyClientCreate( + [out, retval] DirectPlay8LobbyClient **ret + ); + HRESULT DirectPlayLobbiedApplicationCreate( + [out, retval] DirectPlay8LobbiedApplication **ret + ); +}; + +[ uuid(58356c5d-0bfd-48ed-93c5-f4520b6233de), helpstring("D3DX8"), threading(both), @@ -709,3 +810,12 @@ interface ID3DX8 : IUnknown { vi_progid("DIRECT.D3DX8.0") ] coclass D3DX8 { interface ID3DX8; }; + +[ + uuid(e7ff1300-96a5-11d3-ac85-00c04fc2c602), + helpstring("DirectX8"), + threading(both), + progid("DIRECT.DirectX8.0"), + vi_progid("DIRECT.DirectX8.0") +] +coclass DirectX8 { interface IDirectX8; };

1 0

Fabian Maurer : dx8vb: Add D3DX8 coclass and ID3DX8 interface.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: ca4e82a5a92eb9e55b502e8338b5b600b31624ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4e82a5a92eb9e55b502e833… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 23 19:40:45 2017 +0200 dx8vb: Add D3DX8 coclass and ID3DX8 interface. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/dx8vb/Makefile.in | 2 + dlls/dx8vb/dx8vb.idl | 711 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 715 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca4e82a5a92eb9e55b502…

1 0

Jacek Caban : mshtml: Added IDOMEvent:get_eventPhase implementation.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 85527dbdf39c70fe5b1a341701813ecf6263ebc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85527dbdf39c70fe5b1a34170… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:39:11 2017 +0200 mshtml: Added IDOMEvent:get_eventPhase implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 18 ++++++++++++------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 6 ++++++ include/mshtml.idl | 8 ++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a428879..d64238f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -938,8 +938,11 @@ static HRESULT WINAPI DOMEvent_get_defaultPrevented(IDOMEvent *iface, VARIANT_BO static HRESULT WINAPI DOMEvent_get_eventPhase(IDOMEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = This->phase; + return S_OK; } static HRESULT WINAPI DOMEvent_get_target(IDOMEvent *iface, IEventTarget **p) @@ -1434,10 +1437,13 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); - for(i = 0; i < chain_cnt; i++) { - call_event_handlers(target_chain[i], event); - if(!(event_flags & EVENT_BUBBLES) || event->stop_propagation) - break; + event->phase = DEP_AT_TARGET; + call_event_handlers(target_chain[0], event); + + if(event_flags & EVENT_BUBBLES) { + event->phase = DEP_BUBBLING_PHASE; + for(i = 1; !event->stop_propagation && i < chain_cnt; i++) + call_event_handlers(target_chain[i], event); } if(target_vtbl && target_vtbl->set_current_event) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0a967f2..97d34af 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,7 @@ typedef struct { EventTarget *target; BOOL prevent_default; BOOL stop_propagation; + USHORT phase; IHTMLEventObj *event_obj; BOOL no_event_obj; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 84a35f3..ac7ae43 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2534,6 +2534,7 @@ static void test_create_event(IHTMLDocument2 *doc) { IDocumentEvent *doc_event; IDOMEvent *event; + USHORT phase; BSTR str; HRESULT hres; @@ -2547,6 +2548,11 @@ static void test_create_event(IHTMLDocument2 *doc) SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); + phase = 0xdead; + hres = IDOMEvent_get_eventPhase(event, &phase); + ok(hres == S_OK, "get_eventPhase failed: %08x\n", hres); + ok(!phase, "phase = %u\n", phase); + hres = IDOMEvent_preventDefault(event); ok(hres == S_OK, "preventDefault failed: %08x\n", hres); diff --git a/include/mshtml.idl b/include/mshtml.idl index 45feb09..99150aa 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -20031,6 +20031,14 @@ interface IEventTarget : IDispatch [out, retval] VARIANT_BOOL *pfResult); } +typedef enum _DOM_EVENT_PHASE +{ + DEP_CAPTURING_PHASE = 1, + DEP_AT_TARGET = 2, + DEP_BUBBLING_PHASE = 3, + DOM_EVENT_PHASE_Max = 0x7fffffff +} DOM_EVENT_PHASE; + /***************************************************************************** * IDOMEvent interface */

1 0

Jacek Caban : mshtml/tests: Fixed tests on some versions of IE.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: a428dea8bb524c8a95167f82c30f02028ff2dfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a428dea8bb524c8a95167f82c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:37:30 2017 +0200 mshtml/tests: Fixed tests on some versions of IE. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6964f6e..7ec3f60 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5051,6 +5051,7 @@ static HRESULT wb_qi(REFIID riid, void **ppv) { static const IID IID_IWebBrowserPriv2IE7 = {0x1af32b6c, 0xa3ba,0x48b9,{0xb2,0x4e,0x8a,0xa9,0xc4,0x1f,0x6e,0xcd}}; static const IID IID_IWebBrowserPriv2IE8XP = {0x486f6159,0x9f3f,0x4827,{0x82,0xd4,0x28,0x3c,0xef,0x39,0x77,0x33}}; + static const IID IID_WB_undoc = {0xd9befc84,0xf21e,0x4166,{0x87,0x4b,0xa8,0xd3,0x01,0x0d,0xc7,0x64}}; *ppv = NULL; @@ -5089,7 +5090,8 @@ static HRESULT wb_qi(REFIID riid, void **ppv) return E_NOINTERFACE; } - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + if(!IsEqualGUID(riid, &IID_WB_undoc)) + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -6275,6 +6277,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) if(support_wbapp) SET_EXPECT(get_LocationURL); SET_EXPECT(TranslateUrl); + SET_EXPECT(GetOverrideKeyPath); SET_EXPECT(EvaluateNewWindow); hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); @@ -6286,6 +6289,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) todo_wine CHECK_CALLED_BROKEN(get_LocationURL); todo_wine CHECK_CALLED(TranslateUrl); + CLEAR_CALLED(GetOverrideKeyPath); if(!called_EvaluateNewWindow) { win_skip("INewWindowManager not supported\n");

1 0

Fabian Maurer : wineboot: In ProcessRunKeys use correct parentheses in condition.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 8fc3f3437c260db23ddff453f9a9d5f79564b24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc3f3437c260db23ddff453f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 24 20:05:52 2017 +0200 wineboot: In ProcessRunKeys use correct parentheses in condition. Spotted by David Binderman. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index ee5b8d4..2a65b9e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -682,7 +682,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, return TRUE; if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, - NULL, &hkRun, &dispos ) != ERROR_SUCCESS)) + NULL, &hkRun, &dispos )) != ERROR_SUCCESS) { RegCloseKey( hkWin ); return TRUE;

1 0

Piotr Caban : user32: Don' t do the painting if combobox is not visible in CBPaintText.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 8159af76b4d01c2bd9bc83fb0887ed98bfc6c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8159af76b4d01c2bd9bc83fb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 17:59:38 2017 +0200 user32: Don't do the painting if combobox is not visible in CBPaintText. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 149a495..c43d726 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -733,7 +733,7 @@ static void CBPaintText( if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } - else /* paint text field ourselves */ + else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */ { HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); UINT itemState = ODS_COMBOBOXEDIT; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1b4f6fa..10f4fbd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6613,6 +6613,18 @@ static const struct message SetCurSelComboSeq[] = { 0 } }; +static const struct message SetCurSelComboSeq2[] = +{ + { CB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_SETTOPINDEX, sent|wparam|lparam, 0, 0 }, + { LB_GETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_GETTEXTLEN, sent|wparam|lparam, 0, 0 }, + { LB_GETTEXTLEN, sent|wparam|lparam|optional, 0, 0 }, /* TODO: it's sent on all Windows versions */ + { LB_GETTEXT, sent|wparam, 0 }, + { 0 } +}; + static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, @@ -6939,6 +6951,13 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(SetCurSelComboSeq, "CB_SETCURSEL on a ComboBox", FALSE); + ShowWindow(combo, SW_HIDE); + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, CB_SETCURSEL, 0, 0); + log_all_parent_messages--; + ok_sequence(SetCurSelComboSeq2, "CB_SETCURSEL on a ComboBox", FALSE); + DestroyWindow(combo); DestroyWindow(parent); }

1 0

Nikolay Sivov : gdiplus: Implement GdipSetImageAttributesNoOp.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: ab31b59f45affe558b37651d3a00c0d8923f2e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab31b59f45affe558b37651d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 24 13:56:38 2017 +0300 gdiplus: Implement GdipSetImageAttributesNoOp. 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/gdiplus/gdiplus_private.h | 7 +++ dlls/gdiplus/graphics.c | 5 ++ dlls/gdiplus/imageattributes.c | 11 ++-- dlls/gdiplus/tests/image.c | 131 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 148 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ca2c022..76e5b9b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -481,6 +481,12 @@ struct color_remap_table{ ColorMap *colormap; }; +enum imageattr_noop{ + IMAGEATTR_NOOP_UNDEFINED, + IMAGEATTR_NOOP_SET, + IMAGEATTR_NOOP_CLEAR, +}; + struct GpImageAttributes{ WrapMode wrap; ARGB outside_color; @@ -490,6 +496,7 @@ struct GpImageAttributes{ struct color_remap_table colorremaptables[ColorAdjustTypeCount]; BOOL gamma_enabled[ColorAdjustTypeCount]; REAL gamma[ColorAdjustTypeCount]; + enum imageattr_noop noop[ColorAdjustTypeCount]; }; struct GpFont{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0207385..06fb89e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -676,6 +676,11 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d UINT x, y; INT i; + if ((attributes->noop[type] == IMAGEATTR_NOOP_UNDEFINED && + attributes->noop[ColorAdjustTypeDefault] == IMAGEATTR_NOOP_SET) || + (attributes->noop[type] == IMAGEATTR_NOOP_SET)) + return fmt; + if (attributes->colorkeys[type].enabled || attributes->colorkeys[ColorAdjustTypeDefault].enabled) { diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 2050706..ab197a4 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -218,14 +218,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, ColorAdjustType type, BOOL enableFlag) { - static int calls; - TRACE("(%p,%u,%i)\n", imageAttr, type, enableFlag); - if(!(calls++)) - FIXME("not implemented\n"); + if (type >= ColorAdjustTypeCount) + return InvalidParameter; - return NotImplemented; + imageAttr->noop[type] = enableFlag ? IMAGEATTR_NOOP_SET : IMAGEATTR_NOOP_CLEAR; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes *imageAttr, @@ -332,6 +332,7 @@ GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes *imageAttr, GdipSetImageAttributesColorKeys(imageAttr, type, FALSE, 0, 0); GdipSetImageAttributesRemapTable(imageAttr, type, FALSE, 0, NULL); GdipSetImageAttributesGamma(imageAttr, type, FALSE, 0.0); + imageAttr->noop[type] = IMAGEATTR_NOOP_UNDEFINED; return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 82afc74..0b444ef 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2374,10 +2374,44 @@ static void test_colormatrix(void) expect(Ok, stat); ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08x\n", color); + /* Toggle NoOp */ + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfefe40cc, color, 3), "expected 0xfefe40cc, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); expect(Ok, stat); - stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, UnitPixel, imageattr, NULL, NULL); expect(Ok, stat); @@ -2385,6 +2419,101 @@ static void test_colormatrix(void) expect(Ok, stat); ok(color_match(0xff40ccee, color, 1), "Expected ff40ccee, got %.8x\n", color); + /* Disable adjustment, toggle NoOp */ + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + FALSE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + /* Reset with NoOp on, enable adjustment. */ + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08x\n", color); + + /* Now inhibit specific category. */ + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeBitmap, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfffe41cc, color, 3), "expected 0xfffe41cc, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeBitmap, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeBitmap, FALSE); + expect(Ok, stat); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08x\n", color); + + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeBitmap); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1); GdipDisposeImage((GpImage*)bitmap2);

1 0

Jacek Caban : mshtml/tests: Fixed tests on old IE versions.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 8bcd54d7b5d0bb310a618d3e48860a86b81c21d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bcd54d7b5d0bb310a618d3e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:37:36 2017 +0200 mshtml/tests: Fixed tests on old IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0ce4872..48262bb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -41,6 +41,8 @@ static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); +static BOOL is_ie9plus; + static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; static const char range_test_str[] = @@ -6692,7 +6694,8 @@ static void test_xmlhttprequest(IHTMLWindow5 *window) hres = IHTMLXMLHttpRequestFactory_create(factory, &xml); ok(hres == S_OK, "create failed: %08x\n", hres); ok(xml != NULL, "xml == NULL\n"); - test_disp((IUnknown*)xml, &DIID_DispHTMLXMLHttpRequest, &CLSID_HTMLXMLHttpRequest, "[object]"); + if(is_ie9plus) + test_disp((IUnknown*)xml, &DIID_DispHTMLXMLHttpRequest, &CLSID_HTMLXMLHttpRequest, "[object]"); IHTMLXMLHttpRequest_Release(xml); IHTMLXMLHttpRequestFactory_Release(factory); @@ -6725,10 +6728,12 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "get_document failed: %08x\n", hres); ok(doc2 != NULL, "doc2 == NULL\n"); - test_ifaces((IUnknown*)doc2, doc_node_iids); + if(is_ie9plus) + test_ifaces((IUnknown*)doc2, doc_node_iids); test_disp((IUnknown*)doc2, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); - test_ifaces((IUnknown*)doc, doc_obj_iids); + if(is_ie9plus) + test_ifaces((IUnknown*)doc, doc_obj_iids); test_disp((IUnknown*)doc, &DIID_DispHTMLDocument, &CLSID_HTMLDocument, "[object]"); unk = (void*)0xdeadbeef; @@ -10589,16 +10594,6 @@ static void test_document_mode(IHTMLDocument2 *doc2) VARIANT v; HRESULT hres; - if(expected_document_mode >= 9) { - IHTMLDocument7 *doc7; - hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument7, (void**)&doc7); - if(FAILED(hres)) { - win_skip("IHTMLDocument7 interface not supported: %08x\n", hres); - return; - } - IHTMLDocument7_Release(doc7); - } - hres = IHTMLDocument2_QueryInterface(doc2, &IID_IHTMLDocument6, (void**)&doc); ok(hres == S_OK, "Could not get IHTMLDocument6 interface: %08x\n", hres); @@ -10645,6 +10640,9 @@ static void test_quirks_mode(void) expected_document_mode = 5; run_domtest("<html><body></body></html>", test_document_mode); + if(!is_ie9plus) + return; + expected_document_mode = 9; run_domtest("<!DOCTYPE html>\n" "<html>" @@ -10667,6 +10665,27 @@ static void test_quirks_mode(void) "</html>", test_document_mode); } +static void check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument7 *doc7; + HRESULT hres; + + doc = create_document(); + if(!doc) + return; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + + IHTMLDocument2_Release(doc); +} + START_TEST(dom) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -10677,6 +10696,8 @@ START_TEST(dom) container_hwnd = CreateWindowA("static", NULL, WS_POPUP|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 500, 500, NULL, NULL, NULL, NULL); + check_ie(); + run_domtest(doc_str1, test_doc_elem); run_domtest(doc_str1, test_get_set_attr); run_domtest(range_test_str, test_txtrange);

1 0

Fabian Maurer : dx8vb: Add COM classfactory.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: 9bf4cd8325c43c600a297b3b15d0b246bd79f5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf4cd8325c43c600a297b3b1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 23 19:40:44 2017 +0200 dx8vb: Add COM classfactory. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 1 + dlls/dx8vb/dx8vb.spec | 8 +-- dlls/dx8vb/main.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+), 4 deletions(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index ce3237c..d9f93f9 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,4 +1,5 @@ MODULE = dx8vb.dll +IMPORTS = uuid ole32 C_SRCS = \ main.c diff --git a/dlls/dx8vb/dx8vb.spec b/dlls/dx8vb/dx8vb.spec index 973d4b3..bb7c083 100644 --- a/dlls/dx8vb/dx8vb.spec +++ b/dlls/dx8vb/dx8vb.spec @@ -133,7 +133,7 @@ @ stub D3DXMeshIndexBuffer8SetData @ stub D3DXMeshIndexBuffer8GetData @ stub DXCopyMemory -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index 0b60e34..aa6b943 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" + #include <stdarg.h> #include <string.h> @@ -24,10 +28,17 @@ #include "winuser.h" #include "winreg.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "unknwn.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dx8vb); +static HINSTANCE instance_dx8vb; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); @@ -38,8 +49,150 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(instance); + instance_dx8vb = instance; break; } return TRUE; } + +typedef struct { + IClassFactory IClassFactory_iface; + + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +struct object_creation_info +{ + const CLSID *clsid; + HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); +}; + +static const struct object_creation_info object_creation[] = +{ + { &GUID_NULL, 0 }, +}; + +static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = &This->IClassFactory_iface; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI classfactory_AddRef(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI classfactory_Release(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer_unk, REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + HRESULT hres; + IUnknown *unk; + + TRACE("(%p)->(%p,%s,%p)\n", This, outer_unk, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + hres = This->pfnCreateInstance(outer_unk, (void **) &unk); + if (SUCCEEDED(hres)) + { + hres = IUnknown_QueryInterface(unk, riid, ppobj); + IUnknown_Release(unk); + } + return hres; +} + +static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d), stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl classfactory_Vtbl = +{ + classfactory_QueryInterface, + classfactory_AddRef, + classfactory_Release, + classfactory_CreateInstance, + classfactory_LockServer +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + unsigned int i; + IClassFactoryImpl *factory; + + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (!IsEqualGUID(&IID_IClassFactory, riid) + && !IsEqualGUID( &IID_IUnknown, riid)) + return E_NOINTERFACE; + + for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + break; + } + + if (i == sizeof(object_creation)/sizeof(object_creation[0])) + { + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); + if (factory == NULL) + return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &classfactory_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &factory->IClassFactory_iface; + return S_OK; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance_dx8vb); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance_dx8vb); +}

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRecordTypeSetClipPath playback.
by Alexandre Julliard Oct. 24, 2017

Oct. 24, 2017

Module: wine Branch: master Commit: d0f2361170d140ad2510bb26ad187d30fd1c1afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f2361170d140ad2510bb26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 23 09:47:06 2017 +0300 gdiplus/metafile: Implement EmfPlusRecordTypeSetClipPath playback. 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/gdiplus/metafile.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4990a5f..91e18a5 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2362,6 +2362,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return stat; } + case EmfPlusRecordTypeSetClipPath: + { + CombineMode mode = (flags >> 8) & 0xf; + BYTE pathid = flags & 0xff; + GpRegion *region; + + if (dataSize != 0) + return InvalidParameter; + + if (pathid >= EmfPlusObjectTableSize || real_metafile->objtable[pathid].type != ObjectTypePath) + return InvalidParameter; + + stat = GdipCreateRegionPath(real_metafile->objtable[pathid].u.path, &region); + if (stat == Ok) + { + stat = metafile_set_clip_region(real_metafile, region, mode); + GdipDeleteRegion(region); + } + + return stat; + } case EmfPlusRecordTypeSetPageTransform: { EmfPlusSetPageTransform *record = (EmfPlusSetPageTransform*)header;

1 0