July 2021 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Implement NOOVERWRITE maps in wined3d_deferred_context_prepare_upload_bo().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 7186d8bef519d5da101161370b849a1c4d84f984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7186d8bef519d5da10116137… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 17:38:34 2021 -0500 wined3d: Implement NOOVERWRITE maps in wined3d_deferred_context_prepare_upload_bo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 42 ++++++++++++++++++------------------------ dlls/wined3d/cs.c | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0cc3401d0bb..5f2b12ee694 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33121,38 +33121,32 @@ static void test_deferred_context_map(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map_desc); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr == S_OK) + map_data = map_desc.pData; + for (i = 0; i < ARRAY_SIZE(data); ++i) { - map_data = map_desc.pData; - for (i = 0; i < ARRAY_SIZE(data); ++i) - { - ok(map_data[i] == 2 * i, "Got unexpected value %.8e at %u.\n", map_data[i], i); - if (i % 2) - map_data[i] = 3 * i; - } - memcpy(data, map_data, sizeof(data)); - - ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); + ok(map_data[i] == 2 * i, "Got unexpected value %.8e at %u.\n", map_data[i], i); + if (i % 2) + map_data[i] = 3 * i; } + memcpy(data, map_data, sizeof(data)); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map_desc); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - if (hr == S_OK) + map_data = map_desc.pData; + for (i = 0; i < ARRAY_SIZE(data); ++i) { - map_data = map_desc.pData; - for (i = 0; i < ARRAY_SIZE(data); ++i) - { - ok(map_data[i] == data[i], "Got unexpected value %.8e at %u.\n", map_data[i], i); - if (i % 3) - map_data[i] = 4 * i; - } - memcpy(data, map_data, sizeof(data)); - - ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); + ok(map_data[i] == data[i], "Got unexpected value %.8e at %u.\n", map_data[i], i); + if (i % 3) + map_data[i] = 4 * i; } + memcpy(data, map_data, sizeof(data)); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 36b398741b3..d099d3bc9da 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3505,12 +3505,27 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co return NULL; } - if (flags & ~(WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD)) + if (flags & ~(WINED3D_MAP_WRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { FIXME("Unhandled flags %#x.\n", flags); return NULL; } + if (flags & WINED3D_MAP_NOOVERWRITE) + { + const struct wined3d_deferred_upload *upload; + + if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) + { + map_ptr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + address->buffer_object = 0; + address->addr = map_ptr; + return map_ptr; + } + + return NULL; + } + if (!wined3d_array_reserve((void **)&deferred->uploads, &deferred->uploads_capacity, deferred->upload_count + 1, sizeof(*deferred->uploads))) return NULL;

1 0

Zebediah Figura : wined3d: No longer queue WINED3D_CS_QUEUE_MAP operations through wined3d_device_context_ops.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 6a9752bf5e3cff3ceb4249d5a5e59b4d548008d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9752bf5e3cff3ceb4249d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 17:38:35 2021 -0500 wined3d: No longer queue WINED3D_CS_QUEUE_MAP operations through wined3d_device_context_ops. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 83 +++++++----------------------------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/wined3d_private.h | 11 +----- 3 files changed, 18 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a9752bf5e3cff3ceb42…

1 0

Ziqing Hui : d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: dd55d9ce1b4a4ce094caa972f8a3a1cbe5a6df00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd55d9ce1b4a4ce094caa972… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 1 14:08:31 2021 +0800 d3dx10/tests: Test texture returned by D3DX10CreateTextureFromMemory on failure. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 47f6e337f2e..6486b06e7df 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1971,17 +1971,29 @@ static void test_create_texture(void) /* D3DX10CreateTextureFromMemory tests */ - todo_wine - { + resource = (ID3D10Resource *)0xdeadbeef; hr = D3DX10CreateTextureFromMemory(device, NULL, 0, NULL, NULL, &resource, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); + + resource = (ID3D10Resource *)0xdeadbeef; hr = D3DX10CreateTextureFromMemory(device, NULL, sizeof(test_bmp_1bpp), NULL, NULL, &resource, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); + + resource = (ID3D10Resource *)0xdeadbeef; hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, 0, NULL, NULL, &resource, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); + + resource = (ID3D10Resource *)0xdeadbeef; hr = D3DX10CreateTextureFromMemory(device, test_bmp_1bpp, sizeof(test_bmp_1bpp) - 1, NULL, NULL, &resource, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - } + ok(resource == (ID3D10Resource *)0xdeadbeef, "Got unexpected resource %p.\n", resource); for (i = 0; i < ARRAY_SIZE(test_image); ++i) {

1 0

Ziqing Hui : d3dx10: Introduce initial D3DX10CreateTextureFromMemory() implementation.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 68ac49bc118652b0969bade6d950ca7b0999a72b URL: https://source.winehq.org/git/wine.git/?a=commit;h=68ac49bc118652b0969bade6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 1 14:08:41 2021 +0800 d3dx10: Introduce initial D3DX10CreateTextureFromMemory() implementation. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43_main.c | 11 -- dlls/d3dx10_43/tests/d3dx10.c | 8 +- dlls/d3dx10_43/texture.c | 229 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68ac49bc118652b0969b…

1 0

Ziqing Hui : d3dx10: Handle format conversion in D3DX10CreateTextureFromMemory().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: ce0e61dbe839bd80ddc2b9d472cce25b05a9618a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0e61dbe839bd80ddc2b9d4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 1 14:08:49 2021 +0800 d3dx10: Handle format conversion in D3DX10CreateTextureFromMemory(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 83 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 251613d246f..d5d1f02441c 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1147,7 +1147,6 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag { line_match = !memcmp(image->expected_data + stride * i, (BYTE *)map.pData + map.RowPitch * i, stride); - todo_wine ok_(__FILE__, line)(line_match, "Data mismatch for line %u.\n", i); if (!line_match) break; @@ -1998,7 +1997,7 @@ static void test_create_texture(void) winetest_push_context("Test %u", i); hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); - todo_wine_if(test_image[i].expected_info.Format != DXGI_FORMAT_R8G8B8A8_UNORM) + todo_wine_if(is_block_compressed(test_image[i].expected_info.Format)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8655048fa5f..8765f312f4c 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -45,6 +45,32 @@ file_formats[] = { &GUID_ContainerFormatWmp, D3DX10_IFF_WMP }, }; +static const struct +{ + const GUID *wic_guid; + DXGI_FORMAT dxgi_format; +} +wic_pixel_formats[] = +{ + { &GUID_WICPixelFormatBlackWhite, DXGI_FORMAT_R1_UNORM }, + { &GUID_WICPixelFormat8bppAlpha, DXGI_FORMAT_A8_UNORM }, + { &GUID_WICPixelFormat8bppGray, DXGI_FORMAT_R8_UNORM }, + { &GUID_WICPixelFormat16bppGray, DXGI_FORMAT_R16_UNORM }, + { &GUID_WICPixelFormat16bppGrayHalf, DXGI_FORMAT_R16_FLOAT }, + { &GUID_WICPixelFormat32bppGrayFloat, DXGI_FORMAT_R32_FLOAT }, + { &GUID_WICPixelFormat16bppBGR565, DXGI_FORMAT_B5G6R5_UNORM }, + { &GUID_WICPixelFormat16bppBGRA5551, DXGI_FORMAT_B5G5R5A1_UNORM }, + { &GUID_WICPixelFormat32bppBGR, DXGI_FORMAT_B8G8R8X8_UNORM }, + { &GUID_WICPixelFormat32bppBGRA, DXGI_FORMAT_B8G8R8A8_UNORM }, + { &GUID_WICPixelFormat32bppRGBA, DXGI_FORMAT_R8G8B8A8_UNORM }, + { &GUID_WICPixelFormat32bppRGBA1010102, DXGI_FORMAT_R10G10B10A2_UNORM }, + { &GUID_WICPixelFormat32bppRGBA1010102XR, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM }, + { &GUID_WICPixelFormat64bppRGBA, DXGI_FORMAT_R16G16B16A16_UNORM }, + { &GUID_WICPixelFormat64bppRGBAHalf, DXGI_FORMAT_R16G16B16A16_FLOAT }, + { &GUID_WICPixelFormat96bppRGBFloat, DXGI_FORMAT_R32G32B32_FLOAT }, + { &GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT } +}; + static const DXGI_FORMAT to_be_converted_format[] = { DXGI_FORMAT_UNKNOWN, @@ -69,6 +95,19 @@ static D3DX10_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *containe return D3DX10_IFF_FORCE_DWORD; } +static const GUID *dxgi_format_to_wic_guid(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(wic_pixel_formats); ++i) + { + if (wic_pixel_formats[i].dxgi_format == format) + return wic_pixel_formats[i].wic_guid; + } + + return NULL; +} + static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimension wic_dimension) { switch (wic_dimension) @@ -516,6 +555,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { unsigned int frame_count, width, height, stride, frame_size; + IWICFormatConverter *converter = NULL; D3D10_TEXTURE2D_DESC texture_2d_desc; D3D10_SUBRESOURCE_DATA resource_data; IWICBitmapFrameDecode *frame = NULL; @@ -524,7 +564,10 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s ID3D10Texture2D *texture_2d; D3DX10_IMAGE_INFO img_info; IWICStream *stream = NULL; + const GUID *dst_format; BYTE *buffer = NULL; + BOOL can_convert; + GUID src_format; HRESULT hr; TRACE("device %p, src_data %p, src_data_size %lu, load_info %p, pump %p, texture %p, hresult %p.\n", @@ -539,11 +582,6 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s if (FAILED(D3DX10GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL))) return E_FAIL; - if (img_info.Format != DXGI_FORMAT_R8G8B8A8_UNORM) - { - FIXME("Unsupported format %#x.\n", img_info.Format); - return E_FAIL; - } if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto end; @@ -557,6 +595,8 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s goto end; if (FAILED(hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame))) goto end; + if (FAILED(hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &src_format))) + goto end; width = img_info.Width; height = img_info.Height; @@ -568,8 +608,37 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s hr = E_FAIL; goto end; } - if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + + if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) + { + hr = E_FAIL; + FIXME("Unsupported DXGI format %#x.\n", img_info.Format); goto end; + } + + if (IsEqualGUID(&src_format, dst_format)) + { + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + goto end; + } + else + { + if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) + goto end; + if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) + goto end; + if (!can_convert) + { + WARN("Format converting %s to %s is not supported by WIC.\n", + debugstr_guid(&src_format), debugstr_guid(dst_format)); + goto end; + } + if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, + WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) + goto end; + if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) + goto end; + } memset(&texture_2d_desc, 0, sizeof(texture_2d_desc)); texture_2d_desc.Width = width; @@ -593,6 +662,8 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s hr = S_OK; end: + if (converter) + IWICFormatConverter_Release(converter); if (buffer) heap_free(buffer); if (frame)

1 0

Ziqing Hui : d3dx10: Support block compressed formats in D3DX10CreateTextureFromMemory().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 52ba1b498a9694daf804c9aea99c788bb4e753a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ba1b498a9694daf804c9ae… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jul 1 21:02:28 2021 +0200 d3dx10: Support block compressed formats in D3DX10CreateTextureFromMemory(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 87 ++++++++++++++++++++++++++++++++----------- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index d5d1f02441c..30d766bf244 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1147,6 +1147,8 @@ static void check_resource_data(ID3D10Resource *resource, const struct test_imag { line_match = !memcmp(image->expected_data + stride * i, (BYTE *)map.pData + map.RowPitch * i, stride); + todo_wine_if(is_block_compressed(image->expected_info.Format) + && (image->expected_info.Width % 4 != 0 || image->expected_info.Height % 4 != 0)) ok_(__FILE__, line)(line_match, "Data mismatch for line %u.\n", i); if (!line_match) break; @@ -1997,7 +1999,7 @@ static void test_create_texture(void) winetest_push_context("Test %u", i); hr = D3DX10CreateTextureFromMemory(device, test_image[i].data, test_image[i].size, NULL, NULL, &resource, NULL); - todo_wine_if(is_block_compressed(test_image[i].expected_info.Format)) + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 8765f312f4c..8d30aef8648 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -71,6 +71,17 @@ wic_pixel_formats[] = { &GUID_WICPixelFormat128bppRGBAFloat, DXGI_FORMAT_R32G32B32A32_FLOAT } }; +static const DXGI_FORMAT block_compressed_formats[] = +{ + DXGI_FORMAT_BC1_TYPELESS, DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB, + DXGI_FORMAT_BC2_TYPELESS, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC2_UNORM_SRGB, + DXGI_FORMAT_BC3_TYPELESS, DXGI_FORMAT_BC3_UNORM, DXGI_FORMAT_BC3_UNORM_SRGB, + DXGI_FORMAT_BC4_TYPELESS, DXGI_FORMAT_BC4_UNORM, DXGI_FORMAT_BC4_SNORM, + DXGI_FORMAT_BC5_TYPELESS, DXGI_FORMAT_BC5_UNORM, DXGI_FORMAT_BC5_SNORM, + DXGI_FORMAT_BC6H_TYPELESS, DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_SF16, + DXGI_FORMAT_BC7_TYPELESS, DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM_SRGB +}; + static const DXGI_FORMAT to_be_converted_format[] = { DXGI_FORMAT_UNKNOWN, @@ -124,6 +135,17 @@ static D3D10_RESOURCE_DIMENSION wic_dimension_to_d3dx10_dimension(WICDdsDimensio } } +static BOOL is_block_compressed(DXGI_FORMAT format) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i) + if (format == block_compressed_formats[i]) + return TRUE; + + return FALSE; +} + static unsigned int get_bpp_from_format(DXGI_FORMAT format) { switch (format) @@ -556,6 +578,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s { unsigned int frame_count, width, height, stride, frame_size; IWICFormatConverter *converter = NULL; + IWICDdsFrameDecode *dds_frame = NULL; D3D10_TEXTURE2D_DESC texture_2d_desc; D3D10_SUBRESOURCE_DATA resource_data; IWICBitmapFrameDecode *frame = NULL; @@ -582,6 +605,11 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s if (FAILED(D3DX10GetImageInfoFromMemory(src_data, src_data_size, NULL, &img_info, NULL))) return E_FAIL; + if (img_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) + { + FIXME("Cube map is not supported.\n"); + return E_FAIL; + } if (FAILED(hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto end; @@ -600,6 +628,11 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s width = img_info.Width; height = img_info.Height; + if (is_block_compressed(img_info.Format)) + { + width = (width + 3) & ~3; + height = (height + 3) & ~3; + } stride = (width * get_bpp_from_format(img_info.Format) + 7) / 8; frame_size = stride * height; @@ -609,35 +642,45 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s goto end; } - if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) + if (is_block_compressed(img_info.Format)) { - hr = E_FAIL; - FIXME("Unsupported DXGI format %#x.\n", img_info.Format); - goto end; - } - - if (IsEqualGUID(&src_format, dst_format)) - { - if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + if (FAILED(hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICDdsFrameDecode, (void **)&dds_frame))) + goto end; + if (FAILED(hr = IWICDdsFrameDecode_CopyBlocks(dds_frame, NULL, stride * 4, frame_size, buffer))) goto end; } else { - if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) - goto end; - if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) - goto end; - if (!can_convert) + if (!(dst_format = dxgi_format_to_wic_guid(img_info.Format))) { - WARN("Format converting %s to %s is not supported by WIC.\n", - debugstr_guid(&src_format), debugstr_guid(dst_format)); + hr = E_FAIL; + FIXME("Unsupported DXGI format %#x.\n", img_info.Format); goto end; } - if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, - WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) - goto end; - if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) - goto end; + + if (IsEqualGUID(&src_format, dst_format)) + { + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, stride, frame_size, buffer))) + goto end; + } + else + { + if (FAILED(hr = IWICImagingFactory_CreateFormatConverter(factory, &converter))) + goto end; + if (FAILED(hr = IWICFormatConverter_CanConvert(converter, &src_format, dst_format, &can_convert))) + goto end; + if (!can_convert) + { + WARN("Format converting %s to %s is not supported by WIC.\n", + debugstr_guid(&src_format), debugstr_guid(dst_format)); + goto end; + } + if (FAILED(hr = IWICFormatConverter_Initialize(converter, (IWICBitmapSource *)frame, dst_format, + WICBitmapDitherTypeErrorDiffusion, 0, 0, WICBitmapPaletteTypeCustom))) + goto end; + if (FAILED(hr = IWICFormatConverter_CopyPixels(converter, NULL, stride, frame_size, buffer))) + goto end; + } } memset(&texture_2d_desc, 0, sizeof(texture_2d_desc)); @@ -664,6 +707,8 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s end: if (converter) IWICFormatConverter_Release(converter); + if (dds_frame) + IWICDdsFrameDecode_Release(dds_frame); if (buffer) heap_free(buffer); if (frame)

1 0

Huw Davies : nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: f5238be33012c31af8a7c40023ec65c82e7a1456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5238be33012c31af8a7c400… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:08 2021 +0100 nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 13 +++++++-- dlls/nsiproxy.sys/ndis.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 207d3941c0d..d7f6ac9c739 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -113,9 +113,7 @@ static void test_nsi_api( void ) err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); -todo_wine ok( !err, "got %d\n", err ); - if (err) continue; ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); @@ -362,12 +360,23 @@ static void test_ndis_ifinfo( void ) ok( !err, "got %d\n", err ); ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + luid_get.Value = ~0u; err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), &rw_get, rw_size, &dyn_get, sizeof(dyn_get), &stat_get, sizeof(stat_get) ); ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + FreeMibTable( table ); NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8e5eccbbf23..647fd650cd3 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -515,6 +515,75 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void return status; } +static NTSTATUS ifinfo_get_rw_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_rw, alias ): + { + IF_COUNTED_STRING *str = (IF_COUNTED_STRING *)data; + if (data_size != sizeof(*str)) return STATUS_INVALID_PARAMETER; + if_counted_string_init( str, entry->if_name ); + return STATUS_SUCCESS; + } + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_static_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_index ): + if (data_size != sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + *(DWORD *)data = entry->if_index; + return STATUS_SUCCESS; + + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_guid ): + if (data_size != sizeof(GUID)) return STATUS_INVALID_PARAMETER; + *(GUID *)data = entry->if_guid; + return STATUS_SUCCESS; + + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_luid( (const NET_LUID *)key ); + if (entry) + { + switch (param_type) + { + case NSI_PARAM_TYPE_RW: + status = ifinfo_get_rw_parameter( entry, data, data_size, data_offset ); + break; + case NSI_PARAM_TYPE_STATIC: + status = ifinfo_get_static_parameter( entry, data, data_size, data_offset ); + break; + } + } + + LeaveCriticalSection( &if_list_cs ); + + return status; +} + static const struct module_table tables[] = { { @@ -525,6 +594,7 @@ static const struct module_table tables[] = }, ifinfo_enumerate_all, ifinfo_get_all_parameters, + ifinfo_get_parameter }, { ~0u } };

1 0

Alexandre Julliard : server: Store session id in the process and return it at process init time.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: ad93413c71b8f36c3303988af524230660ebd154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad93413c71b8f36c3303988a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:26:47 2021 +0200 server: Store session id in the process and return it at process init time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 - dlls/ntdll/unix/server.c | 1 + include/wine/server_protocol.h | 4 ++-- server/directory.c | 2 +- server/process.c | 1 + server/process.h | 3 +++ server/protocol.def | 1 + server/request.h | 3 ++- server/thread.c | 1 + server/trace.c | 1 + 10 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5d5562e27c0..077c0058c83 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2006,7 +2006,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; - peb->SessionId = 1; if (NtCurrentTeb()->WowTebOffset) { diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 5e3d7347a24..567f50d0ad7 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1513,6 +1513,7 @@ size_t server_init_process(void) ret = wine_server_call( req ); pid = reply->pid; tid = reply->tid; + peb->SessionId = reply->session_id; info_size = reply->info_size; server_start_time = reply->server_start; supported_machines_count = wine_server_reply_size( reply ) / sizeof(*supported_machines); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d73f493edd3..32cbc928c76 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -933,9 +933,9 @@ struct init_first_thread_reply process_id_t pid; thread_id_t tid; timeout_t server_start; + unsigned int session_id; data_size_t info_size; /* VARARG(machines,ushorts); */ - char __pad_28[4]; }; @@ -6251,7 +6251,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 720 +#define SERVER_PROTOCOL_VERSION 721 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index 30d69459984..ec8187b425a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -462,7 +462,7 @@ void init_directories( struct fd *intl_fd ) /* sessions */ create_session( 0 ); - create_session( 1 ); + create_session( default_session_id ); /* object types */ diff --git a/server/process.c b/server/process.c index 9288bcc27d5..ad79a5ed640 100644 --- a/server/process.c +++ b/server/process.c @@ -686,6 +686,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; + process->session_id = default_session_id; /* Assign a high security label to the token. The default would be medium * but Wine provides admin access to all applications right now so high diff --git a/server/process.h b/server/process.h index 0e1a83859d9..55e4d6dced6 100644 --- a/server/process.h +++ b/server/process.h @@ -51,6 +51,7 @@ struct process struct fd *msg_fd; /* fd for sendmsg/recvmsg */ process_id_t id; /* id of the process */ process_id_t group_id; /* group id of the process */ + unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ @@ -142,4 +143,6 @@ static inline int is_process_init_done( struct process *process ) return process->startup_state == STARTUP_DONE; } +static const unsigned int default_session_id = 1; + #endif /* __WINE_SERVER_PROCESS_H */ diff --git a/server/protocol.def b/server/protocol.def index 59ed5632503..ae9a54197a1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -911,6 +911,7 @@ typedef struct process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ timeout_t server_start; /* server start time */ + unsigned int session_id; /* process session id */ data_size_t info_size; /* total size of startup info */ VARARG(machines,ushorts); /* array of supported machines */ @END diff --git a/server/request.h b/server/request.h index 63b09358612..342f8d159f1 100644 --- a/server/request.h +++ b/server/request.h @@ -752,7 +752,8 @@ C_ASSERT( sizeof(struct init_first_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, server_start) == 16 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, info_size) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, session_id) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, info_size) == 28 ); C_ASSERT( sizeof(struct init_first_thread_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, unix_tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, reply_fd) == 16 ); diff --git a/server/thread.c b/server/thread.c index f9535a7b25b..e0c520ee37c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1431,6 +1431,7 @@ DECL_HANDLER(init_first_thread) reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); + reply->session_id = process->session_id; reply->info_size = get_process_startup_info_size( process ); reply->server_start = server_start_time; set_reply_data( supported_machines, diff --git a/server/trace.c b/server/trace.c index b3eea846453..d5d58c21588 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1530,6 +1530,7 @@ static void dump_init_first_thread_reply( const struct init_first_thread_reply * fprintf( stderr, " pid=%04x", req->pid ); fprintf( stderr, ", tid=%04x", req->tid ); dump_timeout( ", server_start=", &req->server_start ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", info_size=%u", req->info_size ); dump_varargs_ushorts( ", machines=", cur_size ); }

1 0

Alexandre Julliard : ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation).
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: bf4105b731b84c053c20796ad122f229fa3889ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4105b731b84c053c20796a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:29:55 2021 +0200 ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 16 +++++++++++++++- include/wine/server_protocol.h | 5 +++-- server/process.c | 1 + server/protocol.def | 1 + server/request.h | 7 ++++--- server/trace.c | 1 + 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 140e7fc8e0d..90bf01d76fd 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -987,7 +987,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class UNIMPLEMENTED_INFO_CLASS(ProcessWx86Information); UNIMPLEMENTED_INFO_CLASS(ProcessPriorityBoost); UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); - UNIMPLEMENTED_INFO_CLASS(ProcessSessionInformation); UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation); UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled); UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination); @@ -1272,6 +1271,21 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessSessionInformation: + len = sizeof(DWORD); + if (size == len) + { + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( handle ); + if (!(ret = wine_server_call( req ))) + *(DWORD *)info = reply->session_id; + } + SERVER_END_REQ; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + case ProcessWow64Information: len = sizeof(ULONG_PTR); if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 32cbc928c76..92ceaf9f8a4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1004,11 +1004,12 @@ struct get_process_info_reply client_ptr_t peb; timeout_t start_time; timeout_t end_time; + unsigned int session_id; int exit_code; int priority; unsigned short machine; /* VARARG(image,pe_image_info); */ - char __pad_58[6]; + char __pad_62[2]; }; @@ -6251,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 721 +#define SERVER_PROTOCOL_VERSION 722 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index ad79a5ed640..8ca19122e74 100644 --- a/server/process.c +++ b/server/process.c @@ -1456,6 +1456,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; + reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) { diff --git a/server/protocol.def b/server/protocol.def index ae9a54197a1..952f5b193b2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -957,6 +957,7 @@ typedef struct client_ptr_t peb; /* PEB address in process address space */ timeout_t start_time; /* process start time */ timeout_t end_time; /* process end time */ + unsigned int session_id; /* process session id */ int exit_code; /* process exit code */ int priority; /* priority class */ unsigned short machine; /* process architecture */ diff --git a/server/request.h b/server/request.h index 342f8d159f1..19e5a2a84f1 100644 --- a/server/request.h +++ b/server/request.h @@ -781,9 +781,10 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, affinity) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, peb) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, session_id) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 52 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 60 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_debug_info_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index d5d58c21588..dee0a893e77 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1584,6 +1584,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_uint64( ", peb=", &req->peb ); dump_timeout( ", start_time=", &req->start_time ); dump_timeout( ", end_time=", &req->end_time ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", machine=%04x", req->machine );

1 0

Alexandre Julliard : ntdll: Return the session id in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: b20cbd0d571302e33ab602fa6670a131ae4353ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20cbd0d571302e33ab602fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:15:26 2021 +0200 ntdll: Return the session id in NtQuerySystemInformation(SystemProcessInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 1 + include/wine/server_protocol.h | 4 ++-- server/process.c | 1 + server/protocol.def | 2 +- server/trace.c | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 0e601beec15..6bd642c30d1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2294,6 +2294,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, nt_process->dwBasePriority = server_process->priority; nt_process->UniqueProcessId = UlongToHandle(server_process->pid); nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->SessionId = server_process->session_id; nt_process->HandleCount = server_process->handle_count; get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); fill_vm_counters( &nt_process->vmCounters, server_process->unix_pid ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 92ceaf9f8a4..d6815b7e349 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2010,9 +2010,9 @@ struct process_info int priority; process_id_t pid; process_id_t parent_pid; + unsigned int session_id; int handle_count; int unix_pid; - int __pad; }; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 722 +#define SERVER_PROTOCOL_VERSION 723 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 8ca19122e74..c2131a2d7e2 100644 --- a/server/process.c +++ b/server/process.c @@ -1874,6 +1874,7 @@ DECL_HANDLER(list_processes) process_info->priority = process->priority; process_info->pid = process->id; process_info->parent_pid = process->parent_id; + process_info->session_id = process->session_id; process_info->handle_count = get_handle_table_count(process); process_info->unix_pid = process->unix_pid; pos += sizeof(*process_info); diff --git a/server/protocol.def b/server/protocol.def index 952f5b193b2..8eb7e3e99ca 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1609,9 +1609,9 @@ struct process_info int priority; process_id_t pid; process_id_t parent_pid; + unsigned int session_id; int handle_count; int unix_pid; - int __pad; /* VARARG(name,unicode_str,name_len); */ /* VARARG(threads,struct thread_info,thread_count); */ }; diff --git a/server/trace.c b/server/trace.c index dee0a893e77..f27cc47170b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1220,9 +1220,9 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) if (size - pos < sizeof(*process)) break; if (pos) fputc( ',', stderr ); dump_timeout( "{start_time=", &process->start_time ); - fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", + fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,session_id=%08x,handle_count=%u,unix_pid=%d,", process->thread_count, process->priority, process->pid, - process->parent_pid, process->handle_count, process->unix_pid ); + process->parent_pid, process->session_id, process->handle_count, process->unix_pid ); pos += sizeof(*process); pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size );

1 0