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

[PATCH 0/6] Implement QueryDisplayConfig() and GetDisplayConfigBufferSizes().
by Brendan Shanks 30 Jun '20

30 Jun '20

Implement QueryDisplayConfig() and the closely related GetDisplayConfigBufferSizes(). Thanks to Zhiyi Zhang for reviewing earlier versions of this patchset. Brendan Shanks (6): include: Add d3dkmdt.h. user32/tests: Mark DisplayConfigGetDeviceInfo() tests returning success as todo_wine. user32: Implement GetDisplayConfigBufferSizes(). user32/tests: Test additional flag values with GetDisplayConfigBufferSizes(). user32: Implement QueryDisplayConfig(). user32/tests: Add more QueryDisplayConfig() tests. dlls/user32/sysparams.c | 287 +++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 92 ++++++++++-- include/Makefile.in | 1 + include/d3dkmdt.h | 59 ++++++++ 4 files changed, 422 insertions(+), 17 deletions(-) create mode 100644 include/d3dkmdt.h -- 2.26.2

2 7

[PATCH] msvcrt: Print assertion failure messages to stderr.
by Zebediah Figura 29 Jun '20

29 Jun '20

This matches Windows behaviour. In particular, redirecting stderr with freopen() followed by assert(0) will print the failure message to the relevant file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- The motivation for this patch is that WriteConsoleW() and therefore _cwprintf() consistently swallow messages when I try to run Wine tests. I don't know if this is a bug, but it turns out there was an easier fix than trying to delve into console code... dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/scanf.c | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index f631d4d727b..cb38b35de9a 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -305,7 +305,7 @@ void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file DoMessageBoxW(assertion_failed, text); } else - _cwprintf(format_console, str, file, line); + MSVCRT_fwprintf(MSVCRT_stderr, format_console, str, file, line); MSVCRT_raise(MSVCRT_SIGABRT); MSVCRT__exit(3); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3ffc785d065..dc89c6af23e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -447,6 +447,8 @@ struct MSVCRT__iobuf { typedef struct MSVCRT__iobuf MSVCRT_FILE; +extern MSVCRT_FILE MSVCRT__iob[]; + struct MSVCRT_lconv { char* decimal_point; char* thousands_sep; @@ -1107,6 +1109,7 @@ MSVCRT___time32_t __cdecl MSVCRT__time32(MSVCRT___time32_t*); MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); +int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 04f87077e16..4b2ac2ed4a1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -35,8 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -extern MSVCRT_FILE MSVCRT__iob[]; - /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base. */ -- 2.27.0

2 1

[PATCH] winegstreamer: Don't store DirectShow caps.
by Zebediah Figura 29 Jun '20

29 Jun '20

Primarily so that we can connect using video caps that can't be translated into DirectShow caps. They will later be converted into translatable caps once the DirectShow source pin is connected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47642 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 162 ++++++++++++++++++++-------------- 1 file changed, 94 insertions(+), 68 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8f89935b82..5697d2c0e0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -78,7 +78,6 @@ struct gstdemux_source GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - AM_MEDIA_TYPE mt; HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; @@ -99,15 +98,11 @@ static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface); -static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_audio_info(const GstAudioInfo *info, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; WAVEFORMATEX *wfx; gint32 depth, bpp; - GstAudioInfo ainfo; - - if (!gst_audio_info_from_caps (&ainfo, caps)) - return FALSE; wfe = CoTaskMemAlloc(sizeof(*wfe)); wfx = (WAVEFORMATEX*)wfe; @@ -122,10 +117,10 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; - wfx->nChannels = ainfo.channels; - wfx->nSamplesPerSec = ainfo.rate; - depth = GST_AUDIO_INFO_WIDTH(&ainfo); - bpp = GST_AUDIO_INFO_DEPTH(&ainfo); + wfx->nChannels = info->channels; + wfx->nSamplesPerSec = info->rate; + depth = GST_AUDIO_INFO_WIDTH(info); + bpp = GST_AUDIO_INFO_DEPTH(info); if (!depth || depth > 32 || depth % 8) depth = bpp; @@ -144,7 +139,8 @@ static gboolean amt_from_gst_caps_audio_raw(const GstCaps *caps, AM_MEDIA_TYPE * default: wfe->dwChannelMask = 0; } - if (GST_AUDIO_INFO_IS_FLOAT(&ainfo)) { + if (GST_AUDIO_INFO_IS_FLOAT(info)) + { amt->subtype = MEDIASUBTYPE_IEEE_FLOAT; wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; } else { @@ -207,7 +203,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE bih->biBitCount = 16; break; default: - FIXME("Unhandled type %s.\n", GST_VIDEO_INFO_NAME(info)); + WARN("Cannot convert %s to a DirectShow type.\n", GST_VIDEO_INFO_NAME(info)); CoTaskMemFree(vih); return FALSE; } @@ -314,8 +310,16 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); GstStructure *structure = gst_caps_get_structure(caps, 0); + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + if (!strcmp(type, "audio/x-raw")) - return amt_from_gst_caps_audio_raw(caps, mt); + { + GstAudioInfo info; + + if (!(gst_audio_info_from_caps(&info, caps))) + return FALSE; + return amt_from_gst_audio_info(&info, mt); + } else if (!strcmp(type, "video/x-raw")) { GstVideoInfo info; @@ -331,7 +335,6 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) VIDEOINFOHEADER *vih; gint i; - memset(mt, 0, sizeof(AM_MEDIA_TYPE)); mt->majortype = MEDIATYPE_Video; mt->subtype = MEDIASUBTYPE_CVID; mt->bTemporalCompression = TRUE; @@ -466,24 +469,6 @@ static GstCaps *amt_to_gst_caps(const AM_MEDIA_TYPE *mt) return NULL; } -static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) -{ - struct gstdemux_source *pin = gst_pad_get_element_private(pad); - struct gstdemux *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - gchar *caps_str = gst_caps_to_string(caps); - - TRACE("filter %p, caps %s.\n", filter, debugstr_a(caps_str)); - g_free(caps_str); - - FreeMediaType(&pin->mt); - - if (!amt_from_gst_caps(caps, &pin->mt)) - return FALSE; - - SetEvent(pin->caps_event); - return TRUE; -} - static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); @@ -662,6 +647,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); + gboolean ret; TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); @@ -722,11 +708,10 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (pin->pin.pin.peer) IPin_EndFlush(pin->pin.pin.peer); return TRUE; - case GST_EVENT_CAPS: { - GstCaps *caps; - gst_event_parse_caps(event, &caps); - return setcaps_sink(pad, caps); - } + case GST_EVENT_CAPS: + ret = gst_pad_event_default(pad, parent, event); + SetEvent(pin->caps_event); + return ret; default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); return gst_pad_event_default(pad, parent, event); @@ -1678,6 +1663,10 @@ static HRESULT gstdecoder_source_query_accept(struct gstdemux_source *pin, const static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { + GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); + const GstStructure *structure; + const char *type; + static const GstVideoFormat video_formats[] = { /* Try to prefer YUV formats over RGB ones. Most decoders output in the @@ -1695,42 +1684,48 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, GST_VIDEO_FORMAT_BGR, }; - if (!index) + assert(caps); /* We shouldn't be able to get here if caps haven't been set. */ + structure = gst_caps_get_structure(caps, 0); + type = gst_structure_get_name(structure); + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + + if (amt_from_gst_caps(caps, mt)) { - CopyMediaType(mt, &pin->mt); - return S_OK; + if (!index--) + { + gst_caps_unref(caps); + return S_OK; + } } - else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Video) - && index - 1 < ARRAY_SIZE(video_formats)) + + if (!strcmp(type, "video/x-raw") && index < ARRAY_SIZE(video_formats)) { - const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + gint width, height; GstVideoInfo info; - gst_video_info_set_format(&info, video_formats[index - 1], - vih->bmiHeader.biWidth, vih->bmiHeader.biHeight); + gst_caps_unref(caps); + gst_structure_get_int(structure, "width", &width); + gst_structure_get_int(structure, "height", &height); + gst_video_info_set_format(&info, video_formats[index], width, height); if (!amt_from_gst_video_info(&info, mt)) return E_OUTOFMEMORY; return S_OK; } - else if (IsEqualGUID(&pin->mt.majortype, &MEDIATYPE_Audio) && index == 1) - { - const WAVEFORMATEX *our_format = (WAVEFORMATEX *)pin->mt.pbFormat; - WAVEFORMATEX *format; - - *mt = pin->mt; - mt->subtype = MEDIASUBTYPE_PCM; - mt->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)); - format = (WAVEFORMATEX *)mt->pbFormat; - format->wFormatTag = WAVE_FORMAT_PCM; - format->nChannels = 2; - format->nSamplesPerSec = our_format->nSamplesPerSec; - format->wBitsPerSample = 16; - format->nBlockAlign = 4; - format->nAvgBytesPerSec = format->nSamplesPerSec * 4; - format->cbSize = 0; + else if (!strcmp(type, "audio/x-raw") && !index) + { + GstAudioInfo info; + gint rate; + + gst_caps_unref(caps); + gst_structure_get_int(structure, "rate", &rate); + gst_audio_info_set_format(&info, GST_AUDIO_FORMAT_S16LE, rate, 2, NULL); + if (!amt_from_gst_audio_info(&info, mt)) + return E_OUTOFMEMORY; return S_OK; } + gst_caps_unref(caps); return VFW_S_NO_MORE_ITEMS; } @@ -2137,7 +2132,6 @@ static void free_source_pin(struct gstdemux_source *pin) gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); CloseHandle(pin->eos_event); - FreeMediaType(&pin->mt); gst_segment_free(pin->segment); strmbase_seeking_cleanup(&pin->seek); @@ -2394,9 +2388,24 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) return TRUE; } +static gboolean get_source_amt(const struct gstdemux_source *pin, AM_MEDIA_TYPE *mt) +{ + GstCaps *caps = gst_pad_get_current_caps(pin->my_sink); + gboolean ret = amt_from_gst_caps(caps, mt); + gst_caps_unref(caps); + return ret; +} + static HRESULT wave_parser_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; + AM_MEDIA_TYPE pad_mt; + HRESULT hr; + + if (!get_source_amt(pin, &pad_mt)) + return E_OUTOFMEMORY; + hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; + FreeMediaType(&pad_mt); + return hr; } static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, @@ -2404,7 +2413,8 @@ static HRESULT wave_parser_source_get_media_type(struct gstdemux_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(mt, &pin->mt); + if (!get_source_amt(pin, mt)) + return E_OUTOFMEMORY; return S_OK; } @@ -2507,7 +2517,14 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) static HRESULT avi_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; + AM_MEDIA_TYPE pad_mt; + HRESULT hr; + + if (!get_source_amt(pin, &pad_mt)) + return E_OUTOFMEMORY; + hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; + FreeMediaType(&pad_mt); + return hr; } static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, @@ -2515,7 +2532,8 @@ static HRESULT avi_splitter_source_get_media_type(struct gstdemux_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(mt, &pin->mt); + if (!get_source_amt(pin, mt)) + return E_OUTOFMEMORY; return S_OK; } @@ -2632,7 +2650,14 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) static HRESULT mpeg_splitter_source_query_accept(struct gstdemux_source *pin, const AM_MEDIA_TYPE *mt) { - return compare_media_types(mt, &pin->mt) ? S_OK : S_FALSE; + AM_MEDIA_TYPE pad_mt; + HRESULT hr; + + if (!get_source_amt(pin, &pad_mt)) + return E_OUTOFMEMORY; + hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; + FreeMediaType(&pad_mt); + return hr; } static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, @@ -2640,7 +2665,8 @@ static HRESULT mpeg_splitter_source_get_media_type(struct gstdemux_source *pin, { if (index > 0) return VFW_S_NO_MORE_ITEMS; - CopyMediaType(mt, &pin->mt); + if (!get_source_amt(pin, mt)) + return E_OUTOFMEMORY; return S_OK; } -- 2.27.0

1 0

[tools] winetest: Add a script to test HTTP redirection limits.
by Owen Rudge 29 Jun '20

29 Jun '20

I've written patches to implement support for WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS in winhttp; this script will be required for the tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- winetest/tests/redirecttest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 winetest/tests/redirecttest.php

1 0

[PATCH] netio.sys: Remove WINAPI on static functions where not needed.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/netio.sys/netio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 53d74f994db..fe73b06b978 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -605,7 +605,7 @@ static void WINAPI send_receive_callback(TP_CALLBACK_INSTANCE *instance, void *s unlock_socket(socket); } -static NTSTATUS WINAPI do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flags, IRP *irp, BOOL is_send) +static NTSTATUS do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flags, IRP *irp, BOOL is_send) { struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); struct wsk_pending_io *io; -- 2.20.1

3 3

[PATCH 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon 29 Jun '20

29 Jun '20

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- With the Sekiro test from last time, but injecting 2kHz mouse events to better show the differences, brings the normal FPS from ~=50fps (the missing esync series hurts badly here) down to ~=20fps on average with some catch up moments, probably when LL hooks start to timeout in batch. Patch #4 helps by doing less work in the LL hooks and using rawinput messages instead, and bring it up to ~=30fps on average, but still with the catch up moments. And with patch #5 it holds the load much better, with a steady ~=45fps thanks to the ll-hook removal. dlls/user32/tests/input.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3130f3987e3..0607f300871 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1757,6 +1757,7 @@ static void test_RegisterRawInputDevices(void) { HWND hwnd; RAWINPUTDEVICE raw_devices[1]; + UINT count, raw_devices_count; BOOL res; raw_devices[0].usUsagePage = 0x01; @@ -1783,6 +1784,42 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 1, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[0].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; -- 2.27.0

2 9

[PATCH] netio.sys: Fix some minor case issues in comments.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/netio.sys/netio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index b0ca6801799..53d74f994db 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -1,7 +1,7 @@ /* * WSK (Winsock Kernel) driver library. * - * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.20.1

2 2

[PATCH] ntoskrnl.exe/tests: Fix some minor case issues in comments.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 48de151f31f..45ea90260a8 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -1,7 +1,7 @@ /* * ntoskrnl.exe testing framework * - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index da0b02ac006..be0f58f837c 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -4,7 +4,7 @@ * Copyright 2015 Sebastian Lackner * Copyright 2015 Michael M??ller * Copyright 2015 Christian Costa - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.20.1

2 1

[PATCH] mshtml: Add a trailing '\n' to a TRACE().
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57ec662de84..d267fa6de52 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -726,7 +726,7 @@ static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); hres = return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); if(hres == S_OK && V_VT(p) == VT_BSTR && !V_BSTR(p)) { - TRACE("default #ffffff"); + TRACE("default #ffffff\n"); if(!(V_BSTR(p) = SysAllocString(L"#ffffff"))) hres = E_OUTOFMEMORY; } -- 2.20.1

2 1

[PATCH] mshtml: Fix the spelling of a parameter name.
by Francois Gouget 29 Jun '20

29 Jun '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/mshtml.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index e202dfff1ae..ba7ef0db165 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28242,7 +28242,7 @@ interface IMarkupServices2 : IMarkupServices [in] IMarkupPointer *pPointerFinish, [in] IMarkupPointer *pPointerTarget, [in, out] IMarkupPointer *pPointerStatus, - [out] IHTMLElement **ppElemFailBotton, + [out] IHTMLElement **ppElemFailBottom, [out] IHTMLElement **ppElemFailTop); HRESULT SaveSegmentsToClipboard( -- 2.20.1

2 1