July 2016 - Wine-Commits - list.winehq.org

Michael Müller : kernel32/tests: Add tests for UnmapViewOfFile with unaligned pointer.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 38d49350072419fa38a5f376fe00ba5dcb9a6f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d49350072419fa38a5f376f… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 19 12:59:24 2016 +0200 kernel32/tests: Add tests for UnmapViewOfFile with unaligned pointer. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 37206b5..75d772b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -435,7 +435,7 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); - SetFilePointer( file, 4096, NULL, FILE_BEGIN ); + SetFilePointer( file, 12288, NULL, FILE_BEGIN ); SetEndOfFile( file ); /* read/write mapping */ @@ -994,6 +994,30 @@ static void test_MapViewOfFile(void) ok(info.State == MEM_FREE, "%#x != MEM_FREE\n", info.State); ok(info.Type == 0, "%#x != 0\n", info.Type); + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 12288, NULL ); + ok( mapping != NULL, "CreateFileMappingA failed with error %u\n", GetLastError() ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); + ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); + + ret = UnmapViewOfFile( (char *)ptr + 100 ); + ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); + ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); + + ret = UnmapViewOfFile( (char *)ptr + 4096 ); + todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); + if (!ret) UnmapViewOfFile( ptr ); + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); + ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); + + ret = UnmapViewOfFile( (char *)ptr + 4096 + 100 ); + todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); + if (!ret) UnmapViewOfFile( ptr ); + + CloseHandle(mapping); CloseHandle(file); DeleteFileA(testfile); }

1 0

Michael Stefaniuc : dmsynth: The DMSynth{, Sink} COM objects don' t support aggregation.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 91ba1a2561a0e7ef275538407e9ab862667a8517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ba1a2561a0e7ef275538407… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:50:58 2016 +0200 dmsynth: The DMSynth{,Sink} COM objects don't support aggregation. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/dmsynth_main.c | 7 +++++-- dlls/dmsynth/dmsynth_private.h | 4 ++-- dlls/dmsynth/synth.c | 4 ++-- dlls/dmsynth/synthsink.c | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index a95a613..1fb5157 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -32,7 +32,7 @@ LONG DMSYNTH_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl; /****************************************************************** @@ -84,7 +84,10 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index f056581..ed86ce0 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -50,8 +50,8 @@ typedef struct IDirectMusicSynthSinkImpl IDirectMusicSynthSinkImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicSynth8Impl implementation structure diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c5720ec..fceeebd 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -575,14 +575,14 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj, IUnknown *outer) +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { static const WCHAR descrW[] = {'M','i','c','r','o','s','o','f','t',' ', 'S','y','n','t','h','e','s','i','z','e','r',0}; IDirectMusicSynth8Impl *obj; HRESULT hr; - TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ppobj, outer); + TRACE("(%s, %p)\n", debugstr_guid(riid), ppobj); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); if (NULL == obj) { diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 18ef50f..4720e59 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -267,12 +267,12 @@ static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *obj; HRESULT hr; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p)\n", debugstr_guid(riid), ret_iface); *ret_iface = NULL;

1 0

Michael Müller : kernel32: In Win9x mode UnmapViewOfFile requires base address of a mapping.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 1b26d38095e7d710375657b64db80c7c858ebea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b26d38095e7d710375657b64… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 19 13:00:30 2016 +0200 kernel32: In Win9x mode UnmapViewOfFile requires base address of a mapping. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/virtual.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 37ab264..5733a42 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -576,7 +576,19 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, */ BOOL WINAPI UnmapViewOfFile( LPCVOID addr ) { - NTSTATUS status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr ); + NTSTATUS status; + + if (GetVersion() & 0x80000000) + { + MEMORY_BASIC_INFORMATION info; + if (!VirtualQuery( addr, &info, sizeof(info) ) || info.AllocationBase != addr) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } + } + + status = NtUnmapViewOfSection( GetCurrentProcess(), (void *)addr ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; }

1 0

Michael Stefaniuc : dmsynth: Lock/unlock the module only on creation/ desctruction.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 8ba03f8a986b439d3b5b46ce58be1333222c8155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba03f8a986b439d3b5b46ce5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 19 09:53:07 2016 +0200 dmsynth: Lock/unlock the module only on creation/desctruction. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synth.c | 7 +++---- dlls/dmsynth/synthsink.c | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index fceeebd..88ba53e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -72,8 +72,6 @@ static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(LPDIRECTMUSICSYNTH8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); - return ref; } @@ -88,10 +86,9 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(LPDIRECTMUSICSYNTH8 iface) if (This->pLatencyClock) IReferenceClock_Release(This->pLatencyClock); HeapFree(GetProcessHeap(), 0, This); + DMSYNTH_UnlockModule(); } - DMSYNTH_UnlockModule(); - return ref; } @@ -605,7 +602,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; strcpyW(obj->pCaps.wszDescription, descrW); + DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); IDirectMusicSynth8_Release(&obj->IDirectMusicSynth8_iface); + return hr; } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 4720e59..7d148b0 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -67,8 +67,6 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(LPDIRECTMUSICSYNTHSINK ifac TRACE("(%p)->(): new ref = %u\n", This, ref); - DMSYNTH_LockModule(); - return ref; } @@ -83,10 +81,9 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(LPDIRECTMUSICSYNTHSINK ifa if (This->latency_clock) IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); + DMSYNTH_UnlockModule(); } - DMSYNTH_UnlockModule(); - return ref; }

1 0

Józef Kucia : wined3d: Enable rendering to integer textures.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: a7e52707b0519d666304d80da67eb63131527136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e52707b0519d666304d80da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 18 13:27:39 2016 +0200 wined3d: Enable rendering to integer textures. 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/d3d10core/tests/device.c | 9 ++++++++- dlls/d3d11/tests/d3d11.c | 7 +++++++ dlls/wined3d/utils.c | 14 +++++++++----- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c84ea8d..7e161f5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1098,6 +1098,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 9, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, @@ -1113,7 +1115,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, - {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1125,10 +1127,15 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0bcf477..e20b99b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1519,6 +1519,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 9, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_SINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, @@ -1546,10 +1548,15 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_SINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 24e20ec..3406fdd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1246,11 +1246,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_R8G8B8A8_UINT, GL_RGBA8UI, GL_RGBA8UI, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RGB10_A2UI, NULL}, {WINED3DFMT_R8G8B8A8_SINT, GL_RGBA8I, GL_RGBA8I, 0, GL_RGBA_INTEGER, GL_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, EXT_TEXTURE_INTEGER, NULL}, {WINED3DFMT_R8G8B8X8_UNORM, GL_RGB8, GL_RGB8, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, @@ -1287,7 +1287,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_R16_UINT, GL_R16UI, GL_R16UI, 0, GL_RED_INTEGER, GL_UNSIGNED_SHORT, 0, - WINED3DFMT_FLAG_TEXTURE, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16_SINT, GL_R16I, GL_R16I, 0, + GL_RED_INTEGER, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, @@ -1480,11 +1484,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_DEPTH_BUFFER_FLOAT, convert_s8_uint_d24_float}, {WINED3DFMT_R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA32UI, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, EXT_TEXTURE_INTEGER, NULL}, {WINED3DFMT_R32G32B32A32_SINT, GL_RGBA32I, GL_RGBA32I, 0, GL_RGBA_INTEGER, GL_INT, 0, - WINED3DFMT_FLAG_TEXTURE, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, EXT_TEXTURE_INTEGER, NULL}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, GL_COMPRESSED_RED_RGTC1, GL_COMPRESSED_RED_RGTC1, 0,

1 0

Józef Kucia : d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM vertex format.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 36c82e6d49fedfe3c6aa3592058f3349c57db7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c82e6d49fedfe3c6aa35920… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 18 13:27:38 2016 +0200 d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM vertex format. 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/d3d10core/tests/device.c | 126 ++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 66 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index edfe27b..c84ea8d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8106,6 +8106,7 @@ static void test_input_assembler(void) LAYOUT_SINT8, LAYOUT_UNORM8, LAYOUT_SNORM8, + LAYOUT_UNORM10_2, LAYOUT_COUNT, }; @@ -8119,14 +8120,12 @@ static void test_input_assembler(void) ID3D10InputLayout *input_layout[LAYOUT_COUNT]; struct d3d10core_test_context test_context; ID3D10Buffer *vb_position, *vb_attribute; - unsigned int i, x, y, max_data_size; D3D10_TEXTURE2D_DESC texture_desc; + unsigned int i, j, stride, offset; ID3D10Texture2D *render_target; ID3D10RenderTargetView *rtv; - struct texture_readback rb; ID3D10PixelShader *ps; ID3D10Device *device; - UINT stride, offset; HRESULT hr; static const DXGI_FORMAT layout_formats[LAYOUT_COUNT] = @@ -8140,6 +8139,7 @@ static void test_input_assembler(void) DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, + DXGI_FORMAT_R10G10B10A2_UNORM, }; static const struct { @@ -8250,63 +8250,70 @@ static void test_input_assembler(void) 0x00000000, 0x00101e46, 0x00000000, 0x0500002b, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, 0x0100003e, }; - static const float float32_data[] = - { - 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, - }; - static const unsigned short uint16_data[] = - { - 6, 8, 55, 777, 6, 8, 55, 777, 6, 8, 55, 777, 6, 8, 55, 777, - }; - static const short sint16_data[] = - { - -1, 33, 8, -77, -1, 33, 8, -77, -1, 33, 8, -77, -1, 33, 8, -77, - }; - static const unsigned short unorm16_data[] = - { - 0, 16383, 32767, 65535, 0, 16383, 32767, 65535, 0, 16383, 32767, 65535, 0, 16383, 32767, 65535, - }; - static const short snorm16_data[] = - { - -32768, 0, 32767, 0, -32768, 0, 32767, 0, -32768, 0, 32767, 0, -32768, 0, 32767, 0, - }; - static const unsigned char uint8_data[] = - { - 0, 64, 128, 255, 0, 64, 128, 255, 0, 64, 128, 255, 0, 64, 128, 255, - }; - static const signed char sint8_data[] = - { - -128, 0, 127, 64, -128, 0, 127, 64, -128, 0, 127, 64, -128, 0, 127, 64, - }; + static const float float32_data[] = {1.0f, 2.0f, 3.0f, 4.0f}; + static const unsigned short uint16_data[] = {6, 8, 55, 777}; + static const short sint16_data[] = {-1, 33, 8, -77}; + static const unsigned short unorm16_data[] = {0, 16383, 32767, 65535}; + static const short snorm16_data[] = {-32768, 0, 32767, 0}; + static const unsigned char uint8_data[] = {0, 64, 128, 255}; + static const signed char sint8_data[] = {-128, 0, 127, 64}; + static const unsigned int uint32_zero = 0; + static const unsigned int uint32_max = 0xffffffff; + static const unsigned int unorm10_2_data= 0xa00003ff; + static const unsigned int g10_data = 0x000ffc00; + static const unsigned int a2_data = 0xc0000000; static const struct { enum layout_id layout_id; unsigned int stride; - unsigned int data_size; const void *data; struct vec4 expected_color; BOOL todo; } tests[] = { - {LAYOUT_FLOAT32, 4 * sizeof(*float32_data), sizeof(float32_data), float32_data, + {LAYOUT_FLOAT32, sizeof(float32_data), float32_data, {1.0f, 2.0f, 3.0f, 4.0f}}, - {LAYOUT_UINT16, 4 * sizeof(*uint16_data), sizeof(uint16_data), uint16_data, + {LAYOUT_UINT16, sizeof(uint16_data), uint16_data, {6.0f, 8.0f, 55.0f, 777.0f}, TRUE}, - {LAYOUT_SINT16, 4 * sizeof(*sint16_data), sizeof(sint16_data), sint16_data, + {LAYOUT_SINT16, sizeof(sint16_data), sint16_data, {-1.0f, 33.0f, 8.0f, -77.0f}, TRUE}, - {LAYOUT_UNORM16, 4 * sizeof(*unorm16_data), sizeof(unorm16_data), unorm16_data, + {LAYOUT_UNORM16, sizeof(unorm16_data), unorm16_data, {0.0f, 16383.0f / 65535.0f, 32767.0f / 65535.0f, 1.0f}}, - {LAYOUT_SNORM16, 4 * sizeof(*snorm16_data), sizeof(snorm16_data), snorm16_data, + {LAYOUT_SNORM16, sizeof(snorm16_data), snorm16_data, {-1.0f, 0.0f, 1.0f, 0.0f}}, - {LAYOUT_UINT8, 4 * sizeof(*uint8_data), sizeof(uint8_data), uint8_data, + {LAYOUT_UINT8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT8, sizeof(uint32_max), &uint32_max, + {255.0f, 255.0f, 255.0f, 255.0f}}, + {LAYOUT_UINT8, sizeof(uint8_data), uint8_data, {0.0f, 64.0f, 128.0f, 255.0f}}, - {LAYOUT_SINT8, 4 * sizeof(*sint8_data), sizeof(sint8_data), sint8_data, + {LAYOUT_SINT8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_SINT8, sizeof(uint32_max), &uint32_max, + {-1.0f, -1.0f, -1.0f, -1.0f}}, + {LAYOUT_SINT8, sizeof(sint8_data), sint8_data, {-128.0f, 0.0f, 127.0f, 64.0f}}, - {LAYOUT_UNORM8, 4 * sizeof(*uint8_data), sizeof(uint8_data), uint8_data, + {LAYOUT_UNORM8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UNORM8, sizeof(uint32_max), &uint32_max, + {1.0f, 1.0f, 1.0f, 1.0f}}, + {LAYOUT_UNORM8, sizeof(uint8_data), uint8_data, {0.0f, 64.0f / 255.0f, 128.0f / 255.0f, 1.0f}}, - {LAYOUT_SNORM8, 4 * sizeof(*sint8_data), sizeof(sint8_data), sint8_data, + {LAYOUT_SNORM8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_SNORM8, sizeof(sint8_data), sint8_data, {-1.0f, 0.0f, 1.0f, 64.0f / 127.0f}}, + {LAYOUT_UNORM10_2, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UNORM10_2, sizeof(uint32_max), &uint32_max, + {1.0f, 1.0f, 1.0f, 1.0f}}, + {LAYOUT_UNORM10_2, sizeof(g10_data), &g10_data, + {0.0f, 1.0f, 0.0f, 0.0f}}, + {LAYOUT_UNORM10_2, sizeof(a2_data), &a2_data, + {0.0f, 0.0f, 0.0f, 1.0f}}, + {LAYOUT_UNORM10_2, sizeof(unorm10_2_data), &unorm10_2_data, + {1.0f, 0.0f, 512.0f / 1023.0f, 2.0f / 3.0f}}, }; if (!init_test_context(&test_context)) @@ -8333,15 +8340,8 @@ static void test_input_assembler(void) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", layout_formats[i], hr); } - max_data_size = 0; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) - { - if (tests[i].data_size > max_data_size) - max_data_size = tests[i].data_size; - } - vb_position = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); - vb_attribute = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, max_data_size, NULL); + vb_attribute = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, 1024, NULL); texture_desc.Width = 640; texture_desc.Height = 480; @@ -8371,14 +8371,19 @@ static void test_input_assembler(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { D3D10_BOX box = {0, 0, 0, 1, 1, 1}; - const struct vec4 *color; assert(tests[i].layout_id < LAYOUT_COUNT); ID3D10Device_IASetInputLayout(device, input_layout[tests[i].layout_id]); - box.right = tests[i].data_size; - ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb_attribute, 0, - &box, tests[i].data, 0, 0); + assert(4 * tests[i].stride <= 1024); + box.right = tests[i].stride; + for (j = 0; j < 4; ++j) + { + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb_attribute, 0, + &box, tests[i].data, 0, 0); + box.left += tests[i].stride; + box.right += tests[i].stride; + } stride = tests[i].stride; ID3D10Device_IASetVertexBuffers(device, 1, 1, &vb_attribute, &stride, &offset); @@ -8400,6 +8405,7 @@ static void test_input_assembler(void) case DXGI_FORMAT_R32G32B32A32_FLOAT: case DXGI_FORMAT_R16G16B16A16_UNORM: case DXGI_FORMAT_R16G16B16A16_SNORM: + case DXGI_FORMAT_R10G10B10A2_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_SNORM: ID3D10Device_VSSetShader(device, vs_float); @@ -8407,19 +8413,7 @@ static void test_input_assembler(void) } ID3D10Device_Draw(device, 4, 0); - - get_texture_readback(render_target, 0, &rb); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) - { - color = get_readback_vec4(&rb, x, y); - ok(compare_vec4(color, &tests[i].expected_color, 2), - "Test %u: Got unexpected color {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - i, color->x, color->y, color->z, color->w, x, y); - } - } - release_texture_readback(&rb); + check_texture_vec4(render_target, &tests[i].expected_color, 2); } ID3D10Texture2D_Release(render_target);

1 0

Józef Kucia : d3d11/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM vertex format.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: aae0628ba7c59a1fc05e2b5081f2a1405e7314b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae0628ba7c59a1fc05e2b508… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 18 13:27:37 2016 +0200 d3d11/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM vertex format. 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/d3d11/tests/d3d11.c | 126 ++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 66 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a83f622..0bcf477 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8429,6 +8429,7 @@ static void test_input_assembler(void) LAYOUT_SINT8, LAYOUT_UNORM8, LAYOUT_SNORM8, + LAYOUT_UNORM10_2, LAYOUT_COUNT, }; @@ -8442,15 +8443,13 @@ static void test_input_assembler(void) ID3D11InputLayout *input_layout[LAYOUT_COUNT]; ID3D11Buffer *vb_position, *vb_attribute; struct d3d11_test_context test_context; - unsigned int i, x, y, max_data_size; D3D11_TEXTURE2D_DESC texture_desc; + unsigned int i, j, stride, offset; ID3D11Texture2D *render_target; ID3D11DeviceContext *context; ID3D11RenderTargetView *rtv; - struct texture_readback rb; ID3D11PixelShader *ps; ID3D11Device *device; - UINT stride, offset; HRESULT hr; static const DXGI_FORMAT layout_formats[LAYOUT_COUNT] = @@ -8464,6 +8463,7 @@ static void test_input_assembler(void) DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, + DXGI_FORMAT_R10G10B10A2_UNORM, }; static const struct { @@ -8574,63 +8574,70 @@ static void test_input_assembler(void) 0x00000000, 0x00101e46, 0x00000000, 0x0500002b, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, 0x0100003e, }; - static const float float32_data[] = - { - 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, - }; - static const unsigned short uint16_data[] = - { - 6, 8, 55, 777, 6, 8, 55, 777, 6, 8, 55, 777, 6, 8, 55, 777, - }; - static const short sint16_data[] = - { - -1, 33, 8, -77, -1, 33, 8, -77, -1, 33, 8, -77, -1, 33, 8, -77, - }; - static const unsigned short unorm16_data[] = - { - 0, 16383, 32767, 65535, 0, 16383, 32767, 65535, 0, 16383, 32767, 65535, 0, 16383, 32767, 65535, - }; - static const short snorm16_data[] = - { - -32768, 0, 32767, 0, -32768, 0, 32767, 0, -32768, 0, 32767, 0, -32768, 0, 32767, 0, - }; - static const unsigned char uint8_data[] = - { - 0, 64, 128, 255, 0, 64, 128, 255, 0, 64, 128, 255, 0, 64, 128, 255, - }; - static const signed char sint8_data[] = - { - -128, 0, 127, 64, -128, 0, 127, 64, -128, 0, 127, 64, -128, 0, 127, 64, - }; + static const float float32_data[] = {1.0f, 2.0f, 3.0f, 4.0f}; + static const unsigned short uint16_data[] = {6, 8, 55, 777}; + static const short sint16_data[] = {-1, 33, 8, -77}; + static const unsigned short unorm16_data[] = {0, 16383, 32767, 65535}; + static const short snorm16_data[] = {-32768, 0, 32767, 0}; + static const unsigned char uint8_data[] = {0, 64, 128, 255}; + static const signed char sint8_data[] = {-128, 0, 127, 64}; + static const unsigned int uint32_zero = 0; + static const unsigned int uint32_max = 0xffffffff; + static const unsigned int unorm10_2_data= 0xa00003ff; + static const unsigned int g10_data = 0x000ffc00; + static const unsigned int a2_data = 0xc0000000; static const struct { enum layout_id layout_id; unsigned int stride; - unsigned int data_size; const void *data; struct vec4 expected_color; BOOL todo; } tests[] = { - {LAYOUT_FLOAT32, 4 * sizeof(*float32_data), sizeof(float32_data), float32_data, + {LAYOUT_FLOAT32, sizeof(float32_data), float32_data, {1.0f, 2.0f, 3.0f, 4.0f}}, - {LAYOUT_UINT16, 4 * sizeof(*uint16_data), sizeof(uint16_data), uint16_data, + {LAYOUT_UINT16, sizeof(uint16_data), uint16_data, {6.0f, 8.0f, 55.0f, 777.0f}, TRUE}, - {LAYOUT_SINT16, 4 * sizeof(*sint16_data), sizeof(sint16_data), sint16_data, + {LAYOUT_SINT16, sizeof(sint16_data), sint16_data, {-1.0f, 33.0f, 8.0f, -77.0f}, TRUE}, - {LAYOUT_UNORM16, 4 * sizeof(*unorm16_data), sizeof(unorm16_data), unorm16_data, + {LAYOUT_UNORM16, sizeof(unorm16_data), unorm16_data, {0.0f, 16383.0f / 65535.0f, 32767.0f / 65535.0f, 1.0f}}, - {LAYOUT_SNORM16, 4 * sizeof(*snorm16_data), sizeof(snorm16_data), snorm16_data, + {LAYOUT_SNORM16, sizeof(snorm16_data), snorm16_data, {-1.0f, 0.0f, 1.0f, 0.0f}}, - {LAYOUT_UINT8, 4 * sizeof(*uint8_data), sizeof(uint8_data), uint8_data, + {LAYOUT_UINT8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT8, sizeof(uint32_max), &uint32_max, + {255.0f, 255.0f, 255.0f, 255.0f}}, + {LAYOUT_UINT8, sizeof(uint8_data), uint8_data, {0.0f, 64.0f, 128.0f, 255.0f}}, - {LAYOUT_SINT8, 4 * sizeof(*sint8_data), sizeof(sint8_data), sint8_data, + {LAYOUT_SINT8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_SINT8, sizeof(uint32_max), &uint32_max, + {-1.0f, -1.0f, -1.0f, -1.0f}}, + {LAYOUT_SINT8, sizeof(sint8_data), sint8_data, {-128.0f, 0.0f, 127.0f, 64.0f}}, - {LAYOUT_UNORM8, 4 * sizeof(*uint8_data), sizeof(uint8_data), uint8_data, + {LAYOUT_UNORM8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UNORM8, sizeof(uint32_max), &uint32_max, + {1.0f, 1.0f, 1.0f, 1.0f}}, + {LAYOUT_UNORM8, sizeof(uint8_data), uint8_data, {0.0f, 64.0f / 255.0f, 128.0f / 255.0f, 1.0f}}, - {LAYOUT_SNORM8, 4 * sizeof(*sint8_data), sizeof(sint8_data), sint8_data, + {LAYOUT_SNORM8, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_SNORM8, sizeof(sint8_data), sint8_data, {-1.0f, 0.0f, 1.0f, 64.0f / 127.0f}}, + {LAYOUT_UNORM10_2, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UNORM10_2, sizeof(uint32_max), &uint32_max, + {1.0f, 1.0f, 1.0f, 1.0f}}, + {LAYOUT_UNORM10_2, sizeof(g10_data), &g10_data, + {0.0f, 1.0f, 0.0f, 0.0f}}, + {LAYOUT_UNORM10_2, sizeof(a2_data), &a2_data, + {0.0f, 0.0f, 0.0f, 1.0f}}, + {LAYOUT_UNORM10_2, sizeof(unorm10_2_data), &unorm10_2_data, + {1.0f, 0.0f, 512.0f / 1023.0f, 2.0f / 3.0f}}, }; if (!init_test_context(&test_context, NULL)) @@ -8658,15 +8665,8 @@ static void test_input_assembler(void) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", layout_formats[i], hr); } - max_data_size = 0; - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) - { - if (tests[i].data_size > max_data_size) - max_data_size = tests[i].data_size; - } - vb_position = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(quad), quad); - vb_attribute = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, max_data_size, NULL); + vb_attribute = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, 1024, NULL); texture_desc.Width = 640; texture_desc.Height = 480; @@ -8696,14 +8696,19 @@ static void test_input_assembler(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { D3D11_BOX box = {0, 0, 0, 1, 1, 1}; - const struct vec4 *color; assert(tests[i].layout_id < LAYOUT_COUNT); ID3D11DeviceContext_IASetInputLayout(context, input_layout[tests[i].layout_id]); - box.right = tests[i].data_size; - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)vb_attribute, 0, - &box, tests[i].data, 0, 0); + assert(4 * tests[i].stride <= 1024); + box.right = tests[i].stride; + for (j = 0; j < 4; ++j) + { + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)vb_attribute, 0, + &box, tests[i].data, 0, 0); + box.left += tests[i].stride; + box.right += tests[i].stride; + } stride = tests[i].stride; ID3D11DeviceContext_IASetVertexBuffers(context, 1, 1, &vb_attribute, &stride, &offset); @@ -8725,6 +8730,7 @@ static void test_input_assembler(void) case DXGI_FORMAT_R32G32B32A32_FLOAT: case DXGI_FORMAT_R16G16B16A16_UNORM: case DXGI_FORMAT_R16G16B16A16_SNORM: + case DXGI_FORMAT_R10G10B10A2_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_SNORM: ID3D11DeviceContext_VSSetShader(context, vs_float, NULL, 0); @@ -8732,19 +8738,7 @@ static void test_input_assembler(void) } ID3D11DeviceContext_Draw(context, 4, 0); - - get_texture_readback(render_target, 0, &rb); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) - { - color = get_readback_vec4(&rb, x, y); - ok(compare_vec4(color, &tests[i].expected_color, 2), - "Test %u: Got unexpected color {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - i, color->x, color->y, color->z, color->w, x, y); - } - } - release_texture_readback(&rb); + check_texture_vec4(render_target, &tests[i].expected_color, 2); } ID3D11Texture2D_Release(render_target);

1 0

Józef Kucia : wined3d: Add support for WINEDFMT_R10G10B10A2_UNORM vertex format.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 77c4bd0aa90e05c0edf06fe256eff9298f6d61cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c4bd0aa90e05c0edf06fe25… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 18 13:27:36 2016 +0200 wined3d: Add support for WINEDFMT_R10G10B10A2_UNORM vertex format. 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/wined3d/utils.c | 70 +++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 522a891..24e20ec 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -329,41 +329,44 @@ struct wined3d_format_vertex_info unsigned int component_count; GLenum gl_vtx_type; GLboolean gl_normalized; + enum wined3d_gl_extension extension; }; static const struct wined3d_format_vertex_info format_vertex_info[] = { - {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, GL_FALSE}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE }, - {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, GL_FALSE}, - {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, GL_TRUE }, - {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, GL_TRUE }, - {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, GL_FALSE}, - {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, - {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, - {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, - {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, - {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE}, - {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT, GL_FALSE}, - {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT, GL_FALSE}, - {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, - {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32_FLOAT, WINED3D_FFP_EMIT_FLOAT1, 1, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_R32G32_FLOAT, WINED3D_FFP_EMIT_FLOAT2, 2, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_R32G32B32_FLOAT, WINED3D_FFP_EMIT_FLOAT3, 3, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3D_FFP_EMIT_FLOAT4, 4, GL_FLOAT, GL_FALSE}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_FFP_EMIT_D3DCOLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE }, + {WINED3DFMT_R8G8B8A8_UINT, WINED3D_FFP_EMIT_UBYTE4, 4, GL_UNSIGNED_BYTE, GL_FALSE}, + {WINED3DFMT_R16G16_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R16G16_SINT, WINED3D_FFP_EMIT_SHORT2, 2, GL_SHORT, GL_FALSE}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3D_FFP_EMIT_SHORT4, 4, GL_SHORT, GL_FALSE}, + {WINED3DFMT_R8G8B8A8_UNORM, WINED3D_FFP_EMIT_UBYTE4N, 4, GL_UNSIGNED_BYTE, GL_TRUE }, + {WINED3DFMT_R16G16_SNORM, WINED3D_FFP_EMIT_SHORT2N, 2, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, 4, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, 2, GL_UNSIGNED_SHORT, GL_TRUE }, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, 4, GL_UNSIGNED_SHORT, GL_TRUE }, + {WINED3DFMT_R10G10B10A2_UINT, WINED3D_FFP_EMIT_UDEC3, 3, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R10G10B10A2_SNORM, WINED3D_FFP_EMIT_DEC3N, 3, GL_SHORT, GL_TRUE }, + {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT_2_10_10_10_REV, GL_TRUE, + ARB_VERTEX_TYPE_2_10_10_10_REV}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, 2, GL_HALF_FLOAT, GL_FALSE}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_HALF_FLOAT, GL_FALSE}, + {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_TRUE }, + {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_BYTE, GL_FALSE}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_BYTE, GL_FALSE}, + {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_BYTE, GL_FALSE}, + {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_SHORT, GL_FALSE}, + {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_SHORT, GL_FALSE}, + {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, 1, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32_SINT, WINED3D_FFP_EMIT_INVALID, 1, GL_INT, GL_FALSE}, + {WINED3DFMT_R32G32_UINT, WINED3D_FFP_EMIT_INVALID, 2, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, + {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, }; struct wined3d_format_texture_info @@ -3273,6 +3276,8 @@ static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int co return component_count * sizeof(GLint); case GL_UNSIGNED_INT: return component_count * sizeof(GLuint); + case GL_UNSIGNED_INT_2_10_10_10_REV: + return sizeof(GLuint); default: FIXME("Unhandled GL type %#x.\n", type); return 0; @@ -3295,6 +3300,9 @@ static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) return FALSE; } + if (!gl_info->supported[format_vertex_info[i].extension]) + continue; + format = &gl_info->formats[fmt_idx]; format->emit_idx = format_vertex_info[i].emit_idx; format->component_count = format_vertex_info[i].component_count;

1 0

Józef Kucia : wined3d: Store vertex attribute size instead of component size in wined3d_format.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 8c0ddf9827f6dff75c3204b107802a0ec3fa7611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0ddf9827f6dff75c3204b10… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 18 13:27:35 2016 +0200 wined3d: Store vertex attribute size instead of component size in wined3d_format. 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/wined3d/buffer.c | 15 +++++++-------- dlls/wined3d/utils.c | 23 ++++++++++++----------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 674daec..79d1246 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -210,7 +210,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, const enum wined3d_buffer_conversion_type conversion_type, const struct wined3d_stream_info_element *attrib, DWORD *stride_this_run) { - DWORD attrib_size; + const struct wined3d_format *format = attrib->format; BOOL ret = FALSE; unsigned int i; DWORD_PTR data; @@ -222,12 +222,12 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, */ if (!attrib->stride) { - FIXME("%s used with stride 0, let's hope we get the vertex stride from somewhere else\n", - debug_d3dformat(attrib->format->id)); + FIXME("%s used with stride 0, let's hope we get the vertex stride from somewhere else.\n", + debug_d3dformat(format->id)); } - else if(attrib->stride != *stride_this_run && *stride_this_run) + else if (attrib->stride != *stride_this_run && *stride_this_run) { - FIXME("Got two concurrent strides, %d and %d\n", attrib->stride, *stride_this_run); + FIXME("Got two concurrent strides, %d and %d.\n", attrib->stride, *stride_this_run); } else { @@ -237,7 +237,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, /* We rely that this happens only on the first converted attribute that is found, * if at all. See above check */ - TRACE("Reconverting because converted attributes occur, and the stride changed\n"); + TRACE("Reconverting because converted attributes occur, and the stride changed.\n"); buffer->stride = *stride_this_run; HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, buffer->conversion_map); buffer->conversion_map = wined3d_calloc(buffer->stride, sizeof(*buffer->conversion_map)); @@ -246,8 +246,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, } data = ((DWORD_PTR)attrib->data.addr) % buffer->stride; - attrib_size = attrib->format->component_count * attrib->format->component_size; - for (i = 0; i < attrib_size; ++i) + for (i = 0; i < format->attribute_size; ++i) { DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e1a7952..522a891 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3253,26 +3253,26 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } -static unsigned int gl_type_size(GLenum type) +static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) { switch (type) { case GL_HALF_FLOAT: - return sizeof(GLhalfNV); + return component_count * sizeof(GLhalfNV); case GL_FLOAT: - return sizeof(GLfloat); + return component_count * sizeof(GLfloat); case GL_BYTE: - return sizeof(GLbyte); + return component_count * sizeof(GLbyte); case GL_UNSIGNED_BYTE: - return sizeof(GLubyte); + return component_count * sizeof(GLubyte); case GL_SHORT: - return sizeof(GLshort); + return component_count * sizeof(GLshort); case GL_UNSIGNED_SHORT: - return sizeof(GLushort); + return component_count * sizeof(GLushort); case GL_INT: - return sizeof(GLint); + return component_count * sizeof(GLint); case GL_UNSIGNED_INT: - return sizeof(GLuint); + return component_count * sizeof(GLuint); default: FIXME("Unhandled GL type %#x.\n", type); return 0; @@ -3301,9 +3301,10 @@ static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; format->gl_vtx_format = format_vertex_info[i].component_count; format->gl_normalized = format_vertex_info[i].gl_normalized; - if (!(format->component_size = gl_type_size(format_vertex_info[i].gl_vtx_type))) + if (!(format->attribute_size = calculate_vertex_attribute_size(format->gl_vtx_type, + format->component_count))) { - ERR("Invalid component size for vertex format %s (%#x).\n", + ERR("Invalid attribute size for vertex format %s (%#x).\n", debug_d3dformat(format_vertex_info[i].id), format_vertex_info[i].id); return FALSE; } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c8704e9..70c2d98 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -315,7 +315,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].usage_idx = usage_idx; format = wined3d_get_format(state->gl_info, format_id); - state->offset += format->component_count * format->component_size; + state->offset += format->attribute_size; ++state->idx; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb71740..b400994 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3630,7 +3630,7 @@ struct wined3d_format GLenum gl_vtx_type; GLint gl_vtx_format; GLboolean gl_normalized; - unsigned int component_size; + unsigned int attribute_size; GLint glInternal; GLint glGammaInternal;

1 0

Michael Müller : ntdll: NtUnmapViewOfSection should succeed for all offsets within the mapped range.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: 1311c8157be3e007b6de5a44df9171e940badb3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1311c8157be3e007b6de5a44d… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Jul 19 12:59:55 2016 +0200 ntdll: NtUnmapViewOfSection should succeed for all offsets within the mapped range. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 6 ++---- dlls/ntdll/tests/info.c | 6 +++--- dlls/ntdll/virtual.c | 3 +-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 75d772b..170ab7b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1007,15 +1007,13 @@ static void test_MapViewOfFile(void) ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); ret = UnmapViewOfFile( (char *)ptr + 4096 ); - todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); - if (!ret) UnmapViewOfFile( ptr ); + ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 12288 ); ok( ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError() ); ret = UnmapViewOfFile( (char *)ptr + 4096 + 100 ); - todo_wine ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); - if (!ret) UnmapViewOfFile( ptr ); + ok( ret, "UnmapViewOfFile failed with error %u\n", GetLastError() ); CloseHandle(mapping); CloseHandle(file); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index be355fb..19c7d66 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1643,7 +1643,7 @@ static void test_mapprotection(void) status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status); - size.u.LowPart = 0x1000; + size.u.LowPart = 0x2000; size.u.HighPart = 0; status = pNtCreateSection ( &h, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE, @@ -1657,7 +1657,7 @@ static void test_mapprotection(void) offset.u.LowPart = 0; offset.u.HighPart = 0; - count = 0x1000; + count = 0x2000; addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); @@ -1680,7 +1680,7 @@ static void test_mapprotection(void) ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); ok((info.Protect & ~PAGE_NOCACHE) == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); - status = pNtUnmapViewOfSection (GetCurrentProcess(), addr); + status = pNtUnmapViewOfSection( GetCurrentProcess(), (char *)addr + 0x1050 ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); pNtClose (h); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 2e63b78..1e692c7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2737,7 +2737,6 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) struct file_view *view; NTSTATUS status = STATUS_NOT_MAPPED_VIEW; sigset_t sigset; - void *base = ROUND_ADDR( addr, page_mask ); if (process != NtCurrentProcess()) { @@ -2754,7 +2753,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) } server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base, 0 )) && (base == view->base) && !(view->protect & VPROT_VALLOC)) + if ((view = VIRTUAL_FindView( addr, 0 )) && !(view->protect & VPROT_VALLOC)) { delete_view( view ); status = STATUS_SUCCESS;

1 0