December 2020 - Wine-Devel - list.winehq.org

Re: [PATCH v4 03/12] winegstreamer: Add MFT registration helper for gstreamer-backed MFTs.

by Zebediah Figura (she/her)

I'd go with something more like "register the audio converter MFT" for a patch subject, since that's the functional change this patch achieves. On 12/2/20 4:36 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v4: Fix tracing of 'param' parameter for ::ProcessMessage. > --- > dlls/winegstreamer/gst_private.h | 1 + > dlls/winegstreamer/main.c | 3 +- > dlls/winegstreamer/mfplat.c | 69 ++++++++++++++++++++++++++++++++ > 3 files changed, 72 insertions(+), 1 deletion(-) > > diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h > index 7889c996204..9518f721504 100644 > --- a/dlls/winegstreamer/gst_private.h > +++ b/dlls/winegstreamer/gst_private.h > @@ -76,6 +76,7 @@ BOOL init_gstreamer(void) DECLSPEC_HIDDEN; > void start_dispatch_thread(void) DECLSPEC_HIDDEN; > > extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; > +extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; > > HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; > IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; > diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c > index 4ca371d58bd..385c5550235 100644 > --- a/dlls/winegstreamer/main.c > +++ b/dlls/winegstreamer/main.c > @@ -368,7 +368,8 @@ HRESULT WINAPI DllRegisterServer(void) > IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, wave_parserW, NULL, NULL, NULL, &reg_wave_parser); > > IFilterMapper2_Release(mapper); > - return S_OK; > + > + return mfplat_DllRegisterServer(); > } > > HRESULT WINAPI DllUnregisterServer(void) > diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c > index 095a9b81091..f300988fc5c 100644 > --- a/dlls/winegstreamer/mfplat.c > +++ b/dlls/winegstreamer/mfplat.c > @@ -445,6 +445,75 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) > return CLASS_E_CLASSNOTAVAILABLE; > } > > +static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; > +static const GUID *audio_converter_supported_types[] = > +{ > + &MFAudioFormat_PCM, > + &MFAudioFormat_Float, > +}; > + > +static const struct mft > +{ > + const GUID *clsid; > + const GUID *category; > + LPWSTR name; > + const UINT32 flags; > + const GUID *major_type; > + const UINT32 input_types_count; > + const GUID **input_types; > + const UINT32 output_types_count; > + const GUID **output_types; > + IMFAttributes *attributes; > +} > +mfts[] = > +{ > + { > + &CLSID_WINEAudioConverter, > + &MFT_CATEGORY_AUDIO_EFFECT, > + audio_converterW, > + MFT_ENUM_FLAG_SYNCMFT, > + &MFMediaType_Audio, > + ARRAY_SIZE(audio_converter_supported_types), > + audio_converter_supported_types, > + ARRAY_SIZE(audio_converter_supported_types), > + audio_converter_supported_types, > + NULL > + }, > +}; > + > +HRESULT mfplat_DllRegisterServer(void) > +{ > + unsigned int i, j; > + HRESULT hr; > + MFT_REGISTER_TYPE_INFO input_types[2], output_types[2]; > + > + for (i = 0; i < ARRAY_SIZE(mfts); i++) > + { > + const struct mft *cur = &mfts[i]; > + > + for (j = 0; j < cur->input_types_count; j++) > + { > + input_types[j].guidMajorType = *(cur->major_type); > + input_types[j].guidSubtype = *(cur->input_types[j]); > + } > + for (j = 0; j < cur->output_types_count; j++) > + { > + output_types[j].guidMajorType = *(cur->major_type); > + output_types[j].guidSubtype = *(cur->output_types[j]); > + } > + > + hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, > + input_types, cur->output_types_count, output_types, cur->attributes); > + > + if (FAILED(hr)) > + { > + FIXME("Failed to register MFT, hr %#x\n", hr); > + return hr; > + } > + } > + return S_OK; > +} > + > static const struct > { > const GUID *subtype; >

Dec. 3, 2020

Re: [PATCH v4 02/12] winegstreamer: Introduce audio conversion transform.

by Zebediah Figura (she/her)

On 12/2/20 4:36 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v4: Reorder patch not to touch MFT registration functionality. > --- > dlls/winegstreamer/Makefile.in | 1 + > dlls/winegstreamer/audioconvert.c | 285 +++++++++++++++++++ > dlls/winegstreamer/gst_private.h | 2 + > dlls/winegstreamer/mfplat.c | 3 + > dlls/winegstreamer/winegstreamer_classes.idl | 6 + > 5 files changed, 297 insertions(+) > create mode 100644 dlls/winegstreamer/audioconvert.c > > diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in > index e578d194f7f..0b3229160b9 100644 > --- a/dlls/winegstreamer/Makefile.in > +++ b/dlls/winegstreamer/Makefile.in > @@ -6,6 +6,7 @@ EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) > PARENTSRC = ../strmbase > > C_SRCS = \ > + audioconvert.c \ > filter.c \ > gst_cbs.c \ > gstdemux.c \ > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > new file mode 100644 > index 00000000000..68f045a4558 > --- /dev/null > +++ b/dlls/winegstreamer/audioconvert.c > @@ -0,0 +1,285 @@ > +#include "config.h" Sorry for missing this before, but you're missing a copyright header here. I think the patch looks good to me otherwise. > + > +#include "gst_private.h" > + > +#include "mfapi.h" > +#include "mferror.h" > +#include "mfidl.h" > +#include "ks.h" > +#include "ksmedia.h" > + > +#include "wine/debug.h" > +#include "wine/heap.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); > + > +struct audio_converter > +{ > + IMFTransform IMFTransform_iface; > + LONG refcount; > +}; > + > +static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > +{ > + return CONTAINING_RECORD(iface, struct audio_converter, IMFTransform_iface); > +} > + > +static HRESULT WINAPI audio_converter_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) > +{ > + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); > + > + if (IsEqualIID(riid, &IID_IMFTransform) || > + IsEqualIID(riid, &IID_IUnknown)) > + { > + *obj = iface; > + IMFTransform_AddRef(iface); > + return S_OK; > + } > + > + WARN("Unsupported %s.\n", debugstr_guid(riid)); > + *obj = NULL; > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI audio_converter_AddRef(IMFTransform *iface) > +{ > + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); > + ULONG refcount = InterlockedIncrement(&transform->refcount); > + > + TRACE("%p, refcount %u.\n", iface, refcount); > + > + return refcount; > +} > + > +static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > +{ > + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); > + ULONG refcount = InterlockedDecrement(&transform->refcount); > + > + TRACE("%p, refcount %u.\n", iface, refcount); > + > + if (!refcount) > + { > + heap_free(transform); > + } > + > + return refcount; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, > + DWORD *output_minimum, DWORD *output_maximum) > +{ > + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); > + > + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) > +{ > + TRACE("%p, %p, %p.\n", iface, inputs, outputs); > + > + *inputs = *outputs = 1; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, > + DWORD output_size, DWORD *outputs) > +{ > + TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) > +{ > + FIXME("%p %u %p.\n", iface, id, info); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) > +{ > + FIXME("%p %u %p.\n", iface, id, info); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) > +{ > + FIXME("%p, %p.\n", iface, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, > + IMFAttributes **attributes) > +{ > + FIXME("%p, %u, %p.\n", iface, id, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, > + IMFAttributes **attributes) > +{ > + FIXME("%p, %u, %p.\n", iface, id, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id) > +{ > + TRACE("%p, %u.\n", iface, id); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) > +{ > + TRACE("%p, %u, %p.\n", iface, streams, ids); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, > + IMFMediaType **type) > +{ > + FIXME("%p, %u, %u, %p.\n", iface, id, index, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, > + IMFMediaType **type) > +{ > + FIXME("%p, %u, %u, %p.\n", iface, id, index, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > +{ > + FIXME("%p, %u, %p.\n", iface, id, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > +{ > + FIXME("%p, %u, %p.\n", iface, id, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) > +{ > + FIXME("%p, %u, %p.\n", iface, id, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStatus(IMFTransform *iface, DWORD *flags) > +{ > + FIXME("%p, %p.\n", iface, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) > +{ > + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) > +{ > + TRACE("%p, %u, %p.\n", iface, id, event); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) > +{ > + FIXME("%p, %u %lu.\n", iface, message, param); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, > + MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) > +{ > + FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + > + return E_NOTIMPL; > +} > + > +static const IMFTransformVtbl audio_converter_vtbl = > +{ > + audio_converter_QueryInterface, > + audio_converter_AddRef, > + audio_converter_Release, > + audio_converter_GetStreamLimits, > + audio_converter_GetStreamCount, > + audio_converter_GetStreamIDs, > + audio_converter_GetInputStreamInfo, > + audio_converter_GetOutputStreamInfo, > + audio_converter_GetAttributes, > + audio_converter_GetInputStreamAttributes, > + audio_converter_GetOutputStreamAttributes, > + audio_converter_DeleteInputStream, > + audio_converter_AddInputStreams, > + audio_converter_GetInputAvailableType, > + audio_converter_GetOutputAvailableType, > + audio_converter_SetInputType, > + audio_converter_SetOutputType, > + audio_converter_GetInputCurrentType, > + audio_converter_GetOutputCurrentType, > + audio_converter_GetInputStatus, > + audio_converter_GetOutputStatus, > + audio_converter_SetOutputBounds, > + audio_converter_ProcessEvent, > + audio_converter_ProcessMessage, > + audio_converter_ProcessInput, > + audio_converter_ProcessOutput, > +}; > + > +HRESULT audio_converter_create(REFIID riid, void **ret) > +{ > + struct audio_converter *object; > + > + TRACE("%s %p\n", debugstr_guid(riid), ret); > + > + if (!(object = heap_alloc_zero(sizeof(*object)))) > + return E_OUTOFMEMORY; > + > + object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; > + object->refcount = 1; > + > + *ret = &object->IMFTransform_iface; > + return S_OK; > +} > diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h > index 28e424439d8..7889c996204 100644 > --- a/dlls/winegstreamer/gst_private.h > +++ b/dlls/winegstreamer/gst_private.h > @@ -84,4 +84,6 @@ IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; > > HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; > > +HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; > + > #endif /* __GST_PRIVATE_INCLUDED__ */ > diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c > index 3a160d68093..095a9b81091 100644 > --- a/dlls/winegstreamer/mfplat.c > +++ b/dlls/winegstreamer/mfplat.c > @@ -405,6 +405,8 @@ failed: > > static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}}; > > +static const GUID CLSID_WINEAudioConverter = {0x6a170414,0xaad9,0x4693,{0xb8,0x06,0x3a,0x0c,0x47,0xc5,0x70,0xd6}}; > + > static const struct class_object > { > const GUID *clsid; > @@ -414,6 +416,7 @@ class_objects[] = > { > { &CLSID_VideoProcessorMFT, &video_processor_create }, > { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create }, > + { &CLSID_WINEAudioConverter, &audio_converter_create }, > }; > > HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) > diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl > index 1dc4ba9a10b..cf1fc69f38a 100644 > --- a/dlls/winegstreamer/winegstreamer_classes.idl > +++ b/dlls/winegstreamer/winegstreamer_classes.idl > @@ -61,3 +61,9 @@ coclass VideoProcessorMFT {} > uuid(317df618-5e5a-468a-9f15-d827a9a08162) > ] > coclass GStreamerByteStreamHandler {} > + > +[ > + threading(both), > + uuid(6a170414-aad9-4693-b806-3a0c47c570d6) > +] > +coclass WINEAudioConverter { } >

Dec. 3, 2020

Re: [PATCH v4 01/12] winegstreamer: Utilize gst_audio_info_to_caps for media type translation.

by Zebediah Figura (she/her)

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

Dec. 3, 2020

Re: [PATCH] crypt32: Fix reading and writing CRYPT_KEY_PROV_INFO certificate property.

by Dmitry Timoshkov

Alexandre Julliard <julliard(a)winehq.org> wrote: > > Is there anything that could be improved to make this patch accepted? > > It's fairly large, it would help if you could do this in smaller chunks > somehow. The patch implements both serializer and deserializer of the CRYPT_KEY_PROV_INFO property, and that can't be split without breaking too much. I can send the tests separately though. Is that acceptable? -- Dmitry.

Dec. 3, 2020

[PATCH 5/5] wined3d: Explicitly synchronise in wined3d_context_gl_map_bo_address().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 ------- dlls/wined3d/context_gl.c | 9 +++++++++ dlls/wined3d/resource.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7a4e48fd9c6..5dbc66449f4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -741,7 +741,6 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, uint32_t flags, struct wined3d_context_gl *context_gl) { - struct wined3d_device_gl *device_gl = wined3d_device_gl(buffer_gl->b.resource.device); const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_bo_gl *bo = &buffer_gl->bo; @@ -759,12 +758,6 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, bo->command_fence_id = 0; return; } - - TRACE("Synchronizing buffer %p.\n", buffer_gl); - - if (bo->command_fence_id == device_gl->current_fence_id) - wined3d_context_gl_submit_command_fence(context_gl); - wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); } static void buffer_mark_used(struct wined3d_buffer *buffer) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 83c61834f5a..406b325cda8 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2653,6 +2653,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, uint32_t flags) { + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; BYTE *memory; @@ -2660,6 +2661,14 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (!(bo = (struct wined3d_bo_gl *)data->buffer_object)) return data->addr; + if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + goto map; + + if (bo->command_fence_id == device_gl->current_fence_id) + wined3d_context_gl_submit_command_fence(context_gl); + wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); + +map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 97b8b68374d..f6e233d8057 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -451,11 +451,11 @@ GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; if (d3d_flags & WINED3D_MAP_READ) ret |= GL_MAP_READ_BIT; + else if (!(d3d_flags & WINED3D_MAP_DISCARD)) + ret |= GL_MAP_UNSYNCHRONIZED_BIT; if (d3d_flags & WINED3D_MAP_DISCARD) ret |= GL_MAP_INVALIDATE_BUFFER_BIT; - if (d3d_flags & WINED3D_MAP_NOOVERWRITE) - ret |= GL_MAP_UNSYNCHRONIZED_BIT; return ret; } -- 2.20.1

Dec. 3, 2020

[PATCH 4/5] wined3d: Reference the bo in wined3d_buffer_gl_upload_ranges().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 82051453ef1..7a4e48fd9c6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1412,6 +1412,7 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc GL_EXTCALL(glBufferSubData(buffer_gl->bo.binding, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("buffer upload"); } -- 2.20.1

Dec. 3, 2020

[PATCH 3/5] wined3d: Reference the bo in wined3d_texture_gl_download_data().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 43d75eb8ce9..6c9627d21f8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2841,6 +2841,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, if (dst_bo) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, dst_bo); checkGLcall("glBindBuffer"); } } -- 2.20.1

Dec. 3, 2020

[PATCH 2/5] wined3d: Reference the bo in wined3d_texture_gl_download_data_slow_path().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1cf4f7eb5ca..43d75eb8ce9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2501,7 +2501,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data) { - const struct wined3d_bo_gl *bo = (const struct wined3d_bo_gl *)data->buffer_object; + struct wined3d_bo_gl *bo = (struct wined3d_bo_gl *)data->buffer_object; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; @@ -2721,6 +2721,7 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl if (bo) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, bo); checkGLcall("glBindBuffer"); } -- 2.20.1

Dec. 3, 2020

[PATCH 1/5] wined3d: Reference the bo in wined3d_texture_gl_upload_data().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1e410930a8b..1cf4f7eb5ca 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2481,6 +2481,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, if (bo.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, (struct wined3d_bo_gl *)bo.buffer_object); checkGLcall("glBindBuffer"); } } -- 2.20.1

Dec. 3, 2020

Re: [PATCH] wined3d: Add NVIDIA GeForce GTX 1060 Mobile.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 3, 2020

Re: [PATCH] crypt32: Fix reading and writing CRYPT_KEY_PROV_INFO certificate property.

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Is there anything that could be improved to make this patch accepted? It's fairly large, it would help if you could do this in smaller chunks somehow. -- Alexandre Julliard julliard(a)winehq.org

Dec. 3, 2020

[PATCH v3 7/7] gdi32/tests: Test changing system default font smoothing.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/tests/dib.c | 45 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d16cb0df5c0..8cd054f7183 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -3007,7 +3007,7 @@ static inline COLORREF aa_colorref( COLORREF dst, COLORREF text, BYTE glyph ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; -static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BYTE quality, BOOL expected_aa ) { DWORD dib_size = get_dib_size(bmi), ret; LOGFONTA lf; @@ -3029,7 +3029,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) memset( &lf, 0, sizeof(lf) ); strcpy( lf.lfFaceName, "Tahoma" ); lf.lfHeight = 24; - lf.lfQuality = aa ? ANTIALIASED_QUALITY : NONANTIALIASED_QUALITY; + lf.lfQuality = quality; font = CreateFontIndirectA( &lf ); font = SelectObject( hdc, font ); @@ -3054,12 +3054,12 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) for(i = 0; i < dib_size; i++) bits[i] = vals[i % 4]; - if (bmi->bmiHeader.biBitCount <= 8) aa = FALSE; + if (bmi->bmiHeader.biBitCount <= 8) expected_aa = FALSE; text_color = GetTextColor( hdc ); for (i = 0; i < strlen(str); i++) { - DWORD ggo_flags = aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; + DWORD ggo_flags = expected_aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; ret = GetGlyphOutlineA( hdc, str[i], ggo_flags, &gm, 0, NULL, &identity ); @@ -3075,7 +3075,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) if (!ret) continue; - if (aa) + if (expected_aa) { stride = (gm.gmBlackBoxX + 3) & ~3; @@ -3114,7 +3114,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) } diy_hash = hash_dib( hdc, bmi, bits ); - ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - aa %d\n", aa ); + ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - quality %#x, expected_aa %d\n", quality, expected_aa ); HeapFree( GetProcessHeap(), 0, diy_hash ); HeapFree( GetProcessHeap(), 0, eto_hash ); @@ -3125,14 +3125,43 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) static void draw_text( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) { - draw_text_2( hdc, bmi, bits, FALSE ); + UINT smoothing, type; + BOOL ret; + + draw_text_2( hdc, bmi, bits, NONANTIALIASED_QUALITY, FALSE ); + + ret = SystemParametersInfoA(SPI_GETFONTSMOOTHING, 0, &smoothing, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, 0, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + draw_text_2( hdc, bmi, bits, DEFAULT_QUALITY, FALSE ); /* Rounding errors make these cases hard to test */ if ((bmi->bmiHeader.biCompression == BI_BITFIELDS && ((DWORD*)bmi->bmiColors)[0] == 0x3f000) || (bmi->bmiHeader.biBitCount == 16)) + { + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); return; + } + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, 1, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + ret = SystemParametersInfoA(SPI_GETFONTSMOOTHINGTYPE, 0, &type, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)FE_FONTSMOOTHINGSTANDARD, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + draw_text_2( hdc, bmi, bits, DEFAULT_QUALITY, TRUE ); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)(ULONG_PTR)type, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); - draw_text_2( hdc, bmi, bits, TRUE ); + draw_text_2( hdc, bmi, bits, ANTIALIASED_QUALITY, TRUE ); } static void test_simple_graphics(void) -- 2.28.0

Dec. 3, 2020

[PATCH v3 6/7] winex11.drv: Do not override AA flags in xrenderdrv_SelectFont().

by Paul Gofman

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - replaced [PATCH v2 4/6] winex11.drv: Do not set AA flags for font default AA in xrender backend, so device aa_flags get correct value. dlls/winex11.drv/xrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index dc3bed2bfa0..be6db468e3c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -892,10 +892,10 @@ static HFONT CDECL xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_fla HFONT ret; GetObjectW( hfont, sizeof(lfsz.lf), &lfsz.lf ); - if (!*aa_flags) *aa_flags = get_xft_aa_flags( &lfsz.lf ); ret = next->funcs->pSelectFont( next, hfont, aa_flags ); if (!ret) return 0; + if (!*aa_flags) *aa_flags = get_xft_aa_flags( &lfsz.lf ); switch (*aa_flags) { -- 2.28.0

Dec. 3, 2020

[PATCH v3 5/7] gdi32: Update default font AA parameters on system parameters update.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - add default value for subpixel_orientation; - don't take font_cs inside update_font_options(). dlls/gdi32/font.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3ff6c6ef3f6..91703a85cb6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); static HKEY wine_fonts_key; static HKEY wine_fonts_cache_key; +static HKEY volatile_parameters_key; +static HANDLE volatile_parameters_changed_event; struct font_physdev { @@ -98,6 +100,8 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static void update_font_options(void); + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -3764,6 +3768,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) default: if (!(*aa_flags = font->aa_flags)) { + update_font_options(); *aa_flags = lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY ? subpixel_orientation : font_smoothing; } @@ -3944,6 +3949,9 @@ static void init_font_options(void) antialias_fakes = (wcschr(L"yYtT1", buffer[0]) != NULL); } + font_smoothing = GGO_BITMAP; + subpixel_orientation = WINE_GGO_HRGB_BITMAP; + if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) { RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", @@ -3992,6 +4000,26 @@ static void init_font_options(void) TRACE("gamma %d\n", font_gamma_ramp.gamma); } +/* font_cs must be held by the caller */ +static void update_font_options(void) +{ + if (!volatile_parameters_key) + { + if (RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", + &volatile_parameters_key )) + return; + volatile_parameters_changed_event = CreateEventA( NULL, FALSE, TRUE, NULL ); + } + if (WaitForSingleObject( volatile_parameters_changed_event, 0 ) == WAIT_OBJECT_0) + { + if (RegNotifyChangeKeyValue( volatile_parameters_key, FALSE, + REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_THREAD_AGNOSTIC, + volatile_parameters_changed_event, TRUE)) + ERR("Error registering registry change notification.\n"); + + init_font_options(); + } +} static void FONT_LogFontAToW( const LOGFONTA *fontA, LPLOGFONTW fontW ) { -- 2.28.0

Dec. 3, 2020

[PATCH v3 4/7] gdi32: Consolidate aa_flags estimation in font_SelectFont().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - added patch. dlls/gdi32/font.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c952495f7da..3ff6c6ef3f6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3713,16 +3713,6 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) BOOL can_use_bitmap = !!(GetDeviceCaps( dc->hSelf, TEXTCAPS ) & TC_RA_ABLE); GetObjectW( hfont, sizeof(lf), &lf ); - switch (lf.lfQuality) - { - case NONANTIALIASED_QUALITY: - if (!*aa_flags) *aa_flags = GGO_BITMAP; - break; - case ANTIALIASED_QUALITY: - if (!*aa_flags) *aa_flags = GGO_GRAY4_BITMAP; - break; - } - lf.lfWidth = abs(lf.lfWidth); TRACE( "%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", @@ -3763,15 +3753,23 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (font && !*aa_flags) { - *aa_flags = font->aa_flags; - if (!*aa_flags) + switch (lf.lfQuality) { - if (lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY) - *aa_flags = subpixel_orientation; - else - *aa_flags = font_smoothing; + case NONANTIALIASED_QUALITY: + *aa_flags = GGO_BITMAP; + break; + case ANTIALIASED_QUALITY: + *aa_flags = GGO_GRAY4_BITMAP; + break; + default: + if (!(*aa_flags = font->aa_flags)) + { + *aa_flags = lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY + ? subpixel_orientation : font_smoothing; + } + *aa_flags = font_funcs->get_aa_flags( font, *aa_flags, antialias_fakes ); + break; } - *aa_flags = font_funcs->get_aa_flags( font, *aa_flags, antialias_fakes ); } TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); LeaveCriticalSection( &font_cs ); -- 2.28.0

Dec. 3, 2020

[PATCH v3 3/7] gdi32: Handle Wine specific vertical orientations in init_font_options().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9c24182c57e..c952495f7da 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3936,7 +3936,7 @@ static DWORD get_key_value( HKEY key1, HKEY key2, const WCHAR *name, DWORD *valu static void init_font_options(void) { HKEY key, volatile_key = NULL; - DWORD i, type, size, val, gamma = 1400; + DWORD i, type, size, val, gamma = 1400, vertical = 0; WCHAR buffer[20]; size = sizeof(buffer); @@ -3950,16 +3950,18 @@ static void init_font_options(void) { RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", &volatile_key ); - /* FIXME: handle vertical orientations even though Windows doesn't */ + + get_key_value( volatile_key, key, L"WineFontSmoothingVertical", &vertical ); + if (!get_key_value( volatile_key, key, L"FontSmoothingOrientation", &val )) { switch (val) { case 0: /* FE_FONTSMOOTHINGORIENTATIONBGR */ - subpixel_orientation = WINE_GGO_HBGR_BITMAP; + subpixel_orientation = vertical ? WINE_GGO_VBGR_BITMAP : WINE_GGO_HBGR_BITMAP; break; case 1: /* FE_FONTSMOOTHINGORIENTATIONRGB */ - subpixel_orientation = WINE_GGO_HRGB_BITMAP; + subpixel_orientation = vertical ? WINE_GGO_VRGB_BITMAP : WINE_GGO_HRGB_BITMAP; break; } } -- 2.28.0

Dec. 3, 2020

[PATCH v3 2/7] winex11.drv: Init font smoothing system default parameters in X11DRV_XRender_Init().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - use WineFontSmoothingVertical registry value name. dlls/winex11.drv/xrender.c | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3376cee517d..dc3bed2bfa0 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -32,6 +32,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "x11drv.h" #include "winternl.h" #include "wine/unicode.h" @@ -314,6 +315,64 @@ static int load_xrender_formats(void) return count; } +static void set_default_font_smoothing(void) +{ + DWORD smoothing_type, orientation, vertical; + BOOL smoothing; + HKEY sysparam_key; + char *value; + + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + TRACE( "got antialias '%s'.\n", value ); + smoothing = !(tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !_strnicmp( value, "off", -1 )); + SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + } + else + { + if (!SystemParametersInfoA(SPI_GETFONTSMOOTHING, 0, &smoothing, 0)) + smoothing = FALSE; + } + + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "got rgba '%s'.\n", value ); + + vertical = 0; + orientation = smoothing_type = ~0u; + if (!strcmp( value, "rgb" ) || (vertical = !strcmp( value, "vrgb" ))) + { + smoothing_type = FE_FONTSMOOTHINGCLEARTYPE; + orientation = FE_FONTSMOOTHINGORIENTATIONRGB; + } + else if (!strcmp( value, "bgr" ) || (vertical = !strcmp( value, "vbgr" ))) + { + smoothing_type = FE_FONTSMOOTHINGCLEARTYPE; + orientation = FE_FONTSMOOTHINGORIENTATIONBGR; + } + else if (!strcmp( value, "none" )) + { + smoothing_type = FE_FONTSMOOTHINGSTANDARD; + } + + if (smoothing) + { + if (smoothing_type != ~0u) + SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)(ULONG_PTR)smoothing_type, 0); + if (orientation != ~0u) + SystemParametersInfoA(SPI_SETFONTSMOOTHINGORIENTATION, 0, (void *)(ULONG_PTR)orientation, 0); + } + + if (smoothing_type != ~0u && !RegOpenKeyA( HKEY_CURRENT_USER, + "Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", &sysparam_key )) + { + RegSetValueExA( sysparam_key, "WineFontSmoothingVertical", 0, REG_DWORD, (BYTE *)&vertical, sizeof(vertical) ); + RegCloseKey( sysparam_key ); + } + } +} + /*********************************************************************** * X11DRV_XRender_Init * @@ -379,6 +438,8 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) } glyphsetCache[i-1].next = -1; + set_default_font_smoothing(); + return &xrender_funcs; } -- 2.28.0

Dec. 3, 2020

[PATCH v3 1/7] gdi32: Mind temporary system parameters in init_font_options().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fa0f45ec4b..9c24182c57e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3918,23 +3918,24 @@ const struct gdi_dc_funcs font_driver = GDI_PRIORITY_FONT_DRV /* priority */ }; -static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) +static DWORD get_key_value( HKEY key1, HKEY key2, const WCHAR *name, DWORD *value ) { WCHAR buf[12]; DWORD count = sizeof(buf), type, err; - err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); - if (!err) - { - if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); - else *value = wcstol( buf, NULL, 10 ); - } - return err; + if ((err = RegQueryValueExW( key1, name, NULL, &type, (BYTE *)buf, &count )) + && (err = RegQueryValueExW( key2, name, NULL, &type, (BYTE *)buf, &count ))) + return err; + + if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); + else *value = wcstol( buf, NULL, 10 ); + + return 0; } static void init_font_options(void) { - HKEY key; + HKEY key, volatile_key = NULL; DWORD i, type, size, val, gamma = 1400; WCHAR buffer[20]; @@ -3947,8 +3948,10 @@ static void init_font_options(void) if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) { + RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", + &volatile_key ); /* FIXME: handle vertical orientations even though Windows doesn't */ - if (!get_key_value( key, L"FontSmoothingOrientation", &val )) + if (!get_key_value( volatile_key, key, L"FontSmoothingOrientation", &val )) { switch (val) { @@ -3960,18 +3963,20 @@ static void init_font_options(void) break; } } - if (!get_key_value( key, L"FontSmoothing", &val ) && val /* enabled */) + if (!get_key_value( volatile_key, key, L"FontSmoothing", &val ) && val /* enabled */) { - if (!get_key_value( key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) + if (!get_key_value( volatile_key, key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) font_smoothing = subpixel_orientation; else font_smoothing = GGO_GRAY4_BITMAP; } - if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + if (!get_key_value( volatile_key, key, L"FontSmoothingGamma", &val ) && val) { gamma = min( max( val, 1000 ), 2200 ); } RegCloseKey( key ); + if (volatile_key) + RegCloseKey( volatile_key ); } /* Calibrating the difference between the registry value and the Wine gamma value. -- 2.28.0

Dec. 3, 2020

Re: [PATCH] bcrypt: Implement RSA key pair importing.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 3, 2020

Re: [PATCH] msi: Use a string literal for empty strings.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 3, 2020