- Wine-Commits - list.winehq.org

Zebediah Figura : wine.inf: Set the EnableLUA value to 1.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: b381f9d095b2a2377c8b61f734b576ac6083a742 URL: https://gitlab.winehq.org/wine/wine/-/commit/b381f9d095b2a2377c8b61f734b576… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 26 22:41:35 2021 -0600 wine.inf: Set the EnableLUA value to 1. This signifies that UAC is active. Foobar2000 checks this value, and won't even try to elevate itself otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50727 --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b1c0aad6821..4aed3e73e06 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -378,7 +378,7 @@ HKLM,%CurrentVersion%\Explorer\DriveIcons,,16 HKLM,%CurrentVersion%\Explorer\KindMap,,16 HKLM,%CurrentVersion%\Group Policy,,16 HKLM,%CurrentVersion%\Installer,"InstallerLocation",,"%11%" -HKLM,%CurrentVersion%\Policies\System,"EnableLUA",0x10003,0 +HKLM,%CurrentVersion%\Policies\System,"EnableLUA",0x10001,1 HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%"

1 0

Zebediah Figura : msi: Create the custom action server as an elevated process.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: 366398cc53c76028c8dfe8d8a16c78a6a10ce962 URL: https://gitlab.winehq.org/wine/wine/-/commit/366398cc53c76028c8dfe8d8a16c78… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 20:49:05 2021 -0500 msi: Create the custom action server as an elevated process. Dragon Naturally Speaking 12.5 manually validates that the custom action server is elevated. One might imagine that the right approach here is to add a manifest to msiexec; however, msiexec does not always trigger a UAC prompt on Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51143 --- dlls/msi/custom.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index d1e064f5b65..12a7c3c3676 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -573,12 +573,28 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) return r; } +static HANDLE get_admin_token(void) +{ + TOKEN_ELEVATION_TYPE type; + TOKEN_LINKED_TOKEN linked; + DWORD size; + + if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenElevationType, &type, sizeof(type), &size) + || type == TokenElevationTypeFull) + return NULL; + + if (!GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenLinkedToken, &linked, sizeof(linked), &size)) + return NULL; + return linked.LinkedToken; +} + static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) { WCHAR path[MAX_PATH], cmdline[MAX_PATH + 23]; PROCESS_INFORMATION pi = {0}; STARTUPINFOW si = {0}; WCHAR buffer[24]; + HANDLE token; void *cookie; HANDLE pipe; @@ -600,14 +616,18 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) lstrcatW(path, L"\\msiexec.exe"); swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId()); + token = get_admin_token(); + if (is_wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); - CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); Wow64RevertWow64FsRedirection(cookie); } else - CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + CreateProcessAsUserW(token, path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + if (token) CloseHandle(token); CloseHandle(pi.hThread);

1 0

Shaun Ren : sapi: Implement ISpeechVoice::{get/putref}_Voice.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: 43220a6063328bc445a346e5f6849731aafcaf88 URL: https://gitlab.winehq.org/wine/wine/-/commit/43220a6063328bc445a346e5f68497… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Mar 1 20:44:43 2024 -0500 sapi: Implement ISpeechVoice::{get/putref}_Voice. --- dlls/sapi/tests/tts.c | 22 +++++++++++++++++++++- dlls/sapi/tts.c | 26 ++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index a5c950aa80b..38c69e6144a 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -424,7 +424,7 @@ static void test_spvoice(void) IUnknown *dummy; ISpMMSysAudio *audio_out; ISpObjectTokenCategory *token_cat; - ISpObjectToken *token; + ISpObjectToken *token, *token2; WCHAR *token_id = NULL, *default_token_id = NULL; ISpDataKey *attrs_key; LONG rate; @@ -435,6 +435,7 @@ static void test_spvoice(void) ISpeechVoice *speech_voice; ISpeechObjectTokens *speech_tokens; LONG count, volume_long; + ISpeechObjectToken *speech_token; BSTR req = NULL, opt = NULL; UINT info_count; ITypeInfo *typeinfo; @@ -724,6 +725,25 @@ static void test_spvoice(void) ok(hr == S_OK, "got %#lx.\n", hr); ok(volume_long == 80, "got %ld.\n", volume_long); + hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)&speech_token); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpeechVoice_putref_Voice(speech_voice, speech_token); + ok(hr == S_OK, "got %#lx.\n", hr); + ISpeechObjectToken_Release(speech_token); + + speech_token = (ISpeechObjectToken *)0xdeadbeef; + hr = ISpeechVoice_get_Voice(speech_voice, &speech_token); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(speech_token && speech_token != (ISpeechObjectToken *)0xdeadbeef, "got %p.\n", speech_token); + hr = ISpeechObjectToken_QueryInterface(speech_token, &IID_ISpObjectToken, (void **)&token2); + ok(hr == S_OK, "got %#lx.\n", hr); + token_id = NULL; + hr = ISpObjectToken_GetId(token2, &token_id); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(!wcscmp(token_id, test_token_id), "got %s.\n", wine_dbgstr_w(token_id)); + CoTaskMemFree(token_id); + ISpObjectToken_Release(token2); + hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); ok(hr == S_OK, "got %#lx.\n", hr); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 325edaf04fb..c474a118981 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -235,16 +235,34 @@ static HRESULT WINAPI speech_voice_get_Status(ISpeechVoice *iface, ISpeechVoiceS static HRESULT WINAPI speech_voice_get_Voice(ISpeechVoice *iface, ISpeechObjectToken **voice) { - FIXME("(%p, %p): stub.\n", iface, voice); + struct speech_voice *This = impl_from_ISpeechVoice(iface); + ISpObjectToken *token; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, voice); + + if (!voice) return E_POINTER; + if (FAILED(hr = ISpVoice_GetVoice(&This->ISpVoice_iface, &token))) + return hr; + hr = ISpObjectToken_QueryInterface(token, &IID_ISpeechObjectToken, (void **)voice); + ISpObjectToken_Release(token); + return hr; } static HRESULT WINAPI speech_voice_putref_Voice(ISpeechVoice *iface, ISpeechObjectToken *voice) { - FIXME("(%p, %p): stub.\n", iface, voice); + struct speech_voice *This = impl_from_ISpeechVoice(iface); + ISpObjectToken *token; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, voice); + + if (!voice) return E_INVALIDARG; + if (FAILED(hr = ISpeechObjectToken_QueryInterface(voice, &IID_ISpObjectToken, (void **)&token))) + return hr; + hr = ISpVoice_SetVoice(&This->ISpVoice_iface, token); + ISpObjectToken_Release(token); + return hr; } static HRESULT WINAPI speech_voice_get_AudioOutput(ISpeechVoice *iface, ISpeechObjectToken **output)

1 0

Shaun Ren : sapi: Implement ISpeechVoice::{get/put}_Volume.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: 7c384f361aaa38b31fa7b9ff72085eee728c52ea URL: https://gitlab.winehq.org/wine/wine/-/commit/7c384f361aaa38b31fa7b9ff72085e… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Mar 1 20:20:13 2024 -0500 sapi: Implement ISpeechVoice::{get/put}_Volume. --- dlls/sapi/tests/tts.c | 9 ++++++++- dlls/sapi/tts.c | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 4d565b35294..a5c950aa80b 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -434,7 +434,7 @@ static void test_spvoice(void) DWORD start, duration; ISpeechVoice *speech_voice; ISpeechObjectTokens *speech_tokens; - LONG count; + LONG count, volume_long; BSTR req = NULL, opt = NULL; UINT info_count; ITypeInfo *typeinfo; @@ -717,6 +717,13 @@ static void test_spvoice(void) ok(count == 1, "got %ld.\n", count); ISpeechObjectTokens_Release(speech_tokens); + volume_long = 0xdeadbeef; + hr = ISpeechVoice_put_Volume(speech_voice, 80); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpeechVoice_get_Volume(speech_voice, &volume_long); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(volume_long == 80, "got %ld.\n", volume_long); + hr = ISpeechVoice_Speak(speech_voice, NULL, SVSFPurgeBeforeSpeak, NULL); ok(hr == S_OK, "got %#lx.\n", hr); diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index d22ffd7a0da..325edaf04fb 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -291,16 +291,25 @@ static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate) static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume) { - FIXME("(%p, %p): stub.\n", iface, volume); + struct speech_voice *This = impl_from_ISpeechVoice(iface); + USHORT res = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %p).\n", iface, volume); + + if (!volume) return E_POINTER; + hr = ISpVoice_GetVolume(&This->ISpVoice_iface, &res); + *volume = res; + return hr; } static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume) { - FIXME("(%p, %ld): stub.\n", iface, volume); + struct speech_voice *This = impl_from_ISpeechVoice(iface); - return E_NOTIMPL; + TRACE("(%p, %ld).\n", iface, volume); + + return ISpVoice_SetVolume(&This->ISpVoice_iface, (USHORT)volume); } static HRESULT WINAPI speech_voice_put_AllowAudioOutputFormatChangesOnNextSet(ISpeechVoice *iface,

1 0

Zhiyi Zhang : rtworkq: Avoid closing a thread pool object while its callbacks are running.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: f3bab6c5b793deeed5738081d3e43bfdd679e95f URL: https://gitlab.winehq.org/wine/wine/-/commit/f3bab6c5b793deeed5738081d3e43b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 23 16:47:55 2024 +0800 rtworkq: Avoid closing a thread pool object while its callbacks are running. Consider a thread A running scheduled_item_cancelable_callback() and a thread B running queue_cancel_item(), which is the scenario from canceling a work item right after it gets submitted by RtwqScheduleWorkItem(). When the CloseThreadpoolTimer() call in queue_cancel_item() in thread B runs before the queue_release_pending_item() in scheduled_item_cancelable_callback() in thread A, scheduled_item_cancelable_callback() ends up calling work_item_Release() and CloseThreadpoolTimer() is called again for the same timer object. So the thread pool timer object end up getting released while the scheduled_item_cancelable_callback() is running, triggering the '!object->num_running_callbacks' assertion in tp_object_release(). This is actually a double free but the assertion happens before the second free could happen. The same thing could happen for thread pool wait objects as well. Fix mf and mfmediaengine tests sometimes trigger the '!object->num_running_callbacks' assertion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55724 --- dlls/rtworkq/queue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 15b8da47639..40471ff5234 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -892,9 +892,13 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) IRtwqAsyncResult_SetStatus(item->result, RTWQ_E_OPERATION_CANCELLED); invoke_async_callback(item->result); CloseThreadpoolWait(item->u.wait_object); + item->u.wait_object = NULL; } else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) + { CloseThreadpoolTimer(item->u.timer_object); + item->u.timer_object = NULL; + } else WARN("Unknown item key mask %#I64x.\n", key); queue_release_pending_item(item);

1 0

Zhiyi Zhang : rtworkq: Avoid possible scenarios that an async callback could be called twice.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: 7865026f53b295eee910b51f93e56e8e1d0bb9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7865026f53b295eee910b51f93e56e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 23 17:12:04 2024 +0800 rtworkq: Avoid possible scenarios that an async callback could be called twice. Consider a thread A running waiting_item_cancelable_callback() and a thread B running queue_cancel_item(), which is the scenario from canceling a work item right after it gets submitted by RtwqPutWaitingWorkItem(). When the invoke_async_callback() call in queue_cancel_item() for item key with WAIT_ITEM_KEY_MASK in thread B runs before the queue_release_pending_item() in waiting_item_cancelable_callback() in thread A, the async callback is called the first time in queue_cancel_item() with RTWQ_E_OPERATION_CANCELLED, then a second time in waiting_item_cancelable_callback(). We should check in queue_release_pending_item() whether an item is already removed by queue_cancel_item() before calling async callbacks. A different scenario could happen for scheduled_item_cancelable_callback() with the function ends up calling its async callback even after it has been canceled by queue_cancel_item(). --- dlls/rtworkq/queue.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 40471ff5234..eebb096ad31 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -730,16 +730,22 @@ static HRESULT invoke_async_callback(IRtwqAsyncResult *result) return hr; } -static void queue_release_pending_item(struct work_item *item) +/* Return TRUE when the item is actually released by this function. The item could have been already + * removed from pending items when it got canceled. */ +static BOOL queue_release_pending_item(struct work_item *item) { + BOOL ret = FALSE; + EnterCriticalSection(&item->queue->cs); if (item->key) { list_remove(&item->entry); + ret = TRUE; item->key = 0; IUnknown_Release(&item->IUnknown_iface); } LeaveCriticalSection(&item->queue->cs); + return ret; } static void CALLBACK waiting_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_WAIT *wait, @@ -761,9 +767,8 @@ static void CALLBACK waiting_item_cancelable_callback(TP_CALLBACK_INSTANCE *inst TRACE("result object %p.\n", item->result); - queue_release_pending_item(item); - - invoke_async_callback(item->result); + if (queue_release_pending_item(item)) + invoke_async_callback(item->result); IUnknown_Release(&item->IUnknown_iface); } @@ -785,9 +790,8 @@ static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *in TRACE("result object %p.\n", item->result); - queue_release_pending_item(item); - - invoke_async_callback(item->result); + if (queue_release_pending_item(item)) + invoke_async_callback(item->result); IUnknown_Release(&item->IUnknown_iface); }

1 0

Rémi Bernon : mfreadwrite/reader: Adjust min_buffer_size to be 1s of audio data.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: bf800b5e76b808ee0b50be3349a6d5a037c77e36 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf800b5e76b808ee0b50be3349a6d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 29 18:19:11 2024 +0100 mfreadwrite/reader: Adjust min_buffer_size to be 1s of audio data. --- dlls/mfreadwrite/reader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 58de40c772b..5cd4641a0d4 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1912,9 +1912,14 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL list_init(&entry->entry); entry->category = category; - if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Audio)) - IMFMediaType_GetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, - &entry->min_buffer_size); + if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Audio) + && SUCCEEDED(IMFMediaType_GetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &entry->min_buffer_size))) + { + UINT32 bytes_per_second; + + if (SUCCEEDED(IMFMediaType_GetUINT32(output_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &bytes_per_second))) + entry->min_buffer_size = max(entry->min_buffer_size, bytes_per_second); + } count = 0; if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, allow_processor ? NULL : &out_type, NULL, &classes, &count)))

1 0

Tim Clem : winebus.sys: Only attempt to open joysticks and gamepads in the IOHID backend.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: c5f9d9188a6dea5b9e9e4a2f8fbf362f11b5e72b URL: https://gitlab.winehq.org/wine/wine/-/commit/c5f9d9188a6dea5b9e9e4a2f8fbf36… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Mar 1 14:39:18 2024 -0800 winebus.sys: Only attempt to open joysticks and gamepads in the IOHID backend. An extension of 3985b7c5. Opening the device for the Touch Bar on older MacBooks also triggers a permission prompt, so for now it makes sense to restrict the devices we open. --- dlls/winebus.sys/bus_iohid.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index fdcd820e99e..a44944576e9 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -281,17 +281,22 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); - if (usage_page == HID_USAGE_PAGE_GENERIC && (usage == HID_USAGE_GENERIC_MOUSE || usage == HID_USAGE_GENERIC_KEYBOARD)) - { - TRACE("Ignoring mouse / keyboard device\n"); - return; - } - desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (usage_page != HID_USAGE_PAGE_GENERIC || + !(usage == HID_USAGE_GENERIC_JOYSTICK || usage == HID_USAGE_GENERIC_GAMEPAD)) + { + /* winebus isn't currently meant to handle anything but these, and + * opening keyboards, mice, or the Touch Bar on older MacBooks triggers + * a permissions dialog for input monitoring. + */ + ERR("Ignoring HID device %p (vid %04x, pid %04x): not a joystick or gamepad\n", IOHIDDevice, desc.vid, desc.pid); + return; + } + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) { ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, desc.vid, desc.pid);

1 0

Zebediah Figura : msi: Round costs up to 4096 bytes instead of clamping.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: 9725a2286acdb791de316295d9bcb11411a3fd56 URL: https://gitlab.winehq.org/wine/wine/-/commit/9725a2286acdb791de316295d9bcb1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 2 15:06:31 2024 -0600 msi: Round costs up to 4096 bytes instead of clamping. --- dlls/msi/msi.c | 4 ++-- dlls/msi/msipriv.h | 7 +++++++ dlls/msi/tests/package.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2b821d08cf5..611399a8fb0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2037,14 +2037,14 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DW } else if ((file = msi_get_loaded_file( package, comp->KeyPath ))) { - *cost = max( 8, comp->Cost / 512 ); + *cost = cost_from_size( comp->Cost ); *buflen = set_drive( drive, file->TargetPath[0] ); r = ERROR_SUCCESS; } } else if (IStorage_Stat( package->db->storage, &stat, STATFLAG_NONAME ) == S_OK) { - *temp = max( 8, stat.cbSize.QuadPart / 512 ); + *temp = cost_from_size( stat.cbSize.QuadPart ); *buflen = set_drive( drive, path[0] ); r = ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4c2f2ae2589..588aa9a7487 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1194,4 +1194,11 @@ static inline LPWSTR strdupUtoW( LPCSTR str ) return ret; } +static inline int cost_from_size( int size ) +{ + /* Cost is size rounded up to the nearest 4096 bytes, + * expressed in units of 512 bytes. */ + return ((size + 4095) & ~4095) / 512; +} + #endif /* __WINE_MSI_PRIVATE__ */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9f15bc37520..9257a835891 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8628,7 +8628,7 @@ static void test_costs(void) ok( len == 2, "expected len == 2, got %lu\n", len ); ok( drive[0], "expected a drive\n" ); ok( !cost, "expected cost == 0, got %d\n", cost ); - ok( temp && temp != 0xdead, "expected temp > 0, got %d\n", temp ); + todo_wine ok( temp && temp != 0xdead, "expected temp > 0, got %d\n", temp ); /* increased index */ len = sizeof(drive);

1 0

Zebediah Figura : msi: Store component cost in 512-byte units.
by Alexandre Julliard March 4, 2024

March 4, 2024

Module: wine Branch: master Commit: d7bbe884ef29215f4db2027f450fb959314f5383 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7bbe884ef29215f4db2027f450fb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 2 15:23:56 2024 -0600 msi: Store component cost in 512-byte units. This avoids overflow when component costs exceed 4 GB. --- dlls/msi/action.c | 14 +++++++------- dlls/msi/install.c | 3 +-- dlls/msi/msi.c | 4 ++-- dlls/msi/msipriv.h | 3 ++- dlls/msi/tests/package.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 20da818e686..06f399223f4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2070,7 +2070,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) if (msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { - comp->Cost += file->FileSize; + comp->cost += cost_from_size( file->FileSize ); continue; } file_size = msi_get_disk_file_size( package, file->TargetPath ); @@ -2082,7 +2082,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) { if (msi_compare_file_versions( file_version, file->Version ) < 0) { - comp->Cost += file->FileSize - file_size; + comp->cost += cost_from_size( file->FileSize - file_size ); } free( file_version ); continue; @@ -2091,7 +2091,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) { if (msi_compare_font_versions( font_version, file->Version ) < 0) { - comp->Cost += file->FileSize - file_size; + comp->cost += cost_from_size( file->FileSize - file_size ); } free( font_version ); continue; @@ -2099,7 +2099,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) } if (file_size != file->FileSize) { - comp->Cost += file->FileSize - file_size; + comp->cost += cost_from_size( file->FileSize - file_size ); } } @@ -2217,7 +2217,7 @@ static ULONGLONG get_volume_space_required( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->Cost; + if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->cost; } return ret; } @@ -2292,10 +2292,10 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) msi_set_property( package->db, L"PrimaryVolumeSpaceAvailable", buf, -1 ); } required = get_volume_space_required( package ); - swprintf( buf, ARRAY_SIZE(buf), L"%lu", required / 512 ); + swprintf( buf, ARRAY_SIZE(buf), L"%lu", required ); msi_set_property( package->db, L"PrimaryVolumeSpaceRequired", buf, -1 ); - swprintf( buf, ARRAY_SIZE(buf), L"%lu", (free.QuadPart - required) / 512 ); + swprintf( buf, ARRAY_SIZE(buf), L"%lu", (free.QuadPart / 512) - required ); msi_set_property( package->db, L"PrimaryVolumeSpaceRemaining", buf, -1 ); msi_set_property( package->db, L"PrimaryVolumePath", primary_folder, 2 ); } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 609a3016eaa..f4db3b510f1 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1147,7 +1147,7 @@ static INT feature_cost( MSIFEATURE *feature ) LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { - cost += cl->component->Cost; + cost += cl->component->cost; } return cost; } @@ -1197,7 +1197,6 @@ UINT MSI_GetFeatureCost( MSIPACKAGE *package, MSIFEATURE *feature, MSICOSTTREE t break; } - *cost /= 512; return ERROR_SUCCESS; } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 611399a8fb0..2c0f3aa50f5 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2028,7 +2028,7 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DW GetWindowsDirectoryW( path, MAX_PATH ); if (component && component[0]) { - if (msi_is_global_assembly( comp )) *temp = comp->Cost; + if (msi_is_global_assembly( comp )) *temp = comp->cost; if (!comp->Enabled || !comp->KeyPath) { *cost = 0; @@ -2037,7 +2037,7 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DW } else if ((file = msi_get_loaded_file( package, comp->KeyPath ))) { - *cost = cost_from_size( comp->Cost ); + *cost = comp->cost; *buflen = set_drive( drive, file->TargetPath[0] ); r = ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 588aa9a7487..b7bc1e7b067 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -532,7 +532,8 @@ typedef struct tagMSICOMPONENT INSTALLSTATE Action; BOOL ForceLocalState; BOOL Enabled; - INT Cost; + /* Cost is in 512-byte units, as returned from MsiEnumComponentCosts() et al. */ + int cost; INT RefCount; LPWSTR FullKeypath; LPWSTR AdvertiseString; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9257a835891..228fd91ef43 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8607,7 +8607,7 @@ static void test_costs(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); ok( len == 2, "expected len == 2, got %lu\n", len ); ok( drive[0], "expected a drive\n" ); - todo_wine ok( cost == 12000024, "got %d\n", cost ); + ok( cost == 12000024, "got %d\n", cost ); ok( !temp, "expected temp == 0, got %d\n", temp ); len = sizeof(drive); @@ -8651,7 +8651,7 @@ static void test_costs(void) cost = 0xdead; r = MsiGetFeatureCostA( hpkg, "one", MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &cost ); ok( !r, "got %u\n", r); - todo_wine ok( cost == 12000024, "got %d\n", cost ); + ok( cost == 12000024, "got %d\n", cost ); MsiCloseHandle( hpkg ); error:

1 0