[ros-diffs] [akhaldi] 60165: [DNSAPI_WINETEST] * Sync with Wine 1.7.1.

Author: akhaldi
Date: Mon Sep 16 14:48:02 2013
New Revision: 60165

URL: http://svn.reactos.org/svn/reactos?rev=60165&view=rev
Log:
[DNSAPI_WINETEST]
* Sync with Wine 1.7.1.

Modified:
    trunk/rostests/winetests/dnsapi/CMakeLists.txt
    trunk/rostests/winetests/dnsapi/name.c
    trunk/rostests/winetests/dnsapi/record.c
    trunk/rostests/winetests/dnsapi/testlist.c

Modified: trunk/rostests/winetests/dnsapi/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/CMakeList...
==============================================================================
--- trunk/rostests/winetests/dnsapi/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/dnsapi/CMakeLists.txt	[iso-8859-1] Mon Sep 16 14:48:02 2013
@@ -1,10 +1,6 @@

-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__ROS_LONG64__)
 add_executable(dnsapi_winetest name.c record.c testlist.c)
-target_link_libraries(dnsapi_winetest wine)
 set_module_type(dnsapi_winetest win32cui)
-add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32 ntdll)
+add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32)
 add_cd_file(TARGET dnsapi_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/dnsapi/name.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/name.c?re...
==============================================================================
--- trunk/rostests/winetests/dnsapi/name.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/dnsapi/name.c	[iso-8859-1] Mon Sep 16 14:48:02 2013
@@ -18,20 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "windns.h"
-
-#include "wine/test.h"
+#include <wine/test.h>
+
+//#include <stdarg.h>
+
+//#include "windef.h"
+//#include "winbase.h"
+//#include "winnls.h"
+#include <windns.h>

static const struct
 {
     LPCSTR name;
     DNS_NAME_FORMAT format;
     DNS_STATUS status;
+    DNS_STATUS status_broken;
 }
 test_data[] =
 {
@@ -47,8 +48,8 @@
     { "a.*", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR },
     { "a ", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR },
     { "a._b", DnsNameDomain, DNS_ERROR_NON_RFC_NAME },
-    { "123", DnsNameDomain, DNS_ERROR_NUMERIC_NAME },
-    { "123.456", DnsNameDomain, DNS_ERROR_NUMERIC_NAME },
+    { "123", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME },
+    { "123.456", DnsNameDomain, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME },
     { "a.b", DnsNameDomain, ERROR_SUCCESS },

{ "", DnsNameDomainLabel, ERROR_INVALID_NAME },
@@ -79,8 +80,8 @@
     { "e.*", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR },
     { "e ", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR },
     { "e._f", DnsNameHostnameFull, DNS_ERROR_NON_RFC_NAME },
-    { "789", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME },
-    { "789.456", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME },
+    { "789", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME },
+    { "789.456", DnsNameHostnameFull, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME },
     { "e.f", DnsNameHostnameFull, ERROR_SUCCESS },

{ "", DnsNameHostnameLabel, ERROR_INVALID_NAME },
@@ -93,7 +94,7 @@
     { "*", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR },
     { "g ", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR },
     { "_g", DnsNameHostnameLabel, DNS_ERROR_NON_RFC_NAME },
-    { "123", DnsNameHostnameLabel, DNS_ERROR_NUMERIC_NAME },
+    { "123", DnsNameHostnameLabel, ERROR_SUCCESS, DNS_ERROR_NUMERIC_NAME },
     { "123.456", DnsNameHostnameLabel, ERROR_INVALID_NAME },
     { "g.h", DnsNameHostnameLabel, ERROR_INVALID_NAME },

@@ -146,8 +147,8 @@
     for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++)
     {
         status = DnsValidateName_A( test_data[i].name, test_data[i].format );
-        ok( status == test_data[i].status, "%d: '%s': got %d, expected %d\n",
-            i, test_data[i].name, status, test_data[i].status );
+        ok( status == test_data[i].status || broken(status == test_data[i].status_broken),
+            "%d: '%s': got %d, expected %d\n", i, test_data[i].name, status, test_data[i].status );
     }
 }

Modified: trunk/rostests/winetests/dnsapi/record.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/record.c?...
==============================================================================
--- trunk/rostests/winetests/dnsapi/record.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/dnsapi/record.c	[iso-8859-1] Mon Sep 16 14:48:02 2013
@@ -18,15 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include <stdarg.h>
-#include <stdio.h>
+#include <wine/test.h>

-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "windns.h"
+//#include <stdarg.h>
+//#include <stdio.h>

-#include "wine/test.h"
+//#include "windef.h"
+//#include "winbase.h"
+//#include "winnls.h"
+#include <windns.h>

static char name1[] = "localhost";
 static char name2[] = "LOCALHOST";

Modified: trunk/rostests/winetests/dnsapi/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/testlist....
==============================================================================
--- trunk/rostests/winetests/dnsapi/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/dnsapi/testlist.c	[iso-8859-1] Mon Sep 16 14:48:02 2013
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */

-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>

extern void func_name(void);
 extern void func_record(void);