mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 22:47:28 +00:00
[IEXPLORE] Sync with Wine Staging 2.9. CORE-13362
79d01be iexplore: Follow translation version info to detect native IE. svn path=/trunk/; revision=74773
This commit is contained in:
parent
6b4d06cee9
commit
15f8d4f061
|
@ -3,6 +3,6 @@ add_rc_deps(iexplore.rc ${CMAKE_CURRENT_SOURCE_DIR}/iexplore.ico)
|
||||||
add_executable(iexplore main.c iexplore.rc)
|
add_executable(iexplore main.c iexplore.rc)
|
||||||
target_link_libraries(iexplore wine)
|
target_link_libraries(iexplore wine)
|
||||||
set_module_type(iexplore win32gui UNICODE)
|
set_module_type(iexplore win32gui UNICODE)
|
||||||
add_delay_importlibs(iexplore advpack version)
|
add_delay_importlibs(iexplore advpack version user32)
|
||||||
add_importlibs(iexplore ieframe msvcrt kernel32 ntdll)
|
add_importlibs(iexplore ieframe msvcrt kernel32 ntdll)
|
||||||
add_cd_file(TARGET iexplore DESTINATION reactos FOR all)
|
add_cd_file(TARGET iexplore DESTINATION reactos FOR all)
|
||||||
|
|
|
@ -47,18 +47,19 @@ static BOOL check_native_ie(void)
|
||||||
LPWSTR file_desc;
|
LPWSTR file_desc;
|
||||||
UINT bytes;
|
UINT bytes;
|
||||||
void* buf;
|
void* buf;
|
||||||
BOOL ret;
|
BOOL ret = TRUE;
|
||||||
|
LPWORD translation;
|
||||||
|
|
||||||
static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0};
|
static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0};
|
||||||
static const WCHAR wineW[] = {'W','i','n','e',0};
|
static const WCHAR wineW[] = {'W','i','n','e',0};
|
||||||
static const WCHAR file_desc_strW[] =
|
static const WCHAR translationW[] =
|
||||||
|
{'\\','V','a','r','F','i','l','e','I','n','f','o',
|
||||||
|
'\\','T','r','a','n','s','l','a','t','i','o','n',0};
|
||||||
|
static const WCHAR file_desc_fmtW[] =
|
||||||
{'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o',
|
{'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o',
|
||||||
#ifndef __REACTOS__
|
'\\','%','0','4','x','%','0','4','x',
|
||||||
'\\','0','4','0','9','0','4','e','4',
|
|
||||||
#else
|
|
||||||
'\\','0','4','0','9','0','4','b','0',
|
|
||||||
#endif
|
|
||||||
'\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0};
|
'\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0};
|
||||||
|
WCHAR file_desc_strW[48];
|
||||||
|
|
||||||
size = GetFileVersionInfoSizeW(browseui_dllW, &handle);
|
size = GetFileVersionInfoSizeW(browseui_dllW, &handle);
|
||||||
if(!size)
|
if(!size)
|
||||||
|
@ -66,8 +67,11 @@ static BOOL check_native_ie(void)
|
||||||
|
|
||||||
buf = HeapAlloc(GetProcessHeap(), 0, size);
|
buf = HeapAlloc(GetProcessHeap(), 0, size);
|
||||||
GetFileVersionInfoW(browseui_dllW, 0, size,buf);
|
GetFileVersionInfoW(browseui_dllW, 0, size,buf);
|
||||||
|
if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes))
|
||||||
ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW);
|
{
|
||||||
|
wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]);
|
||||||
|
ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW);
|
||||||
|
}
|
||||||
|
|
||||||
HeapFree(GetProcessHeap(), 0, buf);
|
HeapFree(GetProcessHeap(), 0, buf);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -235,7 +235,7 @@ reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16
|
||||||
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9
|
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9
|
||||||
reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources.
|
reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources.
|
||||||
reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11
|
reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11
|
||||||
reactos/base/applications/iexplore # Synced to WineStaging-1.9.11
|
reactos/base/applications/iexplore # Synced to WineStaging-2.9
|
||||||
reactos/base/applications/notepad # Forked at Wine-20041201
|
reactos/base/applications/notepad # Forked at Wine-20041201
|
||||||
reactos/base/applications/regedit # Out of sync
|
reactos/base/applications/regedit # Out of sync
|
||||||
reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16
|
reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.16
|
||||||
|
|
Loading…
Reference in a new issue