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

[PATCH 1/2] ntdll: Reorder DECLSPEC_NORETURN on raise_status().
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ntdll/ntdll_misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f18ab1f..0744e5a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -60,7 +60,7 @@ extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ) DECLSPEC_HIDDEN; extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; -extern void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_NORETURN DECLSPEC_HIDDEN; +DECLSPEC_NORETURN extern void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC_HIDDEN; extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; -- 2.10.0.windows.1

1 0

[PATCH 1/5] wldap32: Implement ldap_search_init_pageW.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 62 ++++++++++++++++++++++++++++++++-- dlls/wldap32/winldap_private.h | 11 +++++- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..27a8156e51 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -277,11 +277,67 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop return NULL; } -PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope, +PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (base) + { + search->base = strWtoU( base ); + if (!search->base) goto fail; + } + if (filter) + { + search->filter = strWtoU( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarrayWtoU( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controlWtoU( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarrayWtoU( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..7145260aca 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; -typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +typedef struct ldapsearch +{ + char *base, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControl **serverctrls; + LDAPControl **clientctrls; + struct timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA { -- 2.25.2

2 1

[PATCH 0/6] dxgi: Implement waitable swap chain for D3D12.
by Philip Rebohle 15 Apr '20

15 Apr '20

This series implements DXGI 1.3 frame latency events for D3D12 swap chains, which is used by Resident Evil 2/3, and is required for Monster Hunter World. The implementation just signals a D3D12 fence after presenting, and uses its SetEventOnCompletion function to signal the event, which doesn't necessarily happen after the Vulkan present operation has finished on the GPU, but will always happen after the command buffer that blits the back buffer to the Vulkan swap chain image has finished execution, so it should be good enough, since the D3D12 app does not have direct access to the Vulkan swap chain. - Philip

2 8

[PATCH] winnt.h: Add __readgsqword declaration.
by Jacek Caban 15 Apr '20

15 Apr '20

pragma intrinsic is meant only as an addition to C declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 3/3] winapi_test: Remove 1 MIDL_STUB_MESSAGE field exclusion, in tests.dat.
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Revert 5c033dad7991375a3d5c9abe92d454e7c9d56f77. NB: Wine never renamed this field... PSDK S03R2 and SDK 10.0.16299.0 have it. --- dlls/rpcrt4/tests/generated.c | 6 ++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index a111bb0..7dd5968 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -623,6 +623,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 97) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 98) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 104) @@ -1481,6 +1484,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 60) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 9396536..215249b 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount +MIDL_STUB_MESSAGE MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT -- 2.10.0.windows.1

1 0

[PATCH 2/3] winapi_test: Remove 3 MIDL_STUB_MESSAGE field exclusions, in tests.dat.
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 52911fc66c53816d7df1b417ca50ec25e24f9e88. --- dlls/rpcrt4/tests/generated.c | 18 ++++++++++++++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 72672cd..a111bb0 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -593,6 +593,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 48) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 56) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 60) @@ -1442,6 +1451,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 28) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 32) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 33) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 34) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 36) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 5b2be4b..9396536 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 +MIDL_STUB_MESSAGE: !UniquePtrCount MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT -- 2.10.0.windows.1

1 0

[PATCH 1/3] winapi_test: Add common headers for rpcrt4 test, in tests.dat.
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 02236f06a813a42a08fda5e40a97ba07fae9a712. --- tools/winapi/tests.dat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..5b2be4b 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -11,6 +11,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + wingdi.h %include @@ -472,6 +473,7 @@ basetsd.h winnt.h windef.h winbase.h + timezoneapi.h %include @@ -928,6 +930,10 @@ Unit tests for data structure packing %header +basetsd.h +winnt.h +windef.h + rpc.h rpcdce.h rpcdcep.h @@ -1050,6 +1056,7 @@ winnt.h windef.h wtypes.h guiddef.h + shellapi.h shtypes.h shlobj.h @@ -1230,6 +1237,7 @@ basetsd.h winnt.h windef.h wtypes.h + shlwapi.h %include @@ -1264,6 +1272,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + urlmon.h %include @@ -1321,6 +1330,7 @@ basetsd.h winnt.h windef.h winbase.h + wingdi.h winuser.h @@ -1595,6 +1605,7 @@ basetsd.h winnt.h windef.h winbase.h + wininet.h %include @@ -1736,6 +1747,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + mmsystem.h digitalv.h -- 2.10.0.windows.1

1 0

[PATCH] include: Fix DECLSPEC_NORETURN usage.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/eh.h | 4 ++-- include/msvcrt/process.h | 10 +++++----- include/msvcrt/stdlib.h | 8 ++++---- include/wine/exception.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-)

1 0

[PATCH 2/2] windowscodecs: Implement stub for DdsDecoder.
by Ziqing Hui 15 Apr '20

15 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/ddsformat.c | 227 ++++++++++++++++++ dlls/windowscodecs/regsvr.c | 23 ++ dlls/windowscodecs/tests/ddsformat.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 7 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/ddsformat.c

3 2

[PATCH 1/2] windowscodecs/tests: Add tests for DDS format.
by Ziqing Hui 15 Apr '20

15 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/ddsformat.c | 121 +++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 dlls/windowscodecs/tests/ddsformat.c

2 1