November 2019 - wine-commits

Nikolay Sivov : rpcss: Implement interface to return sequential identifiers.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: wine Branch: master Commit: 9bec4bb582ba59baa2c2b7c9fae411722ee9cb64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bec4bb582ba59baa2c2b7c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 7 23:00:00 2019 +0300 rpcss: Implement interface to return sequential identifiers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/irpcss.idl | 33 +++++++++++++++++++++++++++++++++ programs/rpcss/Makefile.in | 3 ++- programs/rpcss/irpcss.idl | 21 +++++++++++++++++++++ programs/rpcss/rpcss_main.c | 12 ++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/include/wine/irpcss.idl b/include/wine/irpcss.idl new file mode 100644 index 0000000000..1874e10025 --- /dev/null +++ b/include/wine/irpcss.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2019 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 + */ + +import "wtypes.idl"; + +cpp_quote("#define IRPCSS_PROTSEQ {'n','c','a','l','r','p','c',0}") +cpp_quote("#define IRPCSS_ENDPOINT {'i','r','p','c','s','s',0}") + +[ + uuid(85da4974-edc7-40ff-bad4-9c4525a8d044), + version(0.0), +] +interface Irpcss +{ + HRESULT irpcss_get_thread_seq_id( + [in] handle_t handle, + [out] DWORD *sequence_id); +} diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 6ccb5e965a..dcc405a944 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -10,4 +10,5 @@ C_SRCS = \ IDL_SRCS = \ epm.idl \ - irot.idl + irot.idl \ + irpcss.idl diff --git a/programs/rpcss/irpcss.idl b/programs/rpcss/irpcss.idl new file mode 100644 index 0000000000..1f346ada82 --- /dev/null +++ b/programs/rpcss/irpcss.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2019 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 + */ + +#pragma makedep server + +#include "wine/irpcss.idl" diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 42749028c3..6e85ef2c33 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -28,6 +28,7 @@ #include "winsvc.h" #include "irot.h" #include "epm.h" +#include "irpcss.h" #include "wine/debug.h" @@ -37,6 +38,13 @@ static WCHAR rpcssW[] = {'R','p','c','S','s',0}; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; +HRESULT __cdecl irpcss_get_thread_seq_id(handle_t h, DWORD *id) +{ + static LONG thread_seq_id; + *id = InterlockedIncrement(&thread_seq_id); + return S_OK; +} + static RPC_STATUS RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; @@ -45,6 +53,8 @@ static RPC_STATUS RPCSS_Initialize(void) static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static unsigned short irpcss_protseq[] = IRPCSS_PROTSEQ; + static unsigned short irpcss_endpoint[] = IRPCSS_ENDPOINT; static const struct protseq_map { unsigned short *protseq; @@ -54,11 +64,13 @@ static RPC_STATUS RPCSS_Initialize(void) { epm_protseq, epm_endpoint }, { epm_protseq_lrpc, epm_endpoint_lrpc }, { irot_protseq, irot_endpoint }, + { irpcss_protseq, irpcss_endpoint }, }; RPC_IF_HANDLE ifspecs[] = { epm_v3_0_s_ifspec, Irot_v0_2_s_ifspec, + Irpcss_v0_0_s_ifspec, }; RPC_STATUS status; int i, j;

1 0

Francois Gouget : testbot: All but a few winediag messages are errors.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: tools Branch: master Commit: 4fdeed539ca798fe1b669da0835f6aff2b81a363 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4fdeed539ca798fe1b669da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:53:37 2019 +0100 testbot: All but a few winediag messages are errors. Only a few winediag messages may legitimately occur when running the tests. The presence of other winediag messages indicates an error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 2849d60..ea1ad89 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -167,7 +167,19 @@ sub GetLogLineCategory($) } if ($Line =~ /:winediag:/) { - return "diag"; + if (# Normally CorIsLatestSvc() would not be called but mscoree:mscoree + # calls it as a test. + $Line =~ /CorIsLatestSvc If this function is called,/ or + # VMs and most test machines don't have a midi port. + $Line =~ /No software synthesizer midi port found / or + # Most VMs have limited OpenGL support. + $Line =~ /None of the requested D3D feature levels is supported / or + # The tests are not run as root. + $Line =~ /this requires special permissions/) + { + return "diag"; + } + return "error"; } if (# TestBot script error messages $Line =~ /^[a-zA-Z.]+:error: / or

1 0

Francois Gouget : testbot/web: Document why WineTestBot::Log is used.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: tools Branch: master Commit: 44cd463125c6d6079b2a15db3992bb75c3bfd572 URL: https://source.winehq.org/git/tools.git/?a=commit;h=44cd463125c6d6079b2a15d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:53:10 2019 +0100 testbot/web: Document why WineTestBot::Log is used. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 2 +- testbot/web/Stats.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index fe056aa..d616a7c 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -29,7 +29,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Activity; -use WineTestBot::Log; +use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 43f1494..f453891 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -28,7 +28,7 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; -use WineTestBot::Log; +use WineTestBot::Log; # For Elapsed() use WineTestBot::Utils; use WineTestBot::VMs;

1 0

Francois Gouget : testbot: Trace the chunks in _DumpDiff().
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: tools Branch: master Commit: 5d7bfea1c743825d92cb87e77235306b57a03247 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5d7bfea1c743825d92cb87e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:53:01 2019 +0100 testbot: Trace the chunks in _DumpDiff(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index acb87a4..2849d60 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -809,17 +809,19 @@ sub _DumpDiff($$) print STDERR "$Label:\n"; $Diff = $Diff->Copy(); + my $Chunk = 0; while ($Diff->Next()) { if ($Diff->Same()) { - print STDERR " $_\n" for ($Diff->Same()); + print STDERR "$Chunk $_\n" for ($Diff->Same()); } else { - print STDERR "-$_\n" for ($Diff->Items(1)); - print STDERR "+$_\n" for ($Diff->Items(2)); + print STDERR "$Chunk -$_\n" for ($Diff->Items(1)); + print STDERR "$Chunk +$_\n" for ($Diff->Items(2)); } + $Chunk++; } }

1 0

Francois Gouget : testbot/web: Trace how long it takes to generate the JobDetails page.
by Alexandre Julliard 08 Nov '19

08 Nov '19

Module: tools Branch: master Commit: a1b547a37ce2cb7fac89e76344f1a4841738e09d URL: https://source.winehq.org/git/tools.git/?a=commit;h=a1b547a37ce2cb7fac89e76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 8 10:52:41 2019 +0100 testbot/web: Trace how long it takes to generate the JobDetails page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index fc98e14..a59fa00 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -31,6 +31,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Log; # For Elapsed() use WineTestBot::LogUtils; use WineTestBot::Missions; use WineTestBot::StepsTasks; @@ -41,6 +42,7 @@ use WineTestBot::Engine::Notify; sub _initialize($$$) { my ($self, $Request, $RequiredRole) = @_; + $self->{start} = Time(); my $JobId = $self->GetParam("Key"); if (! defined($JobId)) @@ -645,6 +647,12 @@ sub GenerateDataCell($$$$$) } } +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; +} + package main;

1 0

Piotr Caban : windowscodecs: Include png.h only if SONAME_LIBPNG is defined.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 88d30985ddd534e8bafed531e619846bc8d10839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d30985ddd534e8bafed531… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 22:02:43 2019 +0100 windowscodecs: Include png.h only if SONAME_LIBPNG is defined. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e272e86f..a79df632ef 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -22,7 +22,7 @@ #include <stdarg.h> -#ifdef HAVE_PNG_H +#ifdef SONAME_LIBPNG #include <png.h> #endif @@ -2183,7 +2183,7 @@ HRESULT PngEncoder_CreateInstance(REFIID iid, void** ppv) return ret; } -#else /* !HAVE_PNG_H */ +#else /* !SONAME_LIBPNG */ HRESULT PngDecoder_CreateInstance(REFIID iid, void** ppv) {

1 0

Piotr Caban : user32: Include png.h only if SONAME_LIBPNG is defined.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: cfa9334125f6a4ae7296b3931af5f1af93fc1029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfa9334125f6a4ae7296b393… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 22:02:36 2019 +0100 user32: Include png.h only if SONAME_LIBPNG is defined. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9c61d7ff30..6413d22d03 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -31,7 +31,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> -#ifdef HAVE_PNG_H +#ifdef SONAME_LIBPNG #include <png.h> #endif

1 0

Conor McCarthy : kernelbase: Add stub for SetThreadDescription().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b4684bc561257de99ce2b3bef29cc9b622aab239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4684bc561257de99ce2b3be… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Nov 8 00:54:33 2019 +1000 kernelbase: Add stub for SetThreadDescription(). Used by Hitman 2. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 10 ++++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 3b57e1c898..6f0c4fa752 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -5,6 +5,6 @@ @ stub GetThreadSelectedCpuSets @ stub SetProcessDefaultCpuSets @ stub SetProcessInformation -@ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr wstr) kernel32.SetThreadDescription @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor @ stub SetThreadSelectedCpuSets diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7acd..88708845df 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1447,6 +1447,7 @@ @ stdcall SetTermsrvAppInstallMode(long) @ stdcall SetThreadAffinityMask(long long) @ stdcall -import SetThreadContext(long ptr) +@ stdcall -import SetThreadDescription(ptr wstr) @ stdcall -import SetThreadErrorMode(long ptr) @ stdcall SetThreadExecutionState(long) @ stdcall -import SetThreadGroupAffinity(long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1fa479525..a86a3fe252 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1478,7 +1478,7 @@ @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment @ stdcall SetThreadContext(long ptr) -# @ stub SetThreadDescription +@ stdcall SetThreadDescription(ptr wstr) @ stdcall SetThreadErrorMode(long ptr) @ stdcall SetThreadGroupAffinity(long ptr ptr) @ stdcall SetThreadIdealProcessor(long long) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 0cac2b6941..345f44dff7 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -387,6 +387,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadContext( HANDLE thread, const CONTEXT *co } +/*********************************************************************** + * SetThreadDescription (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ SetThreadDescription( HANDLE thread, PCWSTR description ) +{ + FIXME( "(%p %s): stub\n", thread, debugstr_w( description )); + return E_NOTIMPL; +} + + /*********************************************************************** * SetThreadErrorMode (kernelbase.@) */

1 0

Piotr Caban : ntdll: Work around futimens weak linking problem in set_file_times.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b4ec4028597c06bbdbf283b4a5f5957dd2c1b809 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4ec4028597c06bbdbf283b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 7 16:24:34 2019 +0100 ntdll: Work around futimens weak linking problem in set_file_times. Newer XCode versions are weak linking to futimens function. Because of that Wine will crash trying to execute the function on Mac OS <= 10.12. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 655dcb2eaf..dd6d1341b0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1907,10 +1907,9 @@ static int futimens( int fd, const struct timespec spec[2] ) #define UTIME_OMIT ((1 << 30) - 2) #endif -static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +static BOOL set_file_times_precise( int fd, const LARGE_INTEGER *mtime, + const LARGE_INTEGER *atime, NTSTATUS *status ) { - NTSTATUS status = STATUS_SUCCESS; - #ifdef HAVE_FUTIMENS struct timespec tv[2]; @@ -1926,12 +1925,29 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ tv[1].tv_sec = mtime->QuadPart / 10000000 - SECS_1601_TO_1970; tv[1].tv_nsec = (mtime->QuadPart % 10000000) * 100; } - if (futimens( fd, tv ) == -1) status = FILE_GetNtStatus(); +#ifdef __APPLE__ + if (!&futimens) return FALSE; +#endif + if (futimens( fd, tv ) == -1) *status = FILE_GetNtStatus(); + else *status = STATUS_SUCCESS; + return TRUE; +#else + return FALSE; +#endif +} -#elif defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) +static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +{ + NTSTATUS status = STATUS_SUCCESS; +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) struct timeval tv[2]; struct stat st; +#endif + + if (set_file_times_precise( fd, mtime, atime, &status )) + return status; +#if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) if (!atime->QuadPart || !mtime->QuadPart) {

1 0

Alistair Leslie-Hughes : dsdmo: Added dll.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 43a4439068ef375930fb87f379960a93275afb4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a4439068ef375930fb87f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 6 21:29:28 2019 +0000 dsdmo: Added dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dsdmo/Makefile.in | 6 ++++ dlls/dsdmo/dsdmo.spec | 4 +++ dlls/dsdmo/main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/configure b/configure index 8ddfb4ecdd..d69d1ac4a3 100755 --- a/configure +++ b/configure @@ -1257,6 +1257,7 @@ enable_dpnlobby enable_dpvoice enable_dpwsockx enable_drmclien +enable_dsdmo enable_dsound enable_dsquery enable_dssenh @@ -20384,6 +20385,7 @@ wine_fn_config_makefile dlls/dpvoice enable_dpvoice wine_fn_config_makefile dlls/dpvoice/tests enable_tests wine_fn_config_makefile dlls/dpwsockx enable_dpwsockx wine_fn_config_makefile dlls/drmclien enable_drmclien +wine_fn_config_makefile dlls/dsdmo enable_dsdmo wine_fn_config_makefile dlls/dsound enable_dsound wine_fn_config_makefile dlls/dsound/tests enable_tests wine_fn_config_makefile dlls/dsquery enable_dsquery diff --git a/configure.ac b/configure.ac index 31aac11d31..c99db6984b 100644 --- a/configure.ac +++ b/configure.ac @@ -3237,6 +3237,7 @@ WINE_CONFIG_MAKEFILE(dlls/dpvoice) WINE_CONFIG_MAKEFILE(dlls/dpvoice/tests) WINE_CONFIG_MAKEFILE(dlls/dpwsockx) WINE_CONFIG_MAKEFILE(dlls/drmclien) +WINE_CONFIG_MAKEFILE(dlls/dsdmo) WINE_CONFIG_MAKEFILE(dlls/dsound) WINE_CONFIG_MAKEFILE(dlls/dsound/tests) WINE_CONFIG_MAKEFILE(dlls/dsquery) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in new file mode 100644 index 0000000000..99816ae0c0 --- /dev/null +++ b/dlls/dsdmo/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dsdmo.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/dsdmo/dsdmo.spec b/dlls/dsdmo/dsdmo.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dsdmo/dsdmo.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c new file mode 100644 index 0000000000..788381b7a4 --- /dev/null +++ b/dlls/dsdmo/main.c @@ -0,0 +1,82 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#define COBJMACROS + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsdmo); + +static HINSTANCE dsdmo_instance; + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + TRACE("(%p %d %p)\n", inst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dsdmo_instance = inst; + DisableThreadLibraryCalls(dsdmo_instance); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dsdmo_instance); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dsdmo_instance); +}

1 0

Paul Gofman : kernel32: Output a message in GetVolumeInformationW() when device has no read access.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 4907f2626c56d42f6e8c98832e4f801e06ba3c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4907f2626c56d42f6e8c9883… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Nov 7 13:44:35 2019 +0300 kernel32: Output a message in GetVolumeInformationW() when device has no read access. A lot of applications fail to install from CDs or mounted ISO images when Wine does not return correct volume label from GetVolumeInformation() repeatedly asking to insert correct disk. Most of the time it happens because the block device is read only for user (which is typical default behaviour) and FS info cannot be read. It looks like the hint about what went wrong will simplify things in this common case. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/volume.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 2c8a668b73..02d14cdcc9 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -772,8 +772,12 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, CloseHandle( handle ); goto fill_fs_info; } - else TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); - + else + { + TRACE( "cannot open device %s: %x\n", debugstr_w(nt_name.Buffer), status ); + if (status == STATUS_ACCESS_DENIED) + MESSAGE( "wine: Read access denied for device %s, FS volume label and serial are not available.\n", debugstr_w(nt_name.Buffer) ); + } /* we couldn't open the device, fallback to default strategy */ if (!set_ntstatus( NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0,

1 0

Jacek Caban : vbscript: Move detach_global_objects call to VBScript destructor.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: fcc01c30952a9dc75240b0ddaeaa631ac68d6741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc01c30952a9dc75240b0dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 19:30:28 2019 +0100 vbscript: Move detach_global_objects call to VBScript destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 938e517c23..47fa4562f4 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -188,7 +188,6 @@ static void release_script(script_ctx_t *ctx) IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - detach_global_objects(ctx); heap_pool_free(&ctx->heap); heap_pool_init(&ctx->heap); } @@ -395,6 +394,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); + detach_global_objects(This->ctx); heap_free(This->ctx); heap_free(This); }

1 0

Gabriel Ivăncescu : vbscript: Release the code list when the script is closed.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: d481efee3929a109cf484718ca09dfa2a13e4be7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d481efee3929a109cf484718… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 19:30:22 2019 +0100 vbscript: Release the code list when the script is closed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 6d2bb54e52..938e517c23 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -193,13 +193,10 @@ static void release_script(script_ctx_t *ctx) heap_pool_init(&ctx->heap); } -static void destroy_script(script_ctx_t *ctx) +static void release_code_list(script_ctx_t *ctx) { while(!list_empty(&ctx->code_list)) release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); - - release_script(ctx); - heap_free(ctx); } static void decrease_state(VBScript *This, SCRIPTSTATE state) @@ -221,6 +218,8 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) break; release_script(This->ctx); This->thread_id = 0; + if(state == SCRIPTSTATE_CLOSED) + release_code_list(This->ctx); break; case SCRIPTSTATE_CLOSED: break; @@ -396,7 +395,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); - destroy_script(This->ctx); + heap_free(This->ctx); heap_free(This); }

1 0

Gabriel Ivăncescu : jscript/tests: Add tests for pending and executed code persistence.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c01b4bdebeb96ca17c674b550bf0ed156eca857a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c01b4bdebeb96ca17c674b55… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:28 2019 +0100 jscript/tests: Add tests for pending and executed code persistence. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 254 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c01b4bdebeb96ca17c67…

1 0

Gabriel Ivăncescu : jscript/tests: Use integers instead of booleans for counting call expectations.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: af245b027bd27aacbdd4f64de6af837ef8858af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af245b027bd27aacbdd4f64d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:20 2019 +0100 jscript/tests: Use integers instead of booleans for counting call expectations. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/jscript.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 4c5aa6cc2f..b97e823d58 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -51,27 +51,27 @@ static const CLSID CLSID_JScriptEncode = {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; #define DEFINE_EXPECT(func) \ - static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + static int expect_ ## func = 0, called_ ## func = 0 #define SET_EXPECT(func) \ - expect_ ## func = TRUE + expect_ ## func = 1 #define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ + called_ ## func++; \ }while(0) #define CHECK_EXPECT(func) \ do { \ CHECK_EXPECT2(func); \ - expect_ ## func = FALSE; \ + expect_ ## func--; \ }while(0) #define CHECK_CALLED(func) \ do { \ ok(called_ ## func, "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ + expect_ ## func = called_ ## func = 0; \ }while(0) DEFINE_EXPECT(GetLCID);

1 0

Gabriel Ivăncescu : jscript: Implement script persistence.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: a42666f5905834e0ece351f1845b9ef0f3d34983 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a42666f5905834e0ece351f1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:13 2019 +0100 jscript: Implement script persistence. Persistent code has to be re-executed if the script is uninitialized and then reinitialized and restarted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.h | 1 + dlls/jscript/jscript.c | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1d76cf8f2f..955c315ff9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -169,6 +169,7 @@ local_ref_t *lookup_local(const function_code_t*,const WCHAR*) DECLSPEC_HIDDEN; typedef struct _bytecode_t { LONG ref; + BOOL is_persistent; instr_t *instrs; heap_pool_t heap; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9a03f36b26..60711fce10 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -60,6 +60,7 @@ typedef struct { IActiveScriptSite *site; + struct list persistent_code; struct list queued_code; } JScript; @@ -120,6 +121,19 @@ static void clear_script_queue(JScript *This) { bytecode_t *iter = LIST_ENTRY(list_head(&This->queued_code), bytecode_t, entry); list_remove(&iter->entry); + if (iter->is_persistent) + list_add_tail(&This->persistent_code, &iter->entry); + else + release_bytecode(iter); + } +} + +static void clear_persistent_code_list(JScript *This) +{ + while(!list_empty(&This->queued_code)) + { + bytecode_t *iter = LIST_ENTRY(list_head(&This->persistent_code), bytecode_t, entry); + list_remove(&iter->entry); release_bytecode(iter); } } @@ -209,6 +223,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); + clear_script_queue(This); break; default: assert(0); @@ -463,6 +478,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s return E_UNEXPECTED; decrease_state(This, SCRIPTSTATE_UNINITIALIZED); + list_move_tail(&This->queued_code, &This->persistent_code); return S_OK; } @@ -515,6 +531,7 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) return E_UNEXPECTED; decrease_state(This, SCRIPTSTATE_CLOSED); + clear_persistent_code_list(This); return S_OK; } @@ -779,6 +796,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, return hres; } + code->is_persistent = (dwFlags & SCRIPTTEXT_ISPERSISTENT) != 0; + /* * Although pvarResult is not really used without SCRIPTTEXT_ISEXPRESSION flag, if it's not NULL, * script is executed immediately, even if it's not in started state yet. @@ -789,7 +808,12 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, } hres = exec_global_code(This, code); - release_bytecode(code); + + if(code->is_persistent) + list_add_tail(&This->persistent_code, &code->entry); + else + release_bytecode(code); + if(FAILED(hres)) return hres; @@ -1077,6 +1101,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; ret->is_encode = is_encode; + list_init(&ret->persistent_code); list_init(&ret->queued_code); hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv);

1 0

Gabriel Ivăncescu : jscript: Use standard list for the queued code.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 5e4f0f40860755da3588d14d2c27a055a650acee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4f0f40860755da3588d14d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 7 18:17:06 2019 +0100 jscript: Use standard list for the queued code. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.h | 2 +- dlls/jscript/jscript.c | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a3b598e534..1d76cf8f2f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -185,7 +185,7 @@ typedef struct _bytecode_t { unsigned str_pool_size; unsigned str_cnt; - struct _bytecode_t *next; + struct list entry; } bytecode_t; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,BOOL,BOOL,bytecode_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 2a7c028454..9a03f36b26 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -60,8 +60,7 @@ typedef struct { IActiveScriptSite *site; - bytecode_t *queue_head; - bytecode_t *queue_tail; + struct list queued_code; } JScript; void script_release(script_ctx_t *ctx) @@ -117,27 +116,19 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) static void clear_script_queue(JScript *This) { - bytecode_t *iter, *iter2; - - if(!This->queue_head) - return; - - iter = This->queue_head; - while(iter) { - iter2 = iter->next; - iter->next = NULL; + while(!list_empty(&This->queued_code)) + { + bytecode_t *iter = LIST_ENTRY(list_head(&This->queued_code), bytecode_t, entry); + list_remove(&iter->entry); release_bytecode(iter); - iter = iter2; } - - This->queue_head = This->queue_tail = NULL; } static void exec_queued_code(JScript *This) { bytecode_t *iter; - for(iter = This->queue_head; iter; iter = iter->next) + LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) exec_global_code(This, iter); clear_script_queue(This); @@ -793,10 +784,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, * script is executed immediately, even if it's not in started state yet. */ if(!pvarResult && !is_started(This->ctx)) { - if(This->queue_tail) - This->queue_tail = This->queue_tail->next = code; - else - This->queue_head = This->queue_tail = code; + list_add_tail(&This->queued_code, &code->entry); return S_OK; } @@ -1089,6 +1077,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; ret->is_encode = is_encode; + list_init(&ret->queued_code); hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface);

1 0

Jacek Caban : scrrun/tests: Add test of lost trailing byte in unicode srteam.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 9294823a7b680a86beee199784d3240cca662041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9294823a7b680a86beee1997… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:49 2019 +0100 scrrun/tests: Add test of lost trailing byte in unicode srteam. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3bd8634f25..68ac70ce3a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2032,6 +2032,32 @@ static void test_Read(void) ITextStream_Release(stream); + /* ASCII file, read with Unicode stream */ + /* 3. one byte content, 2 are interpreted as a character, 3rd is lost */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + str = SysAllocString(L"abc"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(SysStringLen(str) == 1, "len = %u\n", SysStringLen(str)); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + + ITextStream_Release(stream); + DeleteFileW(nameW); RemoveDirectoryW(dirW); SysFreeString(nameW);

1 0

Jacek Caban : scrrun/tests: Add ITextStream::ReadLine tests.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: f2b681db7771ff275fb0d4b9e0edb5496dba620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2b681db7771ff275fb0d4b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:36 2019 +0100 scrrun/tests: Add ITextStream::ReadLine tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 2d5c6e4138..3bd8634f25 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1734,6 +1734,7 @@ static void test_ReadAll(void) hr = ITextStream_ReadLine(stream, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); + ok(!wcscmp(str, nameW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -2036,6 +2037,75 @@ static void test_Read(void) SysFreeString(nameW); } +static void test_ReadLine(void) +{ + WCHAR path[MAX_PATH], dir[MAX_PATH]; + ITextStream *stream; + unsigned int i; + HANDLE file; + DWORD size; + HRESULT hr; + BSTR str; + BOOL ret; + + const char data[] = "first line\r\nsecond\n\n\rt\r\re \rst\n"; + + get_temp_filepath(L"test.txt", path, dir); + + ret = CreateDirectoryW(dir, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + for (i = 0; i < 1000; i++) + WriteFile(file, data, strlen(data), &size, NULL); + CloseHandle(file); + + str = SysAllocString(path); + hr = IFileSystem3_OpenTextFile(fs3, str, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + for (i = 0; i < 1000; i++) + { + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!wcscmp(str, L"first line"), "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!wcscmp(str, L"second"), "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!*str, "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = ITextStream_ReadLine(stream, &str); + ok(hr == S_OK, "ReadLine failed: %08x\n", hr); + ok(!wcscmp(str, L"\rt\r\re \rst"), "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + + str = NULL; + hr = ITextStream_ReadLine(stream, &str); + ok(hr == CTL_E_ENDOFFILE, "got 0x%08x\n", hr); + ok(!str, "ReadLine returned %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + ret = DeleteFileW(path); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); + + ret = RemoveDirectoryW(dir); + ok(ret, "RemoveDirectory failed: %u\n", GetLastError()); +} + struct driveexists_test { const WCHAR drivespec[10]; const INT drivetype; @@ -2403,6 +2473,7 @@ START_TEST(filesystem) test_WriteLine(); test_ReadAll(); test_Read(); + test_ReadLine(); test_DriveExists(); test_GetDriveName(); test_GetDrive();

1 0

Jacek Caban : scrrun: Add ITextStream::ReadLine implementation.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 14de44513f343ad0e9590df07a877a6d250964bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=14de44513f343ad0e9590df0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:32 2019 +0100 scrrun: Add ITextStream::ReadLine implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 33 ++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 6 ------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index b05a814593..5893435af7 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <limits.h> #include <assert.h> +#include <wchar.h> #include "windef.h" #include "winbase.h" @@ -499,10 +500,11 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); - VARIANT_BOOL eos; - HRESULT hr; + unsigned int skip = 0; + const WCHAR *nl; + HRESULT hr = S_OK; - FIXME("(%p)->(%p): stub\n", This, text); + TRACE("(%p)->(%p)\n", This, text); if (!text) return E_POINTER; @@ -511,15 +513,28 @@ static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) if (textstream_check_iomode(This, IORead)) return CTL_E_BADFILEMODE; - /* check for EOF */ - hr = ITextStream_get_AtEndOfStream(iface, &eos); - if (FAILED(hr)) - return hr; + while (!(nl = wmemchr(This->read_buf, '\n', This->read_buf_size)) && !This->eof) + { + if (FAILED(hr = read_more_data(This))) + return hr; + } - if (eos == VARIANT_TRUE) + if (This->eof && !This->read_buf_size) return CTL_E_ENDOFFILE; - return E_NOTIMPL; + if (!nl) + { + nl = This->read_buf + This->read_buf_size; + hr = S_FALSE; + } + else if (nl > This->read_buf && nl[-1] == '\r') + { + nl--; + skip = 2; + } + else skip = 1; + + return read_from_buffer(This, nl - This->read_buf, text, skip) ? hr : E_OUTOFMEMORY; } static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3b4af3c498..2d5c6e4138 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1732,10 +1732,8 @@ static void test_ReadAll(void) str = NULL; hr = ITextStream_ReadLine(stream, &str); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); -} SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -1743,7 +1741,6 @@ todo_wine { str = NULL; hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1880,10 +1877,8 @@ static void test_Read(void) str = NULL; hr = ITextStream_ReadLine(stream, &str); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); -} SysFreeString(str); lstrcpyW(buffW, secondlineW); @@ -1891,7 +1886,6 @@ todo_wine { str = NULL; hr = ITextStream_Read(stream, 100, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); -todo_wine ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); ITextStream_Release(stream);

1 0

Jacek Caban : scrrun: Rewrite text stream to use read ahead buffer.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c80e16ae190b4a6a26d6dcc403ed24c65169ed26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c80e16ae190b4a6a26d6dcc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:10:24 2019 +0100 scrrun: Rewrite text stream to use read ahead buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 231 ++++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c80e16ae190b4a6a26d6…

1 0

Jacek Caban : winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 7c29f5a3b3177be955a3fcb1ff4a22b7843c851e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c29f5a3b3177be955a3fcb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 15:19:23 2019 +0100 winemac.drv: Make sure that NSMiniaturizableWindowMask style mask is set before calling miniaturize. miniaturize fails to minimize window when NSMiniaturizableWindowMask style is not set. The style will be restored on window restore (or earlier). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 0bc4d38f4d..877653ea00 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1289,6 +1289,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } else { + [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; [super miniaturize:nil]; discard |= event_mask_for_type(WINDOW_BROUGHT_FORWARD) | event_mask_for_type(WINDOW_GOT_FOCUS) | @@ -1763,6 +1764,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if (pendingMinimize) { + [self setStyleMask:([self styleMask] | NSMiniaturizableWindowMask)]; [super miniaturize:nil]; pendingMinimize = FALSE; }

1 0

Alexandre Julliard : ntdll: Load the main binary directly in ntdll when possible.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b0199ea2fe8f9b77aee7ab4f68c9ae1755442586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0199ea2fe8f9b77aee7ab4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 18:54:21 2019 +0100 ntdll: Load the main binary directly in ntdll when possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 8 +++---- dlls/ntdll/loader.c | 58 ++++++++++++++++++++++++++++++++----------------- dlls/ntdll/process.c | 6 ++--- 3 files changed, 45 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0199ea2fe8f9b77aee7…

1 0

Alexandre Julliard : ntdll: Move some initializations out of thread_init().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 608d086f1b1bb7168e9322c65224c23f34e75f29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608d086f1b1bb7168e9322c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 17:00:39 2019 +0100 ntdll: Move some initializations out of thread_init(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 36 ++++++++++++++++++++++-------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 22 +++------------------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b16d646bdd..98c3f2d950 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4234,8 +4234,22 @@ void __wine_process_init(void) UNICODE_STRING nt_name; void * (CDECL *init_func)(void); INITIAL_TEB stack; + BOOL suspend; + SIZE_T info_size; + TEB *teb = thread_init(); + PEB *peb = teb->Peb; - thread_init(); + /* setup the server connection */ + server_init_process(); + info_size = server_init_thread( peb, &suspend ); + + peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ); + peb->LoaderLock = &loader_section; + + init_directories(); + init_user_process_params( info_size ); + + NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); /* retrieve current umask */ FILE_umask = umask(0777); @@ -4263,7 +4277,7 @@ void __wine_process_init(void) kernel32_start_process = init_func(); - wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + wm = get_modref( peb->ImageBaseAddress ); assert( wm ); if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) { @@ -4271,24 +4285,18 @@ void __wine_process_init(void) exit(1); } - NtCurrentTeb()->Peb->LoaderLock = &loader_section; virtual_set_large_address_space(); /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); - InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); - InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( &stack, 0, 0, NULL )) != STATUS_SUCCESS) - { - ERR( "Main exe initialization for %s failed, status %x\n", - debugstr_w(wm->ldr.FullDllName.Buffer), status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - NtCurrentTeb()->Tib.StackBase = stack.StackBase; - NtCurrentTeb()->Tib.StackLimit = stack.StackLimit; - NtCurrentTeb()->DeallocationStack = stack.DeallocationStack; + virtual_alloc_thread_stack( &stack, 0, 0, NULL ); + teb->Tib.StackBase = stack.StackBase; + teb->Tib.StackLimit = stack.StackLimit; + teb->DeallocationStack = stack.DeallocationStack; server_init_process_done(); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 074792ff2a..eb31bb5bce 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -79,7 +79,7 @@ extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; -extern void thread_init(void) DECLSPEC_HIDDEN; +extern TEB *thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern void virtual_init_threading(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index be54f89082..621aaddfe3 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -220,12 +220,11 @@ static void set_process_name( int argc, char *argv[] ) * * NOTES: The first allocated TEB on NT is at 0x7ffde000. */ -void thread_init(void) +TEB *thread_init(void) { TEB *teb; void *addr; - BOOL suspend; - SIZE_T size, info_size; + SIZE_T size; LARGE_INTEGER now; NTSTATUS status; struct ntdll_thread_data *thread_data; @@ -299,21 +298,7 @@ void thread_init(void) signal_init_thread( teb ); virtual_init_threading(); debug_init(); - - /* setup the server connection */ - server_init_process(); - info_size = server_init_thread( peb, &suspend ); - - /* create the process heap */ - if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) - { - MESSAGE( "wine: failed to create the process heap\n" ); - exit(1); - } - set_process_name( __wine_main_argc, __wine_main_argv ); - init_directories(); - init_user_process_params( info_size ); /* initialize time values in user_shared_data */ NtQuerySystemTime( &now ); @@ -323,10 +308,9 @@ void thread_init(void) user_shared_data->u.TickCount.High2Time = user_shared_data->u.TickCount.High1Time; user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart; user_shared_data->TickCountMultiplier = 1 << 24; - fill_cpu_info(); - NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); + return teb; }

1 0

Alexandre Julliard : ntdll: Initialize earlier things that need the executable name.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b7db0b52cee65a008f503ce727befcad3ba8d28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7db0b52cee65a008f503ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 16:54:31 2019 +0100 ntdll: Initialize earlier things that need the executable name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 45 ++++++++++++++++++++++----------------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/version.c | 33 +++++++++++++++------------------ 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cc7bf6900b..b16d646bdd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3832,28 +3832,33 @@ static void load_global_options(void) attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &name_str, sessionW ); - if (NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) return; - - query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); - query_dword_option( hkey, safesearchW, &path_safe_mode ); - query_dword_option( hkey, safedllmodeW, &dll_safe_mode ); + if (!NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) + { + query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); + query_dword_option( hkey, safesearchW, &path_safe_mode ); + query_dword_option( hkey, safedllmodeW, &dll_safe_mode ); - if (!query_dword_option( hkey, critsectW, &value )) - NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; + if (!query_dword_option( hkey, critsectW, &value )) + NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; - if (!query_dword_option( hkey, heapresW, &value )) - NtCurrentTeb()->Peb->HeapSegmentReserve = value; + if (!query_dword_option( hkey, heapresW, &value )) + NtCurrentTeb()->Peb->HeapSegmentReserve = value; - if (!query_dword_option( hkey, heapcommitW, &value )) - NtCurrentTeb()->Peb->HeapSegmentCommit = value; + if (!query_dword_option( hkey, heapcommitW, &value )) + NtCurrentTeb()->Peb->HeapSegmentCommit = value; - if (!query_dword_option( hkey, decommittotalW, &value )) - NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; + if (!query_dword_option( hkey, decommittotalW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; - if (!query_dword_option( hkey, decommitfreeW, &value )) - NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; + if (!query_dword_option( hkey, decommitfreeW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; - NtClose( hkey ); + NtClose( hkey ); + } + LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, + globalflagW, REG_DWORD, &NtCurrentTeb()->Peb->NtGlobalFlag, + sizeof(DWORD), NULL ); + heap_set_debug_flags( GetProcessHeap() ); } @@ -4223,8 +4228,6 @@ void __wine_process_init(void) static const WCHAR kernel32W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\', 'k','e','r','n','e','l','3','2','.','d','l','l',0}; - static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; - WINE_MODREF *wm; NTSTATUS status; ANSI_STRING func_name; @@ -4239,6 +4242,7 @@ void __wine_process_init(void) umask( FILE_umask ); load_global_options(); + version_init(); /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); @@ -4268,13 +4272,8 @@ void __wine_process_init(void) } NtCurrentTeb()->Peb->LoaderLock = &loader_section; - version_init( wm->ldr.FullDllName.Buffer ); virtual_set_large_address_space(); - LdrQueryImageFileExecutionOptions( &wm->ldr.FullDllName, globalflagW, REG_DWORD, - &NtCurrentTeb()->Peb->NtGlobalFlag, sizeof(DWORD), NULL ); - heap_set_debug_flags( GetProcessHeap() ); - /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e2280dea84..074792ff2a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -77,7 +77,7 @@ extern void signal_start_thread( LPTHREAD_START_ROUTINE entry, void *arg, BOOL s extern void signal_start_process( LPTHREAD_START_ROUTINE entry, BOOL suspend ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_process( int status ) DECLSPEC_HIDDEN; -extern void version_init( const WCHAR *appname ) DECLSPEC_HIDDEN; +extern void version_init(void) DECLSPEC_HIDDEN; extern void debug_init(void) DECLSPEC_HIDDEN; extern void thread_init(void) DECLSPEC_HIDDEN; extern void actctx_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 9c9f2cc8cd..bd03382899 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -485,7 +485,7 @@ static BOOL parse_win_version( HANDLE hkey ) /********************************************************************** * version_init */ -void version_init( const WCHAR *appname ) +void version_init(void) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; @@ -493,6 +493,8 @@ void version_init( const WCHAR *appname ) UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; + const WCHAR *p, *appname = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + WCHAR appversion[MAX_PATH+20]; current_version = &VersionData[WIN7]; @@ -511,26 +513,21 @@ void version_init( const WCHAR *appname ) if (!config_key) goto done; /* open AppDefaults\\appname key */ - if (appname && *appname) - { - const WCHAR *p; - WCHAR appversion[MAX_PATH+20]; - if ((p = strrchrW( appname, '/' ))) appname = p + 1; - if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; - strcpyW( appversion, appdefaultsW ); - strcatW( appversion, appname ); - RtlInitUnicodeString( &nameW, appversion ); - attr.RootDirectory = config_key; + strcpyW( appversion, appdefaultsW ); + strcatW( appversion, appname ); + RtlInitUnicodeString( &nameW, appversion ); + attr.RootDirectory = config_key; - /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe */ - if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) - { - TRACE( "getting version from %s\n", debugstr_w(appversion) ); - got_win_ver = parse_win_version( hkey ); - NtClose( hkey ); - } + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe */ + if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) + { + TRACE( "getting version from %s\n", debugstr_w(appversion) ); + got_win_ver = parse_win_version( hkey ); + NtClose( hkey ); } if (!got_win_ver)

1 0

Zhiyi Zhang : user32/tests: Fix monitor test failures on some systems.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: b95c4c229c87e31130637fc461034cdd06675dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=b95c4c229c87e31130637fc4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 7 22:06:18 2019 +0800 user32/tests: Fix monitor test failures on some systems. On some systems, the monitor name may not be Default_Monitor, so check format instead. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 53 +++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 26ee28a122..04e63dc38d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -81,8 +81,6 @@ static int monitor_count = 0; static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *device, DWORD flags) { - char video_name[32]; - char video_value[128]; char buffer[128]; int number; int vendor_id; @@ -90,10 +88,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de int subsys_id; int revision_id; size_t length; - HKEY hkey; HDC hdc; - DWORD size; - LSTATUS ls; adapter_count++; @@ -102,25 +97,10 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de device->DeviceName); /* DeviceKey */ - /* win7 is the only OS version where \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not in order with adapter index. */ - if (GetVersion() != 0x1db10106 || !strcmp(winetest_platform, "wine")) - { - sprintf(video_name, "\\Device\\Video%d", index); - ls = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkey); - ok(!ls, "#%d: failed to open registry, error: %#x\n", index, ls); - if (!ls) - { - memset(video_value, 0, sizeof(video_value)); - size = sizeof(video_value); - ls = RegQueryValueExA(hkey, video_name, NULL, NULL, (unsigned char *)video_value, &size); - ok(!ls, "#%d: failed to get registry value, error: %#x\n", index, ls); - RegCloseKey(hkey); - ok(!strcmp(video_value, device->DeviceKey), "#%d: wrong DeviceKey: %s\n", index, device->DeviceKey); - } - } - else - ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, - "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); + /* \Device\Video? value in HLKM\HARDWARE\DEVICEMAP\VIDEO are not necessarily in order with adapter index. + * Check format only */ + ok(sscanf(device->DeviceKey, "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Video\\%[^\\]\\%04d", buffer, &number) == 2, + "#%d: wrong DeviceKey %s\n", index, device->DeviceKey); /* DeviceString */ length = strlen(device->DeviceString); @@ -159,9 +139,8 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de } static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, - const DISPLAY_DEVICEA *device, DWORD flags) + DISPLAY_DEVICEA *device, DWORD flags) { - static const char device_id_prefix[] = "MONITOR\\Default_Monitor\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" "\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\"; char monitor_name[32]; @@ -186,24 +165,22 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index device->StateFlags); /* DeviceID */ - lstrcpynA(buffer, device->DeviceID, sizeof(device_id_prefix)); + CharLowerA(device->DeviceID); if (flags & EDD_GET_DEVICE_INTERFACE_NAME) - { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\4&2abfaa30&0&UID0 GUID_DEVINTERFACE_MONITOR - * ^ ^ ^ - * Expect format \\?\DISPLAY#Default_Monitor#4&2abfaa30&0&UID0#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ + { /* HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\[instance id] GUID_DEVINTERFACE_MONITOR + * ^ ^ ^ + * Expect format \\?\DISPLAY#[monitor name]#[instance id]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7} */ ok(strlen(device->DeviceID) == 0 || /* vista ~ win7 */ - sscanf(device->DeviceID, "\\\\?\\DISPLAY#Default_Monitor#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer) == 1 || /* win8+ */ - (!lstrcmpiA(buffer, device_id_prefix) && - sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1), /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ - "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); + sscanf(device->DeviceID, "\\\\?\\display#%[^#]#%[^#]#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}", buffer, buffer) == 2 || /* win8+ */ + sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, /* XP/2003 ignores EDD_GET_DEVICE_INTERFACE_NAME */ + "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); } else { - /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\Default_Monitor\{Instance} */ + /* Expect HarewareID value data + Driver value data in HKLM\SYSTEM\CurrentControlSet\Enum\DISPLAY\[monitor name]\{instance} */ /* But we don't know which monitor instance this belongs to, so check format instead */ - ok(!lstrcmpiA(buffer, device_id_prefix), "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); - ok(sscanf(device->DeviceID + sizeof(device_id_prefix) - 1, "%04d", &number) == 1, - "#%d wrong DeviceID : %s\n", monitor_index, device->DeviceID); + ok(sscanf(device->DeviceID, "monitor\\%[^\\]\\{4d36e96e-e325-11ce-bfc1-08002be10318}\\%04d", buffer, &number) == 2, + "#%d: wrong DeviceID : %s\n", monitor_index, device->DeviceID); } /* DeviceKey */

1 0

Zhiyi Zhang : user32/tests: Fix test failures on multiple monitor setup.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 6b2b004c0ca0427a3337953efab4e59c0e67cd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2b004c0ca0427a3337953e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 7 22:04:31 2019 +0800 user32/tests: Fix test failures on multiple monitor setup. The desktop window rectangle is the same as that of primary monitor for compatibility reasons. It equals to virtual screen rectangle only when there are no more than two active and non-mirrored monitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index f74c9e7561..645c188008 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3225,6 +3225,7 @@ static void test_dpi_mapping(void) ULONG_PTR i, j, k; WINDOWPLACEMENT wpl_orig, wpl; HMONITOR monitor; + INT monitor_count; MONITORINFO mon_info; DPI_AWARENESS_CONTEXT context; @@ -3235,6 +3236,7 @@ static void test_dpi_mapping(void) } context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); GetWindowRect( GetDesktopWindow(), &desktop ); + monitor_count = GetSystemMetrics( SM_CMONITORS ); for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) { pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); @@ -3247,9 +3249,12 @@ static void test_dpi_mapping(void) SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXSCREEN ), GetSystemMetrics( SM_CYSCREEN )); ok( EqualRect( &expect, &rect ), "%lu: wrong desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); - SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); - ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", - i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + if (monitor_count < 2) + { + SetRect( &rect, 0, 0, GetSystemMetrics( SM_CXVIRTUALSCREEN ), GetSystemMetrics( SM_CYVIRTUALSCREEN )); + ok( EqualRect( &expect, &rect ), "%lu: wrong virt desktop rect %s expected %s\n", + i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); + } SetRect( &rect, 0, 0, 1, 1 ); monitor = MonitorFromRect( &rect, MONITOR_DEFAULTTOPRIMARY ); ok( monitor != 0, "failed to get monitor\n" );

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetViewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 227d5a32e3b8d76720e2dea8d30088ef3b4c3a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227d5a32e3b8d76720e2dea8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:24 2019 -0600 ddraw: Handle stateblocks in d3d_device7_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cef865948b..e2643e6589 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5358,7 +5358,9 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi vp.min_z = viewport->dvMinZ; vp.max_z = viewport->dvMaxZ; - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetViewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 00e98852e2cb65c364b8f85cce317bfeecf4a590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e98852e2cb65c364b8f85c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:23 2019 -0600 d3d8: Handle stateblocks in d3d8_device_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0aa326fad5..8cd85776f1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1682,7 +1682,9 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.min_z = viewport->MinZ; vp.max_z = viewport->MaxZ; - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetViewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 960a460e37a4677891126979c5a282d55e943d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=960a460e37a4677891126979… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:22 2019 -0600 d3d9: Handle stateblocks in d3d9_device_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7224c31e6e..b4ba9223e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2123,7 +2123,9 @@ static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D vp.max_z = viewport->MaxZ; wined3d_mutex_lock(); - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); + wined3d_stateblock_set_viewport(device->update_state, &vp); + if (!device->recording) + wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_viewport().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 6f6e440e088436d97702cadda0002446ae84f972 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f6e440e088436d97702cadd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:21 2019 -0600 wined3d: Introduce wined3d_stateblock_set_viewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 24fd551adc..1d522ad89b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1546,6 +1546,15 @@ void CDECL wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock stateblock->changed.material = TRUE; } +void CDECL wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock, + const struct wined3d_viewport *viewport) +{ + TRACE("stateblock %p, viewport %p.\n", stateblock, viewport); + + stateblock->stateblock_state.viewport = *viewport; + stateblock->changed.viewport = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4f3cdf9b7b..48e5ea954b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -277,6 +277,7 @@ @ cdecl wined3d_stateblock_set_transform(ptr long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_viewport(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b535475d0..c311ded731 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2692,6 +2692,7 @@ void __cdecl wined3d_stateblock_set_transform(struct wined3d_stateblock *statebl void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +void __cdecl wined3d_stateblock_set_viewport(struct wined3d_stateblock *stateblock, const struct wined3d_viewport *viewport); HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock,

1 0

Zebediah Figura : d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: eb13c3286f76788770131955861d8cce2800da09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb13c3286f76788770131955… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:20 2019 -0600 d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 38f49572fe..d0967f0ac0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3124,6 +3124,7 @@ static void test_wndproc(void) "Expected IsIconic %u, got %u, i=%u.\n", tests[i].iconic, IsIconic(focus_window), i); ShowWindow(focus_window, SW_SHOWNOACTIVATE); + flush_events(); ShowWindow(focus_window, SW_SHOWMINNOACTIVE); flush_events();

1 0

Paul Gofman : ddraw/tests: Add tests for alpha component in surface format conversions.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c96f0682d0dfb106c779b13ffbfda66d867002a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96f0682d0dfb106c779b13f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Nov 6 16:45:23 2019 +0300 ddraw/tests: Add tests for alpha component in surface format conversions. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c96f0682d0dfb106c779…

1 0

Zebediah Figura : winebus.sys: Stop creating a setupapi device.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: c074966b9d75d9519e8640e87725ad439f4ffa0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c074966b9d75d9519e8640e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:04 2019 -0600 winebus.sys: Stop creating a setupapi device. ntoskrnl.exe handles this now. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus.h | 2 +- dlls/winebus.sys/bus_iohid.c | 5 +--- dlls/winebus.sys/bus_sdl.c | 8 ++----- dlls/winebus.sys/bus_udev.c | 8 ++----- dlls/winebus.sys/main.c | 56 ++++---------------------------------------- 6 files changed, 11 insertions(+), 70 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 78e3da1b9c..3bdc1a5d58 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winebus.sys -IMPORTS = ntoskrnl setupapi advapi32 +IMPORTS = ntoskrnl advapi32 EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index a250878489..09666dc151 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -43,7 +43,7 @@ void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; /* HID Plug and Play Bus */ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; + const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index c6aa003ffc..ed91b51fc8 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -102,9 +102,6 @@ static HANDLE run_loop_handle; static const WCHAR busidW[] = {'I','O','H','I','D',0}; -#include "initguid.h" -DEFINE_GUID(GUID_DEVCLASS_IOHID, 0x989D309D,0x0470,0x4E1A,0x89,0x38,0x50,0x1F,0x42,0xBD,0x9A,0xCD); - struct platform_private { IOHIDDeviceRef device; @@ -348,7 +345,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * input = 0; device = bus_create_hid_device(busidW, vid, pid, input, - version, uid, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, + version, uid, str ? serial_string : NULL, is_gamepad, &iohid_vtbl, sizeof(struct platform_private)); if (!device) ERR("Failed to create device\n"); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 322e09be79..61651c92f6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -66,9 +66,6 @@ static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; -#include "initguid.h" -DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); - static void *sdl_handle = NULL; static HANDLE deviceloop_handle; static UINT quit_event = -1; @@ -974,9 +971,8 @@ static void try_add_device(unsigned int index) if (is_xbox_gamepad) input = 0; - device = bus_create_hid_device(sdl_busidW, vid, pid, - input, version, index, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, - &sdl_vtbl, sizeof(struct platform_private)); + device = bus_create_hid_device(sdl_busidW, vid, pid, input, version, index, + serial, is_xbox_gamepad, &sdl_vtbl, sizeof(struct platform_private)); if (device) { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 5e0b5c5151..239051723c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -98,10 +98,6 @@ static int deviceloop_control[2]; static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; static const WCHAR lnxev_busidW[] = {'L','N','X','E','V',0}; -#include "initguid.h" -DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); -DEFINE_GUID(GUID_DEVCLASS_LINUXEVENT, 0x1b932c0d,0xfea7,0x42cd,0x8e,0xaa,0x0e,0x48,0x79,0xb6,0x9e,0xaa); - struct platform_private { struct udev_device *udev_device; @@ -1241,13 +1237,13 @@ static void try_add_device(struct udev_device *dev) if (strcmp(subsystem, "hidraw") == 0) { device = bus_create_hid_device(hidraw_busidW, vid, pid, input, version, 0, serial, is_gamepad, - &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl, sizeof(struct platform_private)); + &hidraw_vtbl, sizeof(struct platform_private)); } #ifdef HAS_PROPER_INPUT_HEADER else if (strcmp(subsystem, "input") == 0) { device = bus_create_hid_device(lnxev_busidW, vid, pid, input, version, 0, serial, is_gamepad, - &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct wine_input_private)); + &lnxev_vtbl, sizeof(struct wine_input_private)); } #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 24ddb21c4a..b4599b6889 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -25,13 +25,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winternl.h" -#include "winreg.h" -#include "setupapi.h" -#include "cfgmgr32.h" #include "winioctl.h" #include "hidusage.h" #include "ddk/wdm.h" @@ -47,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -static const WCHAR backslashW[] = {'\\',0}; - struct product_desc { WORD vid; @@ -223,23 +215,20 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) + const platform_vtbl *vtbl, DWORD platform_data_size) { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; - WCHAR *id, instance[MAX_DEVICE_ID_LEN]; struct device_extension *ext; struct pnp_device *pnp_dev; DEVICE_OBJECT *device; UNICODE_STRING nameW; WCHAR dev_name[256]; - HDEVINFO devinfo; - SP_DEVINFO_DATA data = {sizeof(data)}; NTSTATUS status; DWORD length; - TRACE("(%s, %04x, %04x, %04x, %u, %u, %s, %u, %s, %p, %u)\n", + TRACE("(%s, %04x, %04x, %04x, %u, %u, %s, %u, %p, %u)\n", debugstr_w(busidW), vid, pid, input, version, uid, debugstr_w(serialW), - is_gamepad, debugstr_guid(class), vtbl, platform_data_size); + is_gamepad, vtbl, platform_data_size); if (!(pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)))) return NULL; @@ -286,41 +275,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, list_add_tail(&pnp_devset, &pnp_dev->entry); LeaveCriticalSection(&device_list_cs); - - devinfo = SetupDiCreateDeviceInfoList(class, NULL); - if (devinfo == INVALID_HANDLE_VALUE) - { - ERR("failed to create device info list, error %#x\n", GetLastError()); - goto error; - } - - if (!(id = get_device_id(device))) - { - ERR("failed to generate instance id\n"); - goto error; - } - strcpyW(instance, id); - ExFreePool(id); - - if (!(id = get_instance_id(device))) - { - ERR("failed to generate instance id\n"); - goto error; - } - strcatW(instance, backslashW); - strcatW(instance, id); - ExFreePool(id); - - if (SetupDiCreateDeviceInfoW(devinfo, instance, class, NULL, NULL, DICD_INHERIT_CLASSDRVS, &data)) - { - if (!SetupDiRegisterDeviceInfo(devinfo, &data, 0, NULL, NULL, NULL)) - ERR("failed to register device info, error %#x\n", GetLastError()); - } - else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) - ERR("failed to create device info, error %#x\n", GetLastError()); - -error: - SetupDiDestroyDeviceInfoList(devinfo); return device; } @@ -556,11 +510,9 @@ static const platform_vtbl mouse_vtbl = static void mouse_device_create(void) { - static const GUID wine_mouse_class = {0xdfe2580e,0x52fd,0x453d,{0xa2,0xc1,0x33,0x81,0xf2,0x32,0x68,0x4c}}; static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; - mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, - &wine_mouse_class, &mouse_vtbl, 0); + mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &mouse_vtbl, 0); IoInvalidateDeviceRelations(bus_pdo, BusRelations); }

1 0

Zebediah Figura : ntoskrnl.exe: BusRelations is also used when devices are removed.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 81cda52d15317d065074fb060732b0f30bf99e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=81cda52d15317d065074fb06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:03 2019 -0600 ntoskrnl.exe: BusRelations is also used when devices are removed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 18 +++++++++++++++--- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 62a32a4afc..863eee390f 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -435,6 +435,21 @@ static void handle_bus_relations( DEVICE_OBJECT *parent ) } } + if (wine_parent->children) + { + for (i = 0; i < wine_parent->children->Count; ++i) + { + DEVICE_OBJECT *child = wine_parent->children->Objects[i]; + + if (!device_in_list( relations, child )) + { + TRACE("Removing device %p.\n", child); + remove_device( child ); + } + ObDereferenceObject( child ); + } + } + ExFreePool( wine_parent->children ); wine_parent->children = relations; @@ -453,9 +468,6 @@ void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RE case BusRelations: handle_bus_relations( device_object ); break; - case RemovalRelations: - remove_device( device_object ); - break; default: FIXME("Unhandled relation %#x.\n", type); break; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index ad542b5dfb..c6aa003ffc 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -371,7 +371,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { - IoInvalidateDeviceRelations(device, RemovalRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); bus_remove_hid_device(device); } } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5f07ee2435..322e09be79 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -902,7 +902,7 @@ static void try_remove_device(SDL_JoystickID id) sdl_controller = private->sdl_controller; sdl_haptic = private->sdl_haptic; - IoInvalidateDeviceRelations(device, RemovalRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); bus_remove_hid_device(device); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b2cf62dedb..5e0b5c5151 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1297,7 +1297,7 @@ static void try_remove_device(struct udev_device *dev) #endif if (!device) return; - IoInvalidateDeviceRelations(device, RemovalRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); private = impl_from_DEVICE_OBJECT(device);

1 0

Zebediah Figura : ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: ca683dcaadadf86dacd797b2d7c2ad1fca0155c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca683dcaadadf86dacd797b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:02 2019 -0600 ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++- dlls/ntoskrnl.exe/ntoskrnl_private.h | 6 +++ dlls/ntoskrnl.exe/pnp.c | 84 +++++++++++++++++++++++++++++++----- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 2 +- dlls/winebus.sys/main.c | 13 +++--- 8 files changed, 96 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f53434aedf..93c9720e96 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1471,6 +1471,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, { static const WCHAR auto_format[] = {'\\','D','e','v','i','c','e','\\','%','0','8','x',0}; NTSTATUS status; + struct wine_device *wine_device; DEVICE_OBJECT *device; HANDLE manager = get_device_manager(); static unsigned int auto_idx = 0; @@ -1479,11 +1480,12 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); - if (!(device = alloc_kernel_object( IoDeviceObjectType, NULL, sizeof(DEVICE_OBJECT) + ext_size, 1 ))) + if (!(wine_device = alloc_kernel_object( IoDeviceObjectType, NULL, sizeof(struct wine_device) + ext_size, 1 ))) return STATUS_NO_MEMORY; + device = &wine_device->device_obj; device->DriverObject = driver; - device->DeviceExtension = device + 1; + device->DeviceExtension = wine_device + 1; device->DeviceType = type; device->StackSize = 1; @@ -1549,9 +1551,11 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) if (status == STATUS_SUCCESS) { + struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; while (*prev && *prev != device) prev = &(*prev)->NextDevice; if (*prev) *prev = (*prev)->NextDevice; + ExFreePool( wine_device->children ); ObDereferenceObject( device ); } } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index b5244ef164..256e945e6f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -86,4 +86,10 @@ static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', '\\','S','e','r','v','i','c','e','s', '\\',0}; + +struct wine_device +{ + DEVICE_OBJECT device_obj; + DEVICE_RELATIONS *children; +}; #endif diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index a3dbe772ae..62a32a4afc 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -318,25 +318,18 @@ static void start_device( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINFO_DATA * } } -static void handle_bus_relations( DEVICE_OBJECT *device ) +static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) { static const WCHAR infpathW[] = {'I','n','f','P','a','t','h',0}; SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; BOOL need_driver = TRUE; - HDEVINFO set; HKEY key; - /* We could (should?) do a full IRP_MN_QUERY_DEVICE_RELATIONS query, - * but we don't have to, we have the DEVICE_OBJECT of the new device - * so we can simply handle the process here */ - if (get_device_instance_id( device, device_instance_id )) return; - set = SetupDiCreateDeviceInfoList( NULL, NULL ); - if (!SetupDiCreateDeviceInfoW( set, device_instance_id, &GUID_NULL, NULL, NULL, 0, &sp_device ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { @@ -364,19 +357,90 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) } start_device( device, set, &sp_device ); - - SetupDiDestroyDeviceInfoList( set ); } static void remove_device( DEVICE_OBJECT *device ) { + struct wine_device *wine_device = CONTAINING_RECORD(device, struct wine_device, device_obj); + TRACE("Removing device %p.\n", device); + if (wine_device->children) + { + ULONG i; + for (i = 0; i < wine_device->children->Count; ++i) + remove_device( wine_device->children->Objects[i] ); + } + send_power_irp( device, PowerDeviceD3 ); send_pnp_irp( device, IRP_MN_SURPRISE_REMOVAL ); send_pnp_irp( device, IRP_MN_REMOVE_DEVICE ); } +static BOOL device_in_list( const DEVICE_RELATIONS *list, const DEVICE_OBJECT *device ) +{ + ULONG i; + for (i = 0; i < list->Count; ++i) + { + if (list->Objects[i] == device) + return TRUE; + } + return FALSE; +} + +static void handle_bus_relations( DEVICE_OBJECT *parent ) +{ + struct wine_device *wine_parent = CONTAINING_RECORD(parent, struct wine_device, device_obj); + SP_DEVINFO_DATA sp_device = {sizeof(sp_device)}; + DEVICE_RELATIONS *relations; + IO_STATUS_BLOCK irp_status; + IO_STACK_LOCATION *irpsp; + NTSTATUS status; + HDEVINFO set; + IRP *irp; + ULONG i; + + TRACE( "(%p)\n", parent ); + + set = SetupDiCreateDeviceInfoList( NULL, NULL ); + + parent = IoGetAttachedDevice( parent ); + + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_PNP, parent, NULL, 0, NULL, NULL, &irp_status ))) + { + SetupDiDestroyDeviceInfoList( set ); + return; + } + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MinorFunction = IRP_MN_QUERY_DEVICE_RELATIONS; + irpsp->Parameters.QueryDeviceRelations.Type = BusRelations; + if ((status = send_device_irp( parent, irp, (ULONG_PTR *)&relations ))) + { + ERR("Failed to enumerate child devices, status %#x.\n", status); + SetupDiDestroyDeviceInfoList( set ); + return; + } + + TRACE("Got %u devices.\n", relations->Count); + + for (i = 0; i < relations->Count; ++i) + { + DEVICE_OBJECT *child = relations->Objects[i]; + + if (!wine_parent->children || !device_in_list( wine_parent->children, child )) + { + TRACE("Adding new device %p.\n", child); + enumerate_new_device( child, set ); + } + } + + ExFreePool( wine_parent->children ); + wine_parent->children = relations; + + SetupDiDestroyDeviceInfoList( set ); +} + /*********************************************************************** * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) */ diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index de8ddf7ad9..a250878489 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -54,3 +54,4 @@ DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSP BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; HANDLE driver_key DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index f0f10ca98e..ad542b5dfb 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -357,7 +357,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * struct platform_private *private = impl_from_DEVICE_OBJECT(device); private->device = IOHIDDevice; private->buffer = NULL; - IoInvalidateDeviceRelations(device, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 64c5a8a1d2..5f07ee2435 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -996,7 +996,7 @@ static void try_add_device(unsigned int index) HeapFree(GetProcessHeap(), 0, serial); return; } - IoInvalidateDeviceRelations(device, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } else { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 6fa6efb7dc..b2cf62dedb 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1268,7 +1268,7 @@ static void try_add_device(struct udev_device *dev) return; } #endif - IoInvalidateDeviceRelations(device, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } else { diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ec8e0f7f48..24ddb21c4a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -89,7 +89,8 @@ static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; /* The root-enumerated device stack. */ -static DEVICE_OBJECT *bus_pdo, *bus_fdo; +DEVICE_OBJECT *bus_pdo; +static DEVICE_OBJECT *bus_fdo; HANDLE driver_key; @@ -560,7 +561,7 @@ static void mouse_device_create(void) mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &wine_mouse_class, &mouse_vtbl, 0); - IoInvalidateDeviceRelations(mouse_obj, BusRelations); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) @@ -572,6 +573,9 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) switch (irpsp->MinorFunction) { + case IRP_MN_QUERY_DEVICE_RELATIONS: + irp->IoStatus.u.Status = handle_IRP_MN_QUERY_DEVICE_RELATIONS(irp); + break; case IRP_MN_START_DEVICE: mouse_device_create(); @@ -613,11 +617,6 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) switch (irpsp->MinorFunction) { - case IRP_MN_QUERY_DEVICE_RELATIONS: - TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); - status = handle_IRP_MN_QUERY_DEVICE_RELATIONS(irp); - irp->IoStatus.u.Status = status; - break; case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp);

1 0

Zebediah Figura : winebus.sys: Initialize and teardown the HID backends while the bus FDO is still extant.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: a60a014dc4f76f36031fa560531192ac9a335bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60a014dc4f76f36031fa560… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:01 2019 -0600 winebus.sys: Initialize and teardown the HID backends while the bus FDO is still extant. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 172 ++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 85 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index bffd9b8f5f..ec8e0f7f48 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -493,18 +493,105 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) return status; } +static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) +{ + TRACE("buffer %p, length %u.\n", buffer, length); + + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + return STATUS_BUFFER_TOO_SMALL; + + memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); + memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; + buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE; + + return STATUS_SUCCESS; +} + +static NTSTATUS mouse_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) +{ + static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','m','o','u','s','e',0}; + if (index != HID_STRING_ID_IPRODUCT) + return STATUS_NOT_IMPLEMENTED; + if (length < ARRAY_SIZE(nameW)) + return STATUS_BUFFER_TOO_SMALL; + strcpyW(buffer, nameW); + return STATUS_SUCCESS; +} + +static NTSTATUS mouse_begin_report_processing(DEVICE_OBJECT *device) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS mouse_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS mouse_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS mouse_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) +{ + FIXME("id %u, stub!\n", id); + return STATUS_NOT_IMPLEMENTED; +} + +static const platform_vtbl mouse_vtbl = +{ + .get_reportdescriptor = mouse_get_reportdescriptor, + .get_string = mouse_get_string, + .begin_report_processing = mouse_begin_report_processing, + .set_output_report = mouse_set_output_report, + .get_feature_report = mouse_get_feature_report, + .set_feature_report = mouse_set_feature_report, +}; + +static void mouse_device_create(void) +{ + static const GUID wine_mouse_class = {0xdfe2580e,0x52fd,0x453d,{0xa2,0xc1,0x33,0x81,0xf2,0x32,0x68,0x4c}}; + static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; + + mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, + &wine_mouse_class, &mouse_vtbl, 0); + IoInvalidateDeviceRelations(mouse_obj, BusRelations); +} + static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { + static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; + static const UNICODE_STRING SDL_enabled = {sizeof(SDL_enabledW) - sizeof(WCHAR), sizeof(SDL_enabledW), (WCHAR*)SDL_enabledW}; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); NTSTATUS ret; switch (irpsp->MinorFunction) { case IRP_MN_START_DEVICE: + mouse_device_create(); + + if (check_bus_option(&SDL_enabled, 1)) + { + if (sdl_driver_init() == STATUS_SUCCESS) + return STATUS_SUCCESS; + } + udev_driver_init(); + iohid_driver_init(); + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; case IRP_MN_SURPRISE_REMOVAL: irp->IoStatus.u.Status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: + udev_driver_unload(); + iohid_driver_unload(); + sdl_driver_unload(); + irp->IoStatus.u.Status = STATUS_SUCCESS; IoSkipCurrentIrpStackLocation(irp); ret = IoCallDriver(bus_pdo, irp); @@ -900,86 +987,11 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *p static void WINAPI driver_unload(DRIVER_OBJECT *driver) { - udev_driver_unload(); - iohid_driver_unload(); - sdl_driver_unload(); NtClose(driver_key); } -static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) -{ - TRACE("buffer %p, length %u.\n", buffer, length); - - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); - buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; - buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE; - - return STATUS_SUCCESS; -} - -static NTSTATUS mouse_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) -{ - static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','m','o','u','s','e',0}; - if (index != HID_STRING_ID_IPRODUCT) - return STATUS_NOT_IMPLEMENTED; - if (length < ARRAY_SIZE(nameW)) - return STATUS_BUFFER_TOO_SMALL; - strcpyW(buffer, nameW); - return STATUS_SUCCESS; -} - -static NTSTATUS mouse_begin_report_processing(DEVICE_OBJECT *device) -{ - return STATUS_SUCCESS; -} - -static NTSTATUS mouse_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) -{ - FIXME("id %u, stub!\n", id); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS mouse_get_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) -{ - FIXME("id %u, stub!\n", id); - return STATUS_NOT_IMPLEMENTED; -} - -static NTSTATUS mouse_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *ret_length) -{ - FIXME("id %u, stub!\n", id); - return STATUS_NOT_IMPLEMENTED; -} - -static const platform_vtbl mouse_vtbl = -{ - .get_reportdescriptor = mouse_get_reportdescriptor, - .get_string = mouse_get_string, - .begin_report_processing = mouse_begin_report_processing, - .set_output_report = mouse_set_output_report, - .get_feature_report = mouse_get_feature_report, - .set_feature_report = mouse_set_feature_report, -}; - -static void mouse_device_create(void) -{ - static const GUID wine_mouse_class = {0xdfe2580e,0x52fd,0x453d,{0xa2,0xc1,0x33,0x81,0xf2,0x32,0x68,0x4c}}; - static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; - - mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, - &wine_mouse_class, &mouse_vtbl, 0); - IoInvalidateDeviceRelations(mouse_obj, BusRelations); -} - NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { - static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; - static const UNICODE_STRING SDL_enabled = {sizeof(SDL_enabledW) - sizeof(WCHAR), sizeof(SDL_enabledW), (WCHAR*)SDL_enabledW}; OBJECT_ATTRIBUTES attr = {0}; NTSTATUS ret; @@ -998,15 +1010,5 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; - mouse_device_create(); - - if (check_bus_option(&SDL_enabled, 1)) - { - if (sdl_driver_init() == STATUS_SUCCESS) - return STATUS_SUCCESS; - } - udev_driver_init(); - iohid_driver_init(); - return STATUS_SUCCESS; }

1 0

Zebediah Figura : wine.inf: Remove registration for the winebus service.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 57ca71fece4a37bde8200250d10d350f20224cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57ca71fece4a37bde8200250… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:55:00 2019 -0600 wine.inf: Remove registration for the winebus service. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bf45c15b58..c0f6e0a391 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -161,7 +161,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService -AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -179,7 +178,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService -AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -197,7 +195,6 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService AddService=Schedule,0,TaskSchedulerService -AddService=WineBus,0,WineBusService AddService=Winmgmt,0,WinmgmtService AddService=wuauserv,0,wuauService @@ -3620,15 +3617,6 @@ ServiceType=32 StartType=3 ErrorControl=1 -[WineBusService] -Description="Wine Platform Bus Kernel" -DisplayName="Platform Bus Kernel" -ServiceBinary="%12%\winebus.sys" -LoadOrderGroup="WinePlugPlay" -ServiceType=1 -StartType=2 -ErrorControl=1 - [SpoolerService] AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing"

1 0

Zebediah Figura : wineboot: Create a root-enumerated device object for winebus.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 9cf9483a4a0f33af6af0beb67395264f1c8ad259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cf9483a4a0f33af6af0beb6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:54:59 2019 -0600 wineboot: Create a root-enumerated device object for winebus. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index eaea154057..3921fa9644 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,7 +1,7 @@ MODULE = wineboot.exe APPMODE = -mconsole IMPORTS = uuid advapi32 -DELAYIMPORTS = shell32 shlwapi version user32 +DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4dfbca5e2c..cd5c9505b3 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -69,6 +69,8 @@ #include <shobjidl.h> #include <shlwapi.h> #include <shellapi.h> +#include <setupapi.h> +#include <newdev.h> #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -1121,6 +1123,57 @@ static HANDLE start_rundll32( const WCHAR *inf_path, BOOL wow64 ) return pi.hProcess; } +static void install_root_pnp_devices(void) +{ + static const struct + { + const char *name; + const char *hardware_id; + const char *infpath; + } + root_devices[] = + { + {"root\\wine\\winebus", "root\\winebus\0", "C:\\windows\\inf\\winebus.inf"}, + }; + SP_DEVINFO_DATA device = {sizeof(device)}; + unsigned int i; + HDEVINFO set; + + if ((set = SetupDiCreateDeviceInfoList( NULL, NULL )) == INVALID_HANDLE_VALUE) + { + WINE_ERR("Failed to create device info list, error %#x.\n", GetLastError()); + return; + } + + for (i = 0; i < ARRAY_SIZE(root_devices); ++i) + { + if (!SetupDiCreateDeviceInfoA( set, root_devices[i].name, &GUID_NULL, NULL, NULL, 0, &device)) + { + if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) + WINE_ERR("Failed to create device %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + continue; + } + + if (!SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_HARDWAREID, + (const BYTE *)root_devices[i].hardware_id, (strlen(root_devices[i].hardware_id) + 2) * sizeof(WCHAR))) + { + WINE_ERR("Failed to set hardware id for %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + continue; + } + + if (!SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device)) + { + WINE_ERR("Failed to register device %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + continue; + } + + if (!UpdateDriverForPlugAndPlayDevicesA(NULL, root_devices[i].hardware_id, root_devices[i].infpath, 0, NULL)) + WINE_ERR("Failed to install drivers for %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + } + + SetupDiDestroyDeviceInfoList(set); +} + /* execute rundll32 on the wine.inf file if necessary */ static void update_wineprefix( BOOL force ) { @@ -1164,6 +1217,8 @@ static void update_wineprefix( BOOL force ) } DestroyWindow( hwnd ); } + install_root_pnp_devices(); + WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() ); }

1 0

Zebediah Figura : winebus.sys: Implement AddDevice().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: cba5674d60fead86bd6f0a8c6770d6063697f927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba5674d60fead86bd6f0a8c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:54:58 2019 -0600 winebus.sys: Implement AddDevice(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 98ed890af8..bffd9b8f5f 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -88,6 +88,9 @@ static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; +/* The root-enumerated device stack. */ +static DEVICE_OBJECT *bus_pdo, *bus_fdo; + HANDLE driver_key; struct pnp_device @@ -490,7 +493,33 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) return status; } -static NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + NTSTATUS ret; + + switch (irpsp->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + case IRP_MN_REMOVE_DEVICE: + irp->IoStatus.u.Status = STATUS_SUCCESS; + IoSkipCurrentIrpStackLocation(irp); + ret = IoCallDriver(bus_pdo, irp); + IoDetachDevice(bus_pdo); + IoDeleteDevice(device); + return ret; + default: + FIXME("Unhandled minor function %#x.\n", irpsp->MinorFunction); + } + + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(bus_pdo, irp); +} + +static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); @@ -519,6 +548,13 @@ static NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } +static NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) +{ + if (device == bus_fdo) + return fdo_pnp_dispatch(device, irp); + return pdo_pnp_dispatch(device, irp); +} + static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_length, BYTE* buffer, ULONG_PTR *out_length) { if (buffer_length < ext->last_report_size) @@ -592,6 +628,12 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) TRACE("(%p, %p)\n", device, irp); + if (device == bus_fdo) + { + IoSkipCurrentIrpStackLocation(irp); + return IoCallDriver(bus_pdo, irp); + } + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_HID_GET_DEVICE_ATTRIBUTES: @@ -836,6 +878,26 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) return FALSE; } +static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) +{ + NTSTATUS ret; + + TRACE("driver %p, pdo %p.\n", driver, pdo); + + if ((ret = IoCreateDevice(driver, 0, NULL, FILE_DEVICE_BUS_EXTENDER, 0, FALSE, &bus_fdo))) + { + ERR("Failed to create FDO, status %#x.\n", ret); + return ret; + } + + IoAttachDeviceToDeviceStack(bus_fdo, pdo); + bus_pdo = pdo; + + bus_fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + static void WINAPI driver_unload(DRIVER_OBJECT *driver) { udev_driver_unload(); @@ -933,6 +995,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; mouse_device_create();

1 0

Zebediah Figura : winebus.inf: Add new INF file and copy it to the INF directory.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 9fa62ce681003318a6bae20aa903ee065b22caf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa62ce681003318a6bae20a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 23:54:57 2019 -0600 winebus.inf: Add new INF file and copy it to the INF directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/Makefile.in | 1 + loader/wine.inf.in | 1 + loader/winebus.inf.in | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/loader/Makefile.in b/loader/Makefile.in index 3ada656408..11a476103c 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -10,6 +10,7 @@ SOURCES = \ wine.man.in \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ + winebus.inf.in \ winehid.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a2bcfae935..bf45c15b58 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3870,4 +3870,5 @@ inf_section = 17 l_intl.nls [inf_section] +winebus.inf winehid.inf diff --git a/loader/winebus.inf.in b/loader/winebus.inf.in new file mode 100644 index 0000000000..3950c3dfc4 --- /dev/null +++ b/loader/winebus.inf.in @@ -0,0 +1,22 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318} +Class=System + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine HID bus driver=device_section,root\winebus + +[device_section.Services] +AddService = winebus,0x2,svc_section + +[svc_section] +Description="Wine HID bus driver" +DisplayName="Wine HID bus" +ServiceBinary="%12%\winebus.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1

1 0

Zebediah Figura : ntdll: Fix a typo.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 3ede217e5cd80b18f709339aea281356579756cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ede217e5cd80b18f709339a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 20:48:53 2019 -0600 ntdll: Fix a typo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 03c0a20624..3224f76dc9 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -372,7 +372,7 @@ static void set_wow64_environment( WCHAR **env ) static const WCHAR commondirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',0}; static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; - static const WCHAR commonfiles86W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s','(','8','6',')',0}; + static const WCHAR commonfiles86W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s','(','x','8','6',')',0}; static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; static const WCHAR winehomedirW[] = {'W','I','N','E','H','O','M','E','D','I','R',0};

1 0

Jacek Caban : vbscript: Fix destroying safearrays in release_exec.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 664d8d1e137b629932732832c1a0fff65e94cba3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=664d8d1e137b629932732832… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 13:08:18 2019 +0100 vbscript: Fix destroying safearrays in release_exec. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3dfcf1e7f7..cf21601ecc 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2274,7 +2274,7 @@ static void release_exec(exec_ctx_t *ctx) } if(ctx->arrays) { - for(i=0; i < ctx->func->var_cnt; i++) { + for(i=0; i < ctx->func->array_cnt; i++) { if(ctx->arrays[i]) SafeArrayDestroy(ctx->arrays[i]); }

1 0

Fabian Maurer : user32/edit: In EM_POSFROMCHAR return correct position for empty lines.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 244268589e5f366d6e5c9c119b302e8b290031f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=244268589e5f366d6e5c9c11… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 7 15:06:11 2019 +0300 user32/edit: In EM_POSFROMCHAR return correct position for empty lines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47305 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 6 +----- dlls/user32/tests/edit.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 00900e648b..557a091c0d 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1097,12 +1097,8 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) lw = line_def->width; w = es->format_rect.right - es->format_rect.left; if (line_def->ssa) - { ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); - x -= es->x_offset; - } - else - x = es->x_offset; + x -= es->x_offset; if (es->style & ES_RIGHT) x = w - (lw - x); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d0374c02a3..e3ed3341d6 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1136,12 +1136,14 @@ static void test_edit_control_3(void) /* Test EM_CHARFROMPOS and EM_POSFROMCHAR */ -static void test_edit_control_4(void) +static void test_char_from_pos(void) { HWND hwEdit; int lo, hi, mid; int ret; int i; + HDC dc; + SIZE size; trace("EDIT: Test EM_CHARFROMPOS and EM_POSFROMCHAR\n"); hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); @@ -1251,6 +1253,24 @@ static void test_edit_control_4(void) ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); + + /* Scrolled to the right with partially visible line, position on next line. */ + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + dc = GetDC(hwEdit); + GetTextExtentPoint32A(dc, "w", 1, &size); + ReleaseDC(hwEdit, dc); + + SetWindowPos(hwEdit, NULL, 0, 0, size.cx * 15, size.cy * 5, SWP_NOMOVE | SWP_NOZORDER); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"wwwwwwwwwwwwwwwwwwww\r\n\r\n"); + SendMessageA(hwEdit, EM_SETSEL, 40, 40); + + lo = (short)SendMessageA(hwEdit, EM_POSFROMCHAR, 22, 0); + ret = (short)SendMessageA(hwEdit, EM_POSFROMCHAR, 20, 0); + ret -= 20 * size.cx; /* Calculate expected position, 20 characters back. */ + ok(ret == lo, "Unexpected position %d vs %d.\n", lo, ret); + + DestroyWindow(hwEdit); } /* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL @@ -3243,7 +3263,7 @@ START_TEST(edit) test_edit_control_1(); test_edit_control_2(); test_edit_control_3(); - test_edit_control_4(); + test_char_from_pos(); test_edit_control_5(); test_edit_control_6(); test_edit_control_limittext();

1 0

Fabian Maurer : comctl32/edit: In EM_POSFROMCHAR return correct position for empty lines.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 34b980e6620a7ddee1e6cc40306bec25f448a21d URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b980e6620a7ddee1e6cc40… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Nov 7 15:06:10 2019 +0300 comctl32/edit: In EM_POSFROMCHAR return correct position for empty lines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47305 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 6 +----- dlls/comctl32/tests/edit.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index bdd3b72558..d02d7af7b9 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1038,12 +1038,8 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) lw = line_def->width; w = es->format_rect.right - es->format_rect.left; if (line_def->ssa) - { ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); - x -= es->x_offset; - } - else - x = es->x_offset; + x -= es->x_offset; if (es->style & ES_RIGHT) x = w - (lw - x); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 3fe208c321..cec6025077 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1189,6 +1189,8 @@ static void test_char_from_pos(void) { int lo, hi, mid, ret, i; HWND hwEdit; + HDC dc; + SIZE size; hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"aa"); @@ -1321,6 +1323,24 @@ static void test_char_from_pos(void) ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); + + /* Scrolled to the right with partially visible line, position on next line. */ + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + dc = GetDC(hwEdit); + GetTextExtentPoint32A(dc, "w", 1, &size); + ReleaseDC(hwEdit, dc); + + SetWindowPos(hwEdit, NULL, 0, 0, size.cx * 15, size.cy * 5, SWP_NOMOVE | SWP_NOZORDER); + SendMessageA(hwEdit, WM_SETTEXT, 0, (LPARAM)"wwwwwwwwwwwwwwwwwwww\r\n\r\n"); + SendMessageA(hwEdit, EM_SETSEL, 40, 40); + + lo = (short)SendMessageA(hwEdit, EM_POSFROMCHAR, 22, 0); + ret = (short)SendMessageA(hwEdit, EM_POSFROMCHAR, 20, 0); + ret -= 20 * size.cx; /* Calculate expected position, 20 characters back. */ + ok(ret == lo, "Unexpected position %d vs %d.\n", lo, ret); + + DestroyWindow(hwEdit); } /* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL

1 0

Francois Gouget : comctl32/listbox: Do no limit item height to 255.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: f37d912215bef35d403fc7cc68713d3d6d2cbe30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37d912215bef35d403fc7cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 7 12:37:29 2019 +0300 comctl32/listbox: Do no limit item height to 255. The change happened between Windows 10 1607 and 1709 in comctl32 v6. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 2 +- dlls/comctl32/tests/listbox.c | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index ab4c481aab..0d6dcd6a0b 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1280,7 +1280,7 @@ static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { - if (height > MAXBYTE) + if (height > MAXWORD) return -1; if (!height) height = 1; diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 70e212892a..dc3b247fb6 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -769,11 +769,27 @@ static void test_listbox_height(void) r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); + /* Before Windows 10 1709 (or 1703?) the item height was limited to 255. + * Since then, with comctl32 V6 the limit is 65535. + */ r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 256, 0 )); - ok( r == -1, "Failed to set item height, %d.\n", r); + ok(r == 0 || broken(r == -1), "Failed to set item height, %d.\n", r); + if (r == -1) + { + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "Unexpected item height %d.\n", r); + } + else + { + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 256, "Unexpected item height %d.\n", r); - r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); - ok( r == 20, "Unexpected item height %d.\n", r); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 65535, 0 )); + ok(r == 0, "Failed to set item height, %d.\n", r); + + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 65535, "Unexpected item height %d.\n", r); + } r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); ok( r == 0, "send message failed\n");

1 0

Jacek Caban : xmllite: Update current pointer after reader_skipn call.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 950d960eed4faeec6c8d482b0fb6ca903feced93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950d960eed4faeec6c8d482b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 23:01:47 2019 +0100 xmllite: Update current pointer after reader_skipn call. The buffer may be reallocated. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e813ca37fe..eddc4d8eec 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2438,7 +2438,7 @@ static HRESULT reader_parse_cdata(xmlreader *reader) else { reader_skipn(reader, 1); - ptr++; + ptr = reader_get_ptr(reader); } }

1 0

Alexandre Julliard : ntdll: Support running .exe.so binaries in RtlCreateUserProcess().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 051a8ddd045b897190279a3f451e39a61fd14dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=051a8ddd045b897190279a3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 12:28:11 2019 +0100 ntdll: Support running .exe.so binaries in RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 7c108f2896..3dbd589f54 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1161,6 +1161,112 @@ static BOOL is_builtin_path( UNICODE_STRING *path, BOOL *is_64bit ) } +/*********************************************************************** + * get_so_file_info + */ +static BOOL get_so_file_info( HANDLE handle, pe_image_info_t *info ) +{ + union + { + struct + { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char version; + unsigned char ignored1[9]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[8]; + unsigned int phoff; + unsigned char ignored3[12]; + unsigned short phnum; + } elf; + struct + { + unsigned char magic[4]; + unsigned char class; + unsigned char data; + unsigned char ignored1[10]; + unsigned short type; + unsigned short machine; + unsigned char ignored2[12]; + unsigned __int64 phoff; + unsigned char ignored3[16]; + unsigned short phnum; + } elf64; + struct + { + unsigned int magic; + unsigned int cputype; + unsigned int cpusubtype; + unsigned int filetype; + } macho; + IMAGE_DOS_HEADER mz; + } header; + + IO_STATUS_BLOCK io; + LARGE_INTEGER offset; + + offset.QuadPart = 0; + if (NtReadFile( handle, 0, NULL, NULL, &io, &header, sizeof(header), &offset, 0 )) return FALSE; + if (io.Information != sizeof(header)) return FALSE; + + if (!memcmp( header.elf.magic, "\177ELF", 4 )) + { + unsigned int type; + unsigned short phnum; + + if (header.elf.version != 1 /* EV_CURRENT */) return FALSE; +#ifdef WORDS_BIGENDIAN + if (header.elf.data != 2 /* ELFDATA2MSB */) return FALSE; +#else + if (header.elf.data != 1 /* ELFDATA2LSB */) return FALSE; +#endif + switch (header.elf.machine) + { + case 3: info->cpu = CPU_x86; break; + case 20: info->cpu = CPU_POWERPC; break; + case 40: info->cpu = CPU_ARM; break; + case 62: info->cpu = CPU_x86_64; break; + case 183: info->cpu = CPU_ARM64; break; + } + if (header.elf.type != 3 /* ET_DYN */) return FALSE; + if (header.elf.class == 2 /* ELFCLASS64 */) + { + offset.QuadPart = header.elf64.phoff; + phnum = header.elf64.phnum; + } + else + { + offset.QuadPart = header.elf.phoff; + phnum = header.elf.phnum; + } + while (phnum--) + { + if (NtReadFile( handle, 0, NULL, NULL, &io, &type, sizeof(type), &offset, 0 )) return FALSE; + if (io.Information < sizeof(type)) return FALSE; + if (type == 3 /* PT_INTERP */) return FALSE; + offset.QuadPart += (header.elf.class == 2) ? 56 : 32; + } + return TRUE; + } + else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xfeedfacf) + { + switch (header.macho.cputype) + { + case 0x00000007: info->cpu = CPU_x86; break; + case 0x01000007: info->cpu = CPU_x86_64; break; + case 0x0000000c: info->cpu = CPU_ARM; break; + case 0x0100000c: info->cpu = CPU_ARM64; break; + case 0x00000012: info->cpu = CPU_POWERPC; break; + } + if (header.macho.filetype == 8) return TRUE; + } + return FALSE; +} + + /*********************************************************************** * get_pe_file_info */ @@ -1172,16 +1278,16 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; + memset( info, 0, sizeof(*info) ); InitializeObjectAttributes( &attr, path, attributes, 0, 0 ); if ((status = NtOpenFile( handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, 0 ))) + FILE_SHARE_READ | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT ))) { BOOL is_64bit; if (is_builtin_path( path, &is_64bit )) { TRACE( "assuming %u-bit builtin for %s\n", is_64bit ? 64 : 32, debugstr_us(path)); - memset( info, 0, sizeof(*info) ); /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; @@ -1212,6 +1318,10 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, ULONG attributes, SERVER_END_REQ; NtClose( mapping ); } + else if (status == STATUS_INVALID_IMAGE_NOT_MZ) + { + if (get_so_file_info( *handle, info )) return STATUS_SUCCESS; + } return status; } @@ -1341,12 +1451,11 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, switch (status) { case STATUS_INVALID_IMAGE_WIN_64: - ERR( "64-bit application %s not supported in 32-bit prefix\n", - debugstr_us( &params->ImagePathName )); + ERR( "64-bit application %s not supported in 32-bit prefix\n", debugstr_us(path) ); break; case STATUS_INVALID_IMAGE_FORMAT: ERR( "%s not supported on this installation (%s binary)\n", - debugstr_us( &params->ImagePathName ), cpu_names[pe_info.cpu] ); + debugstr_us(path), cpu_names[pe_info.cpu] ); break; } goto done;

1 0

Alexandre Julliard : winver: Fix program exit code.
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: wine Branch: master Commit: 4e81171e1281b08a08e099eb5dcf9fd9b04dda3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e81171e1281b08a08e099eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 7 12:34:14 2019 +0100 winver: Fix program exit code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winver/winver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winver/winver.c b/programs/winver/winver.c index 8d725ac73b..96ee25748a 100644 --- a/programs/winver/winver.c +++ b/programs/winver/winver.c @@ -24,5 +24,5 @@ int PASCAL WinMain (HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { - return ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); + return !ShellAboutA(NULL, PACKAGE_NAME, PACKAGE_STRING, 0); }

1 0

Derek Lesho : vkd3d: Implement d3d12_device_GetCustomHeapProperties().
by Alexandre Julliard 07 Nov '19

07 Nov '19

Module: vkd3d Branch: master Commit: 1d955506a34f7ebbe351da63ca804806cfc6f913 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1d955506a34f7ebbe351da6… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Thu Nov 7 19:48:43 2019 +0330 vkd3d: Implement d3d12_device_GetCustomHeapProperties(). Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 66 ++++++++++++++++++++++++++++++++++++++-------- libs/vkd3d/resource.c | 11 +------- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 48 +++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 13ebc70..0624318 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2398,11 +2398,29 @@ done: return S_OK; } +bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) +{ + unsigned int i; + + if (coherent) + *coherent = true; + + for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) + { + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + return false; + if (coherent && !(device->memory_properties.memoryTypes[i].propertyFlags + & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + *coherent = false; + } + + return true; +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { struct d3d12_device *device = impl_from_ID3D12Device(iface); - unsigned int i; TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", iface, feature, feature_data, feature_data_size); @@ -2443,6 +2461,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * case D3D12_FEATURE_ARCHITECTURE: { D3D12_FEATURE_DATA_ARCHITECTURE *data = feature_data; + bool coherent; if (feature_data_size != sizeof(*data)) { @@ -2459,15 +2478,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * WARN("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; - data->UMA = TRUE; - data->CacheCoherentUMA = TRUE; - for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) - { - if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) - data->UMA = FALSE; - if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) - data->CacheCoherentUMA = FALSE; - } + data->UMA = d3d12_device_is_uma(device, &coherent); + data->CacheCoherentUMA = data->UMA ? coherent : FALSE; TRACE("Tile based renderer %#x, UMA %#x, cache coherent UMA %#x.\n", data->TileBasedRenderer, data->UMA, data->CacheCoherentUMA); @@ -2975,11 +2987,43 @@ invalid: static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapProperties(ID3D12Device *iface, D3D12_HEAP_PROPERTIES *heap_properties, UINT node_mask, D3D12_HEAP_TYPE heap_type) { - FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", + struct d3d12_device *device = impl_from_ID3D12Device(iface); + bool coherent; + + TRACE("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x.\n", iface, heap_properties, node_mask, heap_type); debug_ignored_node_mask(node_mask); + heap_properties->Type = D3D12_HEAP_TYPE_CUSTOM; + + switch (heap_type) + { + case D3D12_HEAP_TYPE_DEFAULT: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE; + heap_properties->MemoryPoolPreference = d3d12_device_is_uma(device, NULL) + ? D3D12_MEMORY_POOL_L0 : D3D12_MEMORY_POOL_L1; + break; + + case D3D12_HEAP_TYPE_UPLOAD: + heap_properties->CPUPageProperty = d3d12_device_is_uma(device, &coherent) && coherent + ? D3D12_CPU_PAGE_PROPERTY_WRITE_BACK : D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + + case D3D12_HEAP_TYPE_READBACK: + heap_properties->CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_WRITE_BACK; + heap_properties->MemoryPoolPreference = D3D12_MEMORY_POOL_L0; + break; + + default: + FIXME("Unhandled heap type %#x.\n", heap_type); + break; + }; + + heap_properties->CreationNodeMask = 1; + heap_properties->VisibleNodeMask = 1; + return heap_properties; } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d6e999e..e93d50b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -34,15 +34,6 @@ static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *propertie return true; } -static bool is_numa_device(struct d3d12_device *device) -{ - unsigned int i; - for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) - if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) - return true; - return false; -} - static HRESULT vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, unsigned int *type_index) { @@ -69,7 +60,7 @@ static HRESULT vkd3d_select_memory_type(struct d3d12_device *device, uint32_t me case D3D12_HEAP_TYPE_CUSTOM: if (heap_properties->MemoryPoolPreference == D3D12_MEMORY_POOL_UNKNOWN || (heap_properties->MemoryPoolPreference == D3D12_MEMORY_POOL_L1 - && (is_cpu_accessible_heap(heap_properties) || !is_numa_device(device)))) + && (is_cpu_accessible_heap(heap_properties) || d3d12_device_is_uma(device, NULL)))) { WARN("Invalid memory pool preference.\n"); return E_INVALIDARG; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2d62fda..daa521d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1102,6 +1102,7 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type) DECLSPEC_HIDDEN; +bool d3d12_device_is_uma(struct d3d12_device *device, bool *coherent) DECLSPEC_HIDDEN; void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; diff --git a/tests/d3d12.c b/tests/d3d12.c index 858cf99..0f843b4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1991,6 +1991,7 @@ static void test_create_committed_resource(void) static void test_create_heap(void) { + D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_D3D12_OPTIONS options; D3D12_HEAP_DESC desc, result_desc; ID3D12Device *device, *tmp_device; @@ -2137,6 +2138,53 @@ static void test_create_heap(void) refcount = ID3D12Heap_Release(heap); ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); + memset(&architecture, 0, sizeof(architecture)); + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ARCHITECTURE, &architecture, sizeof(architecture)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + for (i = D3D12_HEAP_TYPE_DEFAULT; i < D3D12_HEAP_TYPE_CUSTOM; ++i) + { + vkd3d_test_set_context("Test %u\n", i); + desc.Properties = ID3D12Device_GetCustomHeapProperties(device, 1, i); + ok(desc.Properties.Type == D3D12_HEAP_TYPE_CUSTOM, "Got unexpected heap type %#x.\n", desc.Properties.Type); + + switch (i) + { + case D3D12_HEAP_TYPE_DEFAULT: + ok(desc.Properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE, + "Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty); + ok(desc.Properties.MemoryPoolPreference == (architecture.UMA + ? D3D12_MEMORY_POOL_L0 : D3D12_MEMORY_POOL_L1), + "Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference); + break; + + case D3D12_HEAP_TYPE_UPLOAD: + ok(desc.Properties.CPUPageProperty == (architecture.CacheCoherentUMA + ? D3D12_CPU_PAGE_PROPERTY_WRITE_BACK : D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE), + "Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty); + ok(desc.Properties.MemoryPoolPreference == D3D12_MEMORY_POOL_L0, + "Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference); + break; + + case D3D12_HEAP_TYPE_READBACK: + ok(desc.Properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK, + "Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty); + ok(desc.Properties.MemoryPoolPreference == D3D12_MEMORY_POOL_L0, + "Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference); + break; + + default: + ok(0, "Invalid heap type %#x.\n", i); + continue; + } + + hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + result_desc = ID3D12Heap_GetDesc(heap); + check_heap_desc(&result_desc, &desc); + ID3D12Heap_Release(heap); + } + vkd3d_test_set_context(NULL); + is_pool_L1_supported = is_memory_pool_L1_supported(device); desc.Properties.Type = D3D12_HEAP_TYPE_CUSTOM; desc.Properties.CreationNodeMask = 1;

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-commits November 2019