- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the generated syscall list.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: f9f23e109287b86bf3d1703cad374326c1eb4ccd URL: https://gitlab.winehq.org/wine/wine/-/commit/f9f23e109287b86bf3d1703cad3743… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:08:00 2023 +0100 ntdll: Use the generated syscall list. --- dlls/ntdll/unix/loader.c | 247 ++--------------------------------------------- 1 file changed, 7 insertions(+), 240 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5b6098df3bc..42b5aa9d84e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -88,6 +88,7 @@ #include "winternl.h" #include "unix_private.h" #include "wine/list.h" +#include "ntsyscalls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(module); @@ -118,247 +119,13 @@ static void *p__wine_syscall_dispatcher; static void * const syscalls[] = { - NtAcceptConnectPort, - NtAccessCheck, - NtAccessCheckAndAuditAlarm, - NtAddAtom, - NtAdjustGroupsToken, - NtAdjustPrivilegesToken, - NtAlertResumeThread, - NtAlertThread, - NtAlertThreadByThreadId, - NtAllocateLocallyUniqueId, - NtAllocateUuids, - NtAllocateVirtualMemory, - NtAllocateVirtualMemoryEx, - NtAreMappedFilesTheSame, - NtAssignProcessToJobObject, - NtCallbackReturn, - NtCancelIoFile, - NtCancelIoFileEx, - NtCancelSynchronousIoFile, - NtCancelTimer, - NtClearEvent, - NtClose, - NtCommitTransaction, - NtCompareObjects, - NtCompleteConnectPort, - NtConnectPort, - NtContinue, - NtCreateDebugObject, - NtCreateDirectoryObject, - NtCreateEvent, - NtCreateFile, - NtCreateIoCompletion, - NtCreateJobObject, - NtCreateKey, - NtCreateKeyTransacted, - NtCreateKeyedEvent, - NtCreateLowBoxToken, - NtCreateMailslotFile, - NtCreateMutant, - NtCreateNamedPipeFile, - NtCreatePagingFile, - NtCreatePort, - NtCreateSection, - NtCreateSemaphore, - NtCreateSymbolicLinkObject, - NtCreateThread, - NtCreateThreadEx, - NtCreateTimer, - NtCreateToken, - NtCreateTransaction, - NtCreateUserProcess, - NtDebugActiveProcess, - NtDebugContinue, - NtDelayExecution, - NtDeleteAtom, - NtDeleteFile, - NtDeleteKey, - NtDeleteValueKey, - NtDeviceIoControlFile, - NtDisplayString, - NtDuplicateObject, - NtDuplicateToken, - NtEnumerateKey, - NtEnumerateValueKey, - NtFilterToken, - NtFindAtom, - NtFlushBuffersFile, - NtFlushInstructionCache, - NtFlushKey, - NtFlushProcessWriteBuffers, - NtFlushVirtualMemory, - NtFreeVirtualMemory, - NtFsControlFile, - NtGetContextThread, - NtGetCurrentProcessorNumber, - NtGetNextThread, - NtGetNlsSectionPtr, - NtGetWriteWatch, - NtImpersonateAnonymousToken, - NtInitializeNlsFiles, - NtInitiatePowerAction, - NtIsProcessInJob, - NtListenPort, - NtLoadDriver, - NtLoadKey, - NtLoadKey2, - NtLoadKeyEx, - NtLockFile, - NtLockVirtualMemory, - NtMakeTemporaryObject, - NtMapViewOfSection, - NtMapViewOfSectionEx, - NtNotifyChangeDirectoryFile, - NtNotifyChangeKey, - NtNotifyChangeMultipleKeys, - NtOpenDirectoryObject, - NtOpenEvent, - NtOpenFile, - NtOpenIoCompletion, - NtOpenJobObject, - NtOpenKey, - NtOpenKeyEx, - NtOpenKeyTransacted, - NtOpenKeyTransactedEx, - NtOpenKeyedEvent, - NtOpenMutant, - NtOpenProcess, - NtOpenProcessToken, - NtOpenProcessTokenEx, - NtOpenSection, - NtOpenSemaphore, - NtOpenSymbolicLinkObject , - NtOpenThread, - NtOpenThreadToken, - NtOpenThreadTokenEx, - NtOpenTimer, - NtPowerInformation, - NtPrivilegeCheck, - NtProtectVirtualMemory, - NtPulseEvent, - NtQueryAttributesFile, - NtQueryDefaultLocale, - NtQueryDefaultUILanguage, - NtQueryDirectoryFile, - NtQueryDirectoryObject, - NtQueryEaFile, - NtQueryEvent, - NtQueryFullAttributesFile, - NtQueryInformationAtom, - NtQueryInformationFile, - NtQueryInformationJobObject, - NtQueryInformationProcess, - NtQueryInformationThread, - NtQueryInformationToken, - NtQueryInstallUILanguage, - NtQueryIoCompletion, - NtQueryKey, - NtQueryLicenseValue, - NtQueryMultipleValueKey, - NtQueryMutant, - NtQueryObject, - NtQueryPerformanceCounter, - NtQuerySection, - NtQuerySecurityObject, - NtQuerySemaphore , - NtQuerySymbolicLinkObject, - NtQuerySystemEnvironmentValue, - NtQuerySystemEnvironmentValueEx, - NtQuerySystemInformation, - NtQuerySystemInformationEx, - NtQuerySystemTime, - NtQueryTimer, - NtQueryTimerResolution, - NtQueryValueKey, - NtQueryVirtualMemory, - NtQueryVolumeInformationFile, - NtQueueApcThread, - NtRaiseException, - NtRaiseHardError, - NtReadFile, - NtReadFileScatter, - NtReadVirtualMemory, - NtRegisterThreadTerminatePort, - NtReleaseKeyedEvent, - NtReleaseMutant, - NtReleaseSemaphore, - NtRemoveIoCompletion, - NtRemoveIoCompletionEx, - NtRemoveProcessDebug, - NtRenameKey, - NtReplaceKey, - NtReplyWaitReceivePort, - NtRequestWaitReplyPort, - NtResetEvent, - NtResetWriteWatch, - NtRestoreKey, - NtResumeProcess, - NtResumeThread, - NtRollbackTransaction, - NtSaveKey, - NtSecureConnectPort, - NtSetContextThread, - NtSetDebugFilterState, - NtSetDefaultLocale, - NtSetDefaultUILanguage, - NtSetEaFile, - NtSetEvent, - NtSetInformationDebugObject, - NtSetInformationFile, - NtSetInformationJobObject, - NtSetInformationKey, - NtSetInformationObject, - NtSetInformationProcess, - NtSetInformationThread, - NtSetInformationToken, - NtSetInformationVirtualMemory, - NtSetIntervalProfile, - NtSetIoCompletion, - NtSetLdtEntries, - NtSetSecurityObject, - NtSetSystemInformation, - NtSetSystemTime, - NtSetThreadExecutionState, - NtSetTimer, - NtSetTimerResolution, - NtSetValueKey, - NtSetVolumeInformationFile, - NtShutdownSystem, - NtSignalAndWaitForSingleObject, - NtSuspendProcess, - NtSuspendThread, - NtSystemDebugControl, - NtTerminateJobObject, - NtTerminateProcess, - NtTerminateThread, - NtTestAlert, - NtTraceControl, - NtUnloadDriver, - NtUnloadKey, - NtUnlockFile, - NtUnlockVirtualMemory, - NtUnmapViewOfSection, - NtUnmapViewOfSectionEx, - NtWaitForAlertByThreadId, - NtWaitForDebugEvent, - NtWaitForKeyedEvent, - NtWaitForMultipleObjects, - NtWaitForSingleObject, -#ifndef _WIN64 - NtWow64AllocateVirtualMemory64, - NtWow64GetNativeSystemInformation, - NtWow64IsProcessorFeaturePresent, - NtWow64ReadVirtualMemory64, - NtWow64WriteVirtualMemory64, +#define SYSCALL_ENTRY(id,name,args) name, +#ifdef _WIN64 + ALL_SYSCALLS64 +#else + ALL_SYSCALLS32 #endif - NtWriteFile, - NtWriteFileGather, - NtWriteVirtualMemory, - NtYieldExecution, - wine_nt_to_unix_file_name, - wine_unix_to_nt_file_name, +#undef SYSCALL_ENTRY }; static BYTE syscall_args[ARRAY_SIZE(syscalls)];

1 0

Hans Leidekker : fusion: Bump version to 4.6.1590.0.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 0f5fab24fcd31818dba5dbf2486f424a391cf638 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f5fab24fcd31818dba5dbf2486f42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 16 10:24:03 2023 +0100 fusion: Bump version to 4.6.1590.0. --- dlls/fusion/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/fusion/version.rc b/dlls/fusion/version.rc index 06b7e1c5516..ab1394c578b 100644 --- a/dlls/fusion/version.rc +++ b/dlls/fusion/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine assembly manager" #define WINE_FILENAME_STR "fusion.dll" -#define WINE_FILEVERSION 2,0,50727,4016 -#define WINE_FILEVERSION_STR "2.0.50727.4016" -#define WINE_PRODUCTVERSION 2,0,50727,4016 -#define WINE_PRODUCTVERSION_STR "2.0.50727.4016" +#define WINE_FILEVERSION 4,6,1590,0 +#define WINE_FILEVERSION_STR "4.6.1590.0" +#define WINE_PRODUCTVERSION 4,6,1590,0 +#define WINE_PRODUCTVERSION_STR "4.6.1590.0" #include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : make_specfiles: Generate a list of syscalls from the corresponding spec files.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 401288a78ddd410f48d7ca1beb03b8d305aacb49 URL: https://gitlab.winehq.org/wine/wine/-/commit/401288a78ddd410f48d7ca1beb03b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:07:08 2023 +0100 make_specfiles: Generate a list of syscalls from the corresponding spec files. --- dlls/ntdll/ntsyscalls.h | 478 ++++++++++++++++++++++++++ dlls/win32u/win32syscalls.h | 807 ++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 77 +++++ 3 files changed, 1362 insertions(+)

1 0

Zhiyi Zhang : uiribbon: Fix IUIFramework::SetUICommandProperty() prototype.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: a7ec901ea326d6420a11304fec3c92f0bdcfa489 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7ec901ea326d6420a11304fec3c92… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 16 17:04:34 2023 +0800 uiribbon: Fix IUIFramework::SetUICommandProperty() prototype. The last parameter should be REFPROPVARIANT instead of PROPVARIANT. --- dlls/uiribbon/uiribbon.c | 4 ++-- include/uiribbon.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 38fd60cd533..73682019cea 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -111,9 +111,9 @@ static HRESULT WINAPI UIRibbonFrameworkImpl_GetUICommandProperty(IUIFramework *i return E_NOTIMPL; } -static HRESULT WINAPI UIRibbonFrameworkImpl_SetUICommandProperty(IUIFramework *iface, UINT32 commandId, REFPROPERTYKEY key, PROPVARIANT value) +static HRESULT WINAPI UIRibbonFrameworkImpl_SetUICommandProperty(IUIFramework *iface, UINT32 commandId, REFPROPERTYKEY key, REFPROPVARIANT value) { - FIXME("(%u, %p): stub!\n", commandId, key); + FIXME("(%u, %p, %p): stub!\n", commandId, key, value); return E_NOTIMPL; } diff --git a/include/uiribbon.idl b/include/uiribbon.idl index d67e5cdbd5c..41fa5394c17 100644 --- a/include/uiribbon.idl +++ b/include/uiribbon.idl @@ -171,7 +171,7 @@ interface IUIFramework : IUnknown HRESULT SetUICommandProperty( [in] UINT32 commandId, [in] REFPROPERTYKEY key, - [in] PROPVARIANT value + [in] REFPROPVARIANT value ); HRESULT InvalidateUICommand( [in] UINT32 commandId,

1 0

Paul Gofman : combase/tests: Add tests for implicit MTA with RoGetActivationFactory().
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 2f1b288a3f0fe3f99f63e883c83d32fc477722b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f1b288a3f0fe3f99f63e883c83d32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 12 14:47:07 2023 -0600 combase/tests: Add tests for implicit MTA with RoGetActivationFactory(). --- dlls/combase/tests/roapi.c | 196 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index f10cbb4507b..4887cb60ef6 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -116,12 +116,208 @@ static void test_ActivationFactories(void) RoUninitialize(); } +static APTTYPE check_thread_apttype; +static APTTYPEQUALIFIER check_thread_aptqualifier; +static HRESULT check_thread_hr; + +static DWORD WINAPI check_apartment_thread(void *dummy) +{ + check_thread_apttype = 0xdeadbeef; + check_thread_aptqualifier = 0xdeadbeef; + check_thread_hr = CoGetApartmentType(&check_thread_apttype, &check_thread_aptqualifier); + return 0; +} + +#define check_thread_apartment(a) check_thread_apartment_(__LINE__, FALSE, a) +#define check_thread_apartment_broken(a) check_thread_apartment_(__LINE__, TRUE, a) +static void check_thread_apartment_(unsigned int line, BOOL broken_fail, HRESULT expected_hr_thread) +{ + HANDLE thread; + + check_thread_hr = 0xdeadbeef; + thread = CreateThread(NULL, 0, check_apartment_thread, NULL, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + ok_(__FILE__, line)(check_thread_hr == expected_hr_thread + || broken(broken_fail && expected_hr_thread == S_OK && check_thread_hr == CO_E_NOTINITIALIZED), + "got %#lx, expected %#lx.\n", check_thread_hr, expected_hr_thread); + if (SUCCEEDED(check_thread_hr)) + { + ok_(__FILE__, line)(check_thread_apttype == APTTYPE_MTA, "got %d.\n", check_thread_apttype); + ok_(__FILE__, line)(check_thread_aptqualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "got %d.\n", check_thread_aptqualifier); + } +} + +static HANDLE mta_init_thread_init_done_event, mta_init_thread_done_event; + +static DWORD WINAPI mta_init_thread(void *dummy) +{ + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "got %#lx.\n", hr); + SetEvent(mta_init_thread_init_done_event); + + WaitForSingleObject(mta_init_thread_done_event, INFINITE); + CoUninitialize(); + return 0; +} + +static DWORD WINAPI mta_init_implicit_thread(void *dummy) +{ + IActivationFactory *factory; + HSTRING str; + HRESULT hr; + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = WindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); + WindowsDeleteString(str); + + SetEvent(mta_init_thread_init_done_event); + WaitForSingleObject(mta_init_thread_done_event, INFINITE); + + /* No CoUninitialize(), testing cleanup on thread exit. */ + return 0; +} + +static void test_implicit_mta(void) +{ + static const struct + { + BOOL ro_init; + BOOL mta; + } + tests[] = + { + { FALSE, FALSE }, + { FALSE, TRUE }, + { TRUE, FALSE }, + { TRUE, TRUE }, + }; + APTTYPEQUALIFIER aptqualifier; + IActivationFactory *factory; + APTTYPE apttype; + unsigned int i; + HANDLE thread; + HSTRING str; + HRESULT hr; + + hr = WindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str); + ok(hr == S_OK, "got %#lx.\n", hr); + /* RoGetActivationFactory doesn't implicitly initialize COM. */ + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine ok(hr == CO_E_NOTINITIALIZED, "got %#lx.\n", hr); + + check_thread_apartment(CO_E_NOTINITIALIZED); + + /* RoGetActivationFactory initializes implicit MTA. */ + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("test %u", i); + if (tests[i].ro_init) + hr = RoInitialize(tests[i].mta ? RO_INIT_MULTITHREADED : RO_INIT_SINGLETHREADED); + else + hr = CoInitializeEx(NULL, tests[i].mta ? COINIT_MULTITHREADED : COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "got %#lx.\n", hr); + check_thread_apartment(tests[i].mta ? S_OK : CO_E_NOTINITIALIZED); + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); + todo_wine_if(!tests[i].mta) check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); + todo_wine_if(!tests[i].mta) check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + if (tests[i].ro_init) + RoUninitialize(); + else + CoUninitialize(); + check_thread_apartment(CO_E_NOTINITIALIZED); + winetest_pop_context(); + } + + mta_init_thread_init_done_event = CreateEventW(NULL, FALSE, FALSE, NULL); + mta_init_thread_done_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + /* RoGetActivationFactory references implicit MTA in a current thread + * even if implicit MTA was already initialized: check with STA init + * after RoGetActivationFactory(). */ + thread = CreateThread(NULL, 0, mta_init_thread, NULL, 0, NULL); + ok(!!thread, "failed.\n"); + WaitForSingleObject(mta_init_thread_init_done_event, INFINITE); + check_thread_apartment(S_OK); + + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); + check_thread_apartment(S_OK); + + hr = CoGetApartmentType(&apttype, &aptqualifier); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(apttype == APTTYPE_MTA, "got %d.\n", apttype); + ok(aptqualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, "got %d.\n", aptqualifier); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = CoGetApartmentType(&apttype, &aptqualifier); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(apttype == APTTYPE_MAINSTA, "got %d.\n", apttype); + ok(aptqualifier == APTTYPEQUALIFIER_NONE, "got %d.\n", aptqualifier); + + SetEvent(mta_init_thread_done_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + todo_wine check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + CoUninitialize(); + check_thread_apartment(CO_E_NOTINITIALIZED); + + /* RoGetActivationFactory references implicit MTA in a current thread + * even if implicit MTA was already initialized: check with STA init + * before RoGetActivationFactory(). */ + thread = CreateThread(NULL, 0, mta_init_thread, NULL, 0, NULL); + ok(!!thread, "failed.\n"); + WaitForSingleObject(mta_init_thread_init_done_event, INFINITE); + check_thread_apartment(S_OK); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); + check_thread_apartment(S_OK); + + SetEvent(mta_init_thread_done_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + todo_wine check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + CoUninitialize(); + check_thread_apartment(CO_E_NOTINITIALIZED); + + /* Test implicit MTA apartment thread exit. */ + thread = CreateThread(NULL, 0, mta_init_implicit_thread, NULL, 0, NULL); + ok(!!thread, "failed.\n"); + WaitForSingleObject(mta_init_thread_init_done_event, INFINITE); + todo_wine check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + SetEvent(mta_init_thread_done_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + check_thread_apartment(CO_E_NOTINITIALIZED); + + CloseHandle(mta_init_thread_init_done_event); + CloseHandle(mta_init_thread_done_event); + WindowsDeleteString(str); +} + START_TEST(roapi) { BOOL ret; load_resource(L"wine.combase.test.dll"); + test_implicit_mta(); test_ActivationFactories(); SetLastError(0xdeadbeef);

1 0

Zebediah Figura : d3d8: Pass NOOVERWRITE to redundantly discarded maps.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: e49c19ebb5a5c4a74a52cad74a674112c42f8bdc URL: https://gitlab.winehq.org/wine/wine/-/commit/e49c19ebb5a5c4a74a52cad74a6741… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 10 12:41:23 2023 -0600 d3d8: Pass NOOVERWRITE to redundantly discarded maps. If DISCARD maps are accelerated, passing empty map flags won't return the same accelerated BO. Tested with Port Royale 2 and Rayman 3. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55770 --- dlls/d3d8/buffer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 866292e43c0..f49f6f9f847 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -193,7 +193,10 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT iface, offset, size, data, flags); if (buffer->discarded) - flags &= ~D3DLOCK_DISCARD; + { + WARN("Filtering out redundant discard of %p.\n", buffer); + flags = (flags & ~D3DLOCK_DISCARD) | D3DLOCK_NOOVERWRITE; + } if (flags & D3DLOCK_DISCARD) buffer->discarded = true; @@ -514,7 +517,10 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o iface, offset, size, data, flags); if (buffer->discarded) - flags &= ~D3DLOCK_DISCARD; + { + WARN("Filtering out redundant discard of %p.\n", buffer); + flags = (flags & ~D3DLOCK_DISCARD) | D3DLOCK_NOOVERWRITE; + } if (flags & D3DLOCK_DISCARD) buffer->discarded = true;

1 0

Zebediah Figura : wined3d: Create the XFB counter BO in wined3d_context_vk_bind_stream_output_buffers().
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: ce59348c8f5e2d24f70a00b1181f06b025649a50 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce59348c8f5e2d24f70a00b1181f06… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 18:03:45 2023 -0600 wined3d: Create the XFB counter BO in wined3d_context_vk_bind_stream_output_buffers(). --- dlls/wined3d/adapter_vk.c | 15 --------------- dlls/wined3d/context_vk.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 73807d827e6..96eeeb3472a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1724,7 +1724,6 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, struct wined3d_context_vk *context_vk; VkCommandBuffer vk_command_buffer; uint32_t instance_count; - unsigned int i; TRACE("device %p, state %p, parameters %p.\n", device, state, parameters); @@ -1744,20 +1743,6 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, if (context_vk->c.transform_feedback_active) { - if (!context_vk->vk_so_counter_bo.vk_buffer) - { - struct wined3d_bo_vk *bo = &context_vk->vk_so_counter_bo; - - if (!wined3d_context_vk_create_bo(context_vk, ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, - VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) - ERR("Failed to create counter BO.\n"); - for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) - { - context_vk->vk_so_counters[i] = bo->vk_buffer; - context_vk->vk_so_offsets[i] = bo->b.buffer_offset + i * sizeof(uint32_t) * 2; - } - } - wined3d_context_vk_reference_bo(context_vk, &context_vk->vk_so_counter_bo); if (context_vk->c.transform_feedback_paused) VK_CALL(vkCmdBeginTransformFeedbackEXT(vk_command_buffer, 0, ARRAY_SIZE(context_vk->vk_so_counters), diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 75f0e68395c..fcdaaa17966 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2813,6 +2813,20 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context struct wined3d_buffer *buffer; unsigned int i, first, count; + if (!context_vk->vk_so_counter_bo.vk_buffer) + { + struct wined3d_bo_vk *bo = &context_vk->vk_so_counter_bo; + + if (!wined3d_context_vk_create_bo(context_vk, ARRAY_SIZE(context_vk->vk_so_counters) * sizeof(uint32_t) * 2, + VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) + ERR("Failed to create counter BO.\n"); + for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) + { + context_vk->vk_so_counters[i] = bo->vk_buffer; + context_vk->vk_so_offsets[i] = bo->b.buffer_offset + i * sizeof(uint32_t) * 2; + } + } + first = 0; count = 0; for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i)

1 0

Paul Gofman : combase: Ensure MTA existence in RoGetActivationFactory().
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: b46eafe3d29889a30904b5dfaa5c4ef35155766d URL: https://gitlab.winehq.org/wine/wine/-/commit/b46eafe3d29889a30904b5dfaa5c4e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 12 12:53:27 2023 -0600 combase: Ensure MTA existence in RoGetActivationFactory(). --- dlls/combase/apartment.c | 31 +++++++++++++++++++++++++++++++ dlls/combase/combase.c | 3 +++ dlls/combase/combase_private.h | 2 ++ dlls/combase/roapi.c | 5 +++++ dlls/combase/tests/roapi.c | 12 ++++++------ dlls/ole32/compobj_private.h | 1 + 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index d679ef3407a..92f1e32c502 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -1157,6 +1157,11 @@ void leave_apartment(struct tlsdata *data) if (data->ole_inits) WARN( "Uninitializing apartment while Ole is still initialized\n" ); apartment_release(data->apt); + if (data->implicit_mta_cookie) + { + apartment_decrement_mta_usage(data->implicit_mta_cookie); + data->implicit_mta_cookie = NULL; + } data->apt = NULL; data->flags &= ~(OLETLS_DISABLE_OLE1DDE | OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED); } @@ -1288,3 +1293,29 @@ void apartment_global_cleanup(void) apartment_release_dlls(); DeleteCriticalSection(&apt_cs); } + +HRESULT ensure_mta(void) +{ + struct apartment *apt; + struct tlsdata *data; + HRESULT hr; + + if (FAILED(hr = com_get_tlsdata(&data))) + return hr; + if ((apt = data->apt) && (data->implicit_mta_cookie || apt->multi_threaded)) + return S_OK; + + EnterCriticalSection(&apt_cs); + if (apt || mta) + hr = apartment_increment_mta_usage(&data->implicit_mta_cookie); + else + hr = CO_E_NOTINITIALIZED; + LeaveCriticalSection(&apt_cs); + + if (FAILED(hr)) + { + ERR("Failed, hr %#lx.\n", hr); + return hr; + } + return S_OK; +} diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index f1b5828e0f8..e072c169953 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -407,6 +407,9 @@ static void com_cleanup_tlsdata(void) if (tlsdata->apt) apartment_release(tlsdata->apt); + if (tlsdata->implicit_mta_cookie) + apartment_decrement_mta_usage(tlsdata->implicit_mta_cookie); + if (tlsdata->errorinfo) IErrorInfo_Release(tlsdata->errorinfo); if (tlsdata->state) diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 53932e9a357..04d251962ec 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -92,6 +92,7 @@ struct tlsdata struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; DWORD cancelcount; + CO_MTA_USAGE_COOKIE implicit_mta_cookie; /* mta referenced by roapi from sta thread */ }; extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data); @@ -161,6 +162,7 @@ void apartment_release(struct apartment *apt); struct apartment * apartment_get_current_or_mta(void); HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie); void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie); +HRESULT ensure_mta(void); struct apartment * apartment_get_mta(void); HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata, REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv); diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index b80ca2e8325..e1017f1f3fd 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -24,6 +24,8 @@ #include "roerrorapi.h" #include "winstring.h" +#include "combase_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(combase); @@ -154,6 +156,9 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_ if (!iid || !class_factory) return E_INVALIDARG; + if (FAILED(hr = ensure_mta())) + return hr; + hr = get_library_for_classid(WindowsGetStringRawBuffer(classid, NULL), &library); if (FAILED(hr)) { diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 4887cb60ef6..abc03176db0 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -211,7 +211,7 @@ static void test_implicit_mta(void) ok(hr == S_OK, "got %#lx.\n", hr); /* RoGetActivationFactory doesn't implicitly initialize COM. */ hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "got %#lx.\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "got %#lx.\n", hr); check_thread_apartment(CO_E_NOTINITIALIZED); @@ -227,10 +227,10 @@ static void test_implicit_mta(void) check_thread_apartment(tests[i].mta ? S_OK : CO_E_NOTINITIALIZED); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); - todo_wine_if(!tests[i].mta) check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + check_thread_apartment_broken(S_OK); /* Broken on Win8. */ hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); ok(hr == REGDB_E_CLASSNOTREG, "got %#lx.\n", hr); - todo_wine_if(!tests[i].mta) check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + check_thread_apartment_broken(S_OK); /* Broken on Win8. */ if (tests[i].ro_init) RoUninitialize(); else @@ -270,7 +270,7 @@ static void test_implicit_mta(void) SetEvent(mta_init_thread_done_event); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); - todo_wine check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + check_thread_apartment_broken(S_OK); /* Broken on Win8. */ CoUninitialize(); check_thread_apartment(CO_E_NOTINITIALIZED); @@ -292,7 +292,7 @@ static void test_implicit_mta(void) SetEvent(mta_init_thread_done_event); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); - todo_wine check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + check_thread_apartment_broken(S_OK); /* Broken on Win8. */ CoUninitialize(); check_thread_apartment(CO_E_NOTINITIALIZED); @@ -300,7 +300,7 @@ static void test_implicit_mta(void) thread = CreateThread(NULL, 0, mta_init_implicit_thread, NULL, 0, NULL); ok(!!thread, "failed.\n"); WaitForSingleObject(mta_init_thread_init_done_event, INFINITE); - todo_wine check_thread_apartment_broken(S_OK); /* Broken on Win8. */ + check_thread_apartment_broken(S_OK); /* Broken on Win8. */ SetEvent(mta_init_thread_done_event); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index eae1a5998c0..2daadb617c5 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -63,6 +63,7 @@ struct oletls struct list spies; /* Spies installed with CoRegisterInitializeSpy */ DWORD spies_lock; DWORD cancelcount; + CO_MTA_USAGE_COOKIE implicit_mta_cookie; /* mta referenced by roapi from sta thread */ }; /* Global Interface Table Functions */

1 0

Paul Gofman : winepulse.drv: Change device description.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 00e1eaffd2b6ae810381ebd15ca7e4eb5a39b8df URL: https://gitlab.winehq.org/wine/wine/-/commit/00e1eaffd2b6ae810381ebd15ca7e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Oct 13 21:55:21 2023 -0600 winepulse.drv: Change device description. --- dlls/winepulse.drv/pulse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 0ddddb00185..62658fc98e6 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -833,8 +833,9 @@ static NTSTATUS pulse_test_connect(void *args) list_init(&g_phys_speakers); list_init(&g_phys_sources); - pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio"); - pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio"); + /* Burnout Paradise Remastered expects device name to have a space. */ + pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio Output"); + pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio Input"); o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL); if (o) {

1 0

Jactry Zeng : msvcp140: Add codecvt<char32> class stub.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 49547f8bb90644bb8c41ca71c30bf9227df4e36e URL: https://gitlab.winehq.org/wine/wine/-/commit/49547f8bb90644bb8c41ca71c30bf9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Nov 15 08:00:56 2023 +0100 msvcp140: Add codecvt<char32> class stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47609 --- dlls/msvcp140/msvcp140.spec | 108 +++++++++--------- dlls/msvcp90/locale.c | 255 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 14 +++ dlls/msvcp_win/msvcp_win.spec | 108 +++++++++--------- 4 files changed, 377 insertions(+), 108 deletions(-)

1 0