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

[PATCH 1/7] mshtml/tests: Allow error when loading an image in events.html.
by Jacek Caban 26 Mar '21

26 Mar '21

Fixes tests on win8. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.html | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[PATCH 1/2] ntdll/tests: Add a test for segment register contents in x86_64 exception handlers.
by Zebediah Figura 26 Mar '21

26 Mar '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/exception.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index da88ca449fb..e2a8071168d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2812,7 +2812,7 @@ static void test___C_specific_handler(void) /* This is heavily based on the i386 exception tests. */ static const struct exception { - BYTE code[18]; /* asm code */ + BYTE code[24]; /* asm code */ BYTE offset; /* offset of faulting instruction */ BYTE length; /* length of faulting instruction */ NTSTATUS status; /* expected status code */ @@ -2921,6 +2921,14 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, + + /* test exception with cleared %ds and %es */ + { { 0x8c, 0xd8, 0x50, 0x8c, 0xc0, 0x50, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, + 0xfa, 0x58, 0x8e, 0xc0, 0x58, 0x8e, 0xd8, 0xc3 }, + /* mov %ds,%eax; pushq %rax; mov %es,%eax; pushq %rax; xorl %eax,%eax; mov %eax,%ds; mov %eax,%es; + * cli; popq %rax; mov %eax,%es; popq %rax; mov %eax,%ds; ret */ + 12, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, @@ -2992,6 +3000,9 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "%u: Unexpected exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)context->Rip ); + todo_wine ok( context->SegDs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs ); + if (except->status == STATUS_BREAKPOINT && is_wow64) parameter_count = 1; else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) -- 2.30.2

4 6

[tools] testbot/TestLauncher: Fix the spelling of an error message.
by Francois Gouget 26 Mar '21

26 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index cfd74ef7e..b024714ac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -267,7 +267,7 @@ int main(int argc, char *argv[]) { if (GetFullPathNameA(argv[Arg], ARRAY_SIZE(TestExeFullName), TestExeFullName, &TestExeFileName) == 0) { - Error("Cauld not get the test executable full path %s (error %lu)\n", + Error("Could not get the test executable full path %s (error %lu)\n", argv[Arg], GetLastError()); return 1; } -- 2.20.1

1 0

[tools] testbot/TestWTBS: Fix a couple of typos in the documentation.
by Francois Gouget 26 Mar '21

26 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 81b56c470..dcdd6ccee 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -675,8 +675,8 @@ there is no error one would declare an empty group such as below, though a g 0 tests.report.kernel32 Finally, note that while the error directives are inherited by subcategories, -they are not merged. So if if both win and win32 have error-matching -directives, win32 will not inherit anything from the win category. +they are not merged. So if both win and win32 have error-matching directives, +win32 will not inherit anything from the win category. =item <tasks.(report|log|testbot).Errors> @@ -873,8 +873,8 @@ Checks that the TestBot applied the patch and did not find it necessary to run make_requests and make_opengl. Finally, note that while the Grep* directives are inherited by subcategories, -they are not merged. So if if both win and win32 have Grep directives, win32 -will not inherit anything from the win category. +they are not merged. So if both win and win32 have Grep directives, win32 will +not inherit anything from the win category. =cut -- 2.20.1

1 0

[PATCH] ieframe/tests: Allow non-zero initial session counter value.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/tests/webbrowser.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)

1 0

[PATCH v4 1/3] windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion.
by Rémi Bernon 26 Mar '21

26 Mar '21

Returning the user default country. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: Same as v3, fix the error handling but without the stupid typo. dlls/windows.globalization/main.c | 12 ++++++++++-- dlls/windows.globalization/tests/globalization.c | 15 +++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 17bb49a1c4e..84813152047 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -225,8 +225,16 @@ static HRESULT STDMETHODCALLTYPE globalization_preferences_get_Languages( static HRESULT STDMETHODCALLTYPE globalization_preferences_get_HomeGeographicRegion( IGlobalizationPreferencesStatics *iface, HSTRING* out) { - FIXME("iface %p, out %p stub!\n", iface, out); - return E_NOTIMPL; + WCHAR country[16]; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!GetUserDefaultGeoName(country, 16)) + return E_FAIL; + + TRACE("returning country %s\n", debugstr_w(country)); + + return WindowsCreateString(country, wcslen(country), out); } static HRESULT STDMETHODCALLTYPE globalization_preferences_get_WeekStartsOn( diff --git a/dlls/windows.globalization/tests/globalization.c b/dlls/windows.globalization/tests/globalization.c index 1918322b7a2..00d9cee5b0d 100644 --- a/dlls/windows.globalization/tests/globalization.c +++ b/dlls/windows.globalization/tests/globalization.c @@ -55,14 +55,11 @@ static void test_GlobalizationPreferences(void) BOOLEAN found; HRESULT hr; UINT32 len; - WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], *country, *tmp; + WCHAR *buf, locale[LOCALE_NAME_MAX_LENGTH], country[16]; UINT32 i, size; GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); - if ((tmp = wcsrchr(locale, '_'))) *tmp = 0; - if (!(tmp = wcschr(locale, '-')) || (wcslen(tmp) > 3 && !(tmp = wcschr(tmp + 1, '-')))) country = wcsdup(L"US"); - else country = wcsdup(tmp + 1); - GetUserDefaultLocaleName(locale, LOCALE_NAME_MAX_LENGTH); + GetUserDefaultGeoName(country, 16); hr = pRoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -77,7 +74,6 @@ static void test_GlobalizationPreferences(void) win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); pWindowsDeleteString(str); pRoUninitialize(); - free(country); return; } @@ -101,8 +97,7 @@ static void test_GlobalizationPreferences(void) IAgileObject_Release(tmp_agile_object); hr = IGlobalizationPreferencesStatics_get_HomeGeographicRegion(preferences_statics, &tmp_str); - todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); - if (FAILED(hr)) goto done; + ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_HomeGeographicRegion failed, hr %#x\n", hr); buf = pWindowsGetStringRawBuffer(tmp_str, &len); ok(buf != NULL && len > 0, "WindowsGetStringRawBuffer returned buf %p, len %u\n", buf, len); @@ -113,7 +108,8 @@ static void test_GlobalizationPreferences(void) pWindowsDeleteString(tmp_str); hr = IGlobalizationPreferencesStatics_get_Languages(preferences_statics, &languages); - ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + todo_wine ok(hr == S_OK, "IGlobalizationPreferencesStatics_get_Languages failed, hr %#x\n", hr); + if (FAILED(hr)) goto done; hr = IVectorView_HSTRING_QueryInterface(languages, &IID_IInspectable, (void **)&tmp_inspectable); ok(hr == S_OK, "IVectorView_HSTRING_QueryInterface failed, hr %#x\n", hr); @@ -164,7 +160,6 @@ done: pWindowsDeleteString(str); pRoUninitialize(); - free(country); } START_TEST(globalization) -- 2.30.2

3 8

[PATCH 4/7] include: Add UAS_EXACTLEGACY define.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/session.c | 4 ++-- dlls/urlmon/tests/misc.c | 4 ++-- include/urlmon.idl | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH 3/7] urlmon: Fix user agent suffix separator handling.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/session.c | 19 +++++++++---------- dlls/urlmon/tests/misc.c | 3 +++ 2 files changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud 26 Mar '21

26 Mar '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 206 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 158 insertions(+), 48 deletions(-) diff --git a/po/nl.po b/po/nl.po index 4622ec87318..237bd4a8535 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-01-30 22:00+0100\n" +"PO-Revision-Date: 2021-03-26 15:45+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14292,17 +14292,6 @@ msgid "Icons (*.ico)" msgstr "Pictogrammen (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14318,7 +14307,7 @@ msgstr "" " REG [opdracht] [parameters]\n" "\n" "Ondersteunde opdrachten:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Voor hulp bij een opdracht, type:\n" " REG [opdracht] /?\n" @@ -14373,6 +14362,55 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <sleutel> [/v waardenaam | /ve] [/t type] [/s scheidingsteken] " +"[/d gegevens] [/f]\n" +"\n" +" Voeg een sleutel toe aan het register of geef een nieuwe waarde aan een " +"registersleutel.\n" +"\n" +" <sleutel>\n" +" De registersleutel die toegevoegd wordt. Als [/v] of [/ve] is gegeven,\n" +" de sleutel waaraan de nieuwe registergegevens moeten worden toegevoegd.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" De naam van de registerwaarde die moet worden toegevoegd.\n" +"\n" +" /ve\n" +" Voeg een lege registerwaarde toe. Deze optie wijzigt de (Standaard)\n" +" registerwaarde.\n" +"\n" +" /t <type>\n" +" Het gegevenstype van de registersleutel. Als [/t] is gegeven, dan moet\n" +" <type> één van de volgende zijn:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Als [/t] niet is gegeven, dan wordt het type REG_SZ verondersteld.\n" +"\n" +" /s <scheidingsteken>\n" +" Het teken dat gebruikt wordt om gegevens in REG_MULTI_SZ te scheiden.\n" +" Als [/s] niet is gegeven, wordt het standaard teken \\0 verwacht.\n" +"\n" +" /d <gegevens>\n" +" De gevens die toegevoegd moeten worden aan een registerwaarde.\n" +"\n" +" /f\n" +" Wijzig het register zonder bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14412,6 +14450,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <sleutel> [/v waardenaam | /ve | /va] [/f]\n" +"\n" +" Verwijder een registersleutel (inclusief alle subsleutels en waardes),\n" +" of een waarde van een registersleutel.\n" +"\n" +" <sleutel>\n" +" De registersleutel die moet worden verwijderd. Als [/v], [/ve] of [/va]\n" +" is gegeven, de registersleutel waarin de waarde moet worden verwijderd.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" De naam van de registerwaarde die verwijderd moet worden.\n" +"\n" +" /ve\n" +" Verwijder een lege registerwaarde. Deze optie haalt de (Standaard)\n" +" registerwaarde weg.\n" +"\n" +" /va\n" +" Verwijder alle waardes van een registersleutel.\n" +"\n" +" /f\n" +" Verwijder een registersleutel (inclusief alle subsleutels en waardes)\n" +" zonder bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14447,16 +14521,47 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <sleutel> [/v waardenaam | /ve] [/s]\n" +"\n" +" Toon een registersleutel en laat alle directe subsleutels, waardes en\n" +" gegevens zien. Gebruik [/s] om de gegevens van de onderliggende\n" +" subsleutels te tonen.\n" +"\n" +" <sleutel>\n" +" De te tonen registersleutel.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" /v <waardenaam>\n" +" Toon de gegevens van de registerwaarde. Als noch [/v] noch [/ve] is\n" +" gegeven, worden alle waardes van de <sleutel> getoond.\n" +"\n" +" /ve\n" +" Toon een een lege registerwaarde. Deze optie vraagt de waarde op van\n" +" de (Standaard) registerwaarde.\n" +"\n" +" /s\n" +" Toon alle registervermeldingen onder <sleutel> en zijn subsleutels.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Foutieve sleutelnaam\n" +msgstr "reg: Foutieve registersleutel\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14567,6 +14672,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <bestand>\n" +"\n" +" Importeer sleutels, waardes en gegevens uit een bestand in het register.\n" +"\n" +" <bestand>\n" +" De naam en het pad van het registerbestand dat geïmporteerd moet worden.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14610,6 +14722,34 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <sleutel> <bestand> [/y]\n" +"\n" +" Exporteer een registersleutel (inclusief alle subsleutels en waardes)\n" +" naar een bestand.\n" +"\n" +" <sleutel>\n" +" De registersleutel die geëxporteerd moet worden.\n" +"\n" +" Formaat: HOOFDSLEUTEL\\Subsleutel\n" +"\n" +" HOOFDSLEUTEL: Een voorgedefinieerde registersleutel. Dit is één van:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subsleutel: Het volledige pad naar een registersleutel onder de gegeven\n" +" HOOFDSLEUTEL.\n" +"\n" +" <bestand>\n" +" De naam en pad van het registerbestand dat aangemaakt wordt.\n" +" Dit bestand moet de extensie .reg hebben.\n" +"\n" +" /y\n" +" <bestand> overschrijven zonder een bevestiging te vragen.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n" @@ -15289,37 +15429,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Verwijderen van DLL '%1' gelukt\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -15350,7 +15459,7 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"Start een programma, of open een document in het programma dat normaal voor\n" +"Start een programma, of open een document met het programma dat normaal voor\n" "deze extensie gebruikt wordt.\n" "Gebruik:\n" "start [opties] programma-naam [...]\n" @@ -15375,6 +15484,7 @@ msgstr "" " met de exit code.\n" "/unix Gebruik een Unix bestandsnaam en start het bestand zoals\n" " Windows Verkenner.\n" +"/exec Voer het opgegeven bestand uit (intern gebruikt in Wine).\n" "/ProgIDOpen Open een document met het specificeerde progID.\n" "/? Toon deze hulp en eindig.\n" -- 2.31.0

1 0

[PATCH 4/6] mmdevapi/tests: Use nameless unions.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/tests/Makefile.in | 1 - dlls/mmdevapi/tests/propstore.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)

2 1