February 2018 - Wine-Devel - list.winehq.org

[PATCH 4/5] wined3d: Replace the pool in struct wined3d_sub_resource_desc with resource access flags.
by Henri Verbeet Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 16 ++++++++++++++++ dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 6 +++--- dlls/d3d8/volume.c | 2 +- dlls/d3d9/d3d9_private.h | 16 ++++++++++++++++ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 6 +++--- dlls/d3d9/volume.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ---- include/wine/wined3d.h | 18 +++++++++++------- 12 files changed, 56 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index bb739a3..d18fdb8 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -280,6 +280,22 @@ static inline DWORD d3dusage_from_wined3dusage(unsigned int usage) return usage & WINED3DUSAGE_MASK; } +static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned int usage) +{ + switch (access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)) + { + default: + case WINED3D_RESOURCE_ACCESS_GPU: + return D3DPOOL_DEFAULT; + case WINED3D_RESOURCE_ACCESS_CPU: + if (usage & WINED3DUSAGE_SCRATCH) + return D3DPOOL_SCRATCH; + return D3DPOOL_SYSTEMMEM; + case WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU: + return D3DPOOL_MANAGED; + } +} + static inline D3DPOOL d3dpool_from_wined3dpool(enum wined3d_pool pool, unsigned int usage) { if (pool == WINED3D_POOL_SYSTEM_MEM && usage & WINED3DUSAGE_SCRATCH) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index f71f4c3..3ece82a 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -192,7 +192,7 @@ static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_ desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 7be4046..ad25001 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d8_texture_2d_GetLevelDesc(IDirect3DTexture8 *iface, UIN desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; desc->Width = wined3d_desc.width; @@ -601,7 +601,7 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; desc->Width = wined3d_desc.width; @@ -946,7 +946,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetLevelDesc(IDirect3DVolumeTexture8 *ifac desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index ad78ea7..bcc6a93 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -126,7 +126,7 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index aade880..3a1ec37 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -283,6 +283,22 @@ static inline DWORD d3dusage_from_wined3dusage(unsigned int usage) return usage & WINED3DUSAGE_MASK; } +static inline D3DPOOL d3dpool_from_wined3daccess(unsigned int access, unsigned int usage) +{ + switch (access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)) + { + default: + case WINED3D_RESOURCE_ACCESS_GPU: + return D3DPOOL_DEFAULT; + case WINED3D_RESOURCE_ACCESS_CPU: + if (usage & WINED3DUSAGE_SCRATCH) + return D3DPOOL_SCRATCH; + return D3DPOOL_SYSTEMMEM; + case WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU: + return D3DPOOL_MANAGED; + } +} + static inline D3DPOOL d3dpool_from_wined3dpool(enum wined3d_pool pool, unsigned int usage) { if (pool == WINED3D_POOL_SYSTEM_MEM && usage & WINED3DUSAGE_SCRATCH) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c5348a4..8fec9b9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1609,10 +1609,10 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - if (desc.pool != WINED3D_POOL_DEFAULT) + if (desc.access & WINED3D_RESOURCE_ACCESS_CPU) { wined3d_mutex_unlock(); - WARN("Colorfill is not allowed on surfaces in pool %#x, returning D3DERR_INVALIDCALL.\n", desc.pool); + WARN("Colour fills are not allowed on surfaces with resource access %#x.\n", desc.access); return D3DERR_INVALIDCALL; } if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index a5b1b08..8c42a8c 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -224,7 +224,7 @@ static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_ desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index bdbaa25..4604b15 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -290,7 +290,7 @@ static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UIN desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; desc->Width = wined3d_desc.width; @@ -677,7 +677,7 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; desc->Width = wined3d_desc.width; @@ -1060,7 +1060,7 @@ static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *ifac desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; desc->Depth = wined3d_desc.depth; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 795da2f..08e0d77 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -127,7 +127,7 @@ static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DES desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); - desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; desc->Depth = wined3d_desc.depth; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e480a22..aa6e14c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2901,7 +2901,7 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture desc->multisample_type = resource->multisample_type; desc->multisample_quality = resource->multisample_quality; desc->usage = resource->usage; - desc->pool = resource->pool; + desc->access = resource->access; level_idx = sub_resource_idx % texture->level_count; desc->width = wined3d_texture_get_level_width(texture, level_idx); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8006f3a..eb8936a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2961,10 +2961,6 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta return context->isStateDirty[idx] & (1u << shift); } -#define WINED3D_RESOURCE_ACCESS_GPU 0x1u -#define WINED3D_RESOURCE_ACCESS_CPU 0x2u -#define WINED3D_RESOURCE_ACCESS_MAP 0x4u - const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; static inline BOOL wined3d_resource_access_is_managed(unsigned int access) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 02c168e..d8d057d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -50,6 +50,10 @@ #define WINEDDERR_INVALIDRECT MAKE_WINED3DHRESULT(150) #define WINEDDERR_OVERLAYNOTVISIBLE MAKE_WINED3DHRESULT(577) +#define WINED3D_RESOURCE_ACCESS_GPU 0x1u +#define WINED3D_RESOURCE_ACCESS_CPU 0x2u +#define WINED3D_RESOURCE_ACCESS_MAP 0x4u + enum wined3d_light_type { WINED3D_LIGHT_POINT = 1, @@ -1744,13 +1748,13 @@ struct wined3d_sub_resource_desc { enum wined3d_format_id format; enum wined3d_multisample_type multisample_type; - UINT multisample_quality; - DWORD usage; - enum wined3d_pool pool; - UINT width; - UINT height; - UINT depth; - UINT size; + unsigned int multisample_quality; + unsigned int usage; + unsigned int access; + unsigned int width; + unsigned int height; + unsigned int depth; + unsigned int size; }; struct wined3d_clip_status -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use the resource access flags in texture_resource_sub_resource_map().
by Henri Verbeet Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5007696..e480a22 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1872,7 +1872,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour if (box && FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) { WARN("Map box is invalid.\n"); - if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && resource->pool == WINED3D_POOL_DEFAULT) + if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) || resource->type != WINED3D_RTYPE_TEXTURE_2D) return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use the resource access flags in wined3d_texture_unload().
by Henri Verbeet Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 03cf027..5007696 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1803,7 +1803,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (resource->pool != WINED3D_POOL_DEFAULT + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU && wined3d_texture_load_location(texture, i, context, resource->map_binding)) { wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); @@ -1812,9 +1812,11 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { /* We should only get here on device reset/teardown for implicit * resources. */ - if (resource->pool != WINED3D_POOL_DEFAULT || resource->type != WINED3D_RTYPE_TEXTURE_2D) - ERR("Discarding %s %p sub-resource %u in the %s pool.\n", debug_d3dresourcetype(resource->type), - resource, i, debug_d3dpool(resource->pool)); + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU + || resource->type != WINED3D_RTYPE_TEXTURE_2D) + ERR("Discarding %s %p sub-resource %u with resource access %s.\n", + debug_d3dresourcetype(resource->type), resource, i, + wined3d_debug_resource_access(resource->access)); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); } -- 2.1.4

1 0

[PATCH 1/5] wined3d: Use the resource access flags in wined3d_texture_set_lod().
by Henri Verbeet Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f166c2a..03cf027 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1095,9 +1095,10 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) /* The d3d9:texture test shows that SetLOD is ignored on non-managed * textures. The call always returns 0, and GetLOD always returns 0. */ - if (texture->resource.pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(texture->resource.access)) { - TRACE("Ignoring SetLOD on %s texture, returning 0.\n", debug_d3dpool(texture->resource.pool)); + TRACE("Ignoring LOD on texture with resource access %s.\n", + wined3d_debug_resource_access(texture->resource.access)); return 0; } -- 2.1.4

1 0

[PATCH 4/4] msvcr100: Add _ReentrantPPLLock class implementation
by Piotr Caban Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 12 ++++----- dlls/msvcr100/msvcr100.spec | 12 ++++----- dlls/msvcr110/msvcr110.spec | 18 ++++++------- dlls/msvcr120/msvcr120.spec | 18 ++++++------- dlls/msvcr120_app/msvcr120_app.spec | 18 ++++++------- dlls/msvcrt/lock.c | 52 +++++++++++++++++++++++++++++++++++++ 6 files changed, 91 insertions(+), 39 deletions(-)

1 0

[PATCH 3/4] msvcr100: Add _NonReentrantPPLLock class implementation
by Piotr Caban Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/lock.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[PATCH 2/4] msvcr100: Use scoped_lock internal buffer when locking critical_section
by Piotr Caban Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/lock.c | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-)

1 0

[PATCH 1/4] msvcr100: Add _NonReentrantPPLLock@details class stub
by Piotr Caban Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 18 +++++++++--------- dlls/msvcr120/msvcr120.spec | 18 +++++++++--------- dlls/msvcr120_app/msvcr120_app.spec | 18 +++++++++--------- dlls/msvcrt/lock.c | 30 ++++++++++++++++++++++++++++++ 6 files changed, 69 insertions(+), 39 deletions(-)

1 0

[PATCH] msvcrt: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/lock.c | 1 + dlls/msvcrt/msvcrt.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index b8b8672314..583e4298d9 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "wine/heap.h" #include "msvcrt.h" #include "cppexcept.h" #include "mtdll.h" diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a380613077..65ced6d26d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1429,20 +1429,5 @@ typedef struct { _FPIEEE_VALUE Result; } _FPIEEE_RECORD, *_PFPIEEE_RECORD; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #define INHERIT_THREAD_PRIORITY 0xF000 #endif /* __WINE_MSVCRT_H */ -- 2.14.3

2 1

[PATCH] secur32: Print contents of LSA_STRING in traces.
by Dmitry Timoshkov Feb. 2, 2018

Feb. 2, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 3a99135a5e..6863df951b 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -58,6 +58,12 @@ struct lsa_connection DWORD magic; }; +static const char *debugstr_as(const LSA_STRING *str) +{ + if (!str) return "<null>"; + return debugstr_an(str->Buffer, str->Length); +} + NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id, PVOID in_buffer, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) @@ -136,7 +142,7 @@ NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, PHANDLE Token, PQUOTA_LIMITS Quotas, PNTSTATUS SubStatus) { FIXME("%p %p %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, - OriginName, LogonType, AuthenticationPackage, + debugstr_as(OriginName), LogonType, AuthenticationPackage, AuthenticationInformation, AuthenticationInformationLength, LocalGroups, SourceContext, ProfileBuffer, ProfileBufferLength, LogonId, Token, Quotas, SubStatus); @@ -158,7 +164,8 @@ static NTSTATUS NTAPI lsa_DeleteLogonSession(LUID *logon_id) static NTSTATUS NTAPI lsa_AddCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key, LSA_STRING *credentials) { - FIXME("%p,%u,%p,%p: stub\n", logon_id, package_id, primary_key, credentials); + FIXME("%p,%u,%s,%s: stub\n", logon_id, package_id, + debugstr_as(primary_key), debugstr_as(credentials)); return STATUS_NOT_IMPLEMENTED; } @@ -172,7 +179,7 @@ static NTSTATUS NTAPI lsa_GetCredentials(LUID *logon_id, ULONG package_id, ULONG static NTSTATUS NTAPI lsa_DeleteCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key) { - FIXME("%p,%#x,%p: stub\n", logon_id, package_id, primary_key); + FIXME("%p,%#x,%s: stub\n", logon_id, package_id, debugstr_as(primary_key)); return STATUS_NOT_IMPLEMENTED; } @@ -859,7 +866,7 @@ NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, { ULONG i; - TRACE("%p %p %p\n", lsa_handle, package_name, package_id); + TRACE("%p %s %p\n", lsa_handle, debugstr_as(package_name), package_id); for (i = 0; i < loaded_packages_count; i++) { -- 2.16.1

3 2