[CABINET_WINETEST]

* Sync with Wine 1.5.26.

svn path=/trunk/; revision=59128

diff --git a/rostests/winetests/cabinet/CMakeLists.txt b/rostests/winetests/cabinet/CMakeLists.txt
index 9a80c8b..e30a550 100644 (file)
--- a/rostests/winetests/cabinet/CMakeLists.txt
+++ b/rostests/winetests/cabinet/CMakeLists.txt
@@ -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)
 add_executable(cabinet_winetest extract.c fdi.c testlist.c)
 target_link_libraries(cabinet_winetest wine)
 set_module_type(cabinet_winetest win32cui)

diff --git a/rostests/winetests/cabinet/extract.c b/rostests/winetests/cabinet/extract.c
index aedbdd4..45387be 100644 (file)
--- a/rostests/winetests/cabinet/extract.c
+++ b/rostests/winetests/cabinet/extract.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 
 /* make the max size large so there is only one cab file */
 #define MEDIA_SIZE          999999999

diff --git a/rostests/winetests/cabinet/fdi.c b/rostests/winetests/cabinet/fdi.c
index 4e1c9e0..507d9c1 100644 (file)
--- a/rostests/winetests/cabinet/fdi.c
+++ b/rostests/winetests/cabinet/fdi.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 
 /* make the max size large so there is only one cab file */
 #define MEDIA_SIZE          999999999

diff --git a/rostests/winetests/cabinet/testlist.c b/rostests/winetests/cabinet/testlist.c
index 992cd35..fd041cd 100644 (file)
--- a/rostests/winetests/cabinet/testlist.c
+++ b/rostests/winetests/cabinet/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
 /* Automatically generated file; DO NOT EDIT!! */
 

-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-

 #define STANDALONE
 #define STANDALONE

-#include "wine/test.h"
+#include <wine/test.h>

 
 extern void func_extract(void);
 extern void func_fdi(void);
 
 extern void func_extract(void);
 extern void func_fdi(void);