June 2020 - Wine-commits - list.winehq.org

Louis Lenders : api-ms-win-core-libraryloader-l2-1-0: Add new dll.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: fcdaf2ca2f6eb1412b350ca1b0f99fde5b65170d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcdaf2ca2f6eb1412b350ca1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:00 2020 +0200 api-ms-win-core-libraryloader-l2-1-0: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-libraryloader-l2-1-0.spec | 2 ++ 4 files changed, 6 insertions(+) diff --git a/configure b/configure index bb98f99f9f..bd5d1166ee 100755 --- a/configure +++ b/configure @@ -971,6 +971,7 @@ enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 enable_api_ms_win_core_libraryloader_l1_2_1 enable_api_ms_win_core_libraryloader_l1_2_2 +enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 @@ -20296,6 +20297,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-1 enable_api_ms_win_core_libraryloader_l1_2_1 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-2 enable_api_ms_win_core_libraryloader_l1_2_2 +wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_win_core_libraryloader_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 diff --git a/configure.ac b/configure.ac index e3d63ed750..22369882ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2887,6 +2887,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in new file mode 100644 index 0000000000..c4c4c315b6 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l2-1-0.dll diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec new file mode 100644 index 0000000000..a9dc31df32 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall LoadPackagedLibrary(wstr long) kernel32.LoadPackagedLibrary +@ stub QueryOptionalDelayLoadedAPI

1 0

Louis Lenders : api-ms-win-core-memory-l1-1-4: Add new dll.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: a20a02ca914d5817195c87a18470a24b9ea6841b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20a02ca914d5817195c87a1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:01 2020 +0200 api-ms-win-core-memory-l1-1-4: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-memory-l1-1-4/Makefile.in | 1 + .../api-ms-win-core-memory-l1-1-4.spec | 31 ++++++++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/configure b/configure index bd5d1166ee..5ad79eaf27 100755 --- a/configure +++ b/configure @@ -984,6 +984,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_memory_l1_1_2 +enable_api_ms_win_core_memory_l1_1_4 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 @@ -20310,6 +20311,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-localregistry-l1-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-4 enable_api_ms_win_core_memory_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 diff --git a/configure.ac b/configure.ac index 22369882ce..87ba3bb780 100644 --- a/configure.ac +++ b/configure.ac @@ -2900,6 +2900,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) diff --git a/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in new file mode 100644 index 0000000000..1a45e5581b --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-4/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-memory-l1-1-4.dll diff --git a/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec b/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec new file mode 100644 index 0000000000..b0d402b24c --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-4/api-ms-win-core-memory-l1-1-4.spec @@ -0,0 +1,31 @@ +@ stub CreateFileMappingFromApp +@ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW +@ stub DiscardVirtualMemory +@ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum +@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch +@ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile +@ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx +@ stub MapViewOfFileFromApp +@ stub OfferVirtualMemory +@ stub OpenFileMappingFromApp +@ stdcall OpenFileMappingW(long long wstr) kernel32.OpenFileMappingW +@ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory +@ stub ReclaimVirtualMemory +@ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch +@ stub SetProcessValidCallTargets +@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx +@ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile +@ stub UnmapViewOfFileEx +@ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc +@ stub VirtualAllocFromApp +@ stdcall VirtualFree(ptr long long) kernel32.VirtualFree +@ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx +@ stdcall VirtualLock(ptr long) kernel32.VirtualLock +@ stdcall VirtualProtect(ptr long long ptr) kernel32.VirtualProtect +@ stub VirtualProtectFromApp +@ stdcall VirtualQuery(ptr ptr long) kernel32.VirtualQuery +@ stdcall VirtualQueryEx(long ptr ptr long) kernel32.VirtualQueryEx +@ stdcall VirtualUnlock(ptr long) kernel32.VirtualUnlock +@ stdcall WriteProcessMemory(long ptr ptr long ptr) kernel32.WriteProcessMemory

1 0

Louis Lenders : api-ms-win-core-localization-l1-2-2: Add new dll.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: d48fed09e530b8e5779412d083a71aeea5808644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48fed09e530b8e5779412d0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:02 2020 +0200 api-ms-win-core-localization-l1-2-2: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-2-2.spec | 42 ++++++++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/configure b/configure index 5ad79eaf27..d12afc2a4d 100755 --- a/configure +++ b/configure @@ -975,6 +975,7 @@ enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 +enable_api_ms_win_core_localization_l1_2_2 enable_api_ms_win_core_localization_l2_1_0 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localization_obsolete_l1_2_0 @@ -20302,6 +20303,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 +wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-2 enable_api_ms_win_core_localization_l1_2_2 wine_fn_config_makefile dlls/api-ms-win-core-localization-l2-1-0 enable_api_ms_win_core_localization_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 diff --git a/configure.ac b/configure.ac index 87ba3bb780..e61a98455c 100644 --- a/configure.ac +++ b/configure.ac @@ -2891,6 +2891,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-obsolete-l1-2-0) diff --git a/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in new file mode 100644 index 0000000000..f4475691cc --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-2-2.dll diff --git a/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec b/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec new file mode 100644 index 0000000000..37f45c3303 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec @@ -0,0 +1,42 @@ +@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx +@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW +@ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GetACP() kernel32.GetACP +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx +@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo +@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW +@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW +@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA +@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx +@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW +@ stdcall GetNLSVersionEx(long wstr ptr) kernel32.GetNLSVersionEx +@ stdcall GetOEMCP() kernel32.GetOEMCP +@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall GetSystemDefaultLocaleName(ptr long) kernel32.GetSystemDefaultLocaleName +@ stdcall GetThreadLocale() kernel32.GetThreadLocale +@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName +@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte +@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stdcall IsValidNLSVersion(long wstr ptr) kernel32.IsValidNLSVersion +@ stdcall LCIDToLocaleName(long ptr long long) kernel32.LCIDToLocaleName +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx +@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW +@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName +@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA +@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW

1 0

Hans Leidekker : mountmgr: Fix buffer length check.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: ea9b507380b4415cf9edd3643d9bcea7ab934fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9b507380b4415cf9edd364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 16:13:12 2020 +0200 mountmgr: Fix buffer length check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49305 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c29ce9f924..d99a096c61 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1780,7 +1780,7 @@ static void query_property( struct disk_device *device, IRP *irp ) if (!irp->UserBuffer || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DEVICE_DESCRIPTOR)) + else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { descriptor = irp->UserBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR);

1 0

Jacek Caban : jscript: Inline add_eval implementation.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 0841b60b8d7464724eb52d0fab8e2c0321a2489c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0841b60b8d7464724eb52d0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:28:03 2020 +0200 jscript: Inline add_eval implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 27f03084fa..c39c59e3ab 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1734,21 +1734,27 @@ static HRESULT interp_in(script_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.6.1 */ -static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t *ret) +static HRESULT interp_add(script_ctx_t *ctx) { - jsval_t r, l; + jsval_t l, r, lval, rval, ret; HRESULT hres; + rval = stack_pop(ctx); + lval = stack_pop(ctx); + + TRACE("%s + %s\n", debugstr_jsval(lval), debugstr_jsval(rval)); + hres = to_primitive(ctx, lval, &l, NO_HINT); + if(SUCCEEDED(hres)) { + hres = to_primitive(ctx, rval, &r, NO_HINT); + if(FAILED(hres)) + jsval_release(l); + } + jsval_release(lval); + jsval_release(rval); if(FAILED(hres)) return hres; - hres = to_primitive(ctx, rval, &r, NO_HINT); - if(FAILED(hres)) { - jsval_release(l); - return hres; - } - if(is_string(l) || is_string(r)) { jsstr_t *lstr, *rstr = NULL; @@ -1761,7 +1767,7 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * ret_str = jsstr_concat(lstr, rstr); if(ret_str) - *ret = jsval_string(ret_str); + ret = jsval_string(ret_str); else hres = E_OUTOFMEMORY; } @@ -1776,29 +1782,12 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * if(SUCCEEDED(hres)) { hres = to_number(ctx, r, &nr); if(SUCCEEDED(hres)) - *ret = jsval_number(nl+nr); + ret = jsval_number(nl+nr); } } jsval_release(r); jsval_release(l); - return hres; -} - -/* ECMA-262 3rd Edition 11.6.1 */ -static HRESULT interp_add(script_ctx_t *ctx) -{ - jsval_t l, r, ret; - HRESULT hres; - - r = stack_pop(ctx); - l = stack_pop(ctx); - - TRACE("%s + %s\n", debugstr_jsval(l), debugstr_jsval(r)); - - hres = add_eval(ctx, l, r, &ret); - jsval_release(l); - jsval_release(r); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Don't realloc interpreter stack.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 2c21d0344cae7ee0c3205393b518a75ab882d535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c21d0344cae7ee0c3205393… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:28:56 2020 +0200 jscript: Don't realloc interpreter stack. We share the stack for all calls in script instance, so it no loner makes sense. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 27 ++++++++++----------------- dlls/jscript/jscript.h | 1 - 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c39c59e3ab..548bc2560c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -62,25 +62,12 @@ typedef struct { } u; } exprval_t; +static const size_t stack_size = 0x4000; + static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) { - if(!ctx->stack_size) { - ctx->stack = heap_alloc(16*sizeof(*ctx->stack)); - if(!ctx->stack) - return E_OUTOFMEMORY; - ctx->stack_size = 16; - }else if(ctx->stack_size == ctx->stack_top) { - jsval_t *new_stack; - - new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*new_stack)); - if(!new_stack) { - jsval_release(v); - return E_OUTOFMEMORY; - } - - ctx->stack = new_stack; - ctx->stack_size *= 2; - } + if(ctx->stack_top == stack_size) + return E_OUTOFMEMORY; ctx->stack[ctx->stack_top++] = v; return S_OK; @@ -3006,6 +2993,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi unsigned i; HRESULT hres; + if(!ctx->stack) { + ctx->stack = heap_alloc(stack_size * sizeof(*ctx->stack)); + if(!ctx->stack) + return E_OUTOFMEMORY; + } + if(bytecode->named_item) { if(!bytecode->named_item->script_obj) { hres = create_named_item_script_obj(ctx, bytecode->named_item); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 40b9f794ae..2a2250d3e9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -425,7 +425,6 @@ struct _script_ctx_t { heap_pool_t tmp_heap; jsval_t *stack; - unsigned stack_size; unsigned stack_top; jsval_t acc;

1 0

Nikolay Sivov : mfmediaengine: Update ready state property during resolution.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: b643cefdc0fccba846c545e73d342394be6d798f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b643cefdc0fccba846c545e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:41:48 2020 +0300 mfmediaengine: Update ready state property during resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 19 +++++++++++++++++-- include/mfmediaengine.idl | 9 +++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2f4a38936c..fee5f6338d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -86,6 +86,7 @@ struct media_engine double duration; MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; + MF_MEDIA_ENGINE_READY ready_state; IMFMediaSession *session; IMFSourceResolver *resolver; BSTR current_source; @@ -400,8 +401,13 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi else engine->duration = INFINITY; + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_METADATA; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE, 0, 0); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA, 0, 0); + + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_ENOUGH_DATA; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); /* TODO: set up topology nodes */ @@ -584,6 +590,8 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) if (url) engine->current_source = SysAllocString(url); + engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_NOTHING; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PURGEQUEUEDEVENTS, 0, 0); if (url) @@ -671,9 +679,16 @@ static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngine *iface, BSTR type, static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + unsigned short state; - return 0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + state = engine->ready_state; + LeaveCriticalSection(&engine->cs); + + return state; } static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index 4ea3d834cf..b914cb3600 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -137,6 +137,15 @@ typedef enum MF_MEDIA_ENGINE_EVENT MF_MEDIA_ENGINE_EVENT_AUDIOENDPOINTCHANGE = 1016, } MF_MEDIA_ENGINE_EVENT; +typedef enum MF_MEDIA_ENGINE_READY +{ + MF_MEDIA_ENGINE_READY_HAVE_NOTHING, + MF_MEDIA_ENGINE_READY_HAVE_METADATA, + MF_MEDIA_ENGINE_READY_HAVE_CURRENT_DATA, + MF_MEDIA_ENGINE_READY_HAVE_FUTURE_DATA, + MF_MEDIA_ENGINE_READY_HAVE_ENOUGH_DATA, +} MF_MEDIA_ENGINE_READY; + [ object, uuid(fc0e10d2-ab2a-4501-a951-06bb1075184c),

1 0

Nikolay Sivov : mfmediaengine: Set up audio output branch.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: a82fa9207d6875a096c0cbf2694d45cc98a201d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a82fa9207d6875a096c0cbf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:41:49 2020 +0300 mfmediaengine: Set up audio output branch. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 77 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index fee5f6338d..d93e2b2f38 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -329,11 +329,55 @@ static ULONG WINAPI media_engine_load_handler_Release(IMFAsyncCallback *iface) return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); } +static HRESULT media_engine_create_source_node(IMFMediaSource *source, IMFPresentationDescriptor *pd, IMFStreamDescriptor *sd, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, node))) + return hr; + + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + + return S_OK; +} + +static HRESULT media_engine_create_audio_renderer(struct media_engine *engine, IMFTopologyNode **node) +{ + unsigned int category, role; + IMFActivate *sar_activate; + HRESULT hr; + + *node = NULL; + + if (FAILED(hr = MFCreateAudioRendererActivate(&sar_activate))) + return hr; + + /* Configuration attributes keys differ between Engine and SAR. */ + if (SUCCEEDED(IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_CATEGORY, &category))) + IMFActivate_SetUINT32(sar_activate, &MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, category); + if (SUCCEEDED(IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, &role))) + IMFActivate_SetUINT32(sar_activate, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, role); + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, node))) + { + IMFTopologyNode_SetObject(*node, (IUnknown *)sar_activate); + IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE); + } + + IMFActivate_Release(sar_activate); + + return hr; +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; unsigned int stream_count = 0, i; IMFPresentationDescriptor *pd; + IMFTopology *topology; UINT64 duration; HRESULT hr; @@ -410,7 +454,36 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); - /* TODO: set up topology nodes */ + /* TODO: set up video stream nodes */ + + if (SUCCEEDED(hr = MFCreateTopology(&topology))) + { + IMFTopologyNode *sar_node = NULL, *audio_src = NULL; + + if (sd_audio) + { + if (FAILED(hr = media_engine_create_source_node(source, pd, sd_audio, &audio_src))) + WARN("Failed to create audio source node, hr %#x.\n", hr); + + if (FAILED(hr = media_engine_create_audio_renderer(engine, &sar_node))) + WARN("Failed to create audio renderer node, hr %#x.\n", hr); + + if (sar_node && audio_src) + { + IMFTopology_AddNode(topology, audio_src); + IMFTopology_AddNode(topology, sar_node); + IMFTopologyNode_ConnectOutput(audio_src, 0, sar_node, 0); + } + + if (sar_node) + IMFTopologyNode_Release(sar_node); + if (audio_src) + IMFTopologyNode_Release(audio_src); + } + } + + if (topology) + IMFTopology_Release(topology); if (sd_video) IMFStreamDescriptor_Release(sd_video); @@ -419,7 +492,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFPresentationDescriptor_Release(pd); - return S_OK; + return hr; } static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in fbo_blitter_blit().
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: f570c9b6554c20d730e6f547d6f3951733f0773c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f570c9b6554c20d730e6f547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:49:58 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in fbo_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cd3d4b4912..65e9da73b4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5859,7 +5859,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_resource->format->id == src_resource->format->id) { - if (dst_resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_resource->format->depth_size || dst_resource->format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 831701d3f4f14de1ae2e9713a8849f18103a9af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=831701d3f4f14de1ae2e9713… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:49:59 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 08a90e3663..b7ca8ceca2 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -566,9 +566,9 @@ static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3 entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); @@ -594,9 +594,9 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } }

1 0