August 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3d9/tests: Add tests for setting vertex shader constants in SWVP and MVP modes.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 7027da7f37ab815cb35c60cc4875ffc64e394d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7027da7f37ab815cb35c60cc4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Aug 23 17:17:53 2017 +0300 d3d9/tests: Add tests for setting vertex shader constants in SWVP and MVP modes. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 50752f8..a129d4c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -38,6 +38,7 @@ struct vec3 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 #define CREATE_DEVICE_FPU_PRESERVE 0x04 #define CREATE_DEVICE_SWVP_ONLY 0x08 +#define CREATE_DEVICE_MIXED_ONLY 0x10 struct device_desc { @@ -155,6 +156,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_SWVP_ONLY) behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; + else if (desc->flags & CREATE_DEVICE_MIXED_ONLY) + behavior_flags = D3DCREATE_MIXED_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) @@ -170,9 +173,11 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons behavior_flags, &present_parameters, &device))) return device; - if (desc && desc->flags & CREATE_DEVICE_SWVP_ONLY) + if (desc && (desc->flags & (CREATE_DEVICE_SWVP_ONLY | CREATE_DEVICE_MIXED_ONLY))) return NULL; - behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); + behavior_flags = (behavior_flags + & ~(D3DCREATE_MIXED_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING)) + | D3DCREATE_HARDWARE_VERTEXPROCESSING; if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) @@ -6068,6 +6073,8 @@ static void test_vertex_shader_constant(void) static const float d[16] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; static const float c[4] = {0.0, 0.0, 0.0, 0.0}; IDirect3DDevice9 *device; + struct device_desc desc; + DWORD consts_swvp; IDirect3D9 *d3d; ULONG refcount; D3DCAPS9 caps; @@ -6120,6 +6127,73 @@ static void test_vertex_shader_constant(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = CREATE_DEVICE_SWVP_ONLY; + + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + consts_swvp = caps.MaxVertexShaderConst; + todo_wine + ok(consts_swvp == 8192, "Unexpected consts_swvp %u.\n", consts_swvp); + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 0, c, 1); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 1, c, 1); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts - 1, d, 4); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp, c, 1); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + desc.flags = CREATE_DEVICE_MIXED_ONLY; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + ok(consts == caps.MaxVertexShaderConst, "Unexpected caps.MaxVertexShaderConst %u, consts %u.\n", + caps.MaxVertexShaderConst, consts); + + IDirect3DDevice9_SetSoftwareVertexProcessing(device, 0); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 0, c, 1); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DDevice9_SetSoftwareVertexProcessing(device, 1); + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts + 0, c, 1); + todo_wine + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, consts_swvp - 1, c, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Huw Davies : riched20: Remove the separate implementation of IOleWindow as IOleInPlaceSite inherits from IOleWindow.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 58cac9c633a1509fee139c84ada3481db9d44996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cac9c633a1509fee139c84a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 24 10:59:31 2017 +0100 riched20: Remove the separate implementation of IOleWindow as IOleInPlaceSite inherits from IOleWindow. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 73 +++++++++---------------------------------------- 1 file changed, 13 insertions(+), 60 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c5f0441..dbb21b2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -258,7 +258,6 @@ typedef struct ITextParaImpl { struct IOleClientSiteImpl { struct reole_child child; IOleClientSite IOleClientSite_iface; - IOleWindow IOleWindow_iface; IOleInPlaceSite IOleInPlaceSite_iface; LONG ref; }; @@ -278,11 +277,6 @@ static inline IRichEditOleImpl *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, IRichEditOleImpl, IUnknown_inner); } -static inline IOleClientSiteImpl *impl_from_IOleWindow(IOleWindow *iface) -{ - return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleWindow_iface); -} - static inline IOleClientSiteImpl *impl_from_IOleInPlaceSite(IOleInPlaceSite *iface) { return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleInPlaceSite_iface); @@ -1068,9 +1062,8 @@ IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleClientSite)) *ppvObj = me; - else if (IsEqualGUID(riid, &IID_IOleWindow)) - *ppvObj = &This->IOleWindow_iface; - else if (IsEqualGUID(riid, &IID_IOleInPlaceSite)) + else if (IsEqualGUID(riid, &IID_IOleWindow) || + IsEqualGUID(riid, &IID_IOleInPlaceSite)) *ppvObj = &This->IOleInPlaceSite_iface; if (*ppvObj) { @@ -1181,35 +1174,28 @@ static const IOleClientSiteVtbl ocst = { IOleClientSite_fnRequestNewObjectLayout }; -/* IOleWindow interface */ -static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObj) +/* IOleInPlaceSite interface */ +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj) { - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); } -static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface) +static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface) { - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_AddRef(&This->IOleClientSite_iface); } -static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface) +static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) { - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); return IOleClientSite_Release(&This->IOleClientSite_iface); } -static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) -{ - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); - FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode); - return E_NOTIMPL; -} - -static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) { - IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); TRACE("(%p)->(%p)\n", This, phwnd); @@ -1223,43 +1209,11 @@ static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) return S_OK; } -static const IOleWindowVtbl olewinvt = { - IOleWindow_fnQueryInterface, - IOleWindow_fnAddRef, - IOleWindow_fnRelease, - IOleWindow_fnGetWindow, - IOleWindow_fnContextSensitiveHelp -}; - -/* IOleInPlaceSite interface */ -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnQueryInterface(IOleInPlaceSite *iface, REFIID riid, void **ppvObj) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); -} - -static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnAddRef(IOleInPlaceSite *iface) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleClientSite_AddRef(&This->IOleClientSite_iface); -} - -static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleClientSite_Release(&This->IOleClientSite_iface); -} - -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) -{ - IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleWindow_GetWindow(&This->IOleWindow_iface, phwnd); -} - static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) { IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - return IOleWindow_ContextSensitiveHelp(&This->IOleWindow_iface, fEnterMode); + FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode); + return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnCanInPlaceActivate(IOleInPlaceSite *iface) @@ -1361,7 +1315,6 @@ static HRESULT CreateOleClientSite(IRichEditOleImpl *reOle, IOleClientSite **ret return E_OUTOFMEMORY; clientSite->IOleClientSite_iface.lpVtbl = &ocst; - clientSite->IOleWindow_iface.lpVtbl = &olewinvt; clientSite->IOleInPlaceSite_iface.lpVtbl = &olestvt; clientSite->ref = 1; clientSite->child.reole = reOle;

1 0

Huw Davies : wineps: Fall back to the null driver for common device caps.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: dd26e02c58006de03ee53a8c2df76f254f7e36fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd26e02c58006de03ee53a8c2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 22 12:42:35 2017 +0100 wineps: Fall back to the null driver for common device caps. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/init.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3b00343..5b32879 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -486,42 +486,23 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) return MulDiv(physDev->vertSize, 100, physDev->Devmode->dmPublic.u1.s1.dmScale); case HORZRES: - case DESKTOPHORZRES: return physDev->horzRes; case VERTRES: - case DESKTOPVERTRES: return physDev->vertRes; case BITSPIXEL: /* Although Windows returns 1 for monochrome printers, we want CreateCompatibleBitmap to provide something other than 1 bpp */ return 32; - case PLANES: - return 1; - case NUMBRUSHES: - return -1; case NUMPENS: return 10; - case NUMMARKERS: - return 0; case NUMFONTS: return 39; case NUMCOLORS: return -1; case PDEVICESIZE: return sizeof(PSDRV_PDEVICE); - case CURVECAPS: - return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | - CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); - case LINECAPS: - return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | - LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); - case POLYGONALCAPS: - return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | - PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); case TEXTCAPS: return TC_CR_ANY | TC_VA_ABLE; /* psdrv 0x59f7 */ - case CLIPCAPS: - return CP_RECTANGLE; case RASTERCAPS: return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV | RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */ @@ -529,17 +510,12 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) return physDev->logPixelsX; case ASPECTY: return physDev->logPixelsY; - case ASPECTXY: - return (int)hypot( (double)physDev->logPixelsX, - (double)physDev->logPixelsY ); case LOGPIXELSX: return MulDiv(physDev->logPixelsX, physDev->Devmode->dmPublic.u1.s1.dmScale, 100); case LOGPIXELSY: return MulDiv(physDev->logPixelsY, physDev->Devmode->dmPublic.u1.s1.dmScale, 100); - case SIZEPALETTE: - return 0; case NUMRESERVED: return 0; case COLORRES: @@ -568,16 +544,9 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } return physDev->PageSize.cy - physDev->ImageableArea.top; - case SCALINGFACTORX: - case SCALINGFACTORY: - case VREFRESH: - case BLTALIGNMENT: - return 0; - case SHADEBLENDCAPS: - return SB_NONE; default: - FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap ); - return 0; + dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); + return dev->funcs->pGetDeviceCaps( dev, cap ); } }

1 0

Vincent Povirk : wmphoto: Register WMP encoder and decoder classes.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: aa7e28497cdba1d0b1eb7aebe07e93a610baa31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7e28497cdba1d0b1eb7aebe… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 16:08:52 2017 -0500 wmphoto: Register WMP encoder and decoder classes. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/wmphoto/Makefile.in | 2 ++ dlls/wmphoto/main.c | 10 ++++++---- dlls/wmphoto/wmphoto.idl | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 1444c48..302087e 100755 --- a/configure +++ b/configure @@ -18831,7 +18831,7 @@ wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean wine_fn_config_test dlls/wmp/tests wmp_test -wine_fn_config_dll wmphoto enable_wmphoto +wine_fn_config_dll wmphoto enable_wmphoto clean wine_fn_config_dll wmvcore enable_wmvcore implib wine_fn_config_test dlls/wmvcore/tests wmvcore_test wine_fn_config_dll wnaspi32 enable_wnaspi32 implib diff --git a/configure.ac b/configure.ac index 0a8a89b..9aeaf34 100644 --- a/configure.ac +++ b/configure.ac @@ -3612,7 +3612,7 @@ WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_TEST(dlls/wmp/tests) -WINE_CONFIG_DLL(wmphoto) +WINE_CONFIG_DLL(wmphoto,,[clean]) WINE_CONFIG_DLL(wmvcore,,[implib]) WINE_CONFIG_TEST(dlls/wmvcore/tests) WINE_CONFIG_DLL(wnaspi32,,[implib]) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in index 115de54..d31af33 100644 --- a/dlls/wmphoto/Makefile.in +++ b/dlls/wmphoto/Makefile.in @@ -1,3 +1,5 @@ MODULE = wmphoto.dll C_SRCS = main.c + +IDL_SRCS = wmphoto.idl diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c index 48fd5dc..a92f18b 100644 --- a/dlls/wmphoto/main.c +++ b/dlls/wmphoto/main.c @@ -24,16 +24,20 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static HINSTANCE WMPHOTO_hInstance; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { case DLL_PROCESS_ATTACH: + WMPHOTO_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; case DLL_WINE_PREATTACH: @@ -56,12 +60,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) HRESULT WINAPI DllRegisterServer(void) { - FIXME("wmphoto: stub\n"); - return E_NOTIMPL; + return __wine_register_resources( WMPHOTO_hInstance ); } HRESULT WINAPI DllUnregisterServer(void) { - FIXME("wmphoto: stub\n"); - return E_NOTIMPL; + return __wine_unregister_resources( WMPHOTO_hInstance ); } diff --git a/dlls/wmphoto/wmphoto.idl b/dlls/wmphoto/wmphoto.idl new file mode 100644 index 0000000..b2a47c1 --- /dev/null +++ b/dlls/wmphoto/wmphoto.idl @@ -0,0 +1,42 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +import "unknwn.idl"; +import "wincodec.idl"; + +[ + helpstring("WIC WMP Decoder"), + uuid(a26cec36-234c-4950-ae16-e34aace71d0d), + threading(both) +] +coclass WICWmpDecoder +{ + [default] interface IWICBitmapDecoder; +}; + +[ + helpstring("WIC WMP Encoder"), + uuid(ac4ce3cb-e1c1-44cd-8215-5a1665509ec2), + threading(both) +] +coclass WICWmpEncoder +{ + [default] interface IWICBitmapEncoder; +};

1 0

Vincent Povirk : wmphoto: Add stub dll.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 618f9de37e349aa270588813f9b5cf1913fa8926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618f9de37e349aa270588813f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 16:08:51 2017 -0500 wmphoto: Add stub dll. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/wmphoto/Makefile.in | 3 +++ dlls/wmphoto/main.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmphoto/wmphoto.spec | 4 +++ 5 files changed, 77 insertions(+) diff --git a/configure b/configure index 2ccbb09..1444c48 100755 --- a/configure +++ b/configure @@ -1515,6 +1515,7 @@ enable_wmasf enable_wmi enable_wmiutils enable_wmp +enable_wmphoto enable_wmvcore enable_wnaspi32 enable_wpc @@ -18830,6 +18831,7 @@ wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test wine_fn_config_dll wmp enable_wmp clean wine_fn_config_test dlls/wmp/tests wmp_test +wine_fn_config_dll wmphoto enable_wmphoto wine_fn_config_dll wmvcore enable_wmvcore implib wine_fn_config_test dlls/wmvcore/tests wmvcore_test wine_fn_config_dll wnaspi32 enable_wnaspi32 implib diff --git a/configure.ac b/configure.ac index 4796492..0a8a89b 100644 --- a/configure.ac +++ b/configure.ac @@ -3612,6 +3612,7 @@ WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) WINE_CONFIG_DLL(wmp,,[clean]) WINE_CONFIG_TEST(dlls/wmp/tests) +WINE_CONFIG_DLL(wmphoto) WINE_CONFIG_DLL(wmvcore,,[implib]) WINE_CONFIG_TEST(dlls/wmvcore/tests) WINE_CONFIG_DLL(wnaspi32,,[implib]) diff --git a/dlls/wmphoto/Makefile.in b/dlls/wmphoto/Makefile.in new file mode 100644 index 0000000..115de54 --- /dev/null +++ b/dlls/wmphoto/Makefile.in @@ -0,0 +1,3 @@ +MODULE = wmphoto.dll + +C_SRCS = main.c diff --git a/dlls/wmphoto/main.c b/dlls/wmphoto/main.c new file mode 100644 index 0000000..48fd5dc --- /dev/null +++ b/dlls/wmphoto/main.c @@ -0,0 +1,67 @@ +/* + * Copyright 2017 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMAcROS +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + } + + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * ppv) +{ + FIXME("wmphoto: stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("wmphoto: stub\n"); + return E_NOTIMPL; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("wmphoto: stub\n"); + return E_NOTIMPL; +} diff --git a/dlls/wmphoto/wmphoto.spec b/dlls/wmphoto/wmphoto.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/wmphoto/wmphoto.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Dmitry Timoshkov : user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: a62a8601db26bd8c39e561505876c6c41b8156bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62a8601db26bd8c39e561505… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 18 19:41:57 2017 +0800 user32/tests: Test DialogBoxParam using a dialog template with invalid control class. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 6 ++++++ dlls/user32/tests/resource.rc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 6b9d704..ac61d4e 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1272,6 +1272,12 @@ static void test_DialogBoxParamA(void) "got %d, expected ERROR_RESOURCE_NAME_NOT_FOUND\n",GetLastError()); SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); +todo_wine + ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); + ok(GetLastError() == 0, "got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0); ok(ret == 0, "DefDlgProcA returned %ld, expected 0\n", ret); ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index f116b85..756e38f 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -124,6 +124,12 @@ FONT 8, "MS Shell Dlg" EDITTEXT 200,4,4,50,14 } +TEST_DIALOG_INVALID_CLASS DIALOG 0, 0, 60, 30 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +{ + CONTROL "",1,"wine invalid class",WS_CHILD,0,0,40,10 +} + IDD_DIALOG DIALOG 0, 0, 186, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog"

1 0

Nikolay Sivov : dwrite/tests: A test to draw trimming sign with drawing effect.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: 65014bcab536a7618069c7c157656ff3a510df1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65014bcab536a7618069c7c15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 24 14:25:04 2017 +0300 dwrite/tests: A test to draw trimming sign with drawing effect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 66 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 1d9d38a..c4034a1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -782,6 +782,17 @@ static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj2 = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj3 = { &testinlineobjvtbl2 }; +struct test_effect +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct test_effect *test_effect_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct test_effect, IUnknown_iface); +} + static HRESULT WINAPI testeffect_QI(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) { @@ -790,18 +801,26 @@ static HRESULT WINAPI testeffect_QI(IUnknown *iface, REFIID riid, void **obj) return S_OK; } + ok(0, "Unexpected riid %s.\n", wine_dbgstr_guid(riid)); *obj = NULL; return E_NOINTERFACE; } static ULONG WINAPI testeffect_AddRef(IUnknown *iface) { - return 2; + struct test_effect *effect = test_effect_from_IUnknown(iface); + return InterlockedIncrement(&effect->ref); } static ULONG WINAPI testeffect_Release(IUnknown *iface) { - return 1; + struct test_effect *effect = test_effect_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&effect->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, effect); + + return ref; } static const IUnknownVtbl testeffectvtbl = { @@ -810,7 +829,16 @@ static const IUnknownVtbl testeffectvtbl = { testeffect_Release }; -static IUnknown testeffect = { &testeffectvtbl }; +static IUnknown *create_test_effect(void) +{ + struct test_effect *effect; + + effect = HeapAlloc(GetProcessHeap(), 0, sizeof(*effect)); + effect->IUnknown_iface.lpVtbl = &testeffectvtbl; + effect->ref = 1; + + return &effect->IUnknown_iface; +} static void test_CreateTextLayout(void) { @@ -1211,7 +1239,7 @@ static void test_CreateEllipsisTrimmingSign(void) IDWriteTextFormat *format; IDWriteInlineObject *sign; IDWriteFactory *factory; - IUnknown *unk; + IUnknown *unk, *effect; HRESULT hr; factory = create_factory(); @@ -1254,6 +1282,16 @@ if (0) {/* crashes on native */ hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0, 0.0, FALSE, FALSE, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, drawellipsis_seq, "ellipsis sign draw test", FALSE); + + effect = create_test_effect(); + + EXPECT_REF(effect, 1); + hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0f, 0.0f, FALSE, FALSE, effect); + ok(hr == S_OK, "Failed to draw trimming sign, hr %#x.\n", hr); + EXPECT_REF(effect, 1); + + IUnknown_Release(effect); + IDWriteInlineObject_Release(sign); /* non-orthogonal flow/reading combination */ @@ -3265,12 +3303,15 @@ static void test_SetDrawingEffect(void) IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFactory *factory; + IUnknown *unk, *effect; DWRITE_TEXT_RANGE r; - IUnknown *unk; HRESULT hr; + LONG ref; factory = create_factory(); + effect = create_test_effect(); + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3282,13 +3323,14 @@ static void test_SetDrawingEffect(void) /* set effect past the end of text */ r.startPosition = 100; r.length = 10; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); r.startPosition = r.length = 0; hr = IDWriteTextLayout_GetDrawingEffect(layout, 101, &unk, &r); ok(hr == S_OK, "got 0x%08x\n", hr); ok(r.startPosition == 100 && r.length == 10, "got %u, %u\n", r.startPosition, r.length); + IUnknown_Release(unk); r.startPosition = r.length = 0; unk = (void*)0xdeadbeef; @@ -3300,7 +3342,7 @@ static void test_SetDrawingEffect(void) /* effect is applied to clusters, not individual text positions */ r.startPosition = 0; r.length = 2; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -3315,7 +3357,7 @@ static void test_SetDrawingEffect(void) r.startPosition = 0; r.length = 2; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -3336,7 +3378,7 @@ static void test_SetDrawingEffect(void) hr = IDWriteTextLayout_SetInlineObject(layout, sign, r); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); flush_sequence(sequences, RENDERER_ID); @@ -3350,7 +3392,7 @@ static void test_SetDrawingEffect(void) r.startPosition = 1; r.length = 1; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); /* no effect is reported in this case */ @@ -3366,7 +3408,7 @@ static void test_SetDrawingEffect(void) r.startPosition = 0; r.length = 1; - hr = IDWriteTextLayout_SetDrawingEffect(layout, &testeffect, r); + hr = IDWriteTextLayout_SetDrawingEffect(layout, effect, r); ok(hr == S_OK, "got 0x%08x\n", hr); /* first range position is all that matters for inline ranges */ @@ -3377,6 +3419,8 @@ static void test_SetDrawingEffect(void) IDWriteTextLayout_Release(layout); + ref = IUnknown_Release(effect); + ok(ref == 0, "Unexpected effect refcount %u\n", ref); IDWriteInlineObject_Release(sign); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Vincent Povirk : shell32: Change default ProgramData folder and set ProfileList key.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: dcb1359b5ec36612ad1539836a6e79a8ad11cbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb1359b5ec36612ad1539836… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 16 14:40:31 2017 -0500 shell32: Change default ProgramData folder and set ProfileList key. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 73 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcb1359b5ec36612ad153…

1 0

Hugh McMaster : regedit/tests: Add Unicode tests for importing invalid registry data.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: d78767b63cbe00ae15867eb2f74cc69ac3443a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78767b63cbe00ae15867eb2f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 24 12:46:27 2017 +0000 regedit/tests: Add Unicode tests for importing invalid registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 510 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 510 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d78767b63cbe00ae15867…

1 0

Jacek Caban : mshtml: Added IHTMLDocument6::getElementById implementation.
by Alexandre Julliard Aug. 24, 2017

Aug. 24, 2017

Module: wine Branch: master Commit: f84d1f0aac98fce5746fb550b9397fbd16fa202d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84d1f0aac98fce5746fb550b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 24 12:29:09 2017 +0200 mshtml: Added IHTMLDocument6::getElementById implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a8d104e..8d48e18 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3142,8 +3142,44 @@ static HRESULT WINAPI HTMLDocument6_getElementById(IHTMLDocument6 *iface, BSTR bstrId, IHTMLElement2 **p) { HTMLDocument *This = impl_from_IHTMLDocument6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrId), p); - return E_NOTIMPL; + nsIDOMElement *nselem; + HTMLElement *elem; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrId), p); + + /* + * Unlike IHTMLDocument3 implementation, this is standard compliant and does + * not search for name attributes, so we may simply let Gecko do the right thing. + */ + + if(!This->doc_node->nsdoc) { + FIXME("Not a document\n"); + return E_FAIL; + } + + nsAString_InitDepend(&nsstr, bstrId); + nsres = nsIDOMHTMLDocument_GetElementById(This->doc_node->nsdoc, &nsstr, &nselem); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("GetElementById failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nselem) { + *p = NULL; + return S_OK; + } + + hres = get_elem(This->doc_node, nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement2_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument6_updateSettings(IHTMLDocument6 *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c6053a6..a3a3bfe 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9857,6 +9857,7 @@ static void test_frameset(IHTMLDocument2 *doc) { IHTMLWindow2 *window; IHTMLFramesCollection2 *frames; + IHTMLDocument6 *doc6; IHTMLElement *elem; HRESULT hres; @@ -9887,6 +9888,29 @@ static void test_frameset(IHTMLDocument2 *doc) elem = get_doc_elem_by_id(doc, "nm1"); test_elem_id((IUnknown*)elem, "fr1"); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument6, (void**)&doc6); + if(SUCCEEDED(hres)) { + IHTMLElement2 *elem2; + BSTR str; + + str = a2bstr("nm1"); + hres = IHTMLDocument6_getElementById(doc6, str, &elem2); + ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(!elem2, "elem = %p\n", elem2); + SysFreeString(str); + + str = a2bstr("fr1"); + hres = IHTMLDocument6_getElementById(doc6, str, &elem2); + ok(hres == S_OK, "getElementById failed: %08x\n", hres); + ok(elem2 != NULL, "elem2 is NULL\n"); + test_elem_id((IUnknown*)elem2, "fr1"); + SysFreeString(str); + + IHTMLDocument6_Release(doc6); + }else { + win_skip("IHTMLDocument6 not supported\n"); + } + test_framebase((IUnknown*)elem); test_framebase_name(elem, "nm1"); test_framebase_put_name(elem, "frame name");

1 0