[1/2] oleaut32/tests: Avoid using a reserved keyword '_restrict' in an idl.
Dmitry Timoshkov
dmitry at baikal.ru
Fri Sep 4 02:24:28 CDT 2015
This fixes 1 of 3 tmarshal.idl compilation errors with midl.exe from PSDK.
Another 2 errors are 'optional' attribute for an 'int' argument and negative
dispatch id (DISPID) value, I don't know how to fix them properly since both
of them are intentionally used for testing.
---
dlls/oleaut32/tests/tmarshal.c | 4 ++--
dlls/oleaut32/tests/tmarshal.idl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index a2fa6e8..e8d5e64 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -825,7 +825,7 @@ static HRESULT WINAPI Widget_put_prop_req_arg(
return S_OK;
}
-static HRESULT WINAPI Widget__restrict(IWidget* iface, INT *i)
+static HRESULT WINAPI Widget_pos_restrict(IWidget* iface, INT *i)
{
trace("restrict\n");
*i = DISPID_TM_RESTRICTED;
@@ -875,7 +875,7 @@ static const struct IWidgetVtbl Widget_VTable =
Widget_ByRefUInt,
Widget_put_prop_opt_arg,
Widget_put_prop_req_arg,
- Widget__restrict,
+ Widget_pos_restrict,
Widget_neg_restrict
};
diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl
index bf90384..33a4df9 100644
--- a/dlls/oleaut32/tests/tmarshal.idl
+++ b/dlls/oleaut32/tests/tmarshal.idl
@@ -175,7 +175,7 @@ library TestTypelib
HRESULT prop_req_arg([in] INT req, [in] INT i);
[id(DISPID_TM_RESTRICTED), restricted]
- HRESULT _restrict([out, retval] INT *i);
+ HRESULT pos_restrict([out, retval] INT *i);
[id(DISPID_TM_NEG_RESTRICTED), restricted]
HRESULT neg_restrict([out, retval] INT *i);
--
2.4.8
More information about the wine-patches
mailing list