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

Jacek Caban : mshtml: Use IWineJSDispatch for screen object script bindings.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 398d98fec4a0a5c73694ff98184d6545721942e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/398d98fec4a0a5c73694ff98184d65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 16:35:17 2024 +0200 mshtml: Use IWineJSDispatch for screen object script bindings. --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- dlls/mshtml/tests/documentmode.js | 2 +- dlls/mshtml/tests/es5.js | 45 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 31976b73d04..7cf4bf9738b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1216,7 +1216,7 @@ static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen ** if(!window->screen) { HRESULT hres; - hres = create_html_screen(dispex_compat_mode(&window->event_target.dispex), &window->screen); + hres = create_html_screen(window, &window->screen); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 461eb3a93f2..a5e0f309ed9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1040,7 +1040,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory* HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**); HRESULT create_location(HTMLOuterWindow*,HTMLLocation**); HRESULT create_navigator(compat_mode_t,IOmNavigator**); -HRESULT create_html_screen(compat_mode_t,IHTMLScreen**); +HRESULT create_html_screen(HTMLInnerWindow*,IHTMLScreen**); HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**); HRESULT create_history(HTMLInnerWindow*,OmHistory**); HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 4ee76a585a1..88dfa1b5bf9 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -425,7 +425,7 @@ static dispex_static_data_t HTMLScreen_dispex = { HTMLScreen_iface_tids }; -HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret) +HRESULT create_html_screen(HTMLInnerWindow *window, IHTMLScreen **ret) { HTMLScreen *screen; @@ -435,7 +435,8 @@ HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret) screen->IHTMLScreen_iface.lpVtbl = &HTMLSreenVtbl; - init_dispatch(&screen->dispex, &HTMLScreen_dispex, NULL, compat_mode); + init_dispatch(&screen->dispex, &HTMLScreen_dispex, window, + dispex_compat_mode(&window->event_target.dispex)); *ret = &screen->IHTMLScreen_iface; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c8ce01b0443..2cffff79479 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -242,7 +242,7 @@ sync_test("builtin_toString", function() { ok(s === (tostr ? tostr : (v < 9 ? "[object]" : "[object " + name + "]")), msg + " toString returned " + s); } s = Object.prototype.toString.call(obj); - todo_wine_if(v >= 9 && name != "Object"). + todo_wine_if(v >= 9 && name != "Object" && name != "Screen"). ok(s === (v < 9 ? "[object Object]" : "[object " + name + "]"), msg + " Object.toString returned " + s); } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 353d0b0b5c0..b1340918fad 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2601,3 +2601,48 @@ sync_test("initProgressEvent", function() { ok(e.loaded === 99, "loaded after re-init = " + e.loaded); ok(e.total === 50, "total after re-init = " + e.total); }); + +sync_test("screen", function() { + var o = screen; + + ok(typeof(o) == "object", "typeof(o) = " + typeof(o)); + ok(o instanceof Object, "o is not an instance of Object"); + + o.prop = 1; + ok(o.prop === 1, "o.prop = " + o.prop); + ok(o.hasOwnProperty("prop"), 'o.hasOwnProperty("prop") = ' + o.hasOwnProperty("prop")); + test_own_data_prop_desc(o, "prop", true, true, true); + + Object.defineProperty(o, "defprop", {writable: false, enumerable: false, configurable: true, value: 2}); + ok(o.defprop === 2, "o.prop = " + o.prop); + test_own_data_prop_desc(o, "defprop", false, false, true); + + ok(typeof(Object.keys(o)) === "object", "Object.keys(o) = " + Object.keys(o)); + ok(Object.isExtensible(o) === true, "Object.isExtensible(o) = " + Object.isExtensible(o)); + ok(Object.isFrozen(o) === false, "Object.isFrozen(o) = " + Object.isFrozen(o)); + ok(Object.isSealed(o) === false, "Object.isSealed(o) = " + Object.isSealed(o)); + + Object.seal(o); + test_own_data_prop_desc(o, "prop", true, true, false); + test_own_data_prop_desc(o, "defprop", false, false, false); + ok(Object.isExtensible(o) === false, "Object.isExtensible(o) = " + Object.isExtensible(o)); + ok(Object.isFrozen(o) === false, "Object.isFrozen(o) = " + Object.isFrozen(o)); + ok(Object.isSealed(o) === true, "Object.isSealed(o) = " + Object.isSealed(o)); + + o.prop2 = 3; + ok(!("prop2" in o), "o.prop2 = " + o.prop2); + + function check_enum(o, name) { + var ret = 0; + for(var iter in o) { + if(iter == name) ret++; + } + ok(ret < 2, name + " enumerated " + ret + " times"); + return ret != 0; + } + ok(check_enum(o, "width"), "width not enumerated"); + ok(check_enum(o, "height"), "height not enumerated"); + ok(check_enum(o, "prop"), "prop not enumerated"); + ok(!check_enum(o, "defprop"), "defprop enumerated"); + ok(!check_enum(o, "prop2"), "prop2 enumerated"); +});

1 0

Connor McAdams : d3dx9/tests: Add tests for DDS skip mip level bits.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: a8f5992bf4b55330b3c305d77922fd2e79671fd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8f5992bf4b55330b3c305d77922fd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Jun 30 08:25:57 2024 -0400 d3dx9/tests: Add tests for DDS skip mip level bits. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 47ac46e9d3b..60a8dfb0fcd 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2202,6 +2202,15 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); + /* Skip level bits are bits 30-26. Bit 31 needs to be ignored. */ + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_24bit, sizeof(dds_24bit), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_FILTER_POINT | (0x20u << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT), 0, &img_info, NULL, &texture); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + + check_image_info(&img_info, 2, 2, 1, 2, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, TRUE); + IDirect3DTexture9_Release(texture); + /* * The values returned in the D3DXIMAGE_INFO structure represent the mip * level the texture data was retrieved from, i.e if we skip the first mip @@ -2471,6 +2480,23 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev D3DX_DEFAULT, 0, NULL, NULL, &volume_texture); ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); + /* Skip level bits are bits 30-26. Bit 31 needs to be ignored. */ + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_FILTER_POINT | (0x20u << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT), 0, &img_info, NULL, &texture); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + + check_image_info(&img_info, 8, 8, 1, 4, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, TRUE); + IDirect3DVolumeTexture9_Release(texture); + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_SKIP_DDS_MIP_LEVELS(1, D3DX_FILTER_POINT), 0, &img_info, NULL, &texture); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + check_image_info(&img_info, 4, 4, 1, 3, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, FALSE); + IDirect3DVolumeTexture9_Release(texture); + /* Load a 2D texture DDS file with multiple mips into a volume texture. */ hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT,

1 0

Connor McAdams : d3dx9: Apply the DDS skip mip level bitmask.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 731cb3957ca859fec71972cdb11f4c8bf0d4beb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/731cb3957ca859fec71972cdb11f4c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 05:00:37 2024 -0400 d3dx9: Apply the DDS skip mip level bitmask. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 4 ++-- dlls/d3dx9_36/texture.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 60a8dfb0fcd..2c022b470d5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2208,7 +2208,7 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) D3DX_DEFAULT, D3DX_FILTER_POINT | (0x20u << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT), 0, &img_info, NULL, &texture); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - check_image_info(&img_info, 2, 2, 1, 2, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, TRUE); + check_image_info(&img_info, 2, 2, 1, 2, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, FALSE); IDirect3DTexture9_Release(texture); /* @@ -2486,7 +2486,7 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev D3DX_DEFAULT, D3DX_FILTER_POINT | (0x20u << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT), 0, &img_info, NULL, &texture); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - check_image_info(&img_info, 8, 8, 1, 4, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, TRUE); + check_image_info(&img_info, 8, 8, 1, 4, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, FALSE); IDirect3DVolumeTexture9_Release(texture); hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index b42c9db3f2d..6ecd9adfece 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -588,6 +588,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi staging_tex = tex = *texture = NULL; skip_levels = mipfilter != D3DX_DEFAULT ? mipfilter >> D3DX_SKIP_DDS_MIP_LEVELS_SHIFT : 0; + skip_levels &= D3DX_SKIP_DDS_MIP_LEVELS_MASK; hr = d3dx_image_init(srcdata, srcdatasize, &image, skip_levels, 0); if (FAILED(hr)) { @@ -1115,6 +1116,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic staging_tex = tex = *volume_texture = NULL; skip_levels = mip_filter != D3DX_DEFAULT ? mip_filter >> D3DX_SKIP_DDS_MIP_LEVELS_SHIFT : 0; + skip_levels &= D3DX_SKIP_DDS_MIP_LEVELS_MASK; hr = d3dx_image_init(data, data_size, &image, skip_levels, 0); if (FAILED(hr)) {

1 0

Connor McAdams : d3dx9/tests: Add more DDS header tests for volume texture files.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 478dbad9294d6eed7225596eea5ab4f3f8cbe233 URL: https://gitlab.winehq.org/wine/wine/-/commit/478dbad9294d6eed7225596eea5ab4… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:11:12 2024 -0400 d3dx9/tests: Add more DDS header tests for volume texture files. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/d3dx9_test_images.h | 5 +- dlls/d3dx9_36/tests/surface.c | 90 +++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/d3dx9_test_images.h b/dlls/d3dx9_36/tests/d3dx9_test_images.h index f1e8ffb94bf..bc80fd01c6b 100644 --- a/dlls/d3dx9_36/tests/d3dx9_test_images.h +++ b/dlls/d3dx9_36/tests/d3dx9_test_images.h @@ -430,8 +430,9 @@ static inline void check_image_info_(const char *file, uint32_t line, const D3DX ok_(file, line)(info->MipLevels == mip_levels, "Expected mip_levels %u, got %u.\n", mip_levels, info->MipLevels); ok_(file, line)(info->Format == format, "Expected texture format %d, got %d.\n", format, info->Format); - ok_(file, line)(info->ResourceType == resource_type, "Expected resource_type %d, got %d.\n", resource_type, - info->ResourceType); + todo_wine_if(wine_todo && info->ResourceType != resource_type) + ok_(file, line)(info->ResourceType == resource_type, "Expected resource_type %d, got %d.\n", resource_type, + info->ResourceType); ok_(file, line)(info->ImageFileFormat == image_file_format, "Expected image_file_format %d, got %d.\n", image_file_format, info->ImageFileFormat); } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 7d9b79c5727..28cad04199f 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -122,10 +122,25 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_PIXELFORMAT 0x00001000 #define DDS_MIPMAPCOUNT 0x00020000 #define DDS_LINEARSIZE 0x00080000 +#define DDS_PITCH 0x00000008 +#define DDS_DEPTH 0x00800000 /* dds_header.caps */ #define DDSCAPS_ALPHA 0x00000002 #define DDS_CAPS_TEXTURE 0x00001000 +#define DDS_CAPS_COMPLEX 0x00000008 + +#define DDS_CAPS2_VOLUME 0x00200000 +#define DDS_CAPS2_CUBEMAP 0x00000200 +#define DDS_CAPS2_CUBEMAP_POSITIVEX 0x00000400 +#define DDS_CAPS2_CUBEMAP_NEGATIVEX 0x00000800 +#define DDS_CAPS2_CUBEMAP_POSITIVEY 0x00001000 +#define DDS_CAPS2_CUBEMAP_NEGATIVEY 0x00002000 +#define DDS_CAPS2_CUBEMAP_POSITIVEZ 0x00004000 +#define DDS_CAPS2_CUBEMAP_NEGATIVEZ 0x00008000 +#define DDS_CAPS2_CUBEMAP_ALL_FACES ( DDS_CAPS2_CUBEMAP_POSITIVEX | DDS_CAPS2_CUBEMAP_NEGATIVEX \ + | DDS_CAPS2_CUBEMAP_POSITIVEY | DDS_CAPS2_CUBEMAP_NEGATIVEY \ + | DDS_CAPS2_CUBEMAP_POSITIVEZ | DDS_CAPS2_CUBEMAP_NEGATIVEZ ) /* dds_pixel_format.flags */ #define DDS_PF_ALPHA 0x00000001 @@ -340,6 +355,52 @@ static void test_dds_header_handling(void) { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, 0, 256, 256, 0, 9, 262146, { D3D_OK, 9 } }, { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, 0, 256, 256, 0, 10, 262146, { D3D_OK, 10 } }, }; + struct + { + uint32_t flags; + uint32_t width; + uint32_t height; + uint32_t depth; + uint32_t row_pitch; + uint32_t mip_levels; + uint32_t caps; + uint32_t caps2; + struct + { + HRESULT hr; + uint32_t width; + uint32_t height; + uint32_t depth; + uint32_t mip_levels; + D3DRESOURCETYPE resource_type; + } + expected; + BOOL todo; + uint32_t pixel_data_size; + } info_tests[] = { + /* Depth value set to 4, but no caps bits are set. Depth is ignored. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, 0, 0, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + /* The volume texture caps2 field is ignored. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, TRUE, 292 }, + /* + * The DDS_DEPTH flag is the only thing checked to determine if a DDS + * file represents a volume texture. + */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, + 0, 0, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + /* Even if the depth field is set to 0, it's still a volume texture. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, + 0, 0, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + /* The DDS_DEPTH flag overrides cubemap caps. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, (292 * 6) }, + }; dds = calloc(1, sizeof(*dds)); if (!dds) @@ -372,6 +433,35 @@ static void test_dds_header_handling(void) } } + for (i = 0; i < ARRAY_SIZE(info_tests); i++) + { + uint32_t file_size = sizeof(dds->magic) + sizeof(dds->header) + info_tests[i].pixel_data_size; + assert(file_size <= sizeof(*dds)); + + winetest_push_context("Test %u", i); + dds->magic = MAKEFOURCC('D','D','S',' '); + fill_dds_header(&dds->header); + dds->header.flags = info_tests[i].flags; + dds->header.width = info_tests[i].width; + dds->header.height = info_tests[i].height; + dds->header.depth = info_tests[i].depth; + dds->header.pitch_or_linear_size = info_tests[i].row_pitch; + dds->header.miplevels = info_tests[i].mip_levels; + dds->header.caps = info_tests[i].caps; + dds->header.caps2 = info_tests[i].caps2; + + memset(&info, 0, sizeof(info)); + hr = D3DXGetImageInfoFromFileInMemory(dds, file_size, &info); + ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(info_tests[i].expected.hr)) + { + check_image_info(&info, info_tests[i].expected.width, info_tests[i].expected.height, + info_tests[i].expected.depth, info_tests[i].expected.mip_levels, D3DFMT_X8R8G8B8, + info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo); + } + winetest_pop_context(); + } + free(dds); }

1 0

Connor McAdams : d3dx9: Check the proper flag for DDS files representing a volume texture.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: c621516c05dae821405d9135b095c6619a4d7d3a URL: https://gitlab.winehq.org/wine/wine/-/commit/c621516c05dae821405d9135b095c6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:17:33 2024 -0400 d3dx9: Check the proper flag for DDS files representing a volume texture. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 4 ++-- dlls/d3dx9_36/tests/surface.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index da23047534b..6d12872a647 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -638,9 +638,9 @@ static HRESULT d3dx_initialize_image_from_dds(const void *src_data, uint32_t src return D3DXERR_INVALIDDATA; TRACE("Pixel format is %#x.\n", image->format); - if (header->caps2 & DDS_CAPS2_VOLUME) + if (header->flags & DDS_DEPTH) { - image->size.depth = header->depth; + image->size.depth = max(header->depth, 1); image->resource_type = D3DRTYPE_VOLUMETEXTURE; } else if (header->caps2 & DDS_CAPS2_CUBEMAP) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 28cad04199f..7c1a33ad2b1 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -384,22 +384,22 @@ static void test_dds_header_handling(void) /* The volume texture caps2 field is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, TRUE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, /* * The DDS_DEPTH flag is the only thing checked to determine if a DDS * file represents a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, /* Even if the depth field is set to 0, it's still a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, /* The DDS_DEPTH flag overrides cubemap caps. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, TRUE, (292 * 6) }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, (292 * 6) }, }; dds = calloc(1, sizeof(*dds));

1 0

Connor McAdams : d3dx9/tests: Add more DDS header tests for cube texture files.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: d36e2a5c3ab5298f652833f076801333b37cae57 URL: https://gitlab.winehq.org/wine/wine/-/commit/d36e2a5c3ab5298f652833f0768013… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:33:36 2024 -0400 d3dx9/tests: Add more DDS header tests for cube texture files. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/surface.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 7c1a33ad2b1..ebca259e551 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -375,31 +375,40 @@ static void test_dds_header_handling(void) D3DRESOURCETYPE resource_type; } expected; - BOOL todo; + BOOL todo_hr; + BOOL todo_info; uint32_t pixel_data_size; } info_tests[] = { /* Depth value set to 4, but no caps bits are set. Depth is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, FALSE, 292 }, /* The volume texture caps2 field is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, FALSE, 292 }, /* * The DDS_DEPTH flag is the only thing checked to determine if a DDS * file represents a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, 292 }, /* Even if the depth field is set to 0, it's still a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, 292 }, /* The DDS_DEPTH flag overrides cubemap caps. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, (292 * 6) }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, (292 * 6) }, + /* Cubemap where width field does not equal height. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 5, 1, (4 * 4), 1, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), + { D3D_OK, 4, 5, 1, 1, D3DRTYPE_CUBETEXTURE, }, FALSE, FALSE, (80 * 6) }, + /* Partial cubemaps are not supported. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 1, (4 * 4), 1, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_POSITIVEX), + { D3DXERR_INVALIDDATA, }, TRUE, FALSE, (64 * 6) }, }; dds = calloc(1, sizeof(*dds)); @@ -452,12 +461,12 @@ static void test_dds_header_handling(void) memset(&info, 0, sizeof(info)); hr = D3DXGetImageInfoFromFileInMemory(dds, file_size, &info); - ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); + todo_wine_if(info_tests[i].todo_hr) ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(info_tests[i].expected.hr)) { check_image_info(&info, info_tests[i].expected.width, info_tests[i].expected.height, info_tests[i].expected.depth, info_tests[i].expected.mip_levels, D3DFMT_X8R8G8B8, - info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo); + info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo_info); } winetest_pop_context(); }

1 0

Connor McAdams : d3dx9: Return failure if a cubemap DDS file does not contain all faces.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 8692b3c0fe7d6e36f1cb4c27d9337a2e956bb715 URL: https://gitlab.winehq.org/wine/wine/-/commit/8692b3c0fe7d6e36f1cb4c27d9337a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:39:36 2024 -0400 d3dx9: Return failure if a cubemap DDS file does not contain all faces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 11 +++++------ dlls/d3dx9_36/tests/surface.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6d12872a647..79ee4edcbc1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -645,14 +645,13 @@ static HRESULT d3dx_initialize_image_from_dds(const void *src_data, uint32_t src } else if (header->caps2 & DDS_CAPS2_CUBEMAP) { - DWORD face; - - faces = 0; - for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) + if ((header->caps2 & DDS_CAPS2_CUBEMAP_ALL_FACES) != DDS_CAPS2_CUBEMAP_ALL_FACES) { - if (header->caps2 & face) - faces++; + WARN("Tried to load a partial cubemap DDS file.\n"); + return D3DXERR_INVALIDDATA; } + + faces = 6; image->resource_type = D3DRTYPE_CUBETEXTURE; } else diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index ebca259e551..5fca2f5d64d 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -408,7 +408,7 @@ static void test_dds_header_handling(void) /* Partial cubemaps are not supported. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 1, (4 * 4), 1, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_POSITIVEX), - { D3DXERR_INVALIDDATA, }, TRUE, FALSE, (64 * 6) }, + { D3DXERR_INVALIDDATA, }, FALSE, FALSE, (64 * 6) }, }; dds = calloc(1, sizeof(*dds));

1 0

Austin English : ntoskrnl.exe: Add a stub for KeQueryGroupAffinity.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 8179609faddee580621529f8b1fffba9a50fb650 URL: https://gitlab.winehq.org/wine/wine/-/commit/8179609faddee580621529f8b1fffb… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 9 01:08:16 2024 -0500 ntoskrnl.exe: Add a stub for KeQueryGroupAffinity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56948 --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7aaf66dd6db..ec67781d9d1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3489,6 +3489,15 @@ ULONG WINAPI KeGetCurrentProcessorNumberEx(PPROCESSOR_NUMBER process_number) return cur_number; } +/*********************************************************************** + * KeQueryGroupAffinity (NTOSKRNL.EXE.@) + */ +KAFFINITY WINAPI KeQueryGroupAffinity(USHORT group_number) +{ + FIXME("%u stub\n", group_number); + return 0; +} + /*********************************************************************** * KeQueryMaximumProcessorCountEx (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 48e1def449c..1bf8ce22fd0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -605,6 +605,7 @@ @ stdcall KeQueryActiveProcessorCountEx(long) @ stdcall KeQueryActiveProcessorCount(ptr) @ stdcall KeQueryActiveGroupCount() GetActiveProcessorGroupCount +@ stdcall KeQueryGroupAffinity(long) @ stdcall KeQueryInterruptTime() @ stdcall KeQueryPriorityThread(ptr) @ stub KeQueryRuntimeThread

1 0

Rémi Bernon : win32u: Use the thread input shared memory for NtUserGetForegroundWindow.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 1f9d011a4c813ec315c6e31f56ed9c0016f569b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f9d011a4c813ec315c6e31f56ed9c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 09:58:55 2023 +0200 win32u: Use the thread input shared memory for NtUserGetForegroundWindow. --- dlls/win32u/input.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 8cdc5a03e16..810cb4c0993 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -551,15 +551,16 @@ static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const */ HWND WINAPI NtUserGetForegroundWindow(void) { - HWND ret = 0; + struct object_lock lock = OBJECT_LOCK_INIT; + const input_shm_t *input_shm; + NTSTATUS status; + HWND hwnd = 0; - SERVER_START_REQ( get_thread_input_data ) - { - req->tid = 0; - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->foreground ); - } - SERVER_END_REQ; - return ret; + while ((status = get_shared_input( 0, &lock, &input_shm )) == STATUS_PENDING) + hwnd = wine_server_ptr_handle( input_shm->active ); + if (status) hwnd = 0; + + return hwnd; } /* see GetActiveWindow */

1 0

Rémi Bernon : win32u: Use the thread input shared memory for NtUserGetCursorInfo.
by Alexandre Julliard 09 Jul '24

09 Jul '24

Module: wine Branch: master Commit: 0b12023b93bbfa7dcac16a6591c986545d47e650 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b12023b93bbfa7dcac16a6591c986… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 09:58:55 2023 +0200 win32u: Use the thread input shared memory for NtUserGetCursorInfo. Always returning TRUE as it now can only fail if there is no foreground thread input, which can spuriously happen, and the code was returning success in that case before. --- dlls/win32u/input.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 810cb4c0993..794dde58359 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -772,22 +772,25 @@ BOOL get_cursor_pos( POINT *pt ) */ BOOL WINAPI NtUserGetCursorInfo( CURSORINFO *info ) { - BOOL ret; + struct object_lock lock = OBJECT_LOCK_INIT; + const input_shm_t *input_shm; + NTSTATUS status; if (!info) return FALSE; - SERVER_START_REQ( get_thread_input_data ) + while ((status = get_shared_input( 0, &lock, &input_shm )) == STATUS_PENDING) { - req->tid = 0; - if ((ret = !wine_server_call( req ))) - { - info->hCursor = wine_server_ptr_handle( reply->cursor ); - info->flags = reply->show_count >= 0 ? CURSOR_SHOWING : 0; - } + info->hCursor = wine_server_ptr_handle( input_shm->cursor ); + info->flags = (input_shm->cursor_count >= 0) ? CURSOR_SHOWING : 0; } - SERVER_END_REQ; + if (status) + { + info->hCursor = 0; + info->flags = CURSOR_SHOWING; + } + get_cursor_pos( &info->ptScreenPos ); - return ret; + return TRUE; } static void check_for_events( UINT flags )

1 0