Aric Stewart aric@codeweavers.com writes:
@@ -68,10 +68,16 @@ typedef struct _marshal_state {
/* used in the olerelay code to avoid having the L"" stuff added by debugstr_w */ static char *relaystr(WCHAR *in) {
- char *tmp = (char *)debugstr_w(in);
- tmp += 2;
- tmp[strlen(tmp)-1] = '\0';
- return tmp;
- static char szNull[] = "<NULL>";
- if (in)
- {
char *tmp = (char *)debugstr_w(in);
tmp += 2;
tmp[strlen(tmp)-1] = '\0';
return tmp;
- }
- else
return szNull;
}
This should never happen. Places that can get a null pointer should use the standard debugstr_w.