marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Do not do our iexplore.exe registration if native Internet Explorer is detected to be present.

oldstable
Aric Stewart 2008-05-08 11:26:47 -05:00 committed by Alexandre Julliard
parent 255eebe44d
commit d4a3e9c016
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shdocvw/Makefile.in
View File

@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = shdocvw.dll
IMPORTLIB = shdocvw
IMPORTS = uuid shell32 shlwapi user32 advapi32 kernel32
DELAYIMPORTS = urlmon ole32 oleaut32
DELAYIMPORTS = version urlmon ole32 oleaut32
C_SRCS = \
classinfo.c \

35
dlls/shdocvw/factory.c
View File

@ -26,6 +26,8 @@
#include "advpub.h"
#include "isguids.h"
#include "winver.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
@ -287,8 +289,39 @@ HRESULT WINAPI DllUnregisterServer(void)
return UnRegisterTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, SYS_WIN32);
}
static BOOL check_native_ie(void)
{
static const WCHAR cszPath[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0};
DWORD handle,size;
size = GetFileVersionInfoSizeW(cszPath,&handle);
if (size)
{
LPVOID buf;
LPWSTR lpFileDescription;
UINT dwBytes;
static const WCHAR cszFD[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\','0','4','0','9','0','4','e','4','\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0};
static const WCHAR cszWine[] = {'W','i','n','e',0};
buf = HeapAlloc(GetProcessHeap(),0,size);
GetFileVersionInfoW(cszPath,0,size,buf);
if (VerQueryValueW(buf, cszFD, (LPVOID*)&lpFileDescription, &dwBytes) &&
strstrW(lpFileDescription,cszWine))
return FALSE;
}
return TRUE;
}
DWORD register_iexplore(BOOL doregister)
{
HRESULT hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL);
HRESULT hres;
if (check_native_ie())
{
TRACE("Native IE detected, not doing registration\n");
return S_OK;
}
hres = reg_install(doregister ? "RegisterIE" : "UnregisterIE", NULL);
return !SUCCEEDED(hres);
}