[ros-diffs] [akhaldi] 74856: [VERSION_WINETEST] Sync with Wine Staging 2.9. CORE-13362

Author: akhaldi
Date: Sun Jun  4 01:47:23 2017
New Revision: 74856

URL: http://svn.reactos.org/svn/reactos?rev=74856&view=rev
Log:
[VERSION_WINETEST] Sync with Wine Staging 2.9. CORE-13362

Modified:
    trunk/rostests/winetests/version/info.c

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] Sun Jun  4 01:47:23 2017
@@ -25,6 +25,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
+#include "winuser.h"
 #include "winver.h"
 #include "verrsrc.h"
 #include "wine/test.h"
@@ -772,6 +773,17 @@
     };
     char desc[MAX_PATH];

+    mod = GetModuleHandleA("kernel32.dll");
+    assert(mod);
+
+    if (!FindResourceExA(mod, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, lang) &&
+        !FindResourceExA(mod, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO,
+                         MAKELANGID(PRIMARYLANGID(lang),SUBLANG_NEUTRAL)))
+    {
+        skip("Translation is not available\n");
+        return;
+    }
+
     size = GetFileVersionInfoSizeW(kernel32W, NULL);
     ok(size, "GetFileVersionInfoSize(kernel32) error %u\n", GetLastError());

@@ -787,10 +799,8 @@
     ok(size == 4, "VerQueryValue returned %u, expected 4\n", size);

/* test default version resource */
-    todo_wine_if(lang != english)
     ok(LOWORD(translation) == lang, "got %u, expected lang is %u\n",
        LOWORD(translation), lang);
-    todo_wine
     ok(HIWORD(translation) == unicode, "got %u, expected codepage is %u\n",
        HIWORD(translation), unicode);

@@ -825,14 +835,12 @@
         translation = *(UINT *)p;

/* test MUI version resource */
-        todo_wine_if((test_flags[i] & FILE_VER_GET_LOCALISED) && lang != english)
         if (test_flags[i] & FILE_VER_GET_LOCALISED)
             ok(LOWORD(translation) == lang, "[%u] got %u, expected lang is %u\n",
                i, LOWORD(translation), lang);
         else
             ok(LOWORD(translation) == english, "[%u] got %u, expected lang is %u\n",
                i, LOWORD(translation), english);
-        todo_wine
         ok(HIWORD(translation) == unicode, "[%u] got %u, expected codepage is %u\n",
            i, HIWORD(translation), unicode);