February 2020 - Wine-Commits

Alexandre Julliard : libport: Move wine_utf8 functions back to libwine and make them obsolete.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 473914f6a5943c4abfc8d0e394c71f395063d89f URL: https://source.winehq.org/git/wine.git/?a=commit;h=473914f6a5943c4abfc8d0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:30 2020 +0100 libport: Move wine_utf8 functions back to libwine and make them obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 2 -- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 3 ++- libs/wine/port.c | 2 -- libs/{port => wine}/utf8.c | 13 +++++++++++-- libs/wine/wine.map | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 216e36b38d..f4bf717892 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -88,8 +88,6 @@ extern int wine_cp_mbstowcs( const union cptable *table, int flags, extern int wine_cp_wcstombs( const union cptable *table, int flags, const WCHAR *src, int srclen, char *dst, int dstlen, const char *defchar, int *used ); -extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index e4cd7c4f99..6e3edcf719 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -102,6 +102,5 @@ C_SRCS = \ stubs.c \ symlink.c \ usleep.c \ - utf8.c \ wctomb.c \ wctype.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 0b862455ac..9b2b8f643d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -10,7 +10,8 @@ C_SRCS = \ loader.c \ mmap.c \ port.c \ - sortkey.c + sortkey.c \ + utf8.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 7c91bfc2d0..1ee754b6b9 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -42,8 +42,6 @@ const void *libwine_port_functions[] = wine_cp_get_table, wine_cp_mbstowcs, wine_cp_wcstombs, - wine_utf8_mbstowcs, - wine_utf8_wcstombs }; /* no longer used, for backwards compatibility only */ diff --git a/libs/port/utf8.c b/libs/wine/utf8.c similarity index 96% rename from libs/port/utf8.c rename to libs/wine/utf8.c index f47561e4bf..27e05818c3 100644 --- a/libs/port/utf8.c +++ b/libs/wine/utf8.c @@ -20,6 +20,10 @@ #include <string.h> +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; @@ -95,7 +99,7 @@ static inline int get_length_wcs_utf8( int flags, const WCHAR *src, unsigned int /* wide char to UTF-8 string conversion */ /* return -1 on dst buffer overflow, -2 on invalid input char */ -int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +int wine_utf8_wcstombs_obsolete( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) { int len; @@ -301,7 +305,7 @@ static inline int get_length_mbs_utf8( int flags, const char *src, int srclen ) /* UTF-8 to wide char string conversion */ /* return -1 on dst buffer overflow, -2 on invalid input char */ -int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +int wine_utf8_mbstowcs_obsolete( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) { unsigned int res; const char *srcend = src + srclen; @@ -336,3 +340,8 @@ int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int if (src < srcend) return -1; /* overflow */ return dstlen - (dstend - dst); } + +__ASM_OBSOLETE(wine_utf8_wcstombs); +__ASM_OBSOLETE(wine_utf8_mbstowcs); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 9898e61820..f0c94a950f 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -53,8 +53,6 @@ WINE_1.0 wine_mmap_remove_reserved_area; wine_set_fs; wine_set_gs; - wine_utf8_mbstowcs; - wine_utf8_wcstombs; wine_wctype_table; /* the following functions are obsolete and only exported for backwards compatibility */ @@ -120,6 +118,8 @@ WINE_1.0 wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack; + wine_utf8_mbstowcs; + wine_utf8_wcstombs; local: *; };

1 0

Alexandre Julliard : libport: Move wine_cpsymbol functions back to libwine and make them obsolete.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: f4b7260d296bfa4e508d5940cc01a11dd8864b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b7260d296bfa4e508d5940… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:22 2020 +0100 libport: Move wine_cpsymbol functions back to libwine and make them obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 2 -- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/cpsymbol.c | 13 +++++++++++-- libs/wine/port.c | 2 -- libs/wine/wine.map | 4 ++-- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index b956fcff44..216e36b38d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -88,8 +88,6 @@ extern int wine_cp_mbstowcs( const union cptable *table, int flags, extern int wine_cp_wcstombs( const union cptable *table, int flags, const WCHAR *src, int srclen, char *dst, int dstlen, const char *defchar, int *used ); -extern int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen ); -extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index c70bd98099..e4cd7c4f99 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -77,7 +77,6 @@ C_SRCS = \ casemap.c \ collation.c \ compose.c \ - cpsymbol.c \ cptable.c \ decompose.c \ digitmap.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index eb4ba330b4..0b862455ac 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -3,6 +3,7 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) C_SRCS = \ config.c \ + cpsymbol.c \ debug.c \ fold.c \ ldt.c \ diff --git a/libs/port/cpsymbol.c b/libs/wine/cpsymbol.c similarity index 82% rename from libs/port/cpsymbol.c rename to libs/wine/cpsymbol.c index e35a35992f..1883d55421 100644 --- a/libs/port/cpsymbol.c +++ b/libs/wine/cpsymbol.c @@ -19,10 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" /* return -1 on dst buffer overflow */ -int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen) +int wine_cpsymbol_mbstowcs_obsolete( const char *src, int srclen, WCHAR *dst, int dstlen) { int len, i; @@ -38,7 +42,7 @@ int wine_cpsymbol_mbstowcs( const char *src, int srclen, WCHAR *dst, int dstlen) } /* return -1 on dst buffer overflow, -2 on invalid character */ -int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen) +int wine_cpsymbol_wcstombs_obsolete( const WCHAR *src, int srclen, char *dst, int dstlen) { int len, i; @@ -56,3 +60,8 @@ int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int dstlen) if (srclen > len) return -1; return len; } + +__ASM_OBSOLETE(wine_cpsymbol_mbstowcs); +__ASM_OBSOLETE(wine_cpsymbol_wcstombs); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/port.c b/libs/wine/port.c index bccbf93c19..7c91bfc2d0 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -42,8 +42,6 @@ const void *libwine_port_functions[] = wine_cp_get_table, wine_cp_mbstowcs, wine_cp_wcstombs, - wine_cpsymbol_mbstowcs, - wine_cpsymbol_wcstombs, wine_utf8_mbstowcs, wine_utf8_wcstombs }; diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 9458cd89f3..9898e61820 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -13,8 +13,6 @@ WINE_1.0 wine_cp_get_table; wine_cp_mbstowcs; wine_cp_wcstombs; - wine_cpsymbol_mbstowcs; - wine_cpsymbol_wcstombs; wine_dlclose; wine_dll_enum_load_path; wine_dll_set_callback; @@ -106,6 +104,8 @@ WINE_1.0 vsprintfW; wine_call_on_stack; wine_compare_string; + wine_cpsymbol_mbstowcs; + wine_cpsymbol_wcstombs; wine_dbg_log; wine_dbg_printf; wine_dbg_sprintf;

1 0

Alexandre Julliard : libport: Move wine_compare_string implementation back to libwine and make it obsolete.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 5a1e897df7c883f86effd21354acdc37320949d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a1e897df7c883f86effd213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:14 2020 +0100 libport: Move wine_compare_string implementation back to libwine and make it obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 3 --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 3 ++- libs/wine/port.c | 1 - libs/{port => wine}/sortkey.c | 16 +++++++++++++--- libs/wine/wine.map | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d2b852fafb..b956fcff44 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -93,9 +93,6 @@ extern int wine_cpsymbol_wcstombs( const WCHAR *src, int srclen, char *dst, int extern int wine_utf8_mbstowcs( int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); extern int wine_utf8_wcstombs( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); -extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ); -extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); - extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 4e3f23cde9..c70bd98099 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -96,7 +96,6 @@ C_SRCS = \ pwrite.c \ readlink.c \ rint.c \ - sortkey.c \ spawn.c \ statvfs.c \ string.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d0b2d1e7b6..eb4ba330b4 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -8,7 +8,8 @@ C_SRCS = \ ldt.c \ loader.c \ mmap.c \ - port.c + port.c \ + sortkey.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index 43355719c2..bccbf93c19 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -38,7 +38,6 @@ const void *libwine_port_functions[] = { strtolW, vsnprintfW, - wine_compare_string, wine_cp_enum_table, wine_cp_get_table, wine_cp_mbstowcs, diff --git a/libs/port/sortkey.c b/libs/wine/sortkey.c similarity index 96% rename from libs/port/sortkey.c rename to libs/wine/sortkey.c index 090aaf0b19..eb132e5361 100644 --- a/libs/port/sortkey.c +++ b/libs/wine/sortkey.c @@ -17,6 +17,11 @@ * 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 "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" extern const unsigned int collation_table[]; @@ -38,7 +43,7 @@ static const WCHAR *get_decomposition( WCHAR ch, unsigned int *len ) * * FIXME: 'variable' flag not handled */ -int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen) +int wine_get_sortkey_obsolete(int flags, const WCHAR *src, int srclen, char *dst, int dstlen) { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ int key_len[4]; @@ -289,8 +294,8 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1, return len1 - len2; } -int wine_compare_string(int flags, const WCHAR *str1, int len1, - const WCHAR *str2, int len2) +int wine_compare_string_obsolete(int flags, const WCHAR *str1, int len1, + const WCHAR *str2, int len2) { int ret; @@ -304,3 +309,8 @@ int wine_compare_string(int flags, const WCHAR *str1, int len1, } return ret; } + +__ASM_OBSOLETE(wine_get_sortkey); +__ASM_OBSOLETE(wine_compare_string); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 08de127cff..9458cd89f3 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -9,7 +9,6 @@ WINE_1.0 wine_anon_mmap; wine_casemap_lower; wine_casemap_upper; - wine_compare_string; wine_cp_enum_table; wine_cp_get_table; wine_cp_mbstowcs; @@ -32,7 +31,6 @@ WINE_1.0 wine_get_fs; wine_get_gs; wine_get_server_dir; - wine_get_sortkey; wine_get_ss; wine_get_user_name; wine_get_version; @@ -107,6 +105,7 @@ WINE_1.0 vsnprintfW; vsprintfW; wine_call_on_stack; + wine_compare_string; wine_dbg_log; wine_dbg_printf; wine_dbg_sprintf; @@ -117,6 +116,7 @@ WINE_1.0 wine_dll_load_main_exe; wine_dll_unload; wine_fold_string; + wine_get_sortkey; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack;

1 0

Zebediah Figura : qedit/tests: Add some tests for sample grabber pin connection.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: c1a559b72ca9719925f6221f28cb7502dd954f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a559b72ca9719925f6221f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 4 22:43:11 2020 -0600 qedit/tests: Add some tests for sample grabber pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/Makefile.in | 2 +- dlls/qedit/tests/mediadet.c | 1 - dlls/qedit/tests/samplegrabber.c | 621 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 612 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a559b72ca9719925f6…

1 0

Nikolay Sivov : rtworkq: Add RtwqPutWaitingWorkItem().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: e9e087fdbbf3c71cda64269048abfaf0c84a897d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e087fdbbf3c71cda642690… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:08 2020 +0300 rtworkq: Add RtwqPutWaitingWorkItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 391 +++++++++++++++++++++++++++++++++++++++++++--- dlls/rtworkq/rtworkq.spec | 6 +- include/rtworkq.idl | 12 ++ 3 files changed, 384 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e087fdbbf3c71cda64…

1 0

Nikolay Sivov : rtworkq: Add a stub dll.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 92427f3a327f43367b8dfdac0fba18cec5f03cfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=92427f3a327f43367b8dfdac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:05 2020 +0300 rtworkq: Add a stub dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/rtworkq/Makefile.in | 4 ++++ dlls/rtworkq/rtworkq.spec | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/configure b/configure index 80235dd995..9f23d268e8 100755 --- a/configure +++ b/configure @@ -1539,6 +1539,7 @@ enable_rsabase enable_rsaenh enable_rstrtmgr enable_rtutils +enable_rtworkq enable_samlib enable_sane_ds enable_sapi @@ -20798,6 +20799,7 @@ wine_fn_config_makefile dlls/rsaenh enable_rsaenh wine_fn_config_makefile dlls/rsaenh/tests enable_tests wine_fn_config_makefile dlls/rstrtmgr enable_rstrtmgr wine_fn_config_makefile dlls/rtutils enable_rtutils +wine_fn_config_makefile dlls/rtworkq enable_rtworkq wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi diff --git a/configure.ac b/configure.ac index 40374210bb..e06743c2ea 100644 --- a/configure.ac +++ b/configure.ac @@ -3606,6 +3606,7 @@ WINE_CONFIG_MAKEFILE(dlls/rsaenh) WINE_CONFIG_MAKEFILE(dlls/rsaenh/tests) WINE_CONFIG_MAKEFILE(dlls/rstrtmgr) WINE_CONFIG_MAKEFILE(dlls/rtutils) +WINE_CONFIG_MAKEFILE(dlls/rtworkq) WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in new file mode 100644 index 0000000000..d6d7d6f715 --- /dev/null +++ b/dlls/rtworkq/Makefile.in @@ -0,0 +1,4 @@ +MODULE = rtworkq.dll +IMPORTLIB = rtworkq + +EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec new file mode 100644 index 0000000000..29e56846c6 --- /dev/null +++ b/dlls/rtworkq/rtworkq.spec @@ -0,0 +1,37 @@ +@ stub RtwqAddPeriodicCallback +@ stub RtwqAllocateSerialWorkQueue +@ stub RtwqAllocateWorkQueue +@ stub RtwqBeginRegisterWorkQueueWithMMCSS +@ stub RtwqBeginUnregisterWorkQueueWithMMCSS +@ stub RtwqCancelDeadline +@ stub RtwqCancelMultipleWaitingWorkItem +@ stub RtwqCancelWorkItem +@ stub RtwqCreateAsyncResult +@ stub RtwqEndRegisterWorkQueueWithMMCSS +@ stub RtwqEndUnregisterWorkQueueWithMMCSS +@ stub RtwqGetPlatform +@ stub RtwqGetWorkQueueMMCSSClass +@ stub RtwqGetWorkQueueMMCSSPriority +@ stub RtwqGetWorkQueueMMCSSTaskId +@ stub RtwqInvokeCallback +@ stub RtwqJoinWorkQueue +@ stub RtwqLockPlatform +@ stub RtwqLockSharedWorkQueue +@ stub RtwqLockWorkQueue +@ stub RtwqPutMultipleWaitingWorkItem +@ stub RtwqPutWaitingWorkItem +@ stub RtwqPutWorkItem +@ stub RtwqRegisterPlatformEvents +@ stub RtwqRegisterPlatformWithMMCSS +@ stub RtwqRemovePeriodicCallback +@ stub RtwqScheduleWorkItem +@ stub RtwqSetDeadline +@ stub RtwqSetDeadline2 +@ stub RtwqSetLongRunning +@ stub RtwqShutdown +@ stub RtwqStartup +@ stub RtwqUnjoinWorkQueue +@ stub RtwqUnlockPlatform +@ stub RtwqUnlockWorkQueue +@ stub RtwqUnregisterPlatformEvents +@ stub RtwqUnregisterPlatformFromMMCSS

1 0

Zebediah Figura : qcap/tests: Add some more tests for smart tee pin connection.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 996c49bcffeefbc39de2c841e0cbd2004b0c2e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=996c49bcffeefbc39de2c841… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 4 22:43:12 2020 -0600 qcap/tests: Add some more tests for smart tee pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/Makefile.in | 2 +- dlls/qcap/tests/smartteefilter.c | 521 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 508 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=996c49bcffeefbc39de2…

1 0

Alexandre Julliard : libport: Move the collation table back to libwine and stop updating it.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: fd86c859180ef649351e96857daa89ac3ae232a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd86c859180ef649351e9685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 5 09:00:47 2020 +0100 libport: Move the collation table back to libwine and stop updating it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 2 +- libs/{port => wine}/collation.c | 6 ++++++ tools/make_unicode | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 260140a391..74b6dcfb61 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -75,7 +75,6 @@ C_SRCS = \ c_949.c \ c_950.c \ casemap.c \ - collation.c \ compose.c \ cptable.c \ decompose.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index d26f0c2589..5850f0299d 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,7 +1,7 @@ EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS) - C_SRCS = \ + collation.c \ config.c \ cpsymbol.c \ debug.c \ diff --git a/libs/port/collation.c b/libs/wine/collation.c similarity index 99% rename from libs/port/collation.c rename to libs/wine/collation.c index 22c35a4c21..10e89126a5 100644 --- a/libs/port/collation.c +++ b/libs/wine/collation.c @@ -2,6 +2,10 @@ /* generated from http://www.unicode.org/reports/tr10/allkeys.txt */ /* DO NOT EDIT!! */ +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "windef.h" const unsigned int DECLSPEC_HIDDEN collation_table[11044] = @@ -1391,3 +1395,5 @@ const unsigned int DECLSPEC_HIDDEN collation_table[11044] = 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x09bf0111, 0x09c00111, 0xffffffff, 0xffffffff }; + +#endif /* __ASM_OBSOLETE */ diff --git a/tools/make_unicode b/tools/make_unicode index cd2f406793..caafce76cb 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2727,7 +2727,6 @@ sub REPLACE_IN_FILE($@) chdir ".." if -f "./make_unicode"; load_data( $DEFAULTS ); dump_case_mappings( "libs/port/casemap.c" ); -dump_sortkeys( "libs/port/collation.c" ); dump_sortkeys( "dlls/kernelbase/collation.c" ); dump_compose_table( "libs/port/compose.c" ); dump_compose_table( "dlls/kernelbase/compose.c" );

1 0

Nikolay Sivov : rtworkq: Add RtwqCancelWorkItem().
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: b8f94f7ef554e97a575c6bbcdd7f0c28237dafc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f94f7ef554e97a575c6bbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 5 08:44:09 2020 +0300 rtworkq: Add RtwqCancelWorkItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 7d949e8e62..2797f292ce 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -465,6 +465,33 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit return S_OK; } +static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) +{ + HRESULT hr = RTWQ_E_NOT_FOUND; + struct work_item *item; + + EnterCriticalSection(&queue->cs); + LIST_FOR_EACH_ENTRY(item, &queue->pending_items, struct work_item, entry) + { + if (item->key == key) + { + key >>= 32; + if ((key & WAIT_ITEM_KEY_MASK) == WAIT_ITEM_KEY_MASK) + CloseThreadpoolWait(item->u.wait_object); + else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) + CloseThreadpoolTimer(item->u.timer_object); + else + WARN("Unknown item key mask %#x.\n", (DWORD)key); + queue_release_pending_item(item); + hr = S_OK; + break; + } + } + LeaveCriticalSection(&queue->cs); + + return hr; +} + struct async_result { RTWQASYNCRESULT result; @@ -724,6 +751,19 @@ HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncRes return hr; } +HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key) +{ + struct queue *queue; + HRESULT hr; + + TRACE("%s.\n", wine_dbgstr_longlong(key)); + + if (FAILED(hr = grab_queue(RTWQ_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + return queue_cancel_item(queue, key); +} + HRESULT WINAPI RtwqLockWorkQueue(DWORD queue) { TRACE("%#x.\n", queue); diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index 47e1c1b2ae..04da2a9573 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -5,7 +5,7 @@ @ stub RtwqBeginUnregisterWorkQueueWithMMCSS @ stub RtwqCancelDeadline @ stub RtwqCancelMultipleWaitingWorkItem -@ stub RtwqCancelWorkItem +@ stdcall RtwqCancelWorkItem(int64) @ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) @ stub RtwqEndRegisterWorkQueueWithMMCSS @ stub RtwqEndUnregisterWorkQueueWithMMCSS diff --git a/include/rtworkq.idl b/include/rtworkq.idl index a899376e92..8cc205a7eb 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -75,6 +75,7 @@ cpp_quote(" DWORD dwBytesTransferred;") cpp_quote(" HANDLE hEvent;") cpp_quote("} RTWQASYNCRESULT;") +cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqLockPlatform(void);") cpp_quote("HRESULT WINAPI RtwqLockWorkQueue(DWORD queue);")

1 0

Rémi Bernon : server: Improve APC error handling when alloc_handle fails.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 9e581ba8c5b4a2f8e2807eeb2c5f800f1b650d01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e581ba8c5b4a2f8e2807eeb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 5 11:49:35 2020 +0100 server: Improve APC error handling when alloc_handle fails. Whenever alloc_handle fails, we ignored the error and dequeued the next APC. This patch makes the loop break whenever the error status changes. Note that the APC is still marked as executed although it failed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/server/thread.c b/server/thread.c index 80db41b48d..5844d03968 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1579,26 +1579,23 @@ DECL_HANDLER(select) reply->timeout = select_on( &select_op, op_size, req->cookie, req->flags, req->timeout ); - if (get_error() == STATUS_USER_APC) + while (get_error() == STATUS_USER_APC) { - for (;;) + if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) + break; + /* Optimization: ignore APC_NONE calls, they are only used to + * wake up a thread, but since we got here the thread woke up already. + */ + if (apc->call.type != APC_NONE && + (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) { - if (!(apc = thread_dequeue_apc( current, !(req->flags & SELECT_ALERTABLE) ))) - break; - /* Optimization: ignore APC_NONE calls, they are only used to - * wake up a thread, but since we got here the thread woke up already. - */ - if (apc->call.type != APC_NONE && - (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - { - reply->call = apc->call; - release_object( apc ); - break; - } - apc->executed = 1; - wake_up( &apc->obj, 0 ); + reply->call = apc->call; release_object( apc ); + break; } + apc->executed = 1; + wake_up( &apc->obj, 0 ); + release_object( apc ); } }

1 0