wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Hans Leidekker : wldap32/tests: Add ber_printf/scanf tests.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 842987cd12057cfe757a4a1df03945840b4cf8c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842987cd12057cfe757a4a1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:53 2021 +0200 wldap32/tests: Add ber_printf/scanf tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/tests/Makefile.in | 1 + dlls/wldap32/tests/ber.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 6df015083e8..05fe5b9af6d 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = wldap32.dll IMPORTS = wldap32 C_SRCS = \ + ber.c \ parse.c diff --git a/dlls/wldap32/tests/ber.c b/dlls/wldap32/tests/ber.c new file mode 100644 index 00000000000..56d54fa6f5a --- /dev/null +++ b/dlls/wldap32/tests/ber.c @@ -0,0 +1,72 @@ +/* + * Copyright 2021 Hans Leidekker 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 + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winldap.h> +#include <winber.h> + +#include "wine/test.h" + +static void test_ber_printf(void) +{ + int ret; + BerElement *ber; + struct berval *bv; + + ber = ber_alloc_t( 0 ); + todo_wine ok( ber == NULL, "ber_alloc_t succeeded\n" ); + + ber = ber_alloc_t( LBER_USE_DER ); + ok( ber != NULL, "ber_alloc_t failed\n" ); + + ret = ber_printf( ber, (char *)"{i}", -1 ); + todo_wine ok( !ret, "got %d\n", ret ); + + ret = ber_flatten( ber, &bv ); + ok( !ret, "got %d\n", ret ); + todo_wine ok( bv->bv_len == 12, "got %d\n", bv->bv_len ); + if (bv->bv_len == 12) ok( !memcmp( bv->bv_val, "0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff", 12 ), "got %s\n", + wine_dbgstr_an(bv->bv_val, 12) ); + ber_bvfree( bv ); + ber_free( ber, 1 ); +} + +static void test_ber_scanf(void) +{ + int ret; + BerElement *ber; + struct berval bv = { 12, (char *)"0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff" }; + int i; + + ber = ber_init( &bv ); + ok( ber != NULL, "ber_init failed\n" ); + + i = 0; + ret = ber_scanf( ber, (char *)"{i}", &i ); + ok( !ret, "got %d\n", ret ); + ok( i == -1, "got %d\n", i ); + ber_free( ber, 1 ); +} + +START_TEST(ber) +{ + test_ber_printf(); + test_ber_scanf(); +}

1 0

Hans Leidekker : include: Remove functions declarations from winldap.h that don't exist in the native header.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 62721a7db3bf03b24bde51a50dc75340a4b05ded URL: https://source.winehq.org/git/wine.git/?a=commit;h=62721a7db3bf03b24bde51a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:52 2021 +0200 include: Remove functions declarations from winldap.h that don't exist in the native header. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 + dlls/wldap32/tests/parse.c | 1 + include/Makefile.in | 1 + include/winldap.h | 12 ------------ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 63f800b5061..89d658c53ff 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -38,6 +38,7 @@ #include "lmcons.h" #include "lmapibuf.h" #include "winldap.h" +#include "winber.h" #include "adsldp_private.h" diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 9fdd4db03ad..8deebcbc6bf 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winldap.h> +#include <winber.h> #include "wine/test.h" diff --git a/include/Makefile.in b/include/Makefile.in index 9133e5c6315..3b60e1be303 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -741,6 +741,7 @@ SOURCES = \ wimgapi.h \ winapifamily.h \ winbase.h \ + winber.h \ wincodec.idl \ wincodecsdk.idl \ wincon.h \ diff --git a/include/winldap.h b/include/winldap.h index 2d41eaa3fa2..2cc29ef693c 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -632,19 +632,7 @@ ULONG CDECL ldap_value_freeW(PWCHAR*); #define ldap_value_free WINELIB_NAME_AW(ldap_value_free) ULONG CDECL ldap_value_free_len(struct berval**); -BerElement* CDECL ber_alloc_t(INT); -BERVAL* CDECL ber_bvdup(BERVAL*); -void CDECL ber_bvecfree(PBERVAL*); void CDECL ber_bvfree(BERVAL*); -ULONG CDECL ber_first_element(BerElement*,ULONG*,CHAR**); -INT CDECL ber_flatten(BerElement*,PBERVAL*); -void CDECL ber_free(BerElement*,INT); -BerElement* CDECL ber_init(BERVAL*); -ULONG CDECL ber_next_element(BerElement*,ULONG*,CHAR*); -ULONG CDECL ber_peek_tag(BerElement*,ULONG*); -INT WINAPIV ber_printf(BerElement*,PCHAR,...); -ULONG CDECL ber_skip_tag(BerElement*,ULONG*); -INT WINAPIV ber_scanf(BerElement*,PCHAR,...); ULONG CDECL LdapGetLastError(void); ULONG CDECL LdapMapErrorToWin32(ULONG);

1 0

Hans Leidekker : include: Add winber.h.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 3f25be74fc3a2c8e1cbe6cf980d0e31b617064a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f25be74fc3a2c8e1cbe6cf9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 6 15:46:51 2021 +0200 include: Add winber.h. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winber.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/include/winber.h b/include/winber.h new file mode 100644 index 00000000000..40ab0f40ed8 --- /dev/null +++ b/include/winber.h @@ -0,0 +1,37 @@ +/* + * Copyright 2021 Hans Leidekker 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 + */ + +#ifndef __WINE_WINBER_H +#define __WINE_WINBER_H + +#define LBER_ERROR (~0L) +#define LBER_DEFAULT (~0L) + +typedef int ber_int_t; +typedef unsigned int ber_tag_t; +typedef unsigned int ber_len_t; + +BerElement * CDECL ber_alloc_t( int ); +void CDECL ber_bvfree( BERVAL * ); +int CDECL ber_flatten( BerElement *, BERVAL ** ); +void CDECL ber_free( BerElement *, int ); +BerElement * CDECL ber_init( BERVAL * ); +int WINAPIV ber_printf( BerElement *, char *, ... ); +ULONG WINAPIV ber_scanf( BerElement *, char *, ... ); + +#endif /* __WINE_WINBER_H */

1 0

Hugh McMaster : reg: Remove unneeded ternary operator in RegDeleteValueW().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: fa24d458f5d9663fbefb1eb7406961b1c6ec3def URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa24d458f5d9663fbefb1eb7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 6 23:39:26 2021 +1000 reg: Remove unneeded ternary operator in RegDeleteValueW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 626fcf3b341..239bbbc672b 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -93,7 +93,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else if (value_name || value_empty) { - if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) + if (RegDeleteValueW(key, value_name)) { RegCloseKey(key); output_message(STRING_VALUE_NONEXIST);

1 0

Arkadiusz Hiler : msvcp140_1: Implement the DLL.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 9cbff7e68c6138eac567eeecbc8022ae54e7760a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbff7e68c6138eac567eeec… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:02:45 2021 +0200 msvcp140_1: Implement the DLL. This backs C++17's std::pmr implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49954 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcp140_1/Makefile.in | 7 +- dlls/msvcp140_1/msvcp140_1.c | 290 +++++++++++++++++++++++++++++++++++ dlls/msvcp140_1/msvcp140_1.spec | 14 +- dlls/msvcp140_1/tests/Makefile.in | 3 + dlls/msvcp140_1/tests/msvcp140_1.c | 305 +++++++++++++++++++++++++++++++++++++ 7 files changed, 613 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cbff7e68c6138eac567…

1 0

Arkadiusz Hiler : msvcp90: Add helpers for creating base class RTTI.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: f3f948a5a39ecff5d83f02e11256a0359624d54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f948a5a39ecff5d83f02e1… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Apr 6 17:05:10 2021 +0300 msvcp90: Add helpers for creating base class RTTI. Suggested by Piotr Caban. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 5052f433875..0c5b83f93f6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -46,7 +46,7 @@ #ifndef __x86_64__ -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -58,7 +58,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static const rtti_base_array name ## _rtti_base_array = { \ { \ @@ -122,7 +125,7 @@ static const cxx_exception_type type ## _cxx_type = { \ #else -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -134,7 +137,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + \ + static void init_ ## name ## _rtti(char *base) \ + { \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + } + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static rtti_base_array name ## _rtti_base_array = { \ { \

1 0

Piotr Caban : msvcp90: Add macro that define type_info vtable.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: 6568a8cb628e3c28839a7859c1ed7eb38fc9af92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6568a8cb628e3c28839a7859… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 6 17:05:09 2021 +0300 msvcp90: Add macro that define type_info vtable. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 32 ++++++++++++++++++++++++++++++++ dlls/msvcp90/exception.c | 32 ++------------------------------ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 02735a3c168..5052f433875 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -449,3 +449,35 @@ typedef struct } cxx_exception_type; #endif + +#define CREATE_TYPE_INFO_VTABLE\ + static void MSVCP_type_info_dtor(type_info * _this) \ +{ \ + free(_this->name); \ +} \ +\ +DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) \ +void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) \ +{ \ + if (flags & 2) \ + { \ + /* we have an array, with the number of elements stored before the first object */ \ + INT_PTR i, *ptr = (INT_PTR *)_this - 1; \ +\ + for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); \ + free(ptr); \ + } \ + else \ + { \ + MSVCP_type_info_dtor(_this); \ + if (flags & 1) free(_this); \ + } \ + return _this; \ +} \ +\ +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \ +\ +__ASM_BLOCK_BEGIN(type_info_vtables) \ + __ASM_VTABLE(type_info, \ + VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); \ +__ASM_BLOCK_END diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 8ea4e132a0f..496dd915608 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +CREATE_TYPE_INFO_VTABLE + #define CLASS_IS_SIMPLE_TYPE 1 #define CLASS_HAS_VIRTUAL_BASE_CLASS 4 @@ -65,34 +67,6 @@ extern const vtable_ptr MSVCP_bad_cast_vtable; /* ??_7range_error@std@@6B@ */ extern const vtable_ptr MSVCP_range_error_vtable; -static void MSVCP_type_info_dtor(type_info * _this) -{ - free(_this->name); -} - -/* Unexported */ -DEFINE_THISCALL_WRAPPER(MSVCP_type_info_vector_dtor,8) -void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int flags) -{ - TRACE("(%p %x)\n", _this, flags); - if (flags & 2) - { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) MSVCP_type_info_dtor(_this + i); - MSVCRT_operator_delete(ptr); - } - else - { - MSVCP_type_info_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); - } - return _this; -} - -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) - /* ??0exception@@QAE@ABQBD@Z */ /* ??0exception@@QEAA@AEBQEBD@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor,8) @@ -1022,8 +996,6 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) #endif __ASM_BLOCK_BEGIN(exception_vtables) - __ASM_VTABLE(type_info, - VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); EXCEPTION_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) VTABLE_ADD_FUNC(MSVCP_exception_what));

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_copy_uav_counter().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: c541c1e9f903b2d4d7d26e61697bd9cf38ce7dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c541c1e9f903b2d4d7d26e61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:22 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_copy_uav_counter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2738ff1a5bd..e84f88ff5f2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1273,7 +1273,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext1 *iface, ID3D11Buffer *dst_buffer, UINT dst_offset, ID3D11UnorderedAccessView *src_view) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d11_unordered_access_view *uav; struct d3d_buffer *buffer_impl; @@ -1284,7 +1284,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); wined3d_mutex_lock(); - wined3d_device_copy_uav_counter(device->wined3d_device, + wined3d_device_context_copy_uav_counter(context->wined3d_context, buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 540dcfdcc9f..c03621c706a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4812,13 +4812,13 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } -void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, +void CDECL wined3d_device_context_copy_uav_counter(struct wined3d_device_context *context, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) { - TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", - device, dst_buffer, offset, uav); + TRACE("context %p, dst_buffer %p, offset %u, uav %p.\n", + context, dst_buffer, offset, uav); - wined3d_device_context_emit_copy_uav_counter(&device->cs->c, dst_buffer, offset, uav); + wined3d_device_context_emit_copy_uav_counter(context, dst_buffer, offset, uav); } static bool resources_format_compatible(const struct wined3d_resource *src_resource, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 918e9e253cc..3ea90e0c925 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -46,7 +46,6 @@ @ cdecl wined3d_device_clear_unordered_access_view_uint(ptr ptr ptr) @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) -@ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @@ -166,6 +165,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_copy_uav_counter(ptr ptr long ptr) @ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_draw_indexed(ptr long long long long long) @ cdecl wined3d_device_context_draw_indirect(ptr ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 18dab157834..bff77b2b949 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2363,8 +2363,6 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); -void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, - struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, @@ -2557,6 +2555,8 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +void __cdecl wined3d_device_context_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *context, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_copy_uav_counter().
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: fce629235cc17d3f615aec4c067c9da6a94502da URL: https://source.winehq.org/git/wine.git/?a=commit;h=fce629235cc17d3f615aec4c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:21 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_copy_uav_counter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ef3c0c76c14..462e6d8a93b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2615,12 +2615,12 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void * wined3d_resource_release(&op->buffer->resource); } -void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, - unsigned int offset, struct wined3d_unordered_access_view *uav) +void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) { struct wined3d_cs_copy_uav_counter *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_COPY_UAV_COUNTER; op->buffer = dst_buffer; op->offset = offset; @@ -2628,7 +2628,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff wined3d_resource_acquire(&dst_buffer->resource); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3b22f7b2086..540dcfdcc9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4818,7 +4818,7 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n", device, dst_buffer, offset, uav); - wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav); + wined3d_device_context_emit_copy_uav_counter(&device->cs->c, dst_buffer, offset, uav); } static bool resources_format_compatible(const struct wined3d_resource *src_resource, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db6b6488e59..957290c7ece 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4733,8 +4733,6 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined const RECT *rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, - unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_cs_emit_flush(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4783,6 +4781,9 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_copy_uav_counter(struct wined3d_device_context *context, + struct wined3d_buffer *dst_buffer, unsigned int offset, + struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; void wined3d_device_context_emit_draw(struct wined3d_device_context *context, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count,

1 0

Zebediah Figura : ddraw: Use wined3d_device_context methods.
by Alexandre Julliard 06 Apr '21

06 Apr '21

Module: wine Branch: master Commit: e516e5e936de44016985363038ac43a9527699f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e516e5e936de440169853630… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 5 23:40:20 2021 -0500 ddraw: Use wined3d_device_context methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 5 +++-- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 31 ++++++++++++++++--------------- dlls/ddraw/executebuffer.c | 4 ++-- dlls/ddraw/surface.c | 8 ++++---- 5 files changed, 27 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e516e5e936de44016985…

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021