Author: akhaldi Date: Mon Dec 2 22:45:51 2013 New Revision: 61202
URL: http://svn.reactos.org/svn/reactos?rev=61202&view=rev Log: [VERSION_WINETEST] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/rostests/winetests/version/CMakeLists.txt trunk/rostests/winetests/version/info.c trunk/rostests/winetests/version/install.c trunk/rostests/winetests/version/testlist.c trunk/rostests/winetests/version/version.rc
Modified: trunk/rostests/winetests/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/CMakeLis... ============================================================================== --- trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -1,16 +1,10 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE info.c install.c - version.rc testlist.c)
-add_executable(version_winetest ${SOURCE}) -target_link_libraries(version_winetest wine) +add_executable(version_winetest ${SOURCE} version.rc) set_module_type(version_winetest win32cui) add_importlibs(version_winetest version msvcrt kernel32 ntdll) add_cd_file(TARGET version_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?r... ============================================================================== --- trunk/rostests/winetests/version/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/info.c [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -178,7 +178,6 @@ ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || - GetLastError() == ERROR_BAD_FORMAT || /* win9x */ GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError());
@@ -195,8 +194,6 @@ d = (WORD)(Version & 0xffff);
sprintf(lpszVerString, "%d.%d.%d.%d", a, b, c, d); - - return; }
static void test_info(void) @@ -341,12 +338,14 @@ retvalW = GetFileVersionInfoSizeW( mypathW, &hdlW); pVersionInfoW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retvalW ); retW = GetFileVersionInfoW( mypathW, 0, retvalW, pVersionInfoW ); + ok(retW, "GetFileVersionInfo failed: GetLastError = %u\n", GetLastError()); }
GetModuleFileNameA(NULL, mypathA, MAX_PATH); retvalA = GetFileVersionInfoSizeA( mypathA, &hdlA); pVersionInfoA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, retvalA ); retA = GetFileVersionInfoA( mypathA, 0, retvalA, pVersionInfoA ); + ok(retA, "GetFileVersionInfo failed: GetLastError = %u\n", GetLastError());
if (is_unicode_enabled) { @@ -411,7 +410,7 @@
retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); - ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); + ok ( uiLengthW == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthW );
ok( uiLengthA == uiLengthW, "The size of VS_FIXEDFILEINFO should be the same for both A/W calls, it is (%d) vs. (%d)\n", uiLengthA, uiLengthW); @@ -499,12 +498,10 @@ ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 got %x\n", len); + ok(len == 0, "expected 0 got %x\n", len);
p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -568,12 +565,10 @@ ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(!ret, "VerQueryValue(%s) succeeded\n", buf); ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || - GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, + GetLastError() == 0xdeadbeef /* NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0 || - len == 0xbeef, /* win9x */ - "expected 0 or 0xbeef, got %x\n", len); + ok(len == 0, "expected 0 or 0xbeef, got %x\n", len); }
HeapFree(GetProcessHeap(), 0, ver);
Modified: trunk/rostests/winetests/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/install.... ============================================================================== --- trunk/rostests/winetests/version/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/install.c [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -89,7 +89,7 @@ "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); break; default: - todo_wine ok(0, "Got unexpected return value %x\n", ret); + ok(0, "Got unexpected return value %x\n", ret); }
dwCur=MAX_PATH; @@ -111,7 +111,7 @@ "got %d(%s) expected MAX_PATH\n", dwOut, outBuf); break; default: - todo_wine ok(0, "Got unexpected return value %x\n", ret); + ok(0, "Got unexpected return value %x\n", ret); } } }
Modified: trunk/rostests/winetests/version/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/testlist... ============================================================================== --- trunk/rostests/winetests/version/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/testlist.c [iso-8859-1] Mon Dec 2 22:45:51 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_info(void); extern void func_install(void);
Modified: trunk/rostests/winetests/version/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/version.... ============================================================================== --- trunk/rostests/winetests/version/version.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/version/version.rc [iso-8859-1] Mon Dec 2 22:45:51 2013 @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "windef.h" -#include "winbase.h" #include "winver.h"
VS_VERSION_INFO VERSIONINFO
-
akhaldi＠svn.reactos.org