November 2020 - Wine-Commits

Robert Wilhelm : vbscript: Allow keywords to be used as property name.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 04b43c721a9f006c4c7d2a097eec7116958db8a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b43c721a9f006c4c7d2a09… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Nov 9 22:09:40 2020 +0100 vbscript: Allow keywords to be used as property name. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7c749b5ef77..a9f4c540fcb 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -452,11 +452,11 @@ ClassBody | PropertyDecl StSep ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } PropertyDecl - : Storage_opt tPROPERTY tGET tIdentifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY + : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 570bb7fbcb3..53f36b6e710 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1656,6 +1656,19 @@ Class class_test_identifiers_as_function_name End Sub End Class +Class class_test_identifiers_as_property_name + Public Property Get Property() + End Property + + Public Property Let Error(par) + Error = par + End Property + + Public Property Set Default(par) + Set Default = par + End Property +End Class + sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10")

1 0

Francois Gouget : mshtml: Fix the spelling of the filter attribute.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: b6cc7b5d5178864c7d0967d610f3a5151e3685d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6cc7b5d5178864c7d0967d6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 9 17:59:22 2020 +0100 mshtml: Fix the spelling of the filter attribute. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index dc5b136edb3..ae21c1f7299 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -415,7 +415,7 @@ static const style_tbl_entry_t style_tbl[] = { DISPID_A_DISPLAY }, { - L"fileter", + L"filter", DISPID_IHTMLCSSSTYLEDECLARATION_FILTER, DISPID_A_FILTER },

1 0

Alexandre Julliard : wineboot: Fall back to initial hostname if the name lookup fails.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 5ac2f4b55338a27c5d8c7e891bc29198dee7ea50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ac2f4b55338a27c5d8c7e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:22:19 2020 +0100 wineboot: Fall back to initial hostname if the name lookup fails. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50084 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index fa1c459035f..05a5ee6aa62 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -820,18 +820,18 @@ static void create_environment_registry_keys( void ) static void create_computer_name_keys(void) { struct addrinfo hints = {0}, *res; - char *dot, buffer[256]; + char *dot, buffer[256], *name = buffer; HKEY key, subkey; if (gethostname( buffer, sizeof(buffer) )) return; hints.ai_flags = AI_CANONNAME; - if (getaddrinfo( buffer, NULL, &hints, &res )) return; - dot = strchr( res->ai_canonname, '.' ); + if (!getaddrinfo( buffer, NULL, &hints, &res )) name = res->ai_canonname; + dot = strchr( name, '.' ); if (dot) *dot++ = 0; - else dot = res->ai_canonname + strlen(res->ai_canonname); + else dot = name + strlen(name); SetComputerNameExA( ComputerNamePhysicalDnsDomain, dot ); - SetComputerNameExA( ComputerNamePhysicalDnsHostname, res->ai_canonname ); - freeaddrinfo( res ); + SetComputerNameExA( ComputerNamePhysicalDnsHostname, name ); + if (name != buffer) freeaddrinfo( res ); if (RegOpenKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\ComputerName", &key )) return;

1 0

Alistair Leslie-Hughes : include: Add ICommandStream interface.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 951793c71ec5626d8fed155ce05f0145a941ea92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=951793c71ec5626d8fed155c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:56 2020 +1100 include: Add ICommandStream interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cmdstrm.idl | 35 +++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ea021a4b80a..1db3765f68b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdstrm.idl \ cmdtxt.idl \ cmnquery.idl \ codecapi.h \ diff --git a/include/cmdstrm.idl b/include/cmdstrm.idl new file mode 100644 index 00000000000..caadf046f1b --- /dev/null +++ b/include/cmdstrm.idl @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + local, + object, + uuid(0c733abf-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandStream : IUnknown +{ + [local] + HRESULT GetCommandStream([out] IID *iid, [in,out] GUID *dialect, [out, iid_is(*iid)] IUnknown **commandstream); + + [local] + HRESULT SetCommandStream([in] REFIID riid, [in] REFGUID dialect, [in, iid_is(riid)] IUnknown *commandstream); +} diff --git a/include/oledb.idl b/include/oledb.idl index 1ffbefa9ffd..87d148f67b4 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -70,6 +70,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "crtrow.idl" #include "errrec.idl" #include "getdts.idl" +#include "cmdstrm.idl" cpp_quote("#include <accctrl.h>")

1 0

Nikolay Sivov : user32: Remove usp10 from delayed imports.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: df0c5d23ef15d31a84daf78a8ab19406c1876894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0c5d23ef15d31a84daf78a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 12:34:12 2020 +0300 user32: Remove usp10 from delayed imports. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index c371e1fc28e..49a52eeff32 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = setupapi gdi32 version sechost advapi32 kernelbase EXTRAINCL = $(PNG_CFLAGS) -DELAYIMPORTS = hid imm32 usp10 +DELAYIMPORTS = hid imm32 EXTRADLLFLAGS = -mno-cygwin

1 0

Alexandre Julliard : Wine release 5.0.3
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: website Branch: master Commit: c33582c58245762f665ca078f7b8c87430b4bd4c URL: https://source.winehq.org/git/website.git/?a=commit;h=c33582c58245762f665ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 20:46:35 2020 +0100 Wine release 5.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020111001.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020111001.xml b/news/en/2020111001.xml new file mode 100644 index 00000000..b9bccbe6 --- /dev/null +++ b/news/en/2020111001.xml @@ -0,0 +1,12 @@ +<news> +<date>November 10, 2020</date> +<title>Wine 5.0.3 Released</title> +<body> + The Wine maintenance release 5.0.3 is now available. + <a href="{$root}/announce/5.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jiajin Cui : gdiplus: Fix crash if failed to create bitmap.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 25137e1cc16da13656a3c1f1fa6163062a3459c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25137e1cc16da13656a3c1f1… Author: Jiajin Cui <cuijiajin(a)uniontech.com> Date: Fri Jul 17 17:34:09 2020 +0800 gdiplus: Fix crash if failed to create bitmap. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f992bc77c87889c37cbd80aced707e6d1a537c8c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2d7f4bdb80f..fa46e7cc4ce 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -432,6 +432,9 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); + if(!hbitmap || !temp_bits) + goto done; + if ((GetDeviceCaps(graphics->hdc, TECHNOLOGY) == DT_RASPRINTER && GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) || fmt & PixelFormatPAlpha) @@ -443,9 +446,12 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height, hdc, 0, 0, src_width, src_height); - DeleteDC(hdc); + DeleteObject(hbitmap); +done: + DeleteDC(hdc); + return Ok; }

1 0

Julian Rüger : documentation: Update German translation.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: bc425f83259671f777854b3be876553376a7ead7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc425f83259671f777854b3b… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Oct 13 09:38:46 2020 +0200 documentation: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 48ef770376baece17ff034a6c42c4f18ff102c8a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.de | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 2066bdfd043..fbf63eca22e 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -21,6 +21,14 @@ enthält) folgende Befehle auf: ./configure make +Im Anschluss können Sie Wine entweder installieren: + +make install + +Oder direkt aus dem Quellverzeichnis ausführen: + +./wine notepad + Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an @@ -83,11 +91,9 @@ Optionale Bibliotheken: wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: https://wiki.winehq.org/Recommended_Packages - Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), - benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - https://wiki.winehq.org/WineOn64bit - Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe https://wiki.winehq.org/Wine64 + Unter 64-Bit-Plattformen benötigen Sie auch die 32-Bit-Versionen dieser + Bibliotheken. + 4. KOMPILIEREN @@ -105,6 +111,9 @@ unter Unix zu kompilieren und zu verlinken. Mit ./configure --help können Sie sich Konfigurations-Optionen für die Kompilierung anzeigen lassen. +Weitere Informationen finden Sie unter https://wiki.winehq.org/Building_Wine + + 5. SETUP Nachdem Wine korrekt erstellt wurde, können Sie "make install" aufrufen; @@ -115,8 +124,8 @@ Vergessen Sie nicht, zuerst frühere Wine-Installationen zu entfernen, die mit der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. -Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ +Nach der Installation können Sie das Konfigurationswerkzeug "winecfg" starten. +Hinweise dazu finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -135,8 +144,8 @@ Beispiel: Um Notepad auszuführen: wine notepad.exe liesmich.txt (Programmaufruf mit Parametern) -Wine ist nicht perfekt, daher können manche Programme abstürzen. -In diesem Fall bekommen Sie einen Log vom Absturz, den Sie beifügen sollten, +Wine ist nicht perfekt, manche Programme könnten abstürzen. +In solchen Fällen bekommen Sie einen Log vom Absturz, den Sie beifügen sollten, wenn Sie den Fehler melden.

1 0

Changping Yu : kernel32/tests: Add test for thread enumeration order in toolhelp.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: ea0920da0a3ddf0fbc5469657c783b00de1930e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea0920da0a3ddf0fbc546965… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 11:25:01 2020 +0800 kernel32/tests: Add test for thread enumeration order in toolhelp. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab7485bb4beccae445717719bff718f11f80e3d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 174 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index bdb01b9824d..7ec0b3aab3a 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -22,11 +22,14 @@ #include <stdlib.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "tlhelp32.h" #include "wine/test.h" #include "winuser.h" +#include "winternl.h" static char selfname[MAX_PATH]; @@ -38,9 +41,12 @@ static BOOL (WINAPI *pProcess32First)(HANDLE, LPPROCESSENTRY32); static BOOL (WINAPI *pProcess32Next)(HANDLE, LPPROCESSENTRY32); static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); +static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); /* 1 minute should be more than enough */ #define WAIT_TIME (60 * 1000) +/* Specify the number of simultaneous threads to test */ +#define NUM_THREADS 4 static DWORD WINAPI sub_thread(void* pmt) { @@ -150,6 +156,166 @@ static void test_process(DWORD curr_pid, DWORD sub_pcs_pid) ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); } +static DWORD WINAPI get_id_thread(void* curr_pid) +{ + HANDLE hSnapshot; + THREADENTRY32 te; + HANDLE ev, threads[NUM_THREADS]; + DWORD thread_ids[NUM_THREADS]; + DWORD thread_traversed[NUM_THREADS]; + DWORD tid, first_tid = 0; + BOOL found = FALSE; + int i, matched_idx = -1; + ULONG buf_size = 0; + NTSTATUS status; + BYTE* pcs_buffer = NULL; + DWORD pcs_offset = 0; + SYSTEM_PROCESS_INFORMATION* spi = NULL; + + ev = CreateEventW(NULL, TRUE, FALSE, NULL); + ok(ev != NULL, "Cannot create event\n"); + + for (i = 0; i < NUM_THREADS; i++) + { + threads[i] = CreateThread(NULL, 0, sub_thread, ev, 0, &tid); + ok(threads[i] != NULL, "Cannot create thread\n"); + thread_ids[i] = tid; + } + + hSnapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + ok(hSnapshot != NULL, "Cannot create snapshot\n"); + + /* Check that this current process is enumerated */ + te.dwSize = sizeof(te); + ok(pThread32First(hSnapshot, &te), "Thread cannot traverse\n"); + do + { + if (found) + { + if (te.th32OwnerProcessID != PtrToUlong(curr_pid)) break; + + if (matched_idx >= 0) + { + thread_traversed[matched_idx++] = te.th32ThreadID; + if (matched_idx >= NUM_THREADS) break; + } + else if (thread_ids[0] == te.th32ThreadID) + { + matched_idx = 0; + thread_traversed[matched_idx++] = te.th32ThreadID; + } + } + else if (te.th32OwnerProcessID == PtrToUlong(curr_pid)) + { + found = TRUE; + first_tid = te.th32ThreadID; + } + } + while (pThread32Next(hSnapshot, &te)); + + ok(found, "Couldn't find self and/or sub-process in process list\n"); + + /* Check if the thread order is strictly consistent */ + found = FALSE; + for (i = 0; i < NUM_THREADS; i++) + { + if (thread_traversed[i] != thread_ids[i]) + { + found = TRUE; + break; + } + /* Reset data */ + thread_traversed[i] = 0; + } + todo_wine + ok(found == FALSE, "The thread order is not strictly consistent\n"); + + /* Determine the order by NtQuerySystemInformation function */ + pcs_buffer = NULL; + status = pNtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Failed with %x\n", status); + if (status == STATUS_INFO_LENGTH_MISMATCH) + { + pcs_buffer = HeapAlloc(GetProcessHeap(), 0, buf_size); + ok(pcs_buffer != NULL, "Unable to allocate space\n"); + found = FALSE; + matched_idx = -1; + + status = NtQuerySystemInformation(SystemProcessInformation, pcs_buffer, buf_size, &buf_size); + do { + spi = (SYSTEM_PROCESS_INFORMATION*)&pcs_buffer[pcs_offset]; + if (spi->UniqueProcessId == curr_pid) + { + found = TRUE; + break; + } + pcs_offset += spi->NextEntryOffset; + } while (spi->NextEntryOffset != 0); + + ok(found && spi, "No process found\n"); + for (i = 0; i < spi->dwThreadCount; i++) + { + tid = HandleToULong(spi->ti[i].ClientId.UniqueThread); + if (matched_idx > 0) + { + thread_traversed[matched_idx++] = tid; + if (matched_idx >= NUM_THREADS) break; + } + else if (tid == thread_ids[0]) + { + matched_idx = 0; + thread_traversed[matched_idx++] = tid; + } + } + } + if (pcs_buffer) + HeapFree(GetProcessHeap(), 0, pcs_buffer); + + ok(matched_idx > 0, "No thread id match found\n"); + + found = FALSE; + for (i = 0; i < NUM_THREADS; i++) + { + if (thread_traversed[i] != thread_ids[i]) + { + found = TRUE; + break; + } + } + todo_wine + ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); + + SetEvent(ev); + WaitForMultipleObjects( NUM_THREADS, threads, TRUE, WAIT_TIME ); + for (i = 0; i < NUM_THREADS; i++) + CloseHandle(threads[i]); + CloseHandle(ev); + CloseHandle(hSnapshot); + + return first_tid; +} + +static void test_main_thread(DWORD curr_pid, DWORD main_tid) +{ + HANDLE thread; + DWORD tid = 0; + int error; + + /* Check that the main thread id is first one in this thread. */ + tid = get_id_thread(ULongToPtr(curr_pid)); + todo_wine + ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); + + /* Check that the main thread id is first one in other thread. */ + thread = CreateThread(NULL, 0, get_id_thread, ULongToPtr(curr_pid), 0, NULL); + error = WaitForSingleObject(thread, WAIT_TIME); + ok(error == WAIT_OBJECT_0, "Thread did not complete within timelimit\n"); + + ok(GetExitCodeThread(thread, &tid), "Could not retrieve exit code\n"); + todo_wine + ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); +} + static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) { HANDLE hSnapshot; @@ -158,7 +324,7 @@ static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) int num = 0; unsigned curr_found = 0; unsigned sub_found = 0; - + hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); @@ -291,6 +457,7 @@ START_TEST(toolhelp) HANDLE ev1, ev2; DWORD w; HANDLE hkernel32 = GetModuleHandleA("kernel32"); + HANDLE hntdll = GetModuleHandleA("ntdll.dll"); pCreateToolhelp32Snapshot = (VOID *) GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); pModule32First = (VOID *) GetProcAddress(hkernel32, "Module32First"); @@ -299,11 +466,13 @@ START_TEST(toolhelp) pProcess32Next = (VOID *) GetProcAddress(hkernel32, "Process32Next"); pThread32First = (VOID *) GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (VOID *) GetProcAddress(hkernel32, "Thread32Next"); + pNtQuerySystemInformation = (VOID *) GetProcAddress(hntdll, "NtQuerySystemInformation"); if (!pCreateToolhelp32Snapshot || !pModule32First || !pModule32Next || !pProcess32First || !pProcess32Next || - !pThread32First || !pThread32Next) + !pThread32First || !pThread32Next || + !pNtQuerySystemInformation) { win_skip("Needed functions are not available, most likely running on Windows NT\n"); return; @@ -339,6 +508,7 @@ START_TEST(toolhelp) test_process(pid, info.dwProcessId); test_thread(pid, info.dwProcessId); + test_main_thread(pid, GetCurrentThreadId()); test_module(pid, curr_expected_modules, ARRAY_SIZE(curr_expected_modules)); test_module(info.dwProcessId, sub_expected_modules, ARRAY_SIZE(sub_expected_modules));

1 0

Michael Stefaniuc : Release 5.0.3.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 69859b4174119c0eb5f48aa0fa54710eca1ee25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69859b4174119c0eb5f48aa0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Oct 22 22:16:09 2020 +0200 Release 5.0.3. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 375 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 191 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69859b4174119c0eb5f4…

1 0