Alexandre Julliard : oleaut32/tests: Fix the tmarshal test on 64-bit.

Alexandre Julliard julliard at winehq.org
Thu May 21 09:35:50 CDT 2009


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed May 20 21:17:05 2009 +0200

oleaut32/tests: Fix the tmarshal test on 64-bit.

---

 dlls/oleaut32/tests/tmarshal.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index b8cc57d..2d23b48 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -1356,7 +1356,7 @@ static void test_DispCallFunc(void)
     V_VT(&varref) = VT_ERROR;
     V_ERROR(&varref) = DISP_E_PARAMNOTFOUND;
     VariantInit(&varresult);
-    hr = DispCallFunc(pWidget, 36, CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult);
+    hr = DispCallFunc(pWidget, 9*sizeof(void*), CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult);
     ok_ole_success(hr, DispCallFunc);
     VariantClear(&varresult);
     VariantClear(&vararg[1]);
@@ -1405,7 +1405,8 @@ START_TEST(tmarshal)
     test_DispCallFunc();
     test_StaticWidget();
 
-    hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, 1);
+    hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL,
+                           sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32);
     ok_ole_success(hr, UnRegisterTypeLib);
 
     CoUninitialize();




More information about the wine-cvs mailing list