March 2020 - Wine-devel - list.winehq.org

[PATCH 2/2] include: Add missing GUIDs in dsound.h
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48750 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] include: Add missing effect related defines and enums in dsound.h
by Vijay Kiran Kamuju 15 Mar '20

15 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] shell32/tests: Avoid random values in the shlexec failure messages.
by Francois Gouget 15 Mar '20

15 Mar '20

Trace the temporary directory value on startup since it's no longer visible in the failure messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shell32/tests/shlexec.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 030ab54525a..e884b409493 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -507,7 +507,14 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); + if (strncmp(filename, tmpdir, strlen(tmpdir)) != 0) + strcat_param(shell_call, "file", filename); + else + { + char buffer[MAX_PATH]; + sprintf(buffer, "tmpdir%s", filename + strlen(tmpdir)); + strcat_param(shell_call, "file", buffer); + } strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); @@ -591,7 +598,14 @@ static INT_PTR shell_execute_ex_(const char* file, int line, sprintf(smask, "0x%x", mask); strcat_param(shell_call, "mask", smask); strcat_param(shell_call, "verb", verb); - strcat_param(shell_call, "file", filename); + if (strncmp(filename, tmpdir, strlen(tmpdir)) != 0) + strcat_param(shell_call, "file", filename); + else + { + char buffer[MAX_PATH]; + sprintf(buffer, "<tmpdir>%s", filename + strlen(tmpdir)); + strcat_param(shell_call, "file", buffer); + } strcat_param(shell_call, "params", parameters); strcat_param(shell_call, "dir", directory); strcat_param(shell_call, "class", class); @@ -2705,6 +2719,7 @@ static void init_test(void) ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); /* Set %TMPDIR% for the tests */ SetEnvironmentVariableA("TMPDIR", tmpdir); + trace("tmpdir=\"%s\"\n", tmpdir); rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); ok(rc != 0, "got %d\n", rc); -- 2.20.1

2 2

[PATCH v2] ntoskrnl.exe: Implement IoOpenDeviceRegistryKey().
by Zebediah Figura 15 Mar '20

15 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix a leak, thanks Zhiyi dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 29 +++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6b5b127a62..40341d8f0c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -423,7 +423,7 @@ @ stdcall IoIsWdmVersionAvailable(long long) @ stub IoMakeAssociatedIrp @ stub IoOpenDeviceInterfaceRegistryKey -@ stub IoOpenDeviceRegistryKey +@ stdcall IoOpenDeviceRegistryKey(ptr long long ptr) @ stub IoPageRead @ stub IoPnPDeliverServicePowerNotification @ stdcall IoQueryDeviceDescription(ptr ptr ptr ptr ptr ptr ptr ptr) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d53..75310f7b35 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -844,6 +844,35 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla return status; } +/*********************************************************************** + * IoOpenDeviceRegistryKey (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCESS_MASK access, HANDLE *key ) +{ + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; + NTSTATUS status; + HDEVINFO set; + + TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key); + + if ((status = get_device_instance_id( device, device_instance_id ))) + { + ERR("Failed to get device instance ID, error %#x.\n", status); + return status; + } + + set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL ); + + SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device ); + + *key = SetupDiOpenDevRegKey( set, &sp_device, DICS_FLAG_GLOBAL, 0, type, access ); + SetupDiDestroyDeviceInfoList( set ); + if (*key == INVALID_HANDLE_VALUE) + return GetLastError(); + return STATUS_SUCCESS; +} + /*********************************************************************** * PoSetPowerState (NTOSKRNL.EXE.@) */ diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 53ea9e17cf..b4325cec6c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1607,6 +1607,7 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING); void WINAPI IoReleaseCancelSpinLock(KIRQL); -- 2.25.1

1 0

[PATCH] shell32/tests: Fix some wording issues in shlexec comments.
by Francois Gouget 15 Mar '20

15 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/tests/shlexec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3d1af739f71..132fe49429e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1119,12 +1119,12 @@ static void test_lpFile_parsed(void) return; } - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); - /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + /* if quoted, existing "drawback_file.noassoc" does not prevent finding "drawback_file.noassoc foo.shlexec" on Wine */ sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, @@ -1141,7 +1141,7 @@ static void test_lpFile_parsed(void) todo_wine okShell(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, "failed: rc=%lu\n", rc); - /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ + /* nonexistent "drawback_nonexist.noassoc" does not prevent finding "drawback_nonexist.noassoc foo.shlexec" on Wine */ sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); okShell(rc > 32, "failed: rc=%lu\n", rc); -- 2.20.1

2 1

[PATCH 1/3] crypt32/tests: Add tests for CryptStringToBinaryW()
by Aaro Altonen 15 Mar '20

15 Mar '20

Add tests for CRYPT_STRING_HEX format Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/crypt32/tests/base64.c | 175 ++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 7b9f4c1077..8af0c5bae0 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -783,8 +783,183 @@ static void testStringToBinaryA(void) } } +static void testStringToBinaryW(void) +{ + DWORD skip_ = 0; + DWORD flags = 0; + DWORD data_len = 0; + WCHAR *input; + BYTE out[256]; + BYTE expected[256]; + BOOL ret; + + /* invalid parameteres -> 87 */ + SetLastError(0xdeadbeef); + ret = CryptStringToBinaryW(NULL, 0, 0, NULL, NULL, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %u, expected 87\n", GetLastError()); + + /* otherwise valid parameters but invalid data_len -> 87 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("213c73796d6c696e6b3efffe"); + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, NULL, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %d, expected 87\n", GetLastError()); + heap_free(input); + + /* uneven amount of data -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("111"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* length is uneven -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("1111"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 3, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* invalid 0x prefix -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("0x213c73796d6c696e6b3efffe"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* invalid characters -> 13 */ + SetLastError(0xdeadbeef); + input = strdupAtoW("abchhh"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* insufficient buffer -> 234 */ + SetLastError(0xdeadbeef); + data_len = 4; + memset(out, 0, sizeof(out)); + expected[0] = 0x21; + expected[1] = 0x3c; + expected[2] = 0x73; + expected[3] = 0x79; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); + ok(data_len == 4, "Got %u, expected 4\n", data_len); + todo_wine ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); + + /* valid data */ + SetLastError(0xdeadbeef); + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + heap_free(input); + + /* valid data with white spaces */ + SetLastError(0xdeadbeef); + input = strdupAtoW("21 3c\t\t \r\n 73 796d6c \t69\t"); + data_len = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptStringToBinaryW(input, 25, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 7, "Got %u, expected 7\n", data_len); + heap_free(input); + + /* valid data with white spaces but spacing breaks the valid data into invalid chunks */ + SetLastError(0xdeadbeef); + input = strdupAtoW("21 3 c"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + heap_free(input); + + /* if "input" contains both valid and invalid data and "out" is valid, "out" shall contain all valid bytes + * until an invalid sequence is reached */ + SetLastError(0xdeadbeef); + data_len = 4; + memset(out, 0, sizeof(out)); + input = strdupAtoW("21 3 c ff"); + ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + ok(!ret, "Got %u, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 4, "Got %u, expected 4\n", data_len); + heap_free(input); + + /* valid data */ + SetLastError(0xdeadbeef); + expected[0] = 0x21; expected[1] = 0x3c; expected[2] = 0x73; + expected[3] = 0x79; expected[4] = 0x6d; expected[5] = 0x6c; + expected[6] = 0x69; expected[7] = 0x6e; expected[8] = 0x6b; + expected[9] = 0x3e; expected[10] = 0xff; expected[11] = 0xfe; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + todo_wine ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); + + /* invalid data but length small enough that it's never detected */ + SetLastError(0xdeadbeef); + input = strdupAtoW("abcdefhhh"); + data_len = 0xdeadbeef; + ret = CryptStringToBinaryW(input, 4, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 2, "Got %u, expected 2\n", data_len); + heap_free(input); + + /* invalid data but length small enough that it's never detected, with whitespaces */ + SetLastError(0xdeadbeef); + memset(out, 0, sizeof(out)); + input = strdupAtoW("\t\t21 fe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 5, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 1, "Got %u, expected 1\n", data_len); + heap_free(input); + + /* valid data but parse only the first 6 bytes (12 chars) */ + SetLastError(0xdeadbeef); + memset(out, 0, sizeof(out)); + expected[0] = 0x21; expected[1] = 0x3c; expected[2] = 0x73; + expected[3] = 0x79; expected[4] = 0x6d; expected[5] = 0x6c; + input = strdupAtoW("213c73796d6c696e6b3efffe"); + data_len = 256; + ret = CryptStringToBinaryW(input, 12, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); + todo_wine ok(ret, "Got %u, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + todo_wine ok(data_len == 6, "Got %u, expected 6\n", data_len); + todo_wine ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); + heap_free(input); +} + START_TEST(base64) { test_CryptBinaryToString(); testStringToBinaryA(); + testStringToBinaryW(); } -- 2.25.1

2 1

[PATCH 3/3] crypt32: Add implementation for CRYPT_STRING_HEX format
by Aaro Altonen 15 Mar '20

15 Mar '20

Add CRYPT_STRING_HEX format implementation for CryptStringToBinaryW() Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48487 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/crypt32/base64.c | 91 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/base64.c | 66 +++++++++++++-------------- 2 files changed, 124 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 73619421ab..9856dead03 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -1036,6 +1036,95 @@ static LONG DecodeAnyW(LPCWSTR pszString, DWORD cchString, return ret; } +static BYTE char_to_byte(BYTE byte) +{ + if (byte >= '0' && byte <= '9') + return byte - '0'; + if (byte >= 'a' && byte <='f') + return byte - 'a' + 10; + else if (byte >= 'A' && byte <='F') + return byte - 'A' + 10; + + return 0xff; +} + +static DWORD hex_to_binary(WCHAR *str, BYTE *out, DWORD *outlen, DWORD *processed) +{ + DWORD ret = ERROR_SUCCESS; + + while (*str && *(str + 1)) + { + BYTE un = char_to_byte(*str); + BYTE ln = char_to_byte(*(str + 1)); + + if (un == 0xff || ln == 0xff) + return ERROR_INVALID_DATA; + + if (*processed >= *outlen) + { + if (out) + return ERROR_MORE_DATA; + ret = ERROR_MORE_DATA; + } + else if (out) + out[*processed] = (un << 4) | ln; + + (*processed)++; + str += 2; + } + + return ret; +} + +static LONG DecodeBinaryToHexW(const WCHAR *instr, DWORD slen, + BYTE *out, DWORD *outlen, DWORD *skip, DWORD *flags) +{ + const WCHAR delim[] = { ' ', '\n', '\r', '\t', '\0' }; + WCHAR *duped, *ptr, *tok, *saveptr; + LONG ret = ERROR_SUCCESS; + DWORD processed = 0; + + if (!outlen) + return ERROR_INVALID_PARAMETER; + + duped = ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(instr) + 1) * sizeof(WCHAR)); + if (duped) + lstrcpyW(duped, instr); + else + return ERROR_NOT_ENOUGH_MEMORY; + + /* force strtok_sW() to parse at most slen - 1 bytes (including white spaces) */ + duped[slen] = '\0'; + + while ((tok = strtok_sW(ptr, delim, &saveptr))) + { + if (strlenW(tok) % 2) + { + ret = ERROR_INVALID_DATA; + break; + } + + if ((ret = hex_to_binary(tok, out, outlen, &processed))) + { + if (ret == ERROR_INVALID_DATA) + break; + } + + ptr = NULL; + } + + if (ret == ERROR_INVALID_DATA) + { + if (!out) + *outlen = 0; + } + else + *outlen = processed; + + HeapFree(GetProcessHeap(), 0, duped); + return ret; +} + BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) @@ -1081,6 +1170,8 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString, decoder = DecodeAnyW; break; case CRYPT_STRING_HEX: + decoder = DecodeBinaryToHexW; + break; case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 8af0c5bae0..b789a0a010 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -813,8 +813,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* length is uneven -> 13 */ @@ -823,8 +823,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 3, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* invalid 0x prefix -> 13 */ @@ -833,8 +833,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* invalid characters -> 13 */ @@ -843,8 +843,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* insufficient buffer -> 234 */ @@ -858,9 +858,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); + ok(GetLastError() == ERROR_MORE_DATA, "Got %d, expected 234\n", GetLastError()); ok(data_len == 4, "Got %u, expected 4\n", data_len); - todo_wine ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); + ok(!memcmp(out, expected, 4), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); /* valid data */ @@ -868,9 +868,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 12, "Got %u, expected 12\n", data_len); heap_free(input); /* valid data with white spaces */ @@ -879,9 +879,9 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; SetLastError(0xdeadbeef); ret = CryptStringToBinaryW(input, 25, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 7, "Got %u, expected 7\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %d, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 7, "Got %u, expected 7\n", data_len); heap_free(input); /* valid data with white spaces but spacing breaks the valid data into invalid chunks */ @@ -890,8 +890,8 @@ static void testStringToBinaryW(void) data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, NULL, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); - todo_wine ok(data_len == 0, "Got %u, expected 0\n", data_len); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(data_len == 0, "Got %u, expected 0\n", data_len); heap_free(input); /* if "input" contains both valid and invalid data and "out" is valid, "out" shall contain all valid bytes @@ -902,7 +902,7 @@ static void testStringToBinaryW(void) input = strdupAtoW("21 3 c ff"); ret = CryptStringToBinaryW(input, 0, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); ok(!ret, "Got %u, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_DATA, "Got %d, expected 13\n", GetLastError()); ok(data_len == 4, "Got %u, expected 4\n", data_len); heap_free(input); @@ -915,10 +915,10 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 256; ret = CryptStringToBinaryW(input, 24, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 12, "Got %u, expected 12\n", data_len); - todo_wine ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 12, "Got %u, expected 12\n", data_len); + ok(!memcmp(out, expected, 12), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); /* invalid data but length small enough that it's never detected */ @@ -926,9 +926,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("abcdefhhh"); data_len = 0xdeadbeef; ret = CryptStringToBinaryW(input, 4, CRYPT_STRING_HEX, NULL, &data_len, NULL, NULL); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 2, "Got %u, expected 2\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 2, "Got %u, expected 2\n", data_len); heap_free(input); /* invalid data but length small enough that it's never detected, with whitespaces */ @@ -937,9 +937,9 @@ static void testStringToBinaryW(void) input = strdupAtoW("\t\t21 fe"); data_len = 256; ret = CryptStringToBinaryW(input, 5, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 1, "Got %u, expected 1\n", data_len); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 1, "Got %u, expected 1\n", data_len); heap_free(input); /* valid data but parse only the first 6 bytes (12 chars) */ @@ -950,10 +950,10 @@ static void testStringToBinaryW(void) input = strdupAtoW("213c73796d6c696e6b3efffe"); data_len = 256; ret = CryptStringToBinaryW(input, 12, CRYPT_STRING_HEX, out, &data_len, &skip_, &flags); - todo_wine ok(ret, "Got %u, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); - todo_wine ok(data_len == 6, "Got %u, expected 6\n", data_len); - todo_wine ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); + ok(ret, "Got %u, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "Got %x, expected 0xdeadbeef\n", GetLastError()); + ok(data_len == 6, "Got %u, expected 6\n", data_len); + ok(!memcmp(out, expected, 6), "Invalid output from CryptStringToBinaryW()!\n"); heap_free(input); } -- 2.25.1

2 1

[PATCH 2/3] libwine: Create strtok_sW()
by Aaro Altonen 15 Mar '20

15 Mar '20

Implement strtok() utility function for wide char strings that is globally available like strlenW() and lstrcpyW() Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msvcrt/wcs.c | 16 +--------------- include/wine/unicode.h | 1 + libs/port/string.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 17d06eed3c..2ad6ed92bf 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1616,21 +1616,7 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcspbrk( const MSVCRT_wchar_t* str, const MSVCRT_wc MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, MSVCRT_wchar_t **next_token ) { - MSVCRT_wchar_t *ret; - - if (!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; - if (!MSVCRT_CHECK_PMT(next_token != NULL)) return NULL; - if (!MSVCRT_CHECK_PMT(str != NULL || *next_token != NULL)) return NULL; - - if (!str) str = *next_token; - - while (*str && strchrW( delim, *str )) str++; - if (!*str) return NULL; - ret = str++; - while (*str && !strchrW( delim, *str )) str++; - if (*str) *str++ = 0; - *next_token = str; - return ret; + return strtok_sW(str, delim, next_token); } /********************************************************************* diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 8d30e9f447..3ee98c611d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -89,6 +89,7 @@ extern int sprintfW( WCHAR *str, const WCHAR *format, ... ); extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); +extern WCHAR *strtok_sW( WCHAR *str, const WCHAR *delim, WCHAR **saveptr ); WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { diff --git a/libs/port/string.c b/libs/port/string.c index c3388bcc7d..ceb5ab67cf 100644 --- a/libs/port/string.c +++ b/libs/port/string.c @@ -528,3 +528,22 @@ int sprintfW( WCHAR *str, const WCHAR *format, ...) va_end(valist); return retval; } + +WCHAR *strtok_sW(WCHAR *str, const WCHAR *delim, WCHAR **saveptr) +{ + WCHAR *ret; + + if (delim == NULL) return NULL; + if (saveptr == NULL) return NULL; + if (str == NULL && *saveptr == NULL) return NULL; + + if (!str) str = *saveptr; + + while (*str && strchrW( delim, *str )) str++; + if (!*str) return NULL; + ret = str++; + while (*str && !strchrW( delim, *str )) str++; + if (*str) *str++ = 0; + *saveptr = str; + return ret; +} -- 2.25.1

1 0

[PATCH v2 2/3] kernel32: Add stub for GetFirmwareType
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by "Myah Caron" <qsniyg(a)mail.com> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- dlls/kernel32/environ.c | 9 +++++++++ dlls/kernel32/kernel32.spec | 1 + include/winnt.h | 13 ++++++++++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 4998af04d9..cba1133f14 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -25,7 +25,7 @@ @ stdcall GetConsoleWindow() kernel32.GetConsoleWindow @ stub GetDurationFormatEx @ stub GetFileAttributesTransactedW -@ stub GetFirmwareType +@ stdcall GetFirmwareType(ptr) kernel32.GetFirmwareType @ stub GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 93ca37fccf..75da15634c 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -134,3 +134,12 @@ DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareType (KERNEL32.@) + */ +BOOL WINAPI GetFirmwareType(PFIRMWARE_TYPE firmware_type) { + FIXME("stub: %p\n", firmware_type); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e285207a7..88fb9616b6 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -690,6 +690,7 @@ @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFirmwareEnvironmentVariableExA(str str ptr long ptr) @ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) +@ stdcall GetFirmwareType(ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW diff --git a/include/winnt.h b/include/winnt.h index 50a6213ef0..0df06f0f33 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2227,9 +2227,9 @@ typedef struct DWORD Ctr; DWORD ContextFlags; - + DWORD Dar; /* Fault registers for coredump */ - DWORD Dsisr; + DWORD Dsisr; DWORD Trap; /* number of powerpc exception taken */ /* These are selected by CONTEXT_DEBUG_REGISTERS */ @@ -4285,7 +4285,7 @@ typedef struct _ACL { typedef enum _ACL_INFORMATION_CLASS { - AclRevisionInformation = 1, + AclRevisionInformation = 1, AclSizeInformation } ACL_INFORMATION_CLASS; @@ -6713,6 +6713,13 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; +typedef enum _FIRMWARE_TYPE { + FirmwareTypeUnknown, + FirmwareTypeBios, + FirmwareTypeUefi, + FirmwareTypeMax +} FIRMWARE_TYPE, *PFIRMWARE_TYPE; + #ifdef __cplusplus } #endif -- 2.25.1

2 1

[PATCH v2 1/3] kernel32: Add stub for GetFirmwareEnvironmentVariableEx
by Myah Caron 15 Mar '20

15 Mar '20

Signed-off-by "Myah Caron" <qsniyg(a)mail.com> --- v2: Fix offsets (the old patch was built against staging - my bad!) Also includes two other stubs (in patches 2 and 3) that are closely related, needed for a hardware information gathering program dlls/kernel32/environ.c | 23 ++++++++++++++++++++++- dlls/kernel32/kernel32.spec | 2 ++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 2d80600f78..93ca37fccf 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -67,7 +67,7 @@ void ENV_CopyStartupInformation(void) ANSI_STRING ansi; RtlAcquirePebLock(); - + rupp = NtCurrentTeb()->Peb->ProcessParameters; startup_infoA.cb = sizeof(startup_infoA); @@ -113,3 +113,24 @@ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID b SetLastError(ERROR_INVALID_FUNCTION); return 0; } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_a(name), debugstr_a(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + + +/*********************************************************************** + * GetFirmwareEnvironmentVariableExW (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableExW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size, PDWORD attributes) +{ + FIXME("stub: %s %s %p %u %p\n", debugstr_w(name), debugstr_w(guid), buffer, size, attributes); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b8eaa6cdde..8e285207a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -688,6 +688,8 @@ @ stdcall GetFinalPathNameByHandleW(long ptr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) +@ stdcall GetFirmwareEnvironmentVariableExA(str str ptr long ptr) +@ stdcall GetFirmwareEnvironmentVariableExW(wstr wstr ptr long ptr) @ stdcall -import GetFullPathNameA(str long ptr ptr) # @ stub GetFullPathNameTransactedA # @ stub GetFullPathNameTransactedW -- 2.25.1

2 1