[ros-diffs] [akhaldi] 59128: [CABINET_WINETEST] * Sync with Wine 1.5.26.

Author: akhaldi
Date: Fri May 31 16:57:58 2013
New Revision: 59128

URL: http://svn.reactos.org/svn/reactos?rev=59128&view=rev
Log:
[CABINET_WINETEST]
* Sync with Wine 1.5.26.

Modified:
    trunk/rostests/winetests/cabinet/CMakeLists.txt
    trunk/rostests/winetests/cabinet/extract.c
    trunk/rostests/winetests/cabinet/fdi.c
    trunk/rostests/winetests/cabinet/testlist.c

Modified: trunk/rostests/winetests/cabinet/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/CMakeLis...
==============================================================================
--- trunk/rostests/winetests/cabinet/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/cabinet/CMakeLists.txt	[iso-8859-1] Fri May 31 16:57:58 2013
@@ -1,8 +1,5 @@

-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__ROS_LONG64__)
 add_executable(cabinet_winetest extract.c fdi.c testlist.c)
 target_link_libraries(cabinet_winetest wine)
 set_module_type(cabinet_winetest win32cui)

Modified: trunk/rostests/winetests/cabinet/extract.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract....
==============================================================================
--- trunk/rostests/winetests/cabinet/extract.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/cabinet/extract.c	[iso-8859-1] Fri May 31 16:57:58 2013
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include <stdio.h>
-#include <windows.h>
-#include "fci.h"
-#include "fdi.h"
-#include "wine/test.h"
+//#include <stdio.h>
+//#include <windows.h>
+#include <wine/test.h>
+#include <fci.h>
+#include <fdi.h>

/* make the max size large so there is only one cab file */
 #define MEDIA_SIZE          999999999

Modified: trunk/rostests/winetests/cabinet/fdi.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/fdi.c?re...
==============================================================================
--- trunk/rostests/winetests/cabinet/fdi.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/cabinet/fdi.c	[iso-8859-1] Fri May 31 16:57:58 2013
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include <stdio.h>
-#include <windows.h>
-#include "fci.h"
-#include "fdi.h"
-#include "wine/test.h"
+//#include <stdio.h>
+//#include <windows.h>
+#include <wine/test.h>
+#include <fci.h>
+#include <fdi.h>

/* make the max size large so there is only one cab file */
 #define MEDIA_SIZE          999999999

Modified: trunk/rostests/winetests/cabinet/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/testlist...
==============================================================================
--- trunk/rostests/winetests/cabinet/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/cabinet/testlist.c	[iso-8859-1] Fri May 31 16:57:58 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_extract(void);
 extern void func_fdi(void);