Author: akhaldi
Date: Sat Nov 21 09:32:38 2015
New Revision: 69978
URL:
http://svn.reactos.org/svn/reactos?rev=69978&view=rev
Log:
[URLMON] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/reactos/dll/win32/urlmon/session.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/urlmon/session.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] Sat Nov 21 09:32:38 2015
@@ -540,7 +540,7 @@
'
','(','c','o','m','p','a','t','i','b','l','e',';',
' ','M','S','I','E','
','8','.','0',';',
'
','W','i','n','d','o','w','s','
','%','s','%','d','.','%','d',';',
- ' ','%','s',';','
','T','r','i','d','e','n','t','/','5','.','0',0};
+ '
','%','s','T','r','i','d','e','n','t','/','5','.','0',0};
static const WCHAR post_platform_keyW[] =
{'S','O','F','T','W','A','R','E',
'\\','M','i','c','r','o','s','o','f','t',
@@ -550,9 +550,8 @@
'\\','5','.','0','\\','U','s','e','r','
','A','g','e','n','t',
'\\','P','o','s','t','
','P','l','a','t','f','o','r','m',0};
static const WCHAR ntW[] = {'N','T',' ',0};
- static const WCHAR win32W[] =
{'W','i','n','3','2',0};
- static const WCHAR win64W[] =
{'W','i','n','6','4',0};
- static const WCHAR wow64W[] =
{'W','O','W','6','4',0};
+ static const WCHAR win64W[] =
{'W','i','n','6','4',';','
','x','6','4',';',' ',0};
+ static const WCHAR wow64W[] =
{'W','O','W','6','4',';',' ',0};
static const WCHAR emptyW[] = {0};
if(user_agent)
@@ -566,7 +565,7 @@
else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow)
os_type = wow64W;
else
- os_type = win32W;
+ os_type = emptyW;
sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type);
len = strlenW(buf);
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 Nov 21 09:32:38 2015
@@ -192,7 +192,7 @@
reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37
reactos/dll/win32/updspapi # Synced to WineStaging-1.7.47
reactos/dll/win32/url # Synced to WineStaging-1.7.47
-reactos/dll/win32/urlmon # Synced to WineStaging-1.7.47
+reactos/dll/win32/urlmon # Synced to WineStaging-1.7.55
reactos/dll/win32/usp10 # Synced to WineStaging-1.7.47
reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-1.7.47