August 2016 - Wine-commits - list.winehq.org

Józef Kucia : d3d9/tests: Restore display rotation in test_get_adapter_displaymode_ex().
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 677a9349c71e75278de2b26cc9d221fc23e14fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=677a9349c71e75278de2b26cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 22 14:53:47 2016 +0200 d3d9/tests: Restore display rotation in test_get_adapter_displaymode_ex(). 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/d3d9/tests/d3d9ex.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 695efa2..283f6e6 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -542,7 +542,7 @@ static void test_get_adapter_displaymode_ex(void) D3DDISPLAYMODE mode; D3DDISPLAYMODEEX mode_ex; D3DDISPLAYROTATION rotation; - DEVMODEW startmode; + DEVMODEW startmode, devmode; LONG retval; hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); @@ -575,21 +575,22 @@ static void test_get_adapter_displaymode_ex(void) ok(retval, "Failed to retrieve current display mode, retval %d.\n", retval); if (!retval) goto out; - startmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; - S2(U1(startmode)).dmDisplayOrientation = DMDO_180; - retval = ChangeDisplaySettingsExW(NULL, &startmode, NULL, 0, NULL); - - if(retval == DISP_CHANGE_BADMODE) + devmode = startmode; + devmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; + S2(U1(devmode)).dmDisplayOrientation = DMDO_180; + retval = ChangeDisplaySettingsExW(NULL, &devmode, NULL, 0, NULL); + if (retval == DISP_CHANGE_BADMODE) { - trace(" Test skipped: graphics mode is not supported\n"); + skip("Graphics mode is not supported.\n"); goto out; } - ok(retval == DISP_CHANGE_SUCCESSFUL,"ChangeDisplaySettingsEx failed with %d\n", retval); + ok(retval == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsEx failed with %d.\n", retval); /* try retrieve orientation info with EnumDisplaySettingsEx*/ - startmode.dmFields = 0; - S2(U1(startmode)).dmDisplayOrientation = 0; - ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); + devmode.dmFields = 0; + S2(U1(devmode)).dmDisplayOrientation = 0; + ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &devmode, EDS_ROTATEDMODE), + "EnumDisplaySettingsEx failed.\n"); /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ memset(&mode_ex, 0, sizeof(mode_ex)); @@ -619,8 +620,8 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - todo_wine ok(S2(U1(startmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, - "rotation is %d instead of %d\n", rotation, S2(U1(startmode)).dmDisplayOrientation); + todo_wine ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + "rotation is %d instead of %d\n", rotation, S2(U1(devmode)).dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); @@ -643,10 +644,12 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* return to the default mode */ - ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + retval = ChangeDisplaySettingsExW(NULL, &startmode, NULL, 0, NULL); + ok(retval == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsEx failed with %d.\n", retval); out: IDirect3D9_Release(d3d9); IDirect3D9Ex_Release(d3d9ex); + DestroyWindow(window); } static void test_create_depth_stencil_surface_ex(void)

1 0

Józef Kucia : d3d9/tests: Add test for IDirect3DDevice9Ex_ResetEx().
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: de3ca49952e929610b0e128fcc805730012273cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3ca49952e929610b0e128fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 22 14:53:48 2016 +0200 d3d9/tests: Add test for IDirect3DDevice9Ex_ResetEx(). 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/d3d9/tests/d3d9ex.c | 405 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 405 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de3ca49952e929610b0e1…

1 0

Józef Kucia : d3d9: Allow passing "mode" to IDirect3DDevice9Ex_ResetEx() iff "Windowed" is FALSE.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: c1cc6e45dabbc695cc7b863d1750822c9598a5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cc6e45dabbc695cc7b863d1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 22 14:53:49 2016 +0200 d3d9: Allow passing "mode" to IDirect3DDevice9Ex_ResetEx() iff "Windowed" is FALSE. 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/d3d9/device.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c600ca..097b05f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3449,6 +3449,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex * TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode); + if (!present_parameters->Windowed == !mode) + { + WARN("Mode can be passed if and only if Windowed is FALSE.\n"); + return D3DERR_INVALIDCALL; + } + return d3d9_device_reset(device, present_parameters, mode); } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index c857e53..63e9a30 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1465,7 +1465,7 @@ static void test_reset_ex(void) modes[i].RefreshRate = 0; modes[i].ScanLineOrdering = 0; hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &modes[i]); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); @@ -1665,7 +1665,7 @@ static void test_reset_ex(void) d3dpp.BackBufferHeight = 400; d3dpp.BackBufferFormat = D3DFMT_A8R8G8B8; hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &mode); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, NULL); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); @@ -1673,8 +1673,8 @@ static void test_reset_ex(void) width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - todo_wine ok(width == modes[1].Width, "Screen width is %u, expected %u.\n", width, modes[1].Width); - todo_wine ok(height == modes[1].Height, "Screen height is %u, expected %u.\n", height, modes[1].Height); + ok(width == modes[1].Width, "Screen width is %u, expected %u.\n", width, modes[1].Width); + ok(height == modes[1].Height, "Screen height is %u, expected %u.\n", height, modes[1].Height); hr = IDirect3DDevice9Ex_GetScissorRect(device, &rect); ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr);

1 0

Józef Kucia : d3d9: Forbid display mode and back buffer mismatch in IDirect3DDevice9Ex_ResetEx ().
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 53714bd6a892744aceefd5af51dce8c52b402e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53714bd6a892744aceefd5af5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 22 14:53:50 2016 +0200 d3d9: Forbid display mode and back buffer mismatch in IDirect3DDevice9Ex_ResetEx(). 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/d3d9/device.c | 9 +++++++++ dlls/d3d9/tests/d3d9ex.c | 17 ++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 097b05f..5d1d292 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3455,6 +3455,15 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex * return D3DERR_INVALIDCALL; } + if (mode && (mode->Width != present_parameters->BackBufferWidth + || mode->Height != present_parameters->BackBufferHeight)) + { + WARN("Mode and back buffer mismatch (mode %ux%u, backbuffer %ux%u).\n", + mode->Width, mode->Height, + present_parameters->BackBufferWidth, present_parameters->BackBufferHeight); + return D3DERR_INVALIDCALL; + } + return d3d9_device_reset(device, present_parameters, mode); } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 63e9a30..05f1580 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1563,15 +1563,26 @@ static void test_reset_ex(void) d3dpp.BackBufferWidth = modes[i].Width - 10; d3dpp.BackBufferHeight = modes[i].Height - 10; hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &modes[i]); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); d3dpp.BackBufferWidth = modes[i].Width - 1; d3dpp.BackBufferHeight = modes[i].Height; hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &modes[i]); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); d3dpp.BackBufferWidth = modes[i].Width; d3dpp.BackBufferHeight = modes[i].Height - 1; hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &modes[i]); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + d3dpp.BackBufferWidth = 0; + d3dpp.BackBufferHeight = 0; + hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &modes[i]); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + d3dpp.BackBufferWidth = modes[i].Width; + d3dpp.BackBufferHeight = modes[i].Height; + mode2 = modes[i]; + mode2.Width = 0; + mode2.Height = 0; + hr = IDirect3DDevice9Ex_ResetEx(device, &d3dpp, &mode2); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected cooperative level %#x.\n", hr);

1 0

Michael Müller : d3d11: Fix calculation of array size for 1D textures.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 983b3577ca50ef7688b026093cfed1156acc76d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=983b3577ca50ef7688b026093… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 23 22:48:27 2016 +0200 d3d11: Fix calculation of array size for 1D textures. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index a13316f..205513d 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -184,7 +184,7 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res { case D3D11_DSV_DIMENSION_TEXTURE1DARRAY: if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count) - desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice; break; case D3D11_DSV_DIMENSION_TEXTURE2DARRAY: @@ -412,7 +412,7 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res { case D3D11_RTV_DIMENSION_TEXTURE1DARRAY: if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count) - desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice; break; case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: @@ -915,7 +915,7 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11 { case D3D11_UAV_DIMENSION_TEXTURE1DARRAY: if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count) - desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize; + desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice; break; case D3D11_UAV_DIMENSION_TEXTURE2DARRAY:

1 0

Jacek Caban : wpc: Added class factory stub implementation.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 14cf136a8c68fa45a72c09409a19d13bb44d3bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cf136a8c68fa45a72c09409… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 24 12:40:35 2016 +0200 wpc: Added class factory stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/wpc.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 48f8edf..20db3fc 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "initguid.h" #include "wpcapi.h" #include "rpcproxy.h" @@ -25,6 +28,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpc); static HINSTANCE wpc_instance; +static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl WPCFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WindowsParentalControls_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WPCFactory = { &WPCFactoryVtbl }; + /****************************************************************** * DllMain */ @@ -49,6 +107,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { + if(IsEqualGUID(&CLSID_WindowsParentalControls, rclsid)) { + TRACE("(CLSID_WindowsParentalControls %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WPCFactory, riid, ppv); + } + FIXME("Unknown object %s (iface %s)\n", debugstr_guid(rclsid), debugstr_guid(riid)); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Michael Müller : d3d11: Correctly print unhandled bind flags in wined3d_usage_from_d3d11.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: d64e9bb59d38e3884fea675de4de7b18107277db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64e9bb59d38e3884fea675de… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 23 17:25:13 2016 +0200 d3d11: Correctly print unhandled bind flags in wined3d_usage_from_d3d11. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 370858e..89dbbda 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -411,7 +411,7 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_DEPTH_STENCIL) wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) - FIXME("Unhandled bind flags %#x.\n", usage & ~handled); + FIXME("Unhandled bind flags %#x.\n", bind_flags & ~handled); if (usage == D3D11_USAGE_DYNAMIC) wined3d_usage |= WINED3DUSAGE_DYNAMIC;

1 0

Jacek Caban : wpc: Added IWindowsParentalControls stub implementation.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: fec49b9af6160b3f3008ca069c116b0d1a76cc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec49b9af6160b3f3008ca069… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 24 12:40:42 2016 +0200 wpc: Added IWindowsParentalControls stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/tests/wpc.c | 2 +- dlls/wpc/wpc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c index 9fcc3f2..2cf35cc 100644 --- a/dlls/wpc/tests/wpc.c +++ b/dlls/wpc/tests/wpc.c @@ -32,7 +32,7 @@ static void test_wpc(void) if(hres == REGDB_E_CLASSNOTREG) win_skip("CLSID_WindowsParentalControls not registered\n"); else - todo_wine ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); if(FAILED(hres)) return; diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 20db3fc..10468e9 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -28,12 +28,87 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpc); static HINSTANCE wpc_instance; -static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +static HRESULT WINAPI WindowsParentalControls_QueryInterface(IWindowsParentalControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWindowsParentalControlsCore)) { + TRACE("(IID_IWindowsParentalControlsCore %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWindowsParentalControls)) { + TRACE("(IID_IWindowsParentalControls %p)\n", ppv); + *ppv = iface; + }else { + FIXME("unsupported iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WindowsParentalControls_AddRef(IWindowsParentalControls *iface) +{ + return 2; +} + +static ULONG WINAPI WindowsParentalControls_Release(IWindowsParentalControls *iface) +{ + return 1; +} + +static HRESULT WINAPI WindowsParentalControls_GetVisibility(IWindowsParentalControls *iface, WPCFLAG_VISIBILITY *visibility) +{ + FIXME("(%p)\n", visibility); + return E_NOTIMPL; +} + +static HRESULT WINAPI WindowsParentalControls_GetUserSettings(IWindowsParentalControls *iface, const WCHAR *sid, IWPCSettings **settings) +{ + FIXME("(%s %p)\n", debugstr_w(sid), settings); + return E_NOTIMPL; +} + +static HRESULT WINAPI WindowsParentalControls_GetWebSettings(IWindowsParentalControls *iface, const WCHAR *sid, IWPCWebSettings **settings) { - FIXME("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + FIXME("(%s %p)\n", debugstr_w(sid), settings); return E_NOTIMPL; } +static HRESULT WINAPI WindowsParentalControls_GetWebFilterInfo(IWindowsParentalControls *iface, GUID *id, WCHAR **name) +{ + FIXME("(%p %p)\n", id, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI WindowsParentalControls_GetGamesSettings(IWindowsParentalControls *iface, const WCHAR *sid, IWPCGamesSettings **settings) +{ + FIXME("(%s %p)\n", debugstr_w(sid), settings); + return E_NOTIMPL; +} + +static const IWindowsParentalControlsVtbl WindowsParentalControlsVtbl = { + WindowsParentalControls_QueryInterface, + WindowsParentalControls_AddRef, + WindowsParentalControls_Release, + WindowsParentalControls_GetVisibility, + WindowsParentalControls_GetUserSettings, + WindowsParentalControls_GetWebSettings, + WindowsParentalControls_GetWebFilterInfo, + WindowsParentalControls_GetGamesSettings +}; + +static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + static IWindowsParentalControls wpc = { &WindowsParentalControlsVtbl }; + + TRACE("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + + return IWindowsParentalControls_QueryInterface(&wpc, riid, ppv); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL;

1 0

Piotr Caban : include: Add msvcrt/fpieee.h header.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 514ff74e9bb222bcc1e1e9829ad412d91ae5efe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514ff74e9bb222bcc1e1e9829… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:57:49 2016 +0200 include: Add msvcrt/fpieee.h header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/fpieee.h | 239 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4aaefaf..89004b8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -473,6 +473,7 @@ HEADER_SRCS = \ msvcrt/errno.h \ msvcrt/fcntl.h \ msvcrt/float.h \ + msvcrt/fpieee.h \ msvcrt/io.h \ msvcrt/limits.h \ msvcrt/locale.h \ diff --git a/include/msvcrt/fpieee.h b/include/msvcrt/fpieee.h new file mode 100644 index 0000000..67f6d11 --- /dev/null +++ b/include/msvcrt/fpieee.h @@ -0,0 +1,239 @@ +/** + * Derived from mingw-w64 header. + * This file is in the public domain. + */ +#ifndef __WINE_FPIEEE_H +#define __WINE_FPIEEE_H + +#include <crtdefs.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + _FpCompareEqual, + _FpCompareGreater, + _FpCompareLess, + _FpCompareUnordered +} _FPIEEE_COMPARE_RESULT; + +typedef enum { + _FpFormatFp32, + _FpFormatFp64, + _FpFormatFp80, + _FpFormatFp128, + _FpFormatI16, + _FpFormatI32, + _FpFormatI64, + _FpFormatU16, + _FpFormatU32, + _FpFormatU64, + _FpFormatBcd80, + _FpFormatCompare, + _FpFormatString, +} _FPIEEE_FORMAT; + +typedef enum { + _FpCodeUnspecified, + _FpCodeAdd, + _FpCodeSubtract, + _FpCodeMultiply, + _FpCodeDivide, + _FpCodeSquareRoot, + _FpCodeRemainder, + _FpCodeCompare, + _FpCodeConvert, + _FpCodeRound, + _FpCodeTruncate, + _FpCodeFloor, + _FpCodeCeil, + _FpCodeAcos, + _FpCodeAsin, + _FpCodeAtan, + _FpCodeAtan2, + _FpCodeCabs, + _FpCodeCos, + _FpCodeCosh, + _FpCodeExp, + _FpCodeFabs, + _FpCodeFmod, + _FpCodeFrexp, + _FpCodeHypot, + _FpCodeLdexp, + _FpCodeLog, + _FpCodeLog10, + _FpCodeModf, + _FpCodePow, + _FpCodeSin, + _FpCodeSinh, + _FpCodeTan, + _FpCodeTanh, + _FpCodeY0, + _FpCodeY1, + _FpCodeYn, + _FpCodeLogb, + _FpCodeNextafter, + _FpCodeNegate, + _FpCodeFmin, + _FpCodeFmax, + _FpCodeConvertTrunc, + _XMMIAddps, + _XMMIAddss, + _XMMISubps, + _XMMISubss, + _XMMIMulps, + _XMMIMulss, + _XMMIDivps, + _XMMIDivss, + _XMMISqrtps, + _XMMISqrtss, + _XMMIMaxps, + _XMMIMaxss, + _XMMIMinps, + _XMMIMinss, + _XMMICmpps, + _XMMICmpss, + _XMMIComiss, + _XMMIUComiss, + _XMMICvtpi2ps, + _XMMICvtsi2ss, + _XMMICvtps2pi, + _XMMICvtss2si, + _XMMICvttps2pi, + _XMMICvttss2si, + _XMMIAddsubps, + _XMMIHaddps, + _XMMIHsubps, + _XMMI2Addpd, + _XMMI2Addsd, + _XMMI2Subpd, + _XMMI2Subsd, + _XMMI2Mulpd, + _XMMI2Mulsd, + _XMMI2Divpd, + _XMMI2Divsd, + _XMMI2Sqrtpd, + _XMMI2Sqrtsd, + _XMMI2Maxpd, + _XMMI2Maxsd, + _XMMI2Minpd, + _XMMI2Minsd, + _XMMI2Cmppd, + _XMMI2Cmpsd, + _XMMI2Comisd, + _XMMI2UComisd, + _XMMI2Cvtpd2pi, + _XMMI2Cvtsd2si, + _XMMI2Cvttpd2pi, + _XMMI2Cvttsd2si, + _XMMI2Cvtps2pd, + _XMMI2Cvtss2sd, + _XMMI2Cvtpd2ps, + _XMMI2Cvtsd2ss, + _XMMI2Cvtdq2ps, + _XMMI2Cvttps2dq, + _XMMI2Cvtps2dq, + _XMMI2Cvttpd2dq, + _XMMI2Cvtpd2dq, + _XMMI2Addsubpd, + _XMMI2Haddpd, + _XMMI2Hsubpd, +} _FP_OPERATION_CODE; + +typedef enum { + _FpRoundNearest, + _FpRoundMinusInfinity, + _FpRoundPlusInfinity, + _FpRoundChopped +} _FPIEEE_ROUNDING_MODE; + +typedef enum { + _FpPrecisionFull, + _FpPrecision53, + _FpPrecision24, +} _FPIEEE_PRECISION; + +typedef float _FP32; +typedef double _FP64; +typedef short _I16; +typedef int _I32; +typedef unsigned short _U16; +typedef unsigned int _U32; +typedef __int64 _Q64; + +typedef struct { + unsigned short W[5]; +} _FP80; + +typedef struct DECLSPEC_ALIGN(16) { + __msvcrt_ulong W[4]; +} _FP128; + +typedef struct DECLSPEC_ALIGN(8) { + __msvcrt_ulong W[2]; +} _I64; + +typedef struct DECLSPEC_ALIGN(8) { + __msvcrt_ulong W[2]; +} _U64; + +typedef struct { + unsigned short W[5]; +} _BCD80; + +typedef struct DECLSPEC_ALIGN(16) { + _Q64 W[2]; +} _FPQ64; + +typedef struct { + union { + _FP32 Fp32Value; + _FP64 Fp64Value; + _FP80 Fp80Value; + _FP128 Fp128Value; + _I16 I16Value; + _I32 I32Value; + _I64 I64Value; + _U16 U16Value; + _U32 U32Value; + _U64 U64Value; + _BCD80 Bcd80Value; + char *StringValue; + int CompareValue; + _Q64 Q64Value; + _FPQ64 Fpq64Value; + } Value; + unsigned int OperandValid : 1; + unsigned int Format : 4; +} _FPIEEE_VALUE; + +typedef struct { + unsigned int Inexact : 1; + unsigned int Underflow : 1; + unsigned int Overflow : 1; + unsigned int ZeroDivide : 1; + unsigned int InvalidOperation : 1; +} _FPIEEE_EXCEPTION_FLAGS; + +typedef struct { + unsigned int RoundingMode : 2; + unsigned int Precision : 3; + unsigned int Operation :12; + _FPIEEE_EXCEPTION_FLAGS Cause; + _FPIEEE_EXCEPTION_FLAGS Enable; + _FPIEEE_EXCEPTION_FLAGS Status; + _FPIEEE_VALUE Operand1; + _FPIEEE_VALUE Operand2; + _FPIEEE_VALUE Result; +} _FPIEEE_RECORD,*_PFPIEEE_RECORD; + +struct _EXCEPTION_POINTERS; + +int __cdecl _fpieee_flt(__msvcrt_ulong _ExceptionCode,struct _EXCEPTION_POINTERS *_PtExceptionPtr,int (__cdecl *_Handler)(_FPIEEE_RECORD *)); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Max Qian : api-ms-win-core-job-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: de111cd3362f44052ca96bee7f6df59073efa466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de111cd3362f44052ca96bee7… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:47 2016 -0700 api-ms-win-core-job-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-job-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 0211b20..928c3a6 100755 --- a/configure +++ b/configure @@ -897,6 +897,7 @@ enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 +enable_api_ms_win_core_job_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 @@ -17433,6 +17434,7 @@ wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_h wine_fn_config_dll api-ms-win-core-interlocked-l1-1-0 enable_api_ms_win_core_interlocked_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 +wine_fn_config_dll api-ms-win-core-job-l1-1-0 enable_api_ms_win_core_job_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 diff --git a/configure.ac b/configure.ac index bc95e88..36c7107 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-job-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-job-l1-1-0/Makefile.in b/dlls/api-ms-win-core-job-l1-1-0/Makefile.in new file mode 100644 index 0000000..412c521 --- /dev/null +++ b/dlls/api-ms-win-core-job-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-job-l1-1-0.dll diff --git a/dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec b/dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec new file mode 100644 index 0000000..720fecb --- /dev/null +++ b/dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall IsProcessInJob(long long ptr) kernel32.IsProcessInJob diff --git a/tools/make_specfiles b/tools/make_specfiles index 947cde7..265e3ea 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,7 @@ my @dll_groups = "api-ms-win-core-heap-l1-2-0", "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", + "api-ms-win-core-job-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-localization-l1-1-0",

1 0