From 170cbf44bae35ae9d38210bca1f14087901864e5 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 8 Oct 2014 18:42:31 +0000 Subject: [PATCH] [SHDOCVW_WINETEST] * Sync with Wine 1.7.27. CORE-8540 svn path=/trunk/; revision=64604 --- rostests/winetests/shdocvw/shdocvw.c | 14 +++++++------- rostests/winetests/shdocvw/shortcut.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rostests/winetests/shdocvw/shdocvw.c b/rostests/winetests/shdocvw/shdocvw.c index 2aeebf28122..3bdceb57287 100644 --- a/rostests/winetests/shdocvw/shdocvw.c +++ b/rostests/winetests/shdocvw/shdocvw.c @@ -36,13 +36,13 @@ static HRESULT (WINAPI *pURLSubRegQueryA)(LPCSTR, LPCSTR, DWORD, LPVOID, DWORD, 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"; /* ################ */ diff --git a/rostests/winetests/shdocvw/shortcut.c b/rostests/winetests/shdocvw/shortcut.c index aee2751dc0c..95916a0a6b5 100644 --- a/rostests/winetests/shdocvw/shortcut.c +++ b/rostests/winetests/shdocvw/shortcut.c @@ -210,7 +210,7 @@ static void test_ShortcutFolder(void) { 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");