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

[PATCH] d3dx9/tests: Clean up GetMatrixPointerArray() tests.
by Matteo Bruni 04 Oct '21

04 Oct '21

Inspired by a patch from Eric Pouech. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Eric, can you test this patch and see if it still fixes the warnings with GCC 11? --- dlls/d3dx9_36/tests/effect.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 86edb1ac65c..7fce65548ec 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1470,20 +1470,28 @@ static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { + union + { + float f[sizeof(D3DXMATRIX) / sizeof(float)]; + D3DXMATRIX m; + } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; UINT l, k, m, element, err = 0; + union + { + DWORD d; + float f; + } cmp = {0xabababab}; for (element = 0; element <= res_desc->Elements + 1; ++element) { memset(fvalue, 0xab, sizeof(fvalue)); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + matrix_pointer_array[l] = &fvalue[l].m; } hr = effect->lpVtbl->GetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); if (!element) @@ -1491,7 +1499,10 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ ok(hr == D3D_OK, "%u - %s[%u]: GetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3D_OK); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[l].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { @@ -1506,20 +1517,27 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ { if (k < res_desc->Columns && l < res_desc->Rows) { - if (!compare_float(fvalue[m * 16 + l * 4 + k], get_float(res_desc->Type, + if (!compare_float(fvalue[m].m.m[l][k], get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512)) ++err; } - else if (fvalue[m * 16 + l * 4 + k] != 0.0f) ++err; + else if (fvalue[m].m.m[l][k] != 0.0f) + ++err; } } } - for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = element; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else { - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; ok(hr == D3DERR_INVALIDCALL, "%u - %s[%u]: GetMatrixPointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3DERR_INVALIDCALL); -- 2.26.3

3 3

[PATCH 3/3] configure: Stop checking for poll.h and sys/poll.h - always use poll.h.
by Huw Davies 04 Oct '21

04 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 2 -- dlls/dinput/joystick_linux.c | 4 +--- dlls/dinput/joystick_linuxinput.c | 4 +--- dlls/iphlpapi/icmp.c | 4 +--- dlls/ntdll/unix/file.c | 2 -- dlls/ntdll/unix/serial.c | 4 +--- dlls/ntdll/unix/sync.c | 5 ----- dlls/winebus.sys/bus_udev.c | 7 +------ dlls/wineoss.drv/midi.c | 5 ----- dlls/winex11.drv/event.c | 5 ----- dlls/ws2_32/unixlib.c | 5 ----- programs/winedbg/gdbproxy.c | 4 +--- server/change.c | 4 +--- server/fd.c | 5 ----- server/file.c | 2 -- server/object.h | 4 +--- server/process.c | 2 -- server/queue.c | 4 +--- server/request.c | 2 -- server/serial.c | 2 -- server/signal.c | 5 ----- server/sock.c | 4 +--- server/thread.c | 2 -- 23 files changed, 10 insertions(+), 77 deletions(-) diff --git a/configure.ac b/configure.ac index 6e82e4fbb8d..649f1e7127a 100644 --- a/configure.ac +++ b/configure.ac @@ -482,7 +482,6 @@ AC_CHECK_HEADERS(\ netinet/tcp.h \ netinet/tcp_fsm.h \ pcap/pcap.h \ - poll.h \ port.h \ pthread.h \ pwd.h \ @@ -505,7 +504,6 @@ AC_CHECK_HEADERS(\ sys/modem.h \ sys/mtio.h \ sys/param.h \ - sys/poll.h \ sys/prctl.h \ sys/protosw.h \ sys/ptrace.h \ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5b54e352c20..6df479ebfa3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -50,9 +50,7 @@ # include <linux/joystick.h> # undef SW_MAX #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 949fd1da081..ed385ef5b01 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -46,9 +46,7 @@ # define HAS_PROPER_HEADER # endif #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef03219e52..29ea074a5ab 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -59,9 +59,7 @@ #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #define USE_WS_PREFIX diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 43e85b0c955..2798fac2678 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -40,9 +40,7 @@ #ifdef HAVE_MNTENT_H #include <mntent.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ab2ef9330a5..cbcf223ca1d 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -49,9 +49,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_MODEM_H # include <sys/modem.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 5a5d49bf4bd..d9d0736a055 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -38,12 +38,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f7f507f4f1f..7b789684bbc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -32,12 +32,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_LIBUDEV_H # include <libudev.h> #endif diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 24b3e7037b0..1e72dfcf898 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -54,12 +54,7 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include <sys/soundcard.h> #include "windef.h" diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1772a27c48b..4e401faf403 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -21,12 +21,7 @@ #include "config.h" -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/Xlib.h> diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 25a38b46758..67edf06368e 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -63,12 +63,7 @@ #ifdef HAVE_IFADDRS_H # include <ifaddrs.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b64abd6f205..f8d40f3ed32 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -34,9 +34,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif diff --git a/server/change.c b/server/change.c index 5edeebf89d3..2573a315657 100644 --- a/server/change.c +++ b/server/change.c @@ -32,9 +32,7 @@ #include <limits.h> #include <dirent.h> #include <errno.h> -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #ifdef HAVE_SYS_INOTIFY_H #include <sys/inotify.h> #endif diff --git a/server/fd.c b/server/fd.c index ad1b7a1bd4a..cc81be06086 100644 --- a/server/fd.c +++ b/server/fd.c @@ -32,12 +32,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #ifdef HAVE_LINUX_MAJOR_H #include <linux/major.h> #endif diff --git a/server/file.c b/server/file.c index 2c7cb0ce5ca..a5fd150b37f 100644 --- a/server/file.c +++ b/server/file.c @@ -36,9 +36,7 @@ #ifdef HAVE_UTIME_H #include <utime.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/object.h b/server/object.h index 039bf4e7d4e..465cd9bfc44 100644 --- a/server/object.h +++ b/server/object.h @@ -21,9 +21,7 @@ #ifndef __WINE_SERVER_OBJECT_H #define __WINE_SERVER_OBJECT_H -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif +#include <poll.h> #include <sys/time.h> #include "wine/server_protocol.h" diff --git a/server/process.c b/server/process.c index 8109fbe8de4..a2dfc1bc3ee 100644 --- a/server/process.c +++ b/server/process.c @@ -34,9 +34,7 @@ # include <sys/socket.h> #endif #include <unistd.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index e4903bcb79f..b2a27fb9075 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,9 +25,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/request.c b/server/request.c index 29b63600f15..5a952faf8aa 100644 --- a/server/request.c +++ b/server/request.c @@ -48,9 +48,7 @@ #include <sys/un.h> #endif #include <unistd.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef __APPLE__ # include <mach/mach_time.h> #endif diff --git a/server/serial.c b/server/serial.c index bdc27de8e4f..19f5ca41ec6 100644 --- a/server/serial.c +++ b/server/serial.c @@ -42,9 +42,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_POLL_H #include <poll.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/signal.c b/server/signal.c index 0c22c157f2b..19b76d44c16 100644 --- a/server/signal.c +++ b/server/signal.c @@ -23,12 +23,7 @@ #include <signal.h> #include <stdio.h> #include <sys/time.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -#include <sys/poll.h> -#endif #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif diff --git a/server/sock.c b/server/sock.c index 7b00cb3f4f4..59a009852c3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -39,9 +39,7 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif +#include <poll.h> #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H diff --git a/server/thread.c b/server/thread.c index 9d412106809..827d5737cb5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -32,9 +32,7 @@ #include <sys/types.h> #include <unistd.h> #include <time.h> -#ifdef HAVE_POLL_H #include <poll.h> -#endif #ifdef HAVE_SCHED_H #include <sched.h> #endif -- 2.23.0

1 0

[PATCH 2/3] configure: Stop checking for poll(2).
by Huw Davies 04 Oct '21

04 Oct '21

In most places we're not dealing with its absence correctly anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 1 - programs/winedbg/gdbproxy.c | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 7e85e46b87b..6e82e4fbb8d 100644 --- a/configure.ac +++ b/configure.ac @@ -2144,7 +2144,6 @@ AC_CHECK_FUNCS(\ lstat \ mach_continuous_time \ pipe2 \ - poll \ port_create \ posix_fadvise \ posix_fallocate \ diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index fb875cd1b29..b64abd6f205 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -53,11 +53,6 @@ # include <unistd.h> #endif -/* if we don't have poll support on this system - * we won't provide gdb proxy support here... - */ -#ifdef HAVE_POLL - #include "debugger.h" #include "windef.h" @@ -2311,11 +2306,9 @@ static int gdb_remote(unsigned flags, unsigned port) wait(NULL); return 0; } -#endif int gdb_main(int argc, char* argv[]) { -#ifdef HAVE_POLL unsigned gdb_flags = 0, port = 0; char *port_end; @@ -2350,8 +2343,6 @@ int gdb_main(int argc, char* argv[]) if (dbg_active_attach(argc, argv) == start_ok || dbg_active_launch(argc, argv) == start_ok) return gdb_remote(gdb_flags, port); -#else - fprintf(stderr, "GdbProxy mode not supported on this platform\n"); -#endif + return -1; } -- 2.23.0

1 0

[PATCH 1/3] configure: No longer use libpoll.
by Huw Davies 04 Oct '21

04 Oct '21

This became unnecessary after macOS 10.5. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 6 ------ dlls/ws2_32/Makefile.in | 1 - programs/winedbg/Makefile.in | 1 - server/Makefile.in | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 913692c828a..7e85e46b87b 100644 --- a/configure.ac +++ b/configure.ac @@ -2166,12 +2166,6 @@ dnl Check for -ldl AC_SEARCH_LIBS(dlopen, dl) WINE_CHECK_LIB_FUNCS(dladdr dlinfo,[$DL_LIBS]) -dnl Check for -lpoll for Mac OS X/Darwin -if test "$ac_cv_func_poll" = no -then - AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(POLL_LIBS,"-lpoll")]) -fi - dnl Check for -lnsl for Solaris AC_SEARCH_LIBS(gethostbyname, nsl) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index bf9018260a4..232ce7f31fd 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -2,7 +2,6 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 DELAYIMPORTS = advapi32 iphlpapi user32 -EXTRALIBS = $(POLL_LIBS) C_SRCS = \ async.c \ diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index bf036fc9b01..620b70bdf40 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,7 +1,6 @@ MODULE = winedbg.exe IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 -EXTRALIBS = $(POLL_LIBS) EXTRADLLFLAGS = -mconsole -mcygwin diff --git a/server/Makefile.in b/server/Makefile.in index 4264e3db108..b6197cffec3 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,6 +49,6 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) +EXTRALIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) unicode_EXTRADEFS = -DNLSDIR="\"${nlsdir}\"" -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" -- 2.23.0

1 0

[PATCH 6/8] gdi32: Don't use RtlDosPathNameToNtPathName_U get_unix_file name.
by Jacek Caban 04 Oct '21

04 Oct '21

Paths are already in NT format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/freetype.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

2 1

[PATCH v2 8/8] gdi32: Use local helpers for Unicode conversion in Unix lib.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Based on ntdll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 99 +++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 10 ++-- dlls/gdi32/win32u_private.h | 5 ++ 3 files changed, 106 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0b32a94f7fe..c6bc3a716be 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3200,6 +3200,7 @@ static UINT get_glyph_index_symbol( struct gdi_font *font, UINT glyph ) CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; + CPTABLEINFO *info; unsigned int i; USHORT *ptr; SIZE_T size; @@ -3207,9 +3208,101 @@ CPTABLEINFO *get_cptable( WORD cp ) for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) if (tables[i].CodePage == cp) return &tables[i]; if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; - if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); - RtlInitCodePageTable( ptr, &tables[i] ); - return &tables[i]; + if (i == ARRAY_SIZE(tables)) + { + ERR( "too many code pages\n" ); + return NULL; + } + + info = &tables[i]; + info->CodePage = ptr[1]; + info->MaximumCharacterSize = ptr[2]; + info->DefaultChar = ptr[3]; + info->UniDefaultChar = ptr[4]; + info->TransDefaultChar = ptr[5]; + info->TransUniDefaultChar = ptr[6]; + memcpy( info->LeadByte, ptr + 7, sizeof(info->LeadByte) ); + ptr += ptr[0]; + + info->WideCharTable = ptr + ptr[0] + 1; + info->MultiByteTable = ++ptr; + ptr += 256; + if (*ptr++) ptr += 256; /* glyph table */ + info->DBCSRanges = ptr; + if (*ptr) /* dbcs ranges */ + { + info->DBCSCodePage = 1; + info->DBCSOffsets = ptr + 1; + } + else + { + info->DBCSCodePage = 0; + info->DBCSOffsets = NULL; + } + + return info; +} + +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, DWORD srclen ) +{ + DWORD i, ret; + + if (!info && !(info = get_cptable( get_acp() ))) return 0; + + srclen /= sizeof(WCHAR); + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + + for (i = dstlen; srclen && i; i--, srclen--, src++) + { + if (uni2cp[*src] & 0xff00) + { + if (i == 1) break; /* do not output a partial char */ + i--; + *dst++ = uni2cp[*src] >> 8; + } + *dst++ = (char)uni2cp[*src]; + } + ret = dstlen - i; + } + else + { + char *uni2cp = info->WideCharTable; + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = uni2cp[src[i]]; + } + return ret; +} + +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, DWORD srclen ) +{ + DWORD i, ret; + + if (!info && !(info = get_cptable( get_acp() ))) return 0; + + dstlen /= sizeof(WCHAR); + if (info->DBCSOffsets) + { + for (i = dstlen; srclen && i; i--, srclen--, src++, dst++) + { + USHORT off = info->DBCSOffsets[(unsigned char)*src]; + if (off && srclen > 1) + { + src++; + srclen--; + *dst = info->DBCSOffsets[off + (unsigned char)*src]; + } + else *dst = info->MultiByteTable[(unsigned char)*src]; + } + ret = dstlen - i; + } + else + { + ret = min( srclen, dstlen ); + for (i = 0; i < ret; i++) dst[i] = info->MultiByteTable[(unsigned char)src[i]]; + } + return ret * sizeof(WCHAR); } static BOOL wc_to_index( UINT cp, WCHAR wc, unsigned char *dst, BOOL allow_default ) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 44d5dc26cff..04b24b7f570 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -602,7 +602,7 @@ static WCHAR *towstr(const char *str) { DWORD len = strlen(str) + 1; WCHAR *wstr = malloc( len * sizeof(WCHAR) ); - RtlMultiByteToUnicodeN( wstr, len * sizeof(WCHAR), &len, str, len ); + win32u_mbtowc( NULL, wstr, len * sizeof(WCHAR), str, len ); return wstr; } @@ -805,8 +805,8 @@ static WCHAR *copy_name_table_string( const FT_SfntName *name ) case TT_PLATFORM_MACINTOSH: if (!(cp = get_mac_code_page( name ))) return NULL; ret = malloc( (name->string_len + 1) * sizeof(WCHAR) ); - RtlCustomCPToUnicodeN( cp, ret, name->string_len * sizeof(WCHAR), &i, - (char *)name->string, name->string_len ); + i = win32u_mbtowc( cp, ret, name->string_len * sizeof(WCHAR), + (char *)name->string, name->string_len ); ret[i / sizeof(WCHAR)] = 0; return ret; } @@ -1165,7 +1165,7 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) { CPTABLEINFO *cptable = get_cptable( name->codepage ); if (!cptable) return NULL; - RtlCustomCPToUnicodeN( cptable, buffer, sizeof(buffer), &len, name->bytes, name->length ); + len = win32u_mbtowc( cptable, buffer, sizeof(buffer), name->bytes, name->length ); len /= sizeof(WCHAR); } @@ -2577,7 +2577,7 @@ static BOOL CDECL freetype_get_glyph_index( struct gdi_font *font, UINT *glyph, DWORD len; char ch; - RtlUnicodeToMultiByteN( &ch, 1, &len, &wc, sizeof(wc) ); + len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); } return TRUE; diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index d986bf339c3..f867c556bff 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -395,4 +395,9 @@ static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) #define wcsrchr(s,c) win32u_wcsrchr(s,c) #define wcstol(s,e,b) win32u_wcstol(s,e,b) +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, + DWORD srclen ) DECLSPEC_HIDDEN; +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, + DWORD srclen ) DECLSPEC_HIDDEN; + #endif /* __WINE_WIN32U_PRIVATE */ -- 2.23.0

1 0

[PATCH v2 7/8] gdi32: Avoid using RtlOpenCurrentUser.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Based on open_hkcu_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0c08816945a..0b32a94f7fe 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6196,6 +6196,28 @@ static void load_registry_fonts(void) NtClose( hkey ); } +static HKEY open_hkcu(void) +{ + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + + if (NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len )) + return 0; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + ascii_to_unicode( bufferW, buffer, len + 1 ); + + return reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); +} + /*********************************************************************** * font_init */ @@ -6214,7 +6236,7 @@ UINT font_init(void) {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; static const WCHAR cacheW[] = {'C','a','c','h','e'}; - if (RtlOpenCurrentUser( MAXIMUM_ALLOWED, &hkcu )) return 0; + if (!(hkcu = open_hkcu())) return 0; wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); if (wine_fonts_key) dpi = init_font_options( hkcu ); NtClose( hkcu ); -- 2.23.0

1 0

[PATCH v2 6/8] gdi32: Don't use RtlDosPathNameToNtPathName_U in get_unix_file_name.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Paths are already in NT format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bd4a29bb723..44d5dc26cff 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1364,7 +1364,7 @@ static WCHAR *get_dos_file_name( LPCSTR str ) return buffer; } -static char *get_unix_file_name( LPCWSTR dosW ) +static char *get_unix_file_name( LPCWSTR path ) { UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; @@ -1372,24 +1372,19 @@ static char *get_unix_file_name( LPCWSTR dosW ) ULONG size = 256; char *buffer; - if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; + nt_name.Buffer = (WCHAR *)path; + nt_name.MaximumLength = nt_name.Length = lstrlenW( path ) * sizeof(WCHAR); InitializeObjectAttributes( &attr, &nt_name, 0, 0, NULL ); for (;;) { - if (!(buffer = malloc( size ))) - { - RtlFreeUnicodeString( &nt_name ); - return NULL; - } + if (!(buffer = malloc( size ))) return NULL; status = wine_nt_to_unix_file_name( &attr, buffer, &size, FILE_OPEN_IF ); if (status != STATUS_BUFFER_TOO_SMALL) break; free( buffer ); } - RtlFreeUnicodeString( &nt_name ); if (status && status != STATUS_NO_SUCH_FILE) { free( buffer ); - RtlSetLastWin32ErrorAndNtStatusFromNtStatus( status ); return NULL; } return buffer; -- 2.23.0

1 0

[PATCH v2 5/8] gdi32: Use win32u_wcsicmp instead of RtlCompareUnicodeStrings.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d8bae670d7f..bd4a29bb723 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1277,13 +1277,11 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), - This->second_name, lstrlenW( This->second_name ), TRUE )) + if (!wcsicmp( This->family_name, This->second_name )) { free( This->second_name ); This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), - This->second_name, lstrlenW( This->second_name ), TRUE )) + if (!wcsicmp( This->family_name, This->second_name )) { free( This->second_name ); This->second_name = NULL; -- 2.23.0

1 0

[PATCH v2 4/8] gdi32: Use pthread mutex in dib driver.
by Huw Davies 04 Oct '21

04 Oct '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dibdrv/graphics.c | 16 +++++----------- dlls/gdi32/win32u_private.h | 3 --- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 875ae308546..410f29e8f19 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -23,6 +23,7 @@ #endif #include <assert.h> +#include <pthread.h> #include "ntgdi_private.h" #include "dibdrv.h" @@ -59,14 +60,7 @@ struct cached_font static struct list font_cache = LIST_INIT( font_cache ); -static CRITICAL_SECTION font_cache_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &font_cache_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": font_cache_cs") } -}; -static CRITICAL_SECTION font_cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t font_cache_lock = PTHREAD_MUTEX_INITIALIZER; static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip ) @@ -575,7 +569,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) font.aa_flags = aa_flags; font.hash = font_cache_hash( &font ); - EnterCriticalSection( &font_cache_cs ); + pthread_mutex_lock( &font_cache_lock ); LIST_FOR_EACH_ENTRY( ptr, &font_cache, struct cached_font, entry ) { if (!font_cache_cmp( &font, ptr )) @@ -608,7 +602,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) } else if (!(ptr = malloc( sizeof(*ptr) ))) { - LeaveCriticalSection( &font_cache_cs ); + pthread_mutex_unlock( &font_cache_lock ); return NULL; } @@ -617,7 +611,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) memset( ptr->glyphs, 0, sizeof(ptr->glyphs) ); done: list_add_head( &font_cache, &ptr->entry ); - LeaveCriticalSection( &font_cache_cs ); + pthread_mutex_unlock( &font_cache_lock ); TRACE( "%d %s -> %p\n", ptr->lf.lfHeight, debugstr_w(ptr->lf.lfFaceName), ptr ); return ptr; } diff --git a/dlls/gdi32/win32u_private.h b/dlls/gdi32/win32u_private.h index 836d8014f01..d986bf339c3 100644 --- a/dlls/gdi32/win32u_private.h +++ b/dlls/gdi32/win32u_private.h @@ -395,7 +395,4 @@ static inline LONG win32u_wcstol( LPCWSTR s, LPWSTR *end, INT base ) #define wcsrchr(s,c) win32u_wcsrchr(s,c) #define wcstol(s,e,b) win32u_wcstol(s,e,b) -#define EnterCriticalSection RtlEnterCriticalSection -#define LeaveCriticalSection RtlLeaveCriticalSection - #endif /* __WINE_WIN32U_PRIVATE */ -- 2.23.0

1 0