From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 21 Nov 2015 09:32:38 +0000 (+0000)
Subject: [URLMON] Sync with Wine Staging 1.7.55. CORE-10536
X-Git-Tag: ReactOS-0.4.0~82
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=d6ebdb2b2b5b82d67c90796c4e9c77c55a89117a

[URLMON] Sync with Wine Staging 1.7.55. CORE-10536

svn path=/trunk/; revision=69978
---

diff --git a/reactos/dll/win32/urlmon/session.c b/reactos/dll/win32/urlmon/session.c
index e819ee5a4ef..69161abd50f 100644
--- a/reactos/dll/win32/urlmon/session.c
+++ b/reactos/dll/win32/urlmon/session.c
@@ -540,7 +540,7 @@ static void ensure_useragent(void)
          ' ','(','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 @@ static void ensure_useragent(void)
          '\\','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 @@ static void ensure_useragent(void)
     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);
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 32804c9d6ba..26190d32baf 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -192,7 +192,7 @@ reactos/dll/win32/traffic             # Synced to WineStaging-1.7.47
 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