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

Paul Gofman : bcrypt/tests: Add test for key parallel usage.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: f638bd901e70c6b22c6f9809d85ba3becfa03c1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f638bd901e70c6b22c6f9809… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 20 16:53:34 2021 +0200 bcrypt/tests: Add test for key parallel usage. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 87 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 456727d04a9..fb5ac03b039 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -862,6 +862,64 @@ static void test_BCryptGenerateSymmetricKey(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +#define RACE_TEST_COUNT 200 +static LONG encrypt_race_start_barrier; + +static DWORD WINAPI encrypt_race_thread(void *parameter) +{ + static UCHAR nonce[] = + {0x11,0x20,0x30,0x40,0x50,0x60,0x10,0x20,0x30,0x40,0x50,0x60}; + static UCHAR auth_data[] = + {0x61,0x50,0x40,0x30,0x20,0x10,0x60,0x50,0x40,0x30,0x20,0x10}; + static UCHAR data2[] = + {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, + 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10}; + static UCHAR expected4[] = + {0xb2,0x27,0x19,0x09,0xc7,0x89,0xdc,0x52,0x24,0x83,0x3a,0x55,0x34,0x76,0x2c,0xbf, + 0x15,0xa1,0xcb,0x40,0x78,0x11,0xba,0xbc,0xa4,0x76,0x69,0x7c,0x75,0x4f,0x11,0xba}; + static UCHAR expected_tag3[] = + {0xef,0xee,0x75,0x99,0xb8,0x12,0xe9,0xf0,0xb4,0xcc,0x65,0x11,0x67,0x60,0x2d,0xe6}; + + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; + BCRYPT_KEY_HANDLE key = parameter; + UCHAR ciphertext[48], tag[16]; + unsigned int i, test; + NTSTATUS ret; + ULONG size; + + memset(&auth_info, 0, sizeof(auth_info)); + auth_info.cbSize = sizeof(auth_info); + auth_info.dwInfoVersion = 1; + auth_info.pbNonce = nonce; + auth_info.cbNonce = sizeof(nonce); + auth_info.pbTag = tag; + auth_info.cbTag = sizeof(tag); + auth_info.pbAuthData = auth_data; + auth_info.cbAuthData = sizeof(auth_data); + + InterlockedIncrement(&encrypt_race_start_barrier); + while (InterlockedCompareExchange(&encrypt_race_start_barrier, 3, 2) != 2) + ; + + for (test = 0; test < RACE_TEST_COUNT; ++test) + { + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag3)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + } + + return 0; +} + static void test_BCryptEncrypt(void) { static UCHAR nonce[] = @@ -921,9 +979,10 @@ static void test_BCryptEncrypt(void) BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; UCHAR *buf, ciphertext[48], ivbuf[16], tag[16]; BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_length; + ULONG size, len, i, test; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; - ULONG size, len, i; + HANDLE hthread; NTSTATUS ret; ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); @@ -1215,6 +1274,32 @@ static void test_BCryptEncrypt(void) ret = pBCryptEncrypt(key, data2, 32, &auth_info, ivbuf, 16, ciphertext, 48, &size, BCRYPT_BLOCK_PADDING); ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + /* race test */ + + encrypt_race_start_barrier = 0; + hthread = CreateThread(NULL, 0, encrypt_race_thread, key, 0, NULL); + + while (InterlockedCompareExchange(&encrypt_race_start_barrier, 2, 1) != 1) + ; + + for (test = 0; test < RACE_TEST_COUNT; ++test) + { + size = 0; + memset(ciphertext, 0xff, sizeof(ciphertext)); + memset(tag, 0xff, sizeof(tag)); + ret = pBCryptEncrypt(key, data2, 32, &auth_info, NULL, 0, ciphertext, 32, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); + ok(!memcmp(tag, expected_tag3, sizeof(expected_tag2)), "wrong tag\n"); + for (i = 0; i < 32; i++) + ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); + for (i = 0; i < 16; i++) + ok(tag[i] == expected_tag3[i], "%u: %02x != %02x\n", i, tag[i], expected_tag3[i]); + } + + WaitForSingleObject(hthread, INFINITE); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf);

1 0

Arkadiusz Hiler : kernel32: Update version to Win 10.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 04a8213ba9e3b8aa1f980d19b240929948da5abe URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a8213ba9e3b8aa1f980d19… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 20 14:38:09 2021 +0300 kernel32: Update version to Win 10. This fixes the game Evil Genius 2 complaining about unsupported OS. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/version.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc index 82287e5da79..b6002f51f7a 100644 --- a/dlls/kernel32/version.rc +++ b/dlls/kernel32/version.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT #define WINE_FILEDESCRIPTION_STR "Wine kernel DLL" #define WINE_FILENAME_STR "kernel32.dll" -/* these values come from Windows 7 SP1 */ -#define WINE_FILEVERSION 6,1,7601,17514 -#define WINE_FILEVERSION_STR "6.1.7601.17514" -#define WINE_PRODUCTVERSION 6,1,7601,17514 -#define WINE_PRODUCTVERSION_STR "6.1.7601.17514" +/* these values come from Windows 10 Version 1909 */ +#define WINE_FILEVERSION 10,0,18362,1350 +#define WINE_FILEVERSION_STR "10.0.18362.1350" +#define WINE_PRODUCTVERSION 10,0,18362,1350 +#define WINE_PRODUCTVERSION_STR "10.0.18362.1350" #include "wine/wine_common_ver.rc"

1 0

Hugh McMaster : reg/tests: Only try querying an invalid key once.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 9752dfeea82c48e2230bacbf9db9564d5562de02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9752dfeea82c48e2230bacbf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:55 2021 +1000 reg/tests: Only try querying an invalid key once. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index c475d288fd8..3c87f76742e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -167,6 +167,10 @@ static void test_query(void) run_reg_exe("reg query -H", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Key not present */ + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); add_value(key, "Test1", REG_SZ, "Hello, World", 13); @@ -245,6 +249,7 @@ static void test_query(void) add_value(key, NULL, REG_SZ, "Empty", 6); add_value(subkey, NULL, REG_SZ, "Empty", 6); close_key(subkey); + close_key(key); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -253,17 +258,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); - /* Clean-up, then query */ - delete_key(key, "subkey"); - close_key(key); - - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - - delete_key(HKEY_CURRENT_USER, KEY_BASE); - - run_reg_exe("reg query HKCU\\" KEY_BASE, &r); - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(query)

1 0

Hugh McMaster : reg/tests: Use 'hkey' in 'query' tests for consistency with other reg.exe tests.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: c573fce35b80d60b38b720a82fee53941c7490ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=c573fce35b80d60b38b720a8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:56 2021 +1000 reg/tests: Use 'hkey' in 'query' tests for consistency with other reg.exe tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 3c87f76742e..7c8a1795b34 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -149,7 +149,7 @@ static void test_query(void) " Wine REG_SZ Second instance\r\n\r\n"; DWORD r, dword = 0x123; - HKEY key, subkey; + HKEY hkey, subkey; BYTE buf[512]; delete_tree(HKEY_CURRENT_USER, KEY_BASE); @@ -172,9 +172,9 @@ static void test_query(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); /* Create a test key */ - add_key(HKEY_CURRENT_USER, KEY_BASE, &key); - add_value(key, "Test1", REG_SZ, "Hello, World", 13); - add_value(key, "Test2", REG_DWORD, &dword, sizeof(dword)); + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Test1", REG_SZ, "Hello, World", 13); + add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -206,10 +206,10 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - add_value(key, "Wine", REG_SZ, "First instance", 15); + add_value(hkey, "Wine", REG_SZ, "First instance", 15); /* Create a test subkey */ - add_key(key, "subkey", &subkey); + add_key(hkey, "subkey", &subkey); read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -246,10 +246,10 @@ static void test_query(void) "got exit code %d, expected 0\n", r); compare_query(buf, test7, TRUE, 0); - add_value(key, NULL, REG_SZ, "Empty", 6); + add_value(hkey, NULL, REG_SZ, "Empty", 6); add_value(subkey, NULL, REG_SZ, "Empty", 6); close_key(subkey); - close_key(key); + close_key(hkey); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg/tests: Add tests for querying a key only containing subkeys.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 8b0602023add5c530e4f257ebf07ebae8e4ffdba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0602023add5c530e4f257e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 20 23:21:57 2021 +1000 reg/tests: Add tests for querying a key only containing subkeys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 7c8a1795b34..5c97554648e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -148,6 +148,18 @@ static void test_query(void) "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" " Wine REG_SZ Second instance\r\n\r\n"; + const char *test8a = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey1\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey2\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey3\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey4\r\n"; + + const char *test8b = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey1\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey2\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey3\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey4\r\n\r\n"; + DWORD r, dword = 0x123; HKEY hkey, subkey; BYTE buf[512]; @@ -259,6 +271,24 @@ static void test_query(void) "got exit code %d, expected 0\n", r); delete_tree(HKEY_CURRENT_USER, KEY_BASE); + + /* Subkeys only */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "subkey1", NULL); + add_key(hkey, "subkey2", NULL); + add_key(hkey, "subkey3", NULL); + add_key(hkey, "subkey4", NULL); + close_key(hkey); + + read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test8a, FALSE, TODO_REG_COMPARE); + + read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test8b, FALSE, TODO_REG_COMPARE); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(query)

1 0

Michael Stefaniuc : mfplat/tests: Test the correct variable.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 2ef900eb8157724f814b40c423e05c335068c29a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef900eb8157724f814b40c4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 19 22:36:32 2021 +0200 mfplat/tests: Test the correct variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fd9a27d599c..caf6f78d9e9 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5608,7 +5608,7 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, &length2, NULL); ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); - ok(length == ptr->contiguous_length, "%d: unexpected linear buffer length %u for %u x %u, format %s.\n", + ok(length2 == ptr->contiguous_length, "%d: unexpected linear buffer length %u for %u x %u, format %s.\n", i, length2, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->fourcc, 4)); hr = IMFMediaBuffer_Unlock(buffer);

1 0

Vijay Kiran Kamuju : include: Add xact.h.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 154a7eef6b8c08d6c31cdaa31ada151e77fd6317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=154a7eef6b8c08d6c31cdaa3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Apr 19 16:31:20 2021 -0500 include: Add xact.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/xact.h | 801 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 802 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=154a7eef6b8c08d6c31c…

1 0

Vijay Kiran Kamuju : include: Add xact2wb.h.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 354d97a6f8eaf1076d3943c9e9269c5d8a48b638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=354d97a6f8eaf1076d3943c9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Apr 19 16:31:21 2021 -0500 include: Add xact2wb.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/xact.h | 1 + include/xact2wb.h | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fa4e90402de..8e40b90a3da 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -838,6 +838,7 @@ SOURCES = \ wuapi.idl \ x3daudio.h \ xact.h \ + xact2wb.h \ xact3.h \ xact3wb.h \ xapo.idl \ diff --git a/include/xact.h b/include/xact.h index 5f9372a9366..03a354e69a9 100644 --- a/include/xact.h +++ b/include/xact.h @@ -23,6 +23,7 @@ #include <objbase.h> #include <float.h> #include <limits.h> +#include <xact2wb.h> #if XACT3_VER == 0x0210 DEFINE_GUID(CLSID_XACTEngine, 0x65d822a4, 0x4799, 0x42c6, 0x9b, 0x18, 0xd2, 0x6c, 0xf6, 0x6d, 0xd3, 0x20); diff --git a/include/xact2wb.h b/include/xact2wb.h new file mode 100644 index 00000000000..5950382f514 --- /dev/null +++ b/include/xact2wb.h @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __XACT2WB_H__ +#define __XACT2WB_H__ + +#include <pshpack1.h> + +typedef DWORD WAVEBANKOFFSET; + +#define WAVEBANK_HEADER_SIGNATURE 0x444e4257 /* DNBW */ +#define WAVEBANK_BANKNAME_LENGTH 64 +#define WAVEBANK_ENTRYNAME_LENGTH 64 + +#define WAVEBANK_TYPE_BUFFER 0x00000000 +#define WAVEBANK_TYPE_STREAMING 0x00000001 +#define WAVEBANK_TYPE_MASK 0x00000001 + +#define WAVEBANK_FLAGS_ENTRYNAMES 0x00010000 +#define WAVEBANK_FLAGS_COMPACT 0x00020000 +#define WAVEBANK_FLAGS_SYNC_DISABLED 0x00040000 +#define WAVEBANK_FLAGS_SEEKTABLES 0x00080000 + +#define WAVEBANK_DVD_SECTOR_SIZE 2048 +#define WAVEBANK_DVD_BLOCK_SIZE (WAVEBANK_DVD_SECTOR_SIZE * 16) +#define WAVEBANK_ALIGNMENT_MIN 4 +#define WAVEBANK_ALIGNMENT_DVD WAVEBANK_DVD_SECTOR_SIZE + +typedef enum WAVEBANKSEGIDX +{ + WAVEBANK_SEGIDX_BANKDATA = 0, + WAVEBANK_SEGIDX_ENTRYMETADATA, + WAVEBANK_SEGIDX_SEEKTABLES, + WAVEBANK_SEGIDX_ENTRYNAMES, + WAVEBANK_SEGIDX_ENTRYWAVEDATA, + WAVEBANK_SEGIDX_COUNT +} WAVEBANKSEGIDX, *LPWAVEBANKSEGIDX; +typedef const WAVEBANKSEGIDX *LPCWAVEBANKSEGIDX; + +#define WAVEBANKMINIFORMAT_TAG_PCM 0x0 +#define WAVEBANKMINIFORMAT_TAG_XMA 0x1 +#define WAVEBANKMINIFORMAT_TAG_ADPCM 0x2 + +#define WAVEBANKMINIFORMAT_BITDEPTH_8 0x0 +#define WAVEBANKMINIFORMAT_BITDEPTH_16 0x1 + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + }; + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT, *LPWAVEBANKMINIWAVEFORMAT; +typedef const WAVEBANKMINIWAVEFORMAT *LPCWAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION, *LPWAVEBANKREGION; +typedef const WAVEBANKREGION *LPCWAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION, *LPWAVEBANKSAMPLEREGION; +typedef const WAVEBANKSAMPLEREGION *LPCWAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKHEADER +{ + DWORD dwSignature; + DWORD dwVersion; +#if XACT3_VER >= 0x0205 + DWORD dwHeaderVersion; +#endif + WAVEBANKREGION Segments[WAVEBANK_SEGIDX_COUNT]; +} WAVEBANKHEADER, *LPWAVEBANKHEADER; +typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; + +#define WAVEBANKENTRY_XMASTREAMS_MAX 3 +#define WAVEBANKENTRY_XMACHANNELS_MAX 6 + +#define WAVEBANKENTRY_FLAGS_READAHEAD 0x00000001 +#define WAVEBANKENTRY_FLAGS_LOOPCACHE 0x00000002 +#define WAVEBANKENTRY_FLAGS_REMOVELOOPTAIL 0x00000004 +#define WAVEBANKENTRY_FLAGS_IGNORELOOP 0x00000008 +#define WAVEBANKENTRY_FLAGS_MASK 0x00000008 + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + }; + DWORD dwFlagsAndDuration; + }; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; +#if XACT3_VER >= 0x0202 + WAVEBANKSAMPLEREGION LoopRegion; +#else + union + { + WAVEBANKREGION LoopRegion; + struct + { + DWORD dwStartOffset; + DWORD nSubframeSkip : 2; + DWORD nSubframeEnd : 2; + DWORD dwEndOffset : 28; + } XMALoopRegion[WAVEBANKENTRY_XMASTREAMS_MAX]; + WAVEBANKREGION LoopRegionAlias[WAVEBANKENTRY_XMASTREAMS_MAX]; + }; +#endif +} WAVEBANKENTRY, *LPWAVEBANKENTRY; +typedef const WAVEBANKENTRY *LPCWAVEBANKENTRY; + +typedef struct WAVEBANKENTRYCOMPACT +{ + DWORD dwOffset : 21; + DWORD dwLengthDeviation : 11; +} WAVEBANKENTRYCOMPACT, *LPWAVEBANKENTRYCOMPACT; +typedef const WAVEBANKENTRYCOMPACT *LPCWAVEBANKENTRYCOMPACT; + +typedef struct WAVEBANKDATA +{ + DWORD dwFlags; + DWORD dwEntryCount; + CHAR szBankName[WAVEBANK_BANKNAME_LENGTH]; + DWORD dwEntryMetaDataElementSize; + DWORD dwEntryNameElementSize; + DWORD dwAlignment; + WAVEBANKMINIWAVEFORMAT CompactFormat; + FILETIME BuildTime; +} WAVEBANKDATA, *LPWAVEBANKDATA; +typedef const WAVEBANKDATA *LPCWAVEBANKDATA; + +#include <poppack.h> + +#endif /* __XACT2WB_H__ */

1 0

Paul Gofman : ntdll: Release IO thread pool object from ioqueue_thread_proc().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 6e75cc98e8fde0e1da69622db88c7835e2b0fdbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e75cc98e8fde0e1da69622d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Apr 20 01:22:30 2021 +0300 ntdll: Release IO thread pool object from ioqueue_thread_proc(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1b51a191979..6f03e96780c 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1519,10 +1519,21 @@ static void CALLBACK ioqueue_thread_proc( void *param ) ERR("NtRemoveIoCompletion failed, status %#x.\n", status); RtlEnterCriticalSection( &ioqueue.cs ); - if (key) - { - io = (struct threadpool_object *)key; + io = (struct threadpool_object *)key; + if (io && io->shutdown) + { + if (iosb.u.Status != STATUS_THREADPOOL_RELEASED_DURING_OPERATION) + { + /* Skip remaining completions until the final one. */ + continue; + } + --ioqueue.objcount; + TRACE( "Releasing io %p.\n", io ); + tp_object_release( io ); + } + else if (io) + { RtlEnterCriticalSection( &io->pool->cs ); if (!array_reserve((void **)&io->u.io.completions, &io->u.io.completion_max, @@ -1609,18 +1620,6 @@ static NTSTATUS tp_ioqueue_lock( struct threadpool_object *io, HANDLE file ) return status; } -static void tp_ioqueue_unlock( struct threadpool_object *io ) -{ - assert( io->type == TP_OBJECT_TYPE_IO ); - - RtlEnterCriticalSection( &ioqueue.cs ); - - if (!--ioqueue.objcount) - NtSetIoCompletion( ioqueue.port, 0, 0, STATUS_SUCCESS, 0 ); - - RtlLeaveCriticalSection( &ioqueue.cs ); -} - /*********************************************************************** * tp_threadpool_alloc (internal) * @@ -2051,8 +2050,6 @@ static void tp_object_prepare_shutdown( struct threadpool_object *object ) tp_timerqueue_unlock( object ); else if (object->type == TP_OBJECT_TYPE_WAIT) tp_waitqueue_unlock( object ); - else if (object->type == TP_OBJECT_TYPE_IO) - tp_ioqueue_unlock( object ); } /*********************************************************************** @@ -2796,9 +2793,12 @@ void WINAPI TpReleaseIoCompletion( TP_IO *io ) TRACE( "%p\n", io ); - tp_object_prepare_shutdown( this ); + RtlEnterCriticalSection( &ioqueue.cs ); + + assert( ioqueue.objcount ); this->shutdown = TRUE; - tp_object_release( this ); + NtSetIoCompletion( ioqueue.port, (ULONG_PTR)this, 0, STATUS_THREADPOOL_RELEASED_DURING_OPERATION, 1 ); + RtlLeaveCriticalSection( &ioqueue.cs ); } /***********************************************************************

1 0

Zebediah Figura : winehid.sys: Pass PnP IRPs down to the next device.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 14fa811f9509a608a3b7434de3ae338f9764f1c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14fa811f9509a608a3b7434d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 19 23:37:08 2021 -0500 winehid.sys: Pass PnP IRPs down to the next device. hidclass requires the minidriver to do this, and to return success from IRP_MN_START_DEVICE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winehid.sys/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winehid.sys/main.c b/dlls/winehid.sys/main.c index 0f18514208a..975deac993f 100644 --- a/dlls/winehid.sys/main.c +++ b/dlls/winehid.sys/main.c @@ -68,6 +68,14 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) } } +static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) +{ + HID_DEVICE_EXTENSION *ext = device->DeviceExtension; + + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(ext->NextDeviceObject, irp); +} + static NTSTATUS WINAPI add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *device) { TRACE("(%p, %p)\n", driver, device); @@ -81,6 +89,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = internal_ioctl; + driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; driver->DriverExtension->AddDevice = add_device; memset(&registration, 0, sizeof(registration));

1 0