[akhaldi] 60337: [MSVFW32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Mon Sep 23 11:36:35 2013
New Revision: 60337

URL: http://svn.reactos.org/svn/reactos?rev=60337&view=rev
Log:
[MSVFW32_WINETEST]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/rostests/winetests/msvfw32/CMakeLists.txt
    trunk/rostests/winetests/msvfw32/msvfw.c
    trunk/rostests/winetests/msvfw32/testlist.c

Modified: trunk/rostests/winetests/msvfw32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/CMakeLi…
==============================================================================
--- trunk/rostests/winetests/msvfw32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msvfw32/CMakeLists.txt	[iso-8859-1] Mon Sep 23 11:36:35 2013
@@ -1,10 +1,5 @@
-
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
 
 add_executable(msvfw32_winetest msvfw.c testlist.c)
-target_link_libraries(msvfw32_winetest wine)
 set_module_type(msvfw32_winetest win32cui)
-add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32 ntdll)
+add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32)
 add_cd_file(TARGET msvfw32_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/msvfw32/msvfw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/msvfw.c…
==============================================================================
--- trunk/rostests/winetests/msvfw32/msvfw.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msvfw32/msvfw.c	[iso-8859-1] Mon Sep 23 11:36:35 2013
@@ -1,7 +1,7 @@
 /*
  * Unit tests for video playback
  *
- * Copyright 2008 Jörg Höhle
+ * Copyright 2008,2010 Jörg Höhle
  * Copyright 2008 Austin English
  *
  * This library is free software; you can redistribute it and/or
@@ -63,7 +63,145 @@
     }
 }
 
+static void test_Locate(void)
+{
+    static BITMAPINFOHEADER bi = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RLE8,
0,100000,100000, 0,0};
+    static BITMAPINFOHEADER bo = {sizeof(BITMAPINFOHEADER),32,8, 1,8, BI_RGB,
0,100000,100000, 0,0};
+    HIC h;
+    DWORD err;
+
+    /* Oddly, MSDN documents that ICLocate takes BITMAPINFOHEADER
+     * pointers, while ICDecompressQuery takes the larger
+     * BITMAPINFO.  Probably it's all the same as long as the
+     * variable length color quads are present when they are
+     * needed. */
+
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    ok(h != 0, "RLE8->RGB failed\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+
+    bo.biHeight = - bo.biHeight;
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    ok(h == 0, "RLE8->RGB height<0 succeeded\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+    bo.biHeight = - bo.biHeight;
+
+    bi.biCompression = mmioFOURCC('c','v','i','d'); /*
Cinepak */
+    h = ICOpen(ICTYPE_VIDEO, mmioFOURCC('c','v','i','d'),
ICMODE_DECOMPRESS);
+    if (h == 0) win_skip("Cinepak/ICCVID codec not found\n");
+    else {
+        bo.biBitCount = bi.biBitCount = 32;
+        err = ICDecompressQuery(h, &bi, &bo);
+        ok(err == ICERR_OK, "Query cvid->RGB32: %d\n", err);
+
+        err = ICDecompressQuery(h, &bi, NULL);
+        ok(err == ICERR_OK, "Query cvid 32: %d\n", err);
+
+        bo.biHeight = -bo.biHeight;
+        err = ICDecompressQuery(h, &bi, &bo);
+        todo_wine ok(err == ICERR_OK, "Query cvid->RGB32 height<0: %d\n",
err);
+        bo.biHeight = -bo.biHeight;
+
+        ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+
+        bo.biBitCount = bi.biBitCount = 8;
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        todo_wine ok(h != 0, "cvid->RGB8 failed\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+        bo.biHeight = - bo.biHeight;
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        todo_wine ok(h != 0, "cvid->RGB8 height<0 failed\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+        bo.biHeight = - bo.biHeight;
+
+        bo.biBitCount = bi.biBitCount = 16;
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        ok(h != 0, "cvid->RGB16 failed\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+        bo.biHeight = - bo.biHeight;
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        todo_wine ok(h != 0, "cvid->RGB16 height<0 failed\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+        bo.biHeight = - bo.biHeight;
+
+        bo.biBitCount = bi.biBitCount = 32;
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        ok(h != 0, "cvid->RGB32 failed\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+        bo.biHeight = - bo.biHeight;
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        todo_wine ok(h != 0, "cvid->RGB32 height<0 failed\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+        bo.biHeight = - bo.biHeight;
+
+        bi.biCompression = mmioFOURCC('C','V','I','D');
+        /* Unlike ICOpen, upper case fails with ICLocate. */
+        h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+        ok(h == 0, "CVID->RGB32 upper case succeeded\n");
+        if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+    }
+
+    bi.biCompression = mmioFOURCC('M','S','V','C'); /* MS
Video 1 */
+
+    bo.biBitCount = bi.biBitCount = 16;
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    ok(h != 0, "MSVC->RGB16 failed\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+
+    bo.biHeight = - bo.biHeight;
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    todo_wine ok(h != 0, "MSVC->RGB16 height<0 failed\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+    bo.biHeight = - bo.biHeight;
+
+    bo.biHeight--;
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    ok(h == 0, "MSVC->RGB16 height too small succeeded\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+    bo.biHeight++;
+
+    /* ICLocate wants upper case MSVC */
+    bi.biCompression = mmioFOURCC('m','s','v','c');
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    ok(h == 0, "msvc->RGB16 succeeded\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+
+    bi.biCompression = mmioFOURCC('M','S','V','C');
+    h = ICOpen(ICTYPE_VIDEO, mmioFOURCC('M','S','V','C'),
ICMODE_DECOMPRESS);
+    ok(h != 0, "No MSVC codec installed!?\n");
+    if (h != 0) {
+        err = ICDecompressQuery(h, &bi, &bo);
+        ok(err == ICERR_OK, "Query MSVC->RGB16: %d\n", err);
+
+        err = ICDecompressQuery(h, &bi, NULL);
+        ok(err == ICERR_OK, "Query MSVC 16: %d\n", err);
+
+        bo.biHeight = -bo.biHeight;
+        err = ICDecompressQuery(h, &bi, &bo);
+        todo_wine ok(err == ICERR_OK, "Query MSVC->RGB16 height<0: %d\n",
err);
+        bo.biHeight = -bo.biHeight;
+
+        bi.biCompression = mmioFOURCC('m','s','v','c');
+        err = ICDecompressQuery(h, &bi, &bo);
+        ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err);
+
+        ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+    }
+
+    bi.biCompression = BI_RGB;
+    bo.biBitCount = bi.biBitCount = 8;
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    todo_wine ok(h != 0, "RGB8->RGB identity failed\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+
+    bi.biCompression = BI_RLE8;
+    h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS);
+    ok(h != 0, "RLE8->RGB again failed\n");
+    if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n");
+}
+
 START_TEST(msvfw)
 {
     test_OpenCase();
+    test_Locate();
 }

Modified: trunk/rostests/winetests/msvfw32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/testlis…
==============================================================================
--- trunk/rostests/winetests/msvfw32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/msvfw32/testlist.c	[iso-8859-1] Mon Sep 23 11:36:35 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_msvfw(void);