November 2020 - Wine-commits

Hans Leidekker : msado15: Fix NULL pointer dereference in close_recordset.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 5e05fce75d840ae1207358ba36d232c3ffcec566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e05fce75d840ae1207358ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 29 11:30:02 2020 +0200 msado15: Fix NULL pointer dereference in close_recordset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49281 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb1d46fc0a50f0b74c0f7476d224b56a239003fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/recordset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1d28d6b957d..52a37cf2187 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -747,7 +747,10 @@ static ULONG WINAPI recordset_AddRef( _Recordset *iface ) static void close_recordset( struct recordset *recordset ) { - ULONG row, col, col_count = get_column_count( recordset ); + ULONG row, col, col_count; + + if (!recordset->fields) return; + col_count = get_column_count( recordset ); recordset->fields->recordset = NULL; Fields_Release( &recordset->fields->Fields_iface );

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExRegisterCallback() function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cdd4c607a654550462b0275d233638846edd78ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd4c607a654550462b0275d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:06 2020 +0300 ntoskrnl.exe: Add stub for ExRegisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7bc99ae1254f467a23b46756dce40a15494f0758) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec0f376d6cd..5b99d4d17ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2057,6 +2057,14 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, return STATUS_SUCCESS; } +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, + PCALLBACK_FUNCTION callback_function, void *callback_context) +{ + FIXME("callback_object %p, callback_function %p, callback_context %p stub.\n", + callback_object, callback_function, callback_context); + + return (void *)0xdeadbeef; +} /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) @@ -2993,6 +3001,7 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) if (!pFunc) { hMod = GetModuleHandleW( halW ); + if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); } RtlFreeAnsiString( &routineNameA ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a39247811e5..b65857b82b8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -180,7 +180,7 @@ @ stub ExRaiseException @ stub ExRaiseHardError @ stub ExRaiseStatus -@ stub ExRegisterCallback +@ stdcall ExRegisterCallback(ptr ptr ptr) @ stub ExReinitializeResourceLite @ stdcall ExReleaseResourceForThreadLite(ptr long) @ extern ExSemaphoreObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5152a89842b..fbb9242cd5b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1296,6 +1296,7 @@ typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); +typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *); #ifdef _WIN64 #define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN @@ -1567,6 +1568,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPI LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExUnregisterCallback() function.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: efdbac559d8371998879c33090cd9f862d18f4f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efdbac559d8371998879c330… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:07 2020 +0300 ntoskrnl.exe: Add stub for ExUnregisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9effc3f96333d809ffba43b975fa062cbf8912d7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5b99d4d17ec..705e6051d58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2066,6 +2066,11 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, return (void *)0xdeadbeef; } +void WINAPI ExUnregisterCallback(void *callback_registration) +{ + FIXME("callback_registration %p stub.\n", callback_registration); +} + /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b65857b82b8..3f6bd777a5e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -188,7 +188,7 @@ @ stdcall ExSetTimerResolution(long long) @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime -@ stub ExUnregisterCallback +@ stdcall ExUnregisterCallback(ptr) @ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index fbb9242cd5b..b69edfbe1b1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1572,6 +1572,7 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); +void WINAPI ExUnregisterCallback(void*); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG);

1 0

Aaro Altonen : msado15: Add IConnectionPoint stub to _Connection.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 27d497896a7e68b6327c2fa69e3b98b5f73f84fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=27d497896a7e68b6327c2fa6… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:17 2020 +0300 msado15: Add IConnectionPoint stub to _Connection. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8b647d8f89e6927bc1591d505eb63eb5ebfe860) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 8ed39a3a518..be201cb90b3 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct connection; + +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + struct connection *conn; + const IID *riid; +}; + struct connection { _Connection Connection_iface; @@ -41,6 +50,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + struct connection_point cp_connev; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -58,6 +68,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -453,6 +468,86 @@ static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = connpointcontainer_FindConnectionPoint }; +static HRESULT WINAPI connpoint_QueryInterface( IConnectionPoint *iface, REFIID riid, void **obj ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IConnectionPoint, riid )) + { + *obj = &connpoint->IConnectionPoint_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid( riid ) ); + return E_NOINTERFACE; + } + + connection_AddRef( &connpoint->conn->Connection_iface ); + return S_OK; +} + +static ULONG WINAPI connpoint_AddRef( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_AddRef( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static ULONG WINAPI connpoint_Release( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_Release( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static HRESULT WINAPI connpoint_GetConnectionInterface( IConnectionPoint *iface, IID *iid ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, iid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_GetConnectionPointContainer( IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, container ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d\n", connpoint, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, + IEnumConnections **points ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, points ); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connpoint_vtbl = +{ + connpoint_QueryInterface, + connpoint_AddRef, + connpoint_Release, + connpoint_GetConnectionInterface, + connpoint_GetConnectionPointContainer, + connpoint_Advise, + connpoint_Unadvise, + connpoint_EnumConnections +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -466,6 +561,10 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; + connection->cp_connev.conn = connection; + connection->cp_connev.riid = &DIID_ConnectionEvents; + connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); return S_OK;

1 0

Aaro Altonen : msado15: Implement IConnectionPointContainer_FindConnectionPoint.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: c5cb0eea37d3dd28183060fdad1fef71d8cbc15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5cb0eea37d3dd28183060fd… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:18 2020 +0300 msado15: Implement IConnectionPointContainer_FindConnectionPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49303 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1222a3595c8eafaef7df95b3804fa2205ac3c84) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 17 +++++++++++++++-- dlls/msado15/tests/msado15.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index be201cb90b3..9e8c05522ef 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "olectl.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -455,8 +456,20 @@ static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointCo REFIID riid, IConnectionPoint **point ) { struct connection *connection = impl_from_IConnectionPointContainer( iface ); - FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); - return E_NOTIMPL; + + TRACE( "%p, %s %p\n", connection, debugstr_guid( riid ), point ); + + if (!point) return E_POINTER; + + if (IsEqualIID( riid, connection->cp_connev.riid )) + { + *point = &connection->cp_connev.IConnectionPoint_iface; + IConnectionPoint_AddRef( *point ); + return S_OK; + } + + FIXME( "unsupported connection point %s\n", debugstr_guid( riid ) ); + return CONNECT_E_NOCONNECTION; } static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index cd6516d45d6..9cde03dd07a 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <initguid.h> #include <oledb.h> +#include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" @@ -799,10 +800,36 @@ static void test_Command(void) _Command_Release( command ); } +static void test_ConnectionPoint(void) +{ + HRESULT hr; + ULONG refs; + IConnectionPoint *point; + IConnectionPointContainer *pointcontainer; + + hr = CoCreateInstance( &CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, + &IID_IConnectionPointContainer, (void**)&pointcontainer ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_RecordsetEvents, &point ); + ok( hr == CONNECT_E_NOCONNECTION, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); + ok( hr == S_OK, "got %08x\n", hr ); + + refs = IConnectionPoint_Release( point ); + ok( refs == 1, "got %u", refs ); + + IConnectionPointContainer_Release( pointcontainer ); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ConnectionPoint(); test_Fields(); test_Recordset(); test_Stream();

1 0

Alexandre Julliard : setupapi: Support a WineSourceDirs section to copy files from the Wine build or data dir.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: c6af3a9002c6a7a8c2c6f96730415e5877640e2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6af3a9002c6a7a8c2c6f967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 11 09:00:43 2020 +0100 setupapi: Support a WineSourceDirs section to copy files from the Wine build or data dir. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa76bec2417551952eec9cd8f5d8302dcb72f5bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/install.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e1667541680..0859739be5d 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -153,13 +153,31 @@ static WCHAR *dup_section_line_field( HINF hinf, const WCHAR *section, const WCH */ static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg ) { + INFCONTEXT context; struct files_callback_info *info = arg; WCHAR src_root[MAX_PATH], *p; if (!info->src_root) { - lstrcpyW( src_root, PARSER_get_inf_filename( hinf ) ); - if ((p = wcsrchr( src_root, '\\' ))) *p = 0; + const WCHAR *build_dir = _wgetenv( L"WINEBUILDDIR" ); + const WCHAR *data_dir = _wgetenv( L"WINEDATADIR" ); + + if ((build_dir || data_dir) && SetupFindFirstLineW( hinf, L"WineSourceDirs", field, &context )) + { + lstrcpyW( src_root, build_dir ? build_dir : data_dir ); + src_root[1] = '\\'; /* change \??\ to \\?\ */ + p = src_root + lstrlenW(src_root); + *p++ = '\\'; + if (!build_dir || !SetupGetStringFieldW( &context, 2, p, MAX_PATH - (p - src_root), NULL )) + { + if (!SetupGetStringFieldW( &context, 1, p, MAX_PATH - (p - src_root), NULL )) p[-1] = 0; + } + } + else + { + lstrcpyW( src_root, PARSER_get_inf_filename( hinf ) ); + if ((p = wcsrchr( src_root, '\\' ))) *p = 0; + } } if (field[0] == '@') /* special case: copy single file */

1 0

Zebediah Figura : setupapi: Reset the source file pointer when comparing files.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 7678c5878aa92a91422ace79f57ca7c3032af834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7678c5878aa92a91422ace79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 11:16:30 2020 -0500 setupapi: Reset the source file pointer when comparing files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 007a9c9726e455fc99d7362e3bafaa89bec11ab4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3b5d62b682c..3b0c9477747 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -933,6 +933,8 @@ static BOOL find_existing_inf(const WCHAR *source, WCHAR *target) if (dest_file == INVALID_HANDLE_VALUE) continue; + SetFilePointer( source_file, 0, NULL, FILE_BEGIN ); + if (GetFileSizeEx( dest_file, &dest_file_size ) && dest_file_size.QuadPart == source_file_size.QuadPart && !compare_files( source_file, dest_file ))

1 0

Zebediah Figura : setupapi: Store the original INF file path in a .pnf file.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 2a9d8699a74fc27ed213f838cde9052269ad41ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a9d8699a74fc27ed213f838… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 11:16:31 2020 -0500 setupapi: Store the original INF file path in a .pnf file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 547d62da228a3846cf058bcc71fc8974356a96b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/misc.c | 17 ++++++++++++++++- dlls/setupapi/setupapi_private.h | 2 ++ dlls/setupapi/tests/misc.c | 4 ++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 6c31365546f..539bfed0caa 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi -IMPORTS = uuid version advapi32 rpcrt4 +IMPORTS = uuid version advapi32 rpcrt4 kernelbase DELAYIMPORTS = shell32 wintrust ole32 winspool.drv comdlg32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3b0c9477747..26e5359804c 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -31,6 +31,7 @@ #include "softpub.h" #include "mscat.h" #include "shlobj.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -962,10 +963,11 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, DWORD buffer_size, DWORD *required_size, WCHAR **filepart ) { BOOL ret = FALSE; - WCHAR target[MAX_PATH], catalog_file[MAX_PATH], *p; + WCHAR target[MAX_PATH], catalog_file[MAX_PATH], pnf_path[MAX_PATH], *p; static const WCHAR inf[] = { '\\','i','n','f','\\',0 }; static const WCHAR wszVersion[] = { 'V','e','r','s','i','o','n',0 }; static const WCHAR wszCatalogFile[] = { 'C','a','t','a','l','o','g','F','i','l','e',0 }; + FILE *pnf_file; unsigned int i; DWORD size; HINF hinf; @@ -1069,6 +1071,19 @@ done: if (style & SP_COPY_DELETESOURCE) DeleteFileW( source ); + if (ret) + { + wcscpy(pnf_path, target); + PathRemoveExtensionW(pnf_path); + PathAddExtensionW(pnf_path, L".pnf"); + if ((pnf_file = _wfopen(pnf_path, L"w"))) + { + fputws(PNF_HEADER, pnf_file); + fputws(source, pnf_file); + fclose(pnf_file); + } + } + size = lstrlenW( target ) + 1; if (dest) { diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index f4685ab2b4c..21ac50e0f3c 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -43,6 +43,8 @@ #define REGPART_RENAME "\\Rename" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" +#define PNF_HEADER L"Wine PNF header\n" + extern HINSTANCE SETUPAPI_hInstance DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 3bb308ef4a7..f16f310b3f7 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -320,7 +320,7 @@ static void test_SetupCopyOEMInf(void) DeleteFileA(dest); strcpy(pnf, dest); *(strrchr(pnf, '.') + 1) = 'p'; - ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + todo_wine ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); res = SetupUninstallOEMInfA(strrchr(orig_dest, '\\') + 1, 0, NULL); ok(res, "Failed to uninstall '%s', error %u.\n", orig_dest, GetLastError()); @@ -328,7 +328,7 @@ static void test_SetupCopyOEMInf(void) DeleteFileA(orig_dest); strcpy(pnf, dest); *(strrchr(pnf, '.') + 1) = 'p'; - ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); + todo_wine ok(!file_exists(pnf), "Expected pnf '%s' to not exist\n", pnf); GetWindowsDirectoryA(orig_dest, sizeof(orig_dest)); strcat(orig_dest, "\\inf\\");

1 0

Zebediah Figura : setupapi: Use the original INF source path if possible when copying files.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: e67cd6901b6ed447ed1355a9366728503b8ca2d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e67cd6901b6ed447ed1355a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 11:16:32 2020 -0500 setupapi: Use the original INF source path if possible when copying files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35903 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f779f36da3d6bc9b3ae2f223063fc02602fe3dc6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/install.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0859739be5d..ed82d750253 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -32,6 +32,7 @@ #include "winnls.h" #include "winsvc.h" #include "shlobj.h" +#include "shlwapi.h" #include "objidl.h" #include "objbase.h" #include "setupapi.h" @@ -146,6 +147,29 @@ static WCHAR *dup_section_line_field( HINF hinf, const WCHAR *section, const WCH return buffer; } +static void get_inf_src_path( HINF hinf, WCHAR *path ) +{ + const WCHAR *inf_path = PARSER_get_inf_filename( hinf ); + WCHAR pnf_path[MAX_PATH]; + FILE *pnf; + + wcscpy( pnf_path, inf_path ); + PathRemoveExtensionW( pnf_path ); + PathAddExtensionW( pnf_path, L".pnf" ); + if ((pnf = _wfopen( pnf_path, L"r" ))) + { + if (fgetws( path, MAX_PATH, pnf ) && !wcscmp( path, PNF_HEADER )) + { + fgetws( path, MAX_PATH, pnf ); + TRACE("using original source path %s\n", debugstr_w(path)); + fclose( pnf ); + return; + } + fclose( pnf ); + } + wcscpy( path, inf_path ); +} + /*********************************************************************** * copy_files_callback * @@ -175,7 +199,7 @@ static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg ) } else { - lstrcpyW( src_root, PARSER_get_inf_filename( hinf ) ); + get_inf_src_path( hinf, src_root ); if ((p = wcsrchr( src_root, '\\' ))) *p = 0; } }

1 0

Louis Lenders : ws2_32: Add FreeAddrInfoEx.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 1cbda58252c4c358f950dfabc01e5ffe3237dd51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cbda58252c4c358f950dfab… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jun 17 00:43:22 2020 +0200 ws2_32: Add FreeAddrInfoEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48256 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6d1fea9711d5062fdcfe5043091451c8aec56023) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 18 ++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2tcpip.h | 4 ++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5c3d1a0dc02..fbfef0aad52 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7243,6 +7243,24 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoEx (WS2_32.@) + */ +void WINAPI FreeAddrInfoEx(ADDRINFOEXA *ai) +{ + TRACE("(%p)\n", ai); + + while (ai) + { + ADDRINFOEXA *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } +} + /*********************************************************************** * FreeAddrInfoExW (WS2_32.@) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index ae3eaf0c90c..8a27972d93c 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoEx(ptr) @ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExCancel(ptr) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 43c277fa0cb..5a444dcb5f3 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -177,7 +177,11 @@ void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); #define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +void WINAPI FreeAddrInfoEx(ADDRINFOEXA*); void WINAPI FreeAddrInfoExW(ADDRINFOEXW*); +#ifdef UNICODE +#define FreeAddrInfoEx FreeAddrInfoExW +#endif int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*);

1 0