- Wine-Commits - list.winehq.org

Alfred Agrell : include: Fix typos in MF_MT_VIDEO_3D and MF_MT_AUDIO_FOLDDOWN_MATRIX.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 1b6cb3ea6a33b6085f8c9206490b8eebe68d25c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b6cb3ea6a33b6085f8c9206490b8e… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typos in MF_MT_VIDEO_3D and MF_MT_AUDIO_FOLDDOWN_MATRIX. --- include/mfapi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mfapi.h b/include/mfapi.h index 86fdcb2b8e4..acf76d84ffd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -266,7 +266,7 @@ DEFINE_GUID(MF_MT_WRAPPED_TYPE, 0x4d3f7b23, 0xd02f, 0x4e6 DEFINE_GUID(MF_MT_FIXED_SIZE_SAMPLES, 0xb8ebefaf, 0xb718, 0x4e04, 0xb0, 0xa9, 0x11, 0x67, 0x75, 0xe3, 0x32, 0x1b); DEFINE_GUID(MF_MT_COMPRESSED, 0x3afd0cee, 0x18f2, 0x4ba5, 0xa1, 0x10, 0x8b, 0xea, 0x50, 0x2e, 0x1f, 0x92); DEFINE_GUID(MF_MT_SAMPLE_SIZE, 0xdad3ab78, 0x1990, 0x408b, 0xbc, 0xe2, 0xeb, 0xa6, 0x73, 0xda, 0xcc, 0x10); -DEFINE_GUID(MF_MT_VIDEO_3D, 0xcb5e88cf, 0x7b5b, 0x47b6, 0x85, 0xaa, 0x1c, 0xa5, 0xae, 0x18, 0x75, 0x55); +DEFINE_GUID(MF_MT_VIDEO_3D, 0xcb5e88cf, 0x7b5b, 0x476b, 0x85, 0xaa, 0x1c, 0xa5, 0xae, 0x18, 0x75, 0x55); DEFINE_GUID(MF_MT_VIDEO_3D_FORMAT, 0x5315d8a0, 0x87c5, 0x4697, 0xb7, 0x93, 0x66, 0x06, 0xc6, 0x7c, 0x04, 0x9b); DEFINE_GUID(MF_MT_VIDEO_3D_NUM_VIEWS, 0xbb077e8a, 0xdcbf, 0x42eb, 0xaf, 0x60, 0x41, 0x8d, 0xf9, 0x8a, 0xa4, 0x95); DEFINE_GUID(MF_MT_VIDEO_3D_LEFT_IS_BASE, 0x6d4b7bff, 0x5629, 0x4404, 0x94, 0x8c, 0xc6, 0x34, 0xf4, 0xce, 0x26, 0xd4); @@ -302,7 +302,7 @@ DEFINE_GUID(MF_MT_AUDIO_BITS_PER_SAMPLE, 0xf2deb57f, 0x40fa, 0x476 DEFINE_GUID(MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, 0xd9bf8d6a, 0x9530, 0x4b7c, 0x9d, 0xdf, 0xff, 0x6f, 0xd5, 0x8b, 0xbd, 0x06); DEFINE_GUID(MF_MT_AUDIO_SAMPLES_PER_BLOCK, 0xaab15aac, 0xe13a, 0x4995, 0x92, 0x22, 0x50, 0x1e, 0xa1, 0x5c, 0x68, 0x77); DEFINE_GUID(MF_MT_AUDIO_CHANNEL_MASK, 0x55fb5765, 0x644a, 0x4caf, 0x84, 0x79, 0x93, 0x89, 0x83, 0xbb, 0x15, 0x88); -DEFINE_GUID(MF_MT_AUDIO_FOLDDOWN_MATRIX, 0x9d62927c, 0x36be, 0x4cf1, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); +DEFINE_GUID(MF_MT_AUDIO_FOLDDOWN_MATRIX, 0x9d62927c, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_WMADRC_PEAKREF, 0x9d62927d, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_WMADRC_PEAKTARGET, 0x9d62927e, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11); DEFINE_GUID(MF_MT_AUDIO_WMADRC_AVGREF, 0x9d62927f, 0x36be, 0x4cf2, 0xb5, 0xc4, 0xa3, 0x92, 0x6e, 0x3e, 0x87, 0x11);

1 0

Alfred Agrell : include: Fix typo in IID_IAudioLoudness.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 32d92b004bd0507b2dd808696e8f26ea9c26f660 URL: https://gitlab.winehq.org/wine/wine/-/commit/32d92b004bd0507b2dd808696e8f26… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IAudioLoudness. --- include/devicetopology.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 7e89d541ad6..1b4b87bd6c3 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -296,7 +296,7 @@ interface IAudioChannelConfig : IUnknown [ pointer_default(unique), nonextensible, - uuid(7d8b1437-dd53-4350-9c1b-1ee2890bf938), + uuid(7d8b1437-dd53-4350-9c1b-1ee2890bd938), local, object ]

1 0

Alfred Agrell : include: Fix typo in GUID_DEVCLASS_1394DEBUG.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: c89884bc3f7fe1581efa60f480ca6c9537d1cf63 URL: https://gitlab.winehq.org/wine/wine/-/commit/c89884bc3f7fe1581efa60f480ca6c… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in GUID_DEVCLASS_1394DEBUG. --- include/devguid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devguid.h b/include/devguid.h index 7a99ba0e6f7..b309bcaafa5 100644 --- a/include/devguid.h +++ b/include/devguid.h @@ -21,7 +21,7 @@ DEFINE_GUID( GUID_DEVCLASS_1394, 0x6BDD1FC1, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F ); DEFINE_GUID( GUID_DEVCLASS_1394DEBUG, - 0x66F250D6, 0x7810, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); + 0x66F250D6, 0x7801, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); DEFINE_GUID( GUID_DEVCLASS_61883, 0x7EBEFBC0, 0x3200, 0x11D2, 0xB4, 0xC2, 0x00, 0xA0, 0xC9, 0x69, 0x7D, 0x07 ); DEFINE_GUID( GUID_DEVCLASS_ADAPTER,

1 0

Alfred Agrell : include: Fix typo in IID_IDWriteStringList.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: b9e48e8b8ad49e156366102a92d2f1d952d0b624 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9e48e8b8ad49e156366102a92d2f1… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IDWriteStringList. --- include/dwrite_3.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index e67c8ab6364..7412c3f5857 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -174,7 +174,7 @@ interface IDWriteRenderingParams3 : IDWriteRenderingParams2 [ local, object, - uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) + uuid(cfee3140-1157-47ca-8b85-31bfcf3f2d0e) ] interface IDWriteStringList : IUnknown {

1 0

Alfred Agrell : include: Fix typo in IID_IRemoteDebugApplication.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: abee495f54c7f8ac2ecbeb4f0d95e4617c691f43 URL: https://gitlab.winehq.org/wine/wine/-/commit/abee495f54c7f8ac2ecbeb4f0d95e4… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IRemoteDebugApplication. --- include/activdbg.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/activdbg.idl b/include/activdbg.idl index e10066c1f26..475469ebb05 100644 --- a/include/activdbg.idl +++ b/include/activdbg.idl @@ -295,7 +295,7 @@ interface IRemoteDebugApplicationThread : IUnknown */ [ object, - uuid(51973c30-cb0c-11d0-b5c9-00a0244Aae7a), + uuid(51973c30-cb0c-11d0-b5c9-00a0244a0e7a), pointer_default(unique) ] interface IRemoteDebugApplication : IUnknown

1 0

Alfred Agrell : include: Fix typo in DXGI_DEBUG_APP.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: wine Branch: master Commit: 6a4494ecd515caea56f32b2f2ac7433a6788962b URL: https://gitlab.winehq.org/wine/wine/-/commit/6a4494ecd515caea56f32b2f2ac743… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in DXGI_DEBUG_APP. --- include/dxgidebug.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 686637321f0..f1c40af2c2b 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -25,7 +25,7 @@ typedef GUID DXGI_DEBUG_ID; cpp_quote("DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b,0x87, 0xe6, 0x43, 0xe9, 0xa9, 0xcf, 0xda, 0x08);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d,0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64);") cpp_quote("DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1,0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a);") -cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x90, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") +cpp_quote("DEFINE_GUID(DXGI_DEBUG_APP, 0x06cd6e01, 0x4219, 0x4ebd,0x87, 0x09, 0x27, 0xed, 0x23, 0x36, 0x0c, 0x62);") typedef enum DXGI_DEBUG_RLO_FLAGS { DXGI_DEBUG_RLO_SUMMARY = 0x0001,

1 0

Victor Chiletto : vkd3d-shader/d3dbc: Fix implicit enum conversion warning.
by Alexandre Julliard July 10, 2024

July 10, 2024

Module: vkd3d Branch: master Commit: 67c690aa070ac447cd95aafb1e7daca1659b9ac7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/67c690aa070ac447cd95aafb1e7da… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Tue Jul 9 18:37:36 2024 -0300 vkd3d-shader/d3dbc: Fix implicit enum conversion warning. This slipped through and broke CI. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index ea9fe775..4522d56c 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2670,11 +2670,11 @@ static void d3dbc_write_resource_load(struct d3dbc_compiler *d3dbc, const struct case HLSL_RESOURCE_SAMPLE_GRAD: sm1_instr.opcode = D3DSIO_TEXLDD; - sm1_instr.srcs[2].type = D3DSPR_TEMP; + sm1_instr.srcs[2].type = VKD3DSPR_TEMP; sm1_instr.srcs[2].reg = ddx->reg.id; sm1_instr.srcs[2].swizzle = hlsl_swizzle_from_writemask(ddx->reg.writemask); - sm1_instr.srcs[3].type = D3DSPR_TEMP; + sm1_instr.srcs[3].type = VKD3DSPR_TEMP; sm1_instr.srcs[3].reg = ddy->reg.id; sm1_instr.srcs[3].swizzle = hlsl_swizzle_from_writemask(ddy->reg.writemask);

1 0

Austin English : ntoskrnl.exe: Add a stub for KeQueryGroupAffinity.
by Alexandre Julliard July 9, 2024

July 9, 2024

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

Connor McAdams : d3dx9: Return failure if a cubemap DDS file does not contain all faces.
by Alexandre Julliard July 9, 2024

July 9, 2024

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

Connor McAdams : d3dx9: Check the proper flag for DDS files representing a volume texture.
by Alexandre Julliard July 9, 2024

July 9, 2024

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