January 2020 - Wine-commits

Zebediah Figura : kernel32/tests: Fix a test failure on Windows 10.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: 741b8f95047b8dad69598501b08bf8a09104574e URL: https://source.winehq.org/git/wine.git/?a=commit;h=741b8f95047b8dad69598501… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 31 16:37:34 2019 -0600 kernel32/tests: Fix a test failure on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 952c1054c8..120e9f16f0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -122,8 +122,11 @@ static void test_VirtualAllocEx(void) ok( bytes_written == 0, "%lu bytes written\n", bytes_written ); b = ReadProcessMemory(hProcess, addr1, src, alloc_size, &bytes_read); ok( !b, "ReadProcessMemory succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); + ok( GetLastError() == ERROR_NOACCESS || + GetLastError() == ERROR_PARTIAL_COPY, /* win10 v1607+ */ + "wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_NOACCESS) + ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); b = VirtualProtect( src, 0x2000, PAGE_NOACCESS, &old_prot ); ok( b, "VirtualProtect failed error %u\n", GetLastError() ); @@ -135,8 +138,11 @@ static void test_VirtualAllocEx(void) ok( bytes_written == 0, "%lu bytes written\n", bytes_written ); b = ReadProcessMemory(hProcess, addr1, src, alloc_size, &bytes_read); ok( !b, "ReadProcessMemory succeeded\n" ); - ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); - ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); + ok( GetLastError() == ERROR_NOACCESS || + GetLastError() == ERROR_PARTIAL_COPY, /* win10 v1607+ */ + "wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_NOACCESS) + ok( bytes_read == 0, "%lu bytes written\n", bytes_read ); b = pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError());

1 0

Zebediah Figura : user32/tests: Work around a failure on Windows < Vista.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: 6e4d441ce11739b145dae200d7b20743c64147de URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e4d441ce11739b145dae200… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 1 12:14:13 2020 -0600 user32/tests: Work around a failure on Windows < Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index aaa51d560a..4aa5565b96 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -51,7 +51,12 @@ static void register_class(void) WNDCLASSA cls; cls.style = CS_DBLCLKS; - cls.lpfnWndProc = DefWindowProcA; + /* Windows < Vista apparently checks lpfnWndProc against the address of + * DefWindowProcA(), and for some reason fails to change the thread desktop + * after creating and destroying a window if it doesn't match. Using an IAT + * (as is default) or a wrapper triggers this, so use GetProcAddress() as + * a workaround. */ + cls.lpfnWndProc = (void *)GetProcAddress(GetModuleHandleA("user32"), "DefWindowProcA"); cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0);

1 0

Zebediah Figura : kernel32: Exclude IsBadStringPtrA() from relay traces.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: 7a61bbaa6f312ed28d9e74baa22b221f0b97e50e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a61bbaa6f312ed28d9e74ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 30 17:18:07 2019 -0600 kernel32: Exclude IsBadStringPtrA() from relay traces. It messes up 16-bit relay traces due to krnl386's use of debugstr_a(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a87747bf61..c115fd3d75 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -971,7 +971,7 @@ @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @ stdcall IsBadReadPtr(ptr long) -@ stdcall IsBadStringPtrA(ptr long) +@ stdcall -norelay IsBadStringPtrA(ptr long) @ stdcall IsBadStringPtrW(ptr long) @ stdcall IsBadWritePtr(ptr long) # @ stub IsCalendarLeapDay

1 0

Alexandre Julliard : Update copyright info for 2020.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: 81dc6240e8e469c3bd527d48ef53bfa7c03018b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81dc6240e8e469c3bd527d48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 1 14:26:13 2020 +0100 Update copyright info for 2020. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 6269a3b77c..3452811370 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2019 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 74d7494342..12c377bc9f 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2019 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index b8d4c5cab9..35ea44773a 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -76,7 +76,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2019 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2020 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

1 0

Alex Henrie : po: Fix typo in Catalan translation.
by Alexandre Julliard 01 Jan '20

01 Jan '20

Module: wine Branch: master Commit: bc41f2a6857702ae9342b9a39b0b8d7568a23abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc41f2a6857702ae9342b9a3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 31 11:43:27 2019 -0700 po: Fix typo in Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ca.po b/po/ca.po index 7255f30d38..59c69ea6d3 100644 --- a/po/ca.po +++ b/po/ca.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: 2019-12-26 18:54-0700\n" +"PO-Revision-Date: 2019-12-31 11:39-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -17115,7 +17115,7 @@ msgstr "" "[/A] Només copiar els fitxers amb l'atribut d'arxiu establert.\n" "[/M] Només copiar els fitxers amb l'atribut d'arxiu establert, elimina\n" "\tl'atribut d'arxiu.\n" -"[/K] Copiar els atributs de fitxer; sense això, no se preserven els\n" +"[/K] Copiar els atributs de fitxer; sense això, no es preserven els\n" " atributs.\n" "[/D | /D:m-d-y] Copiar els fitxers nous o els modificats després de la data\n" "\t\tproveïda.\n"

1 0