mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 01:27:16 +00:00
setupapi: Run registration scripts of fake dlls as they are copied.
This commit is contained in:
Alexandre Julliard
parent
39a4c2532b
commit
5ec4e8f192
|
|
@ -33,6 +33,8 @@
|
|||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
#define COBJMACROS
|
||||
#define ATL_INITGUID
|
||||
#define NONAMELESSSTRUCT
|
||||
#define NONAMELESSUNION
|
||||
#include "ntstatus.h"
|
||||
|
|
@ -45,6 +47,8 @@
|
|||
#include "wine/unicode.h"
|
||||
#include "wine/library.h"
|
||||
#include "wine/debug.h"
|
||||
#include "ole2.h"
|
||||
#include "atliface.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
|
||||
|
||||
|
|
@ -59,6 +63,7 @@ static SIZE_T file_buffer_size;
|
|||
static unsigned int handled_count;
|
||||
static unsigned int handled_total;
|
||||
static char **handled_dlls;
|
||||
static IRegistrar *registrar;
|
||||
|
||||
struct dll_info
|
||||
{
|
||||
|
|
@ -465,6 +470,67 @@ static HANDLE create_dest_file( const WCHAR *name )
|
|||
return h;
|
||||
}
|
||||
|
||||
static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg )
|
||||
{
|
||||
HRESULT *hr = (HRESULT *)arg;
|
||||
WCHAR *buffer;
|
||||
HRSRC rsrc = FindResourceW( module, name, type );
|
||||
char *str = LoadResource( module, rsrc );
|
||||
DWORD lenW, lenA = SizeofResource( module, rsrc );
|
||||
|
||||
if (!str) return FALSE;
|
||||
lenW = MultiByteToWideChar( CP_UTF8, 0, str, lenA, NULL, 0 ) + 1;
|
||||
if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) return FALSE;
|
||||
MultiByteToWideChar( CP_UTF8, 0, str, lenA, buffer, lenW );
|
||||
buffer[lenW - 1] = 0;
|
||||
*hr = IRegistrar_StringRegister( registrar, buffer );
|
||||
HeapFree( GetProcessHeap(), 0, buffer );
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void register_fake_dll( const WCHAR *name, const void *data, size_t size )
|
||||
{
|
||||
static const WCHAR atlW[] = {'a','t','l','.','d','l','l',0};
|
||||
static const WCHAR moduleW[] = {'M','O','D','U','L','E',0};
|
||||
static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0};
|
||||
const IMAGE_RESOURCE_DIRECTORY *resdir;
|
||||
LDR_RESOURCE_INFO info;
|
||||
HRESULT hr = S_OK;
|
||||
HMODULE module = (HMODULE)((ULONG_PTR)data | 1);
|
||||
|
||||
info.Type = (ULONG_PTR)regtypeW;
|
||||
if (LdrFindResourceDirectory_U( module, &info, 1, &resdir )) return;
|
||||
|
||||
if (!registrar)
|
||||
{
|
||||
/* create the object by hand since we can't guarantee that atl and ole32 are registered */
|
||||
IClassFactory *cf;
|
||||
HRESULT (WINAPI *pDllGetClassObject)( REFCLSID clsid, REFIID iid, LPVOID *ppv );
|
||||
HMODULE atl = LoadLibraryW( atlW );
|
||||
|
||||
if ((pDllGetClassObject = (void *)GetProcAddress( atl, "DllGetClassObject" )))
|
||||
{
|
||||
hr = pDllGetClassObject( &CLSID_Registrar, &IID_IClassFactory, (void **)&cf );
|
||||
if (SUCCEEDED( hr ))
|
||||
{
|
||||
hr = IClassFactory_CreateInstance( cf, NULL, &IID_IRegistrar, (void **)®istrar );
|
||||
IClassFactory_Release( cf );
|
||||
}
|
||||
}
|
||||
if (!registrar)
|
||||
{
|
||||
ERR( "failed to create IRegistrar: %x\n", hr );
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
TRACE( "registering %s\n", debugstr_w(name) );
|
||||
IRegistrar_ClearReplacements( registrar );
|
||||
IRegistrar_AddReplacement( registrar, moduleW, name );
|
||||
EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&hr );
|
||||
if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr );
|
||||
}
|
||||
|
||||
/* copy a fake dll file to the dest directory */
|
||||
static void install_fake_dll( WCHAR *dest, char *file, const char *ext )
|
||||
{
|
||||
|
|
@ -494,7 +560,8 @@ static void install_fake_dll( WCHAR *dest, char *file, const char *ext )
|
|||
ret = (WriteFile( h, data, size, &written, NULL ) && written == size);
|
||||
if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() );
|
||||
CloseHandle( h );
|
||||
if (!ret) DeleteFileW( dest );
|
||||
if (ret) register_fake_dll( dest, data, size );
|
||||
else DeleteFileW( dest );
|
||||
}
|
||||
}
|
||||
*destname = 0; /* restore it for next file */
|
||||
|
|
@ -608,7 +675,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source )
|
|||
DWORD written;
|
||||
|
||||
ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size);
|
||||
if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() );
|
||||
if (ret) register_fake_dll( name, buffer, size );
|
||||
else ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -632,4 +700,6 @@ void cleanup_fake_dlls(void)
|
|||
HeapFree( GetProcessHeap(), 0, handled_dlls );
|
||||
handled_dlls = NULL;
|
||||
handled_count = handled_total = 0;
|
||||
if (registrar) IRegistrar_Release( registrar );
|
||||
registrar = NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2489,85 +2489,36 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
|||
|
||||
[RegisterDllsSection]
|
||||
;;some dlls have to be registered first
|
||||
11,,atl.dll,1
|
||||
11,,ole32.dll,1
|
||||
11,,oleaut32.dll,1
|
||||
11,,shell32.dll,1
|
||||
|
||||
11,,actxprxy.dll,1
|
||||
11,,amstream.dll,1
|
||||
11,,avifil32.dll,1
|
||||
11,,browseui.dll,1
|
||||
11,,comctl32.dll,2
|
||||
11,,comdlg32.dll,1
|
||||
11,,cryptdlg.dll,1
|
||||
11,,cryptnet.dll,1
|
||||
11,,d3dxof.dll,1
|
||||
11,,ddraw.dll,1
|
||||
11,,ddrawex.dll,1
|
||||
11,,devenum.dll,1
|
||||
11,,dinput.dll,1
|
||||
11,,dinput8.dll,1
|
||||
11,,dispex.dll,1
|
||||
11,,dmband.dll,1
|
||||
11,,dmcompos.dll,1
|
||||
11,,dmime.dll,1
|
||||
11,,dmloader.dll,1
|
||||
11,,dmscript.dll,1
|
||||
11,,dmstyle.dll,1
|
||||
11,,dmsynth.dll,1
|
||||
11,,dmusic.dll,1
|
||||
11,,dplayx.dll,1
|
||||
11,,dpnet.dll,1
|
||||
11,,dsound.dll,1
|
||||
11,,dswave.dll,1
|
||||
11,,dxdiagn.dll,1
|
||||
11,,explorerframe.dll,1
|
||||
11,,gameux.dll,1
|
||||
11,,hhctrl.ocx,1
|
||||
11,,hlink.dll,1
|
||||
11,,hnetcfg.dll,1
|
||||
11,,ieframe.dll,1
|
||||
11,,inetcomm.dll,1
|
||||
11,,infosoft.dll,1
|
||||
11,,inseng.dll,1
|
||||
11,,itss.dll,1
|
||||
11,,jscript.dll,1
|
||||
11,,mlang.dll,1
|
||||
11,,mmdevapi.dll,1
|
||||
11,,msctf.dll,1
|
||||
11,,msdaps.dll,1
|
||||
11,,mshtml.dll,1
|
||||
11,,msi.dll,1
|
||||
11,,msiexec.exe,1
|
||||
11,,msimtf.dll,1
|
||||
11,,msisip.dll,1
|
||||
11,,mstask.dll,1
|
||||
11,,msxml.dll,1
|
||||
11,,msxml2.dll,1
|
||||
11,,msxml3.dll,1
|
||||
11,,msxml4.dll,1
|
||||
11,,msxml6.dll,1
|
||||
11,,objsel.dll,1
|
||||
11,,oledb32.dll,1
|
||||
11,,qcap.dll,1
|
||||
11,,qedit.dll,1
|
||||
11,,qmgr.dll,1
|
||||
11,,qmgrprxy.dll,1
|
||||
11,,quartz.dll,1
|
||||
11,,rsaenh.dll,1
|
||||
11,,shdocvw.dll,1
|
||||
11,,sti.dll,1
|
||||
11,,urlmon.dll,1
|
||||
11,,vbscript.dll,1
|
||||
11,,wbemprox.dll,1
|
||||
11,,wiaservc.dll,1
|
||||
11,,windowscodecs.dll,1
|
||||
11,,winegstreamer.dll,1
|
||||
11,,wineqtdecoder.dll,1
|
||||
11,,winhttp.dll,1
|
||||
11,,wintrust.dll,1
|
||||
11,,wmiutils.dll,1
|
||||
11,,wuapi.dll,1
|
||||
11,,iexplore.exe,1
|
||||
|
||||
|
|
@ -2595,6 +2546,13 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
|||
11,,iexplore.exe,-
|
||||
11,,winetest.exe,-
|
||||
12,,mountmgr.sys,-
|
||||
; registration order matters for these
|
||||
11,,msxml.dll
|
||||
11,,msxml2.dll
|
||||
11,,msxml3.dll
|
||||
11,,msxml4.dll
|
||||
11,,msxml6.dll
|
||||
11,,shdocvw.dll
|
||||
11,,*
|
||||
|
||||
[FakeDlls]
|
||||
|
|
@ -2614,6 +2572,13 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
|||
11,,notepad.exe
|
||||
11,,winetest.exe,-
|
||||
12,,mountmgr.sys
|
||||
; registration order matters for these
|
||||
11,,msxml.dll
|
||||
11,,msxml2.dll
|
||||
11,,msxml3.dll
|
||||
11,,msxml4.dll
|
||||
11,,msxml6.dll
|
||||
11,,shdocvw.dll
|
||||
10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe
|
||||
10,Microsoft.NET\Framework\v1.1.4322,ngen.exe
|
||||
10,Microsoft.NET\Framework\v1.1.4322,fusion.dll
|
||||
|
|
|
|||
Loading…
Reference in a new issue