July 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] server: Only remove non-listening fd from poll
by David Koolhoven July 9, 2021

July 9, 2021

This makes sure we poll listening non-connection file descriptors even if the event is POLLERR or POLLHUP. Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index befa9117c13..ce2f390ec05 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1024,7 +1024,7 @@ static void sock_poll_event( struct fd *fd, int event ) fprintf(stderr, "socket %p select event: %x\n", sock, event); /* we may change event later, remove from loop here */ - if (event & (POLLERR|POLLHUP)) set_fd_events( sock->fd, -1 ); + if (event & (POLLERR|POLLHUP) && sock->state != SOCK_LISTENING) set_fd_events( sock->fd, -1 ); switch (sock->state) { -- 2.32.0

4 6

[PATCH v2 1/4] include: Add d2d1effects.idl with defines for D2D12DAffineTransform.
by Ziqing Hui July 9, 2021

July 9, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Make the new IDL file only contain defines for D2D12DAffineTransform. Defines for other built in effects will be added in the future. include/Makefile.in | 1 + include/d2d1_1.idl | 1 + include/d2d1effects.idl | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100755 include/d2d1effects.idl diff --git a/include/Makefile.in b/include/Makefile.in index 61a74a210c9..138693c8907 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ SOURCES = \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ + d2d1effects.idl \ d2dbasetypes.h \ d2derr.h \ d3d.h \ diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 257a970968f..fdec8ae5f9c 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -17,6 +17,7 @@ */ import "d2d1.idl"; +import "d2d1effects.idl"; interface ID2D1DeviceContext; interface ID2D1PathGeometry1; diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl new file mode 100755 index 00000000000..7f76c255ea6 --- /dev/null +++ b/include/d2d1effects.idl @@ -0,0 +1,47 @@ +/* + * Copyright 2021 Ziqing Hui for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Built in effect CLSIDs */ +cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") + +typedef enum D2D1_BORDER_MODE +{ + D2D1_BORDER_MODE_SOFT = 0, + D2D1_BORDER_MODE_HARD = 1, + D2D1_BORDER_MODE_FORCE_DWORD = 0xffffffff +} D2D1_BORDER_MODE; + +typedef enum D2D1_2DAFFINETRANSFORM_PROP +{ + D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE = 0, + D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE = 1, + D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX = 2, + D2D1_2DAFFINETRANSFORM_PROP_SHARPNESS = 3, + D2D1_2DAFFINETRANSFORM_PROP_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_PROP; + +typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE +{ + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR = 0, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR = 1, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC = 2, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR = 3, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC = 4, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC = 5, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff +} D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE; -- 2.25.1

2 6

[PATCH] include: Add some function declarations in propvarutil.h
by Biswapriyo Nath July 9, 2021

July 9, 2021

1 0

[PATCH 3/3] gdi32: Use NtGdiCreateClientObj for enhmetafile objects.
by Jacek Caban July 9, 2021

July 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmetafile.c | 49 +++++++++++++++++++++++++++---------- dlls/gdi32/tests/metafile.c | 10 ++++++++ 2 files changed, 46 insertions(+), 13 deletions(-)

2 1

[PATCH 2/3] gdi32: Use NtGdiCreateClientObj for metafile objects.
by Jacek Caban July 9, 2021

July 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi_private.h | 28 +++++++++++++ dlls/gdi32/gdiobj.c | 24 +++++++++++ dlls/gdi32/metafile.c | 83 +++++++++++++++++++++++-------------- dlls/gdi32/objects.c | 14 +++++++ dlls/gdi32/tests/metafile.c | 10 +++++ include/ntgdi.h | 1 + 6 files changed, 128 insertions(+), 32 deletions(-) create mode 100644 dlls/gdi32/gdi_private.h

2 1

[PATCH 1/3] gdi32: Rename gdi_private.h to ntgdi_private.h.
by Jacek Caban July 9, 2021

July 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We will need gdi_private.h for things that will stay in gdi32.dll. dlls/gdi32/bidi.c | 2 +- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/brush.c | 2 +- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/dibdrv/opengl.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 2 +- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/icm.c | 2 +- dlls/gdi32/mapping.c | 2 +- dlls/gdi32/metafile.c | 2 +- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/{gdi_private.h => ntgdi_private.h} | 6 +++--- dlls/gdi32/opengl.c | 2 +- dlls/gdi32/opentype.c | 2 +- dlls/gdi32/painting.c | 2 +- dlls/gdi32/palette.c | 2 +- dlls/gdi32/path.c | 2 +- dlls/gdi32/pen.c | 2 +- dlls/gdi32/printdrv.c | 2 +- dlls/gdi32/region.c | 2 +- dlls/gdi32/vulkan.c | 2 +- 37 files changed, 39 insertions(+), 39 deletions(-) rename dlls/gdi32/{gdi_private.h => ntgdi_private.h} (99%)

2 1

[PATCH] winex11.drv: Don't free cached DnD data after informing an application about the drop event.
by Dmitry Timoshkov July 9, 2021

July 9, 2021

If an application in its IDropTarget::Drop() implementation saves the passed in IDataObject and later calls IDataObject::GetData() it fails because global cached data is no longer available. Another solution is to create a copy of global data and save it inside of IDataObject, but since all data including item contents is global anyway this doesn't seem worth the trouble. Global cahed data will be freed in next X11DRV_XDND_EnterEvent(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winex11.drv/xdnd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0cd2ad88924..9472d9966bb 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -476,8 +476,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("effectRequested(0x%x) accept(%d) performed(0x%x) at x(%d),y(%d)\n", XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y); - X11DRV_XDND_FreeDragDropOp(); - /* Tell the target we are finished. */ memset(&e, 0, sizeof(e)); e.type = ClientMessage; -- 2.31.1

1 0

[PATCH 1/3] conhost: Copy font width/height to the new screen buffer to prevent an unhandled exception (divide by zero)
by Hugh McMaster July 9, 2021

July 9, 2021

CreateConsoleScreenBuffer() copies properties relating to the current console font to the new screen buffer when called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187 Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/conhost.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7db1261d3be..adcfe00d7e9 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -92,10 +92,12 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int if (console->active) { - screen_buffer->max_width = console->active->max_width; - screen_buffer->max_height = console->active->max_height; - screen_buffer->win.right = console->active->win.right - console->active->win.left; - screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + screen_buffer->max_width = console->active->max_width; + screen_buffer->max_height = console->active->max_height; + screen_buffer->win.right = console->active->win.right - console->active->win.left; + screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + screen_buffer->font.width = console->active->font.width; + screen_buffer->font.height = console->active->font.height; } else { -- 2.32.0

2 4

[PATCH] reg/tests: Add registry view syntax tests for the 'import' operation
by Hugh McMaster July 9, 2021

July 9, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/import.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 976dd381f07..ffc29d5cf1b 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -130,6 +130,15 @@ static void test_command_syntax(void) run_reg_exe("reg import a.reg b.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import foo.reg /reg:32 /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import foo.reg /reg:32 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import foo.reg /reg:64 /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_import(void) -- 2.32.0

1 0

[PATCH 6/6] iphlpapi: Return the TCPIP device name in MIB_IFROW.
by Huw Davies July 9, 2021

July 9, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 7 ++++--- dlls/iphlpapi/tests/iphlpapi.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dac84ee2afb..4ff9feb57f2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1736,12 +1736,13 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) return IfIndex; } -static void if_counted_string_copy( WCHAR *dst, unsigned int len, IF_COUNTED_STRING *src ); - static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - if_counted_string_copy( row->wszName, ARRAY_SIZE(row->wszName), &rw->alias ); + static const WCHAR name_prefix[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; + + memcpy( row->wszName, name_prefix, sizeof(name_prefix) ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(name_prefix) - 1, CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1e8950f3482..893d6041287 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -275,7 +275,6 @@ static void testGetIfTable(void) guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); -todo_wine ok( !wcscmp( row->wszName, name ), "got %s vs %s\n", debugstr_w( row->wszName ), debugstr_w( name ) ); } } -- 2.23.0

1 0