- Wine-Commits - list.winehq.org

Alexandre Julliard : wow64: Call the thread init entry point in the CPU backend.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 06dc0473460f3667fb24b73cae38b139e46a23f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/06dc0473460f3667fb24b73cae38b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 13:56:43 2023 +0100 wow64: Call the thread init entry point in the CPU backend. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 7555fdd4ee4..e9b8df76e7c 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -96,6 +96,7 @@ static void * (WINAPI *pBTCpuGetBopCode)(void); static NTSTATUS (WINAPI *pBTCpuGetContext)(HANDLE,HANDLE,void *,void *); static void (WINAPI *pBTCpuProcessInit)(void); static NTSTATUS (WINAPI *pBTCpuSetContext)(HANDLE,HANDLE,void *,void *); +static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); @@ -771,6 +772,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuGetContext ); GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuThreadInit ); GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); @@ -802,6 +804,7 @@ static void thread_init(void) void *cpu_area_ctx; RtlWow64GetCurrentCpuArea( NULL, &cpu_area_ctx, NULL ); + if (pBTCpuThreadInit) pBTCpuThreadInit(); /* update initial context to jump to 32-bit LdrInitializeThunk (cf. 32-bit call_init_thunk) */ switch (current_machine)

1 0

Alexandre Julliard : wow64: Move some exception and context functions to syscall.c.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 58ced9adff675ead7ba290388c30dca5ec60f64e URL: https://gitlab.winehq.org/wine/wine/-/commit/58ced9adff675ead7ba290388c30dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 12:54:03 2023 +0100 wow64: Move some exception and context functions to syscall.c. --- dlls/wow64/process.c | 263 -------------------------------------------------- dlls/wow64/syscall.c | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+), 263 deletions(-)

1 0

Jason Millard : vbscript: Fix memory leak in owned safearray iterator.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: a8c319cad691a53cfd333ab72dbbeac4558f7c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8c319cad691a53cfd333ab72dbbea… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 13:11:56 2023 -0500 vbscript: Fix memory leak in owned safearray iterator. --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/utils.c | 9 +++++++-- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4881efa9454..eb1dcab5f01 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1487,7 +1487,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) case VT_VARIANT|VT_ARRAY|VT_BYREF: { IEnumVARIANT *iter; - hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), &iter); + hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), v.owned && !V_ISBYREF(v.v), &iter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c index 03b1abde481..4bfc2c65a0a 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -28,6 +28,7 @@ typedef struct { LONG ref; SAFEARRAY *sa; + BOOL owned; ULONG i, size; } safearray_iter; @@ -75,8 +76,11 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_Release(IEnumVARIANT *iface) TRACE("(%p) ref=%ld\n", iface, ref); if(!ref) { - if(This->sa) + if(This->sa) { SafeArrayUnlock(This->sa); + if(This->owned) + SafeArrayDestroy(This->sa); + } free(This); } @@ -160,7 +164,7 @@ static ULONG get_safearray_size(SAFEARRAY *sa) return ret; } -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) { safearray_iter *iter; HRESULT hres; @@ -185,6 +189,7 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) iter->IEnumVARIANT_iface.lpVtbl = &safearray_iter_EnumVARIANTVtbl; iter->ref = 1; iter->sa = sa; + iter->owned = owned; iter->i = 0; iter->size = get_safearray_size(sa); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5b0a2222767..13bcf704bf0 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -415,7 +415,7 @@ BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN; -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) DECLSPEC_HIDDEN; #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code)

1 0

Hans Leidekker : ntdll: Look at CurrentMajor/MinorVersionNumber registry values before CurrentVersion.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: 0692d07f85f30ee5191a781b8b6f51006f2ae407 URL: https://gitlab.winehq.org/wine/wine/-/commit/0692d07f85f30ee5191a781b8b6f51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 9 13:45:02 2023 +0100 ntdll: Look at CurrentMajor/MinorVersionNumber registry values before CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54463 --- dlls/ntdll/version.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 3a903c54c6b..9c396598d4e 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -276,18 +276,36 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) memset( version, 0, sizeof(*version) ); - RtlInitUnicodeString( &valueW, L"CurrentVersion" ); - if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count )) + RtlInitUnicodeString( &valueW, L"CurrentMajorVersionNumber" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ) && + info->Type == REG_DWORD) { - WCHAR *p, *str = (WCHAR *)info->Data; - str[info->DataLength / sizeof(WCHAR)] = 0; - p = wcschr( str, '.' ); - if (p) + version->dwMajorVersion = *(DWORD *)info->Data; + + RtlInitUnicodeString( &valueW, L"CurrentMinorVersionNumber" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ) && + info->Type == REG_DWORD) { - *p++ = 0; - version->dwMinorVersion = wcstoul( p, NULL, 10 ); + version->dwMinorVersion = *(DWORD *)info->Data; + } + else version->dwMajorVersion = 0; + } + + if (!version->dwMajorVersion) + { + RtlInitUnicodeString( &valueW, L"CurrentVersion" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count )) + { + WCHAR *p, *str = (WCHAR *)info->Data; + str[info->DataLength / sizeof(WCHAR)] = 0; + p = wcschr( str, '.' ); + if (p) + { + *p++ = 0; + version->dwMinorVersion = wcstoul( p, NULL, 10 ); + } + version->dwMajorVersion = wcstoul( str, NULL, 10 ); } - version->dwMajorVersion = wcstoul( str, NULL, 10 ); } if (version->dwMajorVersion) /* we got the main version, now fetch the other fields */

1 0

Zebediah Figura : winegstreamer: Separate a mf_video_format_to_wg() helper.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: 2803a220f684869ccd66e78778133b2586282da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2803a220f684869ccd66e78778133b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:51:38 2023 -0600 winegstreamer: Separate a mf_video_format_to_wg() helper. --- dlls/winegstreamer/mfplat.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index f00167fb36f..79787cfafd4 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -667,11 +667,23 @@ static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, struct wg memcpy(format->u.audio_mpeg4.codec_data, user_data->pbAudioSpecificConfig, codec_data_size); } +static enum wg_video_format mf_video_format_to_wg(const GUID *subtype) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(video_formats); ++i) + { + if (IsEqualGUID(subtype, video_formats[i].subtype)) + return video_formats[i].format; + } + FIXME("Unrecognized video subtype %s.\n", debugstr_guid(subtype)); + return WG_VIDEO_FORMAT_UNKNOWN; +} + static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { UINT64 frame_rate, frame_size; MFVideoArea aperture; - unsigned int i; UINT32 size; if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size))) @@ -701,15 +713,7 @@ static void mf_media_type_to_wg_format_video(IMFMediaType *type, const GUID *sub format->u.video.fps_d = (UINT32)frame_rate; } - for (i = 0; i < ARRAY_SIZE(video_formats); ++i) - { - if (IsEqualGUID(subtype, video_formats[i].subtype)) - { - format->u.video.format = video_formats[i].format; - return; - } - } - FIXME("Unrecognized video subtype %s.\n", debugstr_guid(subtype)); + format->u.video.format = mf_video_format_to_wg(subtype); } static void mf_media_type_to_wg_format_audio_wma(IMFMediaType *type, const GUID *subtype, struct wg_format *format)

1 0

Jason Millard : vbscript: Fix compile when colon follows Else on new line.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: afb2125cdf281e0f200d2c11b372f8f71fddff65 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb2125cdf281e0f200d2c11b372f8… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 12:14:37 2023 -0500 vbscript: Fix compile when colon follows Else on new line. --- dlls/vbscript/parser.y | 3 +-- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 382504a3d5a..03415dc2b1c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -319,8 +319,7 @@ ElseIf Else_opt : /* empty */ { $$ = NULL; } - | tELSE tNL StatementsNl_opt { $$ = $3; } - | tELSE StatementsNl_opt { $$ = $2; } + | tELSE StSep_opt StatementsNl_opt { $$ = $3; } CaseClausules : /* empty */ { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 3a67cd09dff..1707cc9a92b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -298,6 +298,15 @@ Else x = true End If Call ok(x, "else not called?") +' Else with colon before statement following newline +x = false +If false Then + Call ok(false, "inside if false") +Else +: x = true +End If +Call ok(x, "else not called?") + x = false If false Then Call ok(false, "inside if false")

1 0

Jason Millard : vbscript: Add missing stubs for GetLocale and SetLocale builtins.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: c5957eb9377b607a5f01f44204336b6b079b3435 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5957eb9377b607a5f01f44204336b… Author: Jason Millard <jsm174(a)gmail.com> Date: Wed Feb 8 17:23:15 2023 -0500 vbscript: Add missing stubs for GetLocale and SetLocale builtins. --- dlls/vbscript/global.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7ca2c2b9c72..0baab7e4420 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2178,6 +2178,12 @@ static HRESULT Global_Second(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return FAILED(hres) ? hres : return_short(res, st.wSecond); } +static HRESULT Global_SetLocale(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT Global_DateValue(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -3048,6 +3054,12 @@ static HRESULT Global_FormatPercent(BuiltinDisp *This, VARIANT *args, unsigned a return return_bstr(res, str); } +static HRESULT Global_GetLocale(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT Global_FormatDateTime(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { int format = 0; @@ -3270,6 +3282,7 @@ static const builtin_prop_t global_props[] = { {L"FormatDateTime", Global_FormatDateTime, 0, 1, 2}, {L"FormatNumber", Global_FormatNumber, 0, 1, 5}, {L"FormatPercent", Global_FormatPercent, 0, 1, 5}, + {L"GetLocale", Global_GetLocale, 0, 0}, {L"GetObject", Global_GetObject, 0, 0, 2}, {L"GetRef", Global_GetRef, 0, 1}, {L"Hex", Global_Hex, 0, 1}, @@ -3316,6 +3329,7 @@ static const builtin_prop_t global_props[] = { {L"ScriptEngineMajorVersion", Global_ScriptEngineMajorVersion, 0, 0}, {L"ScriptEngineMinorVersion", Global_ScriptEngineMinorVersion, 0, 0}, {L"Second", Global_Second, 0, 1}, + {L"SetLocale", Global_SetLocale, 0, 0, 1}, {L"Sgn", Global_Sgn, 0, 1}, {L"Sin", Global_Sin, 0, 1}, {L"Space", Global_Space, 0, 1},

1 0

Hans Leidekker : ntdll: Initialize PEB version numbers with Windows 10 values.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: 65a3e1499b15a2da4971e2bab48c3943beb06f96 URL: https://gitlab.winehq.org/wine/wine/-/commit/65a3e1499b15a2da4971e2bab48c39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 9 16:51:41 2023 +0100 ntdll: Initialize PEB version numbers with Windows 10 values. --- dlls/ntdll/unix/env.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 6f1709f4713..79dc7ffc5c3 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1848,9 +1848,9 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) { peb->ImageBaseAddress = module; peb->ProcessParameters = params; - peb->OSMajorVersion = 6; - peb->OSMinorVersion = 1; - peb->OSBuildNumber = 0x1db1; + peb->OSMajorVersion = 10; + peb->OSMinorVersion = 0; + peb->OSBuildNumber = 18362; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion;

1 0

Zebediah Figura : winegstreamer: Check the absolute value of the height in mf_media_type_from_wg_format_video().
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: 98c266c0bdd02c4569fb2acaf70da66e66b79c72 URL: https://gitlab.winehq.org/wine/wine/-/commit/98c266c0bdd02c4569fb2acaf70da6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:44:00 2023 -0600 winegstreamer: Check the absolute value of the height in mf_media_type_from_wg_format_video(). Inverted height indicates vertically flipped video. We don't currently handle that either, but one thing at a time. --- dlls/winegstreamer/mfplat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index a09c67b4f11..f00167fb36f 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -510,13 +510,15 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * { if (format->u.video.format == video_formats[i].format) { + int32_t height = abs(format->u.video.height); + int32_t width = format->u.video.width; + if (FAILED(MFCreateMediaType(&type))) return NULL; IMFMediaType_SetGUID(type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); IMFMediaType_SetGUID(type, &MF_MT_SUBTYPE, video_formats[i].subtype); - IMFMediaType_SetUINT64(type, &MF_MT_FRAME_SIZE, - make_uint64(format->u.video.width, format->u.video.height)); + IMFMediaType_SetUINT64(type, &MF_MT_FRAME_SIZE, make_uint64(width, height)); IMFMediaType_SetUINT64(type, &MF_MT_FRAME_RATE, make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); @@ -529,8 +531,8 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * { .OffsetX = {.value = format->u.video.padding.left}, .OffsetY = {.value = format->u.video.padding.top}, - .Area.cx = format->u.video.width - format->u.video.padding.right - format->u.video.padding.left, - .Area.cy = format->u.video.height - format->u.video.padding.bottom - format->u.video.padding.top, + .Area.cx = width - format->u.video.padding.right - format->u.video.padding.left, + .Area.cy = height - format->u.video.padding.bottom - format->u.video.padding.top, }; IMFMediaType_SetBlob(type, &MF_MT_MINIMUM_DISPLAY_APERTURE,

1 0

Zebediah Figura : mfreadwrite/tests: Test an audio/video file.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: 81b09cdee242e45aa1cf72632bc4bf53007f6df0 URL: https://gitlab.winehq.org/wine/wine/-/commit/81b09cdee242e45aa1cf72632bc4bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 24 15:22:47 2023 -0600 mfreadwrite/tests: Test an audio/video file. --- dlls/mfreadwrite/tests/mfplat.c | 176 +++++++++++++++++++++++++++++++++---- dlls/mfreadwrite/tests/resource.rc | 5 ++ dlls/mfreadwrite/tests/test.mp4 | Bin 0 -> 13078 bytes 3 files changed, 162 insertions(+), 19 deletions(-)

1 0