April 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : ntdll: Clear the first ~1MB of stack in signal_start_thread.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 96f5968a651609aa22ba482d4b244e6599095735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f5968a651609aa22ba482d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 31 12:23:37 2021 +0200 ntdll: Clear the first ~1MB of stack in signal_start_thread. Instead of the whole stack. Stack creation in virtual_alloc_thread_stack and RtlCreateUserStack, as well as Windows rounding logic, enforce a minimum reserved size of 1MB. There's a few guard and canary pages used on the bottom, plus a few more on the top for initial context, and we have to keep a bit of space if we ever need a stack while doing this, so we clear a bit less than 1MB to be safe. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 9 ++++----- dlls/ntdll/signal_x86_64.c | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 635b8f4de81..59d9e1d0df9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -504,13 +504,12 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, */ __ASM_GLOBAL_FUNC( signal_start_thread, "movl 4(%esp),%esi\n\t" /* context */ - "leal -12(%esi),%ecx\n\t" + "leal -12(%esi),%edi\n\t" /* clear the thread stack */ - "andl $~0xfff,%ecx\n\t" /* round down to page size */ - "movl %fs:8,%edi\n\t" /* NtCurrentTeb()->Tib.StackLimit */ - "addl $0x1000,%edi\n\t" + "andl $~0xfff,%edi\n\t" /* round down to page size */ + "movl $0xf0000,%ecx\n\t" + "subl %ecx,%edi\n\t" "movl %edi,%esp\n\t" - "subl %edi,%ecx\n\t" "xorl %eax,%eax\n\t" "shrl $2,%ecx\n\t" "rep; stosl\n\t" diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index d88f7ae553a..c5a6666f4d2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1544,9 +1544,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, "movq %rcx,%rbx\n\t" /* context */ /* clear the thread stack */ "andq $~0xfff,%rcx\n\t" /* round down to page size */ - "movq %gs:0x30,%rax\n\t" - "movq 0x10(%rax),%rdi\n\t" /* NtCurrentTeb()->Tib.StackLimit */ - "addq $0x2000,%rdi\n\t" + "leaq -0xf0000(%rcx),%rdi\n\t" "movq %rdi,%rsp\n\t" "subq %rdi,%rcx\n\t" "xorl %eax,%eax\n\t"

1 0

Rémi Bernon : ntdll/tests: Add committed / reserved thread stack sizes tests.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 94dcca8a0efb5daf8008fdd40652296575e0e331 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94dcca8a0efb5daf8008fdd4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 31 12:23:36 2021 +0200 ntdll/tests: Add committed / reserved thread stack sizes tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 264 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94dcca8a0efb5daf8008…

1 0

Zebediah Figura : xactengine2_7: New DLL.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: b3b318b3c0c53a405cae294b03a4e32612e2e43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b318b3c0c53a405cae294b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:13 2021 -0500 xactengine2_7: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49668 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine2_7/Makefile.in | 11 +++++++++++ dlls/xactengine2_7/xactengine2_7.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 2 ++ 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 611901c092b..30c403dfea9 100755 --- a/configure +++ b/configure @@ -1729,6 +1729,7 @@ enable_x3daudio1_6 enable_x3daudio1_7 enable_xactengine2_0 enable_xactengine2_4 +enable_xactengine2_7 enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 @@ -16439,6 +16440,7 @@ then enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} + enable_xactengine2_7=${enable_xactengine2_7:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -21225,6 +21227,7 @@ wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 wine_fn_config_makefile dlls/xactengine2_0 enable_xactengine2_0 wine_fn_config_makefile dlls/xactengine2_4 enable_xactengine2_4 +wine_fn_config_makefile dlls/xactengine2_7 enable_xactengine2_7 wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 diff --git a/configure.ac b/configure.ac index f6c241e3c19..2564fd17b42 100644 --- a/configure.ac +++ b/configure.ac @@ -1917,6 +1917,7 @@ then enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} + enable_xactengine2_7=${enable_xactengine2_7:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -3895,6 +3896,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) WINE_CONFIG_MAKEFILE(dlls/xactengine2_0) WINE_CONFIG_MAKEFILE(dlls/xactengine2_4) +WINE_CONFIG_MAKEFILE(dlls/xactengine2_7) WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) diff --git a/dlls/xactengine2_7/Makefile.in b/dlls/xactengine2_7/Makefile.in new file mode 100644 index 00000000000..8807677e44a --- /dev/null +++ b/dlls/xactengine2_7/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine2_7.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0207 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine2_7/xactengine2_7.spec b/dlls/xactengine2_7/xactengine2_7.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine2_7/xactengine2_7.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 72de1cf302d..077f64a78e1 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -26,6 +26,8 @@ uuid(0aa000aa-f404-11d9-bd7a-0010dc4f8f81) #elif XACT3_VER == 0x0204 uuid(bc3e0fc6-2e0d-4c45-bc61-d9c328319bd8) +#elif XACT3_VER == 0x0207 + uuid(cd0d66ec-8057-43f5-acbd-66dfb36fd78c) #elif XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) #elif XACT3_VER == 0x0301

1 0

Francois Gouget : winetest: Trace skipped dlls when in exclude (-n) mode.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 5549ad21b33c4471bd90c6eb26dd812f140bf680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5549ad21b33c4471bd90c6eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 21 09:32:37 2021 +0200 winetest: Trace skipped dlls when in exclude (-n) mode. When the command line specifies the list of tests to run, tracing all the skipped dlls unnecessarily spams the test output. But when the command line contains the list of (at most 64) excluded dlls, tracing them ensures tools analysing the report know why the corresponding dlls were skipped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 107151c927f..cb2f23a161e 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -918,6 +918,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; + if (exclude_tests) xprintf (" %s=skipped\n", dllname); return TRUE; } extract_test (&wine_tests[nr_of_files], tempdir, lpszName);

1 0

Zebediah Figura : xactengine2_9: New DLL.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 9e44c3556dedf7f55cefcd7140e1e54f6141b032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e44c3556dedf7f55cefcd71… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:14 2021 -0500 xactengine2_9: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41468 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine2_9/Makefile.in | 11 +++++++++++ dlls/xactengine2_9/xactengine2_9.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 2 ++ 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 30c403dfea9..39639235469 100755 --- a/configure +++ b/configure @@ -1730,6 +1730,7 @@ enable_x3daudio1_7 enable_xactengine2_0 enable_xactengine2_4 enable_xactengine2_7 +enable_xactengine2_9 enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 @@ -16441,6 +16442,7 @@ then enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine2_7=${enable_xactengine2_7:-no} + enable_xactengine2_9=${enable_xactengine2_9:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -21228,6 +21230,7 @@ wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 wine_fn_config_makefile dlls/xactengine2_0 enable_xactengine2_0 wine_fn_config_makefile dlls/xactengine2_4 enable_xactengine2_4 wine_fn_config_makefile dlls/xactengine2_7 enable_xactengine2_7 +wine_fn_config_makefile dlls/xactengine2_9 enable_xactengine2_9 wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 diff --git a/configure.ac b/configure.ac index 2564fd17b42..797f8cfbbbf 100644 --- a/configure.ac +++ b/configure.ac @@ -1918,6 +1918,7 @@ then enable_xactengine2_0=${enable_xactengine2_0:-no} enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine2_7=${enable_xactengine2_7:-no} + enable_xactengine2_9=${enable_xactengine2_9:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -3897,6 +3898,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) WINE_CONFIG_MAKEFILE(dlls/xactengine2_0) WINE_CONFIG_MAKEFILE(dlls/xactengine2_4) WINE_CONFIG_MAKEFILE(dlls/xactengine2_7) +WINE_CONFIG_MAKEFILE(dlls/xactengine2_9) WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) diff --git a/dlls/xactengine2_9/Makefile.in b/dlls/xactengine2_9/Makefile.in new file mode 100644 index 00000000000..eae7c26b9fb --- /dev/null +++ b/dlls/xactengine2_9/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine2_9.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0209 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine2_9/xactengine2_9.spec b/dlls/xactengine2_9/xactengine2_9.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine2_9/xactengine2_9.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 077f64a78e1..f978c05d18e 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -28,6 +28,8 @@ uuid(bc3e0fc6-2e0d-4c45-bc61-d9c328319bd8) #elif XACT3_VER == 0x0207 uuid(cd0d66ec-8057-43f5-acbd-66dfb36fd78c) +#elif XACT3_VER == 0x0209 + uuid(343e68e6-8f82-4a8d-a2da-6e9a944b378c) #elif XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) #elif XACT3_VER == 0x0301

1 0

Zebediah Figura : xactengine2_4: New DLL.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 521d54ef381f20ca42f625d4c271e9550b918f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=521d54ef381f20ca42f625d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 20 22:26:12 2021 -0500 xactengine2_4: New DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49671 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +++ configure.ac | 2 ++ dlls/xactengine2_4/Makefile.in | 11 +++++++++++ dlls/xactengine2_4/xactengine2_4.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 2 ++ 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 3330df8d56b..611901c092b 100755 --- a/configure +++ b/configure @@ -1728,6 +1728,7 @@ enable_x3daudio1_5 enable_x3daudio1_6 enable_x3daudio1_7 enable_xactengine2_0 +enable_xactengine2_4 enable_xactengine3_0 enable_xactengine3_1 enable_xactengine3_2 @@ -16437,6 +16438,7 @@ then enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} + enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -21222,6 +21224,7 @@ wine_fn_config_makefile dlls/x3daudio1_5 enable_x3daudio1_5 wine_fn_config_makefile dlls/x3daudio1_6 enable_x3daudio1_6 wine_fn_config_makefile dlls/x3daudio1_7 enable_x3daudio1_7 wine_fn_config_makefile dlls/xactengine2_0 enable_xactengine2_0 +wine_fn_config_makefile dlls/xactengine2_4 enable_xactengine2_4 wine_fn_config_makefile dlls/xactengine3_0 enable_xactengine3_0 wine_fn_config_makefile dlls/xactengine3_1 enable_xactengine3_1 wine_fn_config_makefile dlls/xactengine3_2 enable_xactengine3_2 diff --git a/configure.ac b/configure.ac index c0125716a0a..f6c241e3c19 100644 --- a/configure.ac +++ b/configure.ac @@ -1916,6 +1916,7 @@ then enable_x3daudio1_6=${enable_x3daudio1_6:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_xactengine2_0=${enable_xactengine2_0:-no} + enable_xactengine2_4=${enable_xactengine2_4:-no} enable_xactengine3_0=${enable_xactengine3_0:-no} enable_xactengine3_1=${enable_xactengine3_1:-no} enable_xactengine3_2=${enable_xactengine3_2:-no} @@ -3893,6 +3894,7 @@ WINE_CONFIG_MAKEFILE(dlls/x3daudio1_5) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_6) WINE_CONFIG_MAKEFILE(dlls/x3daudio1_7) WINE_CONFIG_MAKEFILE(dlls/xactengine2_0) +WINE_CONFIG_MAKEFILE(dlls/xactengine2_4) WINE_CONFIG_MAKEFILE(dlls/xactengine3_0) WINE_CONFIG_MAKEFILE(dlls/xactengine3_1) WINE_CONFIG_MAKEFILE(dlls/xactengine3_2) diff --git a/dlls/xactengine2_4/Makefile.in b/dlls/xactengine2_4/Makefile.in new file mode 100644 index 00000000000..51c7e5eb45a --- /dev/null +++ b/dlls/xactengine2_4/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine2_4.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0204 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine2_4/xactengine2_4.spec b/dlls/xactengine2_4/xactengine2_4.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine2_4/xactengine2_4.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 91a9c19ff67..72de1cf302d 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -24,6 +24,8 @@ threading(both), #if XACT3_VER == 0x0200 uuid(0aa000aa-f404-11d9-bd7a-0010dc4f8f81) +#elif XACT3_VER == 0x0204 + uuid(bc3e0fc6-2e0d-4c45-bc61-d9c328319bd8) #elif XACT3_VER == 0x0300 uuid(3b80ee2a-b0f5-4780-9e30-90cb39685b03) #elif XACT3_VER == 0x0301

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 258f7b36045aa8c07f8c4b9e7b0f97a8ad72531c URL: https://source.winehq.org/git/wine.git/?a=commit;h=258f7b36045aa8c07f8c4b9e… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Apr 21 09:28:01 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/nl.po b/po/nl.po index 51d7f73cb8f..5ee44aa2c56 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-09 10:15+0200\n" +"PO-Revision-Date: 2021-04-21 09:20+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -14761,10 +14761,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Foutieve systeemsleutel [%1]\n" +msgstr "reg: Foutieve systeemsleutel\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?"

1 0

Hans Leidekker : secur32/tests: Add a Kerberos ticket cache test.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 121910171c95c1cd44b8733fc5afcd2b8e7594bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=121910171c95c1cd44b8733f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 10:19:42 2021 +0200 secur32/tests: Add a Kerberos ticket cache test. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/secur32.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 8fd421ca732..f6bca55561c 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -29,6 +29,8 @@ #include <schannel.h> #include <wincred.h> #include <winsock2.h> +#include <ntsecapi.h> +#include <winternl.h> #include "wine/test.h" @@ -464,6 +466,38 @@ static void test_kerberos(void) FreeCredentialHandle( &cred ); } +static void test_ticket_cache(void) +{ + KERB_QUERY_TKT_CACHE_REQUEST req = { KerbQueryTicketCacheMessage }; + KERB_QUERY_TKT_CACHE_RESPONSE *resp; + NTSTATUS status; + HANDLE lsa; + ULONG package, len, i; + LSA_STRING name; + + status = LsaConnectUntrusted( &lsa ); + ok( !status, "got %08x\n", status ); + + RtlInitAnsiString( &name, MICROSOFT_KERBEROS_NAME_A ); + status = LsaLookupAuthenticationPackage( lsa, &name, &package ); + ok( !status, "got %08x\n", status ); + + status = LsaCallAuthenticationPackage( lsa, package, &req, sizeof(req), (void **)&resp, &len, &status ); + ok( !status, "got %08x\n", status ); + ok( resp->MessageType == KerbQueryTicketCacheMessage, "got %u\n", resp->MessageType ); + + for (i = 0; i < resp->CountOfTickets; i++) + { + KERB_TICKET_CACHE_INFO *info = &resp->Tickets[i]; + trace( "ServerName %s\n", wine_dbgstr_wn(info->ServerName.Buffer, info->ServerName.Length/sizeof(WCHAR)) ); + trace( "RealmName %s\n", wine_dbgstr_wn(info->RealmName.Buffer, info->RealmName.Length/sizeof(WCHAR)) ); + trace( "EncryptionType %08x\n", info->EncryptionType ); + trace( "TicketFlags %08x\n", info->TicketFlags ); + } + LsaFreeReturnBuffer( resp ); + LsaDeregisterLogonProcess( lsa ); +} + START_TEST(secur32) { secdll = LoadLibraryA("secur32.dll"); @@ -514,4 +548,5 @@ START_TEST(secur32) } test_kerberos(); + test_ticket_cache(); }

1 0

Hans Leidekker : kerberos: Move support for KerbQueryTicketCacheMessage to the Unix library.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 0eb53443c8cf5b523fa15e0126e87f869c6ec075 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb53443c8cf5b523fa15e01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:30 2021 +0200 kerberos: Move support for KerbQueryTicketCacheMessage to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 428 ++++++------------------------------------------ dlls/kerberos/unixlib.c | 164 +++++++++++++++++++ dlls/kerberos/unixlib.h | 8 + 3 files changed, 219 insertions(+), 381 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eb53443c8cf5b523fa1…

1 0

Hans Leidekker : kerberos: Move support for SpUnsealMessage to the Unix library.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 44593a6364bb34ed4710c18cd149e5f9037cffb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44593a6364bb34ed4710c18c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:29 2021 +0200 kerberos: Move support for SpUnsealMessage to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 248 +----------------------------------------------- dlls/kerberos/unixlib.c | 76 +++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 78 insertions(+), 247 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44593a6364bb34ed4710…

1 0