- wine-devel - winehq.org

[PATCH 5/8] gdi32: Use NtGdiGetTextMetricsW for GetTextMetrics.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 16 ++----------- dlls/gdi32/text.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 14 deletions(-)

2 1

[PATCH 4/8] gdi32: Use NtGdiGetTextExtentExPointW for GetTextExtentExPoint.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 215 ++-------------------------------------------- dlls/gdi32/text.c | 95 ++++++++++++++++++++ include/ntgdi.h | 4 +- 3 files changed, 107 insertions(+), 207 deletions(-)

2 1

[PATCH 3/8] gdi32: Use NtGdiGetTextFaceW for GetTextFace.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 33 ++------------------------------- dlls/gdi32/text.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 2 +- 3 files changed, 39 insertions(+), 32 deletions(-)

2 1

[PATCH 2/8] gdi32: Move GetCharacterPlacementA to text.c.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 53 ----------------------------------------------- dlls/gdi32/text.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 53 deletions(-)

2 1

[PATCH 1/8] gdi32: Move ExtTextOutW wrappers to text.c.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 111 ---------------------------------------- dlls/gdi32/text.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 111 deletions(-)

2 1

[PATCH v2] nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS
by Gerald Pfeifer 20 Aug '21

20 Aug '21

We try to use libprocstat on non-Linux platforms and detect its presence in the configure phase. Make sure we actually link this library in that case by adding $(PROCSTAT_LIBS) to EXTRALIBS. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index cee4b72c33f..183a6374144 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,5 +1,6 @@ MODULE = nsiproxy.sys IMPORTS = ntoskrnl uuid +EXTRALIBS = $(PROCSTAT_LIBS) EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ -- 2.31.1

2 1

[PATCH] nsiproxy: Include sys/types.h from udp.c
by Gerald Pfeifer 20 Aug '21

20 Aug '21

This addresses failures like In file included from dlls/nsiproxy.sys/udp.c:34: In file included from /usr/include/sys/socketvar.h:38: In file included from /usr/include/sys/selinfo.h:36: /usr/include/sys/event.h:77:2: error: unknown type name 'u_short' on non-Linux platforms. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index b6109ef9592..9f9966815c2 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -22,6 +22,10 @@ #include <stdarg.h> #include <stddef.h> +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif -- 2.31.1

2 1

[PATCH v7] server: Implement file access hints using posix_fadvise
by Luke Deller 20 Aug '21

20 Aug '21

Implement file access pattern hints for sequential or random file access using posix_fadvise if available. On Linux this will influence the kernel's readahead behaviour. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- v7: - missed a file: include/config.h.in - avoid warning about unused variable if HAVE_POSIX_FADVISE not defined --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/fd.c | 12 ++++++++++++ 4 files changed, 17 insertions(+) diff --git a/configure b/configure index cc4f64347f1..3197f07f02b 100755 --- a/configure +++ b/configure @@ -18010,6 +18010,7 @@ for ac_func in \ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/configure.ac b/configure.ac index cb8fa573c37..361da0428cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2186,6 +2186,7 @@ AC_CHECK_FUNCS(\ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/include/config.h.in b/include/config.h.in index b1918d46ed1..2b488894a49 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -513,6 +513,9 @@ /* Define to 1 if you have the <port.h> header file. */ #undef HAVE_PORT_H +/* Define to 1 if you have the `posix_fadvise' function. */ +#undef HAVE_POSIX_FADVISE + /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL diff --git a/server/fd.c b/server/fd.c index de7c5d7e36d..56a63c5c798 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1882,6 +1882,9 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam int root_fd = -1; int rw_mode; char *path; +#ifdef HAVE_POSIX_FADVISE + unsigned int cache_hint; +#endif if (((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) || ((options & FILE_DIRECTORY_FILE) && (flags & O_TRUNC))) @@ -2026,6 +2029,15 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam free( closed_fd ); fd->cacheable = 1; } + +#ifdef HAVE_POSIX_FADVISE + cache_hint = options & (FILE_SEQUENTIAL_ONLY | FILE_RANDOM_ACCESS); + if (cache_hint == FILE_SEQUENTIAL_ONLY) + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_SEQUENTIAL ); + else if (cache_hint == FILE_RANDOM_ACCESS) + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_RANDOM ); +#endif + if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ return fd; -- 2.25.1

1 0

[PATCH] oleaut32/typelib: Remove explicit check already handled by the loop condition.
by Nikolay Sivov 20 Aug '21

20 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0526af0abdb..ac326afe1a1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7216,7 +7216,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT *pArgErr) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - int i; + int i, j; unsigned int var_index; TYPEKIND type_kind; HRESULT hres; @@ -7323,15 +7323,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( src_arg = NULL; - if (cNamedArgs) + for (j = 0; j < cNamedArgs; j++) { - USHORT j; - for (j = 0; j < cNamedArgs; j++) - if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) - { - src_arg = &pDispParams->rgvarg[j]; - break; - } + if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) + { + src_arg = &pDispParams->rgvarg[j]; + break; + } } if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) @@ -7400,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { SAFEARRAYBOUND bound; VARIANT *v; - LONG j; + bound.lLbound = 0; bound.cElements = pDispParams->cArgs-i; if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) @@ -7585,7 +7583,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( i == func_desc->cParams-1) { SAFEARRAY *a = V_ARRAY(prgpvarg[i]); - LONG j, ubound; + LONG ubound; VARIANT *v; hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK) -- 2.32.0

1 0

[PATCH v6] server: Implement file access hints using posix_fadvise
by Luke Deller 20 Aug '21

20 Aug '21

Implement file access pattern hints for sequential or random file access using posix_fadvise if available. On Linux this will influence the kernel's readahead behaviour. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- v6: Use a configure check rather than _POSIX_C_SOURCE macro check to see if posix_fadvise is available --- configure | 1 + configure.ac | 1 + server/fd.c | 10 ++++++++++ 3 files changed, 12 insertions(+) diff --git a/configure b/configure index cc4f64347f1..3197f07f02b 100755 --- a/configure +++ b/configure @@ -18010,6 +18010,7 @@ for ac_func in \ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/configure.ac b/configure.ac index cb8fa573c37..361da0428cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2186,6 +2186,7 @@ AC_CHECK_FUNCS(\ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/server/fd.c b/server/fd.c index de7c5d7e36d..7c101fde2e0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1882,6 +1882,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam int root_fd = -1; int rw_mode; char *path; + unsigned int cache_hint; if (((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) || ((options & FILE_DIRECTORY_FILE) && (flags & O_TRUNC))) @@ -2026,6 +2027,15 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam free( closed_fd ); fd->cacheable = 1; } + +#ifdef HAVE_POSIX_FADVISE + cache_hint = options & (FILE_SEQUENTIAL_ONLY | FILE_RANDOM_ACCESS); + if (cache_hint == FILE_SEQUENTIAL_ONLY) + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_SEQUENTIAL ); + else if (cache_hint == FILE_RANDOM_ACCESS) + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_RANDOM ); +#endif + if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ return fd; -- 2.25.1

1 0

[PATCH] tools/winedump: enhanced dumping function attributes for CodeView
by Eric Pouech 20 Aug '21

20 Aug '21

- added a couple of more calling conventions defines - renamed, in CV records, 'call' field into 'callconv' for clarity Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 8 +++---- include/cvconst.h | 3 +++ include/wine/mscvpdb.h | 8 +++---- tools/winedump/msc.c | 56 ++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ddb094f4591..a5e6fd12449 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1295,7 +1295,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, break; case LF_PROCEDURE_V1: - symt = codeview_new_func_signature(ctp, existing, type->procedure_v1.call); + symt = codeview_new_func_signature(ctp, existing, type->procedure_v1.callconv); if (details) { codeview_add_type(curr_type, symt); @@ -1306,7 +1306,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, } break; case LF_PROCEDURE_V2: - symt = codeview_new_func_signature(ctp, existing,type->procedure_v2.call); + symt = codeview_new_func_signature(ctp, existing,type->procedure_v2.callconv); if (details) { codeview_add_type(curr_type, symt); @@ -1321,7 +1321,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - symt = codeview_new_func_signature(ctp, existing, type->mfunction_v1.call); + symt = codeview_new_func_signature(ctp, existing, type->mfunction_v1.callconv); if (details) { codeview_add_type(curr_type, symt); @@ -1335,7 +1335,7 @@ static struct symt* codeview_parse_one_type(struct codeview_type_parse* ctp, /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ - symt = codeview_new_func_signature(ctp, existing, type->mfunction_v2.call); + symt = codeview_new_func_signature(ctp, existing, type->mfunction_v2.callconv); if (details) { codeview_add_type(curr_type, symt); diff --git a/include/cvconst.h b/include/cvconst.h index 39829c73592..95fdc9c73e5 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -720,6 +720,9 @@ typedef enum CV_call_e CV_CALL_TRICALL, CV_CALL_SH5CALL, CV_CALL_M32RCALL, + CV_CALL_CLRCALL, + CV_CALL_INLINE, + CV_CALL_NEAR_VECTOR, CV_CALL_RESERVED, } CV_call_e; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 433a80fd8f4..40b2a32f411 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -308,7 +308,7 @@ union codeview_type unsigned short int len; short int id; unsigned short int rvtype; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short int params; unsigned short int arglist; @@ -319,7 +319,7 @@ union codeview_type unsigned short int len; short int id; unsigned int rvtype; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short int params; unsigned int arglist; @@ -332,7 +332,7 @@ union codeview_type unsigned short int rvtype; unsigned short int class_type; unsigned short int this_type; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short int params; unsigned short int arglist; @@ -346,7 +346,7 @@ union codeview_type unsigned int rvtype; unsigned int class_type; unsigned this_type; - unsigned char call; + unsigned char callconv; unsigned char funcattr; unsigned short params; unsigned int arglist; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index f2eabf31024..67f7de14e78 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -410,6 +410,49 @@ static const char* get_language(unsigned l) return lang; } +static const char* get_callconv(unsigned cc) +{ + const char* callconv; + + switch (cc) + { + case CV_CALL_NEAR_C: callconv = "near C"; break; + case CV_CALL_FAR_C: callconv = "far C"; break; + case CV_CALL_NEAR_PASCAL: callconv = "near pascal"; break; + case CV_CALL_FAR_PASCAL: callconv = "far pascal"; break; + case CV_CALL_NEAR_FAST: callconv = "near fast"; break; + case CV_CALL_FAR_FAST: callconv = "far fast"; break; + case CV_CALL_SKIPPED: callconv = "skipped"; break; + case CV_CALL_NEAR_STD: callconv = "near std"; break; + case CV_CALL_FAR_STD: callconv = "far std"; break; + case CV_CALL_NEAR_SYS: callconv = "near sys"; break; + case CV_CALL_FAR_SYS: callconv = "far sys"; break; + case CV_CALL_THISCALL: callconv = "this call"; break; + case CV_CALL_MIPSCALL: callconv = "mips call"; break; + case CV_CALL_GENERIC: callconv = "generic"; break; + case CV_CALL_ALPHACALL: callconv = "alpha call"; break; + case CV_CALL_PPCCALL: callconv = "ppc call"; break; + case CV_CALL_SHCALL: callconv = "sh call"; break; + case CV_CALL_ARMCALL: callconv = "arm call"; break; + case CV_CALL_AM33CALL: callconv = "am33 call"; break; + case CV_CALL_TRICALL: callconv = "tri call"; break; + case CV_CALL_SH5CALL: callconv = "sh5 call"; break; + case CV_CALL_M32RCALL: callconv = "m32r call"; break; + case CV_CALL_CLRCALL: callconv = "clr call"; break; + case CV_CALL_INLINE: callconv = "inline"; break; + case CV_CALL_NEAR_VECTOR: callconv = "near vector"; break; + case CV_CALL_RESERVED: callconv = "reserved"; break; + default: + { + static char tmp[16]; + sprintf(tmp, "callconv=%x", cc); + callconv = tmp; + } + break; + } + return callconv; +} + static void do_field(const unsigned char* start, const unsigned char* end) { /* @@ -883,26 +926,25 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type break; case LF_PROCEDURE_V1: - /* FIXME: unknown could be the calling convention for the proc */ - printf("\t%x => Procedure V1 ret_type:%x call:%x attr:%s (#%u args_type:%x)\n", + printf("\t%x => Procedure V1 ret_type:%x callconv:%s attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v1.rvtype, - type->procedure_v1.call, get_funcattr(type->procedure_v1.funcattr), + get_callconv(type->procedure_v1.callconv), get_funcattr(type->procedure_v1.funcattr), type->procedure_v1.params, type->procedure_v1.arglist); break; case LF_PROCEDURE_V2: - printf("\t%x => Procedure V2 ret_type:%x unk:%x attr:%s (#%u args_type:%x)\n", + printf("\t%x => Procedure V2 ret_type:%x callconv:%s attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v2.rvtype, - type->procedure_v2.call, get_funcattr(type->procedure_v2.funcattr), + get_callconv(type->procedure_v2.callconv), get_funcattr(type->procedure_v1.funcattr), type->procedure_v2.params, type->procedure_v2.arglist); break; case LF_MFUNCTION_V2: - printf("\t%x => MFunction V2 ret-type:%x call:%x class-type:%x this-type:%x attr:%s\n" + printf("\t%x => MFunction V2 ret-type:%x callconv:%s class-type:%x this-type:%x attr:%s\n" "\t\t#args:%x args-type:%x this_adjust:%x\n", curr_type, type->mfunction_v2.rvtype, - type->mfunction_v2.call, + get_callconv(type->mfunction_v2.callconv), type->mfunction_v2.class_type, type->mfunction_v2.this_type, get_funcattr(type->mfunction_v2.funcattr),

2 1

[PATCH] tools/winedump: now properly displaying function attributes in function/methods codeview records
by Eric Pouech 20 Aug '21

20 Aug '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/mscvpdb.h | 8 ++++---- tools/winedump/msc.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index ac7c2499a26..433a80fd8f4 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -309,7 +309,7 @@ union codeview_type short int id; unsigned short int rvtype; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short int params; unsigned short int arglist; } procedure_v1; @@ -320,7 +320,7 @@ union codeview_type short int id; unsigned int rvtype; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short int params; unsigned int arglist; } procedure_v2; @@ -333,7 +333,7 @@ union codeview_type unsigned short int class_type; unsigned short int this_type; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short int params; unsigned short int arglist; unsigned int this_adjust; @@ -347,7 +347,7 @@ union codeview_type unsigned int class_type; unsigned this_type; unsigned char call; - unsigned char reserved; + unsigned char funcattr; unsigned short params; unsigned int arglist; unsigned int this_adjust; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5d7057345b3..f2eabf31024 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -265,6 +265,25 @@ static const char* get_property(unsigned prop) return tmp; } +static const char* get_funcattr(unsigned attr) +{ + static char tmp[1024]; + unsigned pos = 0; + + if (!attr) return "none"; +#define X(s) {if (pos) tmp[pos++] = ';'; strcpy(tmp + pos, s); pos += strlen(s);} + if (attr & 0x0001) X("C++ReturnUDT"); + if (attr & 0x0002) X("Ctor"); + if (attr & 0x0004) X("Ctor-w/virtualbase"); + if (attr & 0xfff8) pos += sprintf(tmp, "unk:%x", attr & 0xfff8); +#undef X + + tmp[pos] = '\0'; + assert(pos < sizeof(tmp)); + + return tmp; +} + static const char* get_machine(unsigned m) { const char* machine; @@ -865,27 +884,28 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type case LF_PROCEDURE_V1: /* FIXME: unknown could be the calling convention for the proc */ - printf("\t%x => Procedure V1 ret_type:%x call:%x (#%u args_type:%x)\n", + printf("\t%x => Procedure V1 ret_type:%x call:%x attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v1.rvtype, - type->procedure_v1.call, type->procedure_v1.params, - type->procedure_v1.arglist); + type->procedure_v1.call, get_funcattr(type->procedure_v1.funcattr), + type->procedure_v1.params, type->procedure_v1.arglist); break; case LF_PROCEDURE_V2: - printf("\t%x => Procedure V2 ret_type:%x unk:%x (#%u args_type:%x)\n", + printf("\t%x => Procedure V2 ret_type:%x unk:%x attr:%s (#%u args_type:%x)\n", curr_type, type->procedure_v2.rvtype, - type->procedure_v2.call, type->procedure_v2.params, - type->procedure_v2.arglist); + type->procedure_v2.call, get_funcattr(type->procedure_v2.funcattr), + type->procedure_v2.params, type->procedure_v2.arglist); break; case LF_MFUNCTION_V2: - printf("\t%x => MFunction V2 ret-type:%x call:%x class-type:%x this-type:%x\n" + printf("\t%x => MFunction V2 ret-type:%x call:%x class-type:%x this-type:%x attr:%s\n" "\t\t#args:%x args-type:%x this_adjust:%x\n", curr_type, type->mfunction_v2.rvtype, type->mfunction_v2.call, type->mfunction_v2.class_type, type->mfunction_v2.this_type, + get_funcattr(type->mfunction_v2.funcattr), type->mfunction_v2.params, type->mfunction_v2.arglist, type->mfunction_v2.this_adjust);

2 1

[PATCH] winedump: added a bunch of new CPU definitions for PDB
by Eric Pouech 20 Aug '21

20 Aug '21

updated cvinfo.h accordingly Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/cvconst.h | 68 +++++++++++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 143 insertions(+), 7 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index adb18d420fb..39829c73592 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -743,3 +743,71 @@ typedef enum CV_CFL_LANG CV_CFL_MSIL, CV_CFL_HLSL, } CV_CFL_LANG; + +typedef enum CV_CPU_TYPE_e +{ + CV_CFL_8080, + CV_CFL_8086, + CV_CFL_80286, + CV_CFL_80386, + CV_CFL_80486, + CV_CFL_PENTIUM, + CV_CFL_PENTIUMII, + CV_CFL_PENTIUMPRO = CV_CFL_PENTIUMII, + CV_CFL_PENTIUMIII, + CV_CFL_MIPS = 0x10, + CV_CFL_MIPSR4000 = CV_CFL_MIPS, + CV_CFL_MIPS16, + CV_CFL_MIPS32, + CV_CFL_MIPS64, + CV_CFL_MIPSI, + CV_CFL_MIPSII, + CV_CFL_MIPSIII, + CV_CFL_MIPSIV, + CV_CFL_MIPSV, + CV_CFL_M68000 = 0x20, + CV_CFL_M68010, + CV_CFL_M68020, + CV_CFL_M68030, + CV_CFL_M68040, + CV_CFL_ALPHA = 0x30, + CV_CFL_ALPHA_21064 = 0x30, + CV_CFL_ALPHA_21164, + CV_CFL_ALPHA_21164A, + CV_CFL_ALPHA_21264, + CV_CFL_ALPHA_21364, + CV_CFL_PPC601 = 0x40, + CV_CFL_PPC603, + CV_CFL_PPC604, + CV_CFL_PPC620, + CV_CFL_PPCFP, + CV_CFL_SH3 = 0x50, + CV_CFL_SH3E, + CV_CFL_SH3DSP, + CV_CFL_SH4, + CV_CFL_SHMEDIA, + CV_CFL_ARM3 = 0x60, + CV_CFL_ARM4, + CV_CFL_ARM4T, + CV_CFL_ARM5, + CV_CFL_ARM5T, + CV_CFL_ARM6, + CV_CFL_ARM_XMAC, + CV_CFL_ARM_WMMX, + CV_CFL_ARM7, + CV_CFL_OMNI = 0x70, + CV_CFL_IA64 = 0x80, + CV_CFL_IA64_1 = 0x80, + CV_CFL_IA64_2, + CV_CFL_CEE = 0x90, + CV_CFL_AM33 = 0xA0, + CV_CFL_M32R = 0xB0, + CV_CFL_TRICORE = 0xC0, + CV_CFL_X64 = 0xD0, + CV_CFL_AMD64 = CV_CFL_X64, + CV_CFL_EBC = 0xE0, + CV_CFL_THUMB = 0xF0, + CV_CFL_ARMNT = 0xF4, + CV_CFL_ARM64 = 0xF6, + CV_CFL_D3D11_SHADER = 0x100, +} CV_CPU_TYPE_e; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2f0f8e44fa1..27e8cc45f2b 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -271,13 +271,81 @@ static const char* get_machine(unsigned m) switch (m) { - case 0x00: machine = "Intel 8080"; break; - case 0x01: machine = "Intel 8086"; break; - case 0x02: machine = "Intel 80286"; break; - case 0x03: machine = "Intel 80386"; break; - case 0x04: machine = "Intel 80486"; break; - case 0x05: machine = "Intel Pentium"; break; - case 0x10: machine = "MIPS R4000"; break; + case CV_CFL_8080: machine = "Intel 8080"; break; + case CV_CFL_8086: machine = "Intel 8086"; break; + case CV_CFL_80286: machine = "Intel 80286"; break; + case CV_CFL_80386: machine = "Intel 80386"; break; + case CV_CFL_80486: machine = "Intel 80486"; break; + case CV_CFL_PENTIUM: machine = "Intel Pentium"; break; + case CV_CFL_PENTIUMII: machine = "Intel Pentium II"; break; + case CV_CFL_PENTIUMIII: machine = "Intel Pentium III"; break; + + case CV_CFL_MIPS: machine = "MIPS R4000"; break; + case CV_CFL_MIPS16: machine = "MIPS16"; break; + case CV_CFL_MIPS32: machine = "MIPS32"; break; + case CV_CFL_MIPS64: machine = "MIPS64"; break; + case CV_CFL_MIPSI: machine = "MIPS I"; break; + case CV_CFL_MIPSII: machine = "MIPS II"; break; + case CV_CFL_MIPSIII: machine = "MIPS III"; break; + case CV_CFL_MIPSIV: machine = "MIPS IV"; break; + case CV_CFL_MIPSV: machine = "MIPS V"; break; + + case CV_CFL_M68000: machine = "M68000"; break; + case CV_CFL_M68010: machine = "M68010"; break; + case CV_CFL_M68020: machine = "M68020"; break; + case CV_CFL_M68030: machine = "M68030"; break; + case CV_CFL_M68040: machine = "M68040"; break; + + case CV_CFL_ALPHA_21064: machine = "Alpha 21064"; break; + case CV_CFL_ALPHA_21164: machine = "Alpha 21164"; break; + case CV_CFL_ALPHA_21164A: machine = "Alpha 21164A"; break; + case CV_CFL_ALPHA_21264: machine = "Alpha 21264"; break; + case CV_CFL_ALPHA_21364: machine = "Alpha 21364"; break; + + case CV_CFL_PPC601: machine = "PowerPC 601"; break; + case CV_CFL_PPC603: machine = "PowerPC 603"; break; + case CV_CFL_PPC604: machine = "PowerPC 604"; break; + case CV_CFL_PPC620: machine = "PowerPC 620"; break; + case CV_CFL_PPCFP: machine = "PowerPC FP"; break; + + case CV_CFL_SH3: machine = "SH3"; break; + case CV_CFL_SH3E: machine = "SH3E"; break; + case CV_CFL_SH3DSP: machine = "SH3DSP"; break; + case CV_CFL_SH4: machine = "SH4"; break; + case CV_CFL_SHMEDIA: machine = "SHMEDIA"; break; + + case CV_CFL_ARM3: machine = "ARM 3"; break; + case CV_CFL_ARM4: machine = "ARM 4"; break; + case CV_CFL_ARM4T: machine = "ARM 4T"; break; + case CV_CFL_ARM5: machine = "ARM 5"; break; + case CV_CFL_ARM5T: machine = "ARM 5T"; break; + case CV_CFL_ARM6: machine = "ARM 6"; break; + case CV_CFL_ARM_XMAC: machine = "ARM XMAC"; break; + case CV_CFL_ARM_WMMX: machine = "ARM WMMX"; break; + case CV_CFL_ARM7: machine = "ARM 7"; break; + + case CV_CFL_OMNI: machine = "OMNI"; break; + + case CV_CFL_IA64_1: machine = "Itanium"; break; + case CV_CFL_IA64_2: machine = "Itanium 2"; break; + + case CV_CFL_CEE: machine = "CEE"; break; + + case CV_CFL_AM33: machine = "AM33"; break; + + case CV_CFL_M32R: machine = "M32R"; break; + + case CV_CFL_TRICORE: machine = "TRICORE"; break; + + case CV_CFL_X64: machine = "x86_64"; break; + + case CV_CFL_EBC: machine = "EBC"; break; + + case CV_CFL_THUMB: machine = "Thumb"; break; + case CV_CFL_ARMNT: machine = "ARM NT"; break; + case CV_CFL_ARM64: machine = "ARM 64"; break; + + case CV_CFL_D3D11_SHADER: machine = "D3D11 shader"; break; default: { static char tmp[16];

2 1

[PATCH] winedump: added more supported languages from .pdb COMPILE records
by Eric Pouech 20 Aug '21

20 Aug '21

update cvconst.h accordingly Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/cvconst.h | 21 +++++++++++++++++++++ tools/winedump/msc.c | 25 ++++++++++++++++++------- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 80b8e440edc..adb18d420fb 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -722,3 +722,24 @@ typedef enum CV_call_e CV_CALL_M32RCALL, CV_CALL_RESERVED, } CV_call_e; + +typedef enum CV_CFL_LANG +{ + CV_CFL_C, + CV_CFL_CXX, + CV_CFL_FORTRAN, + CV_CFL_MASM, + CV_CFL_PASCAL, + CV_CFL_BASIC, + CV_CFL_COBOL, + CV_CFL_LINK, + CV_CFL_CVTRES, + CV_CFL_CVTPGD, + CV_CFL_CSHARP, + CV_CFL_VB, + CV_CFL_ILASM, + CV_CFL_JAVA, + CV_CFL_JSCRIPT, + CV_CFL_MSIL, + CV_CFL_HLSL, +} CV_CFL_LANG; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 3877a3b9113..2f0f8e44fa1 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -42,6 +42,7 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" +#include "cvconst.h" #include "wine/mscvpdb.h" #define PSTRING(adr, ofs) \ @@ -294,13 +295,23 @@ static const char* get_language(unsigned l) switch (l) { - case 0x00: lang = "C"; break; - case 0x01: lang = "C++"; break; - case 0x02: lang = "Fortran"; break; - case 0x03: lang = "Masm"; break; - case 0x04: lang = "Pascal"; break; - case 0x05: lang = "Basic"; break; - case 0x06: lang = "Cobol"; break; + case CV_CFL_C: lang = "C"; break; + case CV_CFL_CXX: lang = "C++"; break; + case CV_CFL_FORTRAN: lang = "Fortran"; break; + case CV_CFL_MASM: lang = "Masm"; break; + case CV_CFL_PASCAL: lang = "Pascal"; break; + case CV_CFL_BASIC: lang = "Basic"; break; + case CV_CFL_COBOL: lang = "Cobol"; break; + case CV_CFL_LINK: lang = "Link"; break; + case CV_CFL_CVTRES: lang = "Resource"; break; + case CV_CFL_CVTPGD: lang = "PoGo"; break; + case CV_CFL_CSHARP: lang = "C#"; break; + case CV_CFL_VB: lang = "VisualBasic"; break; + case CV_CFL_ILASM: lang = "IL ASM"; break; + case CV_CFL_JAVA: lang = "Java"; break; + case CV_CFL_JSCRIPT: lang = "JavaScript"; break; + case CV_CFL_MSIL: lang = "MSIL"; break; + case CV_CFL_HLSL: lang = "HLSL"; break; default: { static char tmp[16];

2 1

[PATCH v2 1/4] wined3d: Introduce wined3d_view_load_location() helper.
by Jan Sikorski 20 Aug '21

20 Aug '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..dfca8fc53f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -461,21 +480,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_load_location(buffer_from_resource(resource), context, location); - return; - } - - texture = texture_from_resource(resource); - sub_resource_idx = view->sub_resource_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_load_location(texture, sub_resource_idx, context, location); + wined3d_view_load_location(view->resource, &view->desc, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) -- 2.30.2

2 5

[PATCH] winedump: move string conversion of machine and language into dedicated helpers
by Eric Pouech 20 Aug '21

20 Aug '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/msc.c | 96 ++++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 96c7ac21798..3877a3b9113 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -264,6 +264,54 @@ static const char* get_property(unsigned prop) return tmp; } +static const char* get_machine(unsigned m) +{ + const char* machine; + + switch (m) + { + case 0x00: machine = "Intel 8080"; break; + case 0x01: machine = "Intel 8086"; break; + case 0x02: machine = "Intel 80286"; break; + case 0x03: machine = "Intel 80386"; break; + case 0x04: machine = "Intel 80486"; break; + case 0x05: machine = "Intel Pentium"; break; + case 0x10: machine = "MIPS R4000"; break; + default: + { + static char tmp[16]; + sprintf(tmp, "machine=%x", m); + machine = tmp; + } + break; + } + return machine; +} + +static const char* get_language(unsigned l) +{ + const char* lang; + + switch (l) + { + case 0x00: lang = "C"; break; + case 0x01: lang = "C++"; break; + case 0x02: lang = "Fortran"; break; + case 0x03: lang = "Masm"; break; + case 0x04: lang = "Pascal"; break; + case 0x05: lang = "Basic"; break; + case 0x06: lang = "Cobol"; break; + default: + { + static char tmp[16]; + sprintf(tmp, "lang=%x", l); + lang = tmp; + } + break; + } + return lang; +} + static void do_field(const unsigned char* start, const unsigned char* end) { /* @@ -1131,49 +1179,11 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) break; case S_COMPILE: - { - const char* machine; - const char* lang; - - switch (sym->compiland_v1.unknown & 0xFF) - { - case 0x00: machine = "Intel 8080"; break; - case 0x01: machine = "Intel 8086"; break; - case 0x02: machine = "Intel 80286"; break; - case 0x03: machine = "Intel 80386"; break; - case 0x04: machine = "Intel 80486"; break; - case 0x05: machine = "Intel Pentium"; break; - case 0x10: machine = "MIPS R4000"; break; - default: - { - static char tmp[16]; - sprintf(tmp, "machine=%x", sym->compiland_v1.unknown & 0xFF); - machine = tmp; - } - break; - } - switch ((sym->compiland_v1.unknown >> 8) & 0xFF) - { - case 0x00: lang = "C"; break; - case 0x01: lang = "C++"; break; - case 0x02: lang = "Fortran"; break; - case 0x03: lang = "Masm"; break; - case 0x04: lang = "Pascal"; break; - case 0x05: lang = "Basic"; break; - case 0x06: lang = "Cobol"; break; - default: - { - static char tmp[16]; - sprintf(tmp, "language=%x", (sym->compiland_v1.unknown >> 8) & 0xFF); - lang = tmp; - } - break; - } - - printf("\tS-Compiland V1 '%s' %s %s unk:%x\n", - p_string(&sym->compiland_v1.p_name), machine, lang, - sym->compiland_v1.unknown >> 16); - } + printf("\tS-Compiland V1 '%s' %s %s unk:%x\n", + p_string(&sym->compiland_v1.p_name), + get_machine(sym->compiland_v1.unknown & 0xFF), + get_language((sym->compiland_v1.unknown >> 8) & 0xFF), + sym->compiland_v1.unknown >> 16); break; case S_COMPILE2_ST:

1 0

[PATCH] dbghelp: introducing symt_exe to hold symbolic information about .exe, .dll
by Eric Pouech 20 Aug '21

20 Aug '21

This is the internal object for SymTagExe symbols --- dlls/dbghelp/dbghelp_private.h | 11 ++++++++++- dlls/dbghelp/module.c | 3 +++ dlls/dbghelp/symbol.c | 15 ++++++++++++++- dlls/dbghelp/type.c | 8 +++++++- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d87b1b5ecde..7be0af0c9a1 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -161,10 +161,16 @@ struct symt_block struct vector vchildren; /* sub-blocks & local variables */ }; -struct symt_compiland +struct symt_exe /* in fact .exe, .dll */ { struct symt symt; struct module* module; +}; + +struct symt_compiland +{ + struct symt symt; + struct symt_exe* exe; ULONG_PTR address; unsigned source; struct vector vchildren; /* global variables & functions */ @@ -375,6 +381,7 @@ struct module unsigned sorttab_size; struct symt_ht** addr_sorttab; struct hash_table ht_symbols; + struct symt_exe* top; /* types */ struct hash_table ht_types; @@ -707,6 +714,8 @@ extern int __cdecl symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDE extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; +extern struct symt_exe* + symt_new_exe(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 247aadcef0e..d8843b100a1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -233,6 +233,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->sources = 0; wine_rb_init(&module->sources_offsets_tree, source_rb_compare); + /* add top level symbol */ + module->top = symt_new_exe(module); + return module; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index df952fc3984..ce586f7bcff 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -180,6 +180,19 @@ static WCHAR* file_regex(const char* srcfile) return mask; } +struct symt_exe* symt_new_exe(struct module* module) +{ + struct symt_exe* sym; + + TRACE_(dbghelp_symt)("Adding toplevel exe symbol %s\n", debugstr_w(module->module.ModuleName)); + if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) + { + sym->symt.tag = SymTagExe; + sym->module = module; + } + return sym; +} + struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) { @@ -190,7 +203,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { sym->symt.tag = SymTagCompiland; - sym->module = module; + sym->exe = module->top; sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 1a7cef9b7c0..76077372764 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -87,7 +87,7 @@ const char* symt_get_name(const struct symt* sym) case SymTagBaseType: return ((const struct symt_basic*)sym)->hash_elt.name; case SymTagLabel: return ((const struct symt_hierarchy_point*)sym)->hash_elt.name; case SymTagThunk: return ((const struct symt_thunk*)sym)->hash_elt.name; - case SymTagCompiland: return source_get(((const struct symt_compiland*)sym)->module, + case SymTagCompiland: return source_get(((const struct symt_compiland*)sym)->exe->module, ((const struct symt_compiland*)sym)->source); /* hierarchy tree */ case SymTagEnum: return ((const struct symt_enum*)sym)->name; @@ -716,6 +716,12 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagFunctionArgType: X(DWORD) = symt_ptr2index(module, ((const struct symt_function_arg_type*)type)->container); break; + case SymTagUDT: + X(DWORD) = symt_ptr2index(module, &module->top->symt); + break; + case SymTagCompiland: + X(DWORD) = symt_ptr2index(module, &((const struct symt_compiland*)type)->exe->symt); + break; default: FIXME("Unsupported sym-tag %s for get-lexical-parent\n", symt_get_tag_str(type->tag));

3 2

[PATCH] oleaut32/tests: Add interface checks for font object.
by Nikolay Sivov 20 Aug '21

20 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/olefont.c | 53 ++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5137d807e78..c14d3d9435d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -51,6 +51,21 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -183,41 +198,27 @@ static void test_ifont_sizes(void) test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } -static void test_QueryInterface(void) +static void test_interfaces(void) { - LPVOID pvObj = NULL; HRESULT hr; - IFont* font = NULL; - IPersistStreamInit *persistStreamInit = NULL; - LONG ref; + IFont *font = NULL; hr = pOleCreateFontIndirect(NULL, &IID_IFont, NULL); EXPECT_HR(hr, E_POINTER); - hr = pOleCreateFontIndirect(NULL, &IID_IFont, &pvObj); - font = pvObj; - + hr = pOleCreateFontIndirect(NULL, &IID_IFont, (void **)&font); EXPECT_HR(hr, S_OK); ok(font != NULL,"OCFI (NULL,..) returns NULL, instead of !NULL\n"); - pvObj = NULL; - hr = IFont_QueryInterface( font, &IID_IFont, &pvObj); - EXPECT_HR(hr, S_OK); - - /* Test if QueryInterface increments ref counter for IFONTs */ - ref = IFont_AddRef(font); - ok(ref == 3 || - broken(ref == 1), /* win95 */ - "IFont_QI expected ref value 3 but instead got %d\n", ref); - IFont_Release(font); + check_interface(font, &IID_IFont, TRUE); + check_interface(font, &IID_IFontDisp, TRUE); + check_interface(font, &IID_IDispatch, TRUE); + check_interface(font, &IID_IPersist, TRUE); + check_interface(font, &IID_IPersistStream, TRUE); + check_interface(font, &IID_IConnectionPointContainer, TRUE); + check_interface(font, &IID_IPersistPropertyBag, TRUE); + check_interface(font, &IID_IPersistStreamInit, FALSE); - ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n"); - - /* IFont never had IPersistStreamInit */ - hr = IFont_QueryInterface(font, &IID_IPersistStreamInit, (void**)&persistStreamInit); - EXPECT_HR(hr, E_NOINTERFACE); - - IFont_Release(font); IFont_Release(font); } @@ -1278,7 +1279,7 @@ START_TEST(olefont) return; } - test_QueryInterface(); + test_interfaces(); test_type_info(); test_ifont_sizes(); test_font_events_disp(); -- 2.32.0

1 0

[PATCH] wined3d: Avoid read-to-read resource barriers.
by Jan Sikorski 20 Aug '21

20 Aug '21

We can generally skip them, but make sure that subsequent barriers synchronize with all accumulated usages. This is motivated by an issue where a program using a single buffer to store both indices and vertex attributes causes superfluous barriers on each draw call. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/buffer.c | 44 +++++++++++++++++++++------------- dlls/wined3d/texture.c | 31 +++++++++++++++--------- dlls/wined3d/wined3d_private.h | 15 ++++++++++++ 3 files changed, 62 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4420885b15f..ef5727030c8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1588,28 +1588,38 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, if (buffer_vk->bind_mask && buffer_vk->bind_mask != bind_mask) { const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkAccessFlags src_access_mask, dst_access_mask; VkBufferMemoryBarrier vk_barrier; TRACE(" %s -> %s.\n", wined3d_debug_bind_flags(buffer_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); - wined3d_context_vk_end_current_render_pass(context_vk); - - vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; - vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(buffer_vk->bind_mask); - vk_barrier.dstAccessMask = vk_access_mask_from_bind_flags(bind_mask); - vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.buffer = buffer_vk->bo.vk_buffer; - vk_barrier.offset = buffer_vk->bo.buffer_offset; - vk_barrier.size = buffer_vk->b.resource.size; - VK_CALL(vkCmdPipelineBarrier(wined3d_context_vk_get_command_buffer(context_vk), - vk_pipeline_stage_mask_from_bind_flags(buffer_vk->bind_mask), - vk_pipeline_stage_mask_from_bind_flags(bind_mask), - 0, 0, NULL, 1, &vk_barrier, 0, NULL)); - } - buffer_vk->bind_mask = bind_mask; + src_access_mask = vk_access_mask_from_bind_flags(buffer_vk->bind_mask); + dst_access_mask = vk_access_mask_from_bind_flags(bind_mask); + + if (!vk_access_mask_is_read_only(src_access_mask | dst_access_mask)) + { + wined3d_context_vk_end_current_render_pass(context_vk); + + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = src_access_mask; + vk_barrier.dstAccessMask = dst_access_mask; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = buffer_vk->bo.vk_buffer; + vk_barrier.offset = buffer_vk->bo.buffer_offset; + vk_barrier.size = buffer_vk->b.resource.size; + VK_CALL(vkCmdPipelineBarrier(wined3d_context_vk_get_command_buffer(context_vk), + vk_pipeline_stage_mask_from_bind_flags(buffer_vk->bind_mask), + vk_pipeline_stage_mask_from_bind_flags(bind_mask), + 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + buffer_vk->bind_mask = bind_mask; + return; + } + } + + buffer_vk->bind_mask |= bind_mask; } HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c1247fbc56b..687626a0d56 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5251,22 +5251,31 @@ void wined3d_texture_vk_barrier(struct wined3d_texture_vk *texture_vk, if (texture_vk->bind_mask && texture_vk->bind_mask != bind_mask) { + VkAccessFlags src_access_mask, dst_access_mask; + TRACE(" %s -> %s.\n", wined3d_debug_bind_flags(texture_vk->bind_mask), wined3d_debug_bind_flags(bind_mask)); - vk_range.aspectMask = vk_aspect_mask_from_format(texture_vk->t.resource.format); - vk_range.baseMipLevel = 0; - vk_range.levelCount = VK_REMAINING_MIP_LEVELS; - vk_range.baseArrayLayer = 0; - vk_range.layerCount = VK_REMAINING_ARRAY_LAYERS; + src_access_mask = vk_access_mask_from_bind_flags(texture_vk->bind_mask); + dst_access_mask = vk_access_mask_from_bind_flags(bind_mask); - wined3d_context_vk_image_barrier(context_vk, wined3d_context_vk_get_command_buffer(context_vk), - vk_pipeline_stage_mask_from_bind_flags(texture_vk->bind_mask), - vk_pipeline_stage_mask_from_bind_flags(bind_mask), - vk_access_mask_from_bind_flags(texture_vk->bind_mask), vk_access_mask_from_bind_flags(bind_mask), - texture_vk->layout, texture_vk->layout, texture_vk->image.vk_image, &vk_range); + if (!vk_access_mask_is_read_only(src_access_mask | dst_access_mask)) + { + vk_range.aspectMask = vk_aspect_mask_from_format(texture_vk->t.resource.format); + vk_range.baseMipLevel = 0; + vk_range.levelCount = VK_REMAINING_MIP_LEVELS; + vk_range.baseArrayLayer = 0; + vk_range.layerCount = VK_REMAINING_ARRAY_LAYERS; + + wined3d_context_vk_image_barrier(context_vk, wined3d_context_vk_get_command_buffer(context_vk), + vk_pipeline_stage_mask_from_bind_flags(texture_vk->bind_mask), + vk_pipeline_stage_mask_from_bind_flags(bind_mask), src_access_mask, dst_access_mask, + texture_vk->layout, texture_vk->layout, texture_vk->image.vk_image, &vk_range); + texture_vk->bind_mask = bind_mask; + return; + } } - texture_vk->bind_mask = bind_mask; + texture_vk->bind_mask |= bind_mask; } static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86eae149306..ae4ae1bf160 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -317,6 +317,21 @@ VkImageViewType vk_image_view_type_from_wined3d(enum wined3d_resource_type type, VkPipelineStageFlags vk_pipeline_stage_mask_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; VkShaderStageFlagBits vk_shader_stage_from_wined3d(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; +static inline bool vk_access_mask_is_read_only(VkAccessFlags flags) +{ + static const VkAccessFlags read_flags = + VK_ACCESS_INDIRECT_COMMAND_READ_BIT | VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | + VK_ACCESS_UNIFORM_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT | + VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | + VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_HOST_READ_BIT | VK_ACCESS_MEMORY_READ_BIT | + VK_ACCESS_COMMAND_PREPROCESS_READ_BIT_NV | VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT | + VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT | VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR | + VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR | VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT | + VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT; + + return (flags & read_flags) == flags; +} + static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { if (func < WINED3D_CMP_NEVER || func > WINED3D_CMP_ALWAYS) -- 2.30.2

2 2

[PATCH] dbghelp: let SymGetTypeFromName fill more fields in SYMBOL_INFO
by Eric Pouech 20 Aug '21

20 Aug '21

--- dlls/dbghelp/type.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 8e91eb3c554..1a7cef9b7c0 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -925,6 +925,8 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, { struct module_pair pair; struct symt* type; + const char* name; + DWORD64 size; pair.pcs = process_find_by_handle(hProcess); if (!pair.pcs) return FALSE; @@ -932,7 +934,19 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, if (!module_get_debug(&pair)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE; - Symbol->TypeIndex = symt_ptr2index(pair.effective, type); - + Symbol->Index = Symbol->TypeIndex = symt_ptr2index(pair.effective, type); + if (Symbol->MaxNameLen) + { + name = symt_get_name(type); + Symbol->NameLen = min(strlen(name), Symbol->MaxNameLen - 1); + memcpy(Symbol->Name, name, Symbol->NameLen); + Symbol->Name[Symbol->NameLen] = '\0'; + } + else + Symbol->NameLen = 0; + symt_get_info(pair.effective, type, TI_GET_LENGTH, &size); + Symbol->Size = size; + Symbol->ModBase = pair.requested->module.BaseOfImage; + Symbol->Tag = type->tag; return TRUE; }

1 0

[PATCH] dbghelp: handling of complex location in dwarf
by Eric Pouech 20 Aug '21

20 Aug '21

Don't recompute the location when we need to store a location block for later recomputation. It had also the bad side effect of letting the location to be absolute, which wasn't expected at all. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 53274c4f597..a4f426ca6a0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -930,7 +930,6 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (ULONG_PTR)ptr; - compute_location(ctx->module, &lctx, loc, NULL, frame); } } return TRUE;

1 0

[PATCH] dbghelp: return name of compiland in SymGetTypeInfo
by Eric Pouech 20 Aug '21

20 Aug '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 1 + dlls/dbghelp/type.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3415fc1557c..d87b1b5ecde 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -164,6 +164,7 @@ struct symt_block struct symt_compiland { struct symt symt; + struct module* module; ULONG_PTR address; unsigned source; struct vector vchildren; /* global variables & functions */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..df952fc3984 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -190,6 +190,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { sym->symt.tag = SymTagCompiland; + sym->module = module; sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 374b69aeb08..8e91eb3c554 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -87,6 +87,8 @@ const char* symt_get_name(const struct symt* sym) case SymTagBaseType: return ((const struct symt_basic*)sym)->hash_elt.name; case SymTagLabel: return ((const struct symt_hierarchy_point*)sym)->hash_elt.name; case SymTagThunk: return ((const struct symt_thunk*)sym)->hash_elt.name; + case SymTagCompiland: return source_get(((const struct symt_compiland*)sym)->module, + ((const struct symt_compiland*)sym)->source); /* hierarchy tree */ case SymTagEnum: return ((const struct symt_enum*)sym)->name; case SymTagTypedef: return ((const struct symt_typedef*)sym)->hash_elt.name;

1 0

[PATCH] kernelbase: Handle 2 full paths in PathAllocCombine.
by Daniel Lehman 20 Aug '21

20 Aug '21

3 2

[PATCH v2] quartz: Change reference increasing method to avoid unintended DLL unloading.
by Hiroki Awata 19 Aug '21

19 Aug '21

Incrementing object_locks by DSCF_CreateInstance is sometimes wrong. For example, dsound_render_create creates two instances because it calls system_clock_create internally, but object_locks is only increased by 1. Each create function should increase the object_locks instead of DSCF_CreateInstance. Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/quartz/acmwrapper.c | 1 + dlls/quartz/avidec.c | 1 + dlls/quartz/dsoundrender.c | 1 + dlls/quartz/filesource.c | 1 + dlls/quartz/filtergraph.c | 1 + dlls/quartz/filtermapper.c | 3 +++ dlls/quartz/main.c | 1 - dlls/quartz/memallocator.c | 1 + dlls/quartz/passthrough.c | 1 + dlls/quartz/systemclock.c | 1 + dlls/quartz/vmr9.c | 1 + 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..0804c18b3c8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -534,6 +534,7 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) object->lasttime_real = object->lasttime_sent = -1; + InterlockedIncrement(&object_locks); TRACE("Created ACM wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..8191b703553 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -611,6 +611,7 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); + InterlockedIncrement(&object_locks); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..521a97ca359 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1049,6 +1049,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; object->IQualityControl_iface.lpVtbl = &dsound_render_qc_vtbl; + InterlockedIncrement(&object_locks); TRACE("Created DirectSound renderer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..12830d404b8 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -430,6 +430,7 @@ HRESULT async_reader_create(IUnknown *outer, IUnknown **out) object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + InterlockedIncrement(&object_locks); TRACE("Created file source %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..6b13fca6787 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5652,6 +5652,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL else object->message_thread = NULL; + InterlockedIncrement(&object_locks); TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..249867da8c8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -195,6 +195,7 @@ static HRESULT enum_reg_filters_create(REGFILTER *filters, unsigned int count, I object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumRegFilters_iface; return S_OK; @@ -329,6 +330,7 @@ static HRESULT enum_moniker_create(IMoniker **filters, unsigned int count, IEnum object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumMoniker_iface; return S_OK; @@ -1701,6 +1703,7 @@ HRESULT filter_mapper_create(IUnknown *pUnkOuter, IUnknown **out) else pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + InterlockedIncrement(&object_locks); TRACE("Created filter mapper %p.\n", pFM2impl); *out = &pFM2impl->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..282c56e6c7f 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -127,7 +127,6 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..1bc4d1d0041 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -936,5 +936,6 @@ HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) else CoTaskMemFree(pMemAlloc); + InterlockedIncrement(&object_locks); return hr; } diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..e576547f934 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -108,6 +108,7 @@ HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) strmbase_passthrough_init(&object->passthrough, object->outer_unk); + InterlockedIncrement(&object_locks); TRACE("Created seeking passthrough %p.\n", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..917cde99681 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -339,6 +339,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + InterlockedIncrement(&object_locks); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..df50a32d514 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2587,6 +2587,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + InterlockedIncrement(&object_locks); TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; -- 2.27.0

3 2

pending patches
by Eric Pouech 19 Aug '21

19 Aug '21

Hi Alexandre, there are a bunch of patches - https://www.winehq.org/pipermail/wine-devel/2021-August/192926.html - ot the serie https://www.winehq.org/pipermail/wine-devel/2021-July/190750.html which are neither committed nor being commented upon would you mind giving some feedback on the status of those? TIA -- Eric Pouech

2 1

[PATCH v3 1/2] quartz: Change reference increasing method to avoid unintended DLL unloading.
by Hiroki Awata 19 Aug '21

19 Aug '21

Incrementing object_locks by DSCF_CreateInstance is sometimes wrong. For example, dsound_render_create creates two instances because it calls system_clock_create internally, but object_locks is only increased by 1. Each create function should increase the object_locks instead of DSCF_CreateInstance. Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/quartz/acmwrapper.c | 1 + dlls/quartz/avidec.c | 1 + dlls/quartz/dsoundrender.c | 1 + dlls/quartz/filesource.c | 1 + dlls/quartz/filtergraph.c | 1 + dlls/quartz/filtermapper.c | 3 +++ dlls/quartz/main.c | 1 - dlls/quartz/memallocator.c | 5 +++++ dlls/quartz/passthrough.c | 1 + dlls/quartz/systemclock.c | 1 + dlls/quartz/videorenderer.c | 1 + dlls/quartz/vmr9.c | 1 + 12 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..0804c18b3c8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -534,6 +534,7 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) object->lasttime_real = object->lasttime_sent = -1; + InterlockedIncrement(&object_locks); TRACE("Created ACM wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..8191b703553 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -611,6 +611,7 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); + InterlockedIncrement(&object_locks); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..521a97ca359 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1049,6 +1049,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; object->IQualityControl_iface.lpVtbl = &dsound_render_qc_vtbl; + InterlockedIncrement(&object_locks); TRACE("Created DirectSound renderer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..12830d404b8 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -430,6 +430,7 @@ HRESULT async_reader_create(IUnknown *outer, IUnknown **out) object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + InterlockedIncrement(&object_locks); TRACE("Created file source %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..6b13fca6787 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5652,6 +5652,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL else object->message_thread = NULL; + InterlockedIncrement(&object_locks); TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..249867da8c8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -195,6 +195,7 @@ static HRESULT enum_reg_filters_create(REGFILTER *filters, unsigned int count, I object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumRegFilters_iface; return S_OK; @@ -329,6 +330,7 @@ static HRESULT enum_moniker_create(IMoniker **filters, unsigned int count, IEnum object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumMoniker_iface; return S_OK; @@ -1701,6 +1703,7 @@ HRESULT filter_mapper_create(IUnknown *pUnkOuter, IUnknown **out) else pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + InterlockedIncrement(&object_locks); TRACE("Created filter mapper %p.\n", pFM2impl); *out = &pFM2impl->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..282c56e6c7f 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -127,7 +127,6 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..966346ed7ce 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -932,9 +932,14 @@ HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) pMemAlloc->pMemory = NULL; if (SUCCEEDED(hr = BaseMemAllocator_Init(StdMemAllocator_Alloc, StdMemAllocator_Free, NULL, NULL, NULL, StdMemAllocator_Destroy, &pMemAlloc->csState, &pMemAlloc->base))) + { *out = (IUnknown *)&pMemAlloc->base.IMemAllocator_iface; + InterlockedIncrement(&object_locks); + } else + { CoTaskMemFree(pMemAlloc); + } return hr; } diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..e576547f934 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -108,6 +108,7 @@ HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) strmbase_passthrough_init(&object->passthrough, object->outer_unk); + InterlockedIncrement(&object_locks); TRACE("Created seeking passthrough %p.\n", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..917cde99681 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -339,6 +339,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + InterlockedIncrement(&object_locks); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1a59a9b5213..7b248a01438 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -496,6 +496,7 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) return hr; } + InterlockedIncrement(&object_locks); TRACE("Created video renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..df50a32d514 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2587,6 +2587,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + InterlockedIncrement(&object_locks); TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; -- 2.27.0

1 1

[PATCH] include: Add ID3DX10Mesh definition.
by Nikolay Sivov 19 Aug '21

19 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10mesh.h | 99 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 include/d3dx10mesh.h diff --git a/include/Makefile.in b/include/Makefile.in index 0163b9b0951..5d5caf74c63 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -144,6 +144,7 @@ SOURCES = \ d3dx10async.h \ d3dx10core.h \ d3dx10math.h \ + d3dx10mesh.h \ d3dx10tex.h \ d3dx11.h \ d3dx11async.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index 7062d24ea09..cb7b65c53cc 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -31,6 +31,7 @@ #include "d3dx10core.h" #include "d3dx10async.h" #include "d3dx10tex.h" +#include "d3dx10mesh.h" #define _FACDD 0x876 #define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) diff --git a/include/d3dx10mesh.h b/include/d3dx10mesh.h new file mode 100644 index 00000000000..d813ef68df2 --- /dev/null +++ b/include/d3dx10mesh.h @@ -0,0 +1,99 @@ +/* + * Copyright 2021 Nikolay Sivov 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 "d3dx10.h" + +DEFINE_GUID(IID_ID3DX10Mesh, 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95); +DEFINE_GUID(IID_ID3DX10MeshBuffer, 0x4b0d117, 0x1041, 0x46b1, 0xaa, 0x8a, 0x39, 0x52, 0x84, 0x8b, 0xa2, 0x2e); + +typedef enum _D3DX10_MESH_DISCARD_FLAGS +{ + D3DX10_MESH_DISCARD_ATTRIBUTE_BUFFER = 0x01, + D3DX10_MESH_DISCARD_ATTRIBUTE_TABLE = 0x02, + D3DX10_MESH_DISCARD_POINTREPS = 0x04, + D3DX10_MESH_DISCARD_ADJACENCY = 0x08, + D3DX10_MESH_DISCARD_DEVICE_BUFFERS = 0x10, +} D3DX10_MESH_DISCARD_FLAGS; + +typedef struct _D3DX10_ATTRIBUTE_RANGE +{ + UINT AttribId; + UINT FaceStart; + UINT FaceCount; + UINT VertexStart; + UINT VertexCount; +} D3DX10_ATTRIBUTE_RANGE; +typedef D3DX10_ATTRIBUTE_RANGE* LPD3DX10_ATTRIBUTE_RANGE; + +#define INTERFACE ID3DX10MeshBuffer +DECLARE_INTERFACE_(ID3DX10MeshBuffer, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10MeshBuffer methods ***/ + STDMETHOD(Map)(THIS_ void **data, SIZE_T *size) PURE; + STDMETHOD(Unmap)(THIS) PURE; + STDMETHOD_(SIZE_T, GetSize)(THIS) PURE; +}; +#undef INTERFACE + +#define INTERFACE ID3DX10Mesh +DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10Mesh methods ***/ + STDMETHOD_(UINT, GetFaceCount)(THIS) PURE; + STDMETHOD_(UINT, GetVertexCount)(THIS) PURE; + STDMETHOD_(UINT, GetVertexBufferCount)(THIS) PURE; + STDMETHOD_(UINT, GetFlags)(THIS) PURE; + STDMETHOD(GetVertexDescription)(THIS_ const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) PURE; + STDMETHOD(SetVertexData)(THIS_ UINT index, const void *data) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ UINT index, ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetIndexData)(THIS_ const void *data, UINT count) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetAttributeData)(THIS_ const UINT *data) PURE; + STDMETHOD(GetAttributeBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetAttributeTable)(THIS_ const D3DX10_ATTRIBUTE_RANGE *table, UINT size) PURE; + STDMETHOD(GetAttributeTable)(THIS_ D3DX10_ATTRIBUTE_RANGE *table, UINT *size) PURE; + STDMETHOD(GenerateAdjacencyAndPointReps)(THIS_ float epsilon) PURE; + STDMETHOD(GenerateGSAdjacency)(THIS) PURE; + STDMETHOD(SetAdjacencyData)(THIS_ const UINT *adjacency) PURE; + STDMETHOD(GetAdjacenctBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetPointRepData)(THIS_ const UINT *pointreps) PURE; + STDMETHOD(GetPointRepBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(Discard)(THIS_ D3DX10_MESH_DISCARD_FLAGS flags) PURE; + STDMETHOD(CloneMesh)(THIS_ UINT flags, const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, + UINT decl_count, ID3DX10Mesh **cloned_mesh); + STDMETHOD(Optimize)(THIS_ UINT flags, UINT *face_remap, ID3D10Blob **vertex_remap) PURE; + STDMETHOD(GenerateAttributeBufferFromTable)(THIS) PURE; + STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, + float *u, float *v, float *dist, ID3D10Blob **all_hits) PURE; + STDMETHOD(IntersectSubset)(THIS_ UINT attr_id, D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, + float *u, float *v, float *dist, ID3D10Blob **all_hits) PURE; + STDMETHOD(CommitToDevice)(THIS) PURE; + STDMETHOD(DrawSubset)(THIS_ UINT attr_id) PURE; + STDMETHOD(DrawSubsetInstanced)(THIS_ UINT attr_id, UINT instance_count, UINT start_instance) PURE; + STDMETHOD(GetDeviceVertexBuffer)(THIS_ UINT index, ID3D10Buffer **buffer) PURE; + STDMETHOD(GetDeviceIndexBuffer)(THIS_ ID3D10Buffer **buffer) PURE; +}; +#undef INTERFACE -- 2.32.0

1 0

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Free all instruction lists in reverse order (Valgrind).
by Zebediah Figura 19 Aug '21

19 Aug '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 16 +++++----------- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3544b9d6..01d5e773 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1278,7 +1278,6 @@ void hlsl_free_instr_list(struct list *list) * the "uses" list. */ LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) hlsl_free_instr(node); - vkd3d_free(list); } static void free_ir_constant(struct hlsl_ir_constant *constant) @@ -1297,12 +1296,8 @@ static void free_ir_expr(struct hlsl_ir_expr *expr) static void free_ir_if(struct hlsl_ir_if *if_node) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&if_node->then_instrs); + hlsl_free_instr_list(&if_node->else_instrs); hlsl_src_remove(&if_node->condition); vkd3d_free(if_node); } @@ -1320,10 +1315,7 @@ static void free_ir_load(struct hlsl_ir_load *load) static void free_ir_loop(struct hlsl_ir_loop *loop) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&loop->body); vkd3d_free(loop); } @@ -1342,6 +1334,8 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) void hlsl_free_instr(struct hlsl_ir_node *node) { + assert(list_empty(&node->uses)); + switch (node->type) { case HLSL_IR_CONSTANT: diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5f1e9167..cb4fd7c8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -136,6 +136,12 @@ static struct list *make_empty_list(struct hlsl_ctx *ctx) return list; } +static void destroy_instr_list(struct list *list) +{ + hlsl_free_instr_list(list); + vkd3d_free(list); +} + static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) { if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) @@ -385,10 +391,10 @@ oom: vkd3d_free(loop); vkd3d_free(cond_jump); vkd3d_free(list); - hlsl_free_instr_list(init); - hlsl_free_instr_list(cond); - hlsl_free_instr_list(iter); - hlsl_free_instr_list(body); + destroy_instr_list(init); + destroy_instr_list(cond); + destroy_instr_list(iter); + destroy_instr_list(body); return NULL; } @@ -405,7 +411,7 @@ static unsigned int initializer_size(const struct parse_initializer *initializer static void free_parse_initializer(struct parse_initializer *initializer) { - hlsl_free_instr_list(initializer->instrs); + destroy_instr_list(initializer->instrs); vkd3d_free(initializer->args); } @@ -1789,7 +1795,7 @@ hlsl_prog: { if (!list_empty($2)) hlsl_fixme(ctx, @2, "Uniform initializer."); - hlsl_free_instr_list($2); + destroy_instr_list($2); } | hlsl_prog preproc_directive | hlsl_prog ';' @@ -2364,7 +2370,7 @@ arrays: unsigned int size = evaluate_array_dimension(node_from_list($2)); uint32_t *new_array; - hlsl_free_instr_list($2); + destroy_instr_list($2); $$ = $4; @@ -2656,7 +2662,7 @@ postfix_expr: { if (!add_increment(ctx, $1, false, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2665,7 +2671,7 @@ postfix_expr: { if (!add_increment(ctx, $1, true, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2717,20 +2723,20 @@ postfix_expr: if (index->data_type->type != HLSL_CLASS_SCALAR) { hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } list_add_tail($1, &cast->node.entry); if (!add_array_load(ctx, $1, array, &cast->node, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2821,7 +2827,7 @@ unary_expr: { if (!add_increment(ctx, $2, false, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; @@ -2830,7 +2836,7 @@ unary_expr: { if (!add_increment(ctx, $2, true, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; -- 2.32.0

6 26

[v2 PATCH vkd3d 1/6] vkd3d-shader/hlsl: Free all instruction lists in reverse order (Valgrind).
by Matteo Bruni 19 Aug '21

19 Aug '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Add a missing vkd3d_free() to free_function_decl(). libs/vkd3d-shader/hlsl.c | 17 ++++++----------- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3544b9d6..0d9186ae 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1278,7 +1278,6 @@ void hlsl_free_instr_list(struct list *list) * the "uses" list. */ LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) hlsl_free_instr(node); - vkd3d_free(list); } static void free_ir_constant(struct hlsl_ir_constant *constant) @@ -1297,12 +1296,8 @@ static void free_ir_expr(struct hlsl_ir_expr *expr) static void free_ir_if(struct hlsl_ir_if *if_node) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&if_node->then_instrs); + hlsl_free_instr_list(&if_node->else_instrs); hlsl_src_remove(&if_node->condition); vkd3d_free(if_node); } @@ -1320,10 +1315,7 @@ static void free_ir_load(struct hlsl_ir_load *load) static void free_ir_loop(struct hlsl_ir_loop *loop) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&loop->body); vkd3d_free(loop); } @@ -1342,6 +1334,8 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) void hlsl_free_instr(struct hlsl_ir_node *node) { + assert(list_empty(&node->uses)); + switch (node->type) { case HLSL_IR_CONSTANT: @@ -1382,6 +1376,7 @@ static void free_function_decl(struct hlsl_ir_function_decl *decl) { vkd3d_free(decl->parameters); hlsl_free_instr_list(decl->body); + vkd3d_free(decl->body); vkd3d_free(decl); } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5f1e9167..cb4fd7c8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -136,6 +136,12 @@ static struct list *make_empty_list(struct hlsl_ctx *ctx) return list; } +static void destroy_instr_list(struct list *list) +{ + hlsl_free_instr_list(list); + vkd3d_free(list); +} + static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) { if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) @@ -385,10 +391,10 @@ oom: vkd3d_free(loop); vkd3d_free(cond_jump); vkd3d_free(list); - hlsl_free_instr_list(init); - hlsl_free_instr_list(cond); - hlsl_free_instr_list(iter); - hlsl_free_instr_list(body); + destroy_instr_list(init); + destroy_instr_list(cond); + destroy_instr_list(iter); + destroy_instr_list(body); return NULL; } @@ -405,7 +411,7 @@ static unsigned int initializer_size(const struct parse_initializer *initializer static void free_parse_initializer(struct parse_initializer *initializer) { - hlsl_free_instr_list(initializer->instrs); + destroy_instr_list(initializer->instrs); vkd3d_free(initializer->args); } @@ -1789,7 +1795,7 @@ hlsl_prog: { if (!list_empty($2)) hlsl_fixme(ctx, @2, "Uniform initializer."); - hlsl_free_instr_list($2); + destroy_instr_list($2); } | hlsl_prog preproc_directive | hlsl_prog ';' @@ -2364,7 +2370,7 @@ arrays: unsigned int size = evaluate_array_dimension(node_from_list($2)); uint32_t *new_array; - hlsl_free_instr_list($2); + destroy_instr_list($2); $$ = $4; @@ -2656,7 +2662,7 @@ postfix_expr: { if (!add_increment(ctx, $1, false, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2665,7 +2671,7 @@ postfix_expr: { if (!add_increment(ctx, $1, true, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2717,20 +2723,20 @@ postfix_expr: if (index->data_type->type != HLSL_CLASS_SCALAR) { hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } list_add_tail($1, &cast->node.entry); if (!add_array_load(ctx, $1, array, &cast->node, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2821,7 +2827,7 @@ unary_expr: { if (!add_increment(ctx, $2, false, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; @@ -2830,7 +2836,7 @@ unary_expr: { if (!add_increment(ctx, $2, true, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; -- 2.26.3

2 1

gst.h present but cannot be compiled
by Ozan Türkyılmaz 19 Aug '21

19 Aug '21

Hello All, I was checking the latest git wine source and I had the below error message: checking gst/gst.h usability... no checking gst/gst.h presence... yes configure: WARNING: gst/gst.h: present but cannot be compiled configure: WARNING: gst/gst.h: check for missing prerequisite headers? configure: WARNING: gst/gst.h: see the Autoconf documentation configure: WARNING: gst/gst.h: section "Present But Cannot Be Compiled" configure: WARNING: gst/gst.h: proceeding with the compiler's result configure: WARNING: ## ------------------------------------ ## configure: WARNING: ## Report this to wine-devel(a)winehq.org ## configure: WARNING: ## ------------------------------------ ## checking for gst/gst.h... no As the error message said I should report this to wine-devel, I am writing this email. I use Slackware-current update (actually Slackware 15 RC1 now). My gstreamer version is 1.18.4 and I checked the build scripts and there's no upstream patches applied. Gcc version is 11.2.0 if any other questions, please ask and I will provide information. Regards, Ozan

2 1

[PATCH vkd3d] tests/vkd3d_api: Ignore llvmpipe device for testing.
by Giovanni Mascellani 19 Aug '21

19 Aug '21

Creating a D3D12 device backed by a llvmpipe physical device fails because llvmpipe doesn't implement some required extensions. This is not a failure in vkd3d. --- tests/vkd3d_api.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 8195c067..c32fc465 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -553,6 +553,14 @@ static void test_physical_device(void) { for (i = 0; i < count; ++i) { + VkPhysicalDeviceProperties vk_physical_device_properties; + vkGetPhysicalDeviceProperties(vk_physical_devices[i], &vk_physical_device_properties); + if (strncmp(vk_physical_device_properties.deviceName, "llvmpipe", 8) == 0) + { + trace("Ignoring llvmpipe device.\n"); + continue; + } + trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); create_info.vk_physical_device = vk_physical_devices[i]; -- 2.33.0

1 0

[PATCH vkd3d v2 6/7] vkd3d-shader: Handle extended instruction operand fields.
by Conor McCarthy 19 Aug '21

19 Aug '21

Prevents any non-zero value in fields starting at bit 14 from causing the modifier flags to be skipped, and emits proper warning and fixme messages. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- Supersedes patch 211558. --- libs/vkd3d-shader/dxbc.c | 60 ++++++++++++++++++++++++++++------------ libs/vkd3d-shader/sm4.h | 25 +++++++++++++---- 2 files changed, 63 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index fab19046..338499cd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1123,8 +1123,9 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr } param->data_type = data_type; - if (token & VKD3D_SM4_REGISTER_MODIFIER) + if (token & VKD3D_SM4_EXTENDED_OPERAND) { + unsigned int type; DWORD m; if (*ptr >= end) @@ -1133,27 +1134,52 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr return false; } m = *(*ptr)++; + type = m & VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK; - switch (m) + if (type == VKD3D_SM4_EXTENDED_OPERAND_MODIFIER) { - case VKD3D_SM4_REGISTER_MODIFIER_NEGATE: - *modifier = VKD3DSPSM_NEG; - break; + unsigned int min_precis = (m & VKD3D_SM4_REGISTER_MIN_PRECIS_MASK) >> VKD3D_SM4_REGISTER_MIN_PRECIS_SHIFT; + unsigned int op_mod = (m & VKD3D_SM4_REGISTER_MODIFIER_MASK) >> VKD3D_SM4_REGISTER_MODIFIER_SHIFT; + unsigned int non_uniform = + (m & VKD3D_SM4_REGISTER_NON_UNIFORM_MASK) >> VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT; - case VKD3D_SM4_REGISTER_MODIFIER_ABS: - *modifier = VKD3DSPSM_ABS; - break; + switch (op_mod & (VKD3D_SM4_REGISTER_MODIFIER_ABS | VKD3D_SM4_REGISTER_MODIFIER_NEGATE)) + { + case VKD3D_SM4_REGISTER_MODIFIER_NEGATE: + *modifier = VKD3DSPSM_NEG; + break; - case VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE: - *modifier = VKD3DSPSM_ABSNEG; - break; + case VKD3D_SM4_REGISTER_MODIFIER_ABS: + *modifier = VKD3DSPSM_ABS; + break; - default: - FIXME("Skipping modifier 0x%08x.\n", m); - /* fall-through */ - case VKD3D_SM4_REGISTER_MODIFIER_NONE: - *modifier = VKD3DSPSM_NONE; - break; + case VKD3D_SM4_REGISTER_MODIFIER_ABS | VKD3D_SM4_REGISTER_MODIFIER_NEGATE: + *modifier = VKD3DSPSM_ABSNEG; + break; + + default: + *modifier = VKD3DSPSM_NONE; + break; + } + op_mod &= ~(VKD3D_SM4_REGISTER_MODIFIER_ABS | VKD3D_SM4_REGISTER_MODIFIER_NEGATE); + if (op_mod) + FIXME("Skipping modifier flags %#x.\n", op_mod); + + if (min_precis) + WARN("Ignoring minimum precision %#x.\n", min_precis); + + if (non_uniform) + FIXME("Ignoring extended modifier NON_UNIFORM.\n"); + } + else if (type) + { + FIXME("Unhandled extended operand type %#x.\n", type); + } + + if (m & VKD3D_SM4_EXTENDED_OPERAND) + { + FIXME("Skipping second-order extended operand.\n"); + *ptr += *ptr < end; } } else diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 335f0161..495582ca 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -93,7 +93,18 @@ #define VKD3D_SM4_OPCODE_MASK 0xff -#define VKD3D_SM4_REGISTER_MODIFIER (0x1u << 31) +#define VKD3D_SM4_EXTENDED_OPERAND (0x1u << 31) + +#define VKD3D_SM4_EXTENDED_OPERAND_TYPE_MASK 0x1fu + +#define VKD3D_SM4_REGISTER_MODIFIER_SHIFT 6 +#define VKD3D_SM4_REGISTER_MODIFIER_MASK (0xffu << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + +#define VKD3D_SM4_REGISTER_MIN_PRECIS_SHIFT 14 +#define VKD3D_SM4_REGISTER_MIN_PRECIS_MASK (0x7u << VKD3D_SM4_REGISTER_MIN_PRECIS_SHIFT) + +#define VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT 17 +#define VKD3D_SM4_REGISTER_NON_UNIFORM_MASK (0x1u << VKD3D_SM4_REGISTER_NON_UNIFORM_SHIFT) #define VKD3D_SM4_ADDRESSING_SHIFT2 28 #define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) @@ -381,12 +392,16 @@ enum vkd3d_sm4_register_type VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, }; +enum vkd3d_sm4_extended_operand_type +{ + VKD3D_SM4_EXTENDED_OPERAND_NONE = 0x0, + VKD3D_SM4_EXTENDED_OPERAND_MODIFIER = 0x1, +}; + enum vkd3d_sm4_register_modifier { - VKD3D_SM4_REGISTER_MODIFIER_NONE = 0x01, - VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x41, - VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x81, - VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE = 0xc1, + VKD3D_SM4_REGISTER_MODIFIER_NEGATE = 0x1, + VKD3D_SM4_REGISTER_MODIFIER_ABS = 0x2, }; enum vkd3d_sm4_output_primitive_type -- 2.32.0

2 3

[PATCH vkd3d 1/7] tests: Add tests for unbounded descriptor arrays.
by Conor McCarthy 19 Aug '21

19 Aug '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 325 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2b1830bd..618c2291 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34797,6 +34797,329 @@ done: destroy_test_context(&context); } +static void test_unbounded_resource_arrays(void) +{ + ID3D12Resource *constant_buffers[64], *input_buffers[64], *output_buffers[128]; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D12_CONSTANT_BUFFER_VIEW_DESC cbv_desc; + ID3D12GraphicsCommandList *command_list; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, UINT_MAX, 2, 1, 0}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, UINT_MAX, 2, 1, 64}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 1, 128}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 2, 127}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 3, 192}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges), descriptor_ranges}}, + }; + + static const DWORD cs_code[] = + { + /* Compiled with /res_may_alias (but it has no effect on the output from fxc 10.1). */ +#if 0 + struct cb + { + uint value; + }; + ConstantBuffer<cb> c1[] : register(b2, space1); + + Buffer<uint> t1[] : register(t2, space1); + + RWBuffer<uint> u1[] : register(u1, space1); + RWBuffer<uint> u2[] : register(u2, space2); + RWBuffer<uint> u3[] : register(u1, space3); + + [numthreads(64, 1, 1)] + void main(uint id : SV_DispatchThreadID) + { + uint i = c1[NonUniformResourceIndex(id)].value; + if (id < 64) // Workaround for an fxc bug. + { + u1[NonUniformResourceIndex(id)][0] = t1[NonUniformResourceIndex(i)][0]; + // If u2 is an alias of u1, this should copy u1. + u3[NonUniformResourceIndex(id)][0] = u2[NonUniformResourceIndex(id)][0]; + } + } +#endif + 0x43425844, 0x82871767, 0x87353509, 0x8ccc50cb, 0x5006dd54, 0x00000001, 0x00000250, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x000001fc, 0x00050051, 0x0000007f, 0x0100086a, + 0x07000859, 0x00308e46, 0x00000000, 0x00000002, 0xffffffff, 0x00000001, 0x00000001, 0x07000858, + 0x00307e46, 0x00000000, 0x00000002, 0xffffffff, 0x00004444, 0x00000001, 0x0700089c, 0x0031ee46, + 0x00000000, 0x00000001, 0xffffffff, 0x00004444, 0x00000001, 0x0700089c, 0x0031ee46, 0x00000001, + 0x00000002, 0xffffffff, 0x00004444, 0x00000002, 0x0700089c, 0x0031ee46, 0x00000002, 0x00000001, + 0xffffffff, 0x00004444, 0x00000003, 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, + 0x00000040, 0x00000001, 0x00000001, 0x0600004f, 0x00100012, 0x00000000, 0x0002000a, 0x00004001, + 0x00000040, 0x0304001f, 0x0010000a, 0x00000000, 0x04000036, 0x00100012, 0x00000000, 0x0002000a, + 0x0a000036, 0x00100022, 0x00000000, 0x8630800a, 0x00020001, 0x00000000, 0x00000002, 0x0010000a, + 0x00000000, 0x00000000, 0x0e00002d, 0x00100022, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x86207e16, 0x00020001, 0x00000000, 0x00000002, 0x0010001a, 0x00000000, + 0x0e0000a4, 0x8621e0f2, 0x00020001, 0x00000000, 0x00000001, 0x0010000a, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100556, 0x00000000, 0x0e0000a3, 0x00100022, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8621ee16, 0x00020001, + 0x00000001, 0x00000002, 0x0010000a, 0x00000000, 0x0e0000a4, 0x8621e0f2, 0x00020001, 0x00000002, + 0x00000001, 0x0010000a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00100556, 0x00000000, 0x01000015, 0x0100003e, + }; + + if (!init_compute_test_context(&context)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + todo + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + if (FAILED(hr)) + goto done; + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 256); + + for (i = 0; i < ARRAY_SIZE(constant_buffers); ++i) + { + uint32_t cb_data = 63 - i; + constant_buffers[i] = create_default_buffer(device, D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(constant_buffers[i], 0, sizeof(cb_data), &cb_data, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, constant_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(constant_buffers[i]); + cbv_desc.SizeInBytes = align(sizeof(cb_data), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT); + ID3D12Device_CreateConstantBufferView(context.device, &cbv_desc, get_cpu_descriptor_handle(&context, heap, i)); + } + + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) + { + uint32_t srv_data = i ^ 0x35; + input_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(input_buffers[i], 0, sizeof(srv_data), &srv_data, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_R32_UINT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + ID3D12Device_CreateShaderResourceView(device, input_buffers[i], &srv_desc, + get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(constant_buffers) + i)); + } + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + { + output_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_R32_UINT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = 1; + ID3D12Device_CreateUnorderedAccessView(device, output_buffers[i], NULL, + &uav_desc, get_cpu_descriptor_handle(&context, heap, + ARRAY_SIZE(constant_buffers) + ARRAY_SIZE(input_buffers) + i)); + } + + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_code, sizeof(cs_code))); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, + 0, get_gpu_descriptor_handle(&context, heap, 0)); + + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + { + vkd3d_test_set_context("buffer %u", i); + transition_sub_resource_state(command_list, output_buffers[i], 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + /* Buffers at index >= 64 are aliased. */ + check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + } + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + ID3D12Resource_Release(output_buffers[i]); + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) + ID3D12Resource_Release(input_buffers[i]); + for (i = 0; i < ARRAY_SIZE(constant_buffers); ++i) + ID3D12Resource_Release(constant_buffers[i]); + ID3D12DescriptorHeap_Release(heap); +done: + destroy_test_context(&context); +} + +static void test_unbounded_samplers(void) +{ + ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; + ID3D12Resource *input_texture, *output_buffer; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_SAMPLER_DESC sampler_desc; + D3D12_SUBRESOURCE_DATA data; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 1, 1, 1, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER, UINT_MAX, 1, 1, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, .DescriptorTable = {1, &descriptor_ranges[0]}}, + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, .DescriptorTable = {1, &descriptor_ranges[1]}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {1, 1}}, + }; + + static const DWORD cs_code[] = + { +#if 0 + Texture2D<float> t1 : register(t1, space1); + SamplerState s1[] : register(s1, space1); + RWByteAddressBuffer u1 : register(u1, space1); + + [numthreads(64, 1, 1)] + void main(uint id : SV_DispatchThreadID) + { + // Should alternate between wrap (address 0.1), or clamp (address 1.0). + uint value = t1.SampleLevel(s1[NonUniformResourceIndex(id)], float2(1.1, 1.1), 0.0); + u1.Store(4 * id, value); + } +#endif + 0x43425844, 0x19feacce, 0xef7000f7, 0xd6411d98, 0x890a6fa4, 0x00000001, 0x00000178, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000124, 0x00050051, 0x00000049, 0x0100086a, + 0x0600005a, 0x00306e46, 0x00000000, 0x00000001, 0xffffffff, 0x00000001, 0x07001858, 0x00307e46, + 0x00000000, 0x00000001, 0x00000001, 0x00005555, 0x00000001, 0x0600009d, 0x0031ee46, 0x00000000, + 0x00000001, 0x00000001, 0x00000001, 0x0200005f, 0x00020012, 0x02000068, 0x00000001, 0x0400009b, + 0x00000040, 0x00000001, 0x00000001, 0x04000036, 0x00100012, 0x00000000, 0x0002000a, 0x13000048, + 0x00100012, 0x00000000, 0x00004002, 0x3f8ccccd, 0x3f8ccccd, 0x00000000, 0x00000000, 0x00207e46, + 0x00000000, 0x00000001, 0x86206000, 0x00020001, 0x00000000, 0x00000001, 0x0010000a, 0x00000000, + 0x00004001, 0x00000000, 0x0500001c, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x06000029, + 0x00100022, 0x00000000, 0x0002000a, 0x00004001, 0x00000002, 0x080000a6, 0x0021e012, 0x00000000, + 0x00000001, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, + }; + + static const float texture_data[] = {10.0f, 100.0f, 100.0f, 100.0f}; + + if (!init_compute_test_context(&context)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.Flags = 0; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.pParameters = root_parameters; + + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + todo + ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + if (FAILED(hr)) + goto done; + + input_texture = create_default_texture2d(device, 2, 2, 1, 1, DXGI_FORMAT_R32_FLOAT, D3D12_RESOURCE_FLAG_NONE, + D3D12_RESOURCE_STATE_COPY_DEST); + data.pData = texture_data; + data.RowPitch = 2 * sizeof(uint32_t); + data.SlicePitch = 2 * data.RowPitch; + upload_texture_data(input_texture, &data, 1, queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_texture, D3D12_RESOURCE_STATE_COPY_DEST, + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + output_buffer = create_default_buffer(device, 64 * sizeof(uint32_t), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + context.pipeline_state = create_compute_pipeline_state(device, + context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + sampler_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER, 64); + + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Format = DXGI_FORMAT_R32_FLOAT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + srv_desc.Texture2D.MipLevels = 1; + srv_desc.Texture2D.MostDetailedMip = 0; + srv_desc.Texture2D.PlaneSlice = 0; + srv_desc.Texture2D.ResourceMinLODClamp = 0; + ID3D12Device_CreateShaderResourceView(device, input_texture, &srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + for (i = 0; i < 64; ++i) + { + memset(&sampler_desc, 0, sizeof(sampler_desc)); + sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = sampler_desc.AddressV = sampler_desc.AddressW + = (i & 1) ? D3D12_TEXTURE_ADDRESS_MODE_CLAMP : D3D12_TEXTURE_ADDRESS_MODE_WRAP; + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_descriptor_handle(&context, sampler_heap, i)); + } + + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + heaps[0] = heap; heaps[1] = sampler_heap; + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 2, heaps); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 1, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap)); + ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(command_list, 2, ID3D12Resource_GetGPUVirtualAddress(output_buffer)); + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + transition_resource_state(command_list, output_buffer, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(output_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < 64; ++i) + { + unsigned int value = get_readback_uint(&rb, i, 0, 0); + unsigned int expected = (i & 1) ? 100 : 10; + ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(input_texture); + ID3D12Resource_Release(output_buffer); + ID3D12DescriptorHeap_Release(heap); + ID3D12DescriptorHeap_Release(sampler_heap); +done: + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -34968,4 +35291,6 @@ START_TEST(d3d12) run_test(test_hull_shader_relative_addressing); run_test(test_hull_shader_patch_constant_inputs); run_test(test_resource_arrays); + run_test(test_unbounded_resource_arrays); + run_test(test_unbounded_samplers); } -- 2.32.0

4 12

[PATCH vkd3d v2 1/5] vkd3d-shader/glsl: Implement vkd3d_glsl_generator_generate().
by Atharva Nimbalkar 19 Aug '21

19 Aug '21

Signed-off-by: Atharva Nimbalkar <atharvakn(a)gmail.com> --- Makefile.am | 1 + libs/vkd3d-shader/glsl.c | 118 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 17 +++- libs/vkd3d-shader/vkd3d_shader_private.h | 9 ++ 4 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 libs/vkd3d-shader/glsl.c diff --git a/Makefile.am b/Makefile.am index 9624485..18ba0fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -169,6 +169,7 @@ libvkd3d_shader_la_SOURCES = \ include/vkd3d_shader.h \ libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/dxbc.c \ + libs/vkd3d-shader/glsl.c \ libs/vkd3d-shader/hlsl.c \ libs/vkd3d-shader/hlsl.h \ libs/vkd3d-shader/hlsl_codegen.c \ diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c new file mode 100644 index 0000000..5b4b62b --- /dev/null +++ b/libs/vkd3d-shader/glsl.c @@ -0,0 +1,118 @@ +/* + * Copyright 2021 Atharva Nimbalkar + * + * 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 "vkd3d_shader_private.h" + +struct vkd3d_glsl_generator +{ + struct vkd3d_string_buffer buffer; + struct vkd3d_shader_location location; + struct vkd3d_shader_message_context *message_context; + bool failed; +}; + +struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_glsl_generator *generator; + + if (!(generator = vkd3d_malloc(sizeof(*generator)))) + return NULL; + + memset(generator, 0, sizeof(*generator)); + generator->location.source_name = compile_info->source_name; + generator->location.line = 2; /* Line 1 is the version token. */ + generator->message_context = message_context; + return generator; +} + +static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error( + struct vkd3d_glsl_generator *generator, + enum vkd3d_shader_error error, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vkd3d_shader_verror(generator->message_context, &generator->location, error, fmt, args); + va_end(args); + generator->failed = true; + return; +} + +static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator, + const struct vkd3d_shader_instruction *instruction) +{ + switch (instruction->handler_idx) + { + default: + vkd3d_glsl_compiler_error(generator, + VKD3D_SHADER_ERROR_GLSL_INTERNAL, + "Unhandled instruction %#x", instruction->handler_idx); + break; + } + + ++generator->location.line; + return; +} + +int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, + struct vkd3d_glsl_generator *generator, + struct vkd3d_shader_code *out) +{ + void *code; + struct vkd3d_shader_instruction ins; + + vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); + vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); + + while (!shader_sm4_is_end(parser_data, &parser_ptr)) + { + shader_sm4_read_instruction(parser_data, &parser_ptr, &ins); + + if (ins.handler_idx == VKD3DSIH_INVALID) + { + vkd3d_glsl_compiler_error(generator, + VKD3D_SHADER_ERROR_GLSL_INTERNAL, + "Encountered unrecognized or invalid instruction."); + break; + } + + vkd3d_glsl_handle_instruction(generator, &ins); + } + + if (generator->failed) + return VKD3D_ERROR; + + vkd3d_string_buffer_printf(&generator->buffer, "}\n"); + + if ((code = vkd3d_malloc(generator->buffer.buffer_size))) + { + memcpy(code, generator->buffer.buffer, generator->buffer.content_size); + out->size = generator->buffer.content_size; + out->code = code; + } + else return VKD3D_ERROR_OUT_OF_MEMORY; + + return VKD3D_OK; +} + +void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator) +{ + vkd3d_string_buffer_cleanup(&generator->buffer); + vkd3d_free(generator); +} diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a9b5d0a..d2182e1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1034,11 +1034,22 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_GLSL) { - vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_GLSL_INTERNAL, - "Internal compiler error: Unhandled instruction."); + struct vkd3d_glsl_generator *glsl_generator; + + if (!(glsl_generator = vkd3d_glsl_generator_create(compile_info, message_context))) + { + ERR("Failed to create GLSL generator.\n"); + vkd3d_shader_parser_destroy(&parser); + vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); + return VKD3D_ERROR; + } + + ret = vkd3d_glsl_generator_generate(parser.data, parser.ptr, glsl_generator, out); + + vkd3d_glsl_generator_destroy(glsl_generator); vkd3d_shader_parser_destroy(&parser); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - return VKD3D_ERROR; + return ret; } if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b490b9c..3863797 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -984,6 +984,15 @@ void free_shader_desc(struct vkd3d_shader_desc *desc); int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature); +struct vkd3d_glsl_generator; + +struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context); +int vkd3d_glsl_generator_generate(void *parser_data, const uint32_t *parser_ptr, + struct vkd3d_glsl_generator *generator, + struct vkd3d_shader_code *out); +void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator); + struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, -- 2.32.0

2 9

[PATCH 1/5] msxml3: Do not depend on libxml2 for DOM implementation object.
by Nikolay Sivov 19 Aug '21

19 Aug '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/domimpl.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 74223d5d54e..52f2e40dc9e 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -20,13 +20,7 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -#endif #include "windef.h" #include "winbase.h" @@ -34,12 +28,10 @@ #include "ole2.h" #include "msxml6.h" -#include "msxml_private.h" +#include "msxml_dispex.h" #include "wine/debug.h" -#ifdef HAVE_LIBXML2 - WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domimpl @@ -211,5 +203,3 @@ IUnknown* create_doc_Implementation(void) return (IUnknown*)&This->IXMLDOMImplementation_iface; } - -#endif -- 2.32.0

1 4

[PATCH v3 1/2] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 19 Aug '21

19 Aug '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 20 ++++++++++++++++++++ dlls/dsound/dsound_convert.c | 30 ++++++++++++++++++++---------- dlls/dsound/dsound_private.h | 5 ++++- dlls/dsound/mixer.c | 19 +++++++++++++++++++ 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..bbc7de805a8 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1081,6 +1081,13 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + FillMemory(dsb->committedbuff, dsb->writelead, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1142,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; @@ -1157,6 +1165,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; + VOID *committedbuff; TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); @@ -1166,6 +1175,14 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } + committedbuff = HeapAlloc(GetProcessHeap(),0,pdsb->writelead); + if (committedbuff == NULL) { + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; + } + FillMemory(committedbuff, pdsb->writelead, pdsb->pwfx->wBitsPerSample == 8 ? 128 : 0); + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); @@ -1175,6 +1192,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { + HeapFree(GetProcessHeap(),0,committedbuff); HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL; return DSERR_OUTOFMEMORY; @@ -1192,6 +1210,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; + dsb->committedbuff = committedbuff; DSOUND_RecalcFormat(dsb); InitializeSRWLock(&dsb->lock); @@ -1202,6 +1221,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb->committedbuff); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; }else diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..fc2b0cd0797 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,17 +55,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif +static BYTE *buff_byte(const IDirectSoundBufferImpl *dsb, DWORD offset) +{ + if(offset >= dsb->sec_mixpos && offset < dsb->sec_mixpos + dsb->writelead) { + return (BYTE*)dsb->committedbuff + (offset - dsb->sec_mixpos); + }else if(offset < (dsb->sec_mixpos + dsb->writelead) % dsb->buflen) { + return (BYTE*)dsb->committedbuff + (dsb->buflen - dsb->sec_mixpos + offset); + }else{ + return dsb->buffer->memory + offset; + } +} + static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = buff_byte(dsb, pos + channel); return (buf[0] - 0x80) / (float)0x80; } static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = buff_byte(dsb, pos + 2 * channel); + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } @@ -73,8 +83,8 @@ static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = buff_byte(dsb, pos + 3 * channel); + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -84,16 +94,16 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = buff_byte(dsb, pos + 4 * channel); + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..a79d62c54da 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -153,7 +153,10 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + LPVOID committedbuff; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..32656fbd618 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -391,6 +391,18 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu dsb->sec_mixpos = ipos; } +static void copy_circular(VOID *dstbuff, VOID *srcbuff, DWORD srcoff, DWORD srcsize, DWORD cpysize) +{ + DWORD overflow; + if(cpysize > srcsize - srcoff) { + overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } +} + /** * Calculate the distance between two buffer offsets, taking wraparound * into account. @@ -518,6 +530,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, INT ilen = DSOUND_BufPtrDiff(dsb->buflen, dsb->sec_mixpos, oldpos); DSOUND_CheckEvent(dsb, oldpos, ilen); } + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); return frames; } @@ -551,6 +565,11 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD } } + if(dsb->leadin) { + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); + copy_circular(dsb->committedbuff, dsb->buffer->memory, dsb->sec_mixpos, dsb->buflen, dsb->writelead); + } + dsb->leadin = FALSE; TRACE("frames (primary) = %i\n", frames); -- 2.17.1

2 2

[PATCH 9/9] gdi32: Move GetCharacterPlacementW to text.c.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 181 ------------------------------- dlls/gdi32/ntgdi_private.h | 17 --- dlls/gdi32/text.c | 212 ++++++++++++++++++++++++++++++++++--- 3 files changed, 198 insertions(+), 212 deletions(-)

2 1

[PATCH 8/9] gdi32: Move bidi text reordering to ExtTextOutW.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 36 +++++------------------------------- dlls/gdi32/gdidc.c | 15 --------------- dlls/gdi32/text.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 46 deletions(-)

2 1

[PATCH 7/9] gdi32: Rename bidi.c to text.c.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{bidi.c => text.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dlls/gdi32/{bidi.c => text.c} (99%)

2 1

[PATCH 6/9] gdi32: Use NtGdiGetAndSetDCDword for SetDCPenColor.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 33 ++++++---------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 19 ++++++++-------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 13 +++++++++++ include/ntgdi.h | 1 + 7 files changed, 32 insertions(+), 38 deletions(-)

2 1

[PATCH 5/9] gdi32: Use NtGdiGetAndSetDCDword for SetDCBrushColor.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 34 +++++++--------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/enhmfdrv/objects.c | 19 ++++++++-------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 13 +++++++++++ include/ntgdi.h | 1 + 7 files changed, 33 insertions(+), 38 deletions(-)

2 1

[PATCH 4/9] gdi32: Use ntgdi names for GetPath and PathToRegion.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 4 +-- dlls/gdi32/path.c | 75 +++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 41 deletions(-)

2 1

[PATCH 3/9] gdi32: Use NtGdiWidenPath for WidenPath.
by Jacek Caban 19 Aug '21

19 Aug '21

2 1

[PATCH 2/9] gdi32: Use NtGdiStrokePath for StrokePath.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 6 ++---- 4 files changed, 25 insertions(+), 5 deletions(-)

2 1

[PATCH 1/9] gdi32: Use NtGdiStrokeAndFillPath for StrokeAndFillPath.
by Jacek Caban 19 Aug '21

19 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 6 ++---- 4 files changed, 25 insertions(+), 5 deletions(-)

2 1

[PATCH] quartz: Change reference increasing method to avoid unintended DLL unloading.
by Hiroki Awata 19 Aug '21

19 Aug '21

Incrementing object_locks by DSCF_CreateInstance is sometimes wrong. For example, dsound_render_create creates two instances because it calls system_clock_create internally, but object_locks is only increased by 1. Each create function should increase the object_locks instead of DSCF_CreateInstance. --- It was discussed in this thread. https://www.winehq.org/pipermail/wine-devel/2021-August/192369.html Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/quartz/acmwrapper.c | 1 + dlls/quartz/avidec.c | 1 + dlls/quartz/dsoundrender.c | 1 + dlls/quartz/filesource.c | 1 + dlls/quartz/filtergraph.c | 1 + dlls/quartz/filtermapper.c | 3 +++ dlls/quartz/main.c | 1 - dlls/quartz/memallocator.c | 1 + dlls/quartz/passthrough.c | 1 + dlls/quartz/systemclock.c | 1 + dlls/quartz/vmr9.c | 1 + 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..0804c18b3c8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -534,6 +534,7 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) object->lasttime_real = object->lasttime_sent = -1; + InterlockedIncrement(&object_locks); TRACE("Created ACM wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..8191b703553 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -611,6 +611,7 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); + InterlockedIncrement(&object_locks); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..521a97ca359 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1049,6 +1049,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; object->IQualityControl_iface.lpVtbl = &dsound_render_qc_vtbl; + InterlockedIncrement(&object_locks); TRACE("Created DirectSound renderer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..12830d404b8 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -430,6 +430,7 @@ HRESULT async_reader_create(IUnknown *outer, IUnknown **out) object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + InterlockedIncrement(&object_locks); TRACE("Created file source %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..6b13fca6787 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5652,6 +5652,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL else object->message_thread = NULL; + InterlockedIncrement(&object_locks); TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..249867da8c8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -195,6 +195,7 @@ static HRESULT enum_reg_filters_create(REGFILTER *filters, unsigned int count, I object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumRegFilters_iface; return S_OK; @@ -329,6 +330,7 @@ static HRESULT enum_moniker_create(IMoniker **filters, unsigned int count, IEnum object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumMoniker_iface; return S_OK; @@ -1701,6 +1703,7 @@ HRESULT filter_mapper_create(IUnknown *pUnkOuter, IUnknown **out) else pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + InterlockedIncrement(&object_locks); TRACE("Created filter mapper %p.\n", pFM2impl); *out = &pFM2impl->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..282c56e6c7f 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -127,7 +127,6 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..1bc4d1d0041 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -936,5 +936,6 @@ HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) else CoTaskMemFree(pMemAlloc); + InterlockedIncrement(&object_locks); return hr; } diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..e576547f934 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -108,6 +108,7 @@ HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) strmbase_passthrough_init(&object->passthrough, object->outer_unk); + InterlockedIncrement(&object_locks); TRACE("Created seeking passthrough %p.\n", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..917cde99681 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -339,6 +339,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + InterlockedIncrement(&object_locks); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..df50a32d514 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2587,6 +2587,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + InterlockedIncrement(&object_locks); TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; -- 2.27.0

1 0

[PATCH] nsiproxy: Use $(PROCSTAT_LIBS)
by Gerald Pfeifer 19 Aug '21

19 Aug '21

We try to use libprocstat on non-Linux platforms and detect its presence in the configure phase. Make sure we actually link this library in that case, so add $(PROCSTAT_LIBS) to EXTRADLLFLAGS. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/nsiproxy.sys/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/Makefile.in b/dlls/nsiproxy.sys/Makefile.in index cee4b72c33f..0e9e6de9355 100644 --- a/dlls/nsiproxy.sys/Makefile.in +++ b/dlls/nsiproxy.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = nsiproxy.sys IMPORTS = ntoskrnl uuid -EXTRADLLFLAGS = -Wl,--subsystem,native +EXTRADLLFLAGS = -Wl,--subsystem,native $(PROCSTAT_LIBS) C_SRCS = \ device.c \ -- 2.31.1

2 2

[PATCH] server: Remove check for macOS version < 10.5.
by Huw Davies 19 Aug '21

19 Aug '21

Our stated minimum requirement is 10.8. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- server/fd.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/server/fd.c b/server/fd.c index b953da2ab85..de7c5d7e36d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -627,16 +627,6 @@ static int kqueue_fd = -1; static inline void init_epoll(void) { -#ifdef __APPLE__ /* kqueue support is broken in Mac OS < 10.5 */ - int mib[2]; - char release[32]; - size_t len = sizeof(release); - - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELEASE; - if (sysctl( mib, 2, release, &len, NULL, 0 ) == -1) return; - if (atoi(release) < 9) return; -#endif kqueue_fd = kqueue(); } -- 2.23.0

1 0

[PATCH 6/6] configure: Remove no longer used checks for libkstat.
by Huw Davies 19 Aug '21

19 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configure.ac b/configure.ac index a143f6d3d2a..c58076ed1d6 100644 --- a/configure.ac +++ b/configure.ac @@ -468,7 +468,6 @@ AC_CHECK_HEADERS(\ gsm/gsm.h \ ieeefp.h \ inet/mib2.h \ - kstat.h \ libproc.h \ link.h \ linux/cdrom.h \ @@ -1944,14 +1943,6 @@ then enable_xaudio2_9=${enable_xaudio2_9:-no} fi -dnl **** Check for libkstat **** -if test "$ac_cv_header_kstat_h" = "yes" -then - AC_CHECK_LIB(kstat,kstat_open, - [AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).]) - AC_SUBST(KSTAT_LIBS,"-lkstat")]) -fi - dnl **** Check for libprocstat **** if test "$ac_cv_header_libprocstat_h" = "yes" then -- 2.23.0

1 0

[PATCH 5/6] iphlpapi: Remove no longer needed libraries.
by Huw Davies 19 Aug '21

19 Aug '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 326cf8bf75e..9d7345251bd 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -1,7 +1,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRALIBS = $(KSTAT_LIBS) $(PROCSTAT_LIBS) C_SRCS = \ icmp.c \ -- 2.23.0

1 0

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-devel