[PATCH v4 0/1] MR8228: mshtml: Fix misuse of IWinInetHttpInfo_QueryInfo.

[Yuxuan Shui (＠yshui)]

IWinInetHttpInfo_QueryInfo returns a multibyte string, not a wide string. We
were also wrongly expecting it to have a NUL terminator.

* * *

this one doesn't feel good. IWinInetHttpInfo_QueryInfo calls HttpInfo_QueryInfo (urlmon), which calls HttpQueryInfoA (wininet), so it returns char*. but inside, HttpQueryInfoA is calling HttpQueryInfoW and does charset conversion. so we are converting the string to multibyte and back.

maybe there's an API that returns wchar* i don't know about.

--
  v4: mshtml: Fix misuse of IWinInetHttpInfo_QueryInfo.

https://gitlab.winehq.org/wine/wine/-/merge_requests/8228

[PATCH v4 1/1] mshtml: Fix misuse of IWinInetHttpInfo_QueryInfo.

[Yuxuan Shui]

From: Yuxuan Shui

IWinInetHttpInfo_QueryInfo returns a multibyte string, not a wide string.
---
 dlls/mshtml/navigate.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 6b5eff15105..694a3bddbb0 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -814,7 +814,8 @@ static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info)
 {
     const WCHAR *ptr;
     DWORD len = 0;
-    WCHAR *buf;
+    WCHAR *wbuf;
+    char *buf;

IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, NULL, &len, NULL, NULL);
     if(!len)
@@ -830,12 +831,14 @@ static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info)
         return;
     }

-    ptr = wcschr(buf, '\r');
+    wbuf = strdupAtoW(buf);
+    ptr = wcschr(wbuf, '\r');
     if(ptr && ptr[1] == '\n') {
         ptr += 2;
         process_response_headers(This, ptr);
     }

+    free(wbuf);
     free(buf);
 }

[Jacek Caban (＠jacek)]

Looks mostly good, but please handle memory allocation failure.