https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2da768d403f7518c94c7bc...
commit 2da768d403f7518c94c7bc4a9c7840d40efcc98c Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 23 12:24:56 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 23 12:24:56 2018 +0100
[SHDOCVW_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/shdocvw/shdocvw.c | 25 +++++++++++++------------ modules/rostests/winetests/shdocvw/shortcut.c | 22 +++++++++------------- 2 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/modules/rostests/winetests/shdocvw/shdocvw.c b/modules/rostests/winetests/shdocvw/shdocvw.c index 3bdceb5728..cdf1814f6d 100644 --- a/modules/rostests/winetests/shdocvw/shdocvw.c +++ b/modules/rostests/winetests/shdocvw/shdocvw.c @@ -21,13 +21,13 @@
#include <stdarg.h>
-#include <windef.h> -#include <winbase.h> -#include <winreg.h> -#include <wininet.h> -#include <winnls.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wininet.h" +#include "winnls.h"
-#include <wine/test.h> +#include "wine/test.h"
/* ################ */
@@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void) buffer[sizeof(buffer)-1] = '\0'; len = sizeof(buffer); dummy = 0; - /* on success, len+1 is returned. No idea, if someone depend on this */ + /* on success, string size including terminating 0 is returned for ansi version */ res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); /* len does not include the terminating 0, when buffer is large enough */ - ok( res != 0 && len == ParseURL_table[i].len && + ok( res == (ParseURL_table[i].len+1) && len == ParseURL_table[i].len && !lstrcmpA(buffer, ParseURL_table[i].newurl), - "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", - i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl); + "#%d: got %d and %d with '%s' (expected %d and %d with '%s')\n", + i, res, len, buffer, ParseURL_table[i].len+1, ParseURL_table[i].len, ParseURL_table[i].newurl);
/* use the size test only for the first examples */ @@ -308,11 +308,12 @@ static void test_ParseURLFromOutsideSourceW(void) /* len is in characters */ len = sizeof(bufferW)/sizeof(bufferW[0]); dummy = 0; + /* on success, 1 is returned for unicode version */ res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy); WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL); - ok( res != 0 && len == ParseURL_table[0].len && + ok( res == 1 && len == ParseURL_table[0].len && !lstrcmpA(bufferA, ParseURL_table[0].newurl), - "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", + "got %d and %d with '%s' (expected 1 and %d with '%s')\n", res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);
diff --git a/modules/rostests/winetests/shdocvw/shortcut.c b/modules/rostests/winetests/shdocvw/shortcut.c index 95916a0a6b..cb62c25892 100644 --- a/modules/rostests/winetests/shdocvw/shortcut.c +++ b/modules/rostests/winetests/shdocvw/shortcut.c @@ -34,23 +34,19 @@
#include <stdarg.h>
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS
-#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h"
-//#include "initguid.h" -#include <shlobj.h> -//#include "shobjidl.h" -//#include "shlguid.h" -//#include "ole2.h" +#include "initguid.h" +#include "shlobj.h" +#include "shobjidl.h" +#include "shlguid.h" +#include "ole2.h"
-#include <wine/test.h> +#include "wine/test.h"
/* The following definitions and helper functions are meant to make the de-/registration * of the various necessary registry keys easier. */