June 2019 - Wine-commits - list.winehq.org

Jactry Zeng : d3d9/tests: Add tests for 32-bit depth format support.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: f090548ef251662c5a856d86fae2060dc5b17879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f090548ef251662c5a856d86… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:43 2019 +0430 d3d9/tests: Add tests for 32-bit depth format support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f5c8972..c59b1f7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11833,6 +11833,16 @@ static void test_check_device_format(void) } } + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); }

1 0

Jactry Zeng : ddraw/tests: Add tests for 32-bit depth format support.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: db0dd1561848e50b3e0628dffd04846bc88aa8ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=db0dd1561848e50b3e0628df… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:44 2019 +0430 ddraw/tests: Add tests for 32-bit depth format support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 214 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db0dd1561848e50b3e06…

1 0

Jactry Zeng : wined3d: Drop support for WINED3DFMT_D32_UNORM.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: c5577721b909f8c70d3723cae561e9594902df26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5577721b909f8c70d3723ca… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:45 2019 +0430 wined3d: Drop support for WINED3DFMT_D32_UNORM. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- dlls/ddraw/tests/ddraw1.c | 10 +--------- dlls/ddraw/tests/ddraw2.c | 10 +--------- dlls/ddraw/tests/ddraw4.c | 10 +--------- dlls/ddraw/tests/ddraw7.c | 10 +--------- dlls/wined3d/utils.c | 13 ++++--------- 7 files changed, 12 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 03eb695..1e7b988 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8263,12 +8263,12 @@ static void test_check_device_format(void) hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); IDirect3D8_Release(d3d); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c59b1f7..f05aded 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11835,12 +11835,12 @@ static void test_check_device_format(void) hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7f5e697..b28f1d7 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12903,9 +12903,7 @@ static void test_d32_support(void) { IDirectDrawSurface *surface; DDSURFACEDESC surface_desc; - IDirect3DDevice *device; IDirectDraw *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -12913,12 +12911,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(ddraw, window, DDSCL_NORMAL))) - { - IDirect3DDevice_Release(device); - hw = TRUE; - } - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -12939,7 +12931,7 @@ static void test_d32_support(void) ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags); ok(U2(surface_desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 75b848d..f25cdd8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13779,9 +13779,7 @@ static void test_d32_support(void) { IDirectDrawSurface *surface; DDSURFACEDESC surface_desc; - IDirect3DDevice2 *device; IDirectDraw2 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -13789,12 +13787,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(ddraw, window, DDSCL_NORMAL))) - { - IDirect3DDevice2_Release(device); - hw = TRUE; - } - hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -13815,7 +13807,7 @@ static void test_d32_support(void) ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags); ok(U2(surface_desc).dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b06e8db..bc58c18 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16339,9 +16339,7 @@ static void test_d32_support(void) { IDirectDrawSurface4 *surface; DDSURFACEDESC2 surface_desc; - IDirect3DDevice3 *device; IDirectDraw4 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -16349,12 +16347,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(window, DDSCL_NORMAL))) - { - IDirect3DDevice3_Release(device); - hw = TRUE; - } - hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -16382,7 +16374,7 @@ static void test_d32_support(void) "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth); ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 137270e..49aab66 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16293,9 +16293,7 @@ static void test_d32_support(void) { IDirectDrawSurface7 *surface; DDSURFACEDESC2 surface_desc; - IDirect3DDevice7 *device; IDirectDraw7 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -16303,12 +16301,6 @@ static void test_d32_support(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - if ((device = create_device(window, DDSCL_NORMAL))) - { - IDirect3DDevice7_Release(device); - hw = TRUE; - } - hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -16336,7 +16328,7 @@ static void test_d32_support(void) "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth); ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); - todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface7_Release(surface); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 44b6c48..0872b10 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1270,7 +1270,10 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers return NULL; } -/* The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set: +/* We intentionally don't support WINED3DFMT_D32_UNORM. No hardware driver + * supports it, and applications get confused when we do. + * + * The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set: * * These are never supported on native. * WINED3DFMT_B8G8R8_UNORM @@ -1777,14 +1780,6 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,

1 0

Zhiyi Zhang : dxgi/tests: Add more IDXGISwapChain_Present() tests.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 9b668792a936e89acdc3310aecf1820c0df8f3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b668792a936e89acdc3310a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 02:47:46 2019 +0430 dxgi/tests: Add more IDXGISwapChain_Present() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b668792a936e89acdc3…

1 0

Józef Kucia : vkd3d-shader: Avoid multiple PrimitiveId declarations in hull shaders.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: vkd3d Branch: master Commit: 3172faf61282f934d928683f423e4742bcc25baf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3172faf61282f934d928683… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 25 14:30:11 2019 +0200 vkd3d-shader: Avoid multiple PrimitiveId declarations in hull shaders. 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> --- libs/vkd3d-shader/spirv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 73d2661..ee40953 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4047,6 +4047,7 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * const struct vkd3d_shader_register *reg = &dst->reg; const struct vkd3d_spirv_builtin *builtin; struct vkd3d_symbol reg_symbol; + struct rb_entry *entry; uint32_t input_id; assert(!reg->idx[0].rel_addr); @@ -4059,9 +4060,13 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * return; } + /* vPrim may be declared in multiple hull shader phases. */ + vkd3d_symbol_make_register(&reg_symbol, reg); + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + return; + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); - vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, input_id, SpvStorageClassInput, builtin->component_type, vkd3d_write_mask_from_component_count(builtin->component_count)); reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size;

1 0

Józef Kucia : tests: Print adapter name on Windows.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: vkd3d Branch: master Commit: 678658086d62c23a821d9ef41d8f7f7d4e7e5cd2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=678658086d62c23a821d9ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 25 14:30:12 2019 +0200 tests: Print adapter name on Windows. 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> --- tests/d3d12_crosstest.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 22844ab..fbc0e3d 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -297,9 +297,11 @@ static ID3D12Device *create_device(void) static void init_adapter_info(void) { + char name[MEMBER_SIZE(DXGI_ADAPTER_DESC, Description)]; IDXGIAdapter *dxgi_adapter; DXGI_ADAPTER_DESC desc; IUnknown *adapter; + unsigned int i; HRESULT hr; if (!(adapter = create_adapter())) @@ -312,7 +314,12 @@ static void init_adapter_info(void) hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); - trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + /* FIXME: Use debugstr_w(). */ + for (i = 0; i < ARRAY_SIZE(desc.Description) && isprint(desc.Description[i]); ++i) + name[i] = desc.Description[i]; + name[min(i, ARRAY_SIZE(name) - 1)] = '\0'; + + trace("Adapter: %s, %04x:%04x.\n", name, desc.VendorId, desc.DeviceId); if (desc.VendorId == 0x1414 && desc.DeviceId == 0x008c) {

1 0

Alexandre Julliard : advapi32: Move MD4 implementation to ntdll.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 5768fd6dd25e1eea9a58c22f8909d8ec6db6f112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5768fd6dd25e1eea9a58c22f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 14:47:55 2019 +0200 advapi32: Move MD4 implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 6 +- dlls/advapi32/crypt.c | 65 +++++++++ dlls/advapi32/crypt_md4.c | 326 -------------------------------------------- dlls/ntdll/crypt.c | 244 +++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 3 + 6 files changed, 315 insertions(+), 330 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5768fd6dd25e1eea9a58…

1 0

Alexandre Julliard : advapi32: Move MD5 implementation to ntdll.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: d5249c0f6d4df715a4f273536264b61914015511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5249c0f6d4df715a4f27353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 14:51:40 2019 +0200 advapi32: Move MD5 implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 6 +- dlls/advapi32/crypt_md5.c | 279 -------------------------------------------- dlls/ntdll/crypt.c | 241 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 3 + 5 files changed, 247 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5249c0f6d4df715a4f2…

1 0

Jacek Caban : ntoskrnl.exe: Implement IoGetStackLimits.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: 8b787945ef0073b4fd886b347d9e22e7e40ff3fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b787945ef0073b4fd886b34… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 24 16:25:00 2019 +0200 ntoskrnl.exe: Implement IoGetStackLimits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47017 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 11 +++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 639e4eb..99b8599 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1689,6 +1689,18 @@ PCONFIGURATION_INFORMATION WINAPI IoGetConfigurationInformation(void) return &configuration_information; } +/*********************************************************************** + * IoGetStackLimits (NTOSKRNL.EXE.@) + */ +void WINAPI IoGetStackLimits(ULONG_PTR *low, ULONG_PTR *high) +{ + TEB *teb = NtCurrentTeb(); + + TRACE( "%p %p\n", low, high ); + + *low = (DWORD_PTR)teb->Tib.StackLimit; + *high = (DWORD_PTR)teb->Tib.StackBase; +} /*********************************************************************** * IoIsWdmVersionAvailable (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 5edd8df..afe216b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -408,7 +408,7 @@ @ stub IoGetRequestorProcess @ stub IoGetRequestorProcessId @ stub IoGetRequestorSessionId -@ stub IoGetStackLimits +@ stdcall IoGetStackLimits(ptr ptr) @ stub IoGetTopLevelIrp @ stdcall IoInitializeIrp(ptr long long) @ stdcall IoInitializeRemoveLockEx(ptr long long long long) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dbe189d..48bee1d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1436,6 +1436,16 @@ static void test_lookup_thread(void) "PsLookupThreadByThreadId returned %#x\n", status); } +static void test_stack_limits(void) +{ + ULONG_PTR low = 0, high = 0; + + IoGetStackLimits(&low, &high); + ok(low, "low = 0\n"); + ok(low < high, "low >= high\n"); + ok(low < (ULONG_PTR)&low && (ULONG_PTR)&low < high, "stack variable is not in stack limits\n"); +} + static void test_IoAttachDeviceToDeviceStack(void) { DEVICE_OBJECT *dev1, *dev2, *dev3, *ret; @@ -1503,6 +1513,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_critical_region(FALSE); test_call_driver(device); test_cancel_irp(device); + test_stack_limits(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cad0a20..64afea5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1586,6 +1586,7 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJE NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULONG,PVOID,PULONG); PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); +void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE);

1 0

Jacek Caban : ntoskrnl.exe: Implement ExInitializePagedLookasideList.
by Alexandre Julliard 24 Jun '19

24 Jun '19

Module: wine Branch: master Commit: fac633495db6bba2301578ea401e6b695986d4dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac633495db6bba2301578ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 24 16:25:13 2019 +0200 ntoskrnl.exe: Implement ExInitializePagedLookasideList. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47014 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 ++++++++++++++++++++++------------------ dlls/ntoskrnl.exe/tests/driver.c | 24 +++++++++++++++++ include/ddk/wdm.h | 11 +++++++- 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 99b8599..be8a10a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2060,6 +2060,28 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) HeapFree( GetProcessHeap(), 0, ptr ); } +static void initialize_lookaside_list( GENERAL_LOOKASIDE *lookaside, PALLOCATE_FUNCTION allocate, PFREE_FUNCTION free, + ULONG type, SIZE_T size, ULONG tag ) +{ + + RtlInitializeSListHead( &lookaside->u.ListHead ); + lookaside->Depth = 4; + lookaside->MaximumDepth = 256; + lookaside->TotalAllocates = 0; + lookaside->u2.AllocateMisses = 0; + lookaside->TotalFrees = 0; + lookaside->u3.FreeMisses = 0; + lookaside->Type = type; + lookaside->Tag = tag; + lookaside->Size = size; + lookaside->u4.Allocate = allocate ? allocate : ExAllocatePoolWithTag; + lookaside->u5.Free = free ? free : ExFreePool; + lookaside->LastTotalAllocates = 0; + lookaside->u6.LastAllocateMisses = 0; + + /* FIXME: insert in global list of lookadside lists */ +} + /*********************************************************************** * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) */ @@ -2072,37 +2094,22 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST lookaside, USHORT depth) { TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth ); - - RtlInitializeSListHead( &lookaside->L.u.ListHead ); - lookaside->L.Depth = 4; - lookaside->L.MaximumDepth = 256; - lookaside->L.TotalAllocates = 0; - lookaside->L.u2.AllocateMisses = 0; - lookaside->L.TotalFrees = 0; - lookaside->L.u3.FreeMisses = 0; - lookaside->L.Type = NonPagedPool | flags; - lookaside->L.Tag = tag; - lookaside->L.Size = size; - lookaside->L.u4.Allocate = allocate ? allocate : ExAllocatePoolWithTag; - lookaside->L.u5.Free = free ? free : ExFreePool; - lookaside->L.LastTotalAllocates = 0; - lookaside->L.u6.LastAllocateMisses = 0; - - /* FIXME: insert in global list of lookadside lists */ + initialize_lookaside_list( &lookaside->L, allocate, free, NonPagedPool | flags, size, tag ); } /*********************************************************************** * ExInitializePagedLookasideList (NTOSKRNL.EXE.@) */ -void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST Lookaside, - PALLOCATE_FUNCTION Allocate, - PFREE_FUNCTION Free, - ULONG Flags, - SIZE_T Size, - ULONG Tag, - USHORT Depth) +void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST lookaside, + PALLOCATE_FUNCTION allocate, + PFREE_FUNCTION free, + ULONG flags, + SIZE_T size, + ULONG tag, + USHORT depth) { - FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth ); + TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth ); + initialize_lookaside_list( &lookaside->L, allocate, free, PagedPool | flags, size, tag ); } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 48bee1d..41b1420 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -950,6 +950,7 @@ static void test_stack_callout(void) static void test_lookaside_list(void) { NPAGED_LOOKASIDE_LIST list; + PAGED_LOOKASIDE_LIST paged_list; ULONG tag = 0x454e4957; /* WINE */ ExInitializeNPagedLookasideList(&list, NULL, NULL, POOL_NX_ALLOCATION, LOOKASIDE_MINIMUM_BLOCK_SIZE, tag, 0); @@ -974,6 +975,29 @@ static void test_lookaside_list(void) ok(list.L.MaximumDepth == 256, "Expected 256 got %u\n", list.L.MaximumDepth); ok(list.L.Type == NonPagedPool, "Expected NonPagedPool got %u\n", list.L.Type); ExDeleteNPagedLookasideList(&list); + + ExInitializePagedLookasideList(&paged_list, NULL, NULL, POOL_NX_ALLOCATION, LOOKASIDE_MINIMUM_BLOCK_SIZE, tag, 0); + ok(paged_list.L.Depth == 4, "Expected 4 got %u\n", paged_list.L.Depth); + ok(paged_list.L.MaximumDepth == 256, "Expected 256 got %u\n", paged_list.L.MaximumDepth); + ok(paged_list.L.TotalAllocates == 0, "Expected 0 got %u\n", paged_list.L.TotalAllocates); + ok(paged_list.L.AllocateMisses == 0, "Expected 0 got %u\n", paged_list.L.AllocateMisses); + ok(paged_list.L.TotalFrees == 0, "Expected 0 got %u\n", paged_list.L.TotalFrees); + ok(paged_list.L.FreeMisses == 0, "Expected 0 got %u\n", paged_list.L.FreeMisses); + ok(paged_list.L.Type == (PagedPool|POOL_NX_ALLOCATION), + "Expected PagedPool|POOL_NX_ALLOCATION got %u\n", paged_list.L.Type); + ok(paged_list.L.Tag == tag, "Expected %x got %x\n", tag, paged_list.L.Tag); + ok(paged_list.L.Size == LOOKASIDE_MINIMUM_BLOCK_SIZE, + "Expected %u got %u\n", LOOKASIDE_MINIMUM_BLOCK_SIZE, paged_list.L.Size); + ok(paged_list.L.LastTotalAllocates == 0,"Expected 0 got %u\n", paged_list.L.LastTotalAllocates); + ok(paged_list.L.LastAllocateMisses == 0,"Expected 0 got %u\n", paged_list.L.LastAllocateMisses); + ExDeletePagedLookasideList(&paged_list); + + paged_list.L.Depth = 0; + ExInitializePagedLookasideList(&paged_list, NULL, NULL, 0, LOOKASIDE_MINIMUM_BLOCK_SIZE, tag, 20); + ok(paged_list.L.Depth == 4, "Expected 4 got %u\n", paged_list.L.Depth); + ok(paged_list.L.MaximumDepth == 256, "Expected 256 got %u\n", paged_list.L.MaximumDepth); + ok(paged_list.L.Type == PagedPool, "Expected PagedPool got %u\n", paged_list.L.Type); + ExDeletePagedLookasideList(&paged_list); } static void test_version(void) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 64afea5..f79b36a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -211,7 +211,6 @@ typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; typedef struct _IO_WORKITEM *PIO_WORKITEM; -typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; typedef struct _ZONE_HEADER *PZONE_HEADER; @@ -1364,6 +1363,14 @@ typedef struct LOOKASIDE_ALIGN _NPAGED_LOOKASIDE_LIST #endif } NPAGED_LOOKASIDE_LIST, *PNPAGED_LOOKASIDE_LIST; +typedef struct LOOKASIDE_ALIGN _PAGED_LOOKASIDE_LIST +{ + GENERAL_LOOKASIDE L; +#if defined(__i386__) + FAST_MUTEX Lock__ObsoleteButDoNotDelete; +#endif +} PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST; + typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; @@ -1538,12 +1545,14 @@ PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); +void WINAPI ExDeletePagedLookasideList(PPAGED_LOOKASIDE_LIST); NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); +void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedFlushSList(PSLIST_HEADER); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK);

1 0