wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Initialize file redirects only after the server is connected.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 98eab245d3c3377af0c3da6880bb8ede80cb0925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98eab245d3c3377af0c3da68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 12:59:17 2020 +0200 ntdll: Initialize file redirects only after the server is connected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49380 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++-- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/thread.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 469fe55fe4..d39ca8cd63 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2689,7 +2689,7 @@ static void init_redirects(void) char *dir; struct stat st; - if (!(dir = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof(windows_dir) ))) return; + if (!(dir = malloc( strlen(config_dir) + sizeof(windows_dir) ))) return; strcpy( dir, config_dir ); strcat( dir, windows_dir ); if (!stat( dir, &st )) @@ -2699,7 +2699,7 @@ static void init_redirects(void) nb_redirects = ARRAY_SIZE( redirects ); } else ERR( "%s: %s\n", dir, strerror(errno) ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3bb805103d..73be77e7af 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1227,7 +1227,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) fixup_ntdll_imports( &__wine_spec_nt_header, module ); init_environment( argc, argv, envp ); - init_files(); #ifdef __APPLE__ apple_main_thread(); @@ -1262,7 +1261,6 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); init_environment( __wine_main_argc, __wine_main_argv, envp ); - init_files(); *(struct unix_funcs **)ptr_out = &unix_funcs; wine_mmap_enum_reserved_areas( add_area, NULL, 0 ); return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 97b191e1a5..0470f5eaa8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -110,6 +110,7 @@ TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZ server_init_process(); info_size = server_init_thread( teb->Peb, suspend ); virtual_map_user_shared_data(); + init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); if (size) *size = info_size;

1 0

Alexandre Julliard : ntdll: Move the get/set file information functions to the Unix library.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: c3e2013b615dd449113fe8fce0700319aa082020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e2013b615dd449113fe8fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 15:32:41 2020 +0200 ntdll: Move the get/set file information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 951 +------------------------------------ dlls/ntdll/loader.c | 4 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/file.c | 1006 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/unix_private.h | 3 - dlls/ntdll/unixlib.h | 10 +- 7 files changed, 1012 insertions(+), 967 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e2013b615dd449113f…

1 0

Alexandre Julliard : ntdll: Move the job functions to the Unix library.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 07248fc5002fb109de8fc8e51e9d05329e0cd8cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=07248fc5002fb109de8fc8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 13:21:26 2020 +0200 ntdll: Move the job functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 229 ++-------------------------------------------- dlls/ntdll/unix/loader.c | 7 ++ dlls/ntdll/unix/sync.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 13 ++- 4 files changed, 256 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07248fc5002fb109de8f…

1 0

Alexandre Julliard : ntdll: Move the IO completion functions to the Unix library.
by Alexandre Julliard 15 Jun '20

15 Jun '20

Module: wine Branch: master Commit: 06fa3d32a73d59c7fec59a8682e3750150f84554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fa3d32a73d59c7fec59a86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 11:56:30 2020 +0200 ntdll: Move the IO completion functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 223 +++-------------------------------------------- dlls/ntdll/unix/loader.c | 6 ++ dlls/ntdll/unix/sync.c | 189 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 15 +++- 4 files changed, 223 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06fa3d32a73d59c7fec5…

1 0

Vijay Kiran Kamuju : include: Add missing packing, structs and defines for xact3wb.h.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 948a6a47b8dbd0ddd86cad04de03f0e4ba81b65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=948a6a47b8dbd0ddd86cad04… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 20 13:37:35 2020 +0100 include: Add missing packing, structs and defines for xact3wb.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..c68d7a30fa 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Alistair Leslie-Hughes + * Copyright (c) 2020 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,52 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#include <pshpack1.h> + +typedef DWORD WAVEBANKOFFSET; + +#define WAVEBANK_HEADER_SIGNATURE 0x444e4257 /* DNBW */ +#define WAVEBANK_HEADER_VERSION 44 +#define WAVEBANK_BANKNAME_LENGTH 64 +#define WAVEBANK_ENTRYNAME_LENGTH 64 + +#define WAVEBANK_MAX_DATA_SEGMENT_SIZE 0xffffffff +#define WAVEBANK_COMPACT_DATA_SEGMENT_SIZE 0x001fffff + +#define WAVEBANK_TYPE_BUFFER 0x00000000 +#define WAVEBANK_TYPE_STREAMING 0x00000001 +#define WAVEBANK_TYPE_MASK 0x00000001 + +#define WAVEBANK_FLAGS_ENTRYNAMES 0x00010000 +#define WAVEBANK_FLAGS_COMPACT 0x00020000 +#define WAVEBANK_FLAGS_SYNC_DISABLED 0x00040000 +#define WAVEBANK_FLAGS_SEEKTABLES 0x00080000 +#define WAVEBANK_FLAGS_MASK 0x000F0000 + +#define WAVEBANK_DVD_SECTOR_SIZE 2048 +#define WAVEBANK_DVD_BLOCK_SIZE (WAVEBANK_DVD_SECTOR_SIZE * 16) +#define WAVEBANK_ALIGNMENT_MIN 4 +#define WAVEBANK_ALIGNMENT_DVD WAVEBANK_DVD_SECTOR_SIZE + +typedef enum WAVEBANKSEGIDX +{ + WAVEBANK_SEGIDX_BANKDATA = 0, + WAVEBANK_SEGIDX_ENTRYMETADATA, + WAVEBANK_SEGIDX_SEEKTABLES, + WAVEBANK_SEGIDX_ENTRYNAMES, + WAVEBANK_SEGIDX_ENTRYWAVEDATA, + WAVEBANK_SEGIDX_COUNT +} WAVEBANKSEGIDX, *LPWAVEBANKSEGIDX; +typedef const WAVEBANKSEGIDX *LPCWAVEBANKSEGIDX; + +#define WAVEBANKMINIFORMAT_TAG_PCM 0x0 +#define WAVEBANKMINIFORMAT_TAG_XMA 0x1 +#define WAVEBANKMINIFORMAT_TAG_ADPCM 0x2 +#define WAVEBANKMINIFORMAT_TAG_WMA 0x3 + +#define WAVEBANKMINIFORMAT_BITDEPTH_8 0x0 +#define WAVEBANKMINIFORMAT_BITDEPTH_16 0x1 + typedef union WAVEBANKMINIWAVEFORMAT { struct @@ -29,19 +76,34 @@ typedef union WAVEBANKMINIWAVEFORMAT DWORD wBitsPerSample : 1; } DUMMYSTRUCTNAME; DWORD dwValue; -} WAVEBANKMINIWAVEFORMAT; +} WAVEBANKMINIWAVEFORMAT, *LPWAVEBANKMINIWAVEFORMAT; +typedef const WAVEBANKMINIWAVEFORMAT *LPCWAVEBANKMINIWAVEFORMAT; typedef struct WAVEBANKREGION { DWORD dwOffset; DWORD dwLength; -} WAVEBANKREGION; +} WAVEBANKREGION, *LPWAVEBANKREGION; +typedef const WAVEBANKREGION *LPCWAVEBANKREGION; typedef struct WAVEBANKSAMPLEREGION { DWORD dwStartSample; DWORD dwTotalSamples; -} WAVEBANKSAMPLEREGION; +} WAVEBANKSAMPLEREGION, *LPWAVEBANKSAMPLEREGION; +typedef const WAVEBANKSAMPLEREGION *LPCWAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKHEADER +{ + DWORD dwSignature; + DWORD dwVersion; + DWORD dwHeaderVersion; + WAVEBANKREGION Segments[WAVEBANK_SEGIDX_COUNT]; +} WAVEBANKHEADER, *LPWAVEBANKHEADER; +typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; + +#define WAVEBANKENTRY_XMASTREAMS_MAX 3 +#define WAVEBANKENTRY_XMACHANNELS_MAX 6 typedef struct WAVEBANKENTRY { @@ -58,6 +120,29 @@ typedef struct WAVEBANKENTRY WAVEBANKMINIWAVEFORMAT Format; WAVEBANKREGION PlayRegion; WAVEBANKSAMPLEREGION LoopRegion; -} WAVEBANKENTRY; +} WAVEBANKENTRY, *LPWAVEBANKENTRY; +typedef const WAVEBANKENTRY *LPCWAVEBANKENTRY; + +typedef struct WAVEBANKENTRYCOMPACT +{ + DWORD dwOffset : 21; + DWORD dwLengthDeviation : 11; +} WAVEBANKENTRYCOMPACT, *LPWAVEBANKENTRYCOMPACT; +typedef const WAVEBANKENTRYCOMPACT *LPCWAVEBANKENTRYCOMPACT; + +typedef struct WAVEBANKDATA +{ + DWORD dwFlags; + DWORD dwEntryCount; + CHAR szBankName[WAVEBANK_BANKNAME_LENGTH]; + DWORD dwEntryMetaDataElementSize; + DWORD dwEntryNameElementSize; + DWORD dwAlignment; + WAVEBANKMINIFORMAT CompactFormat; + FILETIME BuildTime; +} WAVEBANKDATA, *LPWAVEBANKDATA; +typedef const WAVEBANKDATA *LPCWAVEBANKDATA; + +#include <poppack.h> #endif /* __XACT3WB_H__ */

1 0

Louis Lenders : pwrshplugin: New stub dll.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 77e9ca7b4c4cfc544225fda2a9e714be766a6923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e9ca7b4c4cfc544225fda2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jun 9 14:49:58 2020 +0200 pwrshplugin: New stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49351 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/pwrshplugin/Makefile.in | 5 +++++ dlls/pwrshplugin/pwrshplugin.spec | 12 ++++++++++++ dlls/pwrshplugin/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 2832456d30..3e28ac28cb 100755 --- a/configure +++ b/configure @@ -1532,6 +1532,7 @@ enable_prntvpt enable_propsys enable_psapi enable_pstorec +enable_pwrshplugin enable_qasf enable_qcap enable_qdvd @@ -21037,6 +21038,7 @@ wine_fn_config_makefile dlls/psapi enable_psapi wine_fn_config_makefile dlls/psapi/tests enable_tests wine_fn_config_makefile dlls/pstorec enable_pstorec wine_fn_config_makefile dlls/pstorec/tests enable_tests +wine_fn_config_makefile dlls/pwrshplugin enable_pwrshplugin wine_fn_config_makefile dlls/qasf enable_qasf wine_fn_config_makefile dlls/qasf/tests enable_tests wine_fn_config_makefile dlls/qcap enable_qcap diff --git a/configure.ac b/configure.ac index b5f2ef0327..8a76b74e83 100644 --- a/configure.ac +++ b/configure.ac @@ -3624,6 +3624,7 @@ WINE_CONFIG_MAKEFILE(dlls/psapi) WINE_CONFIG_MAKEFILE(dlls/psapi/tests) WINE_CONFIG_MAKEFILE(dlls/pstorec) WINE_CONFIG_MAKEFILE(dlls/pstorec/tests) +WINE_CONFIG_MAKEFILE(dlls/pwrshplugin) WINE_CONFIG_MAKEFILE(dlls/qasf) WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) diff --git a/dlls/pwrshplugin/Makefile.in b/dlls/pwrshplugin/Makefile.in new file mode 100644 index 0000000000..03138ab166 --- /dev/null +++ b/dlls/pwrshplugin/Makefile.in @@ -0,0 +1,5 @@ +MODULE = pwrshplugin.dll + +EXTRADLLFLAGS = -mno-cygwin + +RC_SRCS = version.rc diff --git a/dlls/pwrshplugin/pwrshplugin.spec b/dlls/pwrshplugin/pwrshplugin.spec new file mode 100644 index 0000000000..8887bfc59c --- /dev/null +++ b/dlls/pwrshplugin/pwrshplugin.spec @@ -0,0 +1,12 @@ +@ stub GetCLRVersionForPSVersion +@ stub PerformWSManPluginReportCompletion +@ stub WSManPluginCommand +@ stub WSManPluginConnect +@ stub WSManPluginReceive +@ stub WSManPluginReleaseCommandContext +@ stub WSManPluginReleaseShellContext +@ stub WSManPluginSend +@ stub WSManPluginShell +@ stub WSManPluginShutdown +@ stub WSManPluginSignal +@ stub WSManPluginStartup diff --git a/dlls/pwrshplugin/version.rc b/dlls/pwrshplugin/version.rc new file mode 100644 index 0000000000..f3ea96f3cc --- /dev/null +++ b/dlls/pwrshplugin/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Louis Lenders + * + * 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 WINE_FILEDESCRIPTION_STR "Wine powershell plugin" +#define WINE_FILENAME_STR "pwrshplugin.dll" +#define WINE_FILEVERSION 6,3,9600,16384 +#define WINE_FILEVERSION_STR "6.3.9600.16384" +#define WINE_PRODUCTVERSION 6,3,9600,16384 +#define WINE_PRODUCTVERSION_STR "6.3.9600.16384" + +#include "wine/wine_common_ver.rc"

1 0

Alistair Leslie-Hughes : directmanipulation: New stub dll.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: ed9e60fb775bbaf4d3bbb7a7480d6285954b3d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9e60fb775bbaf4d3bbb7a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 17 09:26:16 2019 +1000 directmanipulation: New stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/directmanipulation/Makefile.in | 6 +++ dlls/directmanipulation/directmanipulation.c | 55 +++++++++++++++++++++++++ dlls/directmanipulation/directmanipulation.spec | 6 +++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index b5287cdce1..2832456d30 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_dhtmled_ocx enable_difxapi enable_dinput enable_dinput8 +enable_directmanipulation enable_dispex enable_dmband enable_dmcompos @@ -20622,6 +20623,7 @@ wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests wine_fn_config_makefile dlls/dinput8 enable_dinput8 wine_fn_config_makefile dlls/dinput8/tests enable_tests +wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation wine_fn_config_makefile dlls/dispdib.dll16 enable_win16 wine_fn_config_makefile dlls/dispex enable_dispex wine_fn_config_makefile dlls/dispex/tests enable_tests diff --git a/configure.ac b/configure.ac index 72276fc066..b5f2ef0327 100644 --- a/configure.ac +++ b/configure.ac @@ -3210,6 +3210,7 @@ WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) +WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/dispex) WINE_CONFIG_MAKEFILE(dlls/dispex/tests) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in new file mode 100644 index 0000000000..d09d652b61 --- /dev/null +++ b/dlls/directmanipulation/Makefile.in @@ -0,0 +1,6 @@ +MODULE = directmanipulation.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + directmanipulation.c diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c new file mode 100644 index 0000000000..21458ba1fe --- /dev/null +++ b/dlls/directmanipulation/directmanipulation.c @@ -0,0 +1,55 @@ +/* + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(manipulation); + +static HINSTANCE dm_instance; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dm_instance = instance; + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/directmanipulation/directmanipulation.spec b/dlls/directmanipulation/directmanipulation.spec new file mode 100644 index 0000000000..6c8a107d5c --- /dev/null +++ b/dlls/directmanipulation/directmanipulation.spec @@ -0,0 +1,6 @@ +@ stub InitializeDManipHook +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer()

1 0

Paul Gofman : netio.sys: Add WSK provider stub interface.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 10331eb2b76c1b0220ac93a1be1d78771495c2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=10331eb2b76c1b0220ac93a1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 11 17:47:46 2020 +0300 netio.sys: Add WSK provider stub interface. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netio.sys/netio.c | 118 ++++++++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/driver4.c | 8 ++- 2 files changed, 118 insertions(+), 8 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index 839a06d30d..fac91736ab 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -32,32 +32,138 @@ #include "ddk/wsk.h" #include "wine/debug.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(netio); +struct _WSK_CLIENT +{ + WSK_REGISTRATION *registration; + WSK_CLIENT_NPI *client_npi; +}; + +static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, + ULONG protocol, ULONG Flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, + PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) +{ + FIXME("client %p, address_family %#x, socket_type %#x, protocol %#x, Flags %#x, socket_context %p, dispatch %p, " + "owning_process %p, owning_thread %p, security_descriptor %p, irp %p stub.\n", + client, address_family, socket_type, protocol, Flags, socket_context, dispatch, owning_process, + owning_thread, security_descriptor, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_socket_connect(WSK_CLIENT *client, USHORT socket_type, ULONG protocol, + SOCKADDR *local_address, SOCKADDR *remote_address, ULONG flags, void *socket_context, + const WSK_CLIENT_CONNECTION_DISPATCH *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, + SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) +{ + FIXME("client %p, socket_type %#x, protocol %#x, local_address %p, remote_address %p, " + "flags %#x, socket_context %p, dispatch %p, owning_process %p, owning_thread %p, " + "security_descriptor %p, irp %p stub.\n", + client, socket_type, protocol, local_address, remote_address, flags, socket_context, + dispatch, owning_process, owning_thread, security_descriptor, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_control_client(WSK_CLIENT *client, ULONG control_code, SIZE_T input_size, + void *input_buffer, SIZE_T output_size, void *output_buffer, SIZE_T *output_size_returned, + IRP *irp +) +{ + FIXME("client %p, control_code %#x, input_size %lu, input_buffer %p, output_size %lu, " + "output_buffer %p, output_size_returned %p, irp %p, stub.\n", + client, control_code, input_size, input_buffer, output_size, output_buffer, + output_size_returned, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, + UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, + ADDRINFOEXW **result, PEPROCESS owning_process, PETHREAD owning_thread, IRP *irp) +{ + FIXME("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " + "result %p, owning_process %p, owning_thread %p, irp %p stub.\n", + client, node_name, service_name, name_space, provider, hints, result, + owning_process, owning_thread, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static void WINAPI wsk_free_address_info(WSK_CLIENT *client, ADDRINFOEXW *addr_info) +{ + FIXME("client %p, addr_info %p stub.\n", client, addr_info); +} + +static NTSTATUS WINAPI wsk_get_name_info(WSK_CLIENT *client, SOCKADDR *sock_addr, ULONG sock_addr_length, + UNICODE_STRING *node_name, UNICODE_STRING *service_name, ULONG flags, PEPROCESS owning_process, + PETHREAD owning_thread, IRP *irp) +{ + FIXME("client %p, sock_addr %p, sock_addr_length %u, node_name %p, service_name %p, " + "flags %#x, owning_process %p, owning_thread %p, irp %p stub.\n", + client, sock_addr, sock_addr_length, node_name, service_name, flags, + owning_process, owning_thread, irp); + + return STATUS_NOT_IMPLEMENTED; +} + +static const WSK_PROVIDER_DISPATCH wsk_dispatch = +{ + MAKE_WSK_VERSION(1, 0), 0, + wsk_socket, + wsk_socket_connect, + wsk_control_client, + wsk_get_address_info, + wsk_free_address_info, + wsk_get_name_info, +}; + NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG wait_timeout, WSK_PROVIDER_NPI *wsk_provider_npi) { - FIXME("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p stub.\n", + WSK_CLIENT *client = wsk_registration->ReservedRegistrationContext; + + TRACE("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p.\n", wsk_registration, wait_timeout, wsk_provider_npi); - return STATUS_NOT_IMPLEMENTED; + wsk_provider_npi->Client = client; + wsk_provider_npi->Dispatch = &wsk_dispatch; + return STATUS_SUCCESS; } void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_registration %p stub.\n", wsk_registration); + TRACE("wsk_registration %p.\n", wsk_registration); + } NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_client_npi %p, wsk_registration %p stub.\n", wsk_client_npi, wsk_registration); + WSK_CLIENT *client; - return STATUS_NOT_IMPLEMENTED; + TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); + + if (!(client = heap_alloc(sizeof(*client)))) + { + ERR("No memory.\n"); + return STATUS_NO_MEMORY; + } + + client->registration = wsk_registration; + client->client_npi = wsk_client_npi; + wsk_registration->ReservedRegistrationContext = client; + + return STATUS_SUCCESS; } void WINAPI WskDeregister(WSK_REGISTRATION *wsk_registration) { - FIXME("wsk_registration %p stub.\n", wsk_registration); + TRACE("wsk_registration %p.\n", wsk_registration); + + heap_free(wsk_registration->ReservedRegistrationContext); } static void WINAPI driver_unload(DRIVER_OBJECT *driver) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 2fe6072ec5..d863d74836 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -66,10 +66,14 @@ static void netio_init(void) client_npi.Dispatch = &client_dispatch; status = WskRegister(&client_npi, &registration); - todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); status = WskCaptureProviderNPI(&registration, WSK_INFINITE_WAIT, &provider_npi); - todo_wine ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + ok(provider_npi.Dispatch->Version >= MAKE_WSK_VERSION(1, 0), "Got unexpected version %#x.\n", + provider_npi.Dispatch->Version); + ok(!!provider_npi.Client, "Got null WSK_CLIENT.\n"); } static void netio_uninit(void)

1 0

Paul Gofman : ntoskrnl.exe/tests: Add initial test for netio.sys.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: e63c3ed8279d782ef23702893ce1a3a98bf58885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63c3ed8279d782ef2370289… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 11 17:47:45 2020 +0300 ntoskrnl.exe/tests: Add initial test for netio.sys. Test driver should import netio.sys which is available since Vista, so a new test driver is needed to preserve XP compatibility for the existing tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 + dlls/ntoskrnl.exe/tests/driver4.c | 246 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver4.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 59 +++++++-- 4 files changed, 302 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e63c3ed8279d782ef237…

1 0

Alexandre Julliard : makefiles: Also build import libs for extra test modules.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: c873db8c1d089ad5c8d87acbbe74b2024a537b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c873db8c1d089ad5c8d87acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 19:40:25 2020 +0200 makefiles: Also build import libs for extra test modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 536d2263e3..743eaf6e35 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -183,6 +183,7 @@ struct makefile struct strarray install_lib; struct strarray install_dev; struct strarray extra_targets; + struct strarray extra_imports; struct list sources; struct list includes; const char *base_dir; @@ -1958,6 +1959,12 @@ static void add_generated_sources( struct makefile *make ) if (!make->disabled) strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" )); } + if (strendswith( source->name, ".spec" )) + { + char *obj = replace_extension( source->name, ".spec", "" ); + strarray_addall_uniq( &make->extra_imports, + get_expanded_file_local_var( make, obj, "IMPORTS" )); + } } if (make->testdll) { @@ -4361,8 +4368,8 @@ static void load_sources( struct makefile *make ) if (make->is_cross) { - for (i = 0; i < make->imports.count; i++) - strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); + strarray_addall_uniq( &cross_import_libs, make->imports ); + strarray_addall_uniq( &cross_import_libs, make->extra_imports ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
95
Older →

Jump to page:

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 June 2020