wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Rémi Bernon : mf: Use a dedicated interface for sample allocator ready callbacks.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 76f7236b570972b62fe05ebd38ee249d486d9d02 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f7236b570972b62fe05ebd38ee24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 24 20:04:15 2022 +0200 mf: Use a dedicated interface for sample allocator ready callbacks. --- dlls/mf/session.c | 102 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 73 insertions(+), 29 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 87fe77a730f..2553369fb54 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -50,7 +50,6 @@ enum session_command /* Internally used commands. */ SESSION_CMD_END, SESSION_CMD_QM_NOTIFY_TOPOLOGY, - SESSION_CMD_SA_READY, }; struct session_op @@ -79,10 +78,6 @@ struct session_op { IMFTopology *topology; } notify_topology; - struct - { - TOPOID node_id; - } sa_ready; }; struct list entry; }; @@ -231,6 +226,7 @@ struct media_session IMFRateControl IMFRateControl_iface; IMFTopologyNodeAttributeEditor IMFTopologyNodeAttributeEditor_iface; IMFAsyncCallback commands_callback; + IMFAsyncCallback sa_ready_callback; IMFAsyncCallback events_callback; IMFAsyncCallback sink_finalizer_callback; LONG refcount; @@ -274,6 +270,11 @@ static struct media_session *impl_from_commands_callback_IMFAsyncCallback(IMFAsy return CONTAINING_RECORD(iface, struct media_session, commands_callback); } +static struct media_session *impl_from_sa_ready_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct media_session, sa_ready_callback); +} + static struct media_session *impl_from_events_callback_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_session, events_callback); @@ -1537,15 +1538,7 @@ static HRESULT session_request_sample_from_node(struct media_session *session, I static HRESULT WINAPI node_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) { struct topo_node *topo_node = impl_node_from_IMFVideoSampleAllocatorNotify(iface); - struct session_op *op; - - if (SUCCEEDED(create_session_op(SESSION_CMD_SA_READY, &op))) - { - op->sa_ready.node_id = topo_node->node_id; - MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &topo_node->session->commands_callback, &op->IUnknown_iface); - IUnknown_Release(&op->IUnknown_iface); - } - + MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &topo_node->session->sa_ready_callback, (IUnknown *)iface); return S_OK; } @@ -2378,9 +2371,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); struct media_session *session = impl_from_commands_callback_IMFAsyncCallback(iface); - struct topo_node *topo_node; - IMFTopologyNode *upstream_node; - DWORD upstream_output; EnterCriticalSection(&session->cs); @@ -2409,18 +2399,6 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFQualityManager_NotifyTopology(session->quality_manager, op->notify_topology.topology); session_command_complete(session); break; - case SESSION_CMD_SA_READY: - topo_node = session_get_node_by_id(session, op->sa_ready.node_id); - - if (topo_node->u.sink.requests) - { - if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) - { - session_deliver_pending_samples(session, upstream_node); - IMFTopologyNode_Release(upstream_node); - } - } - break; case SESSION_CMD_SET_RATE: session_set_rate(session, op->set_rate.thin, op->set_rate.rate); break; @@ -2442,6 +2420,71 @@ static const IMFAsyncCallbackVtbl session_commands_callback_vtbl = session_commands_callback_Invoke, }; +static HRESULT WINAPI session_sa_ready_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) + || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI session_sa_ready_callback_AddRef(IMFAsyncCallback *iface) +{ + struct media_session *session = impl_from_sa_ready_callback_IMFAsyncCallback(iface); + return IMFMediaSession_AddRef(&session->IMFMediaSession_iface); +} + +static ULONG WINAPI session_sa_ready_callback_Release(IMFAsyncCallback *iface) +{ + struct media_session *session = impl_from_sa_ready_callback_IMFAsyncCallback(iface); + return IMFMediaSession_Release(&session->IMFMediaSession_iface); +} + +static HRESULT WINAPI session_sa_ready_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI session_sa_ready_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + IMFVideoSampleAllocatorNotify *notify = (IMFVideoSampleAllocatorNotify *)IMFAsyncResult_GetStateNoAddRef(result); + struct topo_node *topo_node = impl_node_from_IMFVideoSampleAllocatorNotify(notify); + struct media_session *session = impl_from_sa_ready_callback_IMFAsyncCallback(iface); + IMFTopologyNode *upstream_node; + DWORD upstream_output; + + EnterCriticalSection(&session->cs); + + if (topo_node->u.sink.requests) + { + if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) + { + session_deliver_pending_samples(session, upstream_node); + IMFTopologyNode_Release(upstream_node); + } + } + + LeaveCriticalSection(&session->cs); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl session_sa_ready_callback_vtbl = +{ + session_sa_ready_callback_QueryInterface, + session_sa_ready_callback_AddRef, + session_sa_ready_callback_Release, + session_sa_ready_callback_GetParameters, + session_sa_ready_callback_Invoke, +}; + static HRESULT WINAPI session_events_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFAsyncCallback) || @@ -3926,6 +3969,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses object->IMFRateControl_iface.lpVtbl = &session_rate_control_vtbl; object->IMFTopologyNodeAttributeEditor_iface.lpVtbl = &node_attribute_editor_vtbl; object->commands_callback.lpVtbl = &session_commands_callback_vtbl; + object->sa_ready_callback.lpVtbl = &session_sa_ready_callback_vtbl; object->events_callback.lpVtbl = &session_events_callback_vtbl; object->sink_finalizer_callback.lpVtbl = &session_sink_finalizer_callback_vtbl; object->refcount = 1;

1 0

Nikolay Sivov : wmiutils: Use CRT allocation functions.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 0e06db39640028ff651559609cae60d759c513b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e06db39640028ff651559609cae60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 09:19:20 2022 +0300 wmiutils: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmiutils/path.c | 142 +++++++++++++++++++-------------------- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/wmiutils_private.h | 10 --- 3 files changed, 73 insertions(+), 83 deletions(-)

1 0

Nikolay Sivov : prntvpt: Use CRT allocation functions.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: e0ca118f03ce2a999ec34d748a0e13dedafad174 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0ca118f03ce2a999ec34d748a0e13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 09:02:00 2022 +0300 prntvpt: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/prntvpt/main.c | 23 ++++++----------------- dlls/prntvpt/ticket.c | 19 +++++++++---------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index e046c6cbaed..90b907f24de 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -26,26 +26,15 @@ #include "winspool.h" #include "objbase.h" #include "prntvpt.h" -#include "wine/heap.h" #include "wine/debug.h" #include "prntvpt_private.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); -static WCHAR *heap_strdupW(const WCHAR *src) -{ - WCHAR *dst; - size_t len; - if (!src) return NULL; - len = (wcslen(src) + 1) * sizeof(WCHAR); - if ((dst = heap_alloc(len))) memcpy(dst, src, len); - return dst; -} - HRESULT WINAPI PTReleaseMemory(PVOID mem) { - heap_free(mem); + free(mem); return S_OK; } @@ -65,9 +54,9 @@ HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) return E_HANDLE; prov->owner = 0; - heap_free(prov->name); + free(prov->name); ClosePrinter(prov->hprn); - heap_free(prov); + free(prov); return S_OK; } @@ -92,16 +81,16 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p if (!max_version || !provider || !used_version) return E_INVALIDARG; - prov = heap_alloc(sizeof(*prov)); + prov = malloc(sizeof(*prov)); if (!prov) return E_OUTOFMEMORY; if (!OpenPrinterW((LPWSTR)printer, &prov->hprn, NULL)) { - heap_free(prov); + free(prov); return HRESULT_FROM_WIN32(GetLastError()); } - prov->name = heap_strdupW(printer); + prov->name = wcsdup(printer); prov->owner = GetCurrentThreadId(); *provider = (HPTPROVIDER)prov; *used_version = 1; diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e43cda8be6b..a8c5134e1ec 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -30,7 +30,6 @@ #include "prntvpt.h" #include "initguid.h" #include "msxml2.h" -#include "wine/heap.h" #include "wine/debug.h" #include "prntvpt_private.h" @@ -709,7 +708,7 @@ static HRESULT initialize_ticket(struct prn_provider *prov, struct ticket *ticke if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return HRESULT_FROM_WIN32(GetLastError()); - pi2 = heap_alloc(size); + pi2 = malloc(size); if (!pi2) return E_OUTOFMEMORY; if (!GetPrinterW(prov->hprn, 2, (LPBYTE)pi2, size, NULL)) @@ -717,7 +716,7 @@ static HRESULT initialize_ticket(struct prn_provider *prov, struct ticket *ticke else devmode_to_ticket(pi2->pDevMode, ticket); - heap_free(pi2); + free(pi2); return hr; } @@ -739,7 +738,7 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre hr = parse_ticket(stream, scope, &ticket); if (hr != S_OK) return hr; - *dm = heap_alloc(sizeof(**dm)); + *dm = malloc(sizeof(**dm)); if (!*dm) return E_OUTOFMEMORY; ticket_to_devmode(&ticket, *dm); @@ -1279,7 +1278,7 @@ static HRESULT write_PageMediaSize_caps(const WCHAR *device, IXMLDOMElement *roo if (count <= 0) return HRESULT_FROM_WIN32(GetLastError()); - pt = heap_alloc(count * sizeof(*pt)); + pt = calloc(count, sizeof(*pt)); if (!pt) return E_OUTOFMEMORY; count = DeviceCapabilitiesW(device, NULL, DC_PAPERSIZE, (LPWSTR)pt, NULL); @@ -1298,7 +1297,7 @@ static HRESULT write_PageMediaSize_caps(const WCHAR *device, IXMLDOMElement *roo fail: if (feature) IXMLDOMElement_Release(feature); - heap_free(pt); + free(pt); return hr; } @@ -1353,7 +1352,7 @@ static HRESULT write_PageResolution_caps(const WCHAR *device, IXMLDOMElement *ro if (count <= 0) return HRESULT_FROM_WIN32(GetLastError()); - res = heap_alloc(count * sizeof(*res)); + res = calloc(count, sizeof(*res)); if (!res) return E_OUTOFMEMORY; count = DeviceCapabilitiesW(device, NULL, DC_ENUMRESOLUTIONS, (LPWSTR)res, NULL); @@ -1372,7 +1371,7 @@ static HRESULT write_PageResolution_caps(const WCHAR *device, IXMLDOMElement *ro fail: if (feature) IXMLDOMElement_Release(feature); - heap_free(res); + free(res); return hr; } @@ -1427,7 +1426,7 @@ static HRESULT write_JobInputBin_caps(const WCHAR *device, IXMLDOMElement *root) if (count <= 0) return HRESULT_FROM_WIN32(GetLastError()); - bin = heap_alloc(count * sizeof(*bin)); + bin = calloc(count, sizeof(*bin)); if (!bin) return E_OUTOFMEMORY; count = DeviceCapabilitiesW(device, NULL, DC_BINS, (LPWSTR)bin, NULL); @@ -1446,7 +1445,7 @@ static HRESULT write_JobInputBin_caps(const WCHAR *device, IXMLDOMElement *root) fail: if (feature) IXMLDOMElement_Release(feature); - heap_free(bin); + free(bin); return hr; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: d19814cb6557dcf9dc8ccee95e6b7e169cb08a4d URL: https://gitlab.winehq.org/wine/wine/-/commit/d19814cb6557dcf9dc8ccee95e6b7e… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Aug 18 18:31:28 2022 +0300 po: Update Finnish translation. --- po/fi.po | 68 +++++----------------------------------------------------------- 1 file changed, 5 insertions(+), 63 deletions(-) diff --git a/po/fi.po b/po/fi.po index ca7ca5c5b9d..e913097eb00 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1327,10 +1327,8 @@ msgid "Options" msgstr "Valinnat" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" -msgstr "Oletukset" +msgstr "Oletus" #: dlls/credui/credui.rc:45 msgid "&User name:" @@ -15825,56 +15823,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -15954,7 +15902,7 @@ msgstr "" " seuraavista:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " Jos parametria [/t] ei anneta, datan laji on oletuksena REG_SZ.\n" "\n" @@ -16391,10 +16339,8 @@ msgstr "&DWORD-arvo" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD-arvo" +msgstr "&QWORD-arvo" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16947,16 +16893,12 @@ msgid "Collapse" msgstr "Tiivistä" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Lisää uuden 32-bittisen arvon" +msgstr "Lisää uuden 64-bittisen arvon" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "Muokkaa DWORD-arvoa" +msgstr "Muokkaa QWORD-arvoa" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 41274a09737f59b8c4e471c915e50510db7bebf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/41274a09737f59b8c4e471c915e505… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Aug 14 17:34:30 2022 +0300 readme: Update Finnish translation. --- documentation/README.fi | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index e459bbc779a..00af959c033 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -146,6 +146,8 @@ Kysymyksiä: Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. +Gitlab: Winen kehitykseen voi osallistua sivustolla https://gitlab.winehq.org + Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, sivulla https://www.winehq.org/forums kerrotaan niistä lisää. @@ -157,14 +159,6 @@ Virheet: IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.libera.chat. -Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla https://www.winehq.org/git kerrotaan tästä lisää. - - -Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi -(mieluiten komennon git-format-patch avulla) listalle wine-devel(a)winehq.org, -jotta se voidaan lisätä Winen seuraavaan versioon. - -- Alkuperäisen version tekstistä on kirjoittanut Alexandre Julliard

1 0

Joel Holdsworth : mountmgr.sys: Implemented FileFsSizeInformation and FileFsFullSizeInformation volume queries.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 7546b4a63d437c2f7f8673cae9341d358f84f1a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7546b4a63d437c2f7f8673cae9341d… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Aug 25 12:58:31 2022 +0100 mountmgr.sys: Implemented FileFsSizeInformation and FileFsFullSizeInformation volume queries. This patch fixes GetDiskFreeSpaceA/W when an NT-style GUID volume path is provided e.g. "\\?\Volume{00000000-0000-0000-0000-000000000043}\" as might be retrieved by FindFirstVolumeA/W and FindNextVolumeA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53547 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/kernel32/tests/drive.c | 2 - dlls/mountmgr.sys/device.c | 50 +++++++++++++++++ dlls/mountmgr.sys/unixlib.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/unixlib.h | 16 ++++++ 4 files changed, 197 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 4cde08ffbee..db9f626aaab 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -164,7 +164,6 @@ static void test_GetDiskFreeSpaceA(void) ok(ret, "GetVolumeNameForVolumeMountPointA error %ld\n", GetLastError()); ret = GetDiskFreeSpaceA(volume_guid_path, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - todo_wine ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); logical_drives = GetLogicalDrives(); @@ -257,7 +256,6 @@ static void test_GetDiskFreeSpaceW(void) ok(ret, "GetVolumeNameForVolumeMountPointW error %ld\n", GetLastError()); ret = GetDiskFreeSpaceW(volume_guid_path, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); - todo_wine ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); logical_drives = GetLogicalDrives(); diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 50b2f38bbd8..328b0b2f344 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1656,6 +1656,30 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_SUCCESS; break; } + case FileFsSizeInformation: + { + FILE_FS_SIZE_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + struct size_info size_info = { 0, 0, 0, 0, 0 }; + struct get_volume_size_info_params params = { dev->unix_mount, &size_info }; + + if (length < sizeof(FILE_FS_SIZE_INFORMATION)) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + if ((status = MOUNTMGR_CALL( get_volume_size_info, &params )) == STATUS_SUCCESS) + { + info->TotalAllocationUnits.QuadPart = size_info.total_allocation_units; + info->AvailableAllocationUnits.QuadPart = size_info.caller_available_allocation_units; + info->SectorsPerAllocationUnit = size_info.sectors_per_allocation_unit; + info->BytesPerSector = size_info.bytes_per_sector; + io->Information = sizeof(*info); + status = STATUS_SUCCESS; + } + + break; + } case FileFsAttributeInformation: { FILE_FS_ATTRIBUTE_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; @@ -1702,6 +1726,32 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_SUCCESS; break; } + case FileFsFullSizeInformation: + { + FILE_FS_FULL_SIZE_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + struct size_info size_info = { 0, 0, 0, 0, 0 }; + struct get_volume_size_info_params params = { dev->unix_mount, &size_info }; + + if (length < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + { + status = STATUS_BUFFER_TOO_SMALL; + break; + } + + if ((status = MOUNTMGR_CALL( get_volume_size_info, &params )) == STATUS_SUCCESS) + { + info->TotalAllocationUnits.QuadPart = size_info.total_allocation_units; + info->CallerAvailableAllocationUnits.QuadPart = size_info.caller_available_allocation_units; + info->ActualAvailableAllocationUnits.QuadPart = size_info.actual_available_allocation_units; + info->SectorsPerAllocationUnit = size_info.sectors_per_allocation_unit; + info->BytesPerSector = size_info.bytes_per_sector; + io->Information = sizeof(*info); + status = STATUS_SUCCESS; + } + + break; + } + default: FIXME("Unsupported volume query %x\n", irpsp->Parameters.QueryVolume.FsInformationClass); status = STATUS_NOT_SUPPORTED; diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index 52a3fce66d6..13f6fbecf09 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -30,12 +30,63 @@ #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> +#ifdef HAVE_SYS_STATFS_H +#include <sys/statfs.h> +#endif +#ifdef HAVE_SYS_STATVFS_H +# include <sys/statvfs.h> +#endif #include <unistd.h> #include "unixlib.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); static struct run_loop_params run_loop_params; +static NTSTATUS errno_to_status( int err ) +{ + TRACE( "errno = %d\n", err ); + switch (err) + { + case EAGAIN: return STATUS_SHARING_VIOLATION; + case EBADF: return STATUS_INVALID_HANDLE; + case EBUSY: return STATUS_DEVICE_BUSY; + case ENOSPC: return STATUS_DISK_FULL; + case EPERM: + case EROFS: + case EACCES: return STATUS_ACCESS_DENIED; + case ENOTDIR: return STATUS_OBJECT_PATH_NOT_FOUND; + case ENOENT: return STATUS_OBJECT_NAME_NOT_FOUND; + case EISDIR: return STATUS_INVALID_DEVICE_REQUEST; + case EMFILE: + case ENFILE: return STATUS_TOO_MANY_OPENED_FILES; + case EINVAL: return STATUS_INVALID_PARAMETER; + case ENOTEMPTY: return STATUS_DIRECTORY_NOT_EMPTY; + case EPIPE: return STATUS_PIPE_DISCONNECTED; + case EIO: return STATUS_DEVICE_NOT_READY; +#ifdef ENOMEDIUM + case ENOMEDIUM: return STATUS_NO_MEDIA_IN_DEVICE; +#endif + case ENXIO: return STATUS_NO_SUCH_DEVICE; + case ENOTTY: + case EOPNOTSUPP:return STATUS_NOT_SUPPORTED; + case ECONNRESET:return STATUS_PIPE_DISCONNECTED; + case EFAULT: return STATUS_ACCESS_VIOLATION; + case ESPIPE: return STATUS_ILLEGAL_FUNCTION; + case ELOOP: return STATUS_REPARSE_POINT_NOT_RESOLVED; +#ifdef ETIME /* Missing on FreeBSD */ + case ETIME: return STATUS_IO_TIMEOUT; +#endif + case ENOEXEC: /* ?? */ + case EEXIST: /* ?? */ + default: + FIXME( "Converting errno %d to STATUS_UNSUCCESSFUL\n", err ); + return STATUS_UNSUCCESSFUL; + } +} + static char *get_dosdevices_path( const char *dev ) { const char *home = getenv( "HOME" ); @@ -266,6 +317,85 @@ static NTSTATUS set_dosdev_symlink( void *args ) return status; } +static NTSTATUS get_volume_size_info( void *args ) +{ + const struct get_volume_size_info_params *params = args; + const char *unix_mount = params->unix_mount; + struct size_info *info = params->info; + + struct stat st; + ULONGLONG bsize; + NTSTATUS status; + int fd = -1; + +#if !defined(linux) || !defined(HAVE_FSTATFS) + struct statvfs stfs; +#else + struct statfs stfs; +#endif + + if (!unix_mount) return STATUS_NO_SUCH_DEVICE; + + if (unix_mount[0] != '/') + { + char *path = get_dosdevices_path( unix_mount ); + if (path) fd = open( path, O_RDONLY ); + free( path ); + } + else fd = open( unix_mount, O_RDONLY ); + + if (fstat( fd, &st ) < 0) + { + status = errno_to_status( errno ); + goto done; + } + if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + { + status = STATUS_INVALID_DEVICE_REQUEST; + goto done; + } + + /* Linux's fstatvfs is buggy */ +#if !defined(linux) || !defined(HAVE_FSTATFS) + if (fstatvfs( fd, &stfs ) < 0) + { + status = errno_to_status( errno ); + goto done; + } + bsize = stfs.f_frsize; +#else + if (fstatfs( fd, &stfs ) < 0) + { + status = errno_to_status( errno ); + goto done; + } + bsize = stfs.f_bsize; +#endif + if (bsize == 2048) /* assume CD-ROM */ + { + info->bytes_per_sector = 2048; + info->sectors_per_allocation_unit = 1; + } + else + { + info->bytes_per_sector = 512; + info->sectors_per_allocation_unit = 8; + } + + info->total_allocation_units = + bsize * stfs.f_blocks / (info->bytes_per_sector * info->sectors_per_allocation_unit); + info->caller_available_allocation_units = + bsize * stfs.f_bavail / (info->bytes_per_sector * info->sectors_per_allocation_unit); + info->actual_available_allocation_units = + bsize * stfs.f_bfree / (info->bytes_per_sector * info->sectors_per_allocation_unit); + + status = STATUS_SUCCESS; + +done: + close( fd ); + return status; +} + static NTSTATUS get_volume_dos_devices( void *args ) { const struct get_volume_dos_devices_params *params = args; @@ -440,6 +570,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = add_drive, get_dosdev_symlink, set_dosdev_symlink, + get_volume_size_info, get_volume_dos_devices, read_volume_file, match_unixdev, diff --git a/dlls/mountmgr.sys/unixlib.h b/dlls/mountmgr.sys/unixlib.h index e7846a764da..d70371876fa 100644 --- a/dlls/mountmgr.sys/unixlib.h +++ b/dlls/mountmgr.sys/unixlib.h @@ -64,6 +64,21 @@ struct add_drive_params int *letter; }; +struct size_info +{ + LONGLONG total_allocation_units; + LONGLONG caller_available_allocation_units; + LONGLONG actual_available_allocation_units; + ULONG sectors_per_allocation_unit; + ULONG bytes_per_sector; +}; + +struct get_volume_size_info_params +{ + const char *unix_mount; + struct size_info *info; +}; + struct get_dosdev_symlink_params { const char *dev; @@ -142,6 +157,7 @@ enum mountmgr_funcs unix_add_drive, unix_get_dosdev_symlink, unix_set_dosdev_symlink, + unix_get_volume_size_info, unix_get_volume_dos_devices, unix_read_volume_file, unix_match_unixdev,

1 0

Joel Holdsworth : ntdll: Implemented NtQueryVolumeInformationFile FileFsFullSizeInformation.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 6af35907991d5e7cab4860116d1adadfd2c28b60 URL: https://gitlab.winehq.org/wine/wine/-/commit/6af35907991d5e7cab4860116d1ada… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Aug 20 21:16:59 2022 +0100 ntdll: Implemented NtQueryVolumeInformationFile FileFsFullSizeInformation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53544 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 8 +--- dlls/ntdll/unix/file.c | 98 ++++++++++++++++++++++++++----------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 065a9251c2a..dd0061b13d8 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1287,7 +1287,7 @@ static void test_file_full_size_information(void) /* Assume No Quota Settings configured on Wine Testbot */ res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); - todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); ok(res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); @@ -1303,8 +1303,6 @@ static void test_file_full_size_information(void) ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %ld\n",fsi.BytesPerSector); ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %ld\n",fsi.SectorsPerAllocationUnit); - todo_wine - { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); @@ -1322,14 +1320,10 @@ static void test_file_full_size_information(void) "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); - } /* Assume file system is NTFS */ - todo_wine - { ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %ld\n",ffsi.BytesPerSector); ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %ld\n",ffsi.SectorsPerAllocationUnit); - } CloseHandle( h ); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 738367dbb57..b31ce4fbb3d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1810,6 +1810,44 @@ static NTSTATUS fill_name_info( const char *unix_name, FILE_NAME_INFORMATION *in } +static NTSTATUS get_full_size_info(int fd, FILE_FS_FULL_SIZE_INFORMATION *info) { + struct stat st; + ULONGLONG bsize; + +#if !defined(linux) || !defined(HAVE_FSTATFS) + struct statvfs stfs; +#else + struct statfs stfs; +#endif + + if (fstat( fd, &st ) < 0) return errno_to_status( errno ); + if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) return STATUS_INVALID_DEVICE_REQUEST; + + /* Linux's fstatvfs is buggy */ +#if !defined(linux) || !defined(HAVE_FSTATFS) + if (fstatvfs( fd, &stfs ) < 0) return errno_to_status( errno ); + bsize = stfs.f_frsize; +#else + if (fstatfs( fd, &stfs ) < 0) return errno_to_status( errno ); + bsize = stfs.f_bsize; +#endif + if (bsize == 2048) /* assume CD-ROM */ + { + info->BytesPerSector = 2048; + info->SectorsPerAllocationUnit = 1; + } + else + { + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + } + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->CallerAvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->ActualAvailableAllocationUnits.QuadPart = bsize * stfs.f_bfree / (info->BytesPerSector * info->SectorsPerAllocationUnit); + return STATUS_SUCCESS; +} + + static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, ULONG length, FILE_INFORMATION_CLASS info_class ) { @@ -6406,7 +6444,6 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io FS_INFORMATION_CLASS info_class ) { int fd, needs_close; - struct stat st; NTSTATUS status; status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); @@ -6456,52 +6493,15 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io else { FILE_FS_SIZE_INFORMATION *info = buffer; + FILE_FS_FULL_SIZE_INFORMATION full_info; - if (fstat( fd, &st ) < 0) - { - status = errno_to_status( errno ); - break; - } - if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) + if ((status = get_full_size_info(fd, &full_info)) == STATUS_SUCCESS) { - status = STATUS_INVALID_DEVICE_REQUEST; - } - else - { - ULONGLONG bsize; - /* Linux's fstatvfs is buggy */ -#if !defined(linux) || !defined(HAVE_FSTATFS) - struct statvfs stfs; - - if (fstatvfs( fd, &stfs ) < 0) - { - status = errno_to_status( errno ); - break; - } - bsize = stfs.f_frsize; -#else - struct statfs stfs; - if (fstatfs( fd, &stfs ) < 0) - { - status = errno_to_status( errno ); - break; - } - bsize = stfs.f_bsize; -#endif - if (bsize == 2048) /* assume CD-ROM */ - { - info->BytesPerSector = 2048; - info->SectorsPerAllocationUnit = 1; - } - else - { - info->BytesPerSector = 512; - info->SectorsPerAllocationUnit = 8; - } - info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); - info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->TotalAllocationUnits = full_info.TotalAllocationUnits; + info->AvailableAllocationUnits = full_info.CallerAvailableAllocationUnits; + info->SectorsPerAllocationUnit = full_info.SectorsPerAllocationUnit; + info->BytesPerSector = full_info.BytesPerSector; io->Information = sizeof(*info); - status = STATUS_SUCCESS; } } break; @@ -6645,8 +6645,14 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io break; case FileFsFullSizeInformation: - FIXME( "%p: full size info not supported\n", handle ); - status = STATUS_NOT_IMPLEMENTED; + if (length < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + status = STATUS_BUFFER_TOO_SMALL; + else + { + FILE_FS_FULL_SIZE_INFORMATION *info = buffer; + if ((status = get_full_size_info(fd, info)) == STATUS_SUCCESS) + io->Information = sizeof(*info); + } break; case FileFsObjectIdInformation:

1 0

Joel Holdsworth : kernel32/tests: Added tests for GetDiskFreeSpaceA/W with volume GUID paths.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: 3741ecf07996bc45cab651b9bebebb4d73303755 URL: https://gitlab.winehq.org/wine/wine/-/commit/3741ecf07996bc45cab651b9bebebb… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 29 10:07:06 2022 +0100 kernel32/tests: Added tests for GetDiskFreeSpaceA/W with volume GUID paths. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/kernel32/tests/drive.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index f2299d2ad7e..4cde08ffbee 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -138,6 +138,7 @@ static void test_GetDiskFreeSpaceA(void) { BOOL ret; DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters; + char volume_guid_path[50]; char drive[] = "?:\\"; DWORD logical_drives; @@ -158,6 +159,14 @@ static void test_GetDiskFreeSpaceA(void) ret = GetDiskFreeSpaceA("C:\\", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); + ret = GetVolumeNameForVolumeMountPointA("C:\\", volume_guid_path, + sizeof(volume_guid_path) / sizeof(volume_guid_path[0])); + ok(ret, "GetVolumeNameForVolumeMountPointA error %ld\n", GetLastError()); + + ret = GetDiskFreeSpaceA(volume_guid_path, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); + todo_wine + ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); + logical_drives = GetLogicalDrives(); ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError()); @@ -213,6 +222,7 @@ static void test_GetDiskFreeSpaceW(void) { BOOL ret; DWORD sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters; + WCHAR volume_guid_path[50]; WCHAR drive[] = {'?',':','\\',0}; DWORD logical_drives; static const WCHAR empty_pathW[] = { 0 }; @@ -242,6 +252,14 @@ static void test_GetDiskFreeSpaceW(void) ret = GetDiskFreeSpaceW(c_drive_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); + ret = GetVolumeNameForVolumeMountPointW(c_drive_pathW, volume_guid_path, + sizeof(volume_guid_path) / sizeof(volume_guid_path[0])); + ok(ret, "GetVolumeNameForVolumeMountPointW error %ld\n", GetLastError()); + + ret = GetDiskFreeSpaceW(volume_guid_path, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); + todo_wine + ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); + logical_drives = GetLogicalDrives(); ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError());

1 0

Joel Holdsworth : kernel32/tests: GetDiskFreeSpaceA/W test targetted at a real drive.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: d40af92f3245920207db0cca07bf73c1ca1713df URL: https://gitlab.winehq.org/wine/wine/-/commit/d40af92f3245920207db0cca07bf73… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 29 09:41:39 2022 +0100 kernel32/tests: GetDiskFreeSpaceA/W test targetted at a real drive. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/kernel32/tests/drive.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index e03c44c1947..f2299d2ad7e 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -155,6 +155,9 @@ static void test_GetDiskFreeSpaceA(void) ret = GetDiskFreeSpaceA("/", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); + ret = GetDiskFreeSpaceA("C:\\", &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); + ok(ret, "GetDiskFreeSpaceA error %ld\n", GetLastError()); + logical_drives = GetLogicalDrives(); ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError()); @@ -215,6 +218,7 @@ static void test_GetDiskFreeSpaceW(void) static const WCHAR empty_pathW[] = { 0 }; static const WCHAR root_pathW[] = { '\\', 0 }; static const WCHAR unix_style_root_pathW[] = { '/', 0 }; + static const WCHAR c_drive_pathW[] = { 'C', ':', '\\', 0 }; ret = GetDiskFreeSpaceW(NULL, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); if (ret == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -235,6 +239,9 @@ static void test_GetDiskFreeSpaceW(void) ret = GetDiskFreeSpaceW(unix_style_root_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); + ret = GetDiskFreeSpaceW(c_drive_pathW, &sectors_per_cluster, &bytes_per_sector, &free_clusters, &total_clusters); + ok(ret, "GetDiskFreeSpaceW error %ld\n", GetLastError()); + logical_drives = GetLogicalDrives(); ok(logical_drives != 0, "GetLogicalDrives error %ld\n", GetLastError());

1 0

Gabriel Ivăncescu : mshtml: Implement props enumeration for Storage.
by Alexandre Julliard 01 Sep '22

01 Sep '22

Module: wine Branch: master Commit: d44a32ba72155136f6ad886d5ecc651c9cec6832 URL: https://gitlab.winehq.org/wine/wine/-/commit/d44a32ba72155136f6ad886d5ecc65… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 1 16:49:46 2022 +0300 mshtml: Implement props enumeration for Storage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 34 +++++++++------ dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlstorage.c | 88 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 28 ++++++++++++- 7 files changed, 140 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 357549698fc..5007f9a5d30 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1888,21 +1888,29 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, return next_dynamic_id(This, idx+1, pid); } - if(id == DISPID_STARTENUM) { - func = This->info->funcs; - }else { - hres = get_builtin_func(This->info, id, &func); - if(FAILED(hres)) - return hres; - func++; - } + if(!is_custom_dispid(id)) { + if(id == DISPID_STARTENUM) { + func = This->info->funcs; + }else { + hres = get_builtin_func(This->info, id, &func); + if(FAILED(hres)) + return hres; + func++; + } - while(func < This->info->funcs + This->info->func_cnt) { - if(func->func_disp_idx == -1) { - *pid = func->id; - return S_OK; + while(func < This->info->funcs + This->info->func_cnt) { + if(func->func_disp_idx == -1) { + *pid = func->id; + return S_OK; + } + func++; } - func++; + } + + if(This->info->desc->vtbl && This->info->desc->vtbl->next_dispid) { + hres = This->info->desc->vtbl->next_dispid(This, id, pid); + if(hres != S_FALSE) + return hres; } if(get_dynamic_data(This) && This->dynamic_data->prop_cnt) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2537a316500..fe743e666c1 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5935,6 +5935,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { HTMLDocumentNode_get_name, HTMLDocumentNode_invoke, NULL, + NULL, HTMLDocumentNode_get_compat_mode, NULL }, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d3704ccbb5c..856f55da6c7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7212,6 +7212,7 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_invoke, NULL, NULL, + NULL, HTMLElement_populate_props }, HTMLElement_get_gecko_target, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 12ad4443e93..5d56037ff04 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -1010,12 +1010,100 @@ static HRESULT HTMLStorage_delete(DispatchEx *dispex, DISPID id) return HTMLStorage_removeItem(&This->IHTMLStorage_iface, This->props[idx]); } +static HRESULT HTMLStorage_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid) +{ + DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; + HTMLStorage *This = impl_from_DispatchEx(dispex); + HRESULT hres; + DISPID tmp; + + if(idx > MSHTML_CUSTOM_DISPID_CNT) + return S_FALSE; + + while(idx < This->num_props) { + hres = check_item(This, This->props[idx]); + if(hres == S_OK) { + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; + } + if(FAILED(hres)) + return hres; + idx++; + } + + /* Populate possibly missing DISPIDs */ + if(!This->filename) { + struct session_entry *session_entry; + + LIST_FOR_EACH_ENTRY(session_entry, &This->session_storage->data_list, struct session_entry, list_entry) { + hres = get_prop(This, session_entry->key, &tmp); + if(FAILED(hres)) + return hres; + } + }else { + IXMLDOMNodeList *node_list; + IXMLDOMElement *elem; + IXMLDOMNode *node; + LONG index = 0; + HRESULT hres; + VARIANT key; + + hres = get_node_list(This->filename, &node_list); + if(FAILED(hres)) + return hres; + + for(;;) { + hres = IXMLDOMNodeList_get_item(node_list, index++, &node); + if(hres != S_OK) { + IXMLDOMNodeList_Release(node_list); + if(FAILED(hres)) + return hres; + break; + } + + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + IXMLDOMNode_Release(node); + if(hres != S_OK) + continue; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"name", &key); + IXMLDOMElement_Release(elem); + if(hres != S_OK) { + if(SUCCEEDED(hres)) + continue; + IXMLDOMNodeList_Release(node_list); + return hres; + } + + if(V_VT(&key) != VT_BSTR) { + FIXME("non-string key %s\n", debugstr_variant(&key)); + VariantClear(&key); + continue; + } + + hres = get_prop(This, V_BSTR(&key), &tmp); + SysFreeString(V_BSTR(&key)); + if(FAILED(hres)) { + IXMLDOMNodeList_Release(node_list); + return hres; + } + } + } + + if(idx >= This->num_props) + return S_FALSE; + + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; +} + static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { NULL, HTMLStorage_get_dispid, HTMLStorage_get_name, HTMLStorage_invoke, HTMLStorage_delete, + HTMLStorage_next_dispid, NULL }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6be61ba3f4f..00eef4d846a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3967,6 +3967,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { HTMLWindow_get_name, HTMLWindow_invoke, NULL, + NULL, HTMLWindow_get_compat_mode, NULL }, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 101dd63d9aa..85f34bb4a9f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -336,6 +336,7 @@ typedef struct { HRESULT (*get_name)(DispatchEx*,DISPID,BSTR*); HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*delete)(DispatchEx*,DISPID); + HRESULT (*next_dispid)(DispatchEx*,DISPID,DISPID*); compat_mode_t (*get_compat_mode)(DispatchEx*); HRESULT (*populate_props)(DispatchEx*); } dispex_static_data_vtbl_t; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 24adb08005c..8cc1da534e6 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1202,7 +1202,10 @@ sync_test("map_obj", function() { }); sync_test("storage", function() { - var v = document.documentMode, r; + var v = document.documentMode, i, r, list; + + sessionStorage["add-at-end"] = 0; + sessionStorage.removeItem("add-at-end"); sessionStorage.setItem("foobar", "1234"); ok("foobar" in sessionStorage, "foobar not in sessionStorage"); @@ -1211,6 +1214,29 @@ sync_test("storage", function() { sessionStorage.barfoo = 4321; r = sessionStorage.getItem("barfoo"); ok(r === "4321", "sessionStorage.barfoo = " + r); + sessionStorage.setItem("abcd", "blah"); + sessionStorage.dcba = "test"; + + // Order isn't consistent, but changes are reflected during the enumeration. + // Elements that were already traversed in DISPID (even if removed before + // the enumeration) are not enumerated, even if re-added during the enum. + i = 0; list = [ "foobar", "barfoo", "abcd", "dcba" ]; + for(r in sessionStorage) { + for(var j = 0; j < list.length; j++) + if(r === list[j]) + break; + ok(j < list.length, "got '" + r + "' enumerating"); + list.splice(j, 1); + if(i === 1) { + sessionStorage.removeItem(list[0]); + sessionStorage.setItem("new", "new"); + list.splice(0, 1, "new"); + } + if(!list.length) + sessionStorage.setItem("add-at-end", "0"); + i++; + } + ok(i === 4, "enum did " + i + " iterations"); try { delete sessionStorage.foobar;

1 0

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 September 2022