wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH 2/2] setupapi: Treat trailing \0 in field values same way as trailing spaces.
by Dmitry Timoshkov 17 Sep '20

17 Sep '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/setupapi/parser.c | 4 ++-- dlls/setupapi/tests/parser.c | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 560c2401b8..c81a712ad8 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -724,7 +724,7 @@ static const WCHAR *value_name_state( struct parser *parser, const WCHAR *pos ) set_state( parser, EOL_BACKSLASH ); return p; default: - if (!iswspace(*p)) token_end = p + 1; + if (*p && !iswspace(*p)) token_end = p + 1; else { push_token( parser, p ); @@ -838,7 +838,7 @@ static const WCHAR *trailing_spaces_state( struct parser *parser, const WCHAR *p set_state( parser, EOL_BACKSLASH ); return p; } - if (!iswspace(*p)) break; + if (*p && !iswspace(*p)) break; } pop_state( parser ); return p; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 8cde35b9de..c18063fbe3 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -370,6 +370,9 @@ static const struct { C("ab\032=cd"), "ab", { "ab" } }, /* nulls */ { C("abcd=ef\x0gh"), "abcd", { "ef gh" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb\0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=bbb \0\n"), "foo", { "bbb" } }, + { C("foo=%bar%\n[Strings]\nbar=aaa\0bbb \0\n"), "foo", { "aaa bbb" } }, /* multiple sections with same name */ { C("[Test2]\nab\n[Test]\nee=ff\n"), "ee", { "ff" } }, /* string substitution */ @@ -470,12 +473,12 @@ static void test_key_names(void) ok( err == 0, "line %u: bad error %u\n", i, err ); if (key_names[i].fields[index]) { - if (i == 49) + if (i == 52) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A1200), /* Vista, W2K8 */ "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); - else if (i == 52) + else if (i == 55) ok( !strcmp( field, key_names[i].fields[index] ) || !strcmp( field, A4096), /* Win10 >= 1709 */ "line %u: bad field %s/%s\n", -- 2.26.2

1 0

[PATCH 1/2] setupapi/tests: Add explicit field for inf contents size.
by Dmitry Timoshkov 17 Sep '20

17 Sep '20

To make possible testing embedded NULs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/setupapi/tests/parser.c | 234 ++++++++++++++++++----------------- 1 file changed, 123 insertions(+), 111 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 06c674aa16..8cde35b9de 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -71,13 +71,13 @@ static const char tmpfilename[] = ".\\tmp.inf"; "verybig=" A1200 "\n" /* create a new file with specified contents and open it */ -static HINF test_file_contents( const char *data, UINT *err_line ) +static HINF test_file_contents( const char *data, int size, UINT *err_line ) { DWORD res; HANDLE handle = CreateFileA( tmpfilename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); if (handle == INVALID_HANDLE_VALUE) return 0; - if (!WriteFile( handle, data, strlen(data), &res, NULL )) trace( "write error\n" ); + if (!WriteFile( handle, data, size, &res, NULL )) trace( "write error\n" ); CloseHandle( handle ); return SetupOpenInfFileA( tmpfilename, 0, INF_STYLE_WIN4, err_line ); } @@ -102,50 +102,53 @@ static const char *get_line_text( INFCONTEXT *context ) static const struct { const char *data; + int data_size; DWORD error; UINT err_line; BOOL todo; } invalid_files[] = { - /* file contents expected error (or 0) errline todo */ - { "\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "abcd\r\n", ERROR_WRONG_INF_STYLE, 0, TRUE }, - { "[Version]\r\n", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "[Version]\nSignature=", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "[Version]\nSignature=foo", ERROR_WRONG_INF_STYLE, 0, FALSE }, - { "[version]\nsignature=$chicago$", 0, 0, FALSE }, - { "[VERSION]\nSIGNATURE=$CHICAGO$", 0, 0, FALSE }, - { "[Version]\nSignature=$chicago$,abcd", 0, 0, FALSE }, - { "[Version]\nabc=def\nSignature=$chicago$", 0, 0, FALSE }, - { "[Version]\nabc=def\n[Version]\nSignature=$chicago$", 0, 0, FALSE }, - { STD_HEADER, 0, 0, FALSE }, - { STD_HEADER "[]\r\n", 0, 0, FALSE }, - { STD_HEADER "]\r\n", 0, 0, FALSE }, - { STD_HEADER "[" A255 "]\r\n", 0, 0, FALSE }, - { STD_HEADER "[ab\r\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER "\n\n[ab\x1a]\n", ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, - { STD_HEADER "[" A256 "]\r\n", ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, - { "[abc]\n" STD_HEADER, 0, 0, FALSE }, - { "abc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, - { ";\n;\nabc\r\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, - { ";\n;\nab\nab\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, - { ";aa\n;bb\n" STD_HEADER, 0, 0, FALSE }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER " [TestSection\x00]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { STD_HEADER " [Test\x00Section]\n", ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, - { "garbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, - { "garbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, - { ";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { ";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, - { " \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER, ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { " \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER, 0, 0, FALSE }, - { "garbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, - { "garbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, - { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { ";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, - { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n", ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, - { " \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n", 0, 0, FALSE }, +#define C(s) s, sizeof(s)-1 + /* file contents expected error (or 0) errline todo */ + { C("\r\n"), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("abcd\r\n"), ERROR_WRONG_INF_STYLE, 0, TRUE }, + { C("[Version]\r\n"), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("[Version]\nSignature="), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("[Version]\nSignature=foo"), ERROR_WRONG_INF_STYLE, 0, FALSE }, + { C("[version]\nsignature=$chicago$"), 0, 0, FALSE }, + { C("[VERSION]\nSIGNATURE=$CHICAGO$"), 0, 0, FALSE }, + { C("[Version]\nSignature=$chicago$,abcd"), 0, 0, FALSE }, + { C("[Version]\nabc=def\nSignature=$chicago$"), 0, 0, FALSE }, + { C("[Version]\nabc=def\n[Version]\nSignature=$chicago$"), 0, 0, FALSE }, + { C(STD_HEADER), 0, 0, FALSE }, + { C(STD_HEADER "[]\r\n"), 0, 0, FALSE }, + { C(STD_HEADER "]\r\n"), 0, 0, FALSE }, + { C(STD_HEADER "[" A255 "]\r\n"), 0, 0, FALSE }, + { C(STD_HEADER "[ab\r\n"), ERROR_BAD_SECTION_NAME_LINE, 3, FALSE }, + { C(STD_HEADER "\n\n[ab\x1a]\n"), ERROR_BAD_SECTION_NAME_LINE, 5, FALSE }, + { C(STD_HEADER "[" A256 "]\r\n"), ERROR_SECTION_NAME_TOO_LONG, 3, FALSE }, + { C("[abc]\n" STD_HEADER), 0, 0, FALSE }, + { C("abc\r\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { C(";\n;\nabc\r\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { C(";\n;\nab\nab\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 3, FALSE }, + { C(";aa\n;bb\n" STD_HEADER), 0, 0, FALSE }, + { C(STD_HEADER " [TestSection\x00]\n"), 0, 0, TRUE }, + { C(STD_HEADER " [Test\x00Section]\n"), 0, 0, TRUE }, + { C(STD_HEADER " [TestSection\x00]\n"), 0, 0, TRUE }, + { C(STD_HEADER " [Test\x00Section]\n"), 0, 0, TRUE }, + { C("garbage1\ngarbage2\n[abc]\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { C("garbage1\ngarbage2\n[Strings]\n" STD_HEADER), 0, 0, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER), 0, 0, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n[abc]\n" STD_HEADER), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n[Strings]\n" STD_HEADER), 0, 0, FALSE }, + { C("garbage1\ngarbage2\n" STD_HEADER "[abc]\n"), ERROR_EXPECTED_SECTION_NAME, 1, FALSE }, + { C("garbage1\ngarbage2\n" STD_HEADER "[Strings]\n"), 0, 0, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n"), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(";comment\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n"), 0, 0, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n" STD_HEADER "[abc]\n"), ERROR_EXPECTED_SECTION_NAME, 2, FALSE }, + { C(" \t\ngarbage1\ngarbage2\n" STD_HEADER "[Strings]\n"), 0, 0, FALSE }, +#undef C }; static void test_invalid_files(void) @@ -159,7 +162,7 @@ static void test_invalid_files(void) { SetLastError( 0xdeadbeef ); err_line = 0xdeadbeef; - hinf = test_file_contents( invalid_files[i].data, &err_line ); + hinf = test_file_contents( invalid_files[i].data, invalid_files[i].data_size, &err_line ); err = GetLastError(); trace( "hinf=%p err=0x%x line=%d\n", hinf, err, err_line ); if (invalid_files[i].error) /* should fail */ @@ -175,8 +178,11 @@ static void test_invalid_files(void) } else /* should succeed */ { - ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i ); - ok( err == 0, "file %u: Error code set to %u\n", i, err ); + todo_wine_if (invalid_files[i].todo) + { + ok( hinf != INVALID_HANDLE_VALUE, "file %u: Open failed\n", i ); + ok( err == 0, "file %u: Error code set to %u\n", i, err ); + } } SetupCloseInfFile( hinf ); } @@ -233,7 +239,7 @@ static void test_section_names(void) for (i = 0; i < ARRAY_SIZE(section_names); i++) { SetLastError( 0xdeadbeef ); - hinf = test_file_contents( section_names[i].data, &err_line ); + hinf = test_file_contents( section_names[i].data, strlen(section_names[i].data), &err_line ); ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; @@ -273,7 +279,7 @@ static void test_enum_sections(void) return; } - hinf = test_file_contents( contents, &err ); + hinf = test_file_contents( contents, strlen(contents), &err ); ok( hinf != NULL, "Expected valid INF file\n" ); for (index = 0; ; index++) @@ -309,84 +315,86 @@ static void test_enum_sections(void) static const struct { const char *data; + int data_size; const char *key; const char *fields[10]; } key_names[] = { -/* file contents expected key expected fields */ - { "ab=cd", "ab", { "cd" } }, - { "ab=cd,ef,gh,ij", "ab", { "cd", "ef", "gh", "ij" } }, - { "ab", "ab", { "ab" } }, - { "ab,cd", NULL, { "ab", "cd" } }, - { "ab,cd=ef", NULL, { "ab", "cd=ef" } }, - { "=abcd,ef", "", { "abcd", "ef" } }, +#define C(s) s, sizeof(s)-1 +/* file contents expected key expected fields */ + { C("ab=cd"), "ab", { "cd" } }, + { C("ab=cd,ef,gh,ij"), "ab", { "cd", "ef", "gh", "ij" } }, + { C("ab"), "ab", { "ab" } }, + { C("ab,cd"), NULL, { "ab", "cd" } }, + { C("ab,cd=ef"), NULL, { "ab", "cd=ef" } }, + { C("=abcd,ef"), "", { "abcd", "ef" } }, /* backslashes */ - { "ba\\\ncd=ef", "bacd", { "ef" } }, - { "ab \\ \ncd=ef", "abcd", { "ef" } }, - { "ab\\\ncd,ef", NULL, { "abcd", "ef" } }, - { "ab \\ ;cc\ncd=ef", "abcd", { "ef" } }, - { "ab \\ \\ \ncd=ef", "abcd", { "ef" } }, - { "ba \\ dc=xx", "ba \\ dc", { "xx" } }, - { "ba \\\\ \nc=d", "bac", { "d" } }, - { "a=b\\\\c", "a", { "b\\\\c" } }, - { "ab=cd \\ ", "ab", { "cd" } }, - { "ba=c \\ \n \\ \n a", "ba", { "ca" } }, - { "ba=c \\ \n \\ a", "ba", { "c\\ a" } }, - { " \\ a= \\ b", "\\ a", { "\\ b" } }, + { C("ba\\\ncd=ef"), "bacd", { "ef" } }, + { C("ab \\ \ncd=ef"), "abcd", { "ef" } }, + { C("ab\\\ncd,ef"), NULL, { "abcd", "ef" } }, + { C("ab \\ ;cc\ncd=ef"), "abcd", { "ef" } }, + { C("ab \\ \\ \ncd=ef"), "abcd", { "ef" } }, + { C("ba \\ dc=xx"), "ba \\ dc", { "xx" } }, + { C("ba \\\\ \nc=d"), "bac", { "d" } }, + { C("a=b\\\\c"), "a", { "b\\\\c" } }, + { C("ab=cd \\ "), "ab", { "cd" } }, + { C("ba=c \\ \n \\ \n a"), "ba", { "ca" } }, + { C("ba=c \\ \n \\ a"), "ba", { "c\\ a" } }, + { C(" \\ a= \\ b"), "\\ a", { "\\ b" } }, /* quotes */ - { "Ab\"Cd\"=Ef", "AbCd", { "Ef" } }, - { "Ab\"Cd=Ef\"", "AbCd=Ef", { "AbCd=Ef" } }, - { "ab\"\"\"cd,ef=gh\"", "ab\"cd,ef=gh", { "ab\"cd,ef=gh" } }, - { "ab\"\"cd=ef", "abcd", { "ef" } }, - { "ab\"\"cd=ef,gh", "abcd", { "ef", "gh" } }, - { "ab=cd\"\"ef", "ab", { "cdef" } }, - { "ab=cd\",\"ef", "ab", { "cd,ef" } }, - { "ab=cd\",ef", "ab", { "cd,ef" } }, - { "ab=cd\",ef\\\nab", "ab", { "cd,ef\\" } }, + { C("Ab\"Cd\"=Ef"), "AbCd", { "Ef" } }, + { C("Ab\"Cd=Ef\""), "AbCd=Ef", { "AbCd=Ef" } }, + { C("ab\"\"\"cd,ef=gh\""), "ab\"cd,ef=gh", { "ab\"cd,ef=gh" } }, + { C("ab\"\"cd=ef"), "abcd", { "ef" } }, + { C("ab\"\"cd=ef,gh"), "abcd", { "ef", "gh" } }, + { C("ab=cd\"\"ef"), "ab", { "cdef" } }, + { C("ab=cd\",\"ef"), "ab", { "cd,ef" } }, + { C("ab=cd\",ef"), "ab", { "cd,ef" } }, + { C("ab=cd\",ef\\\nab"), "ab", { "cd,ef\\" } }, /* single quotes (unhandled)*/ - { "HKLM,A,B,'C',D", NULL, { "HKLM", "A","B","'C'","D" } }, + { C("HKLM,A,B,'C',D"), NULL, { "HKLM", "A","B","'C'","D" } }, /* spaces */ - { " a b = c , d \n", "a b", { "c", "d" } }, - { " a b = c ,\" d\" \n", "a b", { "c", " d" } }, - { " a b\r = c\r\n", "a b", { "c" } }, + { C(" a b = c , d \n"), "a b", { "c", "d" } }, + { C(" a b = c ,\" d\" \n"), "a b", { "c", " d" } }, + { C(" a b\r = c\r\n"), "a b", { "c" } }, /* empty fields */ - { "a=b,,,c,,,d", "a", { "b", "", "", "c", "", "", "d" } }, - { "a=b,\"\",c,\" \",d", "a", { "b", "", "c", " ", "d" } }, - { "=,,b", "", { "", "", "b" } }, - { ",=,,b", NULL, { "", "=", "", "b" } }, - { "a=\n", "a", { "" } }, - { "=", "", { "" } }, + { C("a=b,,,c,,,d"), "a", { "b", "", "", "c", "", "", "d" } }, + { C("a=b,\"\",c,\" \",d"), "a", { "b", "", "c", " ", "d" } }, + { C("=,,b"), "", { "", "", "b" } }, + { C(",=,,b"), NULL, { "", "=", "", "b" } }, + { C("a=\n"), "a", { "" } }, + { C("="), "", { "" } }, /* eof */ - { "ab=c\032d", "ab", { "c" } }, - { "ab\032=cd", "ab", { "ab" } }, + { C("ab=c\032d"), "ab", { "c" } }, + { C("ab\032=cd"), "ab", { "ab" } }, /* nulls */ - { "abcd=ef\x0gh", "abcd", { "ef" } }, + { C("abcd=ef\x0gh"), "abcd", { "ef gh" } }, /* multiple sections with same name */ - { "[Test2]\nab\n[Test]\nee=ff\n", "ee", { "ff" } }, + { C("[Test2]\nab\n[Test]\nee=ff\n"), "ee", { "ff" } }, /* string substitution */ - { "%foo%=%bar%\n" STR_SECTION, "aaa", { "bbb" } }, - { "%foo%xx=%bar%yy\n" STR_SECTION, "aaaxx", { "bbbyy" } }, - { "%% %foo%=%bar%\n" STR_SECTION, "% aaa", { "bbb" } }, - { "%f\"o\"o%=ccc\n" STR_SECTION, "aaa", { "ccc" } }, - { "abc=%bar;bla%\n" STR_SECTION, "abc", { "%bar" } }, - { "loop=%loop%\n" STR_SECTION, "loop", { "%loop2%" } }, - { "%per%%cent%=100\n" STR_SECTION, "12", { "100" } }, - { "a=%big%\n" STR_SECTION, "a", { A400 } }, - { "a=%verybig%\n" STR_SECTION, "a", { A511 } }, /* truncated to 511, not on Vista/W2K8 */ - { "a=%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 } }, - { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, - { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, + { C("%foo%=%bar%\n" STR_SECTION), "aaa", { "bbb" } }, + { C("%foo%xx=%bar%yy\n" STR_SECTION), "aaaxx", { "bbbyy" } }, + { C("%% %foo%=%bar%\n" STR_SECTION), "% aaa", { "bbb" } }, + { C("%f\"o\"o%=ccc\n" STR_SECTION), "aaa", { "ccc" } }, + { C("abc=%bar;bla%\n" STR_SECTION), "abc", { "%bar" } }, + { C("loop=%loop%\n" STR_SECTION), "loop", { "%loop2%" } }, + { C("%per%%cent%=100\n" STR_SECTION), "12", { "100" } }, + { C("a=%big%\n" STR_SECTION), "a", { A400 } }, + { C("a=%verybig%\n" STR_SECTION), "a", { A511 } }, /* truncated to 511, not on Vista/W2K8 */ + { C("a=%big%%big%%big%%big%\n" STR_SECTION), "a", { A400 A400 A400 A400 } }, + { C("a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION), "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, + { C("a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION), "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, /* Prove expansion of system entries removes extra \'s and string replacements doesn't */ - { "ab=\"%24%\"\n" STR_SECTION, "ab", { "C:\\" } }, - { "ab=\"%mydrive%\"\n" STR_SECTION, "ab", { "C:\\" } }, - { "ab=\"%24%\\fred\"\n" STR_SECTION, "ab", { "C:\\fred" } }, - { "ab=\"%mydrive%\\fred\"\n" STR_SECTION,"ab", { "C:\\\\fred" } }, + { C("ab=\"%24%\"\n" STR_SECTION), "ab", { "C:\\" } }, + { C("ab=\"%mydrive%\"\n" STR_SECTION), "ab", { "C:\\" } }, + { C("ab=\"%24%\\fred\"\n" STR_SECTION), "ab", { "C:\\fred" } }, + { C("ab=\"%mydrive%\\fred\"\n" STR_SECTION),"ab", { "C:\\\\fred" } }, /* Confirm duplicate \'s kept */ - { "ab=\"%24%\\\\fred\"", "ab", { "C:\\\\fred" } }, - { "ab=C:\\\\FRED", "ab", { "C:\\\\FRED" } }, + { C("ab=\"%24%\\\\fred\""), "ab", { "C:\\\\fred" } }, + { C("ab=C:\\\\FRED"), "ab", { "C:\\\\FRED" } }, }; /* check the key of a certain line */ @@ -421,10 +429,14 @@ static void test_key_names(void) for (i = 0; i < ARRAY_SIZE(key_names); i++) { + int data_size; + strcpy( buffer, STD_HEADER "[Test]\n" ); - strcat( buffer, key_names[i].data ); + data_size = strlen(buffer); + memcpy( buffer + data_size, key_names[i].data, key_names[i].data_size ); + data_size += key_names[i].data_size; SetLastError( 0xdeadbeef ); - hinf = test_file_contents( buffer, &err_line ); + hinf = test_file_contents( buffer, data_size, &err_line ); ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; @@ -560,7 +572,7 @@ static void test_pSetupGetField(void) unicode = FALSE; } - hinf = test_file_contents( contents, &err ); + hinf = test_file_contents( contents, strlen(contents), &err ); ok( hinf != NULL, "Expected valid INF file\n" ); ret = SetupFindFirstLineA( hinf, "FileBranchInfo", NULL, &context ); @@ -651,7 +663,7 @@ static void test_SetupGetIntField(void) strcat( buffer, keys[i].key ); strcat( buffer, "=" ); strcat( buffer, keys[i].fields ); - hinf = test_file_contents( buffer, &err); + hinf = test_file_contents( buffer, strlen(buffer), &err); ok( hinf != NULL, "Expected valid INF file\n" ); SetupFindFirstLineA( hinf, "TestSection", keys[i].key, &context ); @@ -695,7 +707,7 @@ static void test_GLE(void) int bufsize = MAX_INF_STRING_LENGTH; DWORD retsize; - hinf = test_file_contents( inf, &err ); + hinf = test_file_contents( inf, strlen(inf), &err ); ok( hinf != NULL, "Expected valid INF file\n" ); SetLastError(0xdeadbeef); -- 2.26.2

1 0

[PATCH] ntdll: Implement __C_specific_handler and _local_unwind for arm64
by Martin Storsjo 17 Sep '20

17 Sep '20

The __C_specific_handler function is based on the existing one for x86_64, but with a few small changes: - The TargetIp field in DISPATCHER_CONTEXT is renamed to TargetPc - The handler/filter functions are called via wrapper functions that set up the nonvolatile registers before calling them - Adjust ControlPc backwards if ControlPcIsUnwound is set Signed-off-by: Martin Storsjo <martin(a)martin.st> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 +- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_arm64.c | 174 ++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- dlls/vcruntime140/vcruntime140.spec | 4 +- 5 files changed, 182 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index f74cea4e14c..f9cfe67c1b0 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler @ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @@ -62,7 +62,7 @@ @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) ucrtbase._local_unwind +@ cdecl -arch=x86_64,arm64 _local_unwind(ptr ptr) ucrtbase._local_unwind @ cdecl -arch=i386 _local_unwind2(ptr long) ucrtbase._local_unwind2 @ cdecl -arch=i386 _local_unwind4(ptr ptr long) ucrtbase._local_unwind4 @ cdecl -arch=i386 _longjmpex(ptr long) ucrtbase._longjmpex diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 453c4827572..af1fac8df8e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1437,7 +1437,7 @@ @ cdecl -private -arch=i386 _CIpow() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) @ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @@ -1463,7 +1463,7 @@ @ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) @ cdecl _lfind(ptr ptr ptr long ptr) -@ stdcall -arch=x86_64 _local_unwind(ptr ptr) +@ stdcall -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl _ltoa(long ptr long) @ cdecl _ltow(long ptr long) @ cdecl _memccpy(ptr ptr long long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2335a6cc0a8..d585fe0d93c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -39,6 +39,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); +typedef struct _SCOPE_TABLE +{ + ULONG Count; + struct + { + ULONG BeginAddress; + ULONG EndAddress; + ULONG HandlerAddress; + ULONG JumpTarget; + } ScopeRecord[1]; +} SCOPE_TABLE, *PSCOPE_TABLE; + + /* layering violation: the setjmp buffer is defined in msvcrt, but used by RtlUnwindEx */ struct MSVCRT_JUMP_BUFFER { @@ -63,6 +76,19 @@ struct MSVCRT_JUMP_BUFFER }; +static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) +{ + unsigned int i; + + TRACE( "scope table at %p\n", table ); + for (i = 0; i < table->Count; i++) + TRACE( " %u: %lx-%lx handler %lx target %lx\n", i, + base + table->ScopeRecord[i].BeginAddress, + base + table->ScopeRecord[i].EndAddress, + base + table->ScopeRecord[i].HandlerAddress, + base + table->ScopeRecord[i].JumpTarget ); +} + /******************************************************************* * is_valid_frame */ @@ -1225,6 +1251,154 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); } +/******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); +} + +extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, + PEXCEPTION_FILTER filter, + PUCHAR nonvolatile); +__ASM_GLOBAL_FUNC( __C_ExecuteExceptionFilter, + "stp x29, x30, [sp, #-96]!\n\t" + __ASM_SEH(".seh_save_fplr_x 96\n\t") + "stp x19, x20, [sp, #16]\n\t" + __ASM_SEH(".seh_save_regp x19, 16\n\t") + "stp x21, x22, [sp, #32]\n\t" + __ASM_SEH(".seh_save_regp x21, 32\n\t") + "stp x23, x24, [sp, #48]\n\t" + __ASM_SEH(".seh_save_regp x23, 48\n\t") + "stp x25, x26, [sp, #64]\n\t" + __ASM_SEH(".seh_save_regp x25, 64\n\t") + "stp x27, x28, [sp, #80]\n\t" + __ASM_SEH(".seh_save_regp x27, 80\n\t") + "mov x29, sp\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") + + __ASM_CFI(".cfi_def_cfa x29, 96\n\t") + __ASM_CFI(".cfi_offset x29, -96\n\t") + __ASM_CFI(".cfi_offset x30, -88\n\t") + __ASM_CFI(".cfi_offset x19, -80\n\t") + __ASM_CFI(".cfi_offset x20, -72\n\t") + __ASM_CFI(".cfi_offset x21, -64\n\t") + __ASM_CFI(".cfi_offset x22, -56\n\t") + __ASM_CFI(".cfi_offset x23, -48\n\t") + __ASM_CFI(".cfi_offset x24, -40\n\t") + __ASM_CFI(".cfi_offset x25, -32\n\t") + __ASM_CFI(".cfi_offset x26, -24\n\t") + __ASM_CFI(".cfi_offset x27, -16\n\t") + __ASM_CFI(".cfi_offset x28, -8\n\t") + + "ldp x19, x20, [x3, #0]\n\t" + "ldp x21, x22, [x3, #16]\n\t" + "ldp x23, x24, [x3, #32]\n\t" + "ldp x25, x26, [x3, #48]\n\t" + "ldp x27, x28, [x3, #64]\n\t" + /* Overwrite the frame parameter with Fp from the + * nonvolatile regs */ + "ldr x1, [x3, #80]\n\t" + "blr x2\n\t" + "ldp x19, x20, [sp, #16]\n\t" + "ldp x21, x22, [sp, #32]\n\t" + "ldp x23, x24, [sp, #48]\n\t" + "ldp x25, x26, [sp, #64]\n\t" + "ldp x27, x28, [sp, #80]\n\t" + "ldp x29, x30, [sp], #96\n\t" + "ret") + +extern void __C_ExecuteTerminationHandler(BOOL abnormal, PVOID frame, + PTERMINATION_HANDLER handler, + PUCHAR nonvolatile); +/* This is, implementation wise, identical to __C_ExecuteExceptionFilter. */ +__ASM_GLOBAL_FUNC( __C_ExecuteTerminationHandler, + "b " __ASM_NAME("__C_ExecuteExceptionFilter") "\n\t"); + +/******************************************************************* + * __C_specific_handler (NTDLL.@) + */ +EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, + void *frame, + CONTEXT *context, + struct _DISPATCHER_CONTEXT *dispatch ) +{ + SCOPE_TABLE *table = dispatch->HandlerData; + ULONG i; + DWORD64 ControlPc = dispatch->ControlPc; + + TRACE( "%p %p %p %p\n", rec, frame, context, dispatch ); + if (TRACE_ON(seh)) dump_scope_table( dispatch->ImageBase, table ); + + if (dispatch->ControlPcIsUnwound) + ControlPc -= 4; + + if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + for (i = dispatch->ScopeIndex; i < table->Count; i++) + { + if (ControlPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + ControlPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + PTERMINATION_HANDLER handler; + + if (table->ScopeRecord[i].JumpTarget) continue; + + if (rec->ExceptionFlags & EH_TARGET_UNWIND && + dispatch->TargetPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + dispatch->TargetPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + break; + } + + handler = (PTERMINATION_HANDLER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + dispatch->ScopeIndex = i+1; + + TRACE( "calling __finally %p frame %p\n", handler, frame ); + __C_ExecuteTerminationHandler( TRUE, frame, handler, + dispatch->NonVolatileRegisters ); + } + } + return ExceptionContinueSearch; + } + + for (i = dispatch->ScopeIndex; i < table->Count; i++) + { + if (ControlPc >= dispatch->ImageBase + table->ScopeRecord[i].BeginAddress && + ControlPc < dispatch->ImageBase + table->ScopeRecord[i].EndAddress) + { + if (!table->ScopeRecord[i].JumpTarget) continue; + if (table->ScopeRecord[i].HandlerAddress != EXCEPTION_EXECUTE_HANDLER) + { + EXCEPTION_POINTERS ptrs; + PEXCEPTION_FILTER filter; + + filter = (PEXCEPTION_FILTER)(dispatch->ImageBase + table->ScopeRecord[i].HandlerAddress); + ptrs.ExceptionRecord = rec; + ptrs.ContextRecord = context; + TRACE( "calling filter %p ptrs %p frame %p\n", filter, &ptrs, frame ); + switch (__C_ExecuteExceptionFilter( &ptrs, frame, filter, + dispatch->NonVolatileRegisters )) + { + case EXCEPTION_EXECUTE_HANDLER: + break; + case EXCEPTION_CONTINUE_SEARCH: + continue; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + } + } + TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget ); + RtlUnwindEx( frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget, + rec, 0, dispatch->ContextRecord, dispatch->HistoryTable ); + } + } + return ExceptionContinueSearch; +} + /*********************************************************************** * RtlRaiseException (NTDLL.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 05ac3d3427a..4981d7fbac7 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -48,7 +48,7 @@ @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @@ -555,7 +555,7 @@ @ cdecl -arch=i386 -norelay _libm_sse2_sqrt_precise() MSVCRT___libm_sse2_sqrt_precise @ cdecl -arch=i386 -norelay _libm_sse2_tan_precise() MSVCRT___libm_sse2_tan @ cdecl _loaddll(str) -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) +@ cdecl -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl -arch=i386 _local_unwind2(ptr long) @ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 45d9370c86a..f799bcd4db5 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -10,7 +10,7 @@ @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler @ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @@ -64,7 +64,7 @@ @ cdecl -arch=i386 _local_unwind2(ptr long) ucrtbase._local_unwind2 @ cdecl -arch=i386 _local_unwind4(ptr ptr long) ucrtbase._local_unwind4 @ cdecl -arch=i386 _longjmpex(ptr long) ucrtbase._longjmpex -@ cdecl -arch=x86_64 _local_unwind(ptr ptr) ucrtbase._local_unwind +@ cdecl -arch=x86_64,arm64 _local_unwind(ptr ptr) ucrtbase._local_unwind @ cdecl _purecall() ucrtbase._purecall @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind -- 2.17.1

2 2

[PATCH 1/2] ole32/clipboard: Use wide string constants.
by Nikolay Sivov 17 Sep '20

17 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/clipboard.c | 53 +++++++++++++----------------------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index cb6770c05b3..01cfda831f5 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1743,35 +1743,19 @@ static snapshot *snapshot_construct(DWORD seq_no) */ static void register_clipboard_formats(void) { - static const WCHAR OwnerLink[] = {'O','w','n','e','r','L','i','n','k',0}; - static const WCHAR FileName[] = {'F','i','l','e','N','a','m','e',0}; - static const WCHAR FileNameW[] = {'F','i','l','e','N','a','m','e','W',0}; - static const WCHAR DataObject[] = {'D','a','t','a','O','b','j','e','c','t',0}; - static const WCHAR EmbeddedObject[] = {'E','m','b','e','d','d','e','d',' ','O','b','j','e','c','t',0}; - static const WCHAR EmbedSource[] = {'E','m','b','e','d',' ','S','o','u','r','c','e',0}; - static const WCHAR CustomLinkSource[] = {'C','u','s','t','o','m',' ','L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR LinkSource[] = {'L','i','n','k',' ','S','o','u','r','c','e',0}; - static const WCHAR ObjectDescriptor[] = {'O','b','j','e','c','t',' ','D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR LinkSourceDescriptor[] = {'L','i','n','k',' ','S','o','u','r','c','e',' ', - 'D','e','s','c','r','i','p','t','o','r',0}; - static const WCHAR OlePrivateData[] = {'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0}; - - static const WCHAR WineMarshalledDataObject[] = {'W','i','n','e',' ','M','a','r','s','h','a','l','l','e','d',' ', - 'D','a','t','a','O','b','j','e','c','t',0}; - - ownerlink_clipboard_format = RegisterClipboardFormatW(OwnerLink); - filename_clipboard_format = RegisterClipboardFormatW(FileName); - filenameW_clipboard_format = RegisterClipboardFormatW(FileNameW); - dataobject_clipboard_format = RegisterClipboardFormatW(DataObject); - embedded_object_clipboard_format = RegisterClipboardFormatW(EmbeddedObject); - embed_source_clipboard_format = RegisterClipboardFormatW(EmbedSource); - custom_link_source_clipboard_format = RegisterClipboardFormatW(CustomLinkSource); - link_source_clipboard_format = RegisterClipboardFormatW(LinkSource); - object_descriptor_clipboard_format = RegisterClipboardFormatW(ObjectDescriptor); - link_source_descriptor_clipboard_format = RegisterClipboardFormatW(LinkSourceDescriptor); - ole_private_data_clipboard_format = RegisterClipboardFormatW(OlePrivateData); - - wine_marshal_clipboard_format = RegisterClipboardFormatW(WineMarshalledDataObject); + ownerlink_clipboard_format = RegisterClipboardFormatW(L"OwnerLink"); + filename_clipboard_format = RegisterClipboardFormatW(L"FileName"); + filenameW_clipboard_format = RegisterClipboardFormatW(L"FileNameW"); + dataobject_clipboard_format = RegisterClipboardFormatW(L"DataObject"); + embedded_object_clipboard_format = RegisterClipboardFormatW(L"Embedded Object"); + embed_source_clipboard_format = RegisterClipboardFormatW(L"Embed Source"); + custom_link_source_clipboard_format = RegisterClipboardFormatW(L"Custom Link Source"); + link_source_clipboard_format = RegisterClipboardFormatW(L"Link Source"); + object_descriptor_clipboard_format = RegisterClipboardFormatW(L"Object Descriptor"); + link_source_descriptor_clipboard_format = RegisterClipboardFormatW(L"Link Source Descriptor"); + ole_private_data_clipboard_format = RegisterClipboardFormatW(L"Ole Private Data"); + + wine_marshal_clipboard_format = RegisterClipboardFormatW(L"Wine Marshalled DataObject"); } /*********************************************************************** @@ -2026,9 +2010,6 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd ) { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - /* OleUninitialize() does not release the reference to the dataobject, so take an additional reference here. This reference is then leaked. */ if (clipbrd->src_data) @@ -2040,7 +2021,7 @@ void OLEClipbrd_UnInitialize(void) if ( clipbrd->window ) { DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); + UnregisterClassW( clipbrd_wndclass, GetModuleHandleW(L"ole32") ); } IStream_Release(clipbrd->marshal_data); @@ -2115,9 +2096,7 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, static HWND create_clipbrd_window(void) { WNDCLASSEXW class; - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - static const WCHAR title[] = {'C','l','i','p','b','o','a','r','d','W','i','n','d','o','w',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); + HINSTANCE hinst = GetModuleHandleW(L"ole32"); class.cbSize = sizeof(class); class.style = 0; @@ -2134,7 +2113,7 @@ static HWND create_clipbrd_window(void) RegisterClassExW(&class); - return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, + return CreateWindowW(clipbrd_wndclass, L"ClipboardWindow", WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, 0, 0, 0, 0, HWND_MESSAGE, NULL, hinst, 0); } -- 2.28.0

1 1

[PATCH vkd3d-shader 1/5] vkd3d-shader: Print "domain" in tessellator domains.
by Isabella Bosia 17 Sep '20

17 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 68a90fd..3a17c22 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -420,6 +420,7 @@ static void shader_dump_uav_flags(struct vkd3d_string_buffer *buffer, DWORD uav_ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, enum vkd3d_tessellator_domain domain) { + shader_addline(buffer, "domain_"); switch (domain) { case VKD3D_TESSELLATOR_DOMAIN_LINE: -- 2.25.1

2 9

[PATCH vkd3d 1/6] vkd3d-shader: Remove [ ] from x registers in dcl_indexabletemp.
by Isabella Bosia 17 Sep '20

17 Sep '20

Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 3571de8..7553724 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1330,7 +1330,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, break; case VKD3DSIH_DCL_INDEXABLE_TEMP: - shader_addline(buffer, "%s x[%u][%u], %u", shader_opcode_names[ins->handler_idx], + shader_addline(buffer, "%s x%u[%u], %u", shader_opcode_names[ins->handler_idx], ins->declaration.indexable_temp.register_idx, ins->declaration.indexable_temp.register_size, ins->declaration.indexable_temp.component_count); -- 2.25.1

2 11

[PATCH 1/2] oleacc: Use wide string constants.
by Nikolay Sivov 17 Sep '20

17 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleacc/client.c | 3 +-- dlls/oleacc/main.c | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 1d43ec31063..3b33be55a21 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -274,7 +274,6 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { - static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); WCHAR name[1024]; UINT i, len; @@ -293,7 +292,7 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, if(i+1 >= len) return S_FALSE; - *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + *pszKeyboardShortcut = SysAllocString(L"Alt+!"); if(!*pszKeyboardShortcut) return E_OUTOFMEMORY; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f26abbd117c..f6b66a8bcab 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,15 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; -static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; -static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; -static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; -static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; -static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; -static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; -static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; - typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; @@ -60,15 +51,15 @@ static struct { accessible_create create_window; } builtin_classes[] = { {WC_LISTBOXW, 0x10000, NULL, NULL}, - {menuW, 0x10001, NULL, NULL}, + {L"#32768", 0x10001, NULL, NULL}, /* menu */ {WC_BUTTONW, 0x10002, NULL, NULL}, {WC_STATICW, 0x10003, NULL, NULL}, {WC_EDITW, 0x10004, NULL, NULL}, {WC_COMBOBOXW, 0x10005, NULL, NULL}, - {dialogW, 0x10006, NULL, NULL}, - {winswitchW, 0x10007, NULL, NULL}, - {mdi_clientW, 0x10008, NULL, NULL}, - {desktopW, 0x10009, NULL, NULL}, + {L"#32770", 0x10006, NULL, NULL}, /* dialog */ + {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ + {L"MDIClient", 0x10008, NULL, NULL}, + {L"#32769", 0x10009, NULL, NULL}, /* desktop */ {WC_SCROLLBARW, 0x1000a, NULL, NULL}, {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, @@ -85,9 +76,9 @@ static struct { {MONTHCAL_CLASSW, 0, NULL, NULL}, {DATETIMEPICK_CLASSW, 0, NULL, NULL}, {WC_IPADDRESSW, 0, NULL, NULL}, - {richeditW, 0x1001c, NULL, NULL}, - {richedit20aW, 0, NULL, NULL}, - {richedit20wW, 0, NULL, NULL}, + {L"RICHEDIT", 0x1001c, NULL, NULL}, + {L"RichEdit20A", 0, NULL, NULL}, + {L"RichEdit20W", 0, NULL, NULL}, }; static HINSTANCE oleacc_handle = 0; @@ -243,7 +234,6 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { - static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0}; static const LARGE_INTEGER seek_zero = {{0}}; WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3]; @@ -319,7 +309,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(), + swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, L"%08x:%08x:%08x", GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) { -- 2.28.0

1 1

Kernel32 resource test job takes a long time on 3 win10 test machines.
by Ziqing Hui 17 Sep '20

17 Sep '20

Hi, Does any one have idea why this test job takes a very very long time (about 2 minutes) on w10pro64, w10pro64_2scr and w10pro64_ar test machines? It takes few seconds on other test machines including other win10 machines. Test job link: https://testbot.winehq.org/JobDetails.pl?Key=78782 Patch related to this test job: https://source.winehq.org/patches/data/192735 A test job same to the one above but includes some performance test: https://testbot.winehq.org/JobDetails.pl?Key=78817 Thanks, Ziqing

1 0

[PATCH] gdiplus/tests: Don't test point type array padding.
by Esme Povirk 16 Sep '20

16 Sep '20

Since the point types are an array of bytes, padded to a DWORD boundary, some of the bytes at the end are undefined, and there's no good reason to test them. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- This should fix the recent failures on Windows 10. dlls/gdiplus/tests/region.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d69f09db602..04c388bf5a7 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -641,8 +641,8 @@ static void test_getregiondata(void) expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); - ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, - "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); + ok((*(buf + 28) & 0xffff) == 0x0101, + "expected ????0101 got %08x\n", *(buf + 28)); expect_dword(buf + 29, 0xeeeeeeee); test_region_data(buf, needed, __LINE__); @@ -791,9 +791,8 @@ static void test_getregiondata(void) expect_float(buf + 30, 789.799561); expect_dword(buf + 31, 0x03030300); expect_dword(buf + 32, 0x03030301); - ok(*(buf + 33) == 0x00030303 /* before win7 */ || - *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, - "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + ok((*(buf + 33) & 0xffffff) == 0x030303, + "expected 0x??030303 got %08x\n", *(buf + 33)); expect_dword(buf + 34, 0xeeeeeeee); test_region_data(buf, needed, __LINE__); -- 2.17.1

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 16 Sep '20

16 Sep '20

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel