diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-04-13 14:17:19 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-04-13 14:17:19 +0900 |
commit | a56e30c8d33048216567753d9d3fefc2152af8ac (patch) | |
tree | 7e5d979695fc4a431740982eb1cfecc2898b23a5 /tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp | |
parent | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (diff) | |
download | coreclr-a56e30c8d33048216567753d9d3fefc2152af8ac.tar.gz coreclr-a56e30c8d33048216567753d9d3fefc2152af8ac.tar.bz2 coreclr-a56e30c8d33048216567753d9d3fefc2152af8ac.zip |
Imported Upstream version 2.0.0.11353upstream/2.0.0.11353
Diffstat (limited to 'tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp')
-rwxr-xr-x | tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp index 3f72126acc..b440c52ef5 100755 --- a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp +++ b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp @@ -143,8 +143,11 @@ extern "C" DLL_EXPORT BOOL __cdecl RPinvoke_DelMarshal_InOut(Test_DelMarshal_InO return TRUE; } +// +// PInvokeDef.cs explicitly declares that RPinvoke_DelMarshalPointer_Out uses STDCALL +// typedef LPCSTR (__cdecl * Test_DelMarshalPointer_Out)(/*[out]*/ LPSTR * s); -extern "C" DLL_EXPORT BOOL WINAPI RPinvoke_DelMarshalPointer_Out(Test_DelMarshalPointer_Out d) +extern "C" DLL_EXPORT BOOL __stdcall RPinvoke_DelMarshalPointer_Out(Test_DelMarshalPointer_Out d) { LPSTR str; LPCSTR ret = d(&str); @@ -173,8 +176,11 @@ extern "C" DLL_EXPORT BOOL WINAPI RPinvoke_DelMarshalPointer_Out(Test_DelMarshal return TRUE; } +// +// PInvokeDef.cs explicitly declares that ReverseP_MarshalStrB_InOut uses STDCALL +// typedef LPSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/*[in,out]*/ LPSTR s); -extern "C" DLL_EXPORT BOOL WINAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCSTR s) +extern "C" DLL_EXPORT BOOL __stdcall ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCSTR s) { LPSTR ret = d((LPSTR)s); LPCSTR expected = "Return"; @@ -197,4 +203,4 @@ extern "C" DLL_EXPORT BOOL WINAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalSt return FALSE; } return TRUE; -}
\ No newline at end of file +} |