This is not about embedded nulls, this is about possibly not null terminated strings. If there is zero somewhere in the buffer then we should only convert string up to that zero; if there isn't any nulls, then we have to convert full string and null-terminate string. This can be coded prettier, though:<br>
<br>if (l>0)<br>{<br> void *eos = memchr(str, 0, l);<br> if (eos)<br> l = (LONG)(eos-str);<br>}<br><br>and always zero-pad afterwards<br><br><div><span class="gmail_quote">2008/3/11, Alexandre Julliard <<a href="mailto:julliard@winehq.org">julliard@winehq.org</a>>:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Hin-Tak Leung <<a href="mailto:htl10@users.sourceforge.net">htl10@users.sourceforge.net</a>> writes:<br> <br> > This is the fix to bug 8246 to get HtmlHelpW to work correctly.<br> > It was first worked on by Andrey Turkin and updated later by me.<br>
<br> <br>Please add a proper log entry describing the change.<br> <br> > -static inline LPWSTR strdupAtoW(LPCSTR str)<br> > +static inline LPWSTR strdupnAtoW(LPCSTR str, LONG l)<br> > {<br> > LPWSTR ret;<br>
> DWORD len;<br> > + BOOL zero_pad;<br> ><br> > if(!str)<br> > return NULL;<br> ><br> > - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);<br> > + if (l>0)<br>
> + {<br> > + LONG i;<br> > + zero_pad = TRUE;<br> > + for (i=0;i<l;i++)<br> > + {<br> > + if (!str[i])<br> > + {<br> > + zero_pad = FALSE;<br>
> + l = i+1;<br> > + break;<br> > + }<br> > + }<br> > + } else {<br> > + zero_pad = FALSE;<br> > + }<br> > +<br> > + len = MultiByteToWideChar(CP_ACP, 0, str, l, NULL, 0);<br>
> + if (zero_pad)<br> > + len++;<br> <br> This is ugly and unnecessary, MultiByteToWideChar handles embedded nulls<br> just fine.<br> <br><br> --<br> Alexandre Julliard<br> <a href="mailto:julliard@winehq.org">julliard@winehq.org</a><br>
<br> <br> </blockquote></div><br>