[ros-diffs] [akhaldi] 74773: [IEXPLORE] Sync with Wine Staging 2.9. CORE-13362 79d01be iexplore: Follow translation version info to detect native IE.

Author: akhaldi
Date: Sat Jun  3 17:28:59 2017
New Revision: 74773

URL: http://svn.reactos.org/svn/reactos?rev=74773&view=rev
Log:
[IEXPLORE] Sync with Wine Staging 2.9. CORE-13362

79d01be iexplore: Follow translation version info to detect native IE.

Modified:
    trunk/reactos/base/applications/iexplore/CMakeLists.txt
    trunk/reactos/base/applications/iexplore/main.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore…
==============================================================================
--- trunk/reactos/base/applications/iexplore/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/iexplore/CMakeLists.txt	[iso-8859-1] Sat Jun  3
17:28:59 2017
@@ -3,6 +3,6 @@
 add_executable(iexplore main.c iexplore.rc)
 target_link_libraries(iexplore wine)
 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_cd_file(TARGET iexplore DESTINATION reactos FOR all)

Modified: trunk/reactos/base/applications/iexplore/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore…
==============================================================================
--- trunk/reactos/base/applications/iexplore/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/iexplore/main.c	[iso-8859-1] Sat Jun  3 17:28:59 2017
@@ -47,18 +47,19 @@
     LPWSTR file_desc;
     UINT bytes;
     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 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',
-#ifndef __REACTOS__
-        
'\\','0','4','0','9','0','4','e','4',
-#else
-        
'\\','0','4','0','9','0','4','b','0',
-#endif
+        
'\\','%','0','4','x','%','0','4','x',
         
'\\','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);
     if(!size)
@@ -66,8 +67,11 @@
 
     buf = HeapAlloc(GetProcessHeap(), 0, size);
     GetFileVersionInfoW(browseui_dllW, 0, size,buf);
-
-    ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) ||
!strstrW(file_desc, wineW);
+    if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes))
+    {
+        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);
     return ret;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Jun  3 17:28:59 2017
@@ -235,7 +235,7 @@
 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/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/regedit           # Out of sync
 reactos/base/applications/winhlp32          # Synced to WineStaging-1.9.16