- Wine-Devel - list.winehq.org

[PATCH] po: Update Finnish translation.
by Lauri Kenttä March 11, 2021

March 11, 2021

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/fi.po b/po/fi.po index ccc0f1da8e6..db71721c80f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -19,26 +19,20 @@ msgid "Security" msgstr "Turvallisuus" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Käyttäjänimi:" +msgstr "&Ryhmät ja käyttäjät:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Keltainen" +msgstr "Salli" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Estä" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Pääsy estetty" +msgstr "Oikeudet taholle %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" -- 2.30.2

1 0

[PATCH resend 2/3] ntdll: Implement ProcessCookie for NtQueryInformationProcess.
by Myah Caron March 11, 2021

March 11, 2021

The entropy is based on https://web.archive.org/web/20100603042315/http://blogs.msdn.com/b/michael_… Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I've opted not to include the rdtsc instruction for patch simplicity. It would require either intrinsics or inline assembly, and I'm not sure what's the right way to integrate this under wine. Since the SystemCalls and PageFaults fields are not currently implemented under wine, the entropy currently isn't as good as it could be. I initially thought of (ab)using SystemInterruptInformation's getrandom usage, but I figured that would be even more of a hack. If this (or something else) would be preferred however, please let me know. dlls/ntdll/unix/process.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index ca9951dfa03..c1d7472b00d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -62,6 +62,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "unix_private.h" #include "wine/exception.h" #include "wine/server.h" @@ -1170,6 +1171,30 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) #endif +static ULONG get_process_cookie( void ) +{ + static ULONG process_cookie; + + if (!process_cookie) + { + SYSTEM_PERFORMANCE_INFORMATION spi; + + ULONG cookie = user_shared_data->TickCount.High1Time; + cookie ^= user_shared_data->TickCount.LowPart; + cookie ^= user_shared_data->InterruptTime.LowPart; + + NtQuerySystemInformation( SystemPerformanceInformation, &spi, sizeof( spi ), NULL ); + cookie ^= spi.SystemCalls; + cookie ^= spi.PageFaults; + + /* cookie ^= (ULONG)rdtsc */ + + InterlockedExchange( (LONG*)&process_cookie, cookie ); + } + + return process_cookie; +} + #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME( "(process=%p) Unimplemented information class: " #c "\n", handle); \ @@ -1559,11 +1584,10 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class break; case ProcessCookie: - FIXME( "ProcessCookie (%p,%p,0x%08x,%p) stub\n", handle, info, size, ret_len ); if (handle == NtCurrentProcess()) { len = sizeof(ULONG); - if (size == len) *(ULONG *)info = 0; + if (size == len) *(ULONG *)info = get_process_cookie(); else ret = STATUS_INFO_LENGTH_MISMATCH; } else ret = STATUS_INVALID_PARAMETER; -- 2.30.1

2 2

[PATCH 1/2] make_unicode: Add support for codepage 20949 (Korean Wansung).
by Sanghoon Park March 10, 2021

March 10, 2021

Some Korean fonts are failed to call NtGetNlsSectionPtr() as there is no c_20949.nls file for codepage 20949. Signed-off-by: Sanghoon Park <esifea1908(a)gmail.com> --- tools/make_unicode | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tools/make_unicode b/tools/make_unicode index 93d6a9346c2..a2123e3996b 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -26,6 +26,7 @@ my $UNIVERSION = "13.0.0"; my $UNIDATA = "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip"; my $IDNADATA = "https://www.unicode.org/Public/idna/$UNIVERSION"; my $JISDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS"; +my $KSCDATA = "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC"; my $REPORTS = "http://www.unicode.org/reports"; my $MSDATA = "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6…"; my $MSCODEPAGES = "$MSDATA/Windows Supported Code Page Data Files.zip"; @@ -942,6 +943,45 @@ sub dump_eucjp_codepage() output_codepage_file( 20932 ); } +################################################################ +# build Korean Wansung table from the KSX1001 file +# FIXME: compare to Windows we should add extra mappings for +# characters added from Unicode 1.1 to enhance the completeness. +sub dump_krwansung_codepage() +{ + @cp2uni = (); + @glyph2uni = (); + @lead_bytes = (); + @uni2cp = (); + $default_char = 0x3f; + $default_wchar = 0x003f; + + # ASCII and undefined chars + foreach my $i (0x00 .. 0x7f) { add_mapping( $i, $i ); } + $cp2uni[0xa0] = 0xf8e6; + $cp2uni[0xad] = 0xf8e7; + $cp2uni[0xae] = 0xf8e8; + $cp2uni[0xaf] = 0xf8e9; + $cp2uni[0xfe] = 0xf8ea; + $cp2uni[0xff] = 0xf8eb; + + my $INPUT = open_data_file( $KSCDATA, "KSX1001.TXT" ); + while (<$INPUT>) + { + next if /^\#/; # skip comments + next if /^$/; # skip empty lines + next if /\x1a/; # skip ^Z + if (/^0x([0-9a-fA-F]+)\s+0x([0-9a-fA-F]+)\s+(\#.*)?/) + { + add_mapping( 0x8080 + hex $1, hex $2 ); + next; + } + die "Unrecognized line $_\n"; + } + close $INPUT; + + output_codepage_file( 20949 ); +} ################################################################ # build the sort keys table @@ -2773,6 +2813,7 @@ dump_norm_table( "nls/normidna.nls" ); dump_sortkey_table( "nls/sortdefault.nls", "Windows 10 Sorting Weight Table.txt" ); foreach my $file (@allfiles) { dump_msdata_codepage( $file ); } dump_eucjp_codepage(); +dump_krwansung_codepage(); dump_registry_script( "dlls/kernelbase/kernelbase.rgs", %registry_keys ); exit 0; -- 2.20.1

1 1

[PATCH resend 3/3] ntdll: Use ProcessCookie in RtlEncode/DecodePointer.
by Myah Caron March 10, 2021

March 10, 2021

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntdll/rtl.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c878035a044..b50e3d42543 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1536,30 +1536,22 @@ WCHAR * WINAPI RtlIpv6AddressToStringW(const IN6_ADDR *address, WCHAR *str) } /*********************************************************************** - * get_pointer_obfuscator (internal) + * get_process_cookie (internal) */ -static DWORD_PTR get_pointer_obfuscator( void ) +static ULONG get_process_cookie( void ) { - static DWORD_PTR pointer_obfuscator; + static ULONG process_cookie; - if (!pointer_obfuscator) + if (!process_cookie) { - ULONG seed = NtGetTickCount(); - ULONG_PTR rand; + ULONG cookie; + NtQueryInformationProcess( NtCurrentProcess(), ProcessCookie, &cookie, + sizeof( cookie ), NULL ); - /* generate a random value for the obfuscator */ - rand = RtlUniform( &seed ); - - /* handle 64bit pointers */ - rand ^= (ULONG_PTR)RtlUniform( &seed ) << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); - - /* set the high bits so dereferencing obfuscated pointers will (usually) crash */ - rand |= (ULONG_PTR)0xc0000000 << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); - - InterlockedCompareExchangePointer( (void**) &pointer_obfuscator, (void*) rand, NULL ); + InterlockedExchange( (LONG*)&process_cookie, cookie ); } - return pointer_obfuscator; + return process_cookie; } /*********************************************************************** @@ -1592,7 +1584,7 @@ PVOID WINAPI RtlEncodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - DWORD_PTR cookie = get_pointer_obfuscator(); + DWORD_PTR cookie = (DWORD_PTR) get_process_cookie(); ptrval = (ptrval ^ cookie); return (PVOID)rotr_ptr(ptrval, cookie); @@ -1601,7 +1593,7 @@ PVOID WINAPI RtlEncodePointer( PVOID ptr ) PVOID WINAPI RtlDecodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - DWORD_PTR cookie = get_pointer_obfuscator(); + DWORD_PTR cookie = (DWORD_PTR) get_process_cookie(); ptrval = rotl_ptr(ptrval, cookie); return (PVOID)(ptrval ^ cookie); -- 2.30.1

1 0

[PATCH resend 1/3] ntdll: Use Vista's algorithm for RtlEncode/DecodePointer.
by Myah Caron March 10, 2021

March 10, 2021

The algorithm is described here: https://web.archive.org/web/20100603042315/http://blogs.msdn.com/b/michael_… It still appears to be the same algorithm used in Windows 10. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/ntdll/rtl.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..c878035a044 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1562,19 +1562,49 @@ static DWORD_PTR get_pointer_obfuscator( void ) return pointer_obfuscator; } +/*********************************************************************** + * rotl_ptr (internal) + */ +#ifdef _WIN64 +#define ROT_BITS 64 +#else +#define ROT_BITS 32 +#endif + +static DWORD_PTR rotl_ptr( DWORD_PTR num, int shift ) +{ + shift &= ROT_BITS - 1; + return (num << shift) | (num >> (ROT_BITS-shift)); +} + +static DWORD_PTR rotr_ptr( DWORD_PTR num, int shift ) +{ + shift &= ROT_BITS - 1; + return (num >> shift) | (num << (ROT_BITS-shift)); +} + +#undef ROT_BITS + /************************************************************************* * RtlEncodePointer [NTDLL.@] */ PVOID WINAPI RtlEncodePointer( PVOID ptr ) { + DWORD_PTR ptrval = (DWORD_PTR) ptr; - return (PVOID)(ptrval ^ get_pointer_obfuscator()); + DWORD_PTR cookie = get_pointer_obfuscator(); + + ptrval = (ptrval ^ cookie); + return (PVOID)rotr_ptr(ptrval, cookie); } PVOID WINAPI RtlDecodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; - return (PVOID)(ptrval ^ get_pointer_obfuscator()); + DWORD_PTR cookie = get_pointer_obfuscator(); + + ptrval = rotl_ptr(ptrval, cookie); + return (PVOID)(ptrval ^ cookie); } /************************************************************************* -- 2.30.1

1 0

[PATCH v2 1/6] d3d11: Use wined3d_device_context_set_shader().
by Zebediah Figura March 10, 2021

March 10, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 39 ++++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a64d6975f85..5a812e1b254 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -546,6 +546,8 @@ struct d3d11_immediate_context ID3D11Multithread ID3D11Multithread_iface; LONG refcount; + struct wined3d_device_context *wined3d_context; + struct wined3d_private_store private_store; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c8ec35a59c0..6a30ab313f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -512,7 +512,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceContext1 *iface, ID3D11PixelShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D11PixelShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -522,7 +522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_pixel_shader(device->wined3d_device, ps ? ps->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_PIXEL, + ps ? ps->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -549,7 +550,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetSamplers(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceContext1 *iface, ID3D11VertexShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D11VertexShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -559,7 +560,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, vs ? vs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_VERTEX, + vs ? vs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -737,7 +739,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext1 *iface, ID3D11GeometryShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_geometry_shader *gs = unsafe_impl_from_ID3D11GeometryShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -747,7 +749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_geometry_shader(device->wined3d_device, gs ? gs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_GEOMETRY, + gs ? gs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -1425,7 +1428,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext1 *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_hull_shader *hs = unsafe_impl_from_ID3D11HullShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1435,7 +1438,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_hull_shader(device->wined3d_device, hs ? hs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_HULL, + hs ? hs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -1492,7 +1496,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext1 *iface, ID3D11DomainShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_domain_shader *ds = unsafe_impl_from_ID3D11DomainShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1502,7 +1506,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_domain_shader(device->wined3d_device, ds ? ds->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_DOMAIN, + ds ? ds->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -1579,7 +1584,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext1 *iface, ID3D11ComputeShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_compute_shader *cs = unsafe_impl_from_ID3D11ComputeShader(shader); TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", @@ -1589,7 +1594,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceCo FIXME("Dynamic linking is not implemented yet.\n"); wined3d_mutex_lock(); - wined3d_device_set_compute_shader(device->wined3d_device, cs ? cs->wined3d_shader : NULL); + wined3d_device_context_set_shader(context->wined3d_context, WINED3D_SHADER_TYPE_COMPUTE, + cs ? cs->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -2577,6 +2583,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext1 *iface) { + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; unsigned int i, j; @@ -2584,12 +2591,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, NULL); - wined3d_device_set_hull_shader(device->wined3d_device, NULL); - wined3d_device_set_domain_shader(device->wined3d_device, NULL); - wined3d_device_set_geometry_shader(device->wined3d_device, NULL); - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); - wined3d_device_set_compute_shader(device->wined3d_device, NULL); for (i = 0; i < D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) { wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); @@ -2610,6 +2611,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon } for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { + wined3d_device_context_set_shader(context->wined3d_context, i, NULL); for (j = 0; j < D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++j) wined3d_device_set_constant_buffer(device->wined3d_device, i, j, NULL); } @@ -6458,6 +6460,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par wined3d_device_incref(wined3d_device); device->wined3d_device = wined3d_device; + device->immediate_context.wined3d_context = wined3d_device_get_immediate_context(wined3d_device); device->feature_level = d3d_feature_level_from_wined3d(wined3d_device_get_feature_level(wined3d_device)); -- 2.20.1

5 17

[PATCH 1/4] quartz: Move the current sample tracking back to strmbase.
by Zebediah Figura March 10, 2021

March 10, 2021

Only the video renderer uses this, but we'd like to deduplicate the wait-on-preroll behaviour. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/videorenderer.c | 9 ++------- dlls/strmbase/renderer.c | 4 ++++ include/wine/strmbase.h | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a925340a676..ed5774bf484 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -50,7 +50,6 @@ struct video_renderer DWORD saved_style; HANDLE run_event; - IMediaSample *current_sample; }; static inline struct video_renderer *impl_from_video_window(struct video_window *iface) @@ -109,14 +108,10 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa { const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; - filter->current_sample = pSample; - SetEvent(filter->renderer.state_event); LeaveCriticalSection(&filter->renderer.filter.stream_cs); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.filter.stream_cs); - - filter->current_sample = NULL; } return S_OK; @@ -276,7 +271,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG return VFW_E_NOT_PAUSED; } - if (!filter->current_sample) + if (!filter->renderer.current_sample) { LeaveCriticalSection(&filter->renderer.filter.stream_cs); return E_UNEXPECTED; @@ -289,7 +284,7 @@ static HRESULT video_renderer_get_current_image(struct video_window *iface, LONG } memcpy(image, bih, sizeof(BITMAPINFOHEADER)); - IMediaSample_GetPointer(filter->current_sample, &sample_data); + IMediaSample_GetPointer(filter->renderer.current_sample, &sample_data); memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); LeaveCriticalSection(&filter->renderer.filter.stream_cs); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 47017f5ced5..b384ea991d9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -353,7 +353,11 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp } if (state == State_Paused) + { + filter->current_sample = sample; hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + filter->current_sample = NULL; + } if (need_wait) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4b5ecc86721..e902790ecb1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -291,6 +291,8 @@ struct strmbase_renderer HANDLE flush_event; REFERENCE_TIME stream_start; + IMediaSample *current_sample; + IQualityControl *qc_sink; REFERENCE_TIME last_left, avg_duration, avg_pt; double avg_rate; -- 2.20.1

1 3

[PATCH] winemac.drv: Fix crash when building against Metal-capable SDK but running on older OS X.
by Brendan Shanks March 10, 2021

March 10, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50790 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 7cc6f981fee..05f1c75d53b 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -348,10 +348,15 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp int ret = -1; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + /* Test if Metal is available */ + if (&CGDirectDisplayCopyCurrentMetalDevice == NULL) + goto done; + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); +done: [pool release]; return ret; } -- 2.26.2

1 0

[PATCH] tools: Relax the dot in module names rules.
by Rémi Bernon March 10, 2021

March 10, 2021

This should allow modules with dot in their names, while still making the .dll extension optional. The MODULE variable still determines the actual output file extension. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 201129 This should be a better fix, that will also allow to add tests to these modules without any changes on the testbot (although it should arguably use the same logic as makedep to compute the test executable names). tools/make_makefiles | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 2d3c14cb2ec..3abba2da840 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -446,18 +446,17 @@ sub update_makefiles(@) if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; - die "Invalid MODULE in $file" if $name =~ /\./ && $make{"MODULE"} ne $name; if ($file =~ /^programs\//) { die "EXTRADLLFLAGS should be defined in $file" unless $dllflags; die "EXTRADLLFLAGS should contain -mconsole or -mwindows in $file" unless $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.exe"; } else { die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; - die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.dll"; + die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } if (defined $make{"IMPORTLIB"}) { -- 2.30.0

1 1

[PATCH v2 1/2] jscript: Check for null instance prototype.
by Gabriel Ivăncescu March 10, 2021

March 10, 2021

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Add tests. dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/lang.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5829ceb..9d0357e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1853,7 +1853,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built return hres; } - if(is_object_instance(val)) + if(is_object_instance(val) && get_object(val)) prot = iface_to_jsdisp(get_object(val)); jsval_release(val); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 753b4ee..211ae2f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1864,6 +1864,21 @@ ok(tmp === "VT_DISPATCH", "getVT(Object(nullDisp) = " + tmp); tmp = Object(nullDisp).toString(); ok(tmp === "[object Object]", "Object(nullDisp).toString() = " + tmp); +function testNullPrototype() { + this.x = 13; +} +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); +testNullPrototype.prototype.y = 10; +ok("y" in tmp, "tmp does not have 'y' property"); +tmp = new testNullPrototype(); +ok(tmp.y === 10, "tmp.y !== 10"); +testNullPrototype.prototype = nullDisp; +tmp = new testNullPrototype(); +ok(tmp.x === 13, "tmp.x !== 13"); +ok(!("y" in tmp), "tmp has 'y' property"); + function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon(); -- 2.30.0

2 3