modules/rostests/winetests/riched20/richole.c | 10 ++++++++++
 1 file changed, 10 insertions(+)diff --git a/modules/rostests/winetests/riched20/richole.c b/modules/rostests/winetests/riched20/richole.c
index 492bdc3fa9..b3163cbc26 100644
--- a/modules/rostests/winetests/riched20/richole.c
+++ b/modules/rostests/winetests/riched20/richole.c
@@ -113,6 +113,7 @@ static ULONG get_refcount(IUnknown *iface)
   return IUnknown_Release(iface);
 }
 
+#if 0 /*avoid CORE-16799*/
 #define CHECK_TYPEINFO(disp,expected_riid) _check_typeinfo((IDispatch *)disp, expected_riid, __LINE__)
 static void _check_typeinfo(IDispatch* disp, REFIID expected_riid, int line)
 {
@@ -137,12 +138,15 @@ static void _check_typeinfo(IDispatch* disp, REFIID expected_riid, int line)
     ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr);
     ITypeInfo_Release(typeinfo);
 }
+#endif
 
 static void test_Interfaces(void)
 {
   IRichEditOle *reOle = NULL, *reOle1 = NULL;
   ITextDocument *txtDoc = NULL;
+#if 0 /*avoid CORE-16799*/
   ITextDocument2Old *txtDoc2Old = NULL;
+#endif
   ITextSelection *txtSel = NULL, *txtSel2;
   IUnknown *punk;
   HRESULT hres;
@@ -170,7 +174,9 @@ static void test_Interfaces(void)
                                  (void **) &txtDoc);
   ok(hres == S_OK, "IRichEditOle_QueryInterface\n");
   ok(txtDoc != NULL, "IRichEditOle_QueryInterface\n");
+#if 0 /*avoid CORE-16799*/
   CHECK_TYPEINFO(txtDoc, &IID_ITextDocument);
+#endif
 
   hres = ITextDocument_GetSelection(txtDoc, NULL);
   ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%x\n", hres);
@@ -222,6 +228,7 @@ static void test_Interfaces(void)
   hres = IRichEditOle_QueryInterface(reOle, &IID_IOleInPlaceSite, (void **) &punk);
   ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface\n");
 
+#if 0 /*avoid CORE-16799*/
   hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument2Old, (void **)&txtDoc2Old);
   ok(hres == S_OK, "IRichEditOle_QueryInterface\n");
   ok(txtDoc2Old != NULL, "IRichEditOle_QueryInterface\n");
@@ -231,6 +238,7 @@ static void test_Interfaces(void)
   CHECK_TYPEINFO(txtDoc2Old, &IID_ITextDocument);
 
   ITextDocument2Old_Release(txtDoc2Old);
+#endif
 
   ITextDocument_Release(txtDoc);
   IRichEditOle_Release(reOle);
@@ -245,6 +253,7 @@ static void test_Interfaces(void)
 
   ITextSelection_Release(txtSel);
 
+#if 0 /*avoid CORE-16799*/
   w = new_richedit(NULL);
   res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle);
   ok(res, "SendMessage\n");
@@ -257,6 +266,7 @@ static void test_Interfaces(void)
   ITextDocument2Old_Release(txtDoc2Old);
   IRichEditOle_Release(reOle);
   DestroyWindow(w);
+#endif
 }
 
 static void test_ITextDocument_Open(void)