wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Francois Gouget : winetest/build-index: Streamline the build check.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: 27324e831f00189649fa55df4ba8c157c7830c0b URL: https://source.winehq.org/git/tools.git/?a=commit;h=27324e831f00189649fa55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:22:27 2021 +0200 winetest/build-index: Streamline the build check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 01533c4..f8a0a88 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -211,10 +211,12 @@ my @too_old; opendir(DIR, "data") or die "could not open the 'data' directory: $!"; foreach my $build (readdir(DIR)) { - next if ($build =~ /^(\.\.?|index\.html|errors\.html|tests)$/); if ($build !~ /^[0-9a-f]{40}$/) { - error("'data/$build' is not a valid build directory\n"); + if ($build !~ /^(\.\.?|errors\.html|index\.html|tests)$/) + { + error("'data/$build' is not a valid build directory\n"); + } next; } next unless -f "data/$build/index.html";

1 0

Francois Gouget : winetest/gather: Fix the name of a generated file in a comment.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: 395586d897a73248a27f8bb93f424180e53b348d URL: https://source.winehq.org/git/tools.git/?a=commit;h=395586d897a73248a27f8bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:22:10 2021 +0200 winetest/gather: Fix the name of a generated file in a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 750f0ee..f7dcc16 100755 --- a/winetest/gather +++ b/winetest/gather @@ -899,7 +899,7 @@ EOF # -# Write the data/BUILD/totals.txt file +# Write the data/BUILD/total.txt file # This provides the statistics for the main index page. #

1 0

Rémi Bernon : mfplat: Read queue subscriber within the critical section.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 4904d90870a716fda971fc12240ddbc23323475c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4904d90870a716fda971fc12… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 12 18:36:02 2021 +0200 mfplat: Read queue subscriber within the critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6fb8661dba4..9078702c854 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7109,7 +7109,7 @@ static void queue_notify_subscriber(struct event_queue *queue) static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsyncCallback *callback, IUnknown *state) { struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); - MFASYNCRESULT *result_data = (MFASYNCRESULT *)queue->subscriber; + MFASYNCRESULT *result_data; HRESULT hr; TRACE("%p, %p, %p.\n", iface, callback, state); @@ -7121,7 +7121,7 @@ static HRESULT WINAPI eventqueue_BeginGetEvent(IMFMediaEventQueue *iface, IMFAsy if (queue->is_shut_down) hr = MF_E_SHUTDOWN; - else if (result_data) + else if ((result_data = (MFASYNCRESULT *)queue->subscriber)) { if (result_data->pCallback == callback) hr = IRtwqAsyncResult_GetStateNoAddRef(queue->subscriber) == state ?

1 0

Gijs Vermeulen : rasapi32: Update spec file.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: a8d4ea1d0aae4c2c7c172029cf4789415e9fe337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8d4ea1d0aae4c2c7c172029… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Apr 11 16:12:24 2021 +0200 rasapi32: Update spec file. File version: 10.0.19041.450 (Windows 10). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50851 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/rasapi32.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index e8a28a8814e..90ebcbce072 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -1,5 +1,32 @@ +# @ stub DDMComputeLuid +# @ stub DDMFreeDialingParam +# @ stub DDMFreePhonebookContext +# @ stub DDMFreeRemoteEndpoint +# @ stub DDMGetAddressesFromPhonebook +# @ stub DDMGetEapInfo +# @ stub DDMGetEapUserIdentityW +# @ stub DDMGetPhoneBookContext +# @ stub DDMGetPhonebookInfo +# @ stub DDMGetProtocolStartParams +# @ stub DDMGetRasDialParams +# @ stub DDMGetRasDialingParams +# @ stub DDMGetTunnelEndpoints +# @ stub DDMRasPbkEntryCleanup +# @ stub DDMUpdateProtocolConfigInfoFromEntry +# @ stub DwCloneEntry +# @ stub DwEnumEntryDetails +# @ stub DwEnumEntryDetailsEx +# @ stub DwRasUninitialize +# @ stub GetAutoTriggerProfileInfo +# @ stub IsActiveAutoTriggerConnection +# @ stub IsActiveAutoTriggerConnectionEx +# @ stub RasAutoDialSharedConnection @ stub RasAutodialAddressToNetwork @ stub RasAutodialEntryToNetwork +@ stub RasClearConnectionStatistics +# @ stub RasClearLinkStatistics +# @ stub RasCompleteDialMachineCleanup +# @ stub RasConfigUserProxySettingsW @ stdcall RasConnectionNotificationA(ptr long long) @ stdcall RasConnectionNotificationW(ptr long long) @ stdcall RasCreatePhonebookEntryA(long str) @@ -23,6 +50,10 @@ @ stdcall RasEnumEntriesA(str str ptr ptr ptr) @ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow +# @ stub RasFreeEapUserIdentityA +# @ stub RasFreeEapUserIdentityW +# @ stub RasFreeEntryAdvancedProperties +# @ stub RasGetAutoTriggerConnectStatus @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) @ stdcall RasGetAutodialEnableA(long ptr) @@ -33,13 +64,22 @@ @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +# @ stub RasGetConnectionErrorStringW @ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA @ stub RasGetCredentialsW +# @ stub RasGetCustomAuthDataA +# @ stub RasGetCustomAuthDataW +# @ stub RasGetEapUserDataA +# @ stub RasGetEapUserDataW +# @ stub RasGetEapUserIdentityA +# @ stub RasGetEapUserIdentityW +# @ stub RasGetEntryAdvancedProperties @ stdcall RasGetEntryDialParamsA(str ptr ptr) @ stdcall RasGetEntryDialParamsW(wstr ptr ptr) +# @ stub RasGetEntryHrasconnW @ stdcall RasGetEntryPropertiesA(str str ptr ptr ptr ptr) @ stdcall RasGetEntryPropertiesW(wstr wstr ptr ptr ptr ptr) @ stdcall RasGetErrorStringA(long ptr long) @@ -47,17 +87,39 @@ @ stub RasGetErrorStringWow @ stub RasGetHport @ stdcall RasGetLinkStatistics(ptr long ptr) +# @ stub RasGetNapStatus +# @ stub RasGetPCscf +# @ stub RasGetPbkPath @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) +# @ stub RasGetProjectionInfoEx @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) @ stub RasGetSubEntryHandleA @ stub RasGetSubEntryHandleW @ stub RasGetSubEntryPropertiesA @ stub RasGetSubEntryPropertiesW +# @ stub RasHandleTriggerConnDisconnect @ stdcall RasHangUpA(long) @ stdcall RasHangUpW(long) @ stub RasHangUpWow +# @ stub RasInvokeEapUI +# @ stub RasIsPublicPhonebook +# @ stub RasIsSharedConnection +# @ stub RasNQMStateEnteredNotification +# @ stub RasQueryRedialOnLinkFailure +# @ stub RasQuerySharedAutoDial +# @ stub RasQuerySharedConnection +# @ stub RasRegisterEntryChangeNotification @ stdcall RasRenameEntryA(str str str) @ stdcall RasRenameEntryW(wstr wstr wstr) +# @ stub RasRestoreDefaultLegacyProxySettings +# @ stub RasScriptExecute +# @ stub RasScriptGetIpAddress +# @ stub RasScriptInit +# @ stub RasScriptReceive +# @ stub RasScriptSend +# @ stub RasScriptTerm +# @ stub RasSetAutoTriggerProfile +# @ stub RasSetAutoTriggerProfileEx @ stdcall RasSetAutodialAddressA(str long ptr long long) @ stdcall RasSetAutodialAddressW(wstr long ptr long long) @ stdcall RasSetAutodialEnableA(long long) @@ -68,15 +130,30 @@ @ stub RasSetCredentialsW @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) +# @ stub RasSetEapUserDataA +# @ stub RasSetEapUserDataAEx +# @ stub RasSetEapUserDataW +# @ stub RasSetEapUserDataWEx +# @ stub RasSetEntryAdvancedProperties @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) @ stdcall RasSetEntryPropertiesW(wstr wstr ptr long ptr long) @ stub RasSetOldPassword +# @ stub RasSetPerConnectionProxy +# @ stub RasSetSharedAutoDial @ stdcall RasSetSubEntryPropertiesA(str str long ptr long ptr long) @ stdcall RasSetSubEntryPropertiesW(wstr wstr long ptr long ptr long) +# @ stub RasTriggerConnection +# @ stub RasTriggerConnectionEx +# @ stub RasTriggerDisconnection +# @ stub RasTriggerDisconnectionEx +# @ stub RasUnregisterEntryChangeNotification +# @ stub RasUpdateConnection @ stdcall RasValidateEntryNameA(str str) @ stdcall RasValidateEntryNameW(wstr wstr) +# stub @ RasWriteSharedPbkOptions +# stub @ UnInitializeRAS 500 stub RnaEngineRequest 501 stub DialEngineRequest

1 0

Piotr Caban : winemac.drv: Take all online monitors into account when computing desktop rect.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 66b593049c62978fbbb607117b78fde35f6db936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b593049c62978fbbb60711… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 17:55:23 2021 +0200 winemac.drv: Take all online monitors into account when computing desktop rect. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 8073a875df5..0acddc1dd98 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -68,7 +68,7 @@ static void compute_desktop_rect(void) uint32_t count, i; desktop_rect = CGRectNull; - if (CGGetActiveDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || + if (CGGetOnlineDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || !count) { displayIDs[0] = CGMainDisplayID();

1 0

Piotr Caban : winemac.drv: Don't filter non active displays out.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 5400db15ca9983a06df2f5071705e0256e95e11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5400db15ca9983a06df2f507… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 17:55:19 2021 +0200 winemac.drv: Don't filter non active displays out. On Windows 10 the DISPLAY_DEVICE_ACTIVE flag is set even if monitor is in power saving mode or switched off. Monitors without DISPLAY_DEVICE_ACTIVE are only reported when display is disabled. This doesn't match with CGDisplayIsActive function. Current code causes rendering problems when native .NET is used. When monitors are updated when in power saving mode (e.g. due to race on machine wake-up) we might end up with no monitors being enumerated by EnumDisplayMonitors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 89 ++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 05f1c75d53b..3bb1b5151d5 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -646,65 +646,54 @@ int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitor if (!monitors) return -1; - /* Report an inactive monitor */ - if (!CGDisplayIsActive(adapter_id) && !CGDisplayIsInMirrorSet(adapter_id)) - { - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; - monitor_count++; - } - /* Report active and mirrored monitors in the same mirroring set */ - else - { - if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) - != kCGErrorSuccess) - goto done; + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + goto done; - if (macdrv_get_displays(&displays, &display_count)) - goto done; + if (macdrv_get_displays(&displays, &display_count)) + goto done; - for (i = 0; i < display_id_count; i++) - { - if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) - continue; + for (i = 0; i < display_id_count; i++) + { + if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) + continue; - /* Find and fill in monitor info */ - for (j = 0; j < display_count; j++) + /* Find and fill in monitor info */ + for (j = 0; j < display_count; j++) + { + if (displays[j].displayID == display_ids[i] + || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) { - if (displays[j].displayID == display_ids[i] - || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) + /* Allocate more space if needed */ + if (monitor_count >= capacity) { - /* Allocate more space if needed */ - if (monitor_count >= capacity) - { - capacity *= 2; - realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); - if (!realloc_monitors) - goto done; - monitors = realloc_monitors; - } - - if (j == 0) - primary_index = monitor_count; - - strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); - monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; - monitors[monitor_count].rc_monitor = displays[j].frame; - monitors[monitor_count].rc_work = displays[j].work_frame; - monitor_count++; - break; + capacity *= 2; + realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); + if (!realloc_monitors) + goto done; + monitors = realloc_monitors; } + + if (j == 0) + primary_index = monitor_count; + + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; + monitors[monitor_count].rc_monitor = displays[j].frame; + monitors[monitor_count].rc_work = displays[j].work_frame; + monitor_count++; + break; } } + } - /* Make sure the first monitor on primary adapter is primary */ - if (primary_index) - { - struct macdrv_monitor tmp; - tmp = monitors[0]; - monitors[0] = monitors[primary_index]; - monitors[primary_index] = tmp; - } + /* Make sure the first monitor on primary adapter is primary */ + if (primary_index) + { + struct macdrv_monitor tmp; + tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; } *new_monitors = monitors;

1 0

Nikolay Sivov : mfreadwrite/reader: Add missing allocation check (Coverity).
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 129e5660e3588f4ccfd919870fb71497b61d3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=129e5660e3588f4ccfd91987… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:40:02 2021 +0300 mfreadwrite/reader: Add missing allocation check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2edc83b8685..8b3230ad4d2 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -442,12 +442,14 @@ static void source_reader_set_sa_response(struct source_reader *reader, struct s } } -static void source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, +static HRESULT source_reader_queue_response(struct source_reader *reader, struct media_stream *stream, HRESULT status, DWORD stream_flags, LONGLONG timestamp, IMFSample *sample) { struct stream_response *response; - response = calloc(1, sizeof(*response)); + if (!(response = calloc(1, sizeof(*response)))) + return E_OUTOFMEMORY; + response->status = status; response->stream_index = stream->index; response->stream_flags = stream_flags; @@ -466,6 +468,8 @@ static void source_reader_queue_response(struct source_reader *reader, struct me stream->responses++; source_reader_response_ready(reader, response); + + return S_OK; } static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) @@ -716,8 +720,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) WARN("Sample time wasn't set.\n"); - source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); - return S_OK; + return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); } /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */

1 0

Nikolay Sivov : setupapi: Fix use after free in trace message (Coverity).
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: babdaffff7b25a1db9059598bd3c85da46469d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babdaffff7b25a1db9059598… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:28:14 2021 +0300 setupapi: Fix use after free in trace message (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7ff3cb01eb6..0758fef5603 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1773,7 +1773,7 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { SC_HANDLE manager = NULL, service = NULL; struct device *device; - WCHAR *service_name; + WCHAR *service_name = NULL; DWORD size; TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); @@ -1789,7 +1789,6 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) service_name = malloc(size); if (!RegGetValueW(device->key, NULL, L"Service", RRF_RT_REG_SZ, NULL, service_name, &size)) service = OpenServiceW(manager, service_name, SERVICE_USER_DEFINED_CONTROL); - free(service_name); } remove_device(device); @@ -1803,6 +1802,8 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) } CloseServiceHandle(manager); + free(service_name); + remove_all_device_ifaces(device); return TRUE;

1 0

Nikolay Sivov : mf/tests: Fix mediatype instance leak (Coverity).
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 079c51f6923a53c5c7b0fac897a7ed5a0e8b2abe URL: https://source.winehq.org/git/wine.git/?a=commit;h=079c51f6923a53c5c7b0fac8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 12 17:10:40 2021 +0300 mf/tests: Fix mediatype instance leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 308c1fae529..a5c306a93a0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5237,6 +5237,7 @@ static void test_MFRequireProtectedEnvironment(void) hr = MFRequireProtectedEnvironment(pd); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(mediatype); IMFStreamDescriptor_Release(sd); IMFPresentationDescriptor_Release(pd); }

1 0

Jacek Caban : jscript: Add function name to its scope chain in ES5 mode.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: 1985f330f8a8790bc3b23b999b84b7f615d6f508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1985f330f8a8790bc3b23b99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 12 15:47:58 2021 +0200 jscript: Add function name to its scope chain in ES5 mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 8 ++++++++ dlls/mshtml/tests/documentmode.js | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 06b0fd673b3..f3d9d694b2a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -661,6 +661,14 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(FAILED(hres)) return hres; } + + /* ECMA-262 5.1 Edition 13 */ + if(func->name && ctx->version >= SCRIPTLANGUAGEVERSION_ES5 && !wcscmp(identifier, func->name)) { + TRACE("returning a function from scope chain\n"); + ret->type = EXPRVAL_JSVAL; + ret->u.val = jsval_obj(jsdisp_addref(scope->frame->function_instance)); + return S_OK; + } } if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 75a132e83a7..82f8aae4ed9 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -534,3 +534,39 @@ sync_test("delete_prop", function() { todo_wine. ok(!("globalprop4" in obj), "globalprop4 is still in obj"); }); + +var func_scope_val = 1; + +sync_test("func_scope", function() { + var func_scope_val = 2; + + var f = function func_scope_val() { + return func_scope_val; + }; + + func_scope_val = 3; + if(document.documentMode < 9) { + ok(f() === 3, "f() = " + f()); + return; + } + ok(f === f(), "f() = " + f()); + + f = function func_scope_val(a) { + func_scope_val = 4; + return func_scope_val; + }; + + func_scope_val = 3; + ok(f === f(), "f() = " + f()); + ok(func_scope_val === 3, "func_scope_val = " + func_scope_val); + ok(window.func_scope_val === 1, "window.func_scope_val = " + window.func_scope_val); + + f = function func_scope_val(a) { + return (function() { return a ? func_scope_val(false) : func_scope_val; })(); + }; + + ok(f === f(true), "f(true) = " + f(true)); + + window = 1; + ok(window === window.self, "window = " + window); +});

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021