[PATCH v5 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.

--
  v5: mshtml: Fix misuse of IWinInetHttpInfo_QueryInfo.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8228

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

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

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

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 6b5eff15105..d487d2fae4e 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,13 +831,18 @@ static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info)
         return;
     }
 
-    ptr = wcschr(buf, '\r');
+    wbuf = strdupAtoW(buf);
+    free(buf);
+    if (!wbuf)
+        return;
+
+    ptr = wcschr(wbuf, '\r');
     if(ptr && ptr[1] == '\n') {
         ptr += 2;
         process_response_headers(This, ptr);
     }
 
-    free(buf);
+    free(wbuf);
 }
 
 HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBindCtx *bctx)
-- 
GitLab

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

[PATCH v5 0/1] MR8228: mshtml: Fix misuse of IWinInetHttpInfo_QueryInfo. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8228