- Wine-Devel - list.winehq.org

[PATCH v2 1/5] server: Create the Afd device.
by Zebediah Figura Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is inspired by Jacek's work on the console device. The idea is, similarly, to replace most direct server calls with ioctls. It may also make sense to move the socket ioctls (as well as send/recv) handled in the client to ntdll.so, in the event that they can't be moved to the server due to performance concerns. In that case they would be handled much like cdrom/serial/tape ioctls. This would allow us to move all unix I/O out of ws2_32, as well as get rid of some of the effectively duplicated code dealing with overlapped I/O. server/directory.c | 6 ++++- server/file.h | 1 + server/sock.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index 198fc48ece2..c66d10b1928 100644 --- a/server/directory.c +++ b/server/directory.c @@ -373,10 +373,12 @@ void init_directories(void) static const WCHAR mailslotW[] = {'M','a','i','l','S','l','o','t'}; static const WCHAR condrvW[] = {'C','o','n','D','r','v'}; static const WCHAR nullW[] = {'N','u','l','l'}; + static const WCHAR afdW[] = {'A','f','d'}; static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; static const struct unicode_str condrv_str = {condrvW, sizeof(condrvW)}; static const struct unicode_str null_str = {nullW, sizeof(nullW)}; + static const struct unicode_str afd_str = {afdW, sizeof(afdW)}; /* events */ static const WCHAR event_low_memW[] = {'L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; @@ -404,7 +406,7 @@ void init_directories(void) struct directory *dir_driver, *dir_device, *dir_global, *dir_kernel; struct object *link_dosdev, *link_global, *link_nul, *link_pipe, *link_mailslot; struct object *link_conin, *link_conout, *link_con; - struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device; + struct object *named_pipe_device, *mailslot_device, *null_device, *user_data_mapping, *console_device, *socket_device; struct keyed_event *keyed_event; unsigned int i; @@ -422,11 +424,13 @@ void init_directories(void) named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str ); mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str ); console_device = create_console_device( &dir_device->obj, &condrv_str ); + socket_device = create_socket_device( &dir_device->obj, &afd_str ); null_device = create_unix_device( &dir_device->obj, &null_str, "/dev/null" ); make_object_static( named_pipe_device ); make_object_static( mailslot_device ); make_object_static( null_device ); make_object_static( console_device ); + make_object_static( socket_device ); /* sessions */ create_session( 0 ); diff --git a/server/file.h b/server/file.h index b02c9fe6037..5fb4e5614b9 100644 --- a/server/file.h +++ b/server/file.h @@ -179,6 +179,7 @@ extern struct object *create_user_data_mapping( struct object *root, const struc extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ); extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ); extern struct object *create_console_device( struct object *root, const struct unicode_str *name ); +extern struct object *create_socket_device( struct object *root, const struct unicode_str *name ); extern struct object *create_unix_device( struct object *root, const struct unicode_str *name, const char *unix_path ); diff --git a/server/sock.c b/server/sock.c index 1a53ce4b091..115448574ee 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1164,6 +1164,64 @@ static void sock_release_ifchange( struct sock *sock ) } } +static struct object_type *socket_device_get_type( struct object *obj ); +static void socket_device_dump( struct object *obj, int verbose ); +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *socket_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); + +static const struct object_ops socket_device_ops = +{ + sizeof(struct ifchange), /* size */ + socket_device_dump, /* dump */ + socket_device_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_fd_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + socket_device_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + socket_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + +static struct object_type *socket_device_get_type( struct object *obj ) +{ + static const WCHAR name[] = {'D','e','v','i','c','e'}; + static const struct unicode_str str = { name, sizeof(name) }; + return get_object_type( &str ); +} + +static void socket_device_dump( struct object *obj, int verbose ) +{ + fputs( "Socket device\n", stderr ); +} + +static struct object *socket_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + return NULL; +} + +static struct object *socket_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + set_error( STATUS_NOT_IMPLEMENTED ); + return NULL; +} + +struct object *create_socket_device( struct object *root, const struct unicode_str *name ) +{ + return create_named_object( root, &socket_device_ops, name, 0, NULL ); +} + /* create a socket */ DECL_HANDLER(create_socket) { -- 2.28.0

3 7

[PATCH] msvcrt: Fix console detection in _write.
by Piotr Caban Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2] d3d10core/tests: Add test for NULL resource parameters for _CopySubresourceRegion().
by Paul Gofman Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - avoid crashing on Win2008 Warp. dlls/d3d10core/tests/d3d10core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index deb6144a4be..4332ce2dcf2 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -9819,6 +9819,15 @@ static void test_copy_subresource_region(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + if (!is_warp_device(device)) + { + /* Broken on Win2008 Warp */ + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D10Device_CopySubresourceRegion(device, NULL, 0, + 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); + } + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, (ID3D10Resource *)src_texture, 0, &box); -- 2.26.2

2 1

[PATCH vkd3d] build: Print whether we're building documentation in the configuration summary.
by Henri Verbeet Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index d5f6588f..a9db1723 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,7 @@ AC_OUTPUT dnl Output configuration summary AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) +AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) AS_ECHO([" Configuration summary for $PACKAGE $VERSION @@ -156,6 +157,7 @@ AS_ECHO([" Building demos: ${enable_demos} Building tests: ${enable_tests} + Building documentation: ${HAVE_DOCS} Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) -- 2.11.0

2 1

[PATCH 1/2] dxva2: Return some static render target formats.
by Nikolay Sivov Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- That's what it returns for software device on Windows, regardless of input format, while rejecting some. dlls/dxva2/main.c | 18 +++++++++++++++++- dlls/dxva2/tests/Makefile.in | 2 +- dlls/dxva2/tests/dxva2.c | 23 ++++++++++++++++++++++- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 22a35c4fbb3..6ebc4f00186 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -195,7 +195,23 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, UINT *count, D3DFORMAT **formats) { - FIXME("%p, %s, %p, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, count, formats); + TRACE("%p, %s, %p, %p, %p.\n", iface, debugstr_guid(deviceguid), video_desc, count, formats); + + if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) + { + /* FIXME: filter some input formats */ + + if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) + return E_OUTOFMEMORY; + + *count = 2; + (*formats)[0] = D3DFMT_X8R8G8B8; + (*formats)[1] = D3DFMT_A8R8G8B8; + + return S_OK; + } + else + FIXME("Unsupported device %s.\n", debugstr_guid(deviceguid)); return E_NOTIMPL; } diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in index c86c5ab42fc..ccd03940a24 100644 --- a/dlls/dxva2/tests/Makefile.in +++ b/dlls/dxva2/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxva2.dll -IMPORTS = dxva2 user32 d3d9 +IMPORTS = dxva2 user32 d3d9 ole32 C_SRCS = \ dxva2.c diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 58b0231420d..f5b28ed3f8d 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -82,13 +82,16 @@ static void test_device_manager(void) IDirectXVideoProcessorService *processor_service; IDirectXVideoAccelerationService *accel_service; IDirect3DDevice9 *device, *device2, *device3; + IDirectXVideoProcessorService *proc_service; IDirect3DDeviceManager9 *manager; IDirect3DSurface9 *surfaces[2]; + DXVA2_VideoDesc video_desc; int refcount, refcount2; HANDLE handle, handle1; + D3DFORMAT *formats; + UINT token, count; IDirect3D9 *d3d; HWND window; - UINT token; HRESULT hr; RECT rect; @@ -297,6 +300,24 @@ static void test_device_manager(void) IDirectXVideoAccelerationService_Release(accel_service); + /* RT formats. */ + hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoProcessorService, (void **)&proc_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&video_desc, 0, sizeof(video_desc)); + video_desc.SampleWidth = 64; + video_desc.SampleHeight = 64; + video_desc.Format = D3DFMT_A8R8G8B8; + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count, "Unexpected format count %u.\n", count); + CoTaskMemFree(formats); + + IDirectXVideoProcessorService_Release(proc_service); + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.28.0

1 1

[PATCH v5 2/2] msvcrt: Test .{O|A}CP locale string.
by Piotr Caban Sept. 18, 2020

Sept. 18, 2020

From: Paul Gofman <pgofman(a)codeweavers.com> Used by Marvel's Avengers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/locale.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)

1 0

[PATCH v5 1/2] msvcrt: Use default user locale when only codepage is passed to setlocale.
by Piotr Caban Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - fix implementation and tests for Unicode only locales dlls/msvcrt/locale.c | 172 ++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 101 deletions(-)

1 0

[PATCH] msasn1: Fix buffer allocations.
by Piotr Caban Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msasn1/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH v4 1/2] msvcrt: Use default user locale when only codepage is passed to setlocale.
by Piotr Caban Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- Supersedes 192842. dlls/msvcrt/locale.c | 174 ++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 101 deletions(-)

2 2

[PATCH] msvcp90: Add manifest.
by Dmitry Timoshkov Sept. 18, 2020

Sept. 18, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcp90/Makefile.in | 2 ++ dlls/msvcp90/msvcp90.manifest | 7 +++++++ dlls/msvcp90/msvcp90.rc | 22 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 dlls/msvcp90/msvcp90.manifest create mode 100644 dlls/msvcp90/msvcp90.rc diff --git a/dlls/msvcp90/Makefile.in b/dlls/msvcp90/Makefile.in index b7e7b73423..b4034fc3f0 100644 --- a/dlls/msvcp90/Makefile.in +++ b/dlls/msvcp90/Makefile.in @@ -13,3 +13,5 @@ C_SRCS = \ misc.c \ msvcp_main.c \ string.c + +RC_SRCS = msvcp90.rc diff --git a/dlls/msvcp90/msvcp90.manifest b/dlls/msvcp90/msvcp90.manifest new file mode 100644 index 0000000000..588a0fd7b4 --- /dev/null +++ b/dlls/msvcp90/msvcp90.manifest @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="msvcr90.dll"/> + <file name="msvcp90.dll"/> + <file name="msvcm90.dll"/> +</assembly> diff --git a/dlls/msvcp90/msvcp90.rc b/dlls/msvcp90/msvcp90.rc new file mode 100644 index 0000000000..61a58daf45 --- /dev/null +++ b/dlls/msvcp90/msvcp90.rc @@ -0,0 +1,22 @@ +/* + * Resource file for msvcp90 + * + * Copyright 2020 Dmitry Timoshkov + * + * 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 + */ + +/* @makedep: msvcp90.manifest */ +WINE_MANIFEST 24 msvcp90.manifest -- 2.26.2

1 0