- wine-devel - winehq.org

[PATCH v11 01/10] mshtml: Stringify attribute values in setAttribute using string hints in IE10+.
by Gabriel Ivăncescu 01 Dec '21

01 Dec '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmlelem.c | 36 ++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 - 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 4605fda..9f56a56 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1043,7 +1043,7 @@ static HRESULT get_builtin_id(DispatchEx *This, BSTR name, DWORD grfdex, DISPID return DISP_E_UNKNOWNNAME; } -static HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) +HRESULT change_type(VARIANT *dst, VARIANT *src, VARTYPE vt, IServiceProvider *caller) { V_VT(dst) = VT_EMPTY; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d54f729..3f7c60b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6585,8 +6585,42 @@ static IHTMLEventObj *HTMLElement_set_current_event(DispatchEx *dispex, IHTMLEve return default_set_current_event(This->node.doc->window, event); } +static HRESULT IHTMLElement6_setAttribute_hook(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + VARIANT args[2]; + HRESULT hres; + DISPPARAMS new_dp = { args, NULL, 2, 0 }; + + if(!(flags & DISPATCH_METHOD) || dp->cArgs < 2 || dp->cNamedArgs) + return S_FALSE; + + switch(V_VT(&dp->rgvarg[dp->cArgs - 2])) { + case VT_EMPTY: + case VT_BSTR: + case VT_NULL: + return S_FALSE; + default: + break; + } + + hres = change_type(&args[0], &dp->rgvarg[dp->cArgs - 2], VT_BSTR, caller); + if(FAILED(hres)) + return hres; + args[1] = dp->rgvarg[dp->cArgs - 1]; + + hres = IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, + lcid, flags, &new_dp, res, ei, caller); + VariantClear(&args[0]); + return hres; +} + void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { + static const dispex_hook_t elem6_ie10_hooks[] = { + {DISPID_IHTMLELEMENT6_IE9_SETATTRIBUTE, IHTMLElement6_setAttribute_hook}, + {DISPID_UNKNOWN} + }; static const dispex_hook_t elem2_ie11_hooks[] = { {DISPID_IHTMLELEMENT2_DOSCROLL, NULL}, {DISPID_IHTMLELEMENT2_READYSTATE, NULL}, @@ -6601,7 +6635,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IElementSelector_tid, NULL); if(mode >= COMPAT_MODE_IE9) { - dispex_info_add_interface(info, IHTMLElement6_tid, NULL); + dispex_info_add_interface(info, IHTMLElement6_tid, mode >= COMPAT_MODE_IE10 ? elem6_ie10_hooks : NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5cf53bb..6978ed7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -384,6 +384,7 @@ extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTr void init_dispatch(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT change_type(VARIANT*,VARIANT*,VARTYPE,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT dispex_get_dprop_ref(DispatchEx*,const WCHAR*,BOOL,VARIANT**) DECLSPEC_HIDDEN; HRESULT get_dispids(tid_t,DWORD*,DISPID**) DECLSPEC_HIDDEN; HRESULT remove_attribute(DispatchEx*,DISPID,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 08fcde4..c2fd8bd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1136,7 +1136,6 @@ sync_test("elem_attr", function() { ok(r === (v < 8 ? arr : (v < 9 ? "arrval" : null)), "testattr with custom valueOf = " + r); elem.setAttribute("testattr", arr); r = elem.getAttribute("testattr"); - todo_wine_if(v >= 10). ok(r === (v < 8 ? arr : (v < 10 ? "arrval" : "42")), "testattr after setAttribute with custom valueOf = " + r); ok(elem.testattr === arr, "elem.testattr after setAttribute with custom valueOf = " + elem.testattr); r = elem.removeAttribute("testattr"); -- 2.31.1

3 21

[PATCH v4 2/2] scrrun: Implement folder_CreateTextFile.
by Robert Wilhelm 01 Dec '21

01 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- Supersedes 220458. v4: tests: Use ReadFile to check contents and minor cleanups as recommended by Nikolay. --- dlls/scrrun/filesystem.c | 16 ++++++- dlls/scrrun/tests/filesystem.c | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 359d86bb8fd..7b0b2e110a6 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2518,9 +2518,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..91729bb047f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,86 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10], buff2W[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + DWORD r; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + str = SysAllocString(dirW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + SysFreeString(str); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); + ok(ret && r==2, "read %d, got %d, %d\n", r, ret, GetLastError()); + buffW[r/sizeof(WCHAR)] = 0; + + buff2W[0] = 0xfeff; + buff2W[1] = 0; + ok(!lstrcmpW(buff2W, buffW), "got %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(buff2W)); + CloseHandle(file); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2596,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read(); -- 2.31.1

2 1

[PATCH v4 1/2] scrrun: Extract code to new helper function build_path.
by Robert Wilhelm 01 Dec '21

01 Dec '21

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- Supersedes 220459. v4: Fix issues as pointed out by Nikolay: Leave EPOINTER check in original function and do not specify calling convention. --- dlls/scrrun/filesystem.c | 103 ++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 49 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 68ef1786af9..359d86bb8fd 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,6 +223,59 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) return SysAllocString(buffW); } +static HRESULT build_path( BSTR Path, BSTR Name, BSTR *Result) +{ + BSTR ret; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + ret[path_len] = 0; + lstrcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + lstrcpyW(ret, Path); + if (Path[path_len-1] != ':') + wcscat(ret, L"\\"); + lstrcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + lstrcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -3034,59 +3087,11 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, BSTR Name, BSTR *Result) { - BSTR ret; - TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); if (!Result) return E_POINTER; - if (Path && Name) - { - int path_len = SysStringLen(Path), name_len = SysStringLen(Name); - - /* if both parts have backslashes strip one from Path */ - if (Path[path_len-1] == '\\' && Name[0] == '\\') - { - path_len -= 1; - - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - ret[path_len] = 0; - lstrcatW(ret, Name); - } - } - else if (Path[path_len-1] != '\\' && Name[0] != '\\') - { - ret = SysAllocStringLen(NULL, path_len + name_len + 1); - if (ret) - { - lstrcpyW(ret, Path); - if (Path[path_len-1] != ':') - wcscat(ret, L"\\"); - lstrcatW(ret, Name); - } - } - else - { - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - lstrcatW(ret, Name); - } - } - } - else if (Path || Name) - ret = SysAllocString(Path ? Path : Name); - else - ret = SysAllocStringLen(NULL, 0); - - if (!ret) return E_OUTOFMEMORY; - *Result = ret; - - return S_OK; + return build_path(Path, Name, Result); } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) -- 2.31.1

2 1

[PATCH v2 1/6] wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage().
by Zebediah Figura 01 Dec '21

01 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..f0ef42065d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -930,6 +930,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g else layer_count = texture_gl->t.layer_count; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (layer = 0; layer < layer_count; ++layer) { target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count); -- 2.32.0

2 11

[PATCH v6] kernel32/tests: Add tests for SetCurrentConsoleFontEx
by Hugh McMaster 01 Dec '21

01 Dec '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 146 +++++++++++++++++++++++++++++++++- 1 file changed, 144 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..8c487497cef 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,11 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp; orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3652,158 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Save current console font information */ + cp = GetConsoleOutputCP(); + SetConsoleOutputCP(CP_UTF8); + + /* Try setting console font information for the current window size */ + /* Set general font parameters */ + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 0; + cfix.FontFamily = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"Lucida Console"); + + /* Test font height 16 */ + cfix.dwFontSize.Y = 16; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test font height 20 */ + cfix.dwFontSize.Y = 20; + lstrcpyW(cfix.FaceName, tmp.FaceName); + SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font height 12. We pass in 10x12. */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 12; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test invalid font height */ + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test with no font weight */ + cfix.dwFontSize.Y = 16; + cfix.FontWeight = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test with invalid font face name */ + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"MissingFont"); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.34.1

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.201.
by Georg Lehmann 01 Dec '21

01 Dec '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e5f8d1a46c6..7a9bac7e55e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.200" +VK_XML_VERSION = "1.2.201" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -119,9 +119,6 @@ UNSUPPORTED_EXTENSIONS = [ # Deprecated extensions "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", - - # Broken extensions - "VK_ARM_rasterization_order_attachment_access", # https://github.com/KhronosGroup/Vulkan-Docs/issues/1703 ] # Either internal extensions which aren't present on the win32 platform which -- 2.34.1

1 0

[PATCH] ntdll/tests: Fix iret to invalid selector test on x64.
by Paul Gofman 01 Dec '21

01 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a592ca9cf3c..0c66035568c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2833,8 +2833,8 @@ static const struct exception 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test iret to invalid selector */ - { { 0x6a, 0x00, 0x6a, 0x00, 0x6a, 0x00, 0xcf, 0x83, 0xc4, 0x18, 0xc3 }, - /* 15: pushq $0; pushq $0; pushq $0; iret; addl $24,%esp; ret */ + { { 0x6a, 0x00, 0x6a, 0x00, 0x6a, 0x00, 0xcf, 0x48, 0x83, 0xc4, 0x18, 0xc3 }, + /* 15: pushq $0; pushq $0; pushq $0; iret; addq $24,%rsp; ret */ 6, 1, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffffffffffff } }, /* 15 */ /* test loading an invalid selector */ -- 2.33.1

1 0

[PATCH vkd3d v8 1/4] vkd3d-shader/hlsl: Perform a copy propagation pass.
by Giovanni Mascellani 01 Dec '21

01 Dec '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v8: Address comments in https://source.winehq.org/patches/data/219953 libs/vkd3d-shader/hlsl.c | 21 ++- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 222 ++++++++++++++++++++++++++++++- 3 files changed, 238 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..f59e7403 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1097,6 +1097,20 @@ const char *debug_hlsl_writemask(unsigned int writemask) return vkd3d_dbg_sprintf(".%s", string); } +const char *debug_hlsl_swizzle(unsigned int swizzle, unsigned int count) +{ + static const char components[] = {'x', 'y', 'z', 'w'}; + char string[5]; + unsigned int i = 0; + + for (i = 0; i < count; ++i) + { + string[i] = components[(swizzle >> (2 * i)) % 4]; + } + string[count] = '\0'; + return vkd3d_dbg_sprintf(".%s", string); +} + static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) { struct hlsl_type *type = constant->node.data_type; @@ -1277,18 +1291,15 @@ static void dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hls unsigned int i; dump_src(buffer, &swizzle->val); - vkd3d_string_buffer_printf(buffer, "."); if (swizzle->val.node->data_type->dimy > 1) { + vkd3d_string_buffer_printf(buffer, "."); for (i = 0; i < swizzle->node.data_type->dimx; ++i) vkd3d_string_buffer_printf(buffer, "_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); } else { - static const char c[] = {'x', 'y', 'z', 'w'}; - - for (i = 0; i < swizzle->node.data_type->dimx; ++i) - vkd3d_string_buffer_printf(buffer, "%c", c[(swizzle->swizzle >> i * 2) & 0x3]); + vkd3d_string_buffer_printf(buffer, "%s", debug_hlsl_swizzle(swizzle->swizzle, swizzle->node.data_type->dimx)); } } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 365ef980..bca59b65 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -666,6 +666,7 @@ static inline struct hlsl_type *hlsl_get_numeric_type(const struct hlsl_ctx *ctx const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op); const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type); const char *debug_hlsl_writemask(unsigned int writemask); +const char *debug_hlsl_swizzle(unsigned int swizzle, unsigned int count); struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const struct hlsl_type *type); struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct hlsl_ctx *ctx, unsigned int modifiers); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 4a7e003f..4e1397f6 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -237,6 +237,221 @@ static void replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new) hlsl_free_instr(old); } +struct copy_propagation_value +{ + struct hlsl_ir_node *node; + unsigned int component; +}; + +struct copy_propagation_var_def +{ + struct rb_entry entry; + struct hlsl_ir_var *var; + struct copy_propagation_value values[]; +}; + +struct copy_propagation_state +{ + struct rb_tree variables; +}; + +static int copy_propagation_variable_compare(const void *key, const struct rb_entry *entry) +{ + struct copy_propagation_var_def *variable = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); + uintptr_t key_int = (uintptr_t)key, entry_int = (uintptr_t)variable->var; + + return (key_int > entry_int) - (key_int < entry_int); +} + +static void copy_propagation_variable_destroy(struct rb_entry *entry, void *context) +{ + struct copy_propagation_var_def *variable = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); + + vkd3d_free(variable); +} + +static struct copy_propagation_var_def *copy_propagation_get_variable(struct copy_propagation_state *state, + struct hlsl_ir_var *var) +{ + struct rb_entry *entry = rb_get(&state->variables, var); + + if (entry) + return RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); + else + return NULL; +} + +static struct copy_propagation_var_def *copy_propagation_create_variable(struct hlsl_ctx *ctx, + struct copy_propagation_state *state, struct hlsl_ir_var *var) +{ + struct rb_entry *entry = rb_get(&state->variables, var); + struct copy_propagation_var_def *variable; + int res; + + if (entry) + return RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); + + variable = hlsl_alloc(ctx, offsetof(struct copy_propagation_var_def, values[var->data_type->reg_size])); + if (!variable) + return NULL; + + variable->var = var; + + res = rb_put(&state->variables, var, &variable->entry); + assert(!res); + + return variable; +} + +static void copy_propagation_invalidate_whole_variable(struct copy_propagation_var_def *variable) +{ + TRACE("Invalidate variable %s.\n", variable->var->name); + memset(variable->values, 0, sizeof(*variable->values) * variable->var->data_type->reg_size); +} + +static void copy_propagation_set_value(struct copy_propagation_var_def *variable, unsigned int offset, + unsigned char writemask, struct hlsl_ir_node *node) +{ + unsigned int i, j = 0; + + for (i = 0; i < 4; ++i) + { + if (writemask & (1u << i)) + { + TRACE("Variable %s[%u] is written by instruction %p%s.\n", + variable->var->name, offset + i, node, debug_hlsl_writemask(1u << i)); + variable->values[offset + i].node = node; + variable->values[offset + i].component = j++; + } + } +} + +static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_var_def *variable, + unsigned int offset, unsigned int count, unsigned int *swizzle) +{ + struct hlsl_ir_node *node = NULL; + unsigned int i; + + assert(offset + count <= variable->var->data_type->reg_size); + + *swizzle = 0; + + for (i = 0; i < count; ++i) + { + if (!node) + node = variable->values[offset + i].node; + else if (node != variable->values[offset + i].node) + return NULL; + *swizzle |= variable->values[offset + i].component << (2 * i); + } + + return node; +} + +static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_load *load, + struct copy_propagation_state *state) +{ + struct hlsl_ir_node *node = &load->node, *new_node; + struct copy_propagation_var_def *variable; + struct hlsl_type *type = node->data_type; + struct hlsl_ir_swizzle *swizzle_node; + struct hlsl_deref *src = &load->src; + struct hlsl_ir_var *var = src->var; + unsigned int offset, swizzle; + + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + + if (!hlsl_offset_from_deref(src, &offset)) + return false; + + variable = copy_propagation_get_variable(state, var); + if (!variable) + return false; + + new_node = copy_propagation_compute_replacement(variable, offset, type->dimx, &swizzle); + + TRACE("Load from %s[%d-%d] reconstructed as instruction %p%s.\n", + var->name, offset, offset + type->dimx, new_node, debug_hlsl_swizzle(swizzle, 4)); + + if (!new_node) + return false; + + if (!(swizzle_node = hlsl_new_swizzle(ctx, swizzle, type->dimx, new_node, &node->loc))) + return false; + list_add_before(&node->entry, &swizzle_node->node.entry); + + replace_node(node, &swizzle_node->node); + + return true; +} + +static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, + struct copy_propagation_state *state) +{ + struct copy_propagation_var_def *variable; + struct hlsl_deref *lhs = &store->lhs; + struct hlsl_ir_var *var = lhs->var; + unsigned int offset; + + variable = copy_propagation_create_variable(ctx, state, var); + if (!variable) + return; + + if (hlsl_offset_from_deref(lhs, &offset)) + copy_propagation_set_value(variable, offset, store->writemask, store->rhs.node); + else + copy_propagation_invalidate_whole_variable(variable); +} + +static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct copy_propagation_state *state) +{ + struct hlsl_ir_node *instr, *next; + bool progress = false; + + LIST_FOR_EACH_ENTRY_SAFE(instr, next, &block->instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_LOAD: + progress |= copy_propagation_analyze_load(ctx, hlsl_ir_load(instr), state); + break; + + case HLSL_IR_STORE: + copy_propagation_record_store(ctx, hlsl_ir_store(instr), state); + break; + + case HLSL_IR_IF: + FIXME("Copy propagation doesn't support conditionals yet, leaving.\n"); + return progress; + + case HLSL_IR_LOOP: + FIXME("Copy propagation doesn't support loops yet, leaving.\n"); + return progress; + + default: + break; + } + } + + return progress; +} + +static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block) +{ + struct copy_propagation_state state; + bool progress; + + rb_init(&state.variables, copy_propagation_variable_compare); + + progress = copy_propagation_transform_block(ctx, block, &state); + + rb_destroy(&state.variables, copy_propagation_variable_destroy, NULL); + + return progress; +} + static bool is_vec1(const struct hlsl_type *type) { return (type->type == HLSL_CLASS_SCALAR) || (type->type == HLSL_CLASS_VECTOR && type->dimx == 1); @@ -1390,7 +1605,12 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun progress |= transform_ir(ctx, split_struct_copies, body, NULL); } while (progress); - while (transform_ir(ctx, fold_constants, body, NULL)); + do + { + progress = transform_ir(ctx, fold_constants, body, NULL); + progress |= copy_propagation_execute(ctx, body); + } + while (progress); transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) -- 2.33.1

3 6

[PATCH] ntdll: Set rcx and r11 on exit from syscall dispatcher on x64.
by Paul Gofman 01 Dec '21

01 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 74 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 13 ++++-- 2 files changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 98187266d50..a592ca9cf3c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4917,6 +4917,79 @@ static void test_unwind_from_apc(void) ok(pass == 4, "Got unexpected pass %d.\n", pass); ok(test_unwind_apc_called, "Test user APC was not called.\n"); } + +static void test_syscall_clobbered_regs(void) +{ + struct regs + { + UINT64 rflags_before; + UINT64 rcx; + UINT64 r11; + }; + static const BYTE code[] = + { + 0xfd, /* std */ + 0x9c, /* pushf */ + 0x41, 0x8f, 0x00, /* pop (%r8) */ + 0x41, 0x50, /* push %r8 */ + 0x41, 0xff, 0xd1, /* callq *r9 */ + 0x41, 0x58, /* pop %r8 */ + 0x49, 0x89, 0x48, 0x08, /* mov %rcx,8(%r8) */ + 0x4d, 0x89, 0x58, 0x10, /* mov %r11,16(%r8) */ + 0xfc, /* cld */ + 0xc3, /* ret */ + }; + + static const unsigned int flags_mask = 0x844; /* ZF, PF, SF. */ + NTSTATUS (WINAPI *func)(void *arg1, void *arg2, struct regs *, void *call_addr); + NTSTATUS (WINAPI *pNtCancelTimer)(HANDLE, BOOLEAN *); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + struct regs regs; + CONTEXT context; + NTSTATUS status; + + pNtCancelTimer = (void *)GetProcAddress(hntdll, "NtCancelTimer"); + ok(!!pNtCancelTimer, "NtCancelTimer not found.\n"); + memcpy(code_mem, code, sizeof(code)); + func = code_mem; + memset(&regs, 0, sizeof(regs)); + status = func((HANDLE)0xdeadbeef, NULL, &regs, pNtCancelTimer); + ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#x.\n", status); + + /* After the syscall instruction rcx contains the address of the instruction next after syscall + * and r11 contains rflags before the instruction. rcx, r11 are set by syscall instruction itself, + * looks like Windows is preserving those (setting the the thread context with NtContinue during + * the syscall is the special case of course). + * ZF, PF, SF (0x44) may be potentially altered in the Nt syscall thunk. */ + ok(!((regs.rflags_before ^ regs.r11) & ~flags_mask), "Got unexpected rflags_before %s, r11 %s.\n", + wine_dbgstr_longlong(regs.rflags_before), wine_dbgstr_longlong(regs.r11)); + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + status = func((HANDLE)0xdeadbeef, (BOOLEAN *)0xdeadbeef, &regs, pNtCancelTimer); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); + ok(!((regs.rflags_before ^ regs.r11) & ~flags_mask), "Got unexpected rflags_before %s, r11 %s.\n", + wine_dbgstr_longlong(regs.rflags_before), wine_dbgstr_longlong(regs.r11)); + ok((BYTE *)regs.rcx > (BYTE *)pNtCancelTimer && (BYTE *)regs.rcx < (BYTE *)pNtCancelTimer + 0x20, + "Got unexpected rcx %s, pNtCancelTimer %p.\n", wine_dbgstr_longlong(regs.rcx), pNtCancelTimer); + + context.ContextFlags = CONTEXT_CONTROL; + status = func(GetCurrentThread(), &context, &regs, pNtGetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + ok(!((regs.rflags_before ^ regs.r11) & ~flags_mask), "Got unexpected rflags_before %s, r11 %s.\n", + wine_dbgstr_longlong(regs.rflags_before), wine_dbgstr_longlong(regs.r11)); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); + + status = func(GetCurrentThread(), &context, &regs, pNtSetContextThread); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + /* For some reason bit 1 (documented as reserved, always 1) is cleared in r11 after NtSetContextThread() + * across all the Win versions. */ + ok(!(((regs.rflags_before & ~2) ^ regs.r11) & ~flags_mask), "Got unexpected rflags_before %s, r11 %s.\n", + wine_dbgstr_longlong(regs.rflags_before), wine_dbgstr_longlong(regs.r11)); + ok((BYTE *)regs.rcx > (BYTE *)pNtGetContextThread && (BYTE *)regs.rcx < (BYTE *)pNtGetContextThread + 0x20, + "Got unexpected rcx %s, pNtGetContextThread %p.\n", wine_dbgstr_longlong(regs.rcx), pNtGetContextThread); +} #elif defined(__arm__) #define UNW_FLAG_NHANDLER 0 @@ -10737,6 +10810,7 @@ START_TEST(exception) test_extended_context(); test_copy_context(); test_unwind_from_apc(); + test_syscall_clobbered_regs(); #elif defined(__aarch64__) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 4310c1c6a2f..bd25172b309 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3233,21 +3233,26 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq 0x28(%rcx),%rdi\n\t" "movq 0x20(%rcx),%rsi\n\t" "movq 0x08(%rcx),%rbx\n\t" + "movq 0x80(%rcx),%r11\n\t" /* frame->eflags */ "testl $0x3,%edx\n\t" /* CONTEXT_CONTROL | CONTEXT_INTEGER */ "jnz 1f\n\t" "movq 0x88(%rcx),%rsp\n\t" - "jmpq *0x70(%rcx)\n" /* frame->rip */ + "movq 0x70(%rcx),%rcx\n\t" /* frame->rip */ + "jmpq *%rcx\n\t" "1:\tleaq 0x70(%rcx),%rsp\n\t" "testl $0x2,%edx\n\t" /* CONTEXT_INTEGER */ - "jz 1f\n\t" - "movq 0x00(%rcx),%rax\n\t" + "jnz 1f\n\t" + "btr $1,%r11\n\t" + "movq (%rsp),%rcx\n\t" /* frame->rip */ + "iretq\n" + "1:\tmovq 0x00(%rcx),%rax\n\t" "movq 0x18(%rcx),%rdx\n\t" "movq 0x30(%rcx),%r8\n\t" "movq 0x38(%rcx),%r9\n\t" "movq 0x40(%rcx),%r10\n\t" "movq 0x48(%rcx),%r11\n\t" "movq 0x10(%rcx),%rcx\n" - "1:\tiretq\n" + "iretq\n" "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" -- 2.33.1

2 5

[PATCH resend3 1/4] ntdll: Implement RtlInitializeGenericTable
by Alex Henrie 01 Dec '21

01 Dec '21

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/rtl.c | 13 ++++++++++++- include/ddk/ntddk.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1e359e4a043..657d0ffd091 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -429,7 +429,18 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, void *context) { - FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); + TRACE("(%p, %p, %p, %p, %p)\n", table, compare, allocate, free, context); + + table->TableRoot = NULL; + table->InsertOrderList.Flink = &(table->InsertOrderList); + table->InsertOrderList.Blink = &(table->InsertOrderList); + table->OrderedPointer = &(table->InsertOrderList); + table->NumberGenericTableElements = 0; + table->WhichOrderedElement = 0; + table->CompareRoutine = compare; + table->AllocateRoutine = allocate; + table->FreeRoutine = free; + table->TableContext = context; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..3a1d68b1fa8 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.34.1

1 3

[PATCH 2/4] kernel32: Forward SetCachedSigningLevel to kernelbase.
by Mohamad Al-Jaf 01 Dec '21

01 Dec '21

The Windows 10 kernel32.dll binary contains this function. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernel32/kernel32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9667f82a5da..1e32939035d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1342,6 +1342,7 @@ @ stdcall -import SearchPathA(str str str long ptr ptr) @ stdcall -import SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetCPGlobal(long) +@ stdcall SetCachedSigningLevel(ptr long long long) kernelbase.SetCachedSigningLevel @ stdcall SetCalendarInfoA(long long long str) @ stdcall -import SetCalendarInfoW(long long long wstr) # @ stub SetClientTimeZoneInformation -- 2.34.1

4 6

[PATCH v2 3/3] api-ms-win-security-base-l1-2-0: Forward SetCachedSigningLevel to kernelbase.
by Mohamad Al-Jaf 01 Dec '21

01 Dec '21

In Windows 10 this function is forwarded to kernelbase. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: kernel32: Use import for SetCachedSigningLevel. Thanks Chip Davis, Nikolay Sivov, and Paul Gofman. --- .../api-ms-win-security-base-l1-2-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index fc9af375db6..771407fc203 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -87,7 +87,7 @@ @ stub QuerySecurityAccessMask @ stdcall RevertToSelf() advapi32.RevertToSelf @ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation -@ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) kernelbase.SetCachedSigningLevel @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity -- 2.34.1

1 0

[PATCH v2 2/3] kernel32: Import SetCachedSigningLevel from kernelbase.
by Mohamad Al-Jaf 01 Dec '21

01 Dec '21

The Windows 10 kernel32.dll binary imports this function Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: kernel32: Use import for SetCachedSigningLevel. Thanks Chip Davis, Nikolay Sivov, and Paul Gofman. --- dlls/kernel32/kernel32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fbaf9443934..77f51bfcedf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1343,6 +1343,7 @@ @ stdcall -import SearchPathA(str str str long ptr ptr) @ stdcall -import SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetCPGlobal(long) +@ stdcall -import SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoA(long long long str) @ stdcall -import SetCalendarInfoW(long long long wstr) # @ stub SetClientTimeZoneInformation -- 2.34.1

1 0

[PATCH v2 1/3] kernelbase: Add SetCachedSigningLevel stub.
by Mohamad Al-Jaf 01 Dec '21

01 Dec '21

Fix Microsoft Edge offline installer "ERROR:win_signcache.cc SetCachedSigningLevel method not supported" when running in Windows 10 mode. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: kernel32: Use import for SetCachedSigningLevel. Thanks Chip Davis, Nikolay Sivov, and Paul Gofman. --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7bc0c262fdd..da3d5e4035b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1393,7 +1393,7 @@ @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetAclInformation(ptr ptr long long) -# @ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoW(long long long wstr) # @ stub SetClientDynamicTimeZoneInformation # @ stub SetClientTimeZoneInformation diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 472076cf7fe..3b662854b31 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1547,3 +1547,12 @@ BOOL WINAPI SetAclInformation( PACL acl, LPVOID info, DWORD len, ACL_INFORMATION FIXME( "%p %p 0x%08x 0x%08x - stub\n", acl, info, len, class ); return TRUE; } + +/****************************************************************************** + * SetCachedSigningLevel (kernelbase.@) + */ +BOOL WINAPI SetCachedSigningLevel( PHANDLE source, ULONG count, ULONG flags, HANDLE file ) +{ + FIXME( "%p %u %u %p - stub\n", source, count, flags, file ); + return TRUE; +} \ No newline at end of file diff --git a/include/winbase.h b/include/winbase.h index 2928385bde6..8e8a185b4ff 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2611,6 +2611,7 @@ WINBASEAPI DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR WINBASEAPI DWORD WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); #define SearchPath WINELIB_NAME_AW(SearchPath) WINADVAPI BOOL WINAPI SetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI BOOL WINAPI SetCachedSigningLevel(PHANDLE,ULONG,ULONG,HANDLE); WINBASEAPI BOOL WINAPI SetCommConfig(HANDLE,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetCommBreak(HANDLE); WINBASEAPI BOOL WINAPI SetCommMask(HANDLE,DWORD); -- 2.34.1

1 0

[PATCH] ntdll: Remove the no longer used "mutex" argument to server_select().
by Zebediah Figura 30 Nov '21

30 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/server.c | 14 ++++---------- dlls/ntdll/unix/thread.c | 4 ++-- dlls/ntdll/unix/unix_private.h | 3 +-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a086d0cb583..1dcd0792072 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -585,8 +585,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, - user_apc_t *user_apc ) + timeout_t abs_timeout, context_t *context, user_apc_t *user_apc ) { unsigned int ret; int cookie; @@ -635,11 +634,6 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT size = offsetof( select_op_t, signal_and_wait.signal ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); - if (mutex) - { - mutex_unlock( mutex ); - mutex = NULL; - } if (signaled) break; ret = wait_select_reply( &cookie ); @@ -669,7 +663,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f abs_timeout -= now.QuadPart; } - ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); + ret = server_select( select_op, size, flags, abs_timeout, NULL, &apc ); if (ret == STATUS_USER_APC) return invoke_user_apc( NULL, &apc, ret ); /* A test on Windows 2000 shows that Windows always yields during @@ -690,7 +684,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) if (alertable) { - status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc ); if (status == STATUS_USER_APC) return invoke_user_apc( context, &apc, status ); } return signal_set_full_context( context ); @@ -705,7 +699,7 @@ NTSTATUS WINAPI NtTestAlert(void) user_apc_t apc; NTSTATUS status; - status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); + status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc ); if (status == STATUS_USER_APC) invoke_user_apc( NULL, &apc, STATUS_SUCCESS ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00261edb593..7a32f36920f 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1440,7 +1440,7 @@ void wait_suspend( CONTEXT *context ) contexts_to_server( server_contexts, context ); /* wait with 0 timeout, will only return once the thread is no longer suspended */ - server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, server_contexts, NULL, NULL ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, server_contexts, NULL ); contexts_from_server( context, server_contexts ); errno = saved_errno; } @@ -1489,7 +1489,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c contexts_to_server( server_contexts, context ); server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, - TIMEOUT_INFINITE, server_contexts, NULL, NULL ); + TIMEOUT_INFINITE, server_contexts, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9a9f60a1678..963eb248430 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -158,8 +158,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, - user_apc_t *user_apc ) DECLSPEC_HIDDEN; + timeout_t abs_timeout, context_t *context, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, -- 2.32.0

1 0

[PATCH] kernel32: Use uppercase ntdll name in forwarded exports.
by Paul Gofman 30 Nov '21

30 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- SCP: Secret Laboratory game depends on that for correctly finding export addresses. dlls/kernel32/kernel32.spec | 204 ++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fbaf9443934..015324f7677 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -79,20 +79,20 @@ 69 stdcall -noname -i386 -private K32WOWGetVDMPointerUnfix(long) krnl386.exe16.K32WOWGetVDMPointerUnfix 70 stdcall -noname -i386 -private K32WOWGetDescriptor(long long) krnl386.exe16.K32WOWGetDescriptor 71 stub -noname -i386 IsThreadId - 72 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerAdd(long long long long) ntdll.RtlLargeIntegerAdd - 73 stdcall -noname -i386 -private -ret64 K32RtlEnlargedIntegerMultiply(long long) ntdll.RtlEnlargedIntegerMultiply - 74 stdcall -noname -i386 -private -ret64 K32RtlEnlargedUnsignedMultiply(long long) ntdll.RtlEnlargedUnsignedMultiply - 75 stdcall -noname -i386 -private K32RtlEnlargedUnsignedDivide(long long long ptr) ntdll.RtlEnlargedUnsignedDivide - 76 stdcall -noname -i386 -private -ret64 K32RtlExtendedLargeIntegerDivide(long long long ptr) ntdll.RtlExtendedLargeIntegerDivide - 77 stdcall -noname -i386 -private -ret64 K32RtlExtendedMagicDivide(long long long long long) ntdll.RtlExtendedMagicDivide - 78 stdcall -noname -i386 -private -ret64 K32RtlExtendedIntegerMultiply(long long long) ntdll.RtlExtendedIntegerMultiply - 79 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerShiftLeft(long long long) ntdll.RtlLargeIntegerShiftLeft - 80 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerShiftRight(long long long) ntdll.RtlLargeIntegerShiftRight - 81 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerArithmeticShift(long long long) ntdll.RtlLargeIntegerArithmeticShift - 82 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerNegate(long long) ntdll.RtlLargeIntegerNegate - 83 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerSubtract(long long long long) ntdll.RtlLargeIntegerSubtract - 84 stdcall -noname -i386 -private -ret64 K32RtlConvertLongToLargeInteger(long) ntdll.RtlConvertLongToLargeInteger - 85 stdcall -noname -i386 -private -ret64 K32RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger + 72 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerAdd(long long long long) NTDLL.RtlLargeIntegerAdd + 73 stdcall -noname -i386 -private -ret64 K32RtlEnlargedIntegerMultiply(long long) NTDLL.RtlEnlargedIntegerMultiply + 74 stdcall -noname -i386 -private -ret64 K32RtlEnlargedUnsignedMultiply(long long) NTDLL.RtlEnlargedUnsignedMultiply + 75 stdcall -noname -i386 -private K32RtlEnlargedUnsignedDivide(long long long ptr) NTDLL.RtlEnlargedUnsignedDivide + 76 stdcall -noname -i386 -private -ret64 K32RtlExtendedLargeIntegerDivide(long long long ptr) NTDLL.RtlExtendedLargeIntegerDivide + 77 stdcall -noname -i386 -private -ret64 K32RtlExtendedMagicDivide(long long long long long) NTDLL.RtlExtendedMagicDivide + 78 stdcall -noname -i386 -private -ret64 K32RtlExtendedIntegerMultiply(long long long) NTDLL.RtlExtendedIntegerMultiply + 79 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerShiftLeft(long long long) NTDLL.RtlLargeIntegerShiftLeft + 80 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerShiftRight(long long long) NTDLL.RtlLargeIntegerShiftRight + 81 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerArithmeticShift(long long long) NTDLL.RtlLargeIntegerArithmeticShift + 82 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerNegate(long long) NTDLL.RtlLargeIntegerNegate + 83 stdcall -noname -i386 -private -ret64 K32RtlLargeIntegerSubtract(long long long long) NTDLL.RtlLargeIntegerSubtract + 84 stdcall -noname -i386 -private -ret64 K32RtlConvertLongToLargeInteger(long) NTDLL.RtlConvertLongToLargeInteger + 85 stdcall -noname -i386 -private -ret64 K32RtlConvertUlongToLargeInteger(long) NTDLL.RtlConvertUlongToLargeInteger 86 stdcall -i386 -private @(ptr) krnl386.exe16._KERNEL32_86 87 stdcall -noname -i386 -private SSOnBigStack() krnl386.exe16.SSOnBigStack 88 varargs -noname -i386 -private SSCall(long long ptr) krnl386.exe16.SSCall @@ -133,8 +133,8 @@ # functions exported by name, ordinal doesn't matter -@ stdcall AcquireSRWLockExclusive(ptr) ntdll.RtlAcquireSRWLockExclusive -@ stdcall AcquireSRWLockShared(ptr) ntdll.RtlAcquireSRWLockShared +@ stdcall AcquireSRWLockExclusive(ptr) NTDLL.RtlAcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) NTDLL.RtlAcquireSRWLockShared @ stdcall -import ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) @@ -147,8 +147,8 @@ @ stdcall -import AddRefActCtx(ptr) # @ stub AddSIDToBoundaryDescriptor # @ stub AddSecureMemoryCacheCallback -@ stdcall AddVectoredContinueHandler(long ptr) ntdll.RtlAddVectoredContinueHandler -@ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler +@ stdcall AddVectoredContinueHandler(long ptr) NTDLL.RtlAddVectoredContinueHandler +@ stdcall AddVectoredExceptionHandler(long ptr) NTDLL.RtlAddVectoredExceptionHandler # @ stub AdjustCalendarDate @ stdcall -import AllocConsole() @ stub -i386 AllocLSCallback @@ -210,7 +210,7 @@ @ stdcall -import CancelIo(long) @ stdcall -import CancelIoEx(long ptr) @ stdcall -import CancelSynchronousIo(long) -@ stdcall CancelThreadpoolIo(ptr) ntdll.TpCancelAsyncIoOperation +@ stdcall CancelThreadpoolIo(ptr) NTDLL.TpCancelAsyncIoOperation @ stdcall CancelTimerQueueTimer(ptr ptr) @ stdcall -import CancelWaitableTimer(long) @ stdcall -import ChangeTimerQueueTimer(ptr ptr long long) @@ -228,13 +228,13 @@ @ stdcall CloseProfileUserMapping() @ stdcall -import ClosePseudoConsole(ptr) @ stub CloseSystemHandle -@ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool -@ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup -@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers -@ stdcall CloseThreadpoolIo(ptr) ntdll.TpReleaseIoCompletion -@ stdcall CloseThreadpoolTimer(ptr) ntdll.TpReleaseTimer -@ stdcall CloseThreadpoolWait(ptr) ntdll.TpReleaseWait -@ stdcall CloseThreadpoolWork(ptr) ntdll.TpReleaseWork +@ stdcall CloseThreadpool(ptr) NTDLL.TpReleasePool +@ stdcall CloseThreadpoolCleanupGroup(ptr) NTDLL.TpReleaseCleanupGroup +@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) NTDLL.TpReleaseCleanupGroupMembers +@ stdcall CloseThreadpoolIo(ptr) NTDLL.TpReleaseIoCompletion +@ stdcall CloseThreadpoolTimer(ptr) NTDLL.TpReleaseTimer +@ stdcall CloseThreadpoolWait(ptr) NTDLL.TpReleaseWait +@ stdcall CloseThreadpoolWork(ptr) NTDLL.TpReleaseWork @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) @@ -354,14 +354,14 @@ @ stdcall DebugBreak() @ stdcall DebugBreakProcess(long) @ stdcall DebugSetProcessKillOnExit(long) -@ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer -@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer +@ stdcall DecodePointer(ptr) NTDLL.RtlDecodePointer +@ stdcall DecodeSystemPointer(ptr) NTDLL.RtlDecodeSystemPointer @ stdcall DefineDosDeviceA(long str str) @ stdcall -import DefineDosDeviceW(long wstr wstr) @ stdcall -import DelayLoadFailureHook(str str) @ stdcall DeleteAtom(long) # @ stub DeleteBoundaryDescriptor -@ stdcall DeleteCriticalSection(ptr) ntdll.RtlDeleteCriticalSection +@ stdcall DeleteCriticalSection(ptr) NTDLL.RtlDeleteCriticalSection @ stdcall -import DeleteFiber(ptr) @ stdcall -import DeleteFileA(str) # @ stub DeleteFileTransactedA @@ -369,7 +369,7 @@ @ stdcall -import DeleteFileW(wstr) @ stdcall -import DeleteProcThreadAttributeList(ptr) # @ stub DisableThreadProfiling -@ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback +@ stdcall DisassociateCurrentThreadFromCallback(ptr) NTDLL.TpDisassociateCallback @ stdcall DeleteTimerQueue(long) @ stdcall -import DeleteTimerQueueEx(long long) @ stdcall -import DeleteTimerQueueTimer(long long long) @@ -389,11 +389,11 @@ @ stdcall DuplicateConsoleHandle(long long long long) @ stdcall -import DuplicateHandle(long long long ptr long long long) # @ stub EnableThreadProfiling -@ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer -@ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer +@ stdcall EncodePointer(ptr) NTDLL.RtlEncodePointer +@ stdcall EncodeSystemPointer(ptr) NTDLL.RtlEncodeSystemPointer @ stdcall EndUpdateResourceA(long long) @ stdcall EndUpdateResourceW(long long) -@ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection +@ stdcall EnterCriticalSection(ptr) NTDLL.RtlEnterCriticalSection @ stdcall EnumCalendarInfoA(ptr long long long) @ stdcall EnumCalendarInfoExA(ptr long long long) @ stdcall -import EnumCalendarInfoExEx(ptr wstr long wstr long long) @@ -439,7 +439,7 @@ @ stdcall -import EscapeCommFunction(long long) @ stdcall -arch=x86_64 ExecuteUmsThread(ptr) @ stdcall ExitProcess(long) -@ stdcall ExitThread(long) ntdll.RtlExitUserThread +@ stdcall ExitThread(long) NTDLL.RtlExitUserThread @ stub ExitVDM @ stdcall -import ExpandEnvironmentStringsA(str ptr long) @ stdcall -import ExpandEnvironmentStringsW(wstr ptr long) @@ -520,7 +520,7 @@ @ stdcall -import FlushConsoleInputBuffer(long) @ stdcall -import FlushFileBuffers(long) @ stdcall -import FlushInstructionCache(long long long) -@ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers +@ stdcall FlushProcessWriteBuffers() NTDLL.NtFlushProcessWriteBuffers @ stdcall -import FlushViewOfFile(ptr long) @ stdcall FoldStringA(long str long ptr long) @ stdcall -import FoldStringW(long wstr long ptr long) @@ -532,7 +532,7 @@ @ stub -i386 FreeLSCallback @ stdcall -import FreeLibrary(long) @ stdcall FreeLibraryAndExitThread(long long) -@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion +@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) NTDLL.TpCallbackUnloadDllOnCompletion @ stdcall -import FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback @ stdcall -import FreeUserPhysicalPages(long ptr ptr) @@ -634,8 +634,8 @@ @ stdcall GetCurrentPackagePath(ptr ptr) kernelbase.GetCurrentPackagePath @ stdcall -norelay GetCurrentProcess() KERNEL32_GetCurrentProcess @ stdcall -norelay GetCurrentProcessId() KERNEL32_GetCurrentProcessId -@ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber -@ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx +@ stdcall GetCurrentProcessorNumber() NTDLL.NtGetCurrentProcessorNumber +@ stdcall GetCurrentProcessorNumberEx(ptr) NTDLL.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() KERNEL32_GetCurrentThread @ stdcall -norelay GetCurrentThreadId() KERNEL32_GetCurrentThreadId @ stdcall -import GetCurrentThreadStackLimits(ptr ptr) @@ -926,7 +926,7 @@ @ stdcall Heap32ListFirst(long ptr) @ stub Heap32ListNext @ stub Heap32Next -@ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap +@ stdcall HeapAlloc(long long long) NTDLL.RtlAllocateHeap @ stdcall -import HeapCompact(long long) @ stdcall HeapCreate(long long long) @ stub HeapCreateTagsW @@ -936,10 +936,10 @@ @ stdcall -import HeapLock(long) @ stdcall -import HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW -@ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap +@ stdcall HeapReAlloc(long long ptr long) NTDLL.RtlReAllocateHeap @ stub HeapSetFlags @ stdcall -import HeapSetInformation(ptr long ptr long) -@ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap +@ stdcall HeapSize(long long ptr) NTDLL.RtlSizeHeap @ stub HeapSummary @ stdcall -import HeapUnlock(long) @ stub HeapUsage @@ -952,27 +952,27 @@ @ stdcall InitOnceBeginInitialize(ptr long ptr ptr) kernelbase.InitOnceBeginInitialize @ stdcall InitOnceComplete(ptr long ptr) kernelbase.InitOnceComplete @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) kernelbase.InitOnceExecuteOnce -@ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize -@ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable +@ stdcall InitOnceInitialize(ptr) NTDLL.RtlRunOnceInitialize +@ stdcall InitializeConditionVariable(ptr) NTDLL.RtlInitializeConditionVariable @ stdcall -import -arch=i386,x86_64 InitializeContext(ptr long ptr ptr) @ stdcall -import -arch=i386,x86_64 InitializeContext2(ptr long ptr ptr int64) -@ stdcall InitializeCriticalSection(ptr) ntdll.RtlInitializeCriticalSection +@ stdcall InitializeCriticalSection(ptr) NTDLL.RtlInitializeCriticalSection @ stdcall -import InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall -import InitializeCriticalSectionEx(ptr long long) @ stdcall -import InitializeProcThreadAttributeList(ptr long long ptr) -@ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead -@ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock +@ stdcall InitializeSListHead(ptr) NTDLL.RtlInitializeSListHead +@ stdcall InitializeSRWLock(ptr) NTDLL.RtlInitializeSRWLock @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) -@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) ntdll.RtlInterlockedCompareExchange64 +@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr int64 int64) NTDLL.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) @ stdcall -arch=i386 InterlockedExchange(ptr long) @ stdcall -arch=i386 InterlockedExchangeAdd (ptr long ) -@ stdcall InterlockedFlushSList(ptr) ntdll.RtlInterlockedFlushSList +@ stdcall InterlockedFlushSList(ptr) NTDLL.RtlInterlockedFlushSList @ stdcall -arch=i386 InterlockedIncrement(ptr) -@ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList -@ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -@ stdcall -fastcall InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList -@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) ntdll.RtlInterlockedPushListSListEx +@ stdcall InterlockedPopEntrySList(ptr) NTDLL.RtlInterlockedPopEntrySList +@ stdcall InterlockedPushEntrySList(ptr ptr) NTDLL.RtlInterlockedPushEntrySList +@ stdcall -fastcall InterlockedPushListSList(ptr ptr ptr long) NTDLL.RtlInterlockedPushListSList +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) NTDLL.RtlInterlockedPushListSListEx @ stub InvalidateConsoleDIBits @ stdcall InvalidateNLSCache() @ stdcall IsBadCodePtr(ptr) @@ -996,7 +996,7 @@ @ stub -i386 IsSLCallback @ stdcall IsSystemResumeAutomatic() @ stdcall -import IsThreadAFiber() -@ stdcall IsThreadpoolTimerSet(ptr) ntdll.TpIsTimerSet +@ stdcall IsThreadpoolTimerSet(ptr) NTDLL.TpIsTimerSet # @ stub IsTimeZoneRedirectionEnabled # @ stub IsValidCalDateTime @ stdcall -import IsValidCodePage(long) @@ -1051,8 +1051,8 @@ @ stdcall LZRead(long ptr long) @ stdcall LZSeek(long long long) @ stdcall LZStart() -@ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection -@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion +@ stdcall LeaveCriticalSection(ptr) NTDLL.RtlLeaveCriticalSection +@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) NTDLL.TpCallbackLeaveCriticalSectionOnCompletion @ stdcall -import LoadAppInitDlls() @ stdcall -import LoadLibraryA(str) @ stdcall -import LoadLibraryExA( str long long) @@ -1173,7 +1173,7 @@ @ stdcall -i386 -private -norelay QT_Thunk() krnl386.exe16.QT_Thunk @ stdcall -import QueryActCtxSettingsW(long ptr wstr wstr ptr long ptr) @ stdcall -import QueryActCtxW(long ptr ptr long ptr long ptr) -@ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList +@ stdcall QueryDepthSList(ptr) NTDLL.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall -import QueryDosDeviceW(wstr ptr long) @ stdcall -import QueryFullProcessImageNameA(ptr long ptr ptr) @@ -1272,17 +1272,17 @@ @ stdcall ReinitializeCriticalSection(ptr) @ stdcall -import ReleaseActCtx(ptr) @ stdcall -import ReleaseMutex(long) -@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) ntdll.TpCallbackReleaseMutexOnCompletion +@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) NTDLL.TpCallbackReleaseMutexOnCompletion @ stdcall -import ReleaseSemaphore(long long ptr) -@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion -@ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive -@ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared +@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) NTDLL.TpCallbackReleaseSemaphoreOnCompletion +@ stdcall ReleaseSRWLockExclusive(ptr) NTDLL.RtlReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) NTDLL.RtlReleaseSRWLockShared @ stdcall -import RemoveDirectoryA(str) @ stdcall -import RemoveDirectoryW(wstr) # @ stub RemoveLocalAlternateComputerNameA # @ stub RemoveLocalAlternateComputerNameW -@ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler -@ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler +@ stdcall RemoveVectoredContinueHandler(ptr) NTDLL.RtlRemoveVectoredContinueHandler +@ stdcall RemoveVectoredExceptionHandler(ptr) NTDLL.RtlRemoveVectoredExceptionHandler @ stdcall -import ReOpenFile(ptr long long long) ReOpenFile @ stdcall -import ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @@ -1297,27 +1297,27 @@ @ stdcall -import ResetEvent(long) @ stdcall -import ResetWriteWatch(ptr long) @ stdcall -import ResizePseudoConsole(ptr long) -@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) ntdll.LdrResolveDelayLoadedAPI +@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) NTDLL.LdrResolveDelayLoadedAPI @ stdcall -import ResolveLocaleName(wstr ptr long) -@ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error +@ stdcall RestoreLastError(long) NTDLL.RtlRestoreLastWin32Error @ stdcall -import ResumeThread(long) -@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable -@ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext -@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace -@ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory -@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory -@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable -@ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback -@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry -@ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -@ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException -@ cdecl -arch=arm,arm64,x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext -@ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind -@ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx -@ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind -@ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory +@ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) NTDLL.RtlAddFunctionTable +@ stdcall -norelay RtlCaptureContext(ptr) NTDLL.RtlCaptureContext +@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) NTDLL.RtlCaptureStackBackTrace +@ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) NTDLL.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) NTDLL.RtlCopyMemory +@ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) NTDLL.RtlDeleteFunctionTable +@ stdcall RtlFillMemory(ptr long long) NTDLL.RtlFillMemory +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) NTDLL.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) NTDLL.RtlLookupFunctionEntry +@ stdcall RtlMoveMemory(ptr ptr long) NTDLL.RtlMoveMemory +@ stdcall RtlPcToFileHeader(ptr ptr) NTDLL.RtlPcToFileHeader +@ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) NTDLL.RtlRaiseException +@ cdecl -arch=arm,arm64,x86_64 RtlRestoreContext(ptr ptr) NTDLL.RtlRestoreContext +@ stdcall RtlUnwind(ptr ptr ptr long) NTDLL.RtlUnwind +@ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(long long ptr long ptr) NTDLL.RtlUnwindEx +@ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) NTDLL.RtlVirtualUnwind +@ stdcall RtlZeroMemory(ptr long) NTDLL.RtlZeroMemory @ stdcall -i386 -private -norelay SMapLS() krnl386.exe16.SMapLS @ stdcall -i386 -private -norelay SMapLS_IP_EBP_12() krnl386.exe16.SMapLS_IP_EBP_12 @ stdcall -i386 -private -norelay SMapLS_IP_EBP_16() krnl386.exe16.SMapLS_IP_EBP_16 @@ -1388,7 +1388,7 @@ @ stdcall SetConsoleTitleA(str) @ stdcall -import SetConsoleTitleW(wstr) @ stdcall -import SetConsoleWindowInfo(long long ptr) -@ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount +@ stdcall SetCriticalSectionSpinCount(ptr long) NTDLL.RtlSetCriticalSectionSpinCount @ stdcall SetCurrentConsoleFontEx(long long ptr) @ stdcall -import SetCurrentDirectoryA(str) @ stdcall -import SetCurrentDirectoryW(wstr) @@ -1406,7 +1406,7 @@ @ stdcall -import SetEnvironmentVariableW(wstr wstr) @ stdcall -import SetErrorMode(long) @ stdcall -import SetEvent(long) -@ stdcall SetEventWhenCallbackReturns(ptr long) ntdll.TpCallbackSetEventOnCompletion +@ stdcall SetEventWhenCallbackReturns(ptr long) NTDLL.TpCallbackSetEventOnCompletion @ stdcall -import SetFileApisToANSI() @ stdcall -import SetFileApisToOEM() @ stdcall -import SetFileAttributesA(str long) @@ -1478,10 +1478,10 @@ # @ stub SetThreadToken @ stdcall -import SetThreadUILanguage(long) @ stdcall -import SetThreadpoolStackInformation(ptr ptr) -@ stdcall SetThreadpoolThreadMaximum(ptr long) ntdll.TpSetPoolMaxThreads -@ stdcall SetThreadpoolThreadMinimum(ptr long) ntdll.TpSetPoolMinThreads -@ stdcall SetThreadpoolTimer(ptr ptr long long) ntdll.TpSetTimer -@ stdcall SetThreadpoolWait(ptr long ptr) ntdll.TpSetWait +@ stdcall SetThreadpoolThreadMaximum(ptr long) NTDLL.TpSetPoolMaxThreads +@ stdcall SetThreadpoolThreadMinimum(ptr long) NTDLL.TpSetPoolMinThreads +@ stdcall SetThreadpoolTimer(ptr ptr long long) NTDLL.TpSetTimer +@ stdcall SetThreadpoolWait(ptr long ptr) NTDLL.TpSetWait @ stdcall -import SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @@ -1506,8 +1506,8 @@ @ stdcall -import SleepEx(long long) # @ stub SortCloseHandle # @ stub SortGetHandle -@ stdcall StartThreadpoolIo(ptr) ntdll.TpStartAsyncIoOperation -@ stdcall SubmitThreadpoolWork(ptr) ntdll.TpPostWork +@ stdcall StartThreadpoolIo(ptr) NTDLL.TpStartAsyncIoOperation +@ stdcall SubmitThreadpoolWork(ptr) NTDLL.TpPostWork @ stdcall -import SuspendThread(long) @ stdcall -import SwitchToFiber(ptr) @ stdcall -import SwitchToThread() @@ -1531,9 +1531,9 @@ @ stdcall -import TransactNamedPipe(long ptr long ptr long ptr ptr) @ stdcall -import TransmitCommChar(long long) @ stub TrimVirtualBuffer -@ stdcall TryAcquireSRWLockExclusive(ptr) ntdll.RtlTryAcquireSRWLockExclusive -@ stdcall TryAcquireSRWLockShared(ptr) ntdll.RtlTryAcquireSRWLockShared -@ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection +@ stdcall TryAcquireSRWLockExclusive(ptr) NTDLL.RtlTryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) NTDLL.RtlTryAcquireSRWLockShared +@ stdcall TryEnterCriticalSection(ptr) NTDLL.RtlTryEnterCriticalSection @ stdcall -import TrySubmitThreadpoolCallback(ptr ptr ptr) @ stdcall -import TzSpecificLocalTimeToSystemTime(ptr ptr ptr) # @ stub TzSpecificLocalTimeToSystemTimeEx @@ -1571,7 +1571,7 @@ @ stub ValidateLocale @ stdcall -import VerLanguageNameA(long str long) @ stdcall -import VerLanguageNameW(long wstr long) -@ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask +@ stdcall -ret64 VerSetConditionMask(long long long long) NTDLL.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) # @ stub VerifyScripts @ stdcall VerifyVersionInfoA(ptr long int64) @@ -1595,14 +1595,14 @@ @ stdcall -import WaitForMultipleObjectsEx(long ptr long long long) @ stdcall -import WaitForSingleObject(long long) @ stdcall -import WaitForSingleObjectEx(long long long) -@ stdcall WaitForThreadpoolIoCallbacks(ptr) ntdll.TpWaitForIoCompletion -@ stdcall WaitForThreadpoolTimerCallbacks(ptr long) ntdll.TpWaitForTimer -@ stdcall WaitForThreadpoolWaitCallbacks(ptr long) ntdll.TpWaitForWait -@ stdcall WaitForThreadpoolWorkCallbacks(ptr long) ntdll.TpWaitForWork +@ stdcall WaitForThreadpoolIoCallbacks(ptr) NTDLL.TpWaitForIoCompletion +@ stdcall WaitForThreadpoolTimerCallbacks(ptr long) NTDLL.TpWaitForTimer +@ stdcall WaitForThreadpoolWaitCallbacks(ptr long) NTDLL.TpWaitForWait +@ stdcall WaitForThreadpoolWorkCallbacks(ptr long) NTDLL.TpWaitForWork @ stdcall WaitNamedPipeA (str long) @ stdcall -import WaitNamedPipeW (wstr long) -@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable -@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable +@ stdcall WakeAllConditionVariable(ptr) NTDLL.RtlWakeAllConditionVariable +@ stdcall WakeConditionVariable(ptr) NTDLL.RtlWakeConditionVariable @ stdcall -import WerGetFlags(ptr ptr) @ stdcall -import WerRegisterFile(wstr long long) @ stdcall -import WerRegisterMemoryBlock(ptr long) @@ -1653,8 +1653,8 @@ @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) -@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) NTDLL.__C_specific_handler +@ cdecl -arch=arm,x86_64 -norelay __chkstk() NTDLL.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) @@ -1662,7 +1662,7 @@ @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) -@ stdcall -arch=x86_64 -private _local_unwind(ptr ptr) ntdll._local_unwind +@ stdcall -arch=x86_64 -private _local_unwind(ptr ptr) NTDLL._local_unwind @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) @ stdcall _lwrite(long ptr long) -- 2.33.1

1 0

[PATCH v3] ws2_32: hardcode optlen to 4 for setsockopt in the TCP_NODELAY case
by Bastien Orivel 30 Nov '21

30 Nov '21

According to MSDN [1], `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..5ac88c47b2e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2868,8 +2868,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..e272ed3f303 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,61 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, -1); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.0

2 1

[PATCH] msvcr100: Add _Timer class implementation.
by Piotr Caban 30 Nov '21

30 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 24 ++--- dlls/concrt140/tests/concrt140.c | 145 ++++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 16 +-- dlls/msvcr110/msvcr110.spec | 24 ++--- dlls/msvcr120/msvcr120.spec | 24 ++--- dlls/msvcr120_app/msvcr120_app.spec | 24 ++--- dlls/msvcrt/concurrency.c | 102 +++++++++++++++++++ 7 files changed, 303 insertions(+), 56 deletions(-)

1 0

[PATCH vkd3d v3 1/7] vkd3d-shader/hlsl: Write SM4 integer negation.
by Giovanni Mascellani 30 Nov '21

30 Nov '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..acc11ce9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1376,6 +1376,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.34.0

2 7

[PATCH 1/4] wined3d: Always set GL_PIXEL_PACK_BUFFER binding before downloading texture data.
by Zebediah Figura 30 Nov '21

30 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 48202c2142c..d4c7082912b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2695,6 +2695,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl if (temporary_mem) { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); mem = temporary_mem; } else if (bo) @@ -2705,6 +2707,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl } else { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); mem = data->addr; } @@ -2918,6 +2922,11 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); offset += dst_bo->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } if (src_texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { -- 2.32.0

3 7

[PATCH] d3d9/tests: Add more tests for fullscreen window size reset.
by Paul Gofman 30 Nov '21

30 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3ef9361886d..c480a9d163e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14572,10 +14572,10 @@ static void test_window_position(void) { unsigned int adapter_idx, adapter_count; struct device_desc device_desc; + RECT window_rect, new_rect; IDirect3DDevice9 *device; MONITORINFO monitor_info; HMONITOR monitor; - RECT window_rect; IDirect3D9 *d3d; HWND window; HRESULT hr; @@ -14612,6 +14612,42 @@ static void test_window_position(void) "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + new_rect = window_rect; + --new_rect.right; + --new_rect.bottom; + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + /* After processing window events window rectangle gets restored. But only once, the size set + * on the second resize remains. */ + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + todo_wine ok(EqualRect(&window_rect, &monitor_info.rcMonitor), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + + ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left, + new_rect.bottom - new_rect.top, TRUE); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx); + ok(EqualRect(&window_rect, &new_rect), + "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, + wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); + /* Device resets should restore the window rectangle to fit the whole monitor */ ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); -- 2.33.1

4 3

[PATCH v2] dxgi: Silence a noisy fixme.
by Alistair Leslie-Hughes 30 Nov '21

30 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dxgi/factory.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 4c3e3cf0f34..e3aa554ae85 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -253,7 +253,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IWineDXGIFactory *iface) { - FIXME("iface %p stub!\n", iface); + static BOOL once = FALSE; + + if (!once++) + FIXME("iface %p stub!\n", iface); + else + WARN("iface %p stub!\n", iface); return TRUE; } -- 2.33.0

2 1

[PATCH vkd3d 2/4] vkd3d-shader/hlsl: Add texcoord_offset field to hlsl_ir_resource_load.
by Francisco Casas 30 Nov '21

30 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 9 ++++++++- libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.y | 14 ++++++++++---- libs/vkd3d-shader/hlsl_codegen.c | 2 ++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9824c56d..034d47eb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -629,7 +629,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ctx *ctx, struct hlsl_ir_var struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type, enum hlsl_resource_load_type type, struct hlsl_ir_var *resource, struct hlsl_ir_node *resource_offset, struct hlsl_ir_var *sampler, struct hlsl_ir_node *sampler_offset, struct hlsl_ir_node *coords, - const struct vkd3d_shader_location *loc) + struct hlsl_ir_node *texcoord_offset, const struct vkd3d_shader_location *loc) { struct hlsl_ir_resource_load *load; @@ -642,6 +642,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struc load->sampler.var = sampler; hlsl_src_from_node(&load->sampler.offset, sampler_offset); hlsl_src_from_node(&load->coords, coords); + hlsl_src_from_node(&load->texcoord_offset, texcoord_offset); return load; } @@ -1259,6 +1260,11 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru dump_deref(buffer, &load->sampler); vkd3d_string_buffer_printf(buffer, ", coords = "); dump_src(buffer, &load->coords); + if (load->texcoord_offset.node) + { + vkd3d_string_buffer_printf(buffer, ", offset = "); + dump_src(buffer, &load->texcoord_offset); + } vkd3d_string_buffer_printf(buffer, ")"); } @@ -1435,6 +1441,7 @@ static void free_ir_resource_load(struct hlsl_ir_resource_load *load) hlsl_src_remove(&load->coords); hlsl_src_remove(&load->sampler.offset); hlsl_src_remove(&load->resource.offset); + hlsl_src_remove(&load->texcoord_offset); vkd3d_free(load); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e7bdb45e..fc078708 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -386,6 +386,7 @@ struct hlsl_ir_resource_load enum hlsl_resource_load_type load_type; struct hlsl_deref resource, sampler; struct hlsl_src coords; + struct hlsl_src texcoord_offset; }; struct hlsl_ir_store @@ -707,7 +708,7 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_loc struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type, enum hlsl_resource_load_type type, struct hlsl_ir_var *resource, struct hlsl_ir_node *resource_offset, struct hlsl_ir_var *sampler, struct hlsl_ir_node *sampler_offset, struct hlsl_ir_node *coords, - const struct vkd3d_shader_location *loc); + struct hlsl_ir_node *texcoord_offset, const struct vkd3d_shader_location *loc); struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs); struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_ir_node *rhs, unsigned int writemask, struct vkd3d_shader_location loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ff35c09e..cb2f1aa1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1866,7 +1866,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl return false; if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD, - object_load->src.var, object_load->src.offset.node, NULL, NULL, coords, loc))) + object_load->src.var, object_load->src.offset.node, NULL, NULL, coords, NULL, loc))) return false; list_add_tail(instrs, &load->node.entry); return true; @@ -1876,6 +1876,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; struct hlsl_ir_resource_load *load; + struct hlsl_ir_node *offset = NULL; struct hlsl_ir_load *sampler_load; struct hlsl_ir_node *coords; @@ -1885,8 +1886,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl "Wrong number of arguments to method 'Sample': expected 2 or 3, but got %u.", params->args_count); return false; } - if (params->args_count == 3) - FIXME("Ignoring offset parameter.\n"); sampler_type = params->args[0]->data_type; if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER @@ -1908,9 +1907,16 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) coords = params->args[1]; + if (params->args_count == 3) + { + if (!(offset = add_implicit_conversion(ctx, instrs, params->args[2], + hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim), loc))) + offset = params->args[2]; + } + if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_SAMPLE, object_load->src.var, object_load->src.offset.node, - sampler_load->src.var, sampler_load->src.offset.node, coords, loc))) + sampler_load->src.var, sampler_load->src.offset.node, coords, offset, loc))) return false; list_add_tail(instrs, &load->node.entry); return true; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 8b0eb9b3..93b07ea5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -681,6 +681,8 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop } load->coords.node->last_read = instr->index; + if (load->texcoord_offset.node) + load->texcoord_offset.node->last_read = instr->index; break; } case HLSL_IR_SWIZZLE: -- 2.25.1

2 1

[PATCH 1/3] ws2_32: Implement AI_DNS_ONLY using DNS APIs.
by Hans Leidekker 30 Nov '21

30 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/Makefile.in | 2 +- dlls/ws2_32/protocol.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/protocol.c | 20 +++++++++ dlls/ws2_32/ws2_32_private.h | 1 + include/ws2def.h | 6 +++ 5 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 232ce7f31fd..83ae5e915ae 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -1,7 +1,7 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 -DELAYIMPORTS = advapi32 iphlpapi user32 +DELAYIMPORTS = dnsapi advapi32 iphlpapi user32 C_SRCS = \ async.c \ diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 492400b17a7..239e4d14cd2 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -69,6 +69,84 @@ static int do_getaddrinfo( const char *node, const char *service, } } +static int dns_only_query( const char *node, const struct addrinfo *hints, struct addrinfo **result ) +{ + DNS_STATUS status; + DNS_RECORDA *rec = NULL, *rec6 = NULL, *ptr; + struct addrinfo *info, *next; + struct sockaddr_in *addr; + struct sockaddr_in6 *addr6; + ULONG count = 0; + + if (hints->ai_family != AF_INET && hints->ai_family != AF_INET6 && hints->ai_family != AF_UNSPEC) + { + FIXME( "unsupported family %u\n", hints->ai_family ); + return EAI_FAMILY; + } + if (hints->ai_family == AF_INET || hints->ai_family == AF_UNSPEC) + { + status = DnsQuery_A( node, DNS_TYPE_A, DNS_QUERY_NO_NETBT | DNS_QUERY_NO_MULTICAST, NULL, &rec, NULL ); + if (status != ERROR_SUCCESS && status != DNS_ERROR_RCODE_NAME_ERROR) return EAI_FAIL; + } + if (hints->ai_family == AF_INET6 || hints->ai_family == AF_UNSPEC) + { + status = DnsQuery_A( node, DNS_TYPE_AAAA, DNS_QUERY_NO_NETBT | DNS_QUERY_NO_MULTICAST, NULL, &rec6, NULL ); + if (status != ERROR_SUCCESS && status != DNS_ERROR_RCODE_NAME_ERROR) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + return EAI_FAIL; + } + } + + for (ptr = rec; ptr; ptr = ptr->pNext) count++; + for (ptr = rec6; ptr; ptr = ptr->pNext) count++; + if (!count) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return WSAHOST_NOT_FOUND; + } + if (!(info = calloc( count, sizeof(*info) + sizeof(SOCKADDR_STORAGE) ))) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return WSA_NOT_ENOUGH_MEMORY; + } + *result = info; + + for (ptr = rec; ptr; ptr = ptr->pNext) + { + info->ai_family = AF_INET; + info->ai_socktype = hints->ai_socktype; + info->ai_protocol = hints->ai_protocol; + info->ai_addrlen = sizeof(struct sockaddr_in); + info->ai_addr = (struct sockaddr *)(info + 1); + addr = (struct sockaddr_in *)info->ai_addr; + addr->sin_family = info->ai_family; + addr->sin_addr.S_un.S_addr = ptr->Data.A.IpAddress; + next = (struct addrinfo *)((char *)info + sizeof(*info) + sizeof(SOCKADDR_STORAGE)); + if (--count) info->ai_next = next; + info = next; + } + for (ptr = rec6; ptr; ptr = ptr->pNext) + { + info->ai_family = AF_INET6; + info->ai_socktype = hints->ai_socktype; + info->ai_protocol = hints->ai_protocol; + info->ai_addrlen = sizeof(struct sockaddr_in6); + info->ai_addr = (struct sockaddr *)(info + 1); + addr6 = (struct sockaddr_in6 *)info->ai_addr; + addr6->sin6_family = info->ai_family; + memcpy( &addr6->sin6_addr, &ptr->Data.AAAA.Ip6Address, sizeof(addr6->sin6_addr) ); + next = (struct addrinfo *)((char *)info + sizeof(*info) + sizeof(SOCKADDR_STORAGE)); + if (--count) info->ai_next = next; + info = next; + } + + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return 0; +} /*********************************************************************** * getaddrinfo (ws2_32.@) @@ -96,6 +174,11 @@ int WINAPI getaddrinfo( const char *node, const char *service, if (!(fqdn = get_fqdn())) return WSA_NOT_ENOUGH_MEMORY; node = fqdn; } + else if (!service && hints && (hints->ai_flags == AI_DNS_ONLY || hints->ai_flags == (AI_ALL | AI_DNS_ONLY))) + { + ret = dns_only_query( node, hints, info ); + goto done; + } else if (!hints || hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET6) { /* [ipv6] or [ipv6]:portnumber are supported by Windows */ @@ -139,6 +222,7 @@ int WINAPI getaddrinfo( const char *node, const char *service, free( fqdn ); free( nodev6 ); +done: if (!ret && TRACE_ON(winsock)) { struct addrinfo *ai; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index bb09dc98f1c..6eebb5f6b4d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2328,6 +2328,26 @@ static void test_getaddrinfo(void) memset(&hint, 0, sizeof(hint)); ret = getaddrinfo(NULL, "nonexistentservice", &hint, &result); ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); + + result = NULL; + memset(&hint, 0, sizeof(hint)); + hint.ai_flags = AI_ALL | AI_DNS_ONLY; + hint.ai_family = AF_UNSPEC; + hint.ai_socktype = SOCK_STREAM; + hint.ai_protocol = IPPROTO_TCP; + ret = getaddrinfo("winehq.org", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(!result->ai_flags, "ai_flags == %08x\n", result->ai_flags); + ok(result->ai_family == AF_INET, "ai_family == %d\n", result->ai_family); + ok(result->ai_socktype == SOCK_STREAM, "ai_socktype == %d\n", result->ai_socktype); + ok(result->ai_protocol == IPPROTO_TCP, "ai_protocol == %d\n", result->ai_protocol); + ok(!result->ai_canonname, "ai_canonname == %s\n", result->ai_canonname); + ok(result->ai_addrlen == sizeof(struct sockaddr_in), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + sockaddr = (SOCKADDR_IN *)result->ai_addr; + ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); + ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); + freeaddrinfo(result); } static void test_dns(void) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 8ad3e0d17e9..fa2f89f6e98 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -48,6 +48,7 @@ #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" #include "ip2string.h" +#include "windns.h" #include "wine/afd.h" #include "wine/debug.h" #include "wine/unixlib.h" diff --git a/include/ws2def.h b/include/ws2def.h index 9ddfa031633..46fb80db470 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -284,6 +284,12 @@ typedef struct _WSAMSG { (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) +#ifndef USE_WS_PREFIX +#define AI_DNS_ONLY 0x00000010 +#else +#define WS_AI_DNS_ONLY 0x00000010 +#endif + typedef struct addrinfoexA { int ai_flags; int ai_family; -- 2.30.2

2 1

[PATCH 3/3] wininet: Use DNS only for proxy auto-detection.
by Hans Leidekker 30 Nov '21

30 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/internet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 46fbe86f549..b0fe8a5e3fb 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2431,7 +2431,7 @@ static WCHAR *detect_proxy_autoconfig_url_dns(void) while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { char *name; - struct addrinfo *ai; + struct addrinfo *ai, hints; int res; if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) @@ -2442,7 +2442,10 @@ static WCHAR *detect_proxy_autoconfig_url_dns(void) } strcpy( name, "wpad" ); strcat( name, p ); - res = getaddrinfo( name, NULL, NULL, &ai ); + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = AI_ALL | AI_DNS_ONLY; + hints.ai_family = AF_UNSPEC; + res = getaddrinfo( name, NULL, &hints, &ai ); if (!res) { ret = build_wpad_url( name, ai ); -- 2.30.2

1 0

[PATCH 2/3] winhttp: Use DNS only for proxy auto-detection.
by Hans Leidekker 30 Nov '21

30 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3c8cb0fa992..2620bf30ac0 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1466,7 +1466,7 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { char *name; - struct addrinfo *ai; + struct addrinfo *ai, hints; int res; if (!(name = malloc( sizeof("wpad") + strlen(p) ))) @@ -1477,7 +1477,10 @@ static WCHAR *detect_autoproxyconfig_url_dns(void) } strcpy( name, "wpad" ); strcat( name, p ); - res = getaddrinfo( name, NULL, NULL, &ai ); + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = AI_ALL | AI_DNS_ONLY; + hints.ai_family = AF_UNSPEC; + res = getaddrinfo( name, NULL, &hints, &ai ); if (!res) { ret = build_wpad_url( name, ai ); -- 2.30.2

1 0

[PATCH 2/2] user.exe: Fix WM_ERASEBKGND HDC param conversion in WINPROC_CallProc16To32A.
by Jacek Caban 30 Nov '21

30 Nov '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51624 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/message.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 1/2] user.exe: Use WINPROC_CallProc16To32A for DefWindowProc16.
by Jacek Caban 30 Nov '21

30 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51624 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51899 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user.exe16/message.c | 80 ++++----------------------------------- 1 file changed, 8 insertions(+), 72 deletions(-)

1 0

[PATCH] ntdll: Move the FILE ptr into the blocks that use it.
by Huw Davies 30 Nov '21

30 Nov '21

This is to prevent compiler warnings on non-linux platforms. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 61 ++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 91184b12dba..941c69190fb 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1848,18 +1848,21 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) { unsigned long long totalram = 0, freeram = 0, totalswap = 0, freeswap = 0; - FILE *fp; memset( info, 0, sizeof(*info) ); #if defined(linux) - if ((fp = fopen("/proc/uptime", "r"))) { - double uptime, idle_time; + FILE *fp; - fscanf(fp, "%lf %lf", &uptime, &idle_time); - fclose(fp); - info->IdleTime.QuadPart = 10000000 * idle_time; + if ((fp = fopen("/proc/uptime", "r"))) + { + double uptime, idle_time; + + fscanf(fp, "%lf %lf", &uptime, &idle_time); + fclose(fp); + info->IdleTime.QuadPart = 10000000 * idle_time; + } } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) { @@ -1885,27 +1888,31 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) #endif #ifdef linux - if ((fp = fopen("/proc/meminfo", "r"))) - { - unsigned long long value; - char line[64]; - - while (fgets(line, sizeof(line), fp)) - { - if(sscanf(line, "MemTotal: %llu kB", &value) == 1) - totalram += value * 1024; - else if(sscanf(line, "MemFree: %llu kB", &value) == 1) - freeram += value * 1024; - else if(sscanf(line, "SwapTotal: %llu kB", &value) == 1) - totalswap += value * 1024; - else if(sscanf(line, "SwapFree: %llu kB", &value) == 1) - freeswap += value * 1024; - else if (sscanf(line, "Buffers: %llu", &value)) - freeram += value * 1024; - else if (sscanf(line, "Cached: %llu", &value)) - freeram += value * 1024; - } - fclose(fp); + { + FILE *fp; + + if ((fp = fopen("/proc/meminfo", "r"))) + { + unsigned long long value; + char line[64]; + + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &value) == 1) + totalram += value * 1024; + else if(sscanf(line, "MemFree: %llu kB", &value) == 1) + freeram += value * 1024; + else if(sscanf(line, "SwapTotal: %llu kB", &value) == 1) + totalswap += value * 1024; + else if(sscanf(line, "SwapFree: %llu kB", &value) == 1) + freeswap += value * 1024; + else if (sscanf(line, "Buffers: %llu", &value)) + freeram += value * 1024; + else if (sscanf(line, "Cached: %llu", &value)) + freeram += value * 1024; + } + fclose(fp); + } } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \ defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) -- 2.23.0

1 0

[PATCH v4 9/9] winex11.drv: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 537 ++------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 +- 5 files changed, 32 insertions(+), 512 deletions(-)

2 1

[PATCH v4 8/9] user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Jacek Caban 30 Nov '21

30 Nov '21

Also preserve last error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

3 3

[PATCH v4 7/9] win32u: Implement NtUserEnumDisplayDevices.
by Jacek Caban 30 Nov '21

30 Nov '21

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 335 +---------------------------------- dlls/win32u/dc.c | 6 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/sysparams.c | 71 ++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 33 +++- dlls/win32u/wrappers.c | 10 +- include/ntuser.h | 2 + 9 files changed, 112 insertions(+), 349 deletions(-)

2 1

[PATCH v4 6/9] winex11.drv: Use gdi driver types for display device handler.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 18 ++++++------ dlls/winex11.drv/display.c | 24 ++++++++-------- dlls/winex11.drv/x11drv.h | 55 +++++-------------------------------- dlls/winex11.drv/xinerama.c | 20 +++++++------- dlls/winex11.drv/xrandr.c | 47 +++++++++++++++---------------- 5 files changed, 62 insertions(+), 102 deletions(-)

2 1

[PATCH v4 5/9] win32u: Implement monitor registration.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-)

2 1

[PATCH v2] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.
by Mohamad Al-Jaf 30 Nov '21

30 Nov '21

Enable Microsoft Edge to run in Windows 10 mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51437 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: Fix incorrect spec file parameter. (Thanks Connor McAdams and Nikolay Sivov) --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 44fd42742d9..f1cf06ed4f5 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -324,6 +324,15 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +/*********************************************************************** + * UiaRaiseAutomationPropertyChangedEvent (uiautomationcore.@) + */ +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new) +{ + FIXME("(%p, %d, %s, %s): stub\n", provider, id, debugstr_variant(&old), debugstr_variant(&new)); + return S_OK; +} + void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) { FIXME("(%p): stub\n", callback); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 656641c4bad..82071bd2317 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -86,7 +86,7 @@ #@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) -@ stub UiaRaiseAutomationPropertyChangedEvent +@ stdcall UiaRaiseAutomationPropertyChangedEvent(ptr long int128 int128) #@ stub UiaRaiseChangesEvent #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..563d5c602bd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -66,6 +66,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); -- 2.34.1

2 1

[PATCH v4 4/9] win32u: Implement display adapter registration.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 67 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-)

2 1

[PATCH v4 3/9] win32u: Implement GPU registration.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 473 ++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 481 insertions(+), 8 deletions(-)

2 1

[PATCH v4 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)

2 1

[PATCH v4 1/9] win32u: Implement NtUserGetDisplayConfigBufferSizes.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) create mode 100644 dlls/win32u/sysparams.c

2 1

[PATCH] winemac: Remove unused variable.
by Huw Davies 30 Nov '21

30 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index fe48437849d..ffafb0bd1d2 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -429,7 +429,7 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C HKEY hkey; DWORD type, size; DWORD refresh100; - WCHAR* pixel_encoding = NULL, *end; + WCHAR* pixel_encoding = NULL; init_original_display_mode(); -- 2.23.0

1 0

[PATCH v3 1/2] include: Define ISpeechSynthesizer interface.
by Paul Gofman 30 Nov '21

30 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - remove unused 'apicontract MediaControlContract'; - add 'requires' to ISpeechSynthesisStream. include/Makefile.in | 1 + include/windows.foundation.idl | 9 ++++ include/windows.media.idl | 43 ++++++++++++++++ include/windows.media.speechsynthesis.idl | 63 +++++++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 include/windows.media.idl diff --git a/include/Makefile.in b/include/Makefile.in index acb55b37f6c..b230804974c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -776,6 +776,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.idl \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index fe09dc66edd..292522f2c49 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -119,6 +119,15 @@ namespace Windows { { HRESULT ToString([out, retval] HSTRING *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } } } diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..fe81c768361 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,43 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..29dca510dee 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,10 +36,27 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } + namespace Storage { + namespace Streams { + interface IRandomAccessStreamWithContentType; + interface IRandomAccessStream; + interface IInputStream; + interface IOutputStream; + interface IContentTypeProvider; + } + } +} + +namespace Windows { + namespace Media { + interface IMediaMarker; + } } namespace Windows { @@ -48,6 +66,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +84,34 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] + interface ISpeechSynthesisStream : IInspectable + requires + Windows.Storage.Streams.IRandomAccessStreamWithContentType, + Windows.Storage.Streams.IRandomAccessStream, + Windows.Foundation.IClosable, + Windows.Storage.Streams.IInputStream, + Windows.Storage.Streams.IOutputStream, + Windows.Storage.Streams.IContentTypeProvider + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +146,20 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + interface Windows.Storage.Streams.IRandomAccessStreamWithContentType; + interface Windows.Storage.Streams.IContentTypeProvider; + interface Windows.Storage.Streams.IRandomAccessStream; + interface Windows.Storage.Streams.IOutputStream; + interface Windows.Foundation.IClosable; + interface Windows.Storage.Streams.IInputStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- 2.33.1

2 3

[PATCH v2 1/2] include: Define ISpeechSynthesizer interface.
by Paul Gofman 30 Nov '21

30 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - split off .idl modifications into a separate patch. include/Makefile.in | 1 + include/windows.foundation.idl | 9 +++++ include/windows.media.idl | 48 +++++++++++++++++++++++ include/windows.media.speechsynthesis.idl | 41 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 include/windows.media.idl diff --git a/include/Makefile.in b/include/Makefile.in index 756e25dcc82..530c5b73f19 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -775,6 +775,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.idl \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index fe09dc66edd..292522f2c49 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -119,6 +119,15 @@ namespace Windows { { HRESULT ToString([out, retval] HSTRING *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } } } diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..94a9a516245 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + apicontract MediaControlContract; + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contractversion(1.0)] + apicontract MediaControlContract { + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..431fa9243be 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,12 +36,20 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } } +namespace Windows { + namespace Media { + interface IMediaMarker; + } +} + namespace Windows { namespace Media { namespace SpeechSynthesis { @@ -48,6 +57,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +75,27 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] + interface ISpeechSynthesisStream : IInspectable + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +130,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- 2.33.1

2 4

[PATCH v3 9/9] winex11: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban 30 Nov '21

30 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 537 ++------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 +- 5 files changed, 32 insertions(+), 512 deletions(-)

3 3

[PATCH 1/5] configure: Fix the makefile path for libxml2 and libxslt.
by Zebediah Figura 30 Nov '21

30 Nov '21

They were not correctly being disabled if an external library was specified, which was causing msxml3 to link to the bundled version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 72f580cbf0f..163d06fc327 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,8 +1041,8 @@ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") -WINE_EXTLIB_FLAGS(XML2, libxml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") -WINE_EXTLIB_FLAGS(XSLT, libxslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") +WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") +WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") dnl **** Check for pthread **** -- 2.34.0

2 5

[PATCH 4/4] uxtheme: Reference count theme classes.
by Zhiyi Zhang 30 Nov '21

30 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 9 ++++++++- dlls/uxtheme/msstyles.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index d834c9604b9..8377ca9ebce 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -446,6 +446,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST cur = heap_alloc(sizeof(*cur)); cur->signature = THEME_CLASS_SIGNATURE; + cur->refcount = 0; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1030,6 +1031,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tfActiveTheme; cls->tf->dwRefCount++; + InterlockedIncrement(&cls->refcount); cls->dpi = dpi; } return cls; @@ -1049,6 +1051,8 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + LONG refcount; + __TRY { if (tc->signature != THEME_CLASS_SIGNATURE) @@ -1066,7 +1070,10 @@ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) return E_HANDLE; } - MSSTYLES_CloseThemeFile (tc->tf); + refcount = InterlockedDecrement(&tc->refcount); + /* Some buggy apps may double free HTHEME handles */ + if (refcount >= 0) + MSSTYLES_CloseThemeFile(tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 89937227ee2..8db0aa4c03c 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -50,6 +50,7 @@ struct _THEME_FILE; typedef struct _THEME_CLASS { DWORD signature; + LONG refcount; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; -- 2.32.0

1 0

[PATCH 3/4] uxtheme: Protect CloseThemeData() from invalid input.
by Zhiyi Zhang 30 Nov '21

30 Nov '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> With test case by Michael Müller <michael(a)fds-team.de>. Some applications closes the same HTHEME more than once, causing use-after-free. HTHEME is a handle rather than a pointer. Some testing shows that it's a handle starting from 0x10000 or 0x20000. Each new handle increments from the first handle and closing handles decrements it. I prefer not to implement this handle to data map for now because it will likely hurt performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29974 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 22 ++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 2 ++ 3 files changed, 25 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index c0f626d54aa..d834c9604b9 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -32,6 +32,7 @@ #include "msstyles.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/heap.h" @@ -48,6 +49,8 @@ static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPC #define MSSTYLES_VERSION 0x0003 +#define THEME_CLASS_SIGNATURE 0x12bc6d83 + static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -203,6 +206,7 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) pcls->partstate = ps->next; heap_free(ps); } + pcls->signature = 0; heap_free(pcls); } } @@ -441,6 +445,7 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST if(cur) return cur; cur = heap_alloc(sizeof(*cur)); + cur->signature = THEME_CLASS_SIGNATURE; cur->hTheme = tf->hTheme; lstrcpyW(cur->szAppName, pszAppName); lstrcpyW(cur->szClassName, pszClassName); @@ -1044,6 +1049,23 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList, U */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + __TRY + { + if (tc->signature != THEME_CLASS_SIGNATURE) + tc = NULL; + } + __EXCEPT_PAGE_FAULT + { + tc = NULL; + } + __ENDTRY + + if (!tc) + { + WARN("Invalid theme class handle\n"); + return E_HANDLE; + } + MSSTYLES_CloseThemeFile (tc->tf); return S_OK; } diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..89937227ee2 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -49,6 +49,7 @@ typedef struct _THEME_PARTSTATE { struct _THEME_FILE; typedef struct _THEME_CLASS { + DWORD signature; HMODULE hTheme; struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 10857115061..ebf66f6b5af 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -768,6 +768,8 @@ static void test_CloseThemeData(void) ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); hRes = CloseThemeData(INVALID_HANDLE_VALUE); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); + hRes = CloseThemeData((HTHEME)0xdeadbeef); + ok(hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } static void test_buffer_dc_props(HDC hdc, const RECT *rect) -- 2.32.0

1 0

[PATCH 2/4] uxtheme: Call DefDlgProc() if drawing tab body in a dialog fails.
by Zhiyi Zhang 30 Nov '21

30 Nov '21

Some third party themes have tab body part defined but with its ImageSelectType set to IST_NONE. In this case, DrawThemeBackground() will fail to draw the background. Fix track bar black background in winecfg when using VLT theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/dialog.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index a949bfc6579..d0055e013a0 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -38,8 +38,9 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa static const WCHAR themeClass[] = L"Window"; BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); BOOL doTheming = themingActive && (theme != NULL); + HRESULT hr = E_FAIL; LRESULT result; - + switch (msg) { case WM_CREATE: @@ -78,13 +79,11 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa NULL); #endif return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - else - /* We might have gotten a TAB theme class, so check if we can - * draw as a tab page. */ - if (IsThemePartDefined (theme, TABP_BODY, 0)) - DrawThemeBackground (theme, (HDC)wParam, TABP_BODY, 0, &rc, - NULL); - else + /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ + else if (IsThemePartDefined(theme, TABP_BODY, 0)) + hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); + + if (FAILED(hr)) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); } return 1; -- 2.32.0

1 0

[PATCH 1/4] uxtheme: Use StretchBlt() when resizing a source image for tiling.
by Zhiyi Zhang 30 Nov '21

30 Nov '21

For example, when a theme part has a source image with 0xff00ff as transparent pixels and the sizing margin is larger than the destination, the source image is first resized to fit the destination, during which, StretchBlt() should be used instead of TransparentBlt() because the image should not be blended with the temporary memory device context. Fix group box background may be drawn in black. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index bf294ed3cc8..04ea1e79df9 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -779,8 +779,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); SelectObject(hdcSrc, bmpSrcResized); + /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); rcSrc.left = 0; rcSrc.top = 0; -- 2.32.0

1 0

Re: [PATCH 4/4] uiautomationcore: Add UiaRaiseAutomationPropertyChangedEvent stub.
by Nikolay Sivov 30 Nov '21

30 Nov '21

On 11/29/21 12:18 PM, Mohamad Al-Jaf wrote: > Hi Nikolay, Please reply-all next time to include the list. > > I see, that would explain why it fails to compile in 32-bit Wine. But > how does it compile on the 64-bit version? It worked just fine and the > FIXME channel displayed the correct debugstr_variant output. > > This was the original code: > > HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple > *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue) > { > FIXME("(%p, %d, %s, %s): stub\n", provider, id, > debugstr_variant(&oldValue), debugstr_variant(&newValue)); > return S_OK; > } > > HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple > *provider, PROPERTYID id, VARIANT oldValue, VARIANT newValue); > > I'm not sure I understand how the prototype is wrong, can you please > explain it to me? What doesn't compile? Prototype has to match the one used on Windows, you can't change that for exported functions. > > For stubs, I thought they were unimplemented functions that simply > returned either a boolean or a single value. So in this case, would it > be an implementation? I'm not sure what to put in the subject line. > The function above it, UiaRaiseAutomationEvent, also returns a value, > the same one. Sorry, I'm just trying to understand you and learn more. Connor has been working on this lately, I'll leave it to him to comment. > > On Mon, Nov 29, 2021 at 3:09 AM Nikolay Sivov <nsivov(a)codeweavers.com > <mailto:nsivov@codeweavers.com>> wrote: > > > > On 11/29/21 10:35 AM, Mohamad Al-Jaf wrote: > > > +/*********************************************************************** > > + * UiaRaiseAutomationPropertyChangedEvent > (uiautomationcore.@) > > + */ > > +HRESULT WINAPI > UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple > *provider, PROPERTYID id, VARIANT *oldValue, VARIANT *newValue) > > +{ > > + FIXME("(%p, %d, %p, %p): stub\n", provider, id, oldValue, > newValue); > > + return S_OK; > > +} > The prototype is wrong, and return value is not what stubs usually > have. >

3 5

[PATCH v2 1/2] kernel32/tests: add tests for EnumCalendarInfo(Ex).
by Jinoh Kang 30 Nov '21

30 Nov '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/kernel32/tests/locale.c | 169 +++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index cad2577379b..a5c2ad1068d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7008,6 +7008,171 @@ static void test_geo_name(void) RegCloseKey(key); } +static const LCID locales_with_optional_calendars[] = { + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_LEBANON), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_EGYPT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_ALGERIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_IRAQ), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_JORDAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_KUWAIT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_LIBYA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_MOROCCO), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_OMAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_QATAR), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_SYRIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_TUNISIA), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_UAE), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_ARABIC, SUBLANG_ARABIC_YEMEN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_DIVEHI, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_PERSIAN, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_THAI, SUBLANG_DEFAULT), SORT_DEFAULT), + MAKELCID(MAKELANGID(LANG_URDU, SUBLANG_URDU_PAKISTAN), SORT_DEFAULT) +}; + +static BOOL CALLBACK calinfo_procA(LPSTR calinfo) +{ + (void)calinfo; + return TRUE; +} + +static void test_EnumCalendarInfoA(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoA( calinfo_procA, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoA( calinfo_procA, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) +{ + (void)calinfo; + return TRUE; +} + +static void test_EnumCalendarInfoW(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoW( calinfo_procW, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoW( calinfo_procW, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) +{ + (void)calinfo; + (void)calid; + return TRUE; +} + +static void test_EnumCalendarInfoExA(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoExA( calinfoex_procA, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoExA( calinfoex_procA, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + +static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) +{ + (void)calinfo; + (void)calid; + return TRUE; +} + +static void test_EnumCalendarInfoExW(void) +{ + INT i; + + if (!strcmp(winetest_platform, "wine")) + { + skip("EnumCalendarInfo broken on Wine (test would hang with an infinite loop)\n"); + return; + } + + ok( EnumCalendarInfoExW( calinfoex_procW, + LOCALE_USER_DEFAULT, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), + "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + + for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) + { + LCID lcid = locales_with_optional_calendars[i]; + ok( EnumCalendarInfoExW( calinfoex_procW, + lcid, + ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || + broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -7060,4 +7225,8 @@ START_TEST(locale) test_NLSVersion(); test_geo_name(); test_sorting(); + test_EnumCalendarInfoA(); + test_EnumCalendarInfoW(); + test_EnumCalendarInfoExA(); + test_EnumCalendarInfoExW(); } -- 2.31.1

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel