@@ -100,24 +100,24 @@ extern "C" DLL_EXPORT LPWSTR MarshalPointer_Out(/*[out]*/ LPWSTR *s)
100
100
return ReturnString ();
101
101
}
102
102
103
- typedef LPTSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/* [in,out]*/ LPTSTR s);
104
- extern " C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut (Test_Del_MarshalStrB_InOut d, /* [in]*/ LPCTSTR s)
103
+ typedef LPWSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/* [in,out]*/ LPWSTR s);
104
+ extern " C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut (Test_Del_MarshalStrB_InOut d, /* [in]*/ LPCWSTR s)
105
105
{
106
- LPTSTR ret = d ((LPTSTR )s);
107
- LPTSTR expectedret =(LPTSTR )W (" Native" );
108
- LPTSTR expectedstr = (LPTSTR )W (" m" );
106
+ LPWSTR ret = d ((LPWSTR )s);
107
+ LPWSTR expectedret =(LPWSTR )W (" Native" );
108
+ LPWSTR expectedstr = (LPWSTR )W (" m" );
109
109
110
- size_t lenret = _tcslen (ret);
111
- size_t lenexpectedret = _tcslen (expectedret);
112
- if ((lenret != lenexpectedret)||(_tcsncmp (ret,expectedret,lenret)!=0 ))
110
+ size_t lenret = wcslen (ret);
111
+ size_t lenexpectedret = wcslen (expectedret);
112
+ if ((lenret != lenexpectedret)||(wcsncmp (ret,expectedret,lenret)!=0 ))
113
113
{
114
114
printf (" Error in ReverseP_MarshalStrB_InOut, Returned value didn't match\n " );
115
115
return FALSE ;
116
116
}
117
117
118
- size_t lenstr = _tcslen (s);
119
- size_t lenexpectedstr = _tcslen (expectedstr);
120
- if ((lenstr != lenexpectedstr)||(_tcsncmp (s,expectedstr,lenstr)!=0 ))
118
+ size_t lenstr = wcslen (s);
119
+ size_t lenexpectedstr = wcslen (expectedstr);
120
+ if ((lenstr != lenexpectedstr)||(wcsncmp (s,expectedstr,lenstr)!=0 ))
121
121
{
122
122
printf (" Error in ReverseP_MarshalStrB_InOut, Changed value didn't reflect on native side.\n " );
123
123
return FALSE ;
@@ -126,25 +126,25 @@ extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut(Test_Del_Marshal
126
126
return TRUE ;
127
127
}
128
128
129
- typedef LPTSTR (__cdecl * Test_Del_MarshalStrB_Out)(/* [out]*/ LPTSTR * s);
129
+ typedef LPWSTR (__cdecl * Test_Del_MarshalStrB_Out)(/* [out]*/ LPWSTR * s);
130
130
extern " C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_Out (Test_Del_MarshalStrB_Out d)
131
131
{
132
- LPTSTR s;
133
- LPTSTR ret = d ((LPTSTR *)&s);
134
- LPTSTR expectedret = (LPTSTR )W (" Native" );
135
- LPTSTR expectedstr = (LPTSTR )W (" Managed" );
136
-
137
- size_t lenret = _tcslen (ret);
138
- size_t lenexpectedret = _tcslen (expectedret);
139
- if ((lenret != lenexpectedret)||(_tcsncmp (ret,expectedret,lenret)!=0 ))
132
+ LPWSTR s;
133
+ LPWSTR ret = d ((LPWSTR *)&s);
134
+ LPWSTR expectedret = (LPWSTR )W (" Native" );
135
+ LPWSTR expectedstr = (LPWSTR )W (" Managed" );
136
+
137
+ size_t lenret = wcslen (ret);
138
+ size_t lenexpectedret = wcslen (expectedret);
139
+ if ((lenret != lenexpectedret)||(wcsncmp (ret,expectedret,lenret)!=0 ))
140
140
{
141
141
printf (" Error in ReverseP_MarshalStrB_Out, Returned value didn't match\n " );
142
142
return FALSE ;
143
143
}
144
144
145
- size_t lenstr = _tcslen (s);
146
- size_t lenexpectedstr = _tcslen (expectedstr);
147
- if ((lenstr != lenexpectedstr)||(_tcsncmp (s,expectedstr,lenstr)!=0 ))
145
+ size_t lenstr = wcslen (s);
146
+ size_t lenexpectedstr = wcslen (expectedstr);
147
+ if ((lenstr != lenexpectedstr)||(wcsncmp (s,expectedstr,lenstr)!=0 ))
148
148
{
149
149
printf (" Error in ReverseP_MarshalStrB_Out, Changed value didn't reflect on native side.\n " );
150
150
return FALSE ;
0 commit comments