August 2021 - Wine-devel - list.winehq.org

[PATCH 6/8] gdi32: Store font code page in DC_ATTR.
by Jacek Caban 20 Aug '21

20 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/font.c | 28 ++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/text.c | 9 +++++++++ include/ntgdi.h | 1 + 5 files changed, 17 insertions(+), 24 deletions(-)

2 1

[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