February 2021 - Wine-devel - list.winehq.org

[PATCH] mscoree: Improve non-neutral assembly lookup logic.
by Rémi Bernon 03 Feb '21

03 Feb '21

And neutral logic too, and the combinations with custom privatePath config. This fixes a crash with Mafia III launcher, when it tries to load its localized strings from culture-specific assemblies to display its warning popup message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mscoree/metahost.c | 75 ++++++-- dlls/mscoree/tests/loadpaths.dll.cs | 33 ++++ dlls/mscoree/tests/loadpaths.exe.config | 8 + dlls/mscoree/tests/loadpaths.exe.cs | 28 +++ dlls/mscoree/tests/mscoree.c | 226 ++++++++++++++++++++++++ dlls/mscoree/tests/resource.rc | 9 + 6 files changed, 360 insertions(+), 19 deletions(-) create mode 100644 dlls/mscoree/tests/loadpaths.dll.cs create mode 100644 dlls/mscoree/tests/loadpaths.exe.config create mode 100644 dlls/mscoree/tests/loadpaths.exe.cs diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index a3ed1534753..d9b599fadc7 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -29,6 +29,7 @@ #include "winreg.h" #include "winternl.h" #include "ole2.h" +#include "shlwapi.h" #include "corerror.h" #include "cor.h" @@ -87,6 +88,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status); const char* (CDECL *mono_assembly_name_get_name)(MonoAssemblyName *aname); +const char* (CDECL *mono_assembly_name_get_culture)(MonoAssemblyName *aname); MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly); MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); @@ -193,6 +195,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_assembly_get_image); LOAD_MONO_FUNCTION(mono_assembly_load_from); LOAD_MONO_FUNCTION(mono_assembly_name_get_name); + LOAD_MONO_FUNCTION(mono_assembly_name_get_culture); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_class_from_mono_type); @@ -1651,24 +1654,48 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int return hr; } +static MonoAssembly* mono_assembly_try_load(WCHAR *path) +{ + MonoAssembly *result = NULL; + MonoImageOpenStatus stat; + char *pathA; + + if (!(pathA = WtoA(path))) return NULL; + + result = mono_assembly_open(pathA, &stat); + HeapFree(GetProcessHeap(), 0, pathA); + + if (result) TRACE("found: %s\n", debugstr_w(path)); + return result; +} + static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; char *stringname=NULL; const char *assemblyname; - LPWSTR stringnameW; - int stringnameW_size; + const char *culture; + LPWSTR stringnameW, cultureW; + int stringnameW_size, cultureW_size; WCHAR path[MAX_PATH]; char *pathA; MonoImageOpenStatus stat; DWORD search_flags; int i; static const WCHAR dotdllW[] = {'.','d','l','l',0}; - static const WCHAR slashW[] = {'\\',0}; + static const WCHAR dotexeW[] = {'.','e','x','e',0}; stringname = mono_stringify_assembly_name(aname); assemblyname = mono_assembly_name_get_name(aname); + culture = mono_assembly_name_get_culture(aname); + if (culture) + { + cultureW_size = MultiByteToWideChar(CP_UTF8, 0, culture, -1, NULL, 0); + cultureW = HeapAlloc(GetProcessHeap(), 0, cultureW_size * sizeof(WCHAR)); + if (cultureW) MultiByteToWideChar(CP_UTF8, 0, culture, -1, cultureW, cultureW_size); + } + else cultureW = NULL; TRACE("%s\n", debugstr_a(stringname)); @@ -1684,26 +1711,34 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, stringnameW, stringnameW_size); for (i = 0; private_path[i] != NULL; i++) { + /* This is the lookup order used in Mono */ + /* 1st try: [culture]/[name].dll (culture may be empty) */ wcscpy(path, private_path[i]); - wcscat(path, slashW); - wcscat(path, stringnameW); + if (cultureW) PathAppendW(path, cultureW); + PathAppendW(path, stringnameW); wcscat(path, dotdllW); - pathA = WtoA(path); - if (pathA) - { - result = mono_assembly_open(pathA, &stat); - if (result) - { - TRACE("found: %s\n", debugstr_w(path)); - HeapFree(GetProcessHeap(), 0, pathA); - HeapFree(GetProcessHeap(), 0, stringnameW); - mono_free(stringname); - return result; - } - HeapFree(GetProcessHeap(), 0, pathA); - } + result = mono_assembly_try_load(path); + if (result) break; + + /* 2nd try: [culture]/[name].exe (culture may be empty) */ + wcscpy(path + wcslen(path) - wcslen(dotdllW), dotexeW); + result = mono_assembly_try_load(path); + if (result) break; + + /* 3rd try: [culture]/[name]/[name].dll (culture may be empty) */ + path[wcslen(path) - wcslen(dotexeW)] = 0; + PathAppendW(path, stringnameW); + wcscat(path, dotdllW); + result = mono_assembly_try_load(path); + if (result) break; + + /* 4th try: [culture]/[name]/[name].exe (culture may be empty) */ + wcscpy(path + wcslen(path) - wcslen(dotdllW), dotexeW); + result = mono_assembly_try_load(path); + if (result) break; } HeapFree(GetProcessHeap(), 0, stringnameW); + if (result) goto done; } } @@ -1745,6 +1780,8 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname else TRACE("skipping Windows GAC search due to override setting\n"); +done: + if (cultureW) HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); return result; diff --git a/dlls/mscoree/tests/loadpaths.dll.cs b/dlls/mscoree/tests/loadpaths.dll.cs new file mode 100644 index 00000000000..99732b011d8 --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.dll.cs @@ -0,0 +1,33 @@ +/* + * Copyright 2021 Rémi Bernon 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 + */ + +using System.Reflection; + +#if NEUTRAL +[assembly: AssemblyCulture("")] +#else +[assembly: AssemblyCulture("en")] +#endif + +namespace LoadPaths +{ + public class Test2 + { + public int Foo() { return 0; } + } +} diff --git a/dlls/mscoree/tests/loadpaths.exe.config b/dlls/mscoree/tests/loadpaths.exe.config new file mode 100644 index 00000000000..be6d9fb95cd --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.exe.config @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <probing privatePath="private"/> + </assemblyBinding> + </runtime> +</configuration> diff --git a/dlls/mscoree/tests/loadpaths.exe.cs b/dlls/mscoree/tests/loadpaths.exe.cs new file mode 100644 index 00000000000..22c32603c59 --- /dev/null +++ b/dlls/mscoree/tests/loadpaths.exe.cs @@ -0,0 +1,28 @@ +/* + * Copyright 2021 Rémi Bernon 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 + */ + +namespace LoadPaths +{ + public static class Test + { + static int Main(string[] args) + { + return new Test2().Foo(); + } + } +} diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 26c06246a94..4be3da8c731 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -538,6 +538,229 @@ static void test_createinstance(void) } } +static BOOL write_resource(const WCHAR *resource, const WCHAR *filename) +{ + HANDLE file; + HRSRC rsrc; + void *data; + DWORD size; + BOOL ret; + + rsrc = FindResourceW(GetModuleHandleW(NULL), resource, MAKEINTRESOURCEW(RT_RCDATA)); + if (!rsrc) return FALSE; + + data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!data) return FALSE; + + size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!size) return FALSE; + + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (file == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(file, data, size, &size, NULL); + CloseHandle(file); + return ret; +} + +static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *type, const WCHAR *args) +{ + static const WCHAR *csc = L"C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + WCHAR cmdline[2 * MAX_PATH + 74]; + PROCESS_INFORMATION pi; + STARTUPINFOW si = { 0 }; + BOOL ret; + + if (!PathFileExistsW(csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s /t:%s %s /out:\"%s\" \"%s\"", csc, type, args, target, source); + + si.cb = sizeof(si); + ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsW(target); + ok(ret, "Compilation failed\n"); + + return ret; +} + +static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, const WCHAR *cfg_name, + const WCHAR *dll_dest, BOOL expect_failure, BOOL todo) +{ + WCHAR tmp[MAX_PATH], tmpdir[MAX_PATH], tmpexe[MAX_PATH], tmpcfg[MAX_PATH], tmpdll[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOW si = { 0 }; + WCHAR *ptr, *end; + DWORD exit_code = 0xdeadbeef; + LUID id; + BOOL ret; + + GetTempPathW(MAX_PATH, tmp); + ret = AllocateLocallyUniqueId(&id); + ok(ret, "AllocateLocallyUniqueId failed: %u\n", GetLastError()); + ret = GetTempFileNameW(tmp, L"loadpaths", id.LowPart, tmpdir); + ok(ret, "GetTempFileNameW failed: %u\n", GetLastError()); + + ret = CreateDirectoryW(tmpdir, NULL); + ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + + wcscpy(tmpexe, tmpdir); + PathAppendW(tmpexe, exe_name); + ret = CopyFileW(exe_name, tmpexe, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + if (cfg_name) + { + wcscpy(tmpcfg, tmpdir); + PathAppendW(tmpcfg, cfg_name); + ret = CopyFileW(cfg_name, tmpcfg, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + } + + ptr = tmpdir + wcslen(tmpdir); + PathAppendW(tmpdir, dll_dest); + while (*ptr && (ptr = wcschr(ptr + 1, '\\'))) + { + *ptr = '\0'; + ret = CreateDirectoryW(tmpdir, NULL); + ok(ret, "CreateDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + *ptr = '\\'; + } + + wcscpy(tmpdll, tmpdir); + if ((ptr = wcsrchr(tmpdir, '\\'))) *ptr = '\0'; + + ret = CopyFileW(dll_name, tmpdll, FALSE); + ok(ret, "CopyFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + + si.cb = sizeof(si); + ret = CreateProcessW(tmpexe, tmpexe, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + if (expect_failure) ret = WaitForSingleObject(pi.hProcess, 500); + else + { + ret = WaitForSingleObject(pi.hProcess, 5000); + ok(ret == WAIT_OBJECT_0, "%s: WaitForSingleObject returned %d: %u\n", debugstr_w(dll_dest), ret, GetLastError()); + } + + GetExitCodeProcess(pi.hProcess, &exit_code); + if (ret == WAIT_TIMEOUT) TerminateProcess(pi.hProcess, 0xdeadbeef); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + if (expect_failure) todo_wine_if(todo) ok(exit_code != 0, "%s: Succeeded to execute process\n", debugstr_w(dll_dest)); + else ok(exit_code == 0, "%s: Failed to execute process\n", debugstr_w(dll_dest)); + + /* sometimes the failing process never returns, in which case cleaning up won't work */ + if (ret == WAIT_TIMEOUT && expect_failure) return; + + if (cfg_name) + { + ret = DeleteFileW(tmpcfg); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpcfg), GetLastError()); + } + ret = DeleteFileW(tmpdll); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpdll), GetLastError()); + ret = DeleteFileW(tmpexe); + ok(ret, "DeleteFileW(%s) failed: %u\n", debugstr_w(tmpexe), GetLastError()); + + end = tmpdir + wcslen(tmp); + ptr = tmpdir + wcslen(tmpdir) - 1; + while (ptr > end && (ptr = wcsrchr(tmpdir, '\\'))) + { + ret = RemoveDirectoryW(tmpdir); + ok(ret, "RemoveDirectoryW(%s) failed: %u\n", debugstr_w(tmpdir), GetLastError()); + *ptr = '\0'; + } +} + +static void test_loadpaths(BOOL neutral) +{ + static const WCHAR *loadpaths[] = {L"", L"en", L"libloadpaths", L"en\\libloadpaths"}; + static const WCHAR *dll_source = L"loadpaths.dll.cs"; + static const WCHAR *dll_name = L"libloadpaths.dll"; + static const WCHAR *exe_source = L"loadpaths.exe.cs"; + static const WCHAR *exe_name = L"loadpaths.exe"; + static const WCHAR *cfg_name = L"loadpaths.exe.config"; + WCHAR tmp[MAX_PATH]; + BOOL ret; + int i; + + DeleteFileW(dll_source); + ret = write_resource(dll_source, dll_source); + ok(ret, "Could not write resource: %u\n", GetLastError()); + DeleteFileW(dll_name); + ret = compile_cs(dll_source, dll_name, L"library", neutral ? L"-define:NEUTRAL" : L""); + if (!ret) return; + ret = DeleteFileW(dll_source); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + + DeleteFileW(exe_source); + ret = write_resource(exe_source, exe_source); + ok(ret, "Could not write resource: %u\n", GetLastError()); + DeleteFileW(exe_name); + ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + if (!ret) return; + ret = DeleteFileW(exe_source); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + + DeleteFileW(cfg_name); + ret = write_resource(cfg_name, cfg_name); + ok(ret, "Could not write resource: %u\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(loadpaths); ++i) + { + const WCHAR *path = loadpaths[i]; + BOOL expect_failure = neutral ? wcsstr(path, L"en") != NULL + : wcsstr(path, L"en") == NULL; + + wcscpy(tmp, path); + PathAppendW(tmp, dll_name); + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, expect_failure, !neutral && !*path); + + wcscpy(tmp, L"private"); + if (*path) PathAppendW(tmp, path); + PathAppendW(tmp, dll_name); + + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, TRUE, FALSE); + test_loadpaths_execute(exe_name, dll_name, cfg_name, tmp, expect_failure, FALSE); + + /* exe name for dll should work too */ + if (*path) + { + wcscpy(tmp, path); + PathAppendW(tmp, dll_name); + wcscpy(tmp + wcslen(tmp) - 4, L".exe"); + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, expect_failure, FALSE); + } + + wcscpy(tmp, L"private"); + if (*path) PathAppendW(tmp, path); + PathAppendW(tmp, dll_name); + wcscpy(tmp + wcslen(tmp) - 4, L".exe"); + + test_loadpaths_execute(exe_name, dll_name, NULL, tmp, TRUE, FALSE); + test_loadpaths_execute(exe_name, dll_name, cfg_name, tmp, expect_failure, FALSE); + } + + ret = DeleteFileW(cfg_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ret = DeleteFileW(exe_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); + ret = DeleteFileW(dll_name); + ok(ret, "DeleteFileW failed: %u\n", GetLastError()); +} + static void test_createdomain(void) { static const WCHAR test_name[] = {'t','e','s','t',0}; @@ -650,5 +873,8 @@ START_TEST(mscoree) test_createdomain(); } + test_loadpaths(FALSE); + test_loadpaths(TRUE); + FreeLibrary(hmscoree); } diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc index 9a1b89f6569..34516f744a0 100644 --- a/dlls/mscoree/tests/resource.rc +++ b/dlls/mscoree/tests/resource.rc @@ -28,3 +28,12 @@ comtest_exe.manifest RCDATA comtest_exe.manifest /* @makedep: comtest_dll.manifest */ comtest_dll.manifest RCDATA comtest_dll.manifest + +/* @makedep: loadpaths.exe.cs */ +loadpaths.exe.cs RCDATA loadpaths.exe.cs + +/* @makedep: loadpaths.dll.cs */ +loadpaths.dll.cs RCDATA loadpaths.dll.cs + +/* @makedep: loadpaths.exe.config */ +loadpaths.exe.config RCDATA loadpaths.exe.config -- 2.30.0

2 1

[PATCH] gdiplus/tests: Test image brush transformation.
by Haoyang Chen 03 Feb '21

03 Feb '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/gdiplus/tests/brush.c | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 78939e68991..0287078bc80 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <math.h> #include "objbase.h" @@ -274,6 +275,37 @@ static void test_transform(void) GpPointF start, end; GpRectF rectf; REAL elements[6]; + UINT buf[15]; + HBITMAP hbmp,old; + HDC dcmem; + BITMAP bm; + GpImage *image; + IStream *stream; + HGLOBAL hglob; + VOID *data; + HRESULT hr; + LONG size; + + /* 3*5 bmp 32bit*/ + static const unsigned char bmpimage[] = { + 0x42,0x4d,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00, + 0x00,0x00,0x28,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00, + 0x00,0x00,0x01,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x3e,0x00, + 0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00, + 0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00,0xff,0x11,0xff,0x00, + 0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00,0xff,0x33,0xff,0x00, + 0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00,0xff,0x55,0xff,0x00, + 0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00,0xff,0xaa,0xff,0x00, + 0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00, + 0x00,0x00,0x00,0x00}; + + static const UINT buf_rotate_180[15] = { + 0xffffffff, 0xffffffff, 0xffffffff, + 0xffff11ff, 0xffff11ff, 0xffff11ff, + 0xffff33ff, 0xffff33ff, 0xffff33ff, + 0xffff55ff, 0xffff55ff, 0xffff55ff, + 0xffffaaff, 0xffffaaff, 0xffffaaff}; /* GpTexture */ status = GdipCreateMatrix2(2.0, 0.0, 0.0, 0.0, 0.0, 0.0, &m); @@ -556,6 +588,38 @@ static void test_transform(void) expect(Ok, status); status = GdipDeleteBrush((GpBrush*)line); expect(Ok,status); + GdipDeleteGraphics(graphics); + + dcmem = CreateCompatibleDC(hdc); + hbmp = CreateBitmap(3, 5, 1, 32, NULL); + old = SelectObject(dcmem, hbmp); + status = GdipCreateFromHDC(dcmem, &graphics); + expect(Ok, status); + hglob = GlobalAlloc(0, sizeof(bmpimage)); + data = GlobalLock (hglob); + memcpy(data, bmpimage, sizeof(bmpimage)); + GlobalUnlock(hglob); + hr = CreateStreamOnHGlobal(hglob, TRUE, &stream); + expect(S_OK, hr); + status = GdipLoadImageFromStream(stream, &image); + expect(Ok, status); + status = GdipCreateTexture(image, WrapModeTile, &texture); + expect(Ok, status); + status = GdipRotateTextureTransform(texture, 180.0f, MatrixOrderPrepend); + expect(Ok, status); + status = GdipFillRectangle(graphics, (GpBrush*)texture, .0f, .0f, (REAL)3, (REAL)5); + expect(Ok, status); + GdipDeleteBrush((GpBrush*)texture); + GdipDisposeImage(image); + GdipDeleteGraphics(graphics); + IStream_Release(stream); + hbmp = SelectObject(dcmem, old); + GetObjectW(hbmp, sizeof(bm), &bm); + size = GetBitmapBits(hbmp, sizeof(buf), buf); + expect(sizeof(buf), size); + DeleteObject(hbmp); + DeleteDC(dcmem); + ok(!memcmp(buf, buf_rotate_180, sizeof(buf)), "Failed to rotate image.\n"); if(0){ /* enable to visually compare with Windows */ -- 2.20.1

2 1

[tools] testbot/PatchUtils: Only update the Wine files list for Wine patches.
by Francois Gouget 03 Feb '21

03 Feb '21

Only update the list of Wine files if the patch is a Wine patch or will trigger a make_makefiles run (which means any new file could be used). Also reset IsWinePatch to evaluate later parts on their own merits. But note that if we had MakeMakefiles=1 despite IsWinePatch=0 (previous parts modified a Makefile.in file but are not unambiguously a Wine patch), if the last part modifies one of the files newly added to the Wine files list it will automatically get IsWinePatch=1; whereas if presented as a single patch it would still have had MakeMakefiles=1 + IsWinePatch=0. Fortunately the two cases are equivalent as far as Patches::Submit() is concerned. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite test: WTBS S6.2 - Patch to a non-Wine file. testbot/lib/WineTestBot/PatchUtils.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index dda855d11..aeb874321 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -393,10 +393,14 @@ sub GetPatchImpacts($) # Build a copy of the Wine files list reflecting the current situation. $Impacts->{WineFiles} = { %$_WineFiles } if (!$Impacts->{WineFiles}); - map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; - map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; - $Impacts->{NewFiles} = {}; - $Impacts->{DeletedFiles} = {}; + if ($Impacts->{IsWinePatch} or $Impacts->{MakeMakefiles}) + { + map { $Impacts->{WineFiles}->{$_} = 1 } keys %{$Impacts->{NewFiles}}; + map { delete $Impacts->{WineFiles}->{$_} } keys %{$Impacts->{DeletedFiles}}; + $Impacts->{NewFiles} = {}; + $Impacts->{DeletedFiles} = {}; + delete $Impacts->{IsWinePatch}; + } # The modules impacted by previous parts will still need to be built, # but only if the last part justifies a build. So make a backup. -- 2.20.1

1 0

[tools] testbot/TestWTBS: Convert the job ranges into patch ranges.
by Francois Gouget 03 Feb '21

03 Feb '21

Check all patches that have a job that falls in the job ranges, or are in the set of no-job patches surrounding those. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This ensures any test that results in a no-job patch disposition (e.g. "Part is not a Wine patch") will be checked, even if they are at the start or end of the job list. testbot/tests/TestWTBS | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index f6ca54e84..87b53fea5 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -131,7 +131,7 @@ while (@ARGV) } } -my @JobRanges; +my $JobRanges = []; if (!defined $Usage) { if (defined $OptJobs) @@ -140,11 +140,11 @@ if (!defined $Usage) { if ($Range =~ /^([0-9]+)$/) { - push @JobRanges, [$1, $1]; + push @$JobRanges, [$1, $1]; } elsif ($Range =~ /^([0-9]*)\.\.([0-9]*)/) { - push @JobRanges, [$1 || 0, $2 || 0]; + push @$JobRanges, [$1 || 0, $2 || 0]; } else { @@ -983,15 +983,16 @@ sub CheckJob($$) } } -sub IsJobInRange($) +sub IsInRange($$) { - my ($Job) = @_; + my ($Ranges, $Id) = @_; - return 1 if (!@JobRanges); - foreach my $Range (@JobRanges) + return 0 if (!$Id); + return 1 if (!$Ranges or !@$Ranges); + foreach my $Range (@$Ranges) { - return 1 if (($Range->[0] == 0 or $Range->[0] <= $Job->Id) and - ($Range->[1] == 0 or $Job->Id <= $Range->[1])); + return 1 if (($Range->[0] == 0 or $Range->[0] <= $Id) and + ($Range->[1] == 0 or $Id <= $Range->[1])); } return 0; } @@ -1040,7 +1041,7 @@ but not parts 3 and 4. sub CheckJobTree($;$) { my ($Job, $TestInfo) = @_; - return if (!IsJobInRange($Job)); + return if (!IsInRange($JobRanges, $Job->Id)); my $JobId = $Job->Id; # Simplify use in strings return if ($CheckedJobs{$JobId}); @@ -1267,28 +1268,20 @@ sub CheckPatch($$$) { $Job = $Jobs->GetItem($1); } - # The job range restriction extends to their associated patches... - return if ($Job and !IsJobInRange($Job)); - # ..and to patches with no job - return if (!$Job and @JobRanges); my $PatchInfo = $TestInfo->{patch}; if (CheckValue($PatchInfo->{Disposition})) { is($Patch->Disposition, $PatchInfo->{Disposition}, "Check Disposition for patch ". $Patch->Id .": ". $Patch->Subject); } - elsif ($Patch->Disposition =~ /^Submitted job (.*)$/) + elsif ($Job) { - isnt($Job, undef, "Check job $1 for patch ". $Patch->Id .": ". $Patch->Subject); - if (!$Job or $Job->Status eq "canceled") - { - ; # Nothing to check - } - elsif ($Job->Status =~ /^(?:queued|running)$/) + isnt($Job, undef, "Check job ". $Job->Id ." for patch ". $Patch->Id .": ". $Patch->Subject); + if ($Job->Status =~ /^(?:queued|running)$/) { print "...skipping job ". $Job->Id ." because it is not complete yet (". $Job->Status .")\n"; } - else + elsif ($Job->Status ne "canceled") { # Provide defaults for the job checks my $Remarks = $Patch->Subject; @@ -1310,8 +1303,46 @@ sub CheckPatches() { my $Jobs = CreateJobs(); my $Patches = CreatePatches(); + + my $PatchRanges = []; + if (@$JobRanges) + { + # Convert the job ranges into a list of patch ranges so that these patches: + # 1. either have a job in the allowed job ranges, + # 2. or have no job but are contiguous to a patch satisfying 1 or 2. + my ($First, $Last, $AddRange); + foreach my $Patch (sort { $a->Id <=> $b->Id } @{$Patches->GetItems()}) + { + if ($Patch->Disposition =~ /^Submitted job (\d+)$/) + { + my $Job = $Jobs->GetItem($1); + if ($Job and IsInRange($JobRanges, $Job->Id)) + { + $AddRange = 1; + } + elsif ($AddRange) + { + push @$PatchRanges, [$First, $Last]; + $First = $Last = $AddRange = undef; + next; + } + else + { + $First = $Last = $AddRange = undef; + next; + } + } + + $First = $Patch->Id if (!$First); + $Last = $Patch->Id; + } + push @$PatchRanges, [$First, $Last] if ($AddRange); + } + foreach my $Patch (sort { $b->Id <=> $a->Id } @{$Patches->GetItems()}) { + next if (!IsInRange($PatchRanges, $Patch->Id)); + my $PatchFileName = "$DataDir/patches/". $Patch->Id; if (-f $PatchFileName) { -- 2.20.1

1 0

[tools] testbot/WinRun*: Simplify LogTaskError().
by Francois Gouget 03 Feb '21

03 Feb '21

The TestBot engine redirects stderr to testbot.log so there is no need to manually open and append to that file. This also makes the Debug() call in LogTaskError() redundant. Add the "tool:error:" prefix. This clarifies which errors come from the script, and which come from the TestBot Engine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48658 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 14 +------------- testbot/bin/WineRunReconfig.pl | 14 +------------- testbot/bin/WineRunTask.pl | 14 +------------- testbot/bin/WineRunWineTest.pl | 12 +----------- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2764ffc92..ff130526e 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -178,19 +178,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 8047d3e6e..004987f5b 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -179,19 +179,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 303648807..6056806f3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -207,19 +207,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames; diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index bcf89bfa7..7892bca74 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -204,17 +204,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames; -- 2.20.1

1 0

[tools 1/2] testbot: Fix the webpatches setup instructions.
by Francois Gouget 03 Feb '21

03 Feb '21

The webpatches directory should be created in the TestBot directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The current configuration of the TestBot and patches websites are ok of course. This just fixes the documentation on how to replicate it. It's a bit untested since I did not feel like re-setting up my box from scratch but it should match what I have. testbot/doc/INSTALL.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0dd5710f7..7565d6b4d 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -79,9 +79,8 @@ Setup for Wine's patches site: using the WineTestBot web interface and that the results are sane. You may also want to run with $PatchFromEMailOverride set for a while to spot any issue under load. -- In $HOME/tools/testbot/var, set up the webpatches symbolic link to point to - where the patches website stores its patches and test results. Typically: - ln -s $HOME/patches $HOME/tools/testbot/var/webpatches +- In $HOME/tools/testbot/var, create the webpatches directory: + mkdir $HOME/tools/testbot/var/webpatches - Use a cron job to run WinePatchesWebSubmit.pl periodically. For instance: */5 * * * * $HOME/tools/testbot/bin/WinePatchesWebSubmit.pl -- 2.20.1

1 1

[PATCH 1/5] kernel32/tests: Correctly check for failure from FindFirstFile().
by Zebediah Figura 03 Feb '21

03 Feb '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/file.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 2814ab194b2..6d2a216e39c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2928,7 +2928,7 @@ static void test_FindFirstFile_wildcards(void) {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {1, " *..", ", '.aaa'"}, + {0, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, {1, "?", ", '.', '..', 'a'"}, {1, "?.", ", '.', '..', 'a'"}, @@ -2954,23 +2954,26 @@ static void test_FindFirstFile_wildcards(void) correct[0] = incorrect[0] = 0; handle = FindFirstFileA(tests[i].pattern, &find_data); - if (handle) do { - char* ptr; - char quoted[16]; + if (handle != INVALID_HANDLE_VALUE) + { + do { + char *ptr; + char quoted[16]; - sprintf( quoted, ", '%.10s'", find_data.cFileName ); + sprintf(quoted, ", '%.10s'", find_data.cFileName); - if ((ptr = strstr(missing, quoted))) - { - int len = strlen(quoted); - while ((ptr[0] = ptr[len]) != 0) - ++ptr; - strcat(correct, quoted); - } - else - strcat(incorrect, quoted); - } while (FindNextFileA(handle, &find_data)); - FindClose(handle); + if ((ptr = strstr(missing, quoted))) + { + int len = strlen(quoted); + while ((ptr[0] = ptr[len]) != 0) + ++ptr; + strcat(correct, quoted); + } + else + strcat(incorrect, quoted); + } while (FindNextFileA(handle, &find_data)); + FindClose(handle); + } todo_wine_if (tests[i].todo) ok(missing[0] == 0 && incorrect[0] == 0, -- 2.20.1

1 4

[PATCH 1/5] winegstreamer: Move the "mutex" field to struct wg_parser.
by Zebediah Figura 03 Feb '21

03 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 143 ++++++++++++++++------------------ 1 file changed, 65 insertions(+), 78 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1ddbc954fb4..9f733396d92 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -56,6 +56,8 @@ struct wg_parser pthread_t push_thread; + pthread_mutex_t mutex; + pthread_cond_t init_cond; bool no_more_pads, has_duration, error; @@ -95,8 +97,6 @@ struct parser uint64_t next_pull_offset; - pthread_mutex_t mutex; - HANDLE read_thread; BOOL (*init_gst)(struct parser *filter); @@ -706,7 +706,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct parser_event *event) { - struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + struct wg_parser *parser = impl_from_strmbase_filter(pin->pin.pin.filter)->wg_parser; /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer * flushes here. The difference is that we can be blocked by the streaming @@ -714,17 +714,17 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct * request_buffer_src() can only be blocked by the upstream source, and that * is solved by flushing the upstream source. */ - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_empty_cond, &filter->mutex); + pthread_cond_wait(&pin->event_empty_cond, &parser->mutex); if (pin->flushing) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); GST_DEBUG("Filter is flushing; discarding event."); return GST_FLOW_FLUSHING; } pin->event = *event; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&pin->event_cond); GST_LOG("Event queued."); return GST_FLOW_OK; @@ -774,9 +774,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } else { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); pin->eos = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); } break; @@ -784,7 +784,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_START: if (pin->pin.pin.peer) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); pin->flushing = true; pthread_cond_signal(&pin->event_empty_cond); @@ -802,7 +802,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } pin->event.type = PARSER_EVENT_NONE; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); } break; @@ -810,9 +810,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.peer) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); pin->flushing = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); } break; @@ -821,9 +821,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) GstCaps *caps; gst_event_parse_caps(event, &caps); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); gst_caps_replace(&pin->caps, caps); - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; } @@ -1041,14 +1041,14 @@ static bool get_stream_event(struct parser_source *pin, struct parser_event *eve struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); struct wg_parser *parser = filter->wg_parser; - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->flushing && pin->event.type == PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_cond, &filter->mutex); + pthread_cond_wait(&pin->event_cond, &parser->mutex); if (parser->flushing) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); TRACE("Filter is flushing.\n"); return false; } @@ -1056,7 +1056,7 @@ static bool get_stream_event(struct parser_source *pin, struct parser_event *eve *event = pin->event; pin->event.type = PARSER_EVENT_NONE; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&pin->event_empty_cond); return true; @@ -1121,7 +1121,7 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); assert(!parser->read_request.buffer); parser->read_request.buffer = *buffer; @@ -1135,11 +1135,11 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 * read_thread() not running. */ while (!parser->read_request.done) - pthread_cond_wait(&parser->read_done_cond, &filter->mutex); + pthread_cond_wait(&parser->read_done_cond, &parser->mutex); ret = parser->read_request.ret; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); GST_LOG("Request returned %s.", gst_flow_get_name(ret)); @@ -1186,12 +1186,12 @@ static DWORD CALLBACK read_thread(void *arg) TRACE("Starting read thread for filter %p.\n", filter); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (filter->sink_connected) { while (parser->sink_connected && !parser->read_request.buffer) - pthread_cond_wait(&parser->read_cond, &filter->mutex); + pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) break; @@ -1203,7 +1203,7 @@ static DWORD CALLBACK read_thread(void *arg) pthread_cond_signal(&parser->read_done_cond); } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); TRACE("Streaming stopped; exiting.\n"); return 0; @@ -1488,9 +1488,9 @@ static void no_more_pads(GstElement *decodebin, gpointer user) GST_DEBUG("filter %p.", filter); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); } @@ -1530,9 +1530,9 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) fprintf(stderr, "winegstreamer: error: %s: %s\n", GST_OBJECT_NAME(msg->src), dbg_info); g_error_free(err); g_free(dbg_info); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->error = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1545,9 +1545,9 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) break; case GST_MESSAGE_DURATION_CHANGED: - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->has_duration = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1619,7 +1619,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) if (!This->init_gst(This)) return E_FAIL; - pthread_mutex_lock(&This->mutex); + pthread_mutex_lock(&parser->mutex); for (i = 0; i < This->source_count; ++i) { @@ -1628,15 +1628,15 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); pin->seek.llCurrent = 0; while (!pin->caps && !parser->error) - pthread_cond_wait(&parser->init_cond, &This->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); return E_FAIL; } } - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); parser->next_offset = 0; This->next_pull_offset = 0; @@ -1677,6 +1677,7 @@ static void wg_parser_destroy(struct wg_parser *parser) gst_object_unref(parser->bus); } + pthread_mutex_destroy(&parser->mutex); pthread_cond_destroy(&parser->init_cond); pthread_cond_destroy(&parser->read_cond); pthread_cond_destroy(&parser->read_done_cond); @@ -1704,8 +1705,6 @@ static void parser_destroy(struct strmbase_filter *iface) wg_parser_destroy(filter->wg_parser); - pthread_mutex_destroy(&filter->mutex); - strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); @@ -1723,9 +1722,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = true; - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -1764,9 +1763,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = false; - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -1878,9 +1877,9 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = parser->error = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { @@ -1896,15 +1895,15 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) return FALSE; } - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &filter->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return FALSE; } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return TRUE; } @@ -1998,11 +1997,6 @@ static BOOL parser_init_gstreamer(void) return TRUE; } -static void parser_init_common(struct parser *object) -{ - pthread_mutex_init(&object->mutex, NULL); -} - static struct wg_parser *wg_parser_create(void) { struct wg_parser *parser; @@ -2010,6 +2004,7 @@ static struct wg_parser *wg_parser_create(void) if (!(parser = calloc(1, sizeof(*parser)))) return NULL; + pthread_mutex_init(&parser->mutex, NULL); pthread_cond_init(&parser->init_cond, NULL); pthread_cond_init(&parser->read_cond, NULL); pthread_cond_init(&parser->read_done_cond, NULL); @@ -2037,8 +2032,6 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); @@ -2172,9 +2165,9 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = true; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -2221,9 +2214,9 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->flushing = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -2526,13 +2519,13 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) return S_OK; /* Unblock all of our streams. */ - pthread_mutex_lock(&This->mutex); + pthread_mutex_lock(&parser->mutex); for (i = 0; i < This->source_count; ++i) { This->sources[i]->flushing = true; pthread_cond_signal(&This->sources[i]->event_empty_cond); } - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); gst_pad_unlink(parser->my_src, parser->their_sink); @@ -2543,9 +2536,9 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) /* read_thread() needs to stay alive to service any read requests GStreamer * sends, so we can only shut it down after GStreamer stops. */ This->sink_connected = false; - pthread_mutex_lock(&This->mutex); + pthread_mutex_lock(&parser->mutex); parser->sink_connected = false; - pthread_mutex_unlock(&This->mutex); + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_cond); WaitForSingleObject(This->read_thread, INFINITE); CloseHandle(This->read_thread); @@ -2701,8 +2694,6 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_init_gst; @@ -2750,9 +2741,9 @@ static BOOL avi_splitter_init_gst(struct parser *filter) parser->their_sink = gst_element_get_static_pad(element, "sink"); - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); parser->no_more_pads = parser->error = false; - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { @@ -2768,15 +2759,15 @@ static BOOL avi_splitter_init_gst(struct parser *filter) return FALSE; } - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->no_more_pads && !parser->error) - pthread_cond_wait(&parser->init_cond, &filter->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return FALSE; } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return TRUE; } @@ -2821,8 +2812,6 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); object->init_gst = avi_splitter_init_gst; @@ -2896,15 +2885,15 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) return FALSE; } - pthread_mutex_lock(&filter->mutex); + pthread_mutex_lock(&parser->mutex); while (!parser->has_duration && !parser->error && !pin->eos) - pthread_cond_wait(&parser->init_cond, &filter->mutex); + pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return FALSE; } - pthread_mutex_unlock(&filter->mutex); + pthread_mutex_unlock(&parser->mutex); return TRUE; } @@ -2972,8 +2961,6 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - parser_init_common(object); - strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; -- 2.30.0

1 4

[PATCH 2/3] msvcrt: Improve sqrt accuracy and performance on i386.
by Piotr Caban 03 Feb '21

03 Feb '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)

3 3

[PATCH vkd3d 1/5] vkd3d-shader: Move instruction allocation functions to hlsl.c.
by Zebediah Figura 02 Feb '21

02 Feb '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 205 +++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 22 ++++- libs/vkd3d-shader/hlsl.y | 205 --------------------------------------- 3 files changed, 224 insertions(+), 208 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cd0d9cbc..e73ed923 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -18,6 +18,7 @@ */ #include "hlsl.h" +#include <stdio.h> BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { @@ -102,6 +103,41 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra return type; } +static DWORD get_array_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_ARRAY) + return get_array_size(type->e.array.type) * type->e.array.elements_count; + return 1; +} + +struct hlsl_type *new_struct_type(const char *name, struct list *fields) +{ + struct hlsl_struct_field *field; + unsigned int reg_size = 0; + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_STRUCT; + type->base_type = HLSL_TYPE_VOID; + type->name = name; + type->dimx = 0; + type->dimy = 1; + type->e.elements = fields; + + LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) + { + field->reg_offset = reg_size; + reg_size += field->type->reg_size; + type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); + } + type->reg_size = reg_size; + + list_add_tail(&hlsl_ctx.types, &type->entry); + + return type; +} + struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -639,6 +675,35 @@ struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, return expr_from_node(cast); } +struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) +{ + struct hlsl_ir_var *var; + + if (!(var = vkd3d_calloc(1, sizeof(*var)))) + { + hlsl_ctx.status = PARSE_ERR; + return NULL; + } + + var->name = name; + var->data_type = type; + var->loc = loc; + var->semantic = semantic; + var->modifiers = modifiers; + var->reg_reservation = reg_reservation; + return var; +} + +struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, const struct source_location loc) +{ + struct hlsl_ir_var *var = new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); + + if (var) + list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); + return var; +} + static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) { static const enum hlsl_ir_expr_op ops[] = @@ -780,6 +845,146 @@ struct hlsl_ir_node *add_assignment(struct list *instrs, struct hlsl_ir_node *lh return &assign->node; } +static BOOL type_is_single_reg(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; +} + +struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) +{ + struct hlsl_ir_assignment *assign; + + if (!writemask && type_is_single_reg(rhs->data_type)) + writemask = (1 << rhs->data_type->dimx) - 1; + + if (!(assign = vkd3d_malloc(sizeof(*assign)))) + return NULL; + + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); + assign->lhs.var = var; + hlsl_src_from_node(&assign->lhs.offset, offset); + hlsl_src_from_node(&assign->rhs, rhs); + assign->writemask = writemask; + return assign; +} + +struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) +{ + return new_assignment(lhs, NULL, rhs, 0, rhs->loc); +} + +struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) +{ + struct hlsl_ir_constant *c; + + if (!(c = vkd3d_malloc(sizeof(*c)))) + return NULL; + init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); + c->value.u[0] = n; + return c; +} + +struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) +{ + struct hlsl_ir_expr *expr; + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg); + return &expr->node; +} + +struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) +{ + struct hlsl_ir_expr *expr; + + assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); + + if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) + return NULL; + init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); + expr->op = op; + hlsl_src_from_node(&expr->operands[0], arg1); + hlsl_src_from_node(&expr->operands[1], arg2); + return &expr->node; +} + +struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) +{ + struct hlsl_ir_if *iff; + + if (!(iff = vkd3d_malloc(sizeof(*iff)))) + return NULL; + init_node(&iff->node, HLSL_IR_IF, NULL, loc); + hlsl_src_from_node(&iff->condition, condition); + list_init(&iff->then_instrs); + list_init(&iff->else_instrs); + return iff; +} + +struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) +{ + struct hlsl_ir_load *load; + + if (!(load = vkd3d_calloc(1, sizeof(*load)))) + return NULL; + init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); + load->src.var = var; + return load; +} + +struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) +{ + struct hlsl_ir_swizzle *swizzle; + + if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) + return NULL; + init_node(&swizzle->node, HLSL_IR_SWIZZLE, + new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); + hlsl_src_from_node(&swizzle->val, val); + swizzle->swizzle = s; + return swizzle; +} + +BOOL type_is_void(const struct hlsl_type *type) +{ + return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; +} + +struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) +{ + struct hlsl_ir_function_decl *decl; + + if (!(decl = vkd3d_calloc(1, sizeof(*decl)))) + return NULL; + decl->return_type = return_type; + decl->parameters = parameters; + decl->semantic = semantic; + decl->loc = loc; + + if (!type_is_void(return_type)) + { + struct hlsl_ir_var *return_var; + char name[28]; + + sprintf(name, "<retval-%p>", decl); + if (!(return_var = new_synthetic_var(name, return_type, loc))) + { + vkd3d_free(decl); + return NULL; + } + decl->return_var = return_var; + } + + return decl; +} + static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry) { const struct hlsl_type *type = RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 128de1d6..aabfbaf9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -599,19 +599,34 @@ struct hlsl_ir_expr *add_expr(struct list *instrs, enum hlsl_ir_expr_op op, stru struct hlsl_ir_node *add_implicit_conversion(struct list *instrs, struct hlsl_ir_node *node, struct hlsl_type *type, struct source_location *loc) DECLSPEC_HIDDEN; -struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, - struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; +struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, + struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, + struct list *parameters, const char *semantic, struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; +struct hlsl_type *new_struct_type(const char *name, struct list *fields) DECLSPEC_HIDDEN; +struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, + const struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, + const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) DECLSPEC_HIDDEN; +struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) DECLSPEC_HIDDEN; BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; -struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; struct hlsl_type *clone_hlsl_type(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; @@ -624,6 +639,7 @@ BOOL pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void init_functions_tree(struct rb_tree *funcs) DECLSPEC_HIDDEN; void add_function_decl(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, BOOL intrinsic) DECLSPEC_HIDDEN; +BOOL type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; int hlsl_lexer_compile(const char *text, enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint, struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4e2218c5..df155a08 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -77,11 +77,6 @@ static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_locati "'row_major' or 'column_major' modifiers are only allowed for matrices."); } -static BOOL type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) { BOOL ret; @@ -232,24 +227,6 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } -static BOOL type_is_void(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; -} - -static struct hlsl_ir_if *new_if(struct hlsl_ir_node *condition, struct source_location loc) -{ - struct hlsl_ir_if *iff; - - if (!(iff = vkd3d_malloc(sizeof(*iff)))) - return NULL; - init_node(&iff->node, HLSL_IR_IF, NULL, loc); - hlsl_src_from_node(&iff->condition, condition); - list_init(&iff->then_instrs); - list_init(&iff->else_instrs); - return iff; -} - static BOOL append_conditional_break(struct list *cond_list) { struct hlsl_ir_node *condition, *not; @@ -352,20 +329,6 @@ static void free_parse_initializer(struct parse_initializer *initializer) vkd3d_free(initializer->args); } -static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, - struct hlsl_ir_node *val, struct source_location *loc) -{ - struct hlsl_ir_swizzle *swizzle; - - if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) - return NULL; - init_node(&swizzle->node, HLSL_IR_SWIZZLE, - new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); - hlsl_src_from_node(&swizzle->val, val); - swizzle->swizzle = s; - return swizzle; -} - static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const char *swizzle, struct source_location *loc) { @@ -448,60 +411,6 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } -static struct hlsl_ir_var *new_var(const char *name, struct hlsl_type *type, const struct source_location loc, - const char *semantic, unsigned int modifiers, const struct reg_reservation *reg_reservation) -{ - struct hlsl_ir_var *var; - - if (!(var = vkd3d_calloc(1, sizeof(*var)))) - { - hlsl_ctx.status = PARSE_ERR; - return NULL; - } - - var->name = name; - var->data_type = type; - var->loc = loc; - var->semantic = semantic; - var->modifiers = modifiers; - var->reg_reservation = reg_reservation; - return var; -} - -static struct hlsl_ir_var *new_synthetic_var(const char *name, struct hlsl_type *type, - const struct source_location loc) -{ - struct hlsl_ir_var *var = new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); - - if (var) - list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); - return var; -} - -static struct hlsl_ir_assignment *new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, - struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) -{ - struct hlsl_ir_assignment *assign; - - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; - - if (!(assign = vkd3d_malloc(sizeof(*assign)))) - return NULL; - - init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, loc); - assign->lhs.var = var; - hlsl_src_from_node(&assign->lhs.offset, offset); - hlsl_src_from_node(&assign->rhs, rhs); - assign->writemask = writemask; - return assign; -} - -static struct hlsl_ir_assignment *new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) -{ - return new_assignment(lhs, NULL, rhs, 0, rhs->loc); -} - static struct hlsl_ir_jump *add_return(struct list *instrs, struct hlsl_ir_node *return_value, struct source_location loc) { @@ -534,56 +443,6 @@ static struct hlsl_ir_jump *add_return(struct list *instrs, return jump; } -static struct hlsl_ir_constant *new_uint_constant(unsigned int n, const struct source_location loc) -{ - struct hlsl_ir_constant *c; - - if (!(c = vkd3d_malloc(sizeof(*c)))) - return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); - c->value.u[0] = n; - return c; -} - -struct hlsl_ir_node *new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct source_location loc) -{ - struct hlsl_ir_expr *expr; - - if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) - return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); - expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg); - return &expr->node; -} - -struct hlsl_ir_node *new_binary_expr(enum hlsl_ir_expr_op op, - struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) -{ - struct hlsl_ir_expr *expr; - - assert(compare_hlsl_types(arg1->data_type, arg2->data_type)); - - if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) - return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); - expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg1); - hlsl_src_from_node(&expr->operands[1], arg2); - return &expr->node; -} - -static struct hlsl_ir_load *new_var_load(struct hlsl_ir_var *var, const struct source_location loc) -{ - struct hlsl_ir_load *load; - - if (!(load = vkd3d_calloc(1, sizeof(*load)))) - return NULL; - init_node(&load->node, HLSL_IR_LOAD, var->data_type, loc); - load->src.var = var; - return load; -} - static struct hlsl_ir_load *add_load(struct list *instrs, struct hlsl_ir_node *var_node, struct hlsl_ir_node *offset, struct hlsl_type *data_type, const struct source_location loc) { @@ -777,41 +636,6 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s return list; } -static DWORD get_array_size(const struct hlsl_type *type) -{ - if (type->type == HLSL_CLASS_ARRAY) - return get_array_size(type->e.array.type) * type->e.array.elements_count; - return 1; -} - -static struct hlsl_type *new_struct_type(const char *name, struct list *fields) -{ - struct hlsl_struct_field *field; - unsigned int reg_size = 0; - struct hlsl_type *type; - - if (!(type = vkd3d_calloc(1, sizeof(*type)))) - return NULL; - type->type = HLSL_CLASS_STRUCT; - type->base_type = HLSL_TYPE_VOID; - type->name = name; - type->dimx = 0; - type->dimy = 1; - type->e.elements = fields; - - LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) - { - field->reg_offset = reg_size; - reg_size += field->type->reg_size; - type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); - } - type->reg_size = reg_size; - - list_add_tail(&hlsl_ctx.types, &type->entry); - - return type; -} - static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list) { struct parse_variable_def *v, *v_next; @@ -1203,35 +1027,6 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, return statements_list; } -static struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, - struct list *parameters, const char *semantic, struct source_location loc) -{ - struct hlsl_ir_function_decl *decl; - - if (!(decl = vkd3d_calloc(1, sizeof(*decl)))) - return NULL; - decl->return_type = return_type; - decl->parameters = parameters; - decl->semantic = semantic; - decl->loc = loc; - - if (!type_is_void(return_type)) - { - struct hlsl_ir_var *return_var; - char name[28]; - - sprintf(name, "<retval-%p>", decl); - if (!(return_var = new_synthetic_var(name, return_type, loc))) - { - vkd3d_free(decl); - return NULL; - } - decl->return_var = return_var; - } - - return decl; -} - %} %locations -- 2.30.0

3 14