November 2023 - Wine-Commits

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

Nov. 16, 2023

Module: wine Branch: master Commit: ade158ea7df3719ada29aefec06e8f615a30446e URL: https://gitlab.winehq.org/wine/wine/-/commit/ade158ea7df3719ada29aefec06e8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:08:24 2023 +0100 win32u: Use the generated syscall list. --- dlls/win32u/syscall.c | 409 +------------------------------------------------- 1 file changed, 8 insertions(+), 401 deletions(-)

1 0

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

Nov. 16, 2023

Module: wine Branch: master Commit: 4adf3bc0bb31fed012af12ab54875162d4273ed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4adf3bc0bb31fed012af12ab548751… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:09:16 2023 +0100 wow64: Use the generated syscall list. --- dlls/wow64/syscall.c | 8 +- dlls/wow64/syscall.h | 265 --------------------------------------------- dlls/wow64/wow64_private.h | 6 +- 3 files changed, 7 insertions(+), 272 deletions(-)

1 0

Zebediah Figura : wined3d: Provide a null counter BO for slots with no corresponding XFB buffer bound.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: fbd53c3a3f65792608281be25ad5dcb315a6f2eb URL: https://gitlab.winehq.org/wine/wine/-/commit/fbd53c3a3f65792608281be25ad5dc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 18:10:31 2023 -0600 wined3d: Provide a null counter BO for slots with no corresponding XFB buffer bound. The Vulkan specification does not currently mandate this. However, an (unfortunately internal) Khronos discussion determined that this is an oversight, and that many drivers likely expect that no counter buffer will be bound if no XFB buffer is bound. Accordingly the specification will probably mandate this in the future. lavapipe is such a driver. This fixes a crash with llvmpipe in test_index_buffer_offset(). --- dlls/wined3d/context_vk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fcdaaa17966..29a4a4998d4 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2820,13 +2820,12 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context 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; - } } + memset(context_vk->vk_so_counters, 0, sizeof(context_vk->vk_so_counters)); first = 0; count = 0; for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) @@ -2835,6 +2834,8 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context if ((buffer = stream->buffer)) { + context_vk->vk_so_counters[i] = context_vk->vk_so_counter_bo.vk_buffer; + buffer_vk = wined3d_buffer_vk(buffer); buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); wined3d_context_vk_reference_bo(context_vk, wined3d_bo_vk(buffer->buffer_object));

1 0

Alex Henrie : sapi: Use CRT allocation functions.
by Alexandre Julliard Nov. 16, 2023

Nov. 16, 2023

Module: wine Branch: master Commit: 8f26aaf2ba7fc7889c3ec6c5841741a21bc12973 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f26aaf2ba7fc7889c3ec6c5841741… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 16 00:23:51 2023 -0700 sapi: Use CRT allocation functions. --- dlls/sapi/async.c | 5 ++--- dlls/sapi/automation.c | 4 ++-- dlls/sapi/mmaudio.c | 22 +++++++++++----------- dlls/sapi/resource.c | 4 ++-- dlls/sapi/sapi_private.h | 1 - dlls/sapi/stream.c | 4 ++-- dlls/sapi/tts.c | 24 ++++++++++++------------ 7 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/sapi/async.c b/dlls/sapi/async.c index 61b99019abe..69f962d5502 100644 --- a/dlls/sapi/async.c +++ b/dlls/sapi/async.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "objbase.h" -#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" @@ -58,7 +57,7 @@ void async_empty_queue(struct async_queue *queue) LIST_FOR_EACH_ENTRY_SAFE(task, next, &queue->tasks, struct async_task, entry) { list_remove(&task->entry); - heap_free(task); + free(task); } LeaveCriticalSection(&queue->cs); @@ -87,7 +86,7 @@ static void CALLBACK async_worker(TP_CALLBACK_INSTANCE *instance, void *ctx) { ResetEvent(queue->empty); task->proc(task); - heap_free(task); + free(task); if (WaitForSingleObject(queue->cancel, 0) == WAIT_OBJECT_0) goto cancel; } diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c index 8a0e0203198..6292a5119fa 100644 --- a/dlls/sapi/automation.c +++ b/dlls/sapi/automation.c @@ -95,7 +95,7 @@ static ULONG WINAPI file_stream_Release(ISpeechFileStream *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -375,7 +375,7 @@ const static ISpStreamVtbl spstream_vtbl = HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) { - struct file_stream *This = heap_alloc(sizeof(*This)); + struct file_stream *This = malloc(sizeof(*This)); HRESULT hr; if (!This) return E_OUTOFMEMORY; diff --git a/dlls/sapi/mmaudio.c b/dlls/sapi/mmaudio.c index 7452d9a7257..0369157acbc 100644 --- a/dlls/sapi/mmaudio.c +++ b/dlls/sapi/mmaudio.c @@ -381,12 +381,12 @@ static ULONG WINAPI mmsysaudio_Release(ISpMMSysAudio *iface) async_cancel_queue(&This->queue); if (This->token) ISpObjectToken_Release(This->token); - heap_free(This->wfx); + free(This->wfx); CloseHandle(This->event); DeleteCriticalSection(&This->pending_cs); DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); } return ref; @@ -421,7 +421,7 @@ static HRESULT WINAPI mmsysaudio_Write(ISpMMSysAudio *iface, const void *pv, ULO return SP_AUDIO_STOPPED; } - if (!(buf = heap_alloc(sizeof(WAVEHDR) + cb))) + if (!(buf = malloc(sizeof(WAVEHDR) + cb))) { LeaveCriticalSection(&This->cs); return E_OUTOFMEMORY; @@ -434,7 +434,7 @@ static HRESULT WINAPI mmsysaudio_Write(ISpMMSysAudio *iface, const void *pv, ULO if (waveOutPrepareHeader(This->hwave.out, buf, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) { LeaveCriticalSection(&This->cs); - heap_free(buf); + free(buf); return E_FAIL; } @@ -562,7 +562,7 @@ static void free_out_buf_proc(struct async_task *task) TRACE("(%p).\n", task); waveOutUnprepareHeader(fbt->audio->hwave.out, fbt->buf, sizeof(WAVEHDR)); - heap_free(fbt->buf); + free(fbt->buf); EnterCriticalSection(&fbt->audio->pending_cs); buf_count = --fbt->audio->pending_buf_count; @@ -582,7 +582,7 @@ static void CALLBACK wave_out_proc(HWAVEOUT hwo, UINT msg, DWORD_PTR instance, D switch (msg) { case WOM_DONE: - if (!(task = heap_alloc(sizeof(*task)))) + if (!(task = malloc(sizeof(*task)))) { ERR("failed to allocate free_buf_task.\n"); break; @@ -685,13 +685,13 @@ static HRESULT WINAPI mmsysaudio_SetFormat(ISpMMSysAudio *iface, const GUID *gui return res == WAVERR_BADFORMAT ? SPERR_UNSUPPORTED_FORMAT : SPERR_GENERIC_MMSYS_ERROR; } - if (!(new_wfx = heap_alloc(sizeof(*wfx) + wfx->cbSize))) + if (!(new_wfx = malloc(sizeof(*wfx) + wfx->cbSize))) { LeaveCriticalSection(&This->cs); return E_OUTOFMEMORY; } memcpy(new_wfx, wfx, sizeof(*wfx) + wfx->cbSize); - heap_free(This->wfx); + free(This->wfx); This->wfx = new_wfx; LeaveCriticalSection(&This->cs); @@ -874,7 +874,7 @@ static HRESULT mmaudio_create(IUnknown *outer, REFIID iid, void **obj, enum flow return E_NOTIMPL; } - if (!(This = heap_alloc_zero(sizeof(*This)))) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->ISpEventSource_iface.lpVtbl = &event_source_vtbl; This->ISpEventSink_iface.lpVtbl = &event_sink_vtbl; @@ -887,9 +887,9 @@ static HRESULT mmaudio_create(IUnknown *outer, REFIID iid, void **obj, enum flow This->device_id = WAVE_MAPPER; This->state = SPAS_CLOSED; - if (!(This->wfx = heap_alloc(sizeof(*This->wfx)))) + if (!(This->wfx = malloc(sizeof(*This->wfx)))) { - heap_free(This); + free(This); return E_OUTOFMEMORY; } This->wfx->wFormatTag = WAVE_FORMAT_PCM; diff --git a/dlls/sapi/resource.c b/dlls/sapi/resource.c index 8db833b3b39..5fea496979f 100644 --- a/dlls/sapi/resource.c +++ b/dlls/sapi/resource.c @@ -84,7 +84,7 @@ static ULONG WINAPI resource_manager_Release(ISpResourceManager *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -126,7 +126,7 @@ const static ISpResourceManagerVtbl resource_manager_vtbl = HRESULT resource_manager_create(IUnknown *outer, REFIID iid, void **obj) { - struct resource_manager *This = heap_alloc(sizeof(*This)); + struct resource_manager *This = malloc(sizeof(*This)); HRESULT hr; if (!This) return E_OUTOFMEMORY; diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 3cdb59b36a8..f6a5e966461 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/heap.h" #include "wine/list.h" struct async_task diff --git a/dlls/sapi/stream.c b/dlls/sapi/stream.c index 6df2768b5cc..5cd64125ade 100644 --- a/dlls/sapi/stream.c +++ b/dlls/sapi/stream.c @@ -84,7 +84,7 @@ static ULONG WINAPI spstream_Release(ISpStream *iface) if (!ref) { - heap_free(This); + free(This); } return ref; @@ -235,7 +235,7 @@ const static ISpStreamVtbl spstream_vtbl = HRESULT speech_stream_create(IUnknown *outer, REFIID iid, void **obj) { - struct spstream *This = heap_alloc(sizeof(*This)); + struct spstream *This = malloc(sizeof(*This)); HRESULT hr; if (!This) return E_OUTOFMEMORY; diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index b1c90627d5e..410a57b4bfc 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -166,7 +166,7 @@ static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface) if (This->engine) ISpTTSEngine_Release(This->engine); DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); } return ref; @@ -822,7 +822,7 @@ done: } CoTaskMemFree(wfx); if (engine) ISpTTSEngine_Release(engine); - heap_free(speak_task->frag_list); + free(speak_task->frag_list); ISpTTSEngineSite_Release(speak_task->site); if (speak_task->result) @@ -898,7 +898,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR return hr; } - if (!(frag = heap_alloc(sizeof(*frag) + contents_size))) + if (!(frag = malloc(sizeof(*frag) + contents_size))) return E_OUTOFMEMORY; memset(frag, 0, sizeof(*frag)); memcpy(frag + 1, contents, contents_size); @@ -915,7 +915,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR goto fail; } - speak_task = heap_alloc(sizeof(*speak_task)); + speak_task = malloc(sizeof(*speak_task)); speak_task->task.proc = speak_proc; speak_task->result = NULL; @@ -926,7 +926,7 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR if (!(flags & SPF_ASYNC)) { - if (!(result = heap_alloc(sizeof(*result)))) + if (!(result = malloc(sizeof(*result)))) { hr = E_OUTOFMEMORY; goto fail; @@ -952,18 +952,18 @@ static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWOR WaitForSingleObject(result->done, INFINITE); hr = result->hr; CloseHandle(result->done); - heap_free(result); + free(result); return hr; } fail: if (site) ISpTTSEngineSite_Release(site); - heap_free(frag); - heap_free(speak_task); + free(frag); + free(speak_task); if (result) { CloseHandle(result->done); - heap_free(result); + free(result); } return hr; } @@ -1210,7 +1210,7 @@ static ULONG WINAPI ttsenginesite_Release(ISpTTSEngineSite *iface) { if (This->voice) ISpeechVoice_Release(&This->voice->ISpeechVoice_iface); - heap_free(This); + free(This); } return ref; @@ -1315,7 +1315,7 @@ const static ISpTTSEngineSiteVtbl ttsenginesite_vtbl = static HRESULT ttsenginesite_create(struct speech_voice *voice, ULONG stream_num, ISpTTSEngineSite **site) { - struct tts_engine_site *This = heap_alloc(sizeof(*This)); + struct tts_engine_site *This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1387,7 +1387,7 @@ const static IConnectionPointContainerVtbl container_vtbl = HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { - struct speech_voice *This = heap_alloc(sizeof(*This)); + struct speech_voice *This = malloc(sizeof(*This)); HRESULT hr; if (!This) return E_OUTOFMEMORY;

1 0

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