May 2022 - Wine-Devel - list.winehq.org

[PATCH v6 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) May 24, 2022

May 24, 2022

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v6: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

2 10

[PATCH] conhost: Set correct face name when the specified font is not available
by Hugh McMaster May 24, 2022

May 24, 2022

conhost.exe currently copies the user-specified face name from the LOGFONT structure. This results in an invalid face name when the specified font is not available. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 582badf43b5..5e8c3e15a4f 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -678,6 +678,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) struct font_info *font_info = &console->active->font; HFONT font, old_font; TEXTMETRICW tm; + WCHAR face_name[LF_FACESIZE]; CPINFO cpinfo; HDC dc; @@ -703,6 +704,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) old_font = SelectObject( dc, font ); GetTextMetricsW( dc, &tm ); + font_info->face_len = GetTextFaceW( dc, ARRAY_SIZE(face_name), face_name ) - 1; SelectObject( dc, old_font ); ReleaseDC( console->win, dc ); @@ -712,9 +714,8 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) font_info->weight = tm.tmWeight; free( font_info->face_name ); - font_info->face_len = wcslen( logfont->lfFaceName ); font_info->face_name = malloc( font_info->face_len * sizeof(WCHAR) ); - memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); + memcpy( font_info->face_name, face_name, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) -- 2.36.1

2 1

[PATCH v2 1/5] mshtml: Implement HTMLStorage_getItem().
by Hans Leidekker May 24, 2022

May 24, 2022

v2: Fix test failure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlstorage.c | 245 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 243 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 95f7ae5cd16..fe1d6a21b88 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "shlobj.h" #include "wine/debug.h" @@ -35,6 +36,7 @@ typedef struct { DispatchEx dispex; IHTMLStorage IHTMLStorage_iface; LONG ref; + HTMLInnerWindow *window; } HTMLStorage; static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) @@ -121,6 +123,151 @@ static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } +static BOOL create_path(const WCHAR *path) +{ + BOOL ret = TRUE; + WCHAR *new_path; + int len; + + new_path = malloc((wcslen(path) + 1) * sizeof(WCHAR)); + if(!new_path) + return FALSE; + wcscpy(new_path, path); + + while((len = wcslen(new_path)) && new_path[len - 1] == '\\') + new_path[len - 1] = 0; + + while(!CreateDirectoryW(new_path, NULL)) { + WCHAR *slash; + DWORD error = GetLastError(); + if(error == ERROR_ALREADY_EXISTS) break; + if(error != ERROR_PATH_NOT_FOUND) { + ret = FALSE; + break; + } + slash = wcsrchr(new_path, '\\'); + if(!slash) { + ret = FALSE; + break; + } + len = slash - new_path; + new_path[len] = 0; + if(!create_path(new_path)) { + ret = FALSE; + break; + } + new_path[len] = '\\'; + } + free(new_path); + return ret; +} + +static WCHAR *build_filename(const WCHAR *hostname) +{ + static const WCHAR store[] = L"\\Microsoft\\Internet Explorer\\DOMStore\\"; + WCHAR path[MAX_PATH], *ret; + int len; + + if(!SHGetSpecialFolderPathW(NULL, path, CSIDL_LOCAL_APPDATA, TRUE)) { + ERR("Can't get folder path %lu\n", GetLastError()); + return NULL; + } + + len = wcslen(path); + if(len + ARRAY_SIZE(store) > ARRAY_SIZE(path)) { + ERR("Path too long\n"); + return NULL; + } + memcpy(path + len, store, sizeof(store)); + + len += ARRAY_SIZE(store); + ret = malloc((len + wcslen(hostname) + ARRAY_SIZE(L".xml")) * sizeof(WCHAR)); + if(!ret) + return NULL; + + wcscpy(ret, path); + wcscat(ret, hostname); + wcscat(ret, L".xml"); + return ret; +} + +struct storage { + WCHAR *filename; + IXMLDOMDocument *doc; +}; + +static void close_storage(struct storage *storage) +{ + free(storage->filename); + if(storage->doc) + IXMLDOMDocument_Release(storage->doc); + free(storage); +} + +static HRESULT open_storage(const WCHAR *hostname, struct storage **ret) +{ + struct storage *storage; + HRESULT hres = E_OUTOFMEMORY; + VARIANT var; + VARIANT_BOOL success; + WCHAR *ptr; + + storage = calloc(1, sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + storage->filename = build_filename(hostname); + if(!storage->filename) + goto done; + + *(ptr = wcsrchr(storage->filename, '\\')) = 0; + if(!create_path(storage->filename)) { + hres = E_FAIL; + goto done; + } + *ptr = '\\'; + + if(GetFileAttributesW(storage->filename) == INVALID_FILE_ATTRIBUTES) { + DWORD count; + HANDLE file = CreateFileW(storage->filename, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); + if(file == INVALID_HANDLE_VALUE) { + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if(!WriteFile(file, "<root/>", sizeof("<root/>") - 1, &count, NULL)) { + CloseHandle(file); + hres = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + CloseHandle(file); + } + + hres = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&storage->doc); + if(hres != S_OK) + goto done; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(storage->filename); + if(!V_BSTR(&var)) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMDocument_load(storage->doc, var, &success); + if(hres == S_FALSE || success == VARIANT_FALSE) + hres = E_FAIL; + + SysFreeString(V_BSTR(&var)); + +done: + if(hres != S_OK) + close_storage(storage); + else + *ret = storage; + + return hres; +} + static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); @@ -142,14 +289,101 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) return E_NOTIMPL; } -static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +static BSTR build_query(const WCHAR *key) +{ + static const WCHAR fmt[] = L"item[@name='%s']"; + const WCHAR *str = key ? key : L""; + UINT len = ARRAY_SIZE(fmt) + wcslen(str); + BSTR ret = SysAllocStringLen(NULL, len); + + if(ret) swprintf(ret, len, fmt, str); + return ret; +} + +static HRESULT get_root_node(IXMLDOMDocument *doc, IXMLDOMNode **root) +{ + HRESULT hres; + BSTR str; + + str = SysAllocString(L"root"); + if(!str) + return E_OUTOFMEMORY; + + hres = IXMLDOMDocument_selectSingleNode(doc, str, root); + SysFreeString(str); + return hres; +} + +static HRESULT get_item(BSTR hostname, BSTR key, VARIANT *value) +{ + struct storage *storage; + BSTR query = NULL; + IXMLDOMNode *root = NULL, *node = NULL; + IXMLDOMElement *elem = NULL; + HRESULT hres; + + hres = open_storage(hostname, &storage); + if(hres != S_OK) + return hres; + + hres = get_root_node(storage->doc, &root); + if(hres != S_OK) + goto done; + + query = build_query(key); + if(!query) { + hres = E_OUTOFMEMORY; + goto done; + } + + hres = IXMLDOMNode_selectSingleNode(root, query, &node); + if(hres == S_OK) { + hres = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); + if(hres != S_OK) + goto done; + + hres = IXMLDOMElement_getAttribute(elem, (BSTR)L"value", value); + }else { + V_VT(value) = VT_NULL; + hres = S_OK; + } + +done: + SysFreeString(query); + if(root) + IXMLDOMNode_Release(root); + if(node) + IXMLDOMNode_Release(node); + if(elem) + IXMLDOMElement_Release(elem); + close_storage(storage); + return hres; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *value) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + BSTR hostname; + HRESULT hres; - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), value); - V_VT(p) = VT_NULL; - return S_OK; + if(!value) + return E_POINTER; + + if(!This->window) { + FIXME("session storage not supported\n"); + V_VT(value) = VT_NULL; + return S_OK; + } + + hres = IUri_GetHost(This->window->base.outer_window->uri, &hostname); + if(hres != S_OK) + return hres; + + hres = get_item(hostname, bstrKey, value); + SysFreeString(hostname); + return hres; } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) @@ -201,7 +435,7 @@ static dispex_static_data_t HTMLStorage_dispex = { HTMLStorage_iface_tids }; -HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) +HRESULT create_html_storage(compat_mode_t compat_mode, HTMLInnerWindow *window, IHTMLStorage **p) { HTMLStorage *storage; @@ -211,6 +445,7 @@ HRESULT create_html_storage(compat_mode_t compat_mode, IHTMLStorage **p) storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; storage->ref = 1; + storage->window = window; init_dispatch(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex, compat_mode); *p = &storage->IHTMLStorage_iface; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ecd530db7e2..57388ae64a2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2143,7 +2143,7 @@ static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLS HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->session_storage); + NULL, &This->inner_window->session_storage); if(FAILED(hres)) return hres; } @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLSto HRESULT hres; hres = create_html_storage(dispex_compat_mode(&This->inner_window->event_target.dispex), - &This->inner_window->local_storage); + This->inner_window, &This->inner_window->local_storage); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a94f1be1969..0fed06b8aae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -941,7 +941,7 @@ HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**) DE HRESULT create_dom_implementation(HTMLDocumentNode*,IHTMLDOMImplementation**) DECLSPEC_HIDDEN; void detach_dom_implementation(IHTMLDOMImplementation*) DECLSPEC_HIDDEN; -HRESULT create_html_storage(compat_mode_t,IHTMLStorage**) DECLSPEC_HIDDEN; +HRESULT create_html_storage(compat_mode_t,HTMLInnerWindow*,IHTMLStorage**) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_OleCmd_Init(HTMLDocument*) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH 1/2] dwmapi: Fill some values of DWM_TIMING_INFO from DwmGetCompositionTimingInfo().
by Jactry Zeng May 24, 2022

May 24, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/dwmapi/dwmapi_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6bb086a87d1..1ae15c9de72 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -228,6 +228,11 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) memset(info, 0, info->cbSize); info->cbSize = sizeof(DWM_TIMING_INFO); + info->rateRefresh.uiDenominator = 1; + info->rateRefresh.uiNumerator = 64; + info->rateCompose.uiDenominator = 1; + info->rateCompose.uiNumerator = 64; + info->qpcRefreshPeriod = 156250; return S_OK; } -- 2.35.1

2 2

[PATCH v5 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) May 24, 2022

May 24, 2022

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v5: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

4 13

[PATCH 0/2] MR123: Fix interaction between RtlWow64SetThreadContext and NtSetThreadContext
by Jinoh Kang (＠iamahuman) May 24, 2022

May 24, 2022

If a Wow64 process is in emulation mode (e.g. CS points to 32-bit compat segment on x86-64), the Wow64 register context is synonymous to the native register context. The client should indicate this condition by omitting the Wow64 context when issuing a select request. Then, the wineserver automatically redirects Wow64 context writes to the native context. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/123

2 2

[PATCH 0/5] MR101: wined3d: Various patches.
by Matteo Bruni (＠Mystral) May 24, 2022

May 24, 2022

Next 5 patches in my queue, mostly fixing issues with older GPUs / drivers. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/101

5 8

[PATCH 1/2] vbscript: Handle null arguments in MonthName().
by Nikolay Sivov May 24, 2022

May 24, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 3 +++ dlls/vbscript/tests/api.vbs | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 80348a5288f..876a41a14b2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2897,6 +2897,9 @@ static HRESULT Global_MonthName(BuiltinDisp *This, VARIANT *args, unsigned args_ assert(args_cnt == 1 || args_cnt == 2); + if(V_VT(args) == VT_NULL || (args_cnt == 2 && V_VT(args+1) == VT_NULL)) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(args, &month); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 617589053c6..758013c93ef 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2148,4 +2148,21 @@ call testWeekday(DateSerial(2000, 1, 1), vbFriday, 2) call testWeekday(DateSerial(2000, 1, 1), vbSaturday, 1) call testWeekdayError() +sub testMonthNameError() + on error resume next + call Err.clear() + call MonthName(null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call MonthName(1, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call MonthName(null, null) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call MonthName("a", null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testMonthNameError() + Call reportSuccess() -- 2.35.1

2 3

[PATCH 0/2] MR121: gdi32: A couple of EMF DC fixes.
by Huw Davies (＠huw) May 24, 2022

May 24, 2022

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

3 3

[PATCH 0/6] MR118: windows.media.speech: IAsyncAction implementation.
by Bernhard Kölbl May 24, 2022

May 24, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/118

2 9