February 2017 - Wine-Commits

Henri Verbeet : wined3d: Merge common code between texture3d_load_location () and surface_load_location().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 25188eb71fed2540e2a8c828f642837e3e32e747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25188eb71fed2540e2a8c828f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 13:13:21 2017 +0100 wined3d: Merge common code between texture3d_load_location() and surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 60 ++------------------------------------ dlls/wined3d/texture.c | 79 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 50 insertions(+), 89 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 628c83a..84f1c2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2492,28 +2492,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } -static DWORD resource_access_from_location(DWORD location) -{ - switch (location) - { - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_BUFFER: - return WINED3D_RESOURCE_ACCESS_CPU; - - case WINED3D_LOCATION_DRAWABLE: - case WINED3D_LOCATION_TEXTURE_SRGB: - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_RB_MULTISAMPLE: - case WINED3D_LOCATION_RB_RESOLVED: - return WINED3D_RESOURCE_ACCESS_GPU; - - default: - FIXME("Unhandled location %#x.\n", location); - return 0; - } -} - static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2814,46 +2792,15 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; - struct wined3d_texture_sub_resource *sub_resource; HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - sub_resource = &texture->sub_resources[sub_resource_idx]; - if (sub_resource->locations & location) - { - TRACE("Location (%#x) is already up to date.\n", location); - return WINED3D_OK; - } - - if (WARN_ON(d3d)) - { - DWORD required_access = resource_access_from_location(location); - if ((texture->resource.access_flags & required_access) != required_access) - WARN("Operation requires %#x access, but surface only has %#x.\n", - required_access, texture->resource.access_flags); - } - - if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) - { - TRACE("Surface previously discarded, nothing to do.\n"); - wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); - wined3d_texture_validate_location(texture, sub_resource_idx, location); - wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - goto done; - } - - if (!sub_resource->locations) - { - ERR("Surface %p does not have any up to date location.\n", surface); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - return surface_load_location(surface, context, location); - } - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { + DWORD current = texture->sub_resources[sub_resource_idx].locations; FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", - wined3d_debug_location(sub_resource->locations), wined3d_debug_location(location)); + wined3d_debug_location(current), wined3d_debug_location(location)); return WINED3DERR_INVALIDCALL; } @@ -2887,9 +2834,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; } -done: - wined3d_texture_validate_location(texture, sub_resource_idx, location); - return WINED3D_OK; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0d9fadf..50572ab 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -88,11 +88,15 @@ static DWORD wined3d_resource_access_from_location(DWORD location) return 0; case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_USER_MEMORY: return WINED3D_RESOURCE_ACCESS_CPU; case WINED3D_LOCATION_BUFFER: + case WINED3D_LOCATION_DRAWABLE: case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: + case WINED3D_LOCATION_RB_MULTISAMPLE: + case WINED3D_LOCATION_RB_RESOLVED: return WINED3D_RESOURCE_ACCESS_GPU; default: @@ -179,7 +183,50 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); + DWORD current = texture->sub_resources[sub_resource_idx].locations; + BOOL ret; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + TRACE("Current resource location %s.\n", wined3d_debug_location(current)); + + if (current & location) + { + TRACE("Location %s is already up to date.\n", wined3d_debug_location(location)); + return TRUE; + } + + if (WARN_ON(d3d)) + { + DWORD required_access = wined3d_resource_access_from_location(location); + if ((texture->resource.access_flags & required_access) != required_access) + WARN("Operation requires %#x access, but texture only has %#x.\n", + required_access, texture->resource.access_flags); + } + + if (current & WINED3D_LOCATION_DISCARDED) + { + TRACE("Sub-resource previously discarded, nothing to do.\n"); + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + wined3d_texture_validate_location(texture, sub_resource_idx, location); + wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); + return TRUE; + } + + if (!current) + { + ERR("Sub-resource %u of texture %p does not have any up to date location.\n", + sub_resource_idx, texture); + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); + return wined3d_texture_load_location(texture, sub_resource_idx, context, location); + } + + if ((ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location))) + wined3d_texture_validate_location(texture, sub_resource_idx, location); + + return ret; } /* Context activation is done by the caller. */ @@ -2253,38 +2300,11 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; - DWORD required_access = wined3d_resource_access_from_location(location); unsigned int row_pitch, slice_pitch; - TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", - texture, sub_resource_idx, context, wined3d_debug_location(location)); - - TRACE("Current resource location %s.\n", wined3d_debug_location(sub_resource->locations)); - - if ((sub_resource->locations & location) == location) - { - TRACE("Location(s) already up to date.\n"); - return TRUE; - } - - if ((texture->resource.access_flags & required_access) != required_access) - { - ERR("Operation requires %#x access, but volume only has %#x.\n", - required_access, texture->resource.access_flags); - return FALSE; - } - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; - if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) - { - TRACE("Volume previously discarded, nothing to do.\n"); - wined3d_texture_validate_location(texture, sub_resource_idx, location); - wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - goto done; - } - switch (location) { case WINED3D_LOCATION_TEXTURE_RGB: @@ -2369,9 +2389,6 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in return FALSE; } -done: - wined3d_texture_validate_location(texture, sub_resource_idx, location); - return TRUE; }

1 0

Nikolay Sivov : itss: Properly return interface pointers.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 4fdcc03cf8496ebdaf38f07e22692684e7ca78db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fdcc03cf8496ebdaf38f07e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:05 2017 +0300 itss: Properly return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/itss.c | 2 +- dlls/itss/storage.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index fe28ba9..f47a0e9 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -84,7 +84,7 @@ ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = &This->IClassFactory_iface; return S_OK; } diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 60e452d..f20c5bc 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -106,7 +106,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_QueryInterface( || IsEqualGUID(riid, &IID_IEnumSTATSTG)) { IEnumSTATSTG_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IEnumSTATSTG_iface; return S_OK; } @@ -283,7 +283,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_QueryInterface( || IsEqualGUID(riid, &IID_IStorage)) { IStorage_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IStorage_iface; return S_OK; } @@ -666,7 +666,7 @@ static HRESULT WINAPI ITSS_IStream_QueryInterface( || IsEqualGUID(riid, &IID_IStream)) { IStream_AddRef(iface); - *ppvObject = This; + *ppvObject = &This->IStream_iface; return S_OK; }

1 0

Nikolay Sivov : infosoft: Properly return interface pointers.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: d71672eb4c1dc4b115576de0a2b1c6ef42579411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71672eb4c1dc4b115576de0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 14:16:04 2017 +0300 infosoft: Properly return interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/infosoft_main.c | 2 +- dlls/infosoft/wordbreaker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 032316b..9524291 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -81,7 +81,7 @@ static HRESULT WINAPI infosoftcf_fnQueryInterface ( LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { - *ppvObj = This; + *ppvObj = &This->IClassFactory_iface; return S_OK; } diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 1789766..ceb9e18 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -57,7 +57,7 @@ static HRESULT WINAPI wb_QueryInterface( IWordBreaker *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IWordBreaker)) { - *ppvObj = This; + *ppvObj = &This->IWordBreaker_iface; return S_OK; }

1 0

Nikolay Sivov : d2d1: Create gdi-compatible texture for WIC target when asked for it.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 122676540389240e73b3a0f1e0b778483677eb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122676540389240e73b3a0f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 22:14:57 2017 +0300 d2d1: Create gdi-compatible texture for WIC target when asked for it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/wic_render_target.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 07a19ee..57f5d61 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -841,7 +841,8 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.Usage = D3D10_USAGE_DEFAULT; texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = 0; + texture_desc.MiscFlags = desc->usage & D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE ? + D3D10_RESOURCE_MISC_GDI_COMPATIBLE : 0; if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture))) { @@ -860,6 +861,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, texture_desc.Usage = D3D10_USAGE_STAGING; texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; if (FAILED(hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &render_target->readback_texture))) {

1 0

Józef Kucia : d3d9: Do not decrease swapchain refcount when it is already 0.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 1860208f5fe5ddf3b30cf77667aa3b6d1985538a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860208f5fe5ddf3b30cf7766… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:35 2017 +0100 d3d9: Do not decrease swapchain refcount when it is already 0. 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/swapchain.c | 9 ++++++++- dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 91ceaf0..8f3803a 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -90,8 +90,15 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface) static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); - ULONG refcount = InterlockedDecrement(&swapchain->refcount); + ULONG refcount; + if (!swapchain->refcount) + { + WARN("Swapchain does not have any references.\n"); + return 0; + } + + refcount = InterlockedDecrement(&swapchain->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 27f3a1d..5aba575 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1437,15 +1437,15 @@ static void test_refcount(void) CHECK_CALL(hr, "GetSwapChain", device, ++refcount); if (pSwapChain) { - CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT(pSwapChain, 1); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &pRenderTarget); CHECK_CALL(hr, "GetRenderTarget", device, ++refcount); - CHECK_REFCOUNT( pSwapChain, 1); - if(pRenderTarget) + CHECK_REFCOUNT(pSwapChain, 1); + if (pRenderTarget) { - CHECK_SURFACE_CONTAINER( pRenderTarget, IID_IDirect3DSwapChain9, pSwapChain); - CHECK_REFCOUNT( pRenderTarget, 1); + CHECK_SURFACE_CONTAINER(pRenderTarget, IID_IDirect3DSwapChain9, pSwapChain); + CHECK_REFCOUNT(pRenderTarget, 1); CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); CHECK_REFCOUNT(device, refcount); @@ -1454,9 +1454,9 @@ static void test_refcount(void) hr = IDirect3DDevice9_GetRenderTarget(device, 0, &pRenderTarget); CHECK_CALL(hr, "GetRenderTarget", device, refcount); - CHECK_REFCOUNT( pRenderTarget, 2); - CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); - CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); + CHECK_REFCOUNT(pRenderTarget, 2); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 1); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); CHECK_REFCOUNT(device, --refcount); /* The render target is released with the device, so AddRef with refcount=0 is fine here. */ @@ -1484,7 +1484,7 @@ static void test_refcount(void) hr = IDirect3DDevice9_GetDepthStencilSurface(device, &pStencilSurface); CHECK_CALL(hr, "GetDepthStencilSurface", device, ++refcount); - CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT(pSwapChain, 1); if (pStencilSurface) { CHECK_SURFACE_CONTAINER(pStencilSurface, IID_IDirect3DDevice9, device); @@ -1508,14 +1508,18 @@ static void test_refcount(void) pStencilSurface = NULL; } - CHECK_RELEASE_REFCOUNT( pSwapChain, 0); + CHECK_RELEASE_REFCOUNT(pSwapChain, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pSwapChain, 0); + CHECK_RELEASE_REFCOUNT(pSwapChain, 0); /* The implicit swapchwin is released with the device, so AddRef with refcount=0 is fine here. */ CHECK_ADDREF_REFCOUNT(pSwapChain, 1); CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pSwapChain, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pSwapChain, 0); + CHECK_RELEASE_REFCOUNT(pSwapChain, 0); pSwapChain = NULL; } @@ -1524,7 +1528,7 @@ static void test_refcount(void) CHECK_CALL(hr, "CreateIndexBuffer", device, ++refcount ); if(pIndexBuffer) { - tmp = get_refcount( (IUnknown *)pIndexBuffer ); + tmp = get_refcount((IUnknown *)pIndexBuffer); hr = IDirect3DDevice9_SetIndices(device, pIndexBuffer); CHECK_CALL( hr, "SetIndices", pIndexBuffer, tmp); @@ -1641,17 +1645,17 @@ static void test_refcount(void) d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &pSwapChain); CHECK_CALL(hr, "CreateAdditionalSwapChain", device, ++refcount); - if(pSwapChain) + if (pSwapChain) { /* check implicit back buffer */ hr = IDirect3DSwapChain9_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); CHECK_CALL(hr, "GetBackBuffer", device, ++refcount); - CHECK_REFCOUNT( pSwapChain, 1); - if(pBackBuffer) + CHECK_REFCOUNT(pSwapChain, 1); + if (pBackBuffer) { - CHECK_SURFACE_CONTAINER( pBackBuffer, IID_IDirect3DSwapChain9, pSwapChain); - CHECK_REFCOUNT( pBackBuffer, 1); - CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); + CHECK_SURFACE_CONTAINER(pBackBuffer, IID_IDirect3DSwapChain9, pSwapChain); + CHECK_REFCOUNT(pBackBuffer, 1); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT(device, --refcount); /* The back buffer is released with the swapchain, so AddRef with refcount=0 is fine here. */ @@ -1663,7 +1667,7 @@ static void test_refcount(void) CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } - CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT(pSwapChain, 1); } hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_EVENT, &pQuery); CHECK_CALL(hr, "CreateQuery", device, ++refcount);

1 0

Nikolay Sivov : advapi32: Fix trace format of InitiateSystemShutdownEx().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 28d9215961e381b93a742d88c6e64ff0713ab67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d9215961e381b93a742d88c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 12 21:13:53 2017 +0300 advapi32: Fix trace format of InitiateSystemShutdownEx(). 'Reason' argument is a set of flags Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index def40e5..1c528ef 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -231,7 +231,7 @@ BOOL WINAPI InitiateSystemShutdownExA( LPSTR lpMachineName, LPSTR lpMessage, DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown, DWORD dwReason) { - FIXME("%s %s %d %d %d %d\n", debugstr_a(lpMachineName), + FIXME("%s %s %d %d %d %#x\n", debugstr_a(lpMachineName), debugstr_a(lpMessage), dwTimeout, bForceAppsClosed, bRebootAfterShutdown, dwReason); return TRUE; @@ -246,7 +246,7 @@ BOOL WINAPI InitiateSystemShutdownExW( LPWSTR lpMachineName, LPWSTR lpMessage, DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown, DWORD dwReason) { - FIXME("%s %s %d %d %d %d\n", debugstr_w(lpMachineName), + FIXME("%s %s %d %d %d %#x\n", debugstr_w(lpMachineName), debugstr_w(lpMessage), dwTimeout, bForceAppsClosed, bRebootAfterShutdown, dwReason); return TRUE;

1 0

André Hentschel : iphlpapi: Add GetUnicastIpAddressEntry implementation.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: ccdbceeefc196999a698fc1842d4f1bff651ec22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdbceeefc196999a698fc184… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 18:30:13 2017 +0100 iphlpapi: Add GetUnicastIpAddressEntry implementation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 67 +++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 17 +++++++++++ include/ws2def.h | 13 +++++++++ include/ws2ipdef.h | 7 +++++ 5 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 500267c..1a1f8f7 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -147,7 +147,7 @@ @ stub GetUdpStatsFromStack @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack -#@ stub GetUnicastIpAddressEntry +@ stdcall GetUnicastIpAddressEntry( ptr ) #@ stub GetUnicastIpAddressTable @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) @ stdcall Icmp6CreateFile() diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1daf54d..12767c3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2467,6 +2467,73 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, return ret; } +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + ULONG size = 0; + DWORD ret; + + TRACE("%p\n", row); + + if (!row) + return ERROR_INVALID_PARAMETER; + + ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, NULL, &size); + if (ret != ERROR_BUFFER_OVERFLOW) + return ret; + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) + return ERROR_OUTOFMEMORY; + if ((ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, ptr, &size))) + { + HeapFree(GetProcessHeap(), 0, ptr); + return ret; + } + + ret = ERROR_FILE_NOT_FOUND; + for (aa = ptr; aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + + if (aa->u.s.IfIndex != row->InterfaceIndex && + memcmp(&aa->Luid, &row->InterfaceLuid, sizeof(row->InterfaceLuid))) + continue; + ret = ERROR_NOT_FOUND; + + ua = aa->FirstUnicastAddress; + while (ua) + { + SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; + + if ((row->Address.si_family == WS_AF_INET6 && + !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(uaaddr->Ipv6.sin6_addr))) || + (row->Address.si_family == WS_AF_INET && + row->Address.Ipv4.sin_addr.S_un.S_addr == uaaddr->Ipv4.sin_addr.S_un.S_addr)) + { + memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + row->InterfaceIndex = aa->u.s.IfIndex; + row->PrefixOrigin = ua->PrefixOrigin; + row->SuffixOrigin = ua->SuffixOrigin; + row->ValidLifetime = ua->ValidLifetime; + row->PreferredLifetime = ua->PreferredLifetime; + row->OnLinkPrefixLength = ua->OnLinkPrefixLength; + row->SkipAsSource = 0; + row->DadState = ua->DadState; + if (row->Address.si_family == WS_AF_INET6) + row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; + else + row->ScopeId.u.Value = 0; + NtQuerySystemTime(&row->CreationTimeStamp); + HeapFree(GetProcessHeap(), 0, ptr); + return NO_ERROR; + } + ua = ua->Next; + } + } + HeapFree(GetProcessHeap(), 0, ptr); + + return ret; +} + /****************************************************************** * GetUniDirectionalAdapterInfo (IPHLPAPI.@) * diff --git a/include/netioapi.h b/include/netioapi.h index 0357431..0e777c7 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -82,6 +82,22 @@ typedef struct _MIB_IF_TABLE2 MIB_IF_ROW2 Table[1]; } MIB_IF_TABLE2, *PMIB_IF_TABLE2; +typedef struct _MIB_UNICASTIPADDRESS_ROW +{ + SOCKADDR_INET Address; + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + NL_PREFIX_ORIGIN PrefixOrigin; + NL_SUFFIX_ORIGIN SuffixOrigin; + ULONG ValidLifetime; + ULONG PreferredLifetime; + UINT8 OnLinkPrefixLength; + BOOLEAN SkipAsSource; + NL_DAD_STATE DadState; + SCOPE_ID ScopeId; + LARGE_INTEGER CreationTimeStamp; +} MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); @@ -92,5 +108,6 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); #endif /* __WINE_NETIOAPI_H */ diff --git a/include/ws2def.h b/include/ws2def.h index cbd6f74..fa21c06 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -27,6 +27,8 @@ #define WS(x) x #endif +typedef USHORT ADDRESS_FAMILY; + #ifndef __CSADDR_DEFINED__ #define __CSADDR_DEFINED__ @@ -78,6 +80,17 @@ typedef enum { ScopeLevelGlobal = 14 } SCOPE_LEVEL; +typedef struct +{ + union { + struct { + ULONG Zone : 28; + ULONG Level : 4; + } DUMMYSTRUCTNAME; + ULONG Value; + } DUMMYUNIONNAME; +} SCOPE_ID, *PSCOPE_ID; + typedef struct _WSABUF { ULONG len; diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ca47caa..e13cf6e 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -135,6 +135,13 @@ typedef struct WS(sockaddr_in6_pair) PSOCKADDR_IN6 DestinationAddress; } SOCKADDR_IN6_PAIR, *PSOCKADDR_IN6_PAIR; +typedef union _SOCKADDR_INET +{ + SOCKADDR_IN Ipv4; + SOCKADDR_IN6 Ipv6; + ADDRESS_FAMILY si_family; +} SOCKADDR_INET, *PSOCKADDR_INET; + /* * Multicast group information */

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in device_clear_render_targets().
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: 87f98ee88bb85bfe9b21fb312dfc7e8e5036ff03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f98ee88bb85bfe9b21fb312… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 13 13:13:20 2017 +0100 wined3d: Use wined3d_texture_load_location() in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88a3bc9..b4b1803 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -286,7 +286,8 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c { DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - surface_load_location(depth_stencil, context, location); + wined3d_texture_load_location(depth_stencil->container, + dsv->sub_resource_idx, context, location); } if (!context_apply_clear_state(context, state, rt_count, fb))

1 0

Jacob Lifshay : kernel32: Fix improper escaping of quotes in command line.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: c7ad47e9b29971509d8ea76e918b6f623ca52a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ad47e9b29971509d8ea76e9… Author: Jacob Lifshay <programmerjake(a)gmail.com> Date: Thu Feb 9 16:26:36 2017 -0800 kernel32: Fix improper escaping of quotes in command line. Signed-off-by: Jacob Lifshay <programmerjake(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 70c38eb..5b8a3d3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -745,6 +745,10 @@ static void update_library_argv0( const WCHAR *argv0 ) * resulting in an odd number of '\' followed by a '"' * '\"' -> '\\\"' * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' * - '\'s that are not followed by a '"' can be left as is * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' @@ -787,7 +791,7 @@ static BOOL build_command_line( WCHAR **argv ) } len+=(a-*arg)+1 /* for the separating space */; if (has_space) - len+=2; /* for the quotes */ + len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) @@ -800,6 +804,7 @@ static BOOL build_command_line( WCHAR **argv ) { BOOL has_space,has_quote; WCHAR* a; + int bcount; /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; @@ -821,9 +826,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Now transfer it to the command line */ if (has_space) *p++='"'; - if (has_quote) { - int bcount; - + if (has_quote || has_space) { bcount=0; a=*arg; while (*a!='\0') { @@ -849,8 +852,14 @@ static BOOL build_command_line( WCHAR **argv ) WCHAR* x = *arg; while ((*p=*x++)) p++; } - if (has_space) + if (has_space) { + int i; + + /* Double all the '\' preceding the closing quote */ + for (i=0;i<bcount;i++) + *p++='\\'; *p++='"'; + } *p++=' '; } if (p > rupp->CommandLine.Buffer)

1 0

Alistair Leslie-Hughes : dpnet: Use registry lookup in EnumServiceProviders.
by Alexandre Julliard Feb. 13, 2017

Feb. 13, 2017

Module: wine Branch: master Commit: e21c573295a4fa8b00388b2c05d7c0a37bd6b161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c573295a4fa8b00388b2c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:45:42 2017 +0000 dpnet: Use registry lookup in EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 118 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 28 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index d7144df..461d610 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -126,63 +126,125 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, return DPN_OK; } -static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, - const GUID * const pguidServiceProvider, const GUID * const pguidApplication, - DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, - DWORD * const pcReturned, const DWORD dwFlags) +static HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, + DWORD * const buf_size, DWORD * const returned) { - static const WCHAR dp_providerW[] = {'D','i','r','e','c','t','P','l','a','y','8',' ','T','C','P','/','I','P',' ', - 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','\0'}; + static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', + 'D','i','r','e','c','t','P','l','a','y','8','\\', + 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','s',0}; + static const WCHAR friendly[] = {'F','r','i','e','n','d','l','y',' ','N','a','m','e',0}; static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', - ' ','-',' ','I','P','v','4','\0'}; - + ' ','-',' ','I','P','v','4',0}; static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; - DWORD req_size; - - TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, - pcbEnumData, pcReturned, dwFlags); - - if(!pcReturned || !pcbEnumData) + DWORD req_size = 0; + LONG res; + HKEY key = NULL; + LONG next_key; + DWORD index = 0; + WCHAR provider[MAX_PATH]; + DWORD size; + + if(!returned || !buf_size) return E_POINTER; - if(!pguidServiceProvider) + *returned = 0; + + if(!service) { - req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); + if(res == ERROR_FILE_NOT_FOUND) + return DPNERR_DOESNOTEXIST; + + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + req_size += sizeof(DPN_SERVICE_PROVIDER_INFO) + size; + + (*returned)++; + } + + index++; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH ); + } + } - else if(IsEqualGUID(pguidServiceProvider, &CLSID_DP8SP_TCPIP)) + else if(IsEqualGUID(service, &CLSID_DP8SP_TCPIP)) { req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_adapterW); } else { FIXME("Application requested a provider we don't handle (yet)\n"); - *pcReturned = 0; return DPNERR_DOESNOTEXIST; } - if(*pcbEnumData < req_size) + if(*buf_size < req_size) { - *pcbEnumData = req_size; + RegCloseKey(key); + + *buf_size = req_size; return DPNERR_BUFFERTOOSMALL; } - pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + 1); - - if(!pguidServiceProvider) + if(!service) { - lstrcpyW(pSPInfoBuffer->pwszName, dp_providerW); - pSPInfoBuffer->guid = CLSID_DP8SP_TCPIP; + int offset = 0; + int count = 0; + char *infoend = ((char *)info_buffer + (sizeof(DPN_SERVICE_PROVIDER_INFO) * (*returned))); + + index = 0; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + info_buffer[count].guid = CLSID_DP8SP_TCPIP; + info_buffer[count].pwszName = (LPWSTR)(infoend + offset); + + RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, info_buffer[count].pwszName, &size); + + offset += size; + count++; + } + + index++; + next_key = RegEnumKeyW(key, index, provider, MAX_PATH); + } } else { - lstrcpyW(pSPInfoBuffer->pwszName, dp_adapterW); - pSPInfoBuffer->guid = adapter_guid; + info_buffer->pwszName = (LPWSTR)(info_buffer + 1); + lstrcpyW(info_buffer->pwszName, dp_adapterW); + info_buffer->guid = adapter_guid; + *returned = 1; } - *pcReturned = 1; + RegCloseKey(key); + return DPN_OK; } +static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, + const GUID * const pguidServiceProvider, const GUID * const pguidApplication, + DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, + DWORD * const pcReturned, const DWORD dwFlags) +{ + TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); +} + static HRESULT WINAPI IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, const DPNHANDLE hAsyncHandle, const DWORD dwFlags) {

1 0