Alexandre Julliard : riched20/tests: Fix test on 64-bit.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jul 22 14:12:22 CDT 2014


Module: wine
Branch: master
Commit: 35dd553038f69a46b553c16e193ea00e7529ed11
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=35dd553038f69a46b553c16e193ea00e7529ed11

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jul 22 20:38:33 2014 +0200

riched20/tests: Fix test on 64-bit.

---

 dlls/riched20/tests/richole.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 98ac50d..571e5cd 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -418,10 +418,7 @@ static void test_ITextSelection_GetText(void)
   static const WCHAR bufW4[] = {'T', 'e', 's', 't', 'S', 'o', 'm',
                                 'e', 'T', 'e', 'x', 't', '\r', 0};
   static const WCHAR bufW5[] = {'\r', 0};
-  SYSTEM_INFO sysinfo;
-  int is64bit;
-  GetSystemInfo(&sysinfo);
-  is64bit = (sysinfo.wProcessorArchitecture & PROCESSOR_ARCHITECTURE_AMD64);
+  BOOL is64bit = sizeof(void *) > sizeof(int);
 
   create_interfaces(&w, &reOle, &txtDoc, &txtSel);
   SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1);
@@ -446,9 +443,7 @@ static void test_ITextSelection_GetText(void)
   ok(hres == S_OK, "ITextSelection_GetText\n");
   ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr));
 
-  if(is64bit)
-    win_skip("native 64bit riched20 can't support a NULL parameter\n");
-  else
+  if (!is64bit)
     {
       hres = ITextSelection_GetText(txtSel, NULL);
       ok(hres == E_INVALIDARG, "ITextSelection_GetText\n");




More information about the wine-cvs mailing list