wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Changping Yu : kernel32: Adjust thread creation insertion order.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: fe175342eb86fdad3faa32a6a3999caecfb149b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe175342eb86fdad3faa32a6… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 13:08:27 2020 +0800 kernel32: Adjust thread creation insertion order. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59ce4e3eb878ca470ec0f153f567e92a3a577922) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 4 ---- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 7ec0b3aab3a..b196a4f5f0d 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -227,7 +227,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) /* 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 */ @@ -282,7 +281,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) break; } } - todo_wine ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); SetEvent(ev); @@ -303,7 +301,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) /* 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. */ @@ -312,7 +309,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) 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"); } diff --git a/server/thread.c b/server/thread.c index 80db41b48d2..a838bf5ddd0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -265,7 +265,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu thread->affinity = process->affinity; if (!current) current = thread; - list_add_head( &thread_list, &thread->entry ); + list_add_tail( &thread_list, &thread->entry ); if (sd && !set_sd_defaults_from_token( &thread->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |

1 0

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

10 Nov '20

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

Nikolay Sivov : winedbg: Double dll name buffer size for unimplemented function exception.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 755512bd9f660e8f9182f59fed7dadbd36715188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=755512bd9f660e8f9182f59f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 20 21:47:17 2020 +0300 winedbg: Double dll name buffer size for unimplemented function exception. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51fbcc0c23e3217b79a27391eafc911773ca060a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 123cbc934ef..4e8580db0d4 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -914,7 +914,7 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_STUB: { - char dll[32], name[256]; + char dll[64], name[256]; memory_get_string(dbg_curr_process, (void*)rec->ExceptionInformation[0], TRUE, FALSE, dll, sizeof(dll));

1 0

Julian Rüger : documentation: Update German translation.
by Alexandre Julliard 10 Nov '20

10 Nov '20

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

Akihiro Sagawa : documentation: Update Japanese translation.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: f210feacdef0e64de059fab34b2b6e61f8286f9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f210feacdef0e64de059fab3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 11 23:52:19 2020 +0900 documentation: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fef92bacc5967c1a45d7bae98af364a5df47981b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.ja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/documentation/README.ja b/documentation/README.ja index 9b44353306a..57b35de9915 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -19,6 +19,14 @@ READMEというファイル]を含むディレクトリ）から、以下を実 ./configure make +それから次のいずれか、Wineをインストールするか: + +make install + +または、Wineをビルドディレクトリから直接実行してください: + +./wine notepad + "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。

1 0

Gijs Vermeulen : wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 92305238df1d041c688ce6deb2fa0c1e37cbcaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=92305238df1d041c688ce6de… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 11 12:01:47 2020 +0200 wbemprox: Don't crash in IWbemClassObject::Put() when called with empty class object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40945 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c3bd08b02299e3ac89b708ff3bd4bda262ec6bde) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/class.c | 3 +++ dlls/wbemprox/tests/query.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 3ee5771e6b0..a2e04d1a15c 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -455,6 +455,9 @@ static HRESULT WINAPI class_object_Put( if ((hr = get_column_index( co->record->table, wszName, &index )) != S_OK) return hr; return record_set_value( co->record, index, pVal ); } + + if (!ec) return S_OK; + return put_propval( ec->query->view, co->index, wszName, pVal, Type ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index be05165542c..31cf93b4ac9 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -263,7 +263,7 @@ static void test_Win32_Service( IWbemServices *services ) static const WCHAR emptyW[] = {0}; BSTR class = SysAllocString( serviceW ), empty = SysAllocString( emptyW ), method; IWbemClassObject *service, *out; - VARIANT state, retval; + VARIANT state, retval, classvar; CIMTYPE type; HRESULT hr; @@ -343,6 +343,13 @@ static void test_Win32_Service( IWbemServices *services ) hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( !!service, "expected non-NULL service\n" ); + + VariantInit(&classvar); + V_VT(&classvar) = VT_BSTR; + V_BSTR(&classvar) = SysAllocString(L"MyClass"); + hr = IWbemClassObject_Put(service, L"__CLASS", 0, &classvar, 0); + ok( hr == S_OK, "got %08x\n", hr ); + VariantClear(&classvar); IWbemClassObject_Release( service ); service = NULL;

1 0

Gijs Vermeulen : wbemprox: Set obj to NULL on error in get_object().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: ec77942663bcd19c76ada852d11a48fa80d84425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec77942663bcd19c76ada852… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Aug 11 12:01:46 2020 +0200 wbemprox: Set obj to NULL on error in get_object(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11f2057768ed2d5416fad30d6e3e18683ffc17cd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/services.c | 6 +++++- dlls/wbemprox/tests/query.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 8b3a3b1af42..6aa283da387 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -469,7 +469,11 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) return hr; } hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); - if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; + if (hr == WBEM_S_FALSE) + { + hr = WBEM_E_NOT_FOUND; + *obj = NULL; + } IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a3a3565759f..be05165542c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -342,19 +342,23 @@ static void test_Win32_Service( IWbemServices *services ) service = NULL; hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); service = NULL; hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - if (service) IWbemClassObject_Release( service ); + ok( !!service, "expected non-NULL service\n" ); + IWbemClassObject_Release( service ); SysFreeString( empty ); SysFreeString( class ); class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + service = (IWbemClassObject *)0xdeadbeef; hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + ok( service == NULL, "expected NULL service, got %p\n", service ); SysFreeString( class ); }

1 0

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

10 Nov '20

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

Paul Gofman : shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cbfb70ba0a5fc2aadb9cd8f0df98aea732336435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbfb70ba0a5fc2aadb9cd8f0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 15:09:01 2020 +0300 shell32: Only consider copy operation multidest if the number of dst files is greater than one. Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e2f456cfe57de42259cca8155a56854a0f170844) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db39144..38c582be091 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c72440425..36602f335d6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0";

1 0

Gijs Vermeulen : amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 286946a5333ae299fc89949e4211357a3c13c10e URL: https://source.winehq.org/git/wine.git/?a=commit;h=286946a5333ae299fc89949e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jun 19 16:10:30 2020 +0200 amstream: Don't crash on NULL ddraw in IDirectDrawMediaStream::GetDirectDraw(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1e81d551903d548d42d04d5076181741309d23c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/amstream/ddrawstream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 671585f5d63..ff7cf1ab3f5 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -393,6 +393,9 @@ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMedi TRACE("(%p)->(%p)\n", iface, ddraw); + if (!ddraw) + return E_POINTER; + *ddraw = NULL; if (!This->ddraw) {

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
86
Older →

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-commits November 2020