[ros-diffs] [akhaldi] 64604: [SHDOCVW_WINETEST] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Wed Oct  8 18:42:31 2014
New Revision: 64604

URL: http://svn.reactos.org/svn/reactos?rev=64604&view=rev
Log:
[SHDOCVW_WINETEST]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/rostests/winetests/shdocvw/shdocvw.c
    trunk/rostests/winetests/shdocvw/shortcut.c

Modified: trunk/rostests/winetests/shdocvw/shdocvw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shdocvw…
==============================================================================
--- trunk/rostests/winetests/shdocvw/shdocvw.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shdocvw/shdocvw.c	[iso-8859-1] Wed Oct  8 18:42:31 2014
@@ -36,13 +36,13 @@
 static DWORD (WINAPI *pParseURLFromOutsideSourceA)(LPCSTR, LPSTR, LPDWORD, LPDWORD);
 static DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD);
 
-static CHAR appdata[] = "AppData";
-static CHAR common_appdata[] = "Common AppData";
-static CHAR default_page_url[] = "Default_Page_URL";
-static CHAR does_not_exist[] = "does_not_exist";
-static CHAR regpath_iemain[] = "Software\\Microsoft\\Internet Explorer\\Main";
-static CHAR regpath_shellfolders[] =
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-static CHAR start_page[] = "Start Page";
+static const char appdata[] = "AppData";
+static const char common_appdata[] = "Common AppData";
+static const char default_page_url[] = "Default_Page_URL";
+static const char does_not_exist[] = "does_not_exist";
+static const char regpath_iemain[] = "Software\\Microsoft\\Internet
Explorer\\Main";
+static const char regpath_shellfolders[] =
"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
+static const char start_page[] = "Start Page";
 
 /* ################ */
 

Modified: trunk/rostests/winetests/shdocvw/shortcut.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shortcu…
==============================================================================
--- trunk/rostests/winetests/shdocvw/shortcut.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shdocvw/shortcut.c	[iso-8859-1] Wed Oct  8 18:42:31 2014
@@ -210,7 +210,7 @@
     IShellFolder_Release(pWineTestFolder);
     if (FAILED(hr)) goto cleanup;
 
-    /* The resulting folder object has the FolderShortcut CLSID, instead of it's own.
*/
+    /* The resulting folder object has the FolderShortcut CLSID, instead of its own. */
     hr = IPersistFolder3_GetClassID(pWineTestPersistFolder, &clsid);
     ok (SUCCEEDED(hr), "IPersist::GetClassID failed! hr = %08x\n", hr);
     ok (IsEqualCLSID(&CLSID_FolderShortcut, &clsid), "GetClassId returned
wrong CLSID!\n");