December 2020 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] odbccp32: Implement SQLRemoveDSNFromIni/w

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 0e4a12534c8..420f206b700 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1523,18 +1523,45 @@ BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) { + HKEY hkey; + + TRACE("%s\n", debugstr_w(lpszDSN)); + clear_errors(); - FIXME("%s\n", debugstr_w(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\ODBC\\ODBC.INI\\ODBC Data Sources", &hkey) == ERROR_SUCCESS) + { + RegDeleteValueW(hkey, lpszDSN); + RegCloseKey(hkey); + } + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\ODBC\\ODBC.INI", &hkey) == ERROR_SUCCESS) + { + RegDeleteTreeW(hkey, lpszDSN); + RegCloseKey(hkey); + } + + return TRUE; } BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) { + BOOL ret = FALSE; + WCHAR *dsn; + + TRACE("%s\n", debugstr_a(lpszDSN)); + clear_errors(); - FIXME("%s\n", debugstr_a(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + dsn = SQLInstall_strdup(lpszDSN); + if (dsn) + ret = SQLRemoveDSNFromIniW(dsn); + else + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + heap_free(dsn); + + return ret; } BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) -- 2.29.2

Dec. 2, 2020

[PATCH] user32: No need to change the z-order of activated windows.

by Haoyang Chen

Dec. 2, 2020

[PATCH 5/5] dpnhupnp: add stub dll (resend)

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/dpnhupnp/Makefile.in | 8 +++++++ dlls/dpnhupnp/dpnhupnp.spec | 5 +++++ dlls/dpnhupnp/dpnhupnp_main.c | 42 +++++++++++++++++++++++++++++++++++ dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++ 5 files changed, 82 insertions(+) create mode 100644 dlls/dpnhupnp/Makefile.in create mode 100644 dlls/dpnhupnp/dpnhupnp.spec create mode 100644 dlls/dpnhupnp/dpnhupnp_main.c create mode 100644 dlls/dpnhupnp/version.rc diff --git a/configure.ac b/configure.ac index 42ab6b4e557..23ce1fc265c 100644 --- a/configure.ac +++ b/configure.ac @@ -3195,6 +3195,7 @@ WINE_CONFIG_MAKEFILE(dlls/dplayx) WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) WINE_CONFIG_MAKEFILE(dlls/dpmodemx) WINE_CONFIG_MAKEFILE(dlls/dpnaddr) +WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) WINE_CONFIG_MAKEFILE(dlls/dpnet) WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) WINE_CONFIG_MAKEFILE(dlls/dpnhpast) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in new file mode 100644 index 00000000000..7ac77c99471 --- /dev/null +++ b/dlls/dpnhupnp/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dpnhupnp.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + dpnhupnp_main.c + +RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec new file mode 100644 index 00000000000..acc698e99ab --- /dev/null +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -0,0 +1,5 @@ +@ stub DirectPlayNATHelpCreate +@ stub DllRegisterServer +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllUnregisterServer \ No newline at end of file diff --git a/dlls/dpnhupnp/dpnhupnp_main.c b/dlls/dpnhupnp/dpnhupnp_main.c new file mode 100644 index 00000000000..f7b67d6574f --- /dev/null +++ b/dlls/dpnhupnp/dpnhupnp_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnhupnp); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc new file mode 100644 index 00000000000..21633a49815 --- /dev/null +++ b/dlls/dpnhupnp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp" +#define WINE_FILENAME_STR "dpnhupnp.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

Dec. 2, 2020

[PATCH 4/5] dpmodemx: add stub dll (resend)

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/dpmodemx/Makefile.in | 8 +++++++ dlls/dpmodemx/dpmodemx.spec | 1 + dlls/dpmodemx/dpmodemx_main.c | 42 +++++++++++++++++++++++++++++++++++ dlls/dpmodemx/version.rc | 26 ++++++++++++++++++++++ 5 files changed, 78 insertions(+) create mode 100644 dlls/dpmodemx/Makefile.in create mode 100644 dlls/dpmodemx/dpmodemx.spec create mode 100644 dlls/dpmodemx/dpmodemx_main.c create mode 100644 dlls/dpmodemx/version.rc diff --git a/configure.ac b/configure.ac index 3d68cf6e8ad..42ab6b4e557 100644 --- a/configure.ac +++ b/configure.ac @@ -3193,6 +3193,7 @@ WINE_CONFIG_MAKEFILE(dlls/dnsapi/tests) WINE_CONFIG_MAKEFILE(dlls/dplay) WINE_CONFIG_MAKEFILE(dlls/dplayx) WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) +WINE_CONFIG_MAKEFILE(dlls/dpmodemx) WINE_CONFIG_MAKEFILE(dlls/dpnaddr) WINE_CONFIG_MAKEFILE(dlls/dpnet) WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) diff --git a/dlls/dpmodemx/Makefile.in b/dlls/dpmodemx/Makefile.in new file mode 100644 index 00000000000..e074ca33164 --- /dev/null +++ b/dlls/dpmodemx/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dpmodemx.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + dpmodemx_main.c + +RC_SRCS = version.rc diff --git a/dlls/dpmodemx/dpmodemx.spec b/dlls/dpmodemx/dpmodemx.spec new file mode 100644 index 00000000000..14fb05053a8 --- /dev/null +++ b/dlls/dpmodemx/dpmodemx.spec @@ -0,0 +1 @@ +@ stub SPInit \ No newline at end of file diff --git a/dlls/dpmodemx/dpmodemx_main.c b/dlls/dpmodemx/dpmodemx_main.c new file mode 100644 index 00000000000..f5d7a8340ca --- /dev/null +++ b/dlls/dpmodemx/dpmodemx_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpmodemx); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/dpmodemx/version.rc b/dlls/dpmodemx/version.rc new file mode 100644 index 00000000000..b0c644aed83 --- /dev/null +++ b/dlls/dpmodemx/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpmodemx" +#define WINE_FILENAME_STR "dpmodemx.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

Dec. 2, 2020

[PATCH 3/5] dimap: add stub dll (resend)

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/dimap/Makefile.in | 8 ++++++++ dlls/dimap/dimap.spec | 2 ++ dlls/dimap/dimap_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/dimap/version.rc | 26 +++++++++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 dlls/dimap/Makefile.in create mode 100644 dlls/dimap/dimap.spec create mode 100644 dlls/dimap/dimap_main.c create mode 100644 dlls/dimap/version.rc diff --git a/configure.ac b/configure.ac index 5680e8f51e3..3d68cf6e8ad 100644 --- a/configure.ac +++ b/configure.ac @@ -3159,6 +3159,7 @@ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) WINE_CONFIG_MAKEFILE(dlls/diactfrm) WINE_CONFIG_MAKEFILE(dlls/difxapi) +WINE_CONFIG_MAKEFILE(dlls/dimap) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) diff --git a/dlls/dimap/Makefile.in b/dlls/dimap/Makefile.in new file mode 100644 index 00000000000..05030d9cce6 --- /dev/null +++ b/dlls/dimap/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dimap.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + dimap_main.c + +RC_SRCS = version.rc diff --git a/dlls/dimap/dimap.spec b/dlls/dimap/dimap.spec new file mode 100644 index 00000000000..cacaa27a2ca --- /dev/null +++ b/dlls/dimap/dimap.spec @@ -0,0 +1,2 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject diff --git a/dlls/dimap/dimap_main.c b/dlls/dimap/dimap_main.c new file mode 100644 index 00000000000..0f393dfb243 --- /dev/null +++ b/dlls/dimap/dimap_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dimap); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/dimap/version.rc b/dlls/dimap/version.rc new file mode 100644 index 00000000000..d0341dfcb77 --- /dev/null +++ b/dlls/dimap/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dimap" +#define WINE_FILENAME_STR "dimap.dll" +#define WINE_FILEVERSION 5,1,2600,881 +#define WINE_FILEVERSION_STR "5.1.2600.881" +#define WINE_PRODUCTVERSION 5,1,2600,881 +#define WINE_PRODUCTVERSION_STR "5.1.2600.881" + +#include "wine/wine_common_ver.rc" -- 2.28.0

Dec. 2, 2020

[PATCH 2/5] diactfrm: add stub dll (resend)

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/diactfrm/Makefile.in | 8 +++++++ dlls/diactfrm/diactfrm.spec | 4 ++++ dlls/diactfrm/diactfrm_main.c | 42 +++++++++++++++++++++++++++++++++++ dlls/diactfrm/version.rc | 26 ++++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 dlls/diactfrm/Makefile.in create mode 100644 dlls/diactfrm/diactfrm.spec create mode 100644 dlls/diactfrm/diactfrm_main.c create mode 100644 dlls/diactfrm/version.rc diff --git a/configure.ac b/configure.ac index bfdb8564abd..5680e8f51e3 100644 --- a/configure.ac +++ b/configure.ac @@ -3157,6 +3157,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) +WINE_CONFIG_MAKEFILE(dlls/diactfrm) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) diff --git a/dlls/diactfrm/Makefile.in b/dlls/diactfrm/Makefile.in new file mode 100644 index 00000000000..7d83e518017 --- /dev/null +++ b/dlls/diactfrm/Makefile.in @@ -0,0 +1,8 @@ +MODULE = diactfrm.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + diactfrm_main.c + +RC_SRCS = version.rc diff --git a/dlls/diactfrm/diactfrm.spec b/dlls/diactfrm/diactfrm.spec new file mode 100644 index 00000000000..c5fc87af6d5 --- /dev/null +++ b/dlls/diactfrm/diactfrm.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/diactfrm/diactfrm_main.c b/dlls/diactfrm/diactfrm_main.c new file mode 100644 index 00000000000..309374507bb --- /dev/null +++ b/dlls/diactfrm/diactfrm_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(diactfrm); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/diactfrm/version.rc b/dlls/diactfrm/version.rc new file mode 100644 index 00000000000..b6b6692b831 --- /dev/null +++ b/dlls/diactfrm/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine diactfrm" +#define WINE_FILENAME_STR "diactfrm.dll" +#define WINE_FILEVERSION 5,1,2600,881 +#define WINE_FILEVERSION_STR "5.1.2600.881" +#define WINE_PRODUCTVERSION 5,1,2600,881 +#define WINE_PRODUCTVERSION_STR "5.1.2600.881" + +#include "wine/wine_common_ver.rc" -- 2.28.0

Dec. 2, 2020

[PATCH 1/5] d3dpmesh: add stub dll (resend)

by Austin English

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/d3dpmesh/Makefile.in | 8 +++++++ dlls/d3dpmesh/d3dpmesh.spec | 1 + dlls/d3dpmesh/d3dpmesh_main.c | 42 +++++++++++++++++++++++++++++++++++ dlls/d3dpmesh/version.rc | 26 ++++++++++++++++++++++ 5 files changed, 78 insertions(+) create mode 100644 dlls/d3dpmesh/Makefile.in create mode 100644 dlls/d3dpmesh/d3dpmesh.spec create mode 100644 dlls/d3dpmesh/d3dpmesh_main.c create mode 100644 dlls/d3dpmesh/version.rc diff --git a/configure.ac b/configure.ac index e823543f1cd..bfdb8564abd 100644 --- a/configure.ac +++ b/configure.ac @@ -3099,6 +3099,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) WINE_CONFIG_MAKEFILE(dlls/d3dim700) +WINE_CONFIG_MAKEFILE(dlls/d3dpmesh) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) diff --git a/dlls/d3dpmesh/Makefile.in b/dlls/d3dpmesh/Makefile.in new file mode 100644 index 00000000000..2a7546832c2 --- /dev/null +++ b/dlls/d3dpmesh/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3dpmesh.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3dpmesh_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dpmesh/d3dpmesh.spec b/dlls/d3dpmesh/d3dpmesh.spec new file mode 100644 index 00000000000..d4b9a46bd7a --- /dev/null +++ b/dlls/d3dpmesh/d3dpmesh.spec @@ -0,0 +1 @@ +@ stub CreateD3DRMPMeshVisual diff --git a/dlls/d3dpmesh/d3dpmesh_main.c b/dlls/d3dpmesh/d3dpmesh_main.c new file mode 100644 index 00000000000..3d84a693a45 --- /dev/null +++ b/dlls/d3dpmesh/d3dpmesh_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dpmesh); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dpmesh/version.rc b/dlls/d3dpmesh/version.rc new file mode 100644 index 00000000000..87e601a95a7 --- /dev/null +++ b/dlls/d3dpmesh/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3dpmesh" +#define WINE_FILENAME_STR "d3dpmesh.dll" +#define WINE_FILEVERSION 5,0,2134,1 +#define WINE_FILEVERSION_STR "5.0.2134.1" +#define WINE_PRODUCTVERSION 5,0,2134,1 +#define WINE_PRODUCTVERSION_STR "5.0.2134.1" + +#include "wine/wine_common_ver.rc" -- 2.28.0

Dec. 2, 2020

[PATCH] mscoree/tests: The comtest registry tests may require elevated privileges.

by Francois Gouget

On Windows Vista and 7 run_registry_test() requires having elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/mscoree/tests/comtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index b62d527bb95..4b2183bac3a 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -168,6 +168,12 @@ static void run_registry_test(run_type run) sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + if (ret == ERROR_ACCESS_DENIED && !IsUserAnAdmin()) + { + win_skip("cannot run the registry tests due to user not being admin\n"); + RegCloseKey(hkey); + return; + } ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); -- 2.20.1

Dec. 2, 2020

[PATCH] fsutils/tests: fsutils requires elevated privileges on Windows <= 7.

by Francois Gouget

So skip the tests if the first fsutils run fails and we don't have elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- programs/fsutil/tests/Makefile.in | 2 +- programs/fsutil/tests/fsutil.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/programs/fsutil/tests/Makefile.in b/programs/fsutil/tests/Makefile.in index 5a69e47dc61..f0490b3b660 100644 --- a/programs/fsutil/tests/Makefile.in +++ b/programs/fsutil/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = fsutil.exe -IMPORTS = user32 +IMPORTS = advapi32 user32 C_SRCS = \ fsutil.c diff --git a/programs/fsutil/tests/fsutil.c b/programs/fsutil/tests/fsutil.c index 1111b5b2fed..eff47a4f8ec 100644 --- a/programs/fsutil/tests/fsutil.c +++ b/programs/fsutil/tests/fsutil.c @@ -21,6 +21,22 @@ #include "wine/test.h" +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + static DWORD runcmd(const char* cmd) { STARTUPINFOA si = { sizeof(STARTUPINFOA) }; @@ -64,6 +80,11 @@ static void test_hardlink(void) CloseHandle(hfile); rc = runcmd("fsutil"); + if (rc == 1 && !is_process_elevated()) + { + win_skip("Cannot run fsutil without elevated privileges on Windows <= 7\n"); + return; + } ok(rc == 0, "failed to run fsutil\n"); rc = runcmd("fsutil hardlink"); -- 2.20.1

Dec. 2, 2020

Re: [PATCH] windowscodecs: Use wide-char string literals.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 2, 2020

Re: [PATCH] windowscodecs: Use wide-char string literals in regsvr.c.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 2, 2020

Re: [PATCH] windowscodecs: Use wide-char string literals in metadataquery.c.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 2, 2020

[PATCH vkd3d 5/5] vkd3d-shader: Validate "compile_info" in vkd3d_shader_preprocess().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 33 +++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6289a185..1cf1fb35 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -252,7 +252,8 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) free_shader_desc(&parser->shader_desc); } -static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) +static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, + bool validate_target_type) { const enum vkd3d_shader_source_type *source_types; const enum vkd3d_shader_target_type *target_types; @@ -276,16 +277,19 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); - for (i = 0; i < count; ++i) + if (validate_target_type) { - if (target_types[i] == compile_info->target_type) - break; - } - if (i == count) - { - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) + { + if (target_types[i] == compile_info->target_type) + break; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } return VKD3D_OK; @@ -832,7 +836,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -933,7 +937,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if (messages) *messages = NULL; - if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + if ((ret = vkd3d_shader_validate_compile_info(compile_info, true)) < 0) return ret; vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); @@ -1150,10 +1154,15 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( int vkd3d_shader_preprocess(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { + int ret; + TRACE("compile_info %p, out %p, messages %p.\n", compile_info, out, messages); if (messages) *messages = NULL; + if ((ret = vkd3d_shader_validate_compile_info(compile_info, false)) < 0) + return ret; + return VKD3D_ERROR_NOT_IMPLEMENTED; } -- 2.29.2

Dec. 2, 2020

[PATCH vkd3d 4/5] tests: Add a test for macro invocation split across multiple files.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/hlsl_d3d12.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 03a732ce..4f4cc37f 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -72,6 +72,14 @@ static const char test_include_file2[] = static const char test_include_file3[] = "#undef BRONTES"; +static const char test_include2_top[] = + "#define FUNC(a, b) a ## b\n" + "#include \"file4\"\n" + ",ss)"; + +static const char test_include2_file4[] = + "FUNC(pa"; + static unsigned int refcount_file1, refcount_file2, refcount_file3, include_count_file2; static HRESULT WINAPI test_include_Open(ID3DInclude *iface, D3D_INCLUDE_TYPE type, @@ -106,6 +114,13 @@ static HRESULT WINAPI test_include_Open(ID3DInclude *iface, D3D_INCLUDE_TYPE typ *size = strlen(test_include_file3); ++refcount_file3; } + else if (!strcmp(filename, "file4")) + { + ok(type == D3D_INCLUDE_LOCAL, "Got type %#x.\n", type); + ok(!parent_data, "Got parent data %p.\n", parent_data); + *code = test_include2_file4; + *size = strlen(test_include2_file4); + } else { ok(0, "Unexpected filename \"%s\".\n", filename); @@ -390,6 +405,9 @@ static void test_preprocess(void) ok(!refcount_file3, "Got %d references to file1.\n", refcount_file3); todo ok(include_count_file2 == 2, "file2 was included %u times.\n", include_count_file2); + /* Macro invocation spread across multiple files. */ + check_preprocess(test_include2_top, NULL, &test_include, "pass", NULL); + blob = errors = (ID3D10Blob *)0xdeadbeef; hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr); -- 2.29.2

Dec. 2, 2020

[PATCH vkd3d 3/5] vkd3d-utils: Initialize input parameters to ID3DInclude::Open().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2bbedd8b..9c968cc6 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -129,11 +129,12 @@ static int open_include(const char *filename, bool local, const char *parent_dat struct vkd3d_shader_code *code) { ID3DInclude *iface = context; - unsigned int size; + unsigned int size = 0; if (!iface) return VKD3D_ERROR; + memset(code, 0, sizeof(*code)); if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_data, &code->code, &size))) return VKD3D_ERROR; -- 2.29.2

Dec. 2, 2020

[PATCH vkd3d 2/5] vkd3d-utils: Return an error from open_include() if a NULL ID3DInclude was passed to D3DPreprocess().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f799d0a2..2bbedd8b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -131,6 +131,9 @@ static int open_include(const char *filename, bool local, const char *parent_dat ID3DInclude *iface = context; unsigned int size; + if (!iface) + return VKD3D_ERROR; + if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_data, &code->code, &size))) return VKD3D_ERROR; -- 2.29.2

Dec. 2, 2020

[PATCH vkd3d 1/5] tests: Use vkd3d_memmem() in shader_runner_d3d12 (Valgrind).

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner_d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index bf5c3e08..42218041 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -372,6 +372,7 @@ START_TEST(shader_runner_d3d12) case STATE_PREPROC: { ID3D10Blob *blob = NULL, *errors = NULL; + SIZE_T size; HRESULT hr; char *text; @@ -387,8 +388,11 @@ START_TEST(shader_runner_d3d12) } text = ID3D10Blob_GetBufferPointer(blob); - ok(strstr(text, "pass"), "'pass' not found in preprocessed shader.\n"); - ok(!strstr(text, "fail"), "'fail' found in preprocessed shader.\n"); + size = ID3D10Blob_GetBufferSize(blob); + ok(vkd3d_memmem(text, size, "pass", strlen("pass")), + "'pass' not found in preprocessed shader.\n"); + ok(!vkd3d_memmem(text, size, "fail", strlen("fail")), + "'fail' found in preprocessed shader.\n"); ID3D10Blob_Release(blob); } -- 2.29.2

Dec. 2, 2020

[PATCH 10/10] msvcrt: Remove MSVCRT_ prefix from string.c functions.

by Piotr Caban

Dec. 1, 2020

[PATCH 09/10] msvcrt: Remove MSVCRT_ prefix from scanf.c functions.

by Piotr Caban

Dec. 1, 2020

[PATCH 08/10] msvcrt: Remove MSVCRT_ prefix from process.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 24 ++++++------- dlls/msvcr100/msvcr100.spec | 42 +++++++++++------------ dlls/msvcr110/msvcr110.spec | 44 ++++++++++++------------ dlls/msvcr120/msvcr120.spec | 44 ++++++++++++------------ dlls/msvcr70/msvcr70.spec | 42 +++++++++++------------ dlls/msvcr71/msvcr71.spec | 42 +++++++++++------------ dlls/msvcr80/msvcr80.spec | 42 +++++++++++------------ dlls/msvcr90/msvcr90.spec | 42 +++++++++++------------ dlls/msvcrt/msvcrt.h | 5 --- dlls/msvcrt/msvcrt.spec | 42 +++++++++++------------ dlls/msvcrt/process.c | 67 ++++++++++++++++++------------------ dlls/msvcrtd/msvcrtd.spec | 42 +++++++++++------------ dlls/ucrtbase/ucrtbase.spec | 68 ++++++++++++++++++------------------- 13 files changed, 271 insertions(+), 275 deletions(-)

Dec. 1, 2020

[PATCH 07/10] msvcrt: Remove MSVCRT_ prefix from misc.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 12 ++++----- dlls/msvcr100/msvcr100.spec | 30 ++++++++++----------- dlls/msvcr110/msvcr110.spec | 36 ++++++++++++------------- dlls/msvcr120/msvcr120.spec | 42 +++++++++++++++--------------- dlls/msvcr70/msvcr70.spec | 14 +++++----- dlls/msvcr71/msvcr71.spec | 14 +++++----- dlls/msvcr80/msvcr80.spec | 34 ++++++++++++------------ dlls/msvcr90/msvcr90.spec | 34 ++++++++++++------------ dlls/msvcrt/misc.c | 52 ++++++++++++++++++------------------- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 24 ++++++++--------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrtd/msvcrtd.spec | 12 ++++----- dlls/ucrtbase/ucrtbase.spec | 46 ++++++++++++++++---------------- include/msvcrt/stdio.h | 2 +- 15 files changed, 177 insertions(+), 178 deletions(-)

Dec. 1, 2020

[PATCH 06/10] msvcrt: Remove MSVCRT_ prefix from mbcs.c functions.

by Piotr Caban

Dec. 1, 2020

[PATCH 05/10] msvcrt: Remove MSVCRT_ prefix from exit.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 16 +++++----- dlls/msvcr100/msvcr100.spec | 22 +++++++------- dlls/msvcr110/msvcr110.spec | 24 +++++++-------- dlls/msvcr120/msvcr120.spec | 26 ++++++++-------- dlls/msvcr70/msvcr70.spec | 18 +++++------ dlls/msvcr71/msvcr71.spec | 18 +++++------ dlls/msvcr80/msvcr80.spec | 22 +++++++------- dlls/msvcr90/msvcr90.spec | 22 +++++++------- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/except.c | 6 ++-- dlls/msvcrt/exit.c | 46 ++++++++++++++-------------- dlls/msvcrt/locale.c | 10 +++---- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/msvcrt.spec | 20 ++++++------- dlls/msvcrt/process.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 18 +++++------ dlls/ucrtbase/ucrtbase.spec | 60 ++++++++++++++++++------------------- 18 files changed, 167 insertions(+), 169 deletions(-)

Dec. 1, 2020

[PATCH 04/10] msvcrt: Remove MSVCRT_ prefix from except.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 10 +++++----- dlls/msvcr120/msvcr120.spec | 10 +++++----- dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrt/except.c | 22 +++++++++++----------- dlls/msvcrt/exit.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 18 +++++++++--------- 14 files changed, 62 insertions(+), 63 deletions(-)

Dec. 1, 2020

[PATCH 03/10] msvcrt: Remove MSVCRT_ prefix from environ.c functions.

by Piotr Caban

Dec. 1, 2020

[PATCH 02/10] msvcrt: Use stdio.h definitions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 242 ++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 31 +----- include/msvcrt/stdio.h | 1 + 3 files changed, 126 insertions(+), 148 deletions(-)

Dec. 1, 2020

[PATCH 01/10] msvcrt: Use heap structures and definitions from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/heap.c | 29 +++++++++++++++-------------- dlls/msvcrt/msvcrt.h | 18 ------------------ 2 files changed, 15 insertions(+), 32 deletions(-)

Dec. 1, 2020

Re: [PATCH 1/5] include: Extend debug channel name size to 31 bytes.

by Matteo Bruni

On Tue, Dec 1, 2020 at 7:11 PM Matteo Bruni <mbruni(a)codeweavers.com> wrote: > > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > I was testing the next patch in the series and I noticed that > +d3d_synchronous didn't work at all... Of course, the alternative is to shorten the channel name to fit in 14 characters. Some grepping suggests that d3d_synchronous is the only one affected, so I guess that's preferable.

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Derek Lesho

On 12/1/20 4:27 PM, Zebediah Figura (she/her) wrote: > >>> Note that a simpler way to set the channel mask is to use >>> gst_audio_info_to_caps() in caps_from_mf_media_type(). >> Mind if I just move this functionality to caps_from_mf_media_type? I >> remember having problems with gst_audio_info_to_caps. >> > I don't think that makes very much sense in general, no. What problems > did you have with gst_audio_info_to_caps()? I don't remember unfortunately. I'll give it another shot and report back, although I'm starting to have doubts about whether or not we want channel-mask to be set when MF_MT_CHANNEL_MASK isn't.

Dec. 1, 2020

[PATCH 2/2] jscript: Clean up date formatting strings with era.

by Jeff Smith

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/date.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5ca23f199f3..efb97aa632e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -441,7 +441,7 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; jsstr_t *date_jsstr; @@ -466,7 +466,7 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, year = year_from_time(time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } @@ -480,16 +480,16 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, if(!show_offset) swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?L"":L" B.C."); + (int)sec_from_time(time), year, formatEra); else if(offset) swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC%c%02d%02d %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, - year, formatAD?L"":L" B.C."); + year, formatEra); else swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %02d:%02d:%02d UTC %d%s", week, month, day, (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?L"":L" B.C."); + (int)sec_from_time(time), year, formatEra); date_jsstr = jsstr_alloc(buf); if(!date_jsstr) @@ -638,7 +638,7 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; DateInstance *date; @@ -666,15 +666,15 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva year = year_from_time(date->time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } day = date_from_time(date->time); swprintf(buf, ARRAY_SIZE(buf), - formatAD ? L"%s, %d %s %d %02d:%02d:%02d UTC" : L"%s, %d %s %d B.C. %02d:%02d:%02d UTC", - week, day, month, year, (int)hour_from_time(date->time), (int)min_from_time(date->time), + L"%s, %d %s %d%s %02d:%02d:%02d UTC", week, day, month, year, formatEra, + (int)hour_from_time(date->time), (int)min_from_time(date->time), (int)sec_from_time(date->time)); date_str = jsstr_alloc(buf); @@ -714,7 +714,7 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) LOCALE_SABBREVMONTHNAME9, LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; - BOOL formatAD = TRUE; + const WCHAR *formatEra = L""; WCHAR week[64], month[64]; WCHAR buf[192]; jsstr_t *date_str; @@ -741,14 +741,13 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) year = year_from_time(time); if(year<0) { - formatAD = FALSE; + formatEra = L" B.C."; year = -year+1; } day = date_from_time(time); - swprintf(buf, ARRAY_SIZE(buf), formatAD ? L"%s %s %d %d" : L"%s %s %d %d B.C.", week, month, - day, year); + swprintf(buf, ARRAY_SIZE(buf), L"%s %s %d %d%s", week, month, day, year, formatEra); date_str = jsstr_alloc(buf); if(!date_str) -- 2.23.0

Dec. 1, 2020

[PATCH 1/2] jscript: Use wide-char string literals.

by Jeff Smith

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/decode.c | 11 ++++------- dlls/jscript/function.c | 34 +++++++++++++++------------------- dlls/jscript/jsutils.c | 6 ++---- dlls/jscript/parser.y | 4 +--- dlls/jscript/string.c | 4 +--- 5 files changed, 23 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index 283aa2ed947..b121c34b70e 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -113,14 +113,11 @@ HRESULT decode_source(WCHAR *code) const WCHAR *src = code; WCHAR *dst = code; - static const WCHAR decode_beginW[] = {'#','@','~','^'}; - static const WCHAR decode_endW[] = {'^','#','~','@'}; - while(*src) { - if(!wcsncmp(src, decode_beginW, ARRAY_SIZE(decode_beginW))) { + if(!wcscmp(src, L"#@~^")) { DWORD len, i, j=0, csum, s=0; - src += ARRAY_SIZE(decode_beginW); + src += lstrlenW(L"#@~^"); if(!decode_dword(src, &len)) return JS_E_INVALID_CHAR; @@ -165,9 +162,9 @@ HRESULT decode_source(WCHAR *code) return JS_E_INVALID_CHAR; src += 8; - if(wcsncmp(src, decode_endW, ARRAY_SIZE(decode_endW))) + if(wcscmp(src, L"^#~@")) return JS_E_INVALID_CHAR; - src += ARRAY_SIZE(decode_endW); + src += lstrlenW(L"^#~@"); }else { *dst++ = *src++; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 9f6aa4b4ec6..f3b40d22865 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -616,24 +616,20 @@ static HRESULT NativeFunction_call(script_ctx_t *ctx, FunctionInstance *func, ID static HRESULT NativeFunction_toString(FunctionInstance *func, jsstr_t **ret) { NativeFunction *function = (NativeFunction*)func; - DWORD name_len; + DWORD str_len; jsstr_t *str; WCHAR *ptr; - static const WCHAR native_prefixW[] = {'\n','f','u','n','c','t','i','o','n',' '}; - static const WCHAR native_suffixW[] = - {'(',')',' ','{','\n',' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n','}','\n'}; + static const WCHAR native_formatW[] = L"\nfunction %s() {\n [native code]\n}\n"; - name_len = function->name ? lstrlenW(function->name) : 0; - str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len, &ptr); + str_len = lstrlenW(native_formatW) - 2; + if(function->name) + str_len += lstrlenW(function->name); + str = jsstr_alloc_buf(str_len, &ptr); if(!str) return E_OUTOFMEMORY; - memcpy(ptr, native_prefixW, sizeof(native_prefixW)); - ptr += ARRAY_SIZE(native_prefixW); - memcpy(ptr, function->name, name_len*sizeof(WCHAR)); - ptr += name_len; - memcpy(ptr, native_suffixW, sizeof(native_suffixW)); + swprintf(ptr, str_len+1, native_formatW, function->name ? function->name : L""); *ret = str; return S_OK; @@ -912,8 +908,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg int j = 0; HRESULT hres = S_OK; - static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('}; - static const WCHAR function_beginW[] = {')',' ','{','\n'}; + static const WCHAR function_anonymousW[] = L"function anonymous("; + static const WCHAR function_beginW[] = L") {\n"; static const WCHAR function_endW[] = L"\n}"; if(argc) { @@ -932,11 +928,11 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } if(SUCCEEDED(hres)) { - len += ARRAY_SIZE(function_anonymousW) + ARRAY_SIZE(function_beginW) + ARRAY_SIZE(function_endW); + len += lstrlenW(function_anonymousW) + lstrlenW(function_beginW) + lstrlenW(function_endW) + 1; str = heap_alloc(len*sizeof(WCHAR)); if(str) { - memcpy(str, function_anonymousW, sizeof(function_anonymousW)); - ptr = str + ARRAY_SIZE(function_anonymousW); + memcpy(str, function_anonymousW, lstrlenW(function_anonymousW)*sizeof(WCHAR)); + ptr = str + lstrlenW(function_anonymousW); if(argc > 1) { while(1) { ptr += jsstr_flush(params[j], ptr); @@ -946,11 +942,11 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg *ptr++ = ' '; } } - memcpy(ptr, function_beginW, sizeof(function_beginW)); - ptr += ARRAY_SIZE(function_beginW); + memcpy(ptr, function_beginW, lstrlenW(function_beginW)*sizeof(WCHAR)); + ptr += lstrlenW(function_beginW); if(argc) ptr += jsstr_flush(params[argc-1], ptr); - memcpy(ptr, function_endW, sizeof(function_endW)); + memcpy(ptr, function_endW, (lstrlenW(function_endW)+1)*sizeof(WCHAR)); TRACE("%s\n", debugstr_w(str)); }else { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 56e8306ba21..29075282e0b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -494,8 +494,6 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) BOOL neg = FALSE; DOUBLE d = 0.0; - static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; - ptr = jsstr_flatten(str); if(!ptr) return E_OUTOFMEMORY; @@ -510,8 +508,8 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) ptr++; } - if(!wcsncmp(ptr, infinityW, ARRAY_SIZE(infinityW))) { - ptr += ARRAY_SIZE(infinityW); + if(!wcscmp(ptr, L"Infinity")) { + ptr += lstrlenW(L"Infinity"); while(*ptr && iswspace(*ptr)) ptr++; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6016be6cfd8..ba81668dbb3 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1573,14 +1573,12 @@ HRESULT script_parse(script_ctx_t *ctx, struct _compiler_ctx_t *compiler, byteco heap_pool_t *mark; HRESULT hres; - const WCHAR html_tagW[] = {'<','/','s','c','r','i','p','t','>',0}; - parser_ctx = heap_alloc_zero(sizeof(parser_ctx_t)); if(!parser_ctx) return E_OUTOFMEMORY; parser_ctx->error_loc = -1; - parser_ctx->is_html = delimiter && !wcsicmp(delimiter, html_tagW); + parser_ctx->is_html = delimiter && !wcsicmp(delimiter, L"</script>"); parser_ctx->begin = parser_ctx->ptr = code->source; parser_ctx->end = parser_ctx->begin + lstrlenW(parser_ctx->begin); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3dd40e6744f..694cca2b9bb 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -888,9 +888,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(FAILED(hres)) break; }else { - static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d'}; - - hres = strbuf_append(&ret, undefinedW, ARRAY_SIZE(undefinedW)); + hres = strbuf_append(&ret, L"undefined", lstrlenW(L"undefined")); if(FAILED(hres)) break; } -- 2.23.0

Dec. 1, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Derek Lesho

On 12/1/20 3:00 PM, Zebediah Figura (she/her) wrote: > >> +HRESULT mfplat_DllRegisterServer(void) >> +{ >> + unsigned int i; >> + HRESULT hr; >> + >> + for (i = 0; i < ARRAY_SIZE(mfts); i++) >> + { >> + const struct mft *cur = &mfts[i]; >> + >> + MFT_REGISTER_TYPE_INFO *input_types, *output_types; >> + input_types = heap_alloc(cur->input_types_count * sizeof(input_types[0])); >> + output_types = heap_alloc(cur->output_types_count * sizeof(output_types[0])); > Separately, I think it'd be better just to use MFT_REGISTER_TYPE_INFO > directly in your "struct mft", and avoid allocation. It'd have to be > non-const (or duplicate GUID definitions), but I think that's less > awkward on the whole. I'm trying to implement this now, but I'm having trouble with it. MFT_REGISTER_TYPE_INFO consists of GUID value fields, not GUID pointer fields. I'm not sure if there's a clean way to fill GUID fields of a struct in an initialization list, even when the array is not const. I definitely don't want to duplicate the GUID definitions, that would be ugly. Also, I'm not sure I necessarily I agree this solution is better than just having some heap allocations in DllRegisterServer, it's not in what I would call a hotpath.

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Zebediah Figura (she/her)

On 12/1/20 2:54 PM, Derek Lesho wrote: > >>> + /* audioconvert needs a valid channel-mask */ >> Well, that's not quite true, at least from my reading of the source, but >> it does need a valid channel mask for configurations other than mono or >> stereo. >> >> The code below is confusing, though; I'm not sure why channel-mask would >> be present in the caps at all. > Via MF_MT_AUDIO_CHANNEL_MASK. Indeed, I missed that, sorry. >> >> Note that a simpler way to set the channel mask is to use >> gst_audio_info_to_caps() in caps_from_mf_media_type(). > Mind if I just move this functionality to caps_from_mf_media_type? I > remember having problems with gst_audio_info_to_caps. > I don't think that makes very much sense in general, no. What problems did you have with gst_audio_info_to_caps()?

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Derek Lesho

>> + /* audioconvert needs a valid channel-mask */ > Well, that's not quite true, at least from my reading of the source, but > it does need a valid channel mask for configurations other than mono or > stereo. > > The code below is confusing, though; I'm not sure why channel-mask would > be present in the caps at all. Via MF_MT_AUDIO_CHANNEL_MASK. > > Note that a simpler way to set the channel mask is to use > gst_audio_info_to_caps() in caps_from_mf_media_type(). Mind if I just move this functionality to caps_from_mf_media_type? I remember having problems with gst_audio_info_to_caps.

Dec. 1, 2020

Re: [PATCH v2 3/4] winegstreamer: Implement ::Process(Input/Output) for audio conversion transform.

by Zebediah Figura (she/her)

On 11/18/20 2:52 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v2: Fix intermediate compile errors. > --- > dlls/winegstreamer/audioconvert.c | 202 +++++++++++++++++++++++++++++- > dlls/winegstreamer/gst_private.h | 1 + > dlls/winegstreamer/mfplat.c | 75 +++++++++++ > 3 files changed, 273 insertions(+), 5 deletions(-) > > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > index 04227d168ae..deb5ceb2f7c 100644 > --- a/dlls/winegstreamer/audioconvert.c > +++ b/dlls/winegstreamer/audioconvert.c > @@ -24,7 +24,8 @@ struct audio_converter > IMFMediaType *input_type; > IMFMediaType *output_type; > CRITICAL_SECTION cs; > - BOOL valid_state; > + BOOL valid_state, inflight; > + GstElement *container, *appsrc, *audioconvert, *resampler, *appsink; > }; > > static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > @@ -69,6 +70,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > if (!refcount) > { > DeleteCriticalSection(&transform->cs); > + gst_object_unref(transform->container); > heap_free(transform); > } > > @@ -261,22 +263,54 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface > static void audio_converter_update_pipeline_state(struct audio_converter *converter) > { > GstCaps *input_caps, *output_caps; > + GstStructure *input_structure, *output_structure; > + guint64 channels_in, channels_out, channel_mask = 0; > > if (!(converter->valid_state = converter->input_type && converter->output_type)) > + { > + gst_element_set_state(converter->container, GST_STATE_READY); > return; > + } > > if (!(input_caps = caps_from_mf_media_type(converter->input_type))) > { > converter->valid_state = FALSE; > + gst_element_set_state(converter->container, GST_STATE_READY); > return; > } > if (!(output_caps = caps_from_mf_media_type(converter->output_type))) > { > converter->valid_state = FALSE; > + gst_element_set_state(converter->container, GST_STATE_READY); > + gst_caps_unref(input_caps); > + return; > + } > + > + /* audioconvert needs a valid channel-mask */ Well, that's not quite true, at least from my reading of the source, but it does need a valid channel mask for configurations other than mono or stereo. The code below is confusing, though; I'm not sure why channel-mask would be present in the caps at all. Note that a simpler way to set the channel mask is to use gst_audio_info_to_caps() in caps_from_mf_media_type(). > + input_structure = gst_caps_get_structure(input_caps, 0); > + output_structure = gst_caps_get_structure(output_caps, 0); > + > + if (!gst_structure_get(input_structure, "channels", G_TYPE_INT, &channels_in, NULL) || > + !gst_structure_get(output_structure, "channels", G_TYPE_INT, &channels_out, NULL)) > + { > + converter->valid_state = FALSE; > + gst_element_set_state(converter->container, GST_STATE_READY); > gst_caps_unref(input_caps); > + gst_caps_unref(output_caps); > return; > } > > + gst_structure_get(input_structure, "channel-mask", GST_TYPE_BITMASK, &channel_mask, NULL); > + if (channel_mask == 0) > + gst_caps_set_simple(input_caps, "channel-mask", GST_TYPE_BITMASK, (guint64) (1 << channels_in) - 1, NULL); > + > + gst_structure_get(output_structure, "channel-mask", GST_TYPE_BITMASK, &channel_mask, NULL); > + if (channel_mask == 0) > + gst_caps_set_simple(output_caps, "channel-mask", GST_TYPE_BITMASK, (guint64) (1 << channels_out) - 1, NULL); > + > + g_object_set(converter->appsrc, "caps", input_caps, NULL); > + g_object_set(converter->appsink, "caps", output_caps, NULL); > + > if (TRACE_ON(mfplat)) > { > gchar *input_caps_str, *output_caps_str; > @@ -293,6 +327,7 @@ static void audio_converter_update_pipeline_state(struct audio_converter *conver > > gst_caps_unref(input_caps); > gst_caps_unref(output_caps); > + gst_element_set_state(converter->container, GST_STATE_PLAYING); > > return; > } > @@ -496,17 +531,114 @@ static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_ME > > static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) > { > - FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + GstBuffer *gst_buffer; > + HRESULT hr = S_OK; > + int ret; > > - return E_NOTIMPL; > + TRACE("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + > + if (flags) > + WARN("Unsupported flags %#x\n", flags); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + EnterCriticalSection(&converter->cs); > + > + if (!converter->valid_state) > + { > + hr = MF_E_TRANSFORM_TYPE_NOT_SET; > + goto done; > + } > + > + if (converter->inflight) > + { > + hr = MF_E_NOTACCEPTING; > + goto done; > + } > + > + if (!(gst_buffer = gst_buffer_from_mf_sample(sample))) These parentheses are redundant (and I don't think particularly clarifying). The same applies to many other cases in this patch. > + { > + hr = E_FAIL; > + goto done; > + } > + > + g_signal_emit_by_name(converter->appsrc, "push-buffer", gst_buffer, &ret); > + gst_buffer_unref(gst_buffer); > + if (ret != GST_FLOW_OK) > + { > + ERR("Couldn't push buffer ret = %d\n", ret); gst_flow_get_name() may be a good idea here. > + hr = E_FAIL; > + goto done; > + } None of these gotos are actually saving you any lines. > + > + converter->inflight = TRUE; > + > + done: > + LeaveCriticalSection(&converter->cs); > + > + return hr; > } > > static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, > MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) > { > - FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + MFT_OUTPUT_DATA_BUFFER *relevant_buffer = NULL; > + GstSample *sample; > + HRESULT hr = S_OK; > + unsigned int i; > > - return E_NOTIMPL; > + TRACE("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + > + if (flags) > + WARN("Unsupported flags %#x\n", flags); > + > + for (i = 0; i < count; i++) > + { > + MFT_OUTPUT_DATA_BUFFER *out_buffer = &samples[i]; > + > + if (out_buffer->dwStreamID != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (relevant_buffer) > + return MF_E_INVALIDSTREAMNUMBER; > + > + relevant_buffer = out_buffer; > + } > + > + if (!relevant_buffer) > + return S_OK; This code is very strange. Isn't it easier just to validate "count == 1"? And is it really correct to return MF_E_INVALIDSTREAMNUMBER if more than one sample is passed? > + > + EnterCriticalSection(&converter->cs); > + > + if (!converter->valid_state) > + { > + hr = MF_E_TRANSFORM_TYPE_NOT_SET; > + goto done; > + } > + > + if (!converter->inflight) > + { > + hr = MF_E_TRANSFORM_NEED_MORE_INPUT; > + goto done; > + } More gotos that don't save you anything. > + > + g_signal_emit_by_name(converter->appsink, "pull-sample", &sample); > + > + converter->inflight = FALSE; > + > + relevant_buffer->pSample = mf_sample_from_gst_buffer(gst_sample_get_buffer(sample)); > + gst_sample_unref(sample); > + relevant_buffer->dwStatus = S_OK; > + relevant_buffer->pEvents = NULL; > + *status = 0; > + > + done: > + LeaveCriticalSection(&converter->cs); > + > + return hr; > } > > static const IMFTransformVtbl audio_converter_vtbl = > @@ -542,6 +674,7 @@ static const IMFTransformVtbl audio_converter_vtbl = > HRESULT audio_converter_create(REFIID riid, void **ret) > { > struct audio_converter *object; > + HRESULT hr; > > TRACE("%s %p\n", debugstr_guid(riid), ret); > > @@ -553,6 +686,65 @@ HRESULT audio_converter_create(REFIID riid, void **ret) > > InitializeCriticalSection(&object->cs); > > + object->container = gst_bin_new(NULL); > + > + if (!(object->appsrc = gst_element_factory_make("appsrc", NULL))) > + { > + ERR("Failed to create appsrc"); I'd recommend including a message here about possibly missing gst-plugins-base (and similarly below), since it's a very common mistake for users to make. > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->appsrc); > + > + if (!(object->audioconvert = gst_element_factory_make("audioconvert", NULL))) > + { > + ERR("Failed to create converter\n"); > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->audioconvert); > + > + if (!(object->resampler = gst_element_factory_make("audioresample", NULL))) > + { > + ERR("Failed to create resampler\n"); > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->resampler); > + > + if (!(object->appsink = gst_element_factory_make("appsink", NULL))) > + { > + ERR("Failed to create appsink\n"); > + hr = E_FAIL; > + goto failed; > + } > + gst_bin_add(GST_BIN(object->container), object->appsink); > + > + if (!(gst_element_link(object->appsrc, object->audioconvert))) > + { > + ERR("Failed to link appsrc to audioconvert\n"); > + hr = E_FAIL; > + goto failed; > + } > + > + if (!(gst_element_link(object->audioconvert, object->resampler))) > + { > + ERR("Failed to link audioconvert to resampler\n"); > + hr = E_FAIL; > + goto failed; > + } > + > + if (!(gst_element_link(object->resampler, object->appsink))) > + { > + ERR("Failed to link resampler to appsink\n"); > + hr = E_FAIL; > + goto failed; > + } > + More gotos that don't save you anything. > *ret = &object->IMFTransform_iface; > return S_OK; > +failed: > + > + IMFTransform_Release(&object->IMFTransform_iface); > + return hr; > } > diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h > index 7889c996204..7f96c06dfaf 100644 > --- a/dlls/winegstreamer/gst_private.h > +++ b/dlls/winegstreamer/gst_private.h > @@ -81,6 +81,7 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HI > IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN; > GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN; > IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; > +GstBuffer *gst_buffer_from_mf_sample(IMFSample *in) DECLSPEC_HIDDEN; > > HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; > > diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c > index 909fb8b3572..7fdf722ec2e 100644 > --- a/dlls/winegstreamer/mfplat.c > +++ b/dlls/winegstreamer/mfplat.c > @@ -877,3 +877,78 @@ done: > > return out; > } > + > +GstBuffer* gst_buffer_from_mf_sample(IMFSample *mf_sample) > +{ > + GstBuffer *out = gst_buffer_new(); > + IMFMediaBuffer *mf_buffer = NULL; > + LONGLONG duration, time; > + DWORD buffer_count; > + unsigned int i; > + HRESULT hr; > + > + if (FAILED(hr = IMFSample_GetSampleDuration(mf_sample, &duration))) > + goto fail; > + > + if (FAILED(hr = IMFSample_GetSampleTime(mf_sample, &time))) > + goto fail; > + > + GST_BUFFER_DURATION(out) = duration; > + GST_BUFFER_PTS(out) = time * 100; > + > + if (FAILED(hr = IMFSample_GetBufferCount(mf_sample, &buffer_count))) > + goto fail; > + > + for (i = 0; i < buffer_count; i++) > + { > + DWORD buffer_max_size, buffer_size; > + GstMapInfo map_info; > + GstMemory *memory; > + BYTE *buf_data; > + > + if (FAILED(hr = IMFSample_GetBufferByIndex(mf_sample, i, &mf_buffer))) > + goto fail; > + > + if (FAILED(hr = IMFMediaBuffer_GetMaxLength(mf_buffer, &buffer_max_size))) > + goto fail; This value is unused. > + > + if (FAILED(hr = IMFMediaBuffer_GetCurrentLength(mf_buffer, &buffer_size))) > + goto fail; > + > + memory = gst_allocator_alloc(NULL, buffer_size, NULL); > + gst_memory_resize(memory, 0, buffer_size); > + > + if (!(gst_memory_map(memory, &map_info, GST_MAP_WRITE))) > + { > + hr = E_FAIL; > + goto fail; > + } > + > + if (FAILED(hr = IMFMediaBuffer_Lock(mf_buffer, &buf_data, NULL, NULL))) > + goto fail; > + > + memcpy(map_info.data, buf_data, buffer_size); > + > + if (FAILED(hr = IMFMediaBuffer_Unlock(mf_buffer))) > + goto fail; > + > + if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(mf_buffer, buffer_size))) > + goto fail; This doesn't look like it belongs here. > + > + gst_memory_unmap(memory, &map_info); > + > + gst_buffer_append_memory(out, memory); > + > + IMFMediaBuffer_Release(mf_buffer); > + mf_buffer = NULL; > + } > + > + return out; > + > +fail: > + ERR("Failed to copy IMFSample to GstBuffer, hr = %#x\n", hr); > + if (mf_buffer) > + IMFMediaBuffer_Release(mf_buffer); > + gst_buffer_unref(out); > + return NULL; > +} >

Dec. 1, 2020

Re: [PATCH v2 2/4] winegstreamer: Implement ::Set(Input/Output)Type for audio conversion transform.

by Derek Lesho

On 12/1/20 3:10 PM, Zebediah Figura (she/her) wrote: > This field is unused in this patch, but is there a reason its uses can't > be replaced with "converter->input_type && converter->output_type"? If the functionality of update_pipeline_state were moved to the validation stage of Set(Input/Output)Type, yes, that'd be possible. I'll do that. > >> }; >> >> static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) >> @@ -63,6 +68,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) >> >> if (!refcount) >> { >> + DeleteCriticalSection(&transform->cs); >> heap_free(transform); >> } >> >> @@ -252,18 +258,191 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface >> return hr; >> } >> >> +static void audio_converter_update_pipeline_state(struct audio_converter *converter) >> +{ >> + GstCaps *input_caps, *output_caps; >> + >> + if (!(converter->valid_state = converter->input_type && converter->output_type)) >> + return; >> + >> + if (!(input_caps = caps_from_mf_media_type(converter->input_type))) >> + { >> + converter->valid_state = FALSE; >> + return; >> + } >> + if (!(output_caps = caps_from_mf_media_type(converter->output_type))) >> + { >> + converter->valid_state = FALSE; >> + gst_caps_unref(input_caps); >> + return; >> + } >> + >> + if (TRACE_ON(mfplat)) >> + { >> + gchar *input_caps_str, *output_caps_str; >> + >> + input_caps_str = gst_caps_to_string(input_caps); >> + output_caps_str = gst_caps_to_string(output_caps); >> + >> + TRACE("Audio converter MFT configured to transform caps %s to caps %s\n", >> + debugstr_a(input_caps_str), debugstr_a(output_caps_str)); >> + >> + g_free(input_caps_str); >> + g_free(output_caps_str); >> + } >> + >> + gst_caps_unref(input_caps); >> + gst_caps_unref(output_caps); >> + >> + return; >> +} >> + > This function doesn't really do anything but trace; I'm not sure it > makes sense in this patch. I agree, even in the later patches where it does more, it just does the same thing twice for both the input and output type. It makes more sense to include it inline.+ >> + if (!found) >> + return MF_E_INVALIDTYPE; >> + } >> + >> + if (flags & MFT_SET_TYPE_TEST_ONLY) >> + return S_OK; > Wait, so what happens if MFT_SET_TYPE_TEST_ONLY is used with a NULL type? S_OK is returned, indicating that you can unset the input type.

Dec. 1, 2020

Re: [PATCH v2 2/4] winegstreamer: Implement ::Set(Input/Output)Type for audio conversion transform.

by Zebediah Figura (she/her)

On 11/18/20 2:52 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v2: Fix intermediate compile errors. > --- > dlls/winegstreamer/audioconvert.c | 190 +++++++++++++++++++++++++++++- > 1 file changed, 185 insertions(+), 5 deletions(-) > As similar as the implementations of these two functions are, splitting the patch probably wouldn't be a bad thing. > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > index 91fa556cb88..04227d168ae 100644 > --- a/dlls/winegstreamer/audioconvert.c > +++ b/dlls/winegstreamer/audioconvert.c > @@ -1,4 +1,5 @@ > #include "config.h" > +#include <gst/gst.h> > > #include "gst_private.h" > > @@ -20,6 +21,10 @@ struct audio_converter > { > IMFTransform IMFTransform_iface; > LONG refcount; > + IMFMediaType *input_type; > + IMFMediaType *output_type; > + CRITICAL_SECTION cs; > + BOOL valid_state; This field is unused in this patch, but is there a reason its uses can't be replaced with "converter->input_type && converter->output_type"? > }; > > static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > @@ -63,6 +68,7 @@ static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > > if (!refcount) > { > + DeleteCriticalSection(&transform->cs); > heap_free(transform); > } > > @@ -252,18 +258,191 @@ static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface > return hr; > } > > +static void audio_converter_update_pipeline_state(struct audio_converter *converter) > +{ > + GstCaps *input_caps, *output_caps; > + > + if (!(converter->valid_state = converter->input_type && converter->output_type)) > + return; > + > + if (!(input_caps = caps_from_mf_media_type(converter->input_type))) > + { > + converter->valid_state = FALSE; > + return; > + } > + if (!(output_caps = caps_from_mf_media_type(converter->output_type))) > + { > + converter->valid_state = FALSE; > + gst_caps_unref(input_caps); > + return; > + } > + > + if (TRACE_ON(mfplat)) > + { > + gchar *input_caps_str, *output_caps_str; > + > + input_caps_str = gst_caps_to_string(input_caps); > + output_caps_str = gst_caps_to_string(output_caps); > + > + TRACE("Audio converter MFT configured to transform caps %s to caps %s\n", > + debugstr_a(input_caps_str), debugstr_a(output_caps_str)); > + > + g_free(input_caps_str); > + g_free(output_caps_str); > + } > + > + gst_caps_unref(input_caps); > + gst_caps_unref(output_caps); > + > + return; > +} > + This function doesn't really do anything but trace; I'm not sure it makes sense in this patch. > static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > { > - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + unsigned int i; > + HRESULT hr; > > - return E_NOTIMPL; > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + > + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (type) > + { > + GUID major_type, subtype; > + BOOL found = FALSE; > + DWORD unused; > + > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) > + return MF_E_INVALIDTYPE; > + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) > + return MF_E_INVALIDTYPE; > + > + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) > + return MF_E_INVALIDTYPE; > + > + for (i = 0; i < ARRAY_SIZE(raw_types); i++) > + { > + if (IsEqualGUID(&subtype, raw_types[i])) > + { > + found = TRUE; > + break; > + } > + } I guess I didn't notice this in patch 1/4, but raw_types seems a bit overkill when only two types are used (and it's not clear to me that more will be needed). > + > + if (!found) > + return MF_E_INVALIDTYPE; > + } > + > + if (flags & MFT_SET_TYPE_TEST_ONLY) > + return S_OK; Wait, so what happens if MFT_SET_TYPE_TEST_ONLY is used with a NULL type? > + > + hr = S_OK; > + > + EnterCriticalSection(&converter->cs); > + > + if (type) > + { > + if (!converter->input_type) > + if (FAILED(hr = MFCreateMediaType(&converter->input_type))) > + goto done; > + > + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->input_type))) > + goto done; This "goto" is redundant. The former could potentially be made redundant as well. > + } > + else if (converter->input_type) > + { > + IMFMediaType_Release(converter->input_type); > + converter->input_type = NULL; > + } > + > + done: > + if (hr == S_OK) > + audio_converter_update_pipeline_state(converter); > + LeaveCriticalSection(&converter->cs); > + > + return S_OK; > } > > static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > { > - FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + struct audio_converter *converter = impl_audio_converter_from_IMFTransform(iface); > + GUID major_type, subtype; > + unsigned int i; > + DWORD unused; > + HRESULT hr; > > - return E_NOTIMPL; > + TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (!converter->input_type) > + return MF_E_TRANSFORM_TYPE_NOT_SET; > + > + if (type) > + { > + /* validate the type */ > + > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major_type))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &unused))) > + return MF_E_INVALIDTYPE; > + if (IsEqualGUID(&subtype, &MFAudioFormat_PCM) && FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &unused))) > + return MF_E_INVALIDTYPE; > + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &unused))) > + return MF_E_INVALIDTYPE; > + > + if (!(IsEqualGUID(&major_type, &MFMediaType_Audio))) > + return MF_E_INVALIDTYPE; > + > + for (i = 0; i < ARRAY_SIZE(raw_types); i++) > + { > + if (IsEqualGUID(&subtype, raw_types[i])) > + break; > + if (i == ARRAY_SIZE(raw_types)) > + return MF_E_INVALIDTYPE; > + } > + } > + > + if (flags & MFT_SET_TYPE_TEST_ONLY) > + return S_OK; > + > + EnterCriticalSection(&converter->cs); > + > + hr = S_OK; > + > + if (type) > + { > + if (!converter->output_type) > + if (FAILED(hr = MFCreateMediaType(&converter->output_type))) > + goto done; > + > + if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *) converter->output_type))) > + goto done; > + } > + else if (converter->output_type) > + { > + IMFMediaType_Release(converter->output_type); > + converter->output_type = NULL; > + } > + > + done: > + if (hr == S_OK) > + audio_converter_update_pipeline_state(converter); > + LeaveCriticalSection(&converter->cs); > + > + return hr; > } > Most of the above comments apply here as well. > static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > @@ -363,7 +542,6 @@ static const IMFTransformVtbl audio_converter_vtbl = > HRESULT audio_converter_create(REFIID riid, void **ret) > { > struct audio_converter *object; > - HRESULT hr; This should be part of the previous patch. > > TRACE("%s %p\n", debugstr_guid(riid), ret); > > @@ -373,6 +551,8 @@ HRESULT audio_converter_create(REFIID riid, void **ret) > object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; > object->refcount = 1; > > + InitializeCriticalSection(&object->cs); > + Can you please add debug info to the CS? > *ret = &object->IMFTransform_iface; > return S_OK; > } >

Dec. 1, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Derek Lesho

On 12/1/20 3:00 PM, Zebediah Figura (she/her) wrote: >> +static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) >> +{ >> + FIXME("%p, %u.\n", iface, message); >> + >> + return S_OK; >> +} > Why S_OK? Because the media session sends some messages to the transform such as MFT_MESSAGE_NOTIFY_BEGIN_STREAMING and fails to play if S_OK isn't returned. I take it you'd like me to actually implement this method instead. > Why not CLSID_CResamplerMediaObject? In fact, we already have one > application that needs it (bug 47781). The only reason I didn't expose it as CLSID_CResamplerMediaObject is that I didn't want to imply that I was basing the interface and types supported off of that specific object. For instance, that object, from what I can see on the MSDN, doesn't support PCM<->Float conversions, and vice versa. Is this not a big enough deal to keep it separate?

Dec. 1, 2020

Re: [PATCH v2 1/4] winegstreamer: Introduce audio conversion transform.

by Zebediah Figura (she/her)

On 11/18/20 2:52 PM, Derek Lesho wrote: > Serves as a wrapper of audioconvert, and roughly fills the roll of Windows' CLSID_CResamplerMediaObject to convert audio to the format accepted by the streaming audio renderer. Spelling error: "roll" > > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > v2: Fix intermediate compile errors. > --- > dlls/winegstreamer/Makefile.in | 1 + > dlls/winegstreamer/audioconvert.c | 378 +++++++++++++++++++ > dlls/winegstreamer/gst_private.h | 2 + > dlls/winegstreamer/mfplat.c | 77 ++++ > dlls/winegstreamer/winegstreamer_classes.idl | 6 + > 5 files changed, 464 insertions(+) > create mode 100644 dlls/winegstreamer/audioconvert.c > > diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in > index e578d194f7f..0b3229160b9 100644 > --- a/dlls/winegstreamer/Makefile.in > +++ b/dlls/winegstreamer/Makefile.in > @@ -6,6 +6,7 @@ EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) > PARENTSRC = ../strmbase > > C_SRCS = \ > + audioconvert.c \ > filter.c \ > gst_cbs.c \ > gstdemux.c \ > diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c > new file mode 100644 > index 00000000000..91fa556cb88 > --- /dev/null > +++ b/dlls/winegstreamer/audioconvert.c > @@ -0,0 +1,378 @@ > +#include "config.h" > + > +#include "gst_private.h" > + > +#include "mfapi.h" > +#include "mferror.h" > +#include "mfidl.h" > + > +#include "wine/debug.h" > +#include "wine/heap.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); > + > +static const GUID *raw_types[] = { > + &MFAudioFormat_PCM, > + &MFAudioFormat_Float, > +}; > + > +struct audio_converter > +{ > + IMFTransform IMFTransform_iface; > + LONG refcount; > +}; > + > +static struct audio_converter *impl_audio_converter_from_IMFTransform(IMFTransform *iface) > +{ > + return CONTAINING_RECORD(iface, struct audio_converter, IMFTransform_iface); > +} > + > +static HRESULT WINAPI audio_converter_QueryInterface(IMFTransform *iface, REFIID riid, void **obj) > +{ > + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); > + > + if (IsEqualIID(riid, &IID_IMFTransform) || > + IsEqualIID(riid, &IID_IUnknown)) > + { > + *obj = iface; > + IMFTransform_AddRef(iface); > + return S_OK; > + } > + > + WARN("Unsupported %s.\n", debugstr_guid(riid)); > + *obj = NULL; > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI audio_converter_AddRef(IMFTransform *iface) > +{ > + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); > + ULONG refcount = InterlockedIncrement(&transform->refcount); > + > + TRACE("%p, refcount %u.\n", iface, refcount); > + > + return refcount; > +} > + > +static ULONG WINAPI audio_converter_Release(IMFTransform *iface) > +{ > + struct audio_converter *transform = impl_audio_converter_from_IMFTransform(iface); > + ULONG refcount = InterlockedDecrement(&transform->refcount); > + > + TRACE("%p, refcount %u.\n", iface, refcount); > + > + if (!refcount) > + { > + heap_free(transform); > + } > + > + return refcount; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamLimits(IMFTransform *iface, DWORD *input_minimum, DWORD *input_maximum, > + DWORD *output_minimum, DWORD *output_maximum) > +{ > + TRACE("%p, %p, %p, %p, %p.\n", iface, input_minimum, input_maximum, output_minimum, output_maximum); > + > + *input_minimum = *input_maximum = *output_minimum = *output_maximum = 1; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamCount(IMFTransform *iface, DWORD *inputs, DWORD *outputs) > +{ > + TRACE("%p, %p, %p.\n", iface, inputs, outputs); > + > + *inputs = *outputs = 1; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetStreamIDs(IMFTransform *iface, DWORD input_size, DWORD *inputs, > + DWORD output_size, DWORD *outputs) > +{ > + TRACE("%p %u %p %u %p.\n", iface, input_size, inputs, output_size, outputs); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) > +{ > + FIXME("%p %u %p.\n", iface, id, info); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) > +{ > + FIXME("%p %u %p.\n", iface, id, info); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) > +{ > + FIXME("%p, %p.\n", iface, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStreamAttributes(IMFTransform *iface, DWORD id, > + IMFAttributes **attributes) > +{ > + FIXME("%p, %u, %p.\n", iface, id, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, > + IMFAttributes **attributes) > +{ > + FIXME("%p, %u, %p.\n", iface, id, attributes); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_DeleteInputStream(IMFTransform *iface, DWORD id) > +{ > + TRACE("%p, %u.\n", iface, id); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_AddInputStreams(IMFTransform *iface, DWORD streams, DWORD *ids) > +{ > + TRACE("%p, %u, %p.\n", iface, streams, ids); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputAvailableType(IMFTransform *iface, DWORD id, DWORD index, > + IMFMediaType **type) > +{ > + IMFMediaType *ret; > + HRESULT hr; > + > + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (index >= ARRAY_SIZE(raw_types)) > + return MF_E_NO_MORE_TYPES; > + > + if (FAILED(hr = MFCreateMediaType(&ret))) > + return hr; > + > + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) > + { > + IMFMediaType_Release(ret); > + return hr; > + } > + > + if (FAILED(hr = IMFMediaType_SetGUID(ret, &MF_MT_SUBTYPE, raw_types[index]))) > + { > + IMFMediaType_Release(ret); > + return hr; > + } > + > + *type = ret; > + > + return S_OK; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputAvailableType(IMFTransform *iface, DWORD id, DWORD index, > + IMFMediaType **type) > +{ > + IMFMediaType *output_type; > + HRESULT hr; > + > + static const DWORD rates[] = {44100, 48000}; > + static const DWORD channel_cnts[] = {1, 2, 6}; > + static const DWORD sizes[] = {16, 24, 32}; > + const GUID *subtype; > + DWORD rate, channels, bps; > + > + TRACE("%p, %u, %u, %p.\n", iface, id, index, type); > + > + if (id != 0) > + return MF_E_INVALIDSTREAMNUMBER; > + > + if (index >= (2/*rates*/ * 3/*layouts*/ * 3/*bps PCM*/) + (2 * 3)) > + return MF_E_NO_MORE_TYPES; > + > + if (FAILED(hr = MFCreateMediaType(&output_type))) > + return hr; > + > + if (index < 2 * 3 * 3) > + { > + subtype = &MFAudioFormat_PCM; > + rate = rates[index % 2]; > + channels = channel_cnts[(index / 2) % 3]; > + bps = sizes[(index / (2*3)) % 3]; > + } > + else > + { > + index -= (2 * 3 * 3); > + subtype = &MFAudioFormat_Float; > + bps = 32; > + rate = rates[index % 2]; > + channels = channel_cnts[(index / 2) % 3]; > + } > + This is mildly awkward; perhaps it would be better to replace "sizes" with something like static const struct { const GUID *subtype; DWORD depth; } formats[] = { {&MFAudioFormat_PCM, 16}, {&MFAudioFormat_PCM, 24}, {&MFAudioFormat_PCM, 32}, {&MFAudioFormat_Float, 32}, }; > + > + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetGUID(output_type, &MF_MT_SUBTYPE, subtype))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, rate))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_NUM_CHANNELS, channels))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, bps))) > + goto fail; > + > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, channels * bps / 8))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, rate * channels * bps / 8))) > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_AUDIO_CHANNEL_MASK, > + channels == 1 ? SPEAKER_FRONT_CENTER : > + channels == 2 ? SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT : > + /*channels == 6*/ 0x3F))) These are KSAUDIO_SPEAKER_MONO, KSAUDIO_SPEAKER_STEREO, and KSAUDIO_SPEAKER_5POINT1 respectively. > + goto fail; > + if (FAILED(hr = IMFMediaType_SetUINT32(output_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE))) > + goto fail; > + > + *type = output_type; > + > + return S_OK; > + fail: Please don't insert tabs before labels; it makes them look like regular statements. > + IMFMediaType_Release(output_type); > + return hr; > +} > + I'm not sure why this function (and some of the others here) weren't split out into a separate patch like e.g. SetInputType(). Personally I'd recommend splitting out the implementations of all functions. > +static HRESULT WINAPI audio_converter_SetInputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, type, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > +{ > + FIXME("%p, %u, %p.\n", iface, id, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) > +{ > + FIXME("%p, %u, %p.\n", iface, id, type); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags) > +{ > + FIXME("%p, %u, %p.\n", iface, id, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_GetOutputStatus(IMFTransform *iface, DWORD *flags) > +{ > + FIXME("%p, %p.\n", iface, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) > +{ > + FIXME("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessEvent(IMFTransform *iface, DWORD id, IMFMediaEvent *event) > +{ > + TRACE("%p, %u, %p.\n", iface, id, event); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) > +{ > + FIXME("%p, %u.\n", iface, message); > + > + return S_OK; > +} Why S_OK? > + > +static HRESULT WINAPI audio_converter_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) > +{ > + FIXME("%p, %u, %p, %#x.\n", iface, id, sample, flags); > + > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI audio_converter_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, > + MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) > +{ > + FIXME("%p, %#x, %u, %p, %p.\n", iface, flags, count, samples, status); > + > + return E_NOTIMPL; > +} > + > +static const IMFTransformVtbl audio_converter_vtbl = > +{ > + audio_converter_QueryInterface, > + audio_converter_AddRef, > + audio_converter_Release, > + audio_converter_GetStreamLimits, > + audio_converter_GetStreamCount, > + audio_converter_GetStreamIDs, > + audio_converter_GetInputStreamInfo, > + audio_converter_GetOutputStreamInfo, > + audio_converter_GetAttributes, > + audio_converter_GetInputStreamAttributes, > + audio_converter_GetOutputStreamAttributes, > + audio_converter_DeleteInputStream, > + audio_converter_AddInputStreams, > + audio_converter_GetInputAvailableType, > + audio_converter_GetOutputAvailableType, > + audio_converter_SetInputType, > + audio_converter_SetOutputType, > + audio_converter_GetInputCurrentType, > + audio_converter_GetOutputCurrentType, > + audio_converter_GetInputStatus, > + audio_converter_GetOutputStatus, > + audio_converter_SetOutputBounds, > + audio_converter_ProcessEvent, > + audio_converter_ProcessMessage, > + audio_converter_ProcessInput, > + audio_converter_ProcessOutput, > +}; > + > +HRESULT audio_converter_create(REFIID riid, void **ret) > +{ > + struct audio_converter *object; > + HRESULT hr; > + > + TRACE("%s %p\n", debugstr_guid(riid), ret); > + > + if (!(object = heap_alloc_zero(sizeof(*object)))) > + return E_OUTOFMEMORY; > + > + object->IMFTransform_iface.lpVtbl = &audio_converter_vtbl; > + object->refcount = 1; > + > + *ret = &object->IMFTransform_iface; > + return S_OK; > +} > diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h > index 28e424439d8..7889c996204 100644 > --- a/dlls/winegstreamer/gst_private.h > +++ b/dlls/winegstreamer/gst_private.h > @@ -84,4 +84,6 @@ IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN; > > HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; > > +HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; > + > #endif /* __GST_PRIVATE_INCLUDED__ */ > diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c > index 3d224a5accc..909fb8b3572 100644 > --- a/dlls/winegstreamer/mfplat.c > +++ b/dlls/winegstreamer/mfplat.c > @@ -405,6 +405,8 @@ failed: > > static const GUID CLSID_GStreamerByteStreamHandler = {0x317df618, 0x5e5a, 0x468a, {0x9f, 0x15, 0xd8, 0x27, 0xa9, 0xa0, 0x81, 0x62}}; > > +static GUID CLSID_WINEAudioConverter = {0x6a170414,0xaad9,0x4693,{0xb8,0x06,0x3a,0x0c,0x47,0xc5,0x70,0xd6}}; > + Why not CLSID_CResamplerMediaObject? In fact, we already have one application that needs it (bug 47781). Also, this can be const. > static const struct class_object > { > const GUID *clsid; > @@ -414,6 +416,7 @@ class_objects[] = > { > { &CLSID_VideoProcessorMFT, &video_processor_create }, > { &CLSID_GStreamerByteStreamHandler, &winegstreamer_stream_handler_create }, > + { &CLSID_WINEAudioConverter, &audio_converter_create }, > }; > > HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) > @@ -442,6 +445,80 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) > return CLASS_E_CLASSNOTAVAILABLE; > } > > +static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; > +const GUID *audio_converter_supported_types[] = Missing "static" here. > +{ > + &MFAudioFormat_PCM, > + &MFAudioFormat_Float, > +}; > + > +static const struct mft > +{ > + const GUID *clsid; > + const GUID *category; > + LPWSTR name; > + const UINT32 flags; > + const GUID *major_type; > + const UINT32 input_types_count; > + const GUID **input_types; > + const UINT32 output_types_count; > + const GUID **output_types; > + IMFAttributes *attributes; > +} > +mfts[] = > +{ > + { > + &CLSID_WINEAudioConverter, > + &MFT_CATEGORY_AUDIO_EFFECT, > + audio_converterW, > + MFT_ENUM_FLAG_SYNCMFT, > + &MFMediaType_Audio, > + ARRAY_SIZE(audio_converter_supported_types), > + audio_converter_supported_types, > + ARRAY_SIZE(audio_converter_supported_types), > + audio_converter_supported_types, > + NULL > + }, > +}; > + > +HRESULT mfplat_DllRegisterServer(void) > +{ > + unsigned int i; > + HRESULT hr; > + > + for (i = 0; i < ARRAY_SIZE(mfts); i++) > + { > + const struct mft *cur = &mfts[i]; > + > + MFT_REGISTER_TYPE_INFO *input_types, *output_types; > + input_types = heap_alloc(cur->input_types_count * sizeof(input_types[0])); > + output_types = heap_alloc(cur->output_types_count * sizeof(output_types[0])); This is some confusing spacing. I expect either a blank line after all declarations or no blank line at all, but this makes me think "wait, where's input_types declared?" Separately, I think it'd be better just to use MFT_REGISTER_TYPE_INFO directly in your "struct mft", and avoid allocation. It'd have to be non-const (or duplicate GUID definitions), but I think that's less awkward on the whole. > + for (i = 0; i < cur->input_types_count; i++) > + { > + input_types[i].guidMajorType = *(cur->major_type); > + input_types[i].guidSubtype = *(cur->input_types[i]); > + } > + for (i = 0; i < cur->output_types_count; i++) > + { > + output_types[i].guidMajorType = *(cur->major_type); > + output_types[i].guidSubtype = *(cur->output_types[i]); > + } > + > + hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, > + input_types, cur->output_types_count, output_types, cur->attributes); > + > + heap_free(input_types); > + heap_free(output_types); > + > + if (FAILED(hr)) > + { > + FIXME("Failed to register MFT, hr %#x\n", hr); > + return hr; > + } > + } > + return S_OK; > +} > + This registration could also be a separate patch. > static const struct > { > const GUID *subtype; > diff --git a/dlls/winegstreamer/winegstreamer_classes.idl b/dlls/winegstreamer/winegstreamer_classes.idl > index 1dc4ba9a10b..cf1fc69f38a 100644 > --- a/dlls/winegstreamer/winegstreamer_classes.idl > +++ b/dlls/winegstreamer/winegstreamer_classes.idl > @@ -61,3 +61,9 @@ coclass VideoProcessorMFT {} > uuid(317df618-5e5a-468a-9f15-d827a9a08162) > ] > coclass GStreamerByteStreamHandler {} > + > +[ > + threading(both), > + uuid(6a170414-aad9-4693-b806-3a0c47c570d6) > +] > +coclass WINEAudioConverter { } >

Dec. 1, 2020

Re: [PATCH] shdocvw: Use wide-char string literals.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Dec. 1, 2020

[PATCH] server: Block console write until conhost processes ioctl.

by Jacek Caban

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50236 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 2 -- 1 file changed, 2 deletions(-)

Dec. 1, 2020

[PATCH 5/5] d3d11: Don't explicitly check for cube map support.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Always consider them supported whenever the format is otherwise available instead. The idea is to avoid referring to WINED3DUSAGE_LEGACY_CUBEMAP in d3d11. dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2a08d2b1e65..50e8cd58fe2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3315,7 +3315,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, @@ -3364,6 +3363,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; + *format_support |= D3D11_FORMAT_SUPPORT_TEXTURECUBE; if (feature_level >= D3D_FEATURE_LEVEL_10_1) *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; -- 2.26.2

Dec. 1, 2020

[PATCH 4/5] d3d9/tests: Make a variable static const.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7c0a0157389..504d276d6c5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16799,7 +16799,7 @@ static void fp_special_test(void) 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s; -- 2.26.2

Dec. 1, 2020

[PATCH 3/5] wined3d: Get rid of an unnecessary assignment.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/view.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4db3746d8de..1abbbac4fb4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1409,7 +1409,6 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) struct wined3d_context_gl *context_gl; context_gl = wined3d_context_gl(context_acquire(resource->device, NULL, 0)); - gl_info = context_gl->gl_info; create_buffer_view(&view_gl->gl_view, &context_gl->c, desc, buffer, view_gl->v.format); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { -- 2.26.2

Dec. 1, 2020

[PATCH 2/5] wined3d: Allow forcing adapter commands serialization in the CS.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_main.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 37 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 48b73a71fe4..4b71f910048 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -21,6 +21,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); WINE_DECLARE_DEBUG_CHANNEL(fps); #define WINED3D_INITIAL_CS_SIZE 4096 @@ -2866,6 +2867,18 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) WaitForSingleObject(cs->event, INFINITE); } +static void wined3d_cs_adapter_lock(const struct wined3d_cs *cs) +{ + if (cs->serialize_adapter) + EnterCriticalSection(&wined3d_adapter_cs); +} + +static void wined3d_cs_adapter_unlock(const struct wined3d_cs *cs) +{ + if (cs->serialize_adapter) + LeaveCriticalSection(&wined3d_adapter_cs); +} + static DWORD WINAPI wined3d_cs_run(void *ctx) { struct wined3d_cs_packet *packet; @@ -2889,7 +2902,9 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { if (++poll == WINED3D_CS_QUERY_POLL_INTERVAL) { + wined3d_cs_adapter_lock(cs); poll_queries(cs); + wined3d_cs_adapter_unlock(cs); poll = 0; } @@ -2920,7 +2935,9 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) break; } + wined3d_cs_adapter_lock(cs); wined3d_cs_op_handlers[opcode](cs, packet->data); + wined3d_cs_adapter_unlock(cs); TRACE("%s executed.\n", debug_cs_op(opcode)); } @@ -2945,6 +2962,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; + cs->serialize_adapter = TRACE_ON(d3d_synchronous) || wined3d_settings.serialize_adapter; state_init(&cs->state, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e1ed86e80ed..43653d6dbc1 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -96,6 +96,16 @@ static CRITICAL_SECTION_DEBUG wined3d_wndproc_cs_debug = }; static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, 0, 0, 0}; +CRITICAL_SECTION wined3d_adapter_cs; +static CRITICAL_SECTION_DEBUG wined3d_adapter_cs_debug = +{ + 0, 0, &wined3d_adapter_cs, + {&wined3d_adapter_cs_debug.ProcessLocksList, + &wined3d_adapter_cs_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": wined3d_adapter_cs")} +}; +CRITICAL_SECTION wined3d_adapter_cs = {&wined3d_adapter_cs_debug, -1, 0, 0, 0, 0}; + /* When updating default value here, make sure to update winecfg as well, * where appropriate. */ struct wined3d_settings wined3d_settings = @@ -111,6 +121,7 @@ struct wined3d_settings wined3d_settings = ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ FALSE, /* No strict shader math by default. */ + FALSE, /* Don't synchronize adapter commands by default. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -392,6 +403,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } + if (!get_config_key_dword(hkey, appkey, "serialize_adapter", &wined3d_settings.serialize_adapter)) + ERR_(winediag)("Setting serialize_adapter to %#x.\n", wined3d_settings.serialize_adapter); } if (appkey) RegCloseKey( appkey ); @@ -436,6 +449,8 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) heap_free(wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); + DeleteCriticalSection(&wined3d_adapter_cs); + DeleteCriticalSection(&wined3d_wndproc_cs); DeleteCriticalSection(&wined3d_cs); return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab2543e52eb..6ed8d3c2d7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -434,6 +434,7 @@ struct wined3d_settings unsigned int sample_count; BOOL check_float_constants; unsigned int strict_shader_math; + unsigned int serialize_adapter; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds; @@ -4640,6 +4641,7 @@ struct wined3d_cs HMODULE wined3d_module; HANDLE thread; DWORD thread_id; + BOOL serialize_adapter; struct wined3d_cs_queue queue[WINED3D_CS_QUEUE_COUNT]; size_t data_size, start, end; @@ -6323,4 +6325,6 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" +extern CRITICAL_SECTION wined3d_adapter_cs; + #endif -- 2.26.2

Dec. 1, 2020

[PATCH 1/5] include: Extend debug channel name size to 31 bytes.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I was testing the next patch in the series and I noticed that +d3d_synchronous didn't work at all... include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index e064aaefb8e..e505a0a333a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -52,7 +52,7 @@ enum __wine_debug_class struct __wine_debug_channel { unsigned char flags; - char name[15]; + char name[31]; }; #ifndef WINE_NO_TRACE_MSGS -- 2.26.2

Dec. 1, 2020

[PATCH 5/5] wined3d: Reference the stream output bo in context_load_stream_output_buffers().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 --------------- dlls/wined3d/context_gl.c | 21 ++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b52df0bd11e..2dd4780b8ad 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -455,18 +455,3 @@ void context_load_unordered_access_resources(struct wined3d_context *context, context->uses_uavs = 1; } } - -void context_load_stream_output_buffers(struct wined3d_context *context, const struct wined3d_state *state) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) - { - struct wined3d_buffer *buffer; - if (!(buffer = state->stream_output[i].buffer)) - continue; - - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - } -} diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d0c2f707ed0..13e4fa69ea7 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3684,6 +3684,25 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } +static void context_gl_load_stream_output_buffers(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + struct wined3d_buffer_gl *buffer_gl; + + if (!state->stream_output[i].buffer) + continue; + + buffer_gl = wined3d_buffer_gl(state->stream_output[i].buffer); + wined3d_buffer_load(&buffer_gl->b, &context_gl->c, state); + wined3d_buffer_invalidate_location(&buffer_gl->b, ~WINED3D_LOCATION_BUFFER); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } +} + /* Context activation is done by the caller. */ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) @@ -3716,7 +3735,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); - context_load_stream_output_buffers(context, state); + context_gl_load_stream_output_buffers(context_gl, state); /* TODO: Right now the dependency on the vertex shader is necessary * since wined3d_stream_info_from_declaration() depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7baff857d0..ab2543e52eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2117,8 +2117,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; -void context_load_stream_output_buffers(struct wined3d_context *context, - const struct wined3d_state *state) DECLSPEC_HIDDEN; void context_load_unordered_access_resources(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) DECLSPEC_HIDDEN; void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; -- 2.20.1

Dec. 1, 2020

[PATCH 4/5] wined3d: Reference the indirect buffer bo in dispatch_compute().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 419fc4923bd..d0c2f707ed0 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4107,6 +4107,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer_gl->bo.id)); GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } else { -- 2.20.1

Dec. 1, 2020

[PATCH 3/5] wined3d: Reference the indirect buffer bo in wined3d_context_gl_draw_indirect().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4aaf50434a6..419fc4923bd 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4488,8 +4488,8 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) { GLenum gl_primitive_type = gl_primitive_type_from_d3d(state->primitive_type); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(parameters->buffer); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_buffer *buffer = parameters->buffer; const void *offset; if (!gl_info->supported[ARB_DRAW_INDIRECT]) @@ -4498,7 +4498,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ return; } - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->bo.id)); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer_gl->bo.id)); offset = (void *)(GLintptr)parameters->offset; if (idx_size) @@ -4514,6 +4514,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ } GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("draw indirect"); } -- 2.20.1

Dec. 1, 2020

[PATCH 2/5] wined3d: Reference the bo in wined3d_unordered_access_view_gl_clear_uint().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4c85e2fefe4..4db3746d8de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1348,6 +1348,7 @@ void wined3d_unordered_access_view_gl_clear_uint(struct wined3d_unordered_access wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); GL_EXTCALL(glClearBufferSubData(buffer_gl->bo.binding, format->internal, offset, size, format->format, format->type, clear_value)); + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); checkGLcall("clear unordered access view"); } -- 2.20.1

Dec. 1, 2020

[PATCH 1/5] wined3d: Reference the source/destination bo in wined3d_context_gl_copy_bo_address().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index ee1adfcf559..4aaf50434a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2728,6 +2728,9 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, (GLintptr)src->addr, (GLintptr)dst->addr, size)); checkGLcall("direct buffer copy"); + + wined3d_context_gl_reference_bo(context_gl, src_bo); + wined3d_context_gl_reference_bo(context_gl, dst_bo); } else { @@ -2747,12 +2750,16 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, wined3d_context_gl_bind_bo(context_gl, src_bo->binding, src_bo->id); GL_EXTCALL(glGetBufferSubData(src_bo->binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); + + wined3d_context_gl_reference_bo(context_gl, src_bo); } else if (dst_bo && !src_bo) { wined3d_context_gl_bind_bo(context_gl, dst_bo->binding, dst_bo->id); GL_EXTCALL(glBufferSubData(dst_bo->binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); + + wined3d_context_gl_reference_bo(context_gl, dst_bo); } else { -- 2.20.1

Dec. 1, 2020

[PATCH 4/4] kernelbase: Simplify CreateFileW.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/file.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-)

Dec. 1, 2020

[PATCH 3/4] kernel32: Remove no longer needed CONSOLE_Init.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 25 ------------------------- dlls/kernel32/kernel_main.c | 4 ---- dlls/kernel32/kernel_private.h | 12 ------------ 3 files changed, 41 deletions(-)

Dec. 1, 2020

[PATCH 2/4] kernelbase: Remove no longer needed console handle mapping.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 6 +++--- dlls/kernelbase/file.c | 6 ------ dlls/kernelbase/kernelbase.h | 11 ----------- dlls/kernelbase/process.c | 10 ---------- 4 files changed, 3 insertions(+), 30 deletions(-)

Dec. 1, 2020

[PATCH 1/4] cmd: Don't use WCMD_is_console_handle.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/cmd/batch.c | 5 ++--- programs/cmd/wcmd.h | 4 ---- programs/cmd/wcmdmain.c | 5 ++--- 3 files changed, 4 insertions(+), 10 deletions(-)

Dec. 1, 2020

Re: [PATCH vkd3d v2 3/3] vkd3d-compiler: Default to HLSL as a source format when preprocessing.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 1, 2020

Re: [PATCH vkd3d v2 2/3] vkd3d-compiler: Check whether the source format is binary when checking if the output is a tty, when preprocessing.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 1, 2020

Re: [PATCH vkd3d v2 1/3] vkd3d-compiler: Do not validate the target type when preprocessing.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 1, 2020

Re: [PATCH] windowscodecs: Don't make variables const just to cast the const away.

by Esme Povirk (they/them)

I would rather have these inlined.

Dec. 1, 2020

[PATCH 6/6] gdi32: Use FreeType as a fallback when loading font faces.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- We keep FreeType code path as it's still used for some corner cases like WinFNT fonts, although we could also implement the parsing of such fonts ourselves in a similar way. dlls/gdi32/freetype.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f9d82644176..0ffd2f8f34a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1218,15 +1218,10 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr if (!(This = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This) ))) goto done; - if (!(This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) - { - RtlFreeHeap( GetProcessHeap(), 0, This ); - This = NULL; - } - else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && - opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 ) && - opentype_get_properties( data_ptr, data_size, ttc_sfnt_v1, &This->font_version, - &This->fs, &This->ntm_flags )) + if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && + opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 ) && + opentype_get_properties( data_ptr, data_size, ttc_sfnt_v1, &This->font_version, + &This->fs, &This->ntm_flags )) { struct family_names_data family_names; struct face_name_data style_name; @@ -1268,7 +1263,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr WARN( "full name not found, using %s instead\n", debugstr_w(This->full_name) ); } } - else + else if ((This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) { WARN( "unable to parse font, falling back to FreeType\n" ); This->scalable = FT_IS_SCALABLE( This->ft_face ); @@ -1299,6 +1294,11 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); get_fontsig( This->ft_face, &This->fs ); } + else + { + RtlFreeHeap( GetProcessHeap(), 0, This ); + This = NULL; + } done: if (unix_name) munmap( data_ptr, data_size ); @@ -1307,7 +1307,7 @@ done: static void unix_face_destroy( struct unix_face *This ) { - pFT_Done_Face( This->ft_face ); + if (This->ft_face) pFT_Done_Face( This->ft_face ); RtlFreeHeap( GetProcessHeap(), 0, This->full_name ); RtlFreeHeap( GetProcessHeap(), 0, This->style_name ); RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); -- 2.29.2

Dec. 1, 2020

[PATCH 5/6] gdi32: Try to parse font props without FreeType.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This makes a tiny difference to the dump_gdi_font_list report, for some fonts that do not have any bit set in fs->fsCsb[0]. This is the case for instance for Noto Arabic font family. We were previously filling it with FS_LATIN1 as fallback because FreeType reported some charmap encoded with FT_ENCODING_APPLE_ROMAN, but I don't think it was correct. dlls/gdi32/freetype.c | 7 ++-- dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/opentype.c | 91 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 06bc29ff86a..f9d82644176 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1224,7 +1224,9 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This = NULL; } else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && - opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 )) + opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 ) && + opentype_get_properties( data_ptr, data_size, ttc_sfnt_v1, &This->font_version, + &This->fs, &This->ntm_flags )) { struct family_names_data family_names; struct face_name_data style_name; @@ -1291,10 +1293,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = ft_face_get_style_name( This->ft_face, system_lcid ); This->full_name = ft_face_get_full_name( This->ft_face, system_lcid ); - } - if (This) - { This->ntm_flags = get_ntm_flags( This->ft_face ); This->font_version = get_font_version( This->ft_face ); if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9a988d08d7e..8d917a795c0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -439,6 +439,9 @@ extern BOOL opentype_enum_style_names( const struct tt_name_v0 *tt_name_v0, extern BOOL opentype_enum_full_names( const struct tt_name_v0 *tt_name_v0, opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN; +extern BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) DECLSPEC_HIDDEN; + /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 4200b08d318..67af44dfe91 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #define MS_EBDT_TAG MS_MAKE_TAG('E','B','D','T') #define MS_CBDT_TAG MS_MAKE_TAG('C','B','D','T') #define MS_NAME_TAG MS_MAKE_TAG('n','a','m','e') +#define MS_CFF__TAG MS_MAKE_TAG('C','F','F',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -135,6 +136,28 @@ struct tt_name_v0 WORD stringOffset; struct tt_namerecord nameRecord[1]; }; + +struct tt_head +{ + USHORT majorVersion; + USHORT minorVersion; + ULONG revision; + ULONG checksumadj; + ULONG magic; + USHORT flags; + USHORT unitsPerEm; + ULONGLONG created; + ULONGLONG modified; + SHORT xMin; + SHORT yMin; + SHORT xMax; + SHORT yMax; + USHORT macStyle; + USHORT lowestRecPPEM; + SHORT direction_hint; + SHORT index_format; + SHORT glyphdata_format; +}; #include "poppack.h" enum OPENTYPE_PLATFORM_ID @@ -236,6 +259,20 @@ enum OPENTYPE_NAME_ID OPENTYPE_NAME_WWS_SUBFAMILY }; +enum OS2_FSSELECTION +{ + OS2_FSSELECTION_ITALIC = 1 << 0, + OS2_FSSELECTION_UNDERSCORE = 1 << 1, + OS2_FSSELECTION_NEGATIVE = 1 << 2, + OS2_FSSELECTION_OUTLINED = 1 << 3, + OS2_FSSELECTION_STRIKEOUT = 1 << 4, + OS2_FSSELECTION_BOLD = 1 << 5, + OS2_FSSELECTION_REGULAR = 1 << 6, + OS2_FSSELECTION_USE_TYPO_METRICS = 1 << 7, + OS2_FSSELECTION_WWS = 1 << 8, + OS2_FSSELECTION_OBLIQUE = 1 << 9 +}; + static BOOL opentype_get_table_ptr( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, UINT32 table_tag, const void **table_ptr, UINT32 *table_size ) { @@ -270,6 +307,13 @@ static BOOL opentype_get_tt_os2_v1( const void *data, size_t size, const struct return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_OS_2_TAG, (const void **)tt_os2_v1, &table_size ); } +static BOOL opentype_get_tt_head( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + const struct tt_head **tt_head ) +{ + UINT32 table_size = sizeof(**tt_head); + return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_HEAD_TAG, (const void **)tt_head, &table_size ); +} + static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT encoding ) { switch (platform) @@ -677,3 +721,50 @@ BOOL opentype_enum_full_names( const struct tt_name_v0 *header, opentype_enum_na return TRUE; return FALSE; } + +BOOL opentype_get_properties( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + DWORD *version, FONTSIGNATURE *fs, DWORD *ntm_flags ) +{ + const struct tt_os2_v1 *tt_os2_v1; + const struct tt_head *tt_head; + const void *cff_header; + UINT32 table_size = 0; + USHORT idx, selection; + DWORD flags = 0; + + if (!opentype_get_tt_head( data, size, ttc_sfnt_v1, &tt_head )) return FALSE; + if (!opentype_get_tt_os2_v1( data, size, ttc_sfnt_v1, &tt_os2_v1 )) return FALSE; + + *version = GET_BE_DWORD( tt_head->revision ); + + fs->fsUsb[0] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange1 ); + fs->fsUsb[1] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange2 ); + fs->fsUsb[2] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange3 ); + fs->fsUsb[3] = GET_BE_DWORD( tt_os2_v1->ulUnicodeRange4 ); + + if (tt_os2_v1->version == 0) + { + idx = GET_BE_WORD( tt_os2_v1->usFirstCharIndex ); + if (idx >= 0xf000 && idx < 0xf100) fs->fsCsb[0] = FS_SYMBOL; + else fs->fsCsb[0] = FS_LATIN1; + fs->fsCsb[1] = 0; + } + else + { + fs->fsCsb[0] = GET_BE_DWORD( tt_os2_v1->ulCodePageRange1 ); + fs->fsCsb[1] = GET_BE_DWORD( tt_os2_v1->ulCodePageRange2 ); + } + + selection = GET_BE_WORD( tt_os2_v1->fsSelection ); + + if (selection & OS2_FSSELECTION_ITALIC) flags |= NTM_ITALIC; + if (selection & OS2_FSSELECTION_BOLD) flags |= NTM_BOLD; + if (selection & OS2_FSSELECTION_REGULAR) flags |= NTM_REGULAR; + if (flags == 0) flags = NTM_REGULAR; + + if (opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_CFF__TAG, &cff_header, &table_size )) + flags |= NTM_PS_OPENTYPE; + + *ntm_flags = flags; + return TRUE; +} -- 2.29.2

Dec. 1, 2020

[PATCH 4/6] gdi32: Try to parse font names without FreeType.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/freetype.c | 131 ++++++++++- dlls/gdi32/gdi_private.h | 18 ++ dlls/gdi32/opentype.c | 459 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 603 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 686f2b54682..06bc29ff86a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1092,6 +1092,86 @@ fail: return NULL; } +struct family_names_data +{ + LANGID primary_langid; + struct opentype_name family_name; + struct opentype_name second_name; + BOOL primary_seen; + BOOL english_seen; +}; + +static BOOL search_family_names_callback( LANGID langid, struct opentype_name *name, void *user ) +{ + struct family_names_data *data = user; + + if (langid == MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)) + { + data->english_seen = TRUE; + if (data->primary_langid == langid) data->primary_seen = TRUE; + + if (!data->family_name.bytes) data->family_name = *name; + else if (data->primary_langid != langid) data->second_name = *name; + } + else if (data->primary_langid == langid) + { + data->primary_seen = TRUE; + if (!data->second_name.bytes) data->second_name = data->family_name; + data->family_name = *name; + } + else if (!data->second_name.bytes) data->second_name = *name; + + if (data->family_name.bytes && data->second_name.bytes && data->primary_seen && data->english_seen) + return TRUE; + return FALSE; +} + +struct face_name_data +{ + LANGID primary_langid; + struct opentype_name face_name;; +}; + +static BOOL search_face_name_callback( LANGID langid, struct opentype_name *name, void *user ) +{ + struct face_name_data *data = user; + + if (langid == data->primary_langid || (langid == MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) && !data->face_name.bytes)) + data->face_name = *name; + + return langid == data->primary_langid; +} + +static WCHAR *decode_opentype_name( struct opentype_name *name ) +{ + CPTABLEINFO codepage_info; + USHORT *codepage_ptr; + SIZE_T codepage_size; + WCHAR buffer[512]; + DWORD len; + + if (!name->codepage) + { + len = min( ARRAY_SIZE(buffer), name->length / sizeof(WCHAR) ); + while (len--) buffer[len] = GET_BE_WORD( ((WORD *)name->bytes)[len] ); + len = min( ARRAY_SIZE(buffer), name->length / sizeof(WCHAR) ); + } + else + { + NtGetNlsSectionPtr( 11, name->codepage, NULL, (void **)&codepage_ptr, &codepage_size ); + RtlInitCodePageTable( codepage_ptr, &codepage_info ); + RtlCustomCPToUnicodeN( &codepage_info, buffer, sizeof(buffer), &len, name->bytes, name->length ); + len /= sizeof(WCHAR); + NtUnmapViewOfSection( GetCurrentProcess(), codepage_ptr ); + } + + buffer[ARRAY_SIZE(buffer) - 1] = 0; + if (len == ARRAY_SIZE(buffer)) WARN("Truncated font name %s -> %s\n", debugstr_an(name->bytes, name->length), debugstr_w(buffer)); + else buffer[len] = 0; + + return strdupW( buffer ); +} + struct unix_face { FT_Face ft_face; @@ -1110,11 +1190,14 @@ struct unix_face static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, UINT face_index, DWORD flags ) { + static const WCHAR space_w[] = {' ',0}; + const struct ttc_sfnt_v1 *ttc_sfnt_v1; + const struct tt_name_v0 *tt_name_v0; struct unix_face *This; struct stat st; DWORD face_count; - int fd; + int fd, length; TRACE( "unix_name %s, face_index %u, data_ptr %p, data_size %u, flags %#x\n", unix_name, face_index, data_ptr, data_size, flags ); @@ -1140,20 +1223,55 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr RtlFreeHeap( GetProcessHeap(), 0, This ); This = NULL; } - else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 )) + else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 ) && + opentype_get_tt_name_v0( data_ptr, data_size, ttc_sfnt_v1, &tt_name_v0 )) { + struct family_names_data family_names; + struct face_name_data style_name; + struct face_name_data full_name; + LANGID primary_langid = system_lcid; + This->scalable = TRUE; This->num_faces = face_count; + + memset( &family_names, 0, sizeof(family_names) ); + family_names.primary_langid = primary_langid; + opentype_enum_family_names( tt_name_v0, search_family_names_callback, &family_names ); + This->family_name = decode_opentype_name( &family_names.family_name ); + This->second_name = decode_opentype_name( &family_names.second_name ); + + memset( &style_name, 0, sizeof(style_name) ); + style_name.primary_langid = primary_langid; + opentype_enum_style_names( tt_name_v0, search_face_name_callback, &style_name ); + This->style_name = decode_opentype_name( &style_name.face_name ); + + memset( &full_name, 0, sizeof(full_name) ); + style_name.primary_langid = primary_langid; + opentype_enum_full_names( tt_name_v0, search_face_name_callback, &full_name ); + This->full_name = decode_opentype_name( &full_name.face_name ); + + TRACE( "parsed font names family_name %s, second_name %s, primary_seen %d, english_seen %d, " + "full_name %s, style_name %s\n", + debugstr_w(This->family_name), debugstr_w(This->second_name), + family_names.primary_seen, family_names.english_seen, + debugstr_w(This->full_name), debugstr_w(This->style_name) ); + + if (!This->full_name && This->family_name && This->style_name) + { + length = lstrlenW( This->family_name ) + lstrlenW( space_w ) + lstrlenW( This->style_name ) + 1; + This->full_name = RtlAllocateHeap( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + lstrcpyW( This->full_name, This->family_name ); + lstrcatW( This->full_name, space_w ); + lstrcatW( This->full_name, This->style_name ); + WARN( "full name not found, using %s instead\n", debugstr_w(This->full_name) ); + } } else { WARN( "unable to parse font, falling back to FreeType\n" ); This->scalable = FT_IS_SCALABLE( This->ft_face ); This->num_faces = This->ft_face->num_faces; - } - if (This) - { This->family_name = ft_face_get_family_name( This->ft_face, system_lcid ); This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); @@ -1173,7 +1291,10 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = ft_face_get_style_name( This->ft_face, system_lcid ); This->full_name = ft_face_get_full_name( This->ft_face, system_lcid ); + } + if (This) + { This->ntm_flags = get_ntm_flags( This->ft_face ); This->font_version = get_font_version( This->ft_face ); if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a529cb0890c..9a988d08d7e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -417,9 +417,27 @@ extern void font_init(void) DECLSPEC_HIDDEN; /* opentype.c */ struct ttc_sfnt_v1; +struct tt_name_v0; + +struct opentype_name +{ + DWORD codepage; + DWORD length; + const void *bytes; +}; extern BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count, const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) DECLSPEC_HIDDEN; +extern BOOL opentype_get_tt_name_v0( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + const struct tt_name_v0 **tt_name_v0 ) DECLSPEC_HIDDEN; + +typedef BOOL ( *opentype_enum_names_cb )( LANGID langid, struct opentype_name *name, void *user ); +extern BOOL opentype_enum_family_names( const struct tt_name_v0 *tt_name_v0, + opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN; +extern BOOL opentype_enum_style_names( const struct tt_name_v0 *tt_name_v0, + opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN; +extern BOOL opentype_enum_full_names( const struct tt_name_v0 *tt_name_v0, + opentype_enum_names_cb callback, void *user ) DECLSPEC_HIDDEN; /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 2363439cdc5..4200b08d318 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" @@ -40,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); #define MS_EBSC_TAG MS_MAKE_TAG('E','B','S','C') #define MS_EBDT_TAG MS_MAKE_TAG('E','B','D','T') #define MS_CBDT_TAG MS_MAKE_TAG('C','B','D','T') +#define MS_NAME_TAG MS_MAKE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -115,8 +117,125 @@ struct tt_os2_v1 ULONG ulCodePageRange1; ULONG ulCodePageRange2; }; + +struct tt_namerecord +{ + WORD platformID; + WORD encodingID; + WORD languageID; + WORD nameID; + WORD length; + WORD offset; +}; + +struct tt_name_v0 +{ + WORD format; + WORD count; + WORD stringOffset; + struct tt_namerecord nameRecord[1]; +}; #include "poppack.h" +enum OPENTYPE_PLATFORM_ID +{ + OPENTYPE_PLATFORM_UNICODE = 0, + OPENTYPE_PLATFORM_MAC, + OPENTYPE_PLATFORM_ISO, + OPENTYPE_PLATFORM_WIN, + OPENTYPE_PLATFORM_CUSTOM +}; + +enum TT_NAME_WIN_ENCODING_ID +{ + TT_NAME_WIN_ENCODING_SYMBOL = 0, + TT_NAME_WIN_ENCODING_UNICODE_BMP, + TT_NAME_WIN_ENCODING_SJIS, + TT_NAME_WIN_ENCODING_PRC, + TT_NAME_WIN_ENCODING_BIG5, + TT_NAME_WIN_ENCODING_WANSUNG, + TT_NAME_WIN_ENCODING_JOHAB, + TT_NAME_WIN_ENCODING_RESERVED1, + TT_NAME_WIN_ENCODING_RESERVED2, + TT_NAME_WIN_ENCODING_RESERVED3, + TT_NAME_WIN_ENCODING_UNICODE_FULL +}; + +enum TT_NAME_UNICODE_ENCODING_ID +{ + TT_NAME_UNICODE_ENCODING_1_0 = 0, + TT_NAME_UNICODE_ENCODING_1_1, + TT_NAME_UNICODE_ENCODING_ISO_10646, + TT_NAME_UNICODE_ENCODING_2_0_BMP, + TT_NAME_UNICODE_ENCODING_2_0_FULL, + TT_NAME_UNICODE_ENCODING_VAR, + TT_NAME_UNICODE_ENCODING_FULL, +}; + +enum TT_NAME_MAC_ENCODING_ID +{ + TT_NAME_MAC_ENCODING_ROMAN = 0, + TT_NAME_MAC_ENCODING_JAPANESE, + TT_NAME_MAC_ENCODING_TRAD_CHINESE, + TT_NAME_MAC_ENCODING_KOREAN, + TT_NAME_MAC_ENCODING_ARABIC, + TT_NAME_MAC_ENCODING_HEBREW, + TT_NAME_MAC_ENCODING_GREEK, + TT_NAME_MAC_ENCODING_RUSSIAN, + TT_NAME_MAC_ENCODING_RSYMBOL, + TT_NAME_MAC_ENCODING_DEVANAGARI, + TT_NAME_MAC_ENCODING_GURMUKHI, + TT_NAME_MAC_ENCODING_GUJARATI, + TT_NAME_MAC_ENCODING_ORIYA, + TT_NAME_MAC_ENCODING_BENGALI, + TT_NAME_MAC_ENCODING_TAMIL, + TT_NAME_MAC_ENCODING_TELUGU, + TT_NAME_MAC_ENCODING_KANNADA, + TT_NAME_MAC_ENCODING_MALAYALAM, + TT_NAME_MAC_ENCODING_SINHALESE, + TT_NAME_MAC_ENCODING_BURMESE, + TT_NAME_MAC_ENCODING_KHMER, + TT_NAME_MAC_ENCODING_THAI, + TT_NAME_MAC_ENCODING_LAOTIAN, + TT_NAME_MAC_ENCODING_GEORGIAN, + TT_NAME_MAC_ENCODING_ARMENIAN, + TT_NAME_MAC_ENCODING_SIMPL_CHINESE, + TT_NAME_MAC_ENCODING_TIBETAN, + TT_NAME_MAC_ENCODING_MONGOLIAN, + TT_NAME_MAC_ENCODING_GEEZ, + TT_NAME_MAC_ENCODING_SLAVIC, + TT_NAME_MAC_ENCODING_VIETNAMESE, + TT_NAME_MAC_ENCODING_SINDHI, + TT_NAME_MAC_ENCODING_UNINTERPRETED +}; + +enum OPENTYPE_NAME_ID +{ + OPENTYPE_NAME_COPYRIGHT_NOTICE = 0, + OPENTYPE_NAME_FAMILY, + OPENTYPE_NAME_SUBFAMILY, + OPENTYPE_NAME_UNIQUE_IDENTIFIER, + OPENTYPE_NAME_FULLNAME, + OPENTYPE_NAME_VERSION_STRING, + OPENTYPE_NAME_POSTSCRIPT, + OPENTYPE_NAME_TRADEMARK, + OPENTYPE_NAME_MANUFACTURER, + OPENTYPE_NAME_DESIGNER, + OPENTYPE_NAME_DESCRIPTION, + OPENTYPE_NAME_VENDOR_URL, + OPENTYPE_NAME_DESIGNER_URL, + OPENTYPE_NAME_LICENSE_DESCRIPTION, + OPENTYPE_NAME_LICENSE_INFO_URL, + OPENTYPE_NAME_RESERVED_ID15, + OPENTYPE_NAME_TYPOGRAPHIC_FAMILY, + OPENTYPE_NAME_TYPOGRAPHIC_SUBFAMILY, + OPENTYPE_NAME_COMPATIBLE_FULLNAME, + OPENTYPE_NAME_SAMPLE_TEXT, + OPENTYPE_NAME_POSTSCRIPT_CID, + OPENTYPE_NAME_WWS_FAMILY, + OPENTYPE_NAME_WWS_SUBFAMILY +}; + static BOOL opentype_get_table_ptr( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, UINT32 table_tag, const void **table_ptr, UINT32 *table_size ) { @@ -151,6 +270,306 @@ static BOOL opentype_get_tt_os2_v1( const void *data, size_t size, const struct return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_OS_2_TAG, (const void **)tt_os2_v1, &table_size ); } +static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT encoding ) +{ + switch (platform) + { + case OPENTYPE_PLATFORM_UNICODE: + return 0; + case OPENTYPE_PLATFORM_MAC: + switch (encoding) + { + case TT_NAME_MAC_ENCODING_ROMAN: + return 10000; + case TT_NAME_MAC_ENCODING_JAPANESE: + return 10001; + case TT_NAME_MAC_ENCODING_TRAD_CHINESE: + return 10002; + case TT_NAME_MAC_ENCODING_KOREAN: + return 10003; + case TT_NAME_MAC_ENCODING_ARABIC: + return 10004; + case TT_NAME_MAC_ENCODING_HEBREW: + return 10005; + case TT_NAME_MAC_ENCODING_GREEK: + return 10006; + case TT_NAME_MAC_ENCODING_RUSSIAN: + return 10007; + case TT_NAME_MAC_ENCODING_SIMPL_CHINESE: + return 10008; + case TT_NAME_MAC_ENCODING_THAI: + return 10021; + default: + FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); + break; + } + break; + case OPENTYPE_PLATFORM_WIN: + switch (encoding) + { + case TT_NAME_WIN_ENCODING_SYMBOL: + case TT_NAME_WIN_ENCODING_UNICODE_BMP: + case TT_NAME_WIN_ENCODING_UNICODE_FULL: + return 0; + case TT_NAME_WIN_ENCODING_SJIS: + return 932; + case TT_NAME_WIN_ENCODING_PRC: + return 936; + case TT_NAME_WIN_ENCODING_BIG5: + return 950; + case TT_NAME_WIN_ENCODING_WANSUNG: + return 20949; + case TT_NAME_WIN_ENCODING_JOHAB: + return 1361; + default: + FIXME( "encoding %u not handled, platform %d.\n", encoding, platform ); + break; + } + break; + default: + FIXME( "unknown platform %d\n", platform ); + break; + } + + return 0; +} + +static const LANGID mac_langid_table[] = +{ + MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), + MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_ITALIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_DUTCH, SUBLANG_DEFAULT), + MAKELANGID(LANG_SWEDISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_SPANISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_DANISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_PORTUGUESE, SUBLANG_DEFAULT), + MAKELANGID(LANG_NORWEGIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT), + MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), + MAKELANGID(LANG_ARABIC, SUBLANG_DEFAULT), + MAKELANGID(LANG_FINNISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_GREEK, SUBLANG_DEFAULT), + MAKELANGID(LANG_ICELANDIC, SUBLANG_DEFAULT), + MAKELANGID(LANG_MALTESE, SUBLANG_DEFAULT), + MAKELANGID(LANG_TURKISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_CROATIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_DEFAULT), + MAKELANGID(LANG_URDU, SUBLANG_DEFAULT), + MAKELANGID(LANG_HINDI, SUBLANG_DEFAULT), + MAKELANGID(LANG_THAI, SUBLANG_DEFAULT), + MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_LITHUANIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_HUNGARIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_ESTONIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_LATVIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_SAMI, SUBLANG_DEFAULT), + MAKELANGID(LANG_FAEROESE, SUBLANG_DEFAULT), + MAKELANGID(LANG_FARSI, SUBLANG_DEFAULT), + MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_DEFAULT), + MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), + MAKELANGID(LANG_IRISH, SUBLANG_DEFAULT), + MAKELANGID(LANG_ALBANIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_ROMANIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_CZECH, SUBLANG_DEFAULT), + MAKELANGID(LANG_SLOVAK, SUBLANG_DEFAULT), + MAKELANGID(LANG_SLOVENIAN, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_SERBIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_MACEDONIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_BULGARIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_UKRAINIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_BELARUSIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_UZBEK, SUBLANG_DEFAULT), + MAKELANGID(LANG_KAZAK, SUBLANG_DEFAULT), + MAKELANGID(LANG_AZERI, SUBLANG_AZERI_CYRILLIC), + 0, + MAKELANGID(LANG_ARMENIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_GEORGIAN, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_KYRGYZ, SUBLANG_DEFAULT), + MAKELANGID(LANG_TAJIK, SUBLANG_DEFAULT), + MAKELANGID(LANG_TURKMEN, SUBLANG_DEFAULT), + MAKELANGID(LANG_MONGOLIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_MONGOLIAN, SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA), + MAKELANGID(LANG_PASHTO, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_KASHMIRI, SUBLANG_DEFAULT), + MAKELANGID(LANG_SINDHI, SUBLANG_DEFAULT), + MAKELANGID(LANG_TIBETAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_NEPALI, SUBLANG_DEFAULT), + MAKELANGID(LANG_SANSKRIT, SUBLANG_DEFAULT), + MAKELANGID(LANG_MARATHI, SUBLANG_DEFAULT), + MAKELANGID(LANG_BENGALI, SUBLANG_DEFAULT), + MAKELANGID(LANG_ASSAMESE, SUBLANG_DEFAULT), + MAKELANGID(LANG_GUJARATI, SUBLANG_DEFAULT), + MAKELANGID(LANG_PUNJABI, SUBLANG_DEFAULT), + MAKELANGID(LANG_ORIYA, SUBLANG_DEFAULT), + MAKELANGID(LANG_MALAYALAM, SUBLANG_DEFAULT), + MAKELANGID(LANG_KANNADA, SUBLANG_DEFAULT), + MAKELANGID(LANG_TAMIL, SUBLANG_DEFAULT), + MAKELANGID(LANG_TELUGU, SUBLANG_DEFAULT), + MAKELANGID(LANG_SINHALESE, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_KHMER, SUBLANG_DEFAULT), + MAKELANGID(LANG_LAO, SUBLANG_DEFAULT), + MAKELANGID(LANG_VIETNAMESE, SUBLANG_DEFAULT), + MAKELANGID(LANG_INDONESIAN, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_MALAY, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_AMHARIC, SUBLANG_DEFAULT), + MAKELANGID(LANG_TIGRIGNA, SUBLANG_DEFAULT), + 0, + 0, + MAKELANGID(LANG_SWAHILI, SUBLANG_DEFAULT), + 0, + 0, + 0, + MAKELANGID(LANG_MALAGASY, SUBLANG_DEFAULT), + MAKELANGID(LANG_ESPERANTO, SUBLANG_DEFAULT), + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + MAKELANGID(LANG_WELSH, SUBLANG_DEFAULT), + MAKELANGID(LANG_BASQUE, SUBLANG_DEFAULT), + MAKELANGID(LANG_CATALAN, SUBLANG_DEFAULT), + 0, + MAKELANGID(LANG_QUECHUA, SUBLANG_DEFAULT), + 0, + 0, + MAKELANGID(LANG_TATAR, SUBLANG_DEFAULT), + MAKELANGID(LANG_UIGHUR, SUBLANG_DEFAULT), + 0, + 0, + 0, + MAKELANGID(LANG_GALICIAN, SUBLANG_DEFAULT), + MAKELANGID(LANG_AFRIKAANS, SUBLANG_DEFAULT), + MAKELANGID(LANG_BRETON, SUBLANG_DEFAULT), + MAKELANGID(LANG_INUKTITUT, SUBLANG_DEFAULT), + MAKELANGID(LANG_SCOTTISH_GAELIC, SUBLANG_DEFAULT), + MAKELANGID(LANG_MANX_GAELIC, SUBLANG_DEFAULT), + MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), + 0, + 0, + MAKELANGID(LANG_GREENLANDIC, SUBLANG_DEFAULT), + MAKELANGID(LANG_AZERI, SUBLANG_AZERI_LATIN), +}; + +static LANGID get_name_record_langid( enum OPENTYPE_PLATFORM_ID platform, USHORT encoding, USHORT language ) +{ + switch (platform) + { + case OPENTYPE_PLATFORM_WIN: + return language; + case OPENTYPE_PLATFORM_MAC: + if (language < ARRAY_SIZE(mac_langid_table)) return mac_langid_table[language]; + WARN( "invalid mac lang id %d\n", language ); + break; + case OPENTYPE_PLATFORM_UNICODE: + switch (encoding) + { + case TT_NAME_UNICODE_ENCODING_1_0: + case TT_NAME_UNICODE_ENCODING_ISO_10646: + case TT_NAME_UNICODE_ENCODING_2_0_BMP: + if (language < ARRAY_SIZE(mac_langid_table)) return mac_langid_table[language]; + WARN( "invalid unicode lang id %d\n", language ); + break; + default: + break; + } + default: + FIXME( "unknown platform %d\n", platform ); + break; + } + + return MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); +} + +static BOOL opentype_enum_font_names( const struct tt_name_v0 *header, enum OPENTYPE_PLATFORM_ID platform, + enum OPENTYPE_NAME_ID name, opentype_enum_names_cb callback, void *user ) +{ + const char *name_data; + USHORT i, name_count, encoding, language, length, offset; + USHORT platform_id = GET_BE_WORD( platform ), name_id = GET_BE_WORD( name ); + LANGID langid; + BOOL ret = FALSE; + + switch (GET_BE_WORD( header->format )) + { + case 0: + case 1: + break; + default: + FIXME( "unsupported name format %d\n", GET_BE_WORD( header->format ) ); + return FALSE; + } + + name_data = (const char *)header + GET_BE_WORD( header->stringOffset ); + name_count = GET_BE_WORD( header->count ); + for (i = 0; i < name_count; i++) + { + const struct tt_namerecord *record = &header->nameRecord[i]; + struct opentype_name opentype_name; + + if (record->nameID != name_id) continue; + if (record->platformID != platform_id) continue; + + language = GET_BE_WORD( record->languageID ); + if (language >= 0x8000) + { + FIXME( "handle name format 1\n" ); + continue; + } + + encoding = GET_BE_WORD( record->encodingID ); + offset = GET_BE_WORD( record->offset ); + length = GET_BE_WORD( record->length ); + langid = get_name_record_langid( platform, encoding, language ); + + opentype_name.codepage = get_name_record_codepage( platform, encoding ); + opentype_name.length = length; + opentype_name.bytes = name_data + offset; + + if ((ret = callback( langid, &opentype_name, user ))) break; + } + + return ret; +} + BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count, const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) { const struct ttc_header_v1 *ttc_header_v1 = data; @@ -218,3 +637,43 @@ BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD return TRUE; } + +BOOL opentype_get_tt_name_v0( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + const struct tt_name_v0 **tt_name_v0 ) +{ + UINT32 table_size = sizeof(**tt_name_v0); + return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_NAME_TAG, (const void **)tt_name_v0, &table_size ); +} + +BOOL opentype_enum_family_names( const struct tt_name_v0 *header, opentype_enum_names_cb callback, void *user ) +{ + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_WIN, OPENTYPE_NAME_FAMILY, callback, user )) + return TRUE; + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_MAC, OPENTYPE_NAME_FAMILY, callback, user )) + return TRUE; + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_UNICODE, OPENTYPE_NAME_FAMILY, callback, user )) + return TRUE; + return FALSE; +} + +BOOL opentype_enum_style_names( const struct tt_name_v0 *header, opentype_enum_names_cb callback, void *user ) +{ + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_WIN, OPENTYPE_NAME_SUBFAMILY, callback, user )) + return TRUE; + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_MAC, OPENTYPE_NAME_SUBFAMILY, callback, user )) + return TRUE; + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_UNICODE, OPENTYPE_NAME_SUBFAMILY, callback, user )) + return TRUE; + return FALSE; +} + +BOOL opentype_enum_full_names( const struct tt_name_v0 *header, opentype_enum_names_cb callback, void *user ) +{ + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_WIN, OPENTYPE_NAME_FULLNAME, callback, user )) + return TRUE; + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_MAC, OPENTYPE_NAME_FULLNAME, callback, user )) + return TRUE; + if (opentype_enum_font_names( header, OPENTYPE_PLATFORM_UNICODE, OPENTYPE_NAME_FULLNAME, callback, user )) + return TRUE; + return FALSE; +} -- 2.29.2

Dec. 1, 2020

[PATCH 3/6] gdi32: Introduce new opentype font parsing helpers.

by Rémi Bernon

Mostly taken from dwrite source, adapted to make it more flexible. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/freetype.c | 11 ++ dlls/gdi32/gdi_private.h | 7 ++ dlls/gdi32/opentype.c | 220 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 239 insertions(+) create mode 100644 dlls/gdi32/opentype.c diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index a965e80001c..910450b9f64 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -42,6 +42,7 @@ C_SRCS = \ mfdrv/objects.c \ mfdrv/text.c \ opengl.c \ + opentype.c \ painting.c \ palette.c \ path.c \ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cb993034d09..686f2b54682 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1110,8 +1110,10 @@ struct unix_face static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, UINT face_index, DWORD flags ) { + const struct ttc_sfnt_v1 *ttc_sfnt_v1; struct unix_face *This; struct stat st; + DWORD face_count; int fd; TRACE( "unix_name %s, face_index %u, data_ptr %p, data_size %u, flags %#x\n", @@ -1138,11 +1140,20 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr RtlFreeHeap( GetProcessHeap(), 0, This ); This = NULL; } + else if (opentype_get_ttc_sfnt_v1( data_ptr, data_size, face_index, &face_count, &ttc_sfnt_v1 )) + { + This->scalable = TRUE; + This->num_faces = face_count; + } else { + WARN( "unable to parse font, falling back to FreeType\n" ); This->scalable = FT_IS_SCALABLE( This->ft_face ); This->num_faces = This->ft_face->num_faces; + } + if (This) + { This->family_name = ft_face_get_family_name( This->ft_face, system_lcid ); This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b9a06415538..a529cb0890c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -414,6 +414,13 @@ struct font_callback_funcs extern void font_init(void) DECLSPEC_HIDDEN; +/* opentype.c */ + +struct ttc_sfnt_v1; + +extern BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count, + const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) DECLSPEC_HIDDEN; + /* gdiobj.c */ extern HGDIOBJ alloc_gdi_handle( void *obj, WORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c new file mode 100644 index 00000000000..2363439cdc5 --- /dev/null +++ b/dlls/gdi32/opentype.c @@ -0,0 +1,220 @@ +/* + * Copyright 2020 Rémi Bernon for CodeWeavers + * Copyright 2014 Aric Stewart 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include <stdarg.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +#include "gdi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(font); + +#define MS_OTTO_TAG MS_MAKE_TAG('O','T','T','O') +#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') +#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') +#define MS_OS_2_TAG MS_MAKE_TAG('O','S','/','2') +#define MS_EBSC_TAG MS_MAKE_TAG('E','B','S','C') +#define MS_EBDT_TAG MS_MAKE_TAG('E','B','D','T') +#define MS_CBDT_TAG MS_MAKE_TAG('C','B','D','T') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) +#endif + +#include "pshpack2.h" +struct ttc_header_v1 +{ + CHAR TTCTag[4]; + DWORD Version; + DWORD numFonts; + DWORD OffsetTable[1]; +}; + +struct ttc_sfnt_v1 +{ + DWORD version; + WORD numTables; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; +}; + +struct tt_tablerecord +{ + DWORD tag; + DWORD checkSum; + DWORD offset; + DWORD length; +}; + +struct tt_os2_v1 +{ + USHORT version; + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + SHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + SHORT sFamilyClass; + PANOSE panose; + ULONG ulUnicodeRange1; + ULONG ulUnicodeRange2; + ULONG ulUnicodeRange3; + ULONG ulUnicodeRange4; + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + /* According to the Apple spec, original version didn't have the below fields, + * version numbers were taken from the OpenType spec. + */ + /* version 0 (TrueType 1.5) */ + USHORT sTypoAscender; + USHORT sTypoDescender; + USHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + /* version 1 (TrueType 1.66) */ + ULONG ulCodePageRange1; + ULONG ulCodePageRange2; +}; +#include "poppack.h" + +static BOOL opentype_get_table_ptr( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + UINT32 table_tag, const void **table_ptr, UINT32 *table_size ) +{ + const struct tt_tablerecord *table_record; + UINT16 i, table_count; + UINT32 offset, length; + + if (!ttc_sfnt_v1) return FALSE; + + table_record = (const struct tt_tablerecord *)(ttc_sfnt_v1 + 1); + table_count = GET_BE_WORD( ttc_sfnt_v1->numTables ); + for (i = 0; i < table_count; i++, table_record++) + { + if (table_record->tag != table_tag) continue; + offset = GET_BE_DWORD( table_record->offset ); + length = GET_BE_DWORD( table_record->length ); + if (size < offset + length) return FALSE; + if (table_size && length < *table_size) return FALSE; + + if (table_ptr) *table_ptr = (const char *)data + offset; + if (table_size) *table_size = length; + return TRUE; + } + + return FALSE; +} + +static BOOL opentype_get_tt_os2_v1( const void *data, size_t size, const struct ttc_sfnt_v1 *ttc_sfnt_v1, + const struct tt_os2_v1 **tt_os2_v1 ) +{ + UINT32 table_size = sizeof(**tt_os2_v1); + return opentype_get_table_ptr( data, size, ttc_sfnt_v1, MS_OS_2_TAG, (const void **)tt_os2_v1, &table_size ); +} + +BOOL opentype_get_ttc_sfnt_v1( const void *data, size_t size, DWORD index, DWORD *count, const struct ttc_sfnt_v1 **ttc_sfnt_v1 ) +{ + const struct ttc_header_v1 *ttc_header_v1 = data; + const struct tt_os2_v1 *tt_os2_v1; + UINT32 offset, fourcc; + + *ttc_sfnt_v1 = NULL; + *count = 1; + + if (size < sizeof(fourcc)) return FALSE; + memcpy( &fourcc, data, sizeof(fourcc) ); + + switch (fourcc) + { + default: + WARN( "unsupported font format %x\n", fourcc ); + return FALSE; + case MS_TTCF_TAG: + if (size < sizeof(ttc_header_v1)) return FALSE; + if (index >= (*count = GET_BE_DWORD( ttc_header_v1->numFonts ))) return FALSE; + offset = GET_BE_DWORD( ttc_header_v1->OffsetTable[index] ); + break; + case 0x00000100: + case MS_OTTO_TAG: + offset = 0; + break; + } + + if (size < offset + sizeof(**ttc_sfnt_v1)) return FALSE; + *ttc_sfnt_v1 = (const struct ttc_sfnt_v1 *)((const char *)data + offset); + + if (!opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_HEAD_TAG, NULL, NULL )) + { + WARN( "unsupported sfnt font: missing head table.\n" ); + return FALSE; + } + + if (!opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_HHEA_TAG, NULL, NULL )) + { + WARN( "unsupported sfnt font: missing hhea table.\n" ); + return FALSE; + } + + if (!opentype_get_tt_os2_v1( data, size, *ttc_sfnt_v1, &tt_os2_v1 )) + { + WARN( "unsupported sfnt font: missing OS/2 table.\n" ); + return FALSE; + } + + /* Wine uses ttfs as an intermediate step in building its bitmap fonts; + we don't want to load these. */ + if (!memcmp( tt_os2_v1->achVendID, "Wine", sizeof(tt_os2_v1->achVendID) ) && + opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_EBSC_TAG, NULL, NULL )) + { + TRACE( "ignoring wine bitmap-only sfnt font.\n" ); + return FALSE; + } + + if (opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_EBDT_TAG, NULL, NULL ) || + opentype_get_table_ptr( data, size, *ttc_sfnt_v1, MS_CBDT_TAG, NULL, NULL )) + { + WARN( "unsupported sfnt font: embedded bitmap data.\n" ); + return FALSE; + } + + return TRUE; +} -- 2.29.2

Dec. 1, 2020

[PATCH 2/6] gdi32: Store ft_face font props on unix_face.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 00334b470c8..cb993034d09 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1099,6 +1099,12 @@ struct unix_face UINT num_faces; WCHAR *family_name; WCHAR *second_name; + WCHAR *style_name; + WCHAR *full_name; + DWORD ntm_flags; + DWORD font_version; + FONTSIGNATURE fs; + struct bitmap_font_size size; }; static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, @@ -1153,6 +1159,14 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->second_name = NULL; } } + + This->style_name = ft_face_get_style_name( This->ft_face, system_lcid ); + This->full_name = ft_face_get_full_name( This->ft_face, system_lcid ); + + This->ntm_flags = get_ntm_flags( This->ft_face ); + This->font_version = get_font_version( This->ft_face ); + if (!This->scalable) get_bitmap_size( This->ft_face, &This->size ); + get_fontsig( This->ft_face, &This->fs ); } done: @@ -1163,6 +1177,8 @@ done: static void unix_face_destroy( struct unix_face *This ) { pFT_Done_Face( This->ft_face ); + RtlFreeHeap( GetProcessHeap(), 0, This->full_name ); + RtlFreeHeap( GetProcessHeap(), 0, This->style_name ); RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); RtlFreeHeap( GetProcessHeap(), 0, This->family_name ); RtlFreeHeap( GetProcessHeap(), 0, This ); @@ -1172,9 +1188,6 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p DWORD face_index, DWORD flags, DWORD *num_faces ) { struct unix_face *unix_face; - struct bitmap_font_size size; - FONTSIGNATURE fs; - WCHAR *style_name, *full_name; int ret; if (num_faces) *num_faces = 0; @@ -1189,23 +1202,14 @@ static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_p return 0; } - style_name = ft_face_get_style_name( unix_face->ft_face, system_lcid ); - full_name = ft_face_get_full_name( unix_face->ft_face, system_lcid ); - - get_fontsig( unix_face->ft_face, &fs ); - if (!unix_face->scalable) get_bitmap_size( unix_face->ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, style_name, full_name, - file, data_ptr, data_size, face_index, fs, get_ntm_flags( unix_face->ft_face ), - get_font_version( unix_face->ft_face ), flags, - unix_face->scalable ? NULL : &size ); + ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, unix_face->style_name, unix_face->full_name, + file, data_ptr, data_size, face_index, unix_face->fs, unix_face->ntm_flags, + unix_face->font_version, flags, unix_face->scalable ? NULL : &unix_face->size ); - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - - RtlFreeHeap( GetProcessHeap(), 0, style_name ); - RtlFreeHeap( GetProcessHeap(), 0, full_name ); + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", unix_face->fs.fsCsb[0], unix_face->fs.fsCsb[1], + unix_face->fs.fsUsb[0], unix_face->fs.fsUsb[1], unix_face->fs.fsUsb[2], unix_face->fs.fsUsb[3]); if (num_faces) *num_faces = unix_face->num_faces; unix_face_destroy( unix_face ); -- 2.29.2

Dec. 1, 2020

[PATCH 1/6] gdi32: Introduce struct unix_face as a ft_face wrapper.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- So I'm sending this last series now as it seems everybody rushes for their patches to go in before the freeze, and as it should not have any conflict with 196676-196680, or with the other series on the ML as it's mostly only touching freetype.c, it'll leave more time for review. With 196676-196680 applied, this brings some ~250ms improvement to prefix startup (from 1.25s to 1s runtime on average for "cmd /c exit"), and 50ms improvement to process startup (from 0.15s to 0.1s on average). (I probably changed my test setup a bit and upgraded some font packages since the other series so it's not exactly comparable with the previous numbers, but the improvement indicated was measured in a consistent way with / without this series applied) dlls/gdi32/freetype.c | 124 +++++++++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1ee02795bed..00334b470c8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1092,65 +1092,123 @@ fail: return NULL; } +struct unix_face +{ + FT_Face ft_face; + BOOL scalable; + UINT num_faces; + WCHAR *family_name; + WCHAR *second_name; +}; + +static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr, DWORD data_size, + UINT face_index, DWORD flags ) +{ + struct unix_face *This; + struct stat st; + int fd; + + TRACE( "unix_name %s, face_index %u, data_ptr %p, data_size %u, flags %#x\n", + unix_name, face_index, data_ptr, data_size, flags ); + + if (unix_name) + { + if ((fd = open( unix_name, O_RDONLY )) == -1) return NULL; + if (fstat( fd, &st ) == -1) + { + close( fd ); + return NULL; + } + data_size = st.st_size; + data_ptr = mmap( NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0 ); + close( fd ); + if (data_ptr == MAP_FAILED) return NULL; + } + + if (!(This = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This) ))) goto done; + + if (!(This->ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + { + RtlFreeHeap( GetProcessHeap(), 0, This ); + This = NULL; + } + else + { + This->scalable = FT_IS_SCALABLE( This->ft_face ); + This->num_faces = This->ft_face->num_faces; + + This->family_name = ft_face_get_family_name( This->ft_face, system_lcid ); + This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + + /* try to find another secondary name, preferring the lowest langids */ + if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), + This->second_name, lstrlenW( This->second_name ), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + This->second_name = ft_face_get_family_name( This->ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + if (!RtlCompareUnicodeStrings( This->family_name, lstrlenW( This->family_name ), + This->second_name, lstrlenW( This->second_name ), TRUE )) + { + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + This->second_name = NULL; + } + } + } + +done: + if (unix_name) munmap( data_ptr, data_size ); + return This; +} + +static void unix_face_destroy( struct unix_face *This ) +{ + pFT_Done_Face( This->ft_face ); + RtlFreeHeap( GetProcessHeap(), 0, This->second_name ); + RtlFreeHeap( GetProcessHeap(), 0, This->family_name ); + RtlFreeHeap( GetProcessHeap(), 0, This ); +} + static int add_unix_face( const char *unix_name, const WCHAR *file, void *data_ptr, SIZE_T data_size, DWORD face_index, DWORD flags, DWORD *num_faces ) { + struct unix_face *unix_face; struct bitmap_font_size size; FONTSIGNATURE fs; - FT_Face ft_face; - WCHAR *family_name, *second_name, *style_name, *full_name; + WCHAR *style_name, *full_name; int ret; if (num_faces) *num_faces = 0; - if (!(ft_face = new_ft_face( unix_name, data_ptr, data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ))) + if (!(unix_face = unix_face_create( unix_name, data_ptr, data_size, face_index, flags ))) return 0; - if (ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ + if (unix_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ { TRACE("Ignoring %s since its family name begins with a dot\n", debugstr_a(unix_name)); - pFT_Done_Face( ft_face ); + unix_face_destroy( unix_face ); return 0; } - family_name = ft_face_get_family_name( ft_face, system_lcid ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - style_name = ft_face_get_style_name( ft_face, system_lcid ); - full_name = ft_face_get_full_name( ft_face, system_lcid ); - - /* try to find another secondary name, preferring the lowest langids */ - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); - if (!RtlCompareUnicodeStrings( family_name, lstrlenW(family_name), - second_name, lstrlenW(second_name), TRUE )) - { - RtlFreeHeap( GetProcessHeap(), 0, second_name ); - second_name = NULL; - } - } + style_name = ft_face_get_style_name( unix_face->ft_face, system_lcid ); + full_name = ft_face_get_full_name( unix_face->ft_face, system_lcid ); - get_fontsig( ft_face, &fs ); - if (!FT_IS_SCALABLE( ft_face )) get_bitmap_size( ft_face, &size ); + get_fontsig( unix_face->ft_face, &fs ); + if (!unix_face->scalable) get_bitmap_size( unix_face->ft_face, &size ); if (!HIWORD( flags )) flags |= ADDFONT_AA_FLAGS( default_aa_flags ); - ret = callback_funcs->add_gdi_face( family_name, second_name, style_name, full_name, file, - data_ptr, data_size, face_index, fs, get_ntm_flags( ft_face ), - get_font_version( ft_face ), flags, - FT_IS_SCALABLE(ft_face) ? NULL : &size ); + ret = callback_funcs->add_gdi_face( unix_face->family_name, unix_face->second_name, style_name, full_name, + file, data_ptr, data_size, face_index, fs, get_ntm_flags( unix_face->ft_face ), + get_font_version( unix_face->ft_face ), flags, + unix_face->scalable ? NULL : &size ); TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", fs.fsCsb[0], fs.fsCsb[1], fs.fsUsb[0], fs.fsUsb[1], fs.fsUsb[2], fs.fsUsb[3]); - RtlFreeHeap( GetProcessHeap(), 0, family_name ); - RtlFreeHeap( GetProcessHeap(), 0, second_name ); RtlFreeHeap( GetProcessHeap(), 0, style_name ); RtlFreeHeap( GetProcessHeap(), 0, full_name ); - if (num_faces) *num_faces = ft_face->num_faces; - pFT_Done_Face( ft_face ); + if (num_faces) *num_faces = unix_face->num_faces; + unix_face_destroy( unix_face ); return ret; } -- 2.29.2

Dec. 1, 2020

[PATCH v2 4/4] widl: Support WinRT contract attribute.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This makes the following kind of changes to the generated header files, according to the contract and version specified on each type: --- a/windows.foundation.h +++ b/windows.foundation.h @@ -35,11 +35,13 @@ namespace ABI { /* Headers for imported files */ #include <inspectable.h> +#include <windowscontracts.h> #ifdef __cplusplus extern "C" { #endif +#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 #ifdef __cplusplus } /* extern "C" */ namespace ABI { @@ -138,6 +140,8 @@ enum __x_ABI_CWindows_CFoundation_CPropertyType { }; #endif +#endif /* WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 */ +#if WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION >= 0x10000 #ifdef __cplusplus } /* extern "C" */ namespace ABI { include/windows.foundation.idl | 14 +++---- tools/widl/header.c | 72 ++++++++++++++++++++++++++++++++-- tools/widl/parser.l | 1 + tools/widl/parser.y | 10 +++++ tools/widl/widltypes.h | 1 + 5 files changed, 88 insertions(+), 10 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 2a38e9f671b..5e17062f399 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -28,7 +28,7 @@ import "windowscontracts.idl"; namespace Windows { namespace Foundation { - [version(0x06020000)] + [contract(Windows.Foundation.FoundationContract, 1.0)] enum PropertyType { Empty = 0, UInt8 = 1, @@ -73,19 +73,19 @@ namespace Windows { OtherTypeArray = 1044 }; - [version(0x06020000)] + [contract(Windows.Foundation.FoundationContract, 1.0)] struct Point { FLOAT X; FLOAT Y; }; - [version(0x06020000)] + [contract(Windows.Foundation.FoundationContract, 1.0)] struct Size { FLOAT Width; FLOAT Height; }; - [version(0x06020000)] + [contract(Windows.Foundation.FoundationContract, 1.0)] struct Rect { FLOAT X; FLOAT Y; @@ -93,18 +93,18 @@ namespace Windows { FLOAT Height; }; - [version(0x06020000)] + [contract(Windows.Foundation.FoundationContract, 1.0)] struct DateTime { INT64 UniversalTime; }; - [version(0x06020000)] + [contract(Windows.Foundation.FoundationContract, 1.0)] struct TimeSpan { INT64 Duration; }; [ - version(0x06030000), + contract(Windows.Foundation.FoundationContract, 1.0), uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) ] interface IStringable : IInspectable diff --git a/tools/widl/header.c b/tools/widl/header.c index 657ce50c679..223ab5c5ca9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -45,6 +45,11 @@ generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declonly, const char *name, enum name_type name_type); +static void write_winrt_type_comments(FILE *header, const type_t *type); + +static void write_apicontract_guard_start(FILE *header, const expr_t *expr); +static void write_apicontract_guard_end(FILE *header, const expr_t *expr); + static void indent(FILE *h, int delta) { int c; @@ -218,7 +223,9 @@ static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) } LIST_FOR_EACH_ENTRY( v, fields, var_t, entry ) { + expr_t *contract = get_attrp(v->attrs, ATTR_CONTRACT); if (!v || !v->declspec.type) continue; + if (contract) write_apicontract_guard_start(h, contract); indent(h, 0); name = v->name; @@ -252,6 +259,7 @@ static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) } write_type_v(h, &v->declspec, TRUE, v->declonly, name, name_type); fprintf(h, ";\n"); + if (contract) write_apicontract_guard_end(h, contract); } } @@ -261,6 +269,8 @@ static void write_enums(FILE *h, var_list_t *enums, const char *enum_name) if (!enums) return; LIST_FOR_EACH_ENTRY( v, enums, var_t, entry ) { + expr_t *contract = get_attrp(v->attrs, ATTR_CONTRACT); + if (contract) write_apicontract_guard_start(h, contract); if (v->name) { indent(h, 0); if(!enum_name) @@ -273,8 +283,9 @@ static void write_enums(FILE *h, var_list_t *enums, const char *enum_name) } } if (list_next( enums, &v->entry )) fprintf(h, ",\n"); + else fprintf(h, "\n"); + if (contract) write_apicontract_guard_end(h, contract); } - fprintf(h, "\n"); } int needs_space_after(type_t *t) @@ -563,7 +574,9 @@ static void write_type_definition(FILE *f, type_t *t, int declonly) int in_namespace = t->namespace && !is_global_namespace(t->namespace); int save_written = t->written; decl_spec_t ds = {.type = t}; + expr_t *contract = get_attrp(t->attrs, ATTR_CONTRACT); + if (contract) write_apicontract_guard_start(f, contract); if(in_namespace) { fprintf(f, "#ifdef __cplusplus\n"); fprintf(f, "} /* extern \"C\" */\n"); @@ -581,6 +594,7 @@ static void write_type_definition(FILE *f, type_t *t, int declonly) fprintf(f, ";\n"); fprintf(f, "#endif\n\n"); } + if (contract) write_apicontract_guard_end(f, contract); } void write_type_decl(FILE *f, const decl_spec_t *t, const char *name) @@ -1468,12 +1482,55 @@ static char *format_apicontract_macro(const type_t *type) return name; } +static void write_winrt_type_comments(FILE *header, const type_t *type) +{ + expr_t *contract = get_attrp(type->attrs, ATTR_CONTRACT); + fprintf(header, " *\n"); + if (contract) + { + const type_t *type = contract->u.tref.type; + char *name = format_namespace(type->namespace, "", ".", type->name, NULL); + int ver = contract->ref->u.lval; + fprintf(header, " * Introduced to %s in version %d.%d\n *\n", name, (ver >> 16) & 0xffff, ver & 0xffff); + free(name); + } +} + +static void write_apicontract_guard_start(FILE *header, const expr_t *expr) +{ + const type_t *type; + char *name; + int ver; + if (!winrt_mode) return; + type = expr->u.tref.type; + ver = expr->ref->u.lval; + name = format_apicontract_macro(type); + fprintf(header, "#if %s_VERSION >= %#x\n", name, ver); + free(name); +} + +static void write_apicontract_guard_end(FILE *header, const expr_t *expr) +{ + const type_t *type; + char *name; + int ver; + if (!winrt_mode) return; + type = expr->u.tref.type; + ver = expr->ref->u.lval; + name = format_apicontract_macro(type); + fprintf(header, "#endif /* %s_VERSION >= %#x */\n", name, ver); + free(name); +} + static void write_com_interface_start(FILE *header, const type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); + expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s %sinterface\n", iface->name, dispinterface ? "disp" : ""); + if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); + if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->c_name, dispinterface ? "DISP" : ""); fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } @@ -1482,6 +1539,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); type_t *type; if (uuid) @@ -1559,17 +1617,22 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_locals(header, iface, FALSE); fprintf(header, "\n"); } - fprintf(header,"#endif /* __%s_%sINTERFACE_DEFINED__ */\n\n", iface->c_name, dispinterface ? "DISP" : ""); + fprintf(header, "#endif /* __%s_%sINTERFACE_DEFINED__ */\n", iface->c_name, dispinterface ? "DISP" : ""); + if (contract) write_apicontract_guard_end(header, contract); + fprintf(header, "\n"); } static void write_rpc_interface_start(FILE *header, const type_t *iface) { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); const var_t *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); + if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); + if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name); fprintf(header,"#define __%s_INTERFACE_DEFINED__\n\n", iface->name); if (var) @@ -1594,7 +1657,10 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface) static void write_rpc_interface_end(FILE *header, const type_t *iface) { - fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); + expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); + fprintf(header, "\n#endif /* __%s_INTERFACE_DEFINED__ */\n", iface->name); + if (contract) write_apicontract_guard_end(header, contract); + fprintf(header, "\n"); } static void write_coclass(FILE *header, type_t *cocl) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6a9bb65a483..9dce03577c6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -339,6 +339,7 @@ static const struct keyword attr_keywords[] = {"context_handle", tCONTEXTHANDLE, 0}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE, 0}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE, 0}, + {"contract", tCONTRACT, 1}, {"contractversion", tCONTRACTVERSION, 1}, {"control", tCONTROL, 0}, {"custom", tCUSTOM, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5b4bd518a0b..1d413ca74f4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -181,6 +181,7 @@ static typelib_t *current_typelib; %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE %token tCONTEXTHANDLESERIALIZE +%token tCONTRACT %token tCONTRACTVERSION %token tCONTROL tCPPQUOTE %token tCUSTOM @@ -271,6 +272,7 @@ static typelib_t *current_typelib; %type <str_list> str_list %type <expr> m_expr expr expr_const expr_int_const array m_bitfield %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const +%type <expr> contract_req %type <type> interfacehdr %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -508,6 +510,12 @@ contract_ver: | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } ; +contract_req: decl_spec ',' contract_ver { if ($1->type->type_type != TYPE_APICONTRACT) + error_loc("type %s is not an apicontract\n", $1->type->name); + $$ = make_exprl(EXPR_NUM, $3); + $$ = make_exprt(EXPR_GTREQL, declare_var(NULL, $1, make_declarator(NULL), 0), $$); + } + attribute: { $$ = NULL; } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } @@ -523,6 +531,7 @@ attribute: { $$ = NULL; } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } | tCONTEXTHANDLENOSERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } | tCONTEXTHANDLESERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ } + | tCONTRACT '(' contract_req ')' { $$ = make_attrp(ATTR_CONTRACT, $3); } | tCONTRACTVERSION '(' contract_ver ')' { $$ = make_attrv(ATTR_CONTRACTVERSION, $3); } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } @@ -2180,6 +2189,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, + /* ATTR_CONTRACT */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, "contract" }, /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "contractversion" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, "control" }, /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, "custom" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 878650d9c27..d5862426ad4 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -84,6 +84,7 @@ enum attr_type ATTR_CODE, ATTR_COMMSTATUS, ATTR_CONTEXTHANDLE, + ATTR_CONTRACT, ATTR_CONTRACTVERSION, ATTR_CONTROL, ATTR_CUSTOM, -- 2.29.2

Dec. 1, 2020

[PATCH v2 3/4] widl: Support WinRT apicontract type.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These types generate this kind of preprocessor macros in windowscontracts.h: #if !defined(WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION) #define WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION 0x40000 #endif // defined(WINDOWS_FOUNDATION_FOUNDATIONCONTRACT_VERSION) #if !defined(WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION) #define WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION 0xa0000 #endif // defined(WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION) include/Makefile.in | 1 + include/windows.foundation.idl | 1 + include/windowscontracts.idl | 33 +++++ tools/widl/expr.c | 1 + tools/widl/header.c | 27 ++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 239 +++++++++++++++++++-------------- tools/widl/typegen.c | 6 + tools/widl/typelib.c | 3 +- tools/widl/typetree.h | 3 + tools/widl/widltypes.h | 1 + 11 files changed, 211 insertions(+), 105 deletions(-) create mode 100644 include/windowscontracts.idl diff --git a/include/Makefile.in b/include/Makefile.in index 3df4da64233..a84e44998cc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -744,6 +744,7 @@ SOURCES = \ windns.h \ windows.foundation.idl \ windows.h \ + windowscontracts.idl \ windowsx.h \ wine/debug.h \ wine/exception.h \ diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 2c16fa2da22..2a38e9f671b 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; /* import "asyncinfo.idl"; */ +import "windowscontracts.idl"; /* import "eventtoken.idl"; */ /* import "ivectorchangedeventargs.idl"; */ diff --git a/include/windowscontracts.idl b/include/windowscontracts.idl new file mode 100644 index 00000000000..6bcf80ac954 --- /dev/null +++ b/include/windowscontracts.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2020 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +namespace Windows { + namespace Foundation { + [contractversion(4)] + apicontract FoundationContract + {}; + + [contractversion(10)] + apicontract UniversalApiContract + {}; + } +} diff --git a/tools/widl/expr.c b/tools/widl/expr.c index d1ee599a39e..be8311cfb7f 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -462,6 +462,7 @@ static type_t *find_identifier(const char *identifier, const type_t *cont_type, case TYPE_POINTER: case TYPE_ARRAY: case TYPE_BITFIELD: + case TYPE_APICONTRACT: /* nothing to do */ break; case TYPE_ALIAS: diff --git a/tools/widl/header.c b/tools/widl/header.c index a892243fb54..657ce50c679 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -471,6 +471,10 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else write_type_left(h, ds, name_type, declonly, write_callconv); break; } + case TYPE_APICONTRACT: + /* shouldn't be here */ + assert(0); + break; } } } @@ -533,6 +537,10 @@ void write_type_right(FILE *h, type_t *t, int is_field) case TYPE_COCLASS: case TYPE_INTERFACE: break; + case TYPE_APICONTRACT: + /* not supposed to be here */ + assert(0); + break; } } @@ -1452,6 +1460,14 @@ static void write_forward(FILE *header, type_t *iface) fprintf(header, "#endif\n\n" ); } +static char *format_apicontract_macro(const type_t *type) +{ + char *name = format_namespace(type->namespace, "", "_", type->name, NULL); + int i; + for (i = strlen(name); i > 0; --i) name[i - 1] = toupper(name[i - 1]); + return name; +} + static void write_com_interface_start(FILE *header, const type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); @@ -1616,6 +1632,15 @@ static void write_coclass_forward(FILE *header, type_t *cocl) fprintf(header, "#endif /* defined __%s_FWD_DEFINED__ */\n\n", cocl->name ); } +static void write_apicontract(FILE *header, type_t *apicontract) +{ + char *name = format_apicontract_macro(apicontract); + fprintf(header, "#if !defined(%s_VERSION)\n", name); + fprintf(header, "#define %s_VERSION %#x\n", name, get_attrv(apicontract->attrs, ATTR_CONTRACTVERSION)); + fprintf(header, "#endif // defined(%s_VERSION)\n\n", name); + free(name); +} + static void write_import(FILE *header, const char *fname) { char *hname, *p; @@ -1734,6 +1759,8 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons } else if (type_get_type(stmt->u.type) == TYPE_COCLASS) write_coclass(header, stmt->u.type); + else if (type_get_type(stmt->u.type) == TYPE_APICONTRACT) + write_apicontract(header, stmt->u.type); else { write_type_definition(header, stmt->u.type, stmt->declonly); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a4e1d0d2c47..6a9bb65a483 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -267,6 +267,7 @@ static const struct keyword keywords[] = { {"_fastcall", tFASTCALL, 0}, {"_pascal", tPASCAL, 0}, {"_stdcall", tSTDCALL, 0}, + {"apicontract", tAPICONTRACT, 1}, {"boolean", tBOOLEAN, 0}, {"byte", tBYTE, 0}, {"case", tCASE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3c4c8041a1c..5b4bd518a0b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -100,6 +100,7 @@ static attr_list_t *check_library_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); +static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func); static void check_def(const type_t *t); @@ -173,7 +174,9 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS -%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID +%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION +%token tAPICONTRACT +%token tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE @@ -292,6 +295,7 @@ static typelib_t *current_typelib; %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclasshdr coclassdef +%type <type> apicontract %type <num> contract_ver %type <num> pointer_type threading_type version %type <str> libraryhdr callconv cppquote importlib import t_ident @@ -349,6 +353,8 @@ gbl_statements: { $$ = NULL; } | gbl_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } + | gbl_statements apicontract ';' { $$ = append_statement($1, make_statement_type_decl($2)); + reg_type($2, $2->name, current_namespace, 0); } | gbl_statements moduledef { $$ = append_statement($1, make_statement_module($2)); } | gbl_statements librarydef { $$ = append_statement($1, make_statement_library($2)); } | gbl_statements statement { $$ = append_statement($1, $2); } @@ -363,6 +369,8 @@ imp_statements: { $$ = NULL; } | imp_statements coclassdef { $$ = append_statement($1, make_statement_type_decl($2)); reg_type($2, $2->name, current_namespace, 0); } + | imp_statements apicontract ';' { $$ = append_statement($1, make_statement_type_decl($2)); + reg_type($2, $2->name, current_namespace, 0); } | imp_statements moduledef { $$ = append_statement($1, make_statement_module($2)); } | imp_statements statement { $$ = append_statement($1, $2); } | imp_statements importlib { $$ = append_statement($1, make_statement_importlib($2)); } @@ -868,6 +876,13 @@ coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt { $$ = type_coclass_define($1, $3); } ; +apicontract: attributes tAPICONTRACT aIDENTIFIER '{' '}' + { $$ = get_type(TYPE_APICONTRACT, $3, current_namespace, 0); + check_def($$); + $$->attrs = check_apicontract_attrs($$->name, $1); + } + ; + namespacedef: tNAMESPACE aIDENTIFIER { $$ = $2; } | tNAMESPACE aNAMESPACE { $$ = $2; } ; @@ -2143,114 +2158,115 @@ struct allowed_attr unsigned int on_dispinterface : 1; unsigned int on_module : 1; unsigned int on_coclass : 1; + unsigned int on_apicontract : 1; const char *display_name; }; struct allowed_attr allowed_attr[] = { - /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C <display name> } */ - /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, - /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, - /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, - /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, - /* ATTR_ASYNC */ { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, - /* ATTR_ASYNCUUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, "async_uuid" }, - /* ATTR_AUTO_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, - /* ATTR_BINDABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "bindable" }, - /* ATTR_BROADCAST */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, - /* ATTR_CALLAS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "call_as" }, - /* ATTR_CALLCONV */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, - /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "case" }, - /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, - /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, - /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, - /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "contractversion" }, - /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, - /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, "custom" }, - /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, - /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, "default" }, - /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, - /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, - /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, - /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "defaultvtable" }, - /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, - /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, - /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, - /* ATTR_DLLNAME */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "dllname" }, - /* ATTR_DUAL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "dual" }, - /* ATTR_ENABLEALLOCATE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "enable_allocate" }, - /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, - /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, - /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, - /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, - /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, - /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, - /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, - /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, "helpcontext" }, - /* ATTR_HELPFILE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpfile" }, - /* ATTR_HELPSTRING */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, - /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, - /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, - /* ATTR_ID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, - /* ATTR_IDEMPOTENT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, - /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" }, - /* ATTR_IIDIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "iid_is" }, - /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, - /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, - /* ATTR_IN */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, - /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, - /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "length_is" }, - /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, - /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "licensed" }, - /* ATTR_LOCAL */ { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "local" }, - /* ATTR_MAYBE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "maybe" }, - /* ATTR_MESSAGE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "message" }, - /* ATTR_NOCODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nocode" }, - /* ATTR_NONBROWSABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, - /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "noncreatable" }, - /* ATTR_NONEXTENSIBLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonextensible" }, - /* ATTR_NOTIFY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify" }, - /* ATTR_NOTIFYFLAG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify_flag" }, - /* ATTR_OBJECT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "object" }, - /* ATTR_ODL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "odl" }, - /* ATTR_OLEAUTOMATION */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, - /* ATTR_OPTIMIZE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optimize" }, - /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, - /* ATTR_OUT */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, - /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, - /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, - /* ATTR_POINTERDEFAULT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, - /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ref, unique or ptr" }, - /* ATTR_PROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "progid" }, - /* ATTR_PROPGET */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, - /* ATTR_PROPPUT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propput" }, - /* ATTR_PROPPUTREF */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propputref" }, - /* ATTR_PROXY */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "proxy" }, - /* ATTR_PUBLIC */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "public" }, - /* ATTR_RANGE */ { 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, "range" }, - /* ATTR_READONLY */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "readonly" }, - /* ATTR_REPRESENTAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "represent_as" }, - /* ATTR_REQUESTEDIT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "requestedit" }, - /* ATTR_RESTRICTED */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, "restricted" }, - /* ATTR_RETVAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "retval" }, - /* ATTR_SIZEIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "size_is" }, - /* ATTR_SOURCE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "source" }, - /* ATTR_STRICTCONTEXTHANDLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "strict_context_handle" }, - /* ATTR_STRING */ { 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "string" }, - /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "switch_is" }, - /* ATTR_SWITCHTYPE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "switch_type" }, - /* ATTR_THREADING */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "threading" }, - /* ATTR_TRANSMITAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "transmit_as" }, - /* ATTR_UIDEFAULT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "uidefault" }, - /* ATTR_USESGETLASTERROR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "usesgetlasterror" }, - /* ATTR_USERMARSHAL */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "user_marshal" }, - /* ATTR_UUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, "uuid" }, - /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, - /* ATTR_VARARG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, - /* ATTR_VERSION */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 0, 1, "version" }, - /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, - /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, + /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC <display name> } */ + /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "aggregatable" }, + /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, + /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, + /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "appobject" }, + /* ATTR_ASYNC */ { 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, + /* ATTR_ASYNCUUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "async_uuid" }, + /* ATTR_AUTO_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, + /* ATTR_BINDABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "bindable" }, + /* ATTR_BROADCAST */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, + /* ATTR_CALLAS */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "call_as" }, + /* ATTR_CALLCONV */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "case" }, + /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, + /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, + /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, + /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "contractversion" }, + /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, "control" }, + /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, "custom" }, + /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, + /* ATTR_DEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, "default" }, + /* ATTR_DEFAULTBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultbind" }, + /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, + /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, + /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "defaultvtable" }, + /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, + /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, + /* ATTR_DLLNAME */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "dllname" }, + /* ATTR_DUAL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "dual" }, + /* ATTR_ENABLEALLOCATE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "enable_allocate" }, + /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, + /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, + /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, + /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, + /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, + /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, + /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "helpcontext" }, + /* ATTR_HELPFILE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "helpfile" }, + /* ATTR_HELPSTRING */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "helpstring" }, + /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, "helpstringcontext" }, + /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "helpstringdll" }, + /* ATTR_HIDDEN */ { 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, "hidden" }, + /* ATTR_ID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, "id" }, + /* ATTR_IDEMPOTENT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, + /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "ignore" }, + /* ATTR_IIDIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "iid_is" }, + /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, + /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, + /* ATTR_IN */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "in" }, + /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, + /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "length_is" }, + /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "lcid" }, + /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "licensed" }, + /* ATTR_LOCAL */ { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "local" }, + /* ATTR_MAYBE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "maybe" }, + /* ATTR_MESSAGE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "message" }, + /* ATTR_NOCODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nocode" }, + /* ATTR_NONBROWSABLE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, + /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "noncreatable" }, + /* ATTR_NONEXTENSIBLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nonextensible" }, + /* ATTR_NOTIFY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify" }, + /* ATTR_NOTIFYFLAG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "notify_flag" }, + /* ATTR_OBJECT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "object" }, + /* ATTR_ODL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "odl" }, + /* ATTR_OLEAUTOMATION */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, + /* ATTR_OPTIMIZE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optimize" }, + /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, + /* ATTR_OUT */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, + /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, + /* ATTR_POINTERDEFAULT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, + /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "ref, unique or ptr" }, + /* ATTR_PROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "progid" }, + /* ATTR_PROPGET */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, + /* ATTR_PROPPUT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propput" }, + /* ATTR_PROPPUTREF */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propputref" }, + /* ATTR_PROXY */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "proxy" }, + /* ATTR_PUBLIC */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "public" }, + /* ATTR_RANGE */ { 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, "range" }, + /* ATTR_READONLY */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "readonly" }, + /* ATTR_REPRESENTAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "represent_as" }, + /* ATTR_REQUESTEDIT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "requestedit" }, + /* ATTR_RESTRICTED */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, "restricted" }, + /* ATTR_RETVAL */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "retval" }, + /* ATTR_SIZEIS */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "size_is" }, + /* ATTR_SOURCE */ { 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "source" }, + /* ATTR_STRICTCONTEXTHANDLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "strict_context_handle" }, + /* ATTR_STRING */ { 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "string" }, + /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "switch_is" }, + /* ATTR_SWITCHTYPE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "switch_type" }, + /* ATTR_THREADING */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "threading" }, + /* ATTR_TRANSMITAS */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "transmit_as" }, + /* ATTR_UIDEFAULT */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "uidefault" }, + /* ATTR_USESGETLASTERROR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "usesgetlasterror" }, + /* ATTR_USERMARSHAL */ { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "user_marshal" }, + /* ATTR_UUID */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, "uuid" }, + /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, + /* ATTR_VARARG */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, + /* ATTR_VERSION */ { 1, 0, 0, 1, 0, 0, 1, 1, 0, 2, 0, 0, 1, 0, 0, 1, 0, "version" }, + /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "vi_progid" }, + /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, }; static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) @@ -2465,6 +2481,17 @@ static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs) return attrs; } +static attr_list_t *check_apicontract_attrs(const char *name, attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + if (!allowed_attr[attr->type].on_apicontract) + error_loc("inapplicable attribute %s for apicontract %s\n", + allowed_attr[attr->type].display_name, name); + return attrs; +} + static int is_allowed_conf_type(const type_t *type) { switch (type_get_type(type)) @@ -2504,6 +2531,10 @@ static int is_allowed_conf_type(const type_t *type) case TYPE_INTERFACE: case TYPE_BITFIELD: return FALSE; + case TYPE_APICONTRACT: + /* not supposed to be here */ + assert(0); + break; } return FALSE; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4874dfd6c24..5d0f24be06f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -374,6 +374,10 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att case TYPE_ALIAS: case TYPE_BITFIELD: break; + case TYPE_APICONTRACT: + /* not supposed to be here */ + assert(0); + break; } return TGT_INVALID; } @@ -1966,6 +1970,7 @@ unsigned int type_memsize_and_alignment(const type_t *t, unsigned int *align) case TYPE_MODULE: case TYPE_FUNCTION: case TYPE_BITFIELD: + case TYPE_APICONTRACT: /* these types should not be encountered here due to language * restrictions (interface, void, coclass, module), logical * restrictions (alias - due to type_get_type call above) or @@ -2067,6 +2072,7 @@ static unsigned int type_buffer_alignment(const type_t *t) case TYPE_MODULE: case TYPE_FUNCTION: case TYPE_BITFIELD: + case TYPE_APICONTRACT: /* these types should not be encountered here due to language * restrictions (interface, void, coclass, module), logical * restrictions (alias - due to type_get_type call above) or diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index cf027558d0a..faf76440f93 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -224,7 +224,8 @@ unsigned short get_type_vt(type_t *t) return VT_VOID; case TYPE_ALIAS: - /* aliases should be filtered out by the type_get_type call above */ + case TYPE_APICONTRACT: + /* not supposed to be here */ assert(0); break; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index e288c574002..7abec41a8fd 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -223,6 +223,9 @@ static inline int type_is_complete(const type_t *type) case TYPE_ARRAY: case TYPE_BITFIELD: return TRUE; + case TYPE_APICONTRACT: + assert(0); + break; } return FALSE; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 78401cf8278..878650d9c27 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -440,6 +440,7 @@ enum type_type TYPE_POINTER, TYPE_ARRAY, TYPE_BITFIELD, + TYPE_APICONTRACT, }; struct _type_t { -- 2.29.2

Dec. 1, 2020

[PATCH v2 2/4] widl: Support WinRT contractversion attribute parsing.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 12 +++++++++++- tools/widl/widltypes.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d7d96702322..a4e1d0d2c47 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -338,6 +338,7 @@ static const struct keyword attr_keywords[] = {"context_handle", tCONTEXTHANDLE, 0}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE, 0}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE, 0}, + {"contractversion", tCONTRACTVERSION, 1}, {"control", tCONTROL, 0}, {"custom", tCUSTOM, 0}, {"decode", tDECODE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1bbb2e78f7e..3c4c8041a1c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -177,7 +177,9 @@ static typelib_t *current_typelib; %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE -%token tCONTEXTHANDLESERIALIZE tCONTROL tCPPQUOTE +%token tCONTEXTHANDLESERIALIZE +%token tCONTRACTVERSION +%token tCONTROL tCPPQUOTE %token tCUSTOM %token tDECODE tDEFAULT tDEFAULTBIND %token tDEFAULTCOLLELEM @@ -290,6 +292,7 @@ static typelib_t *current_typelib; %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclasshdr coclassdef +%type <num> contract_ver %type <num> pointer_type threading_type version %type <str> libraryhdr callconv cppquote importlib import t_ident %type <uuid> uuid_string @@ -492,6 +495,11 @@ str_list: aSTRING { $$ = append_str( NULL, $1 ); } | str_list ',' aSTRING { $$ = append_str( $1, $3 ); } ; +contract_ver: + aNUM { $$ = MAKEVERSION(0, $1); } + | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } + ; + attribute: { $$ = NULL; } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } @@ -507,6 +515,7 @@ attribute: { $$ = NULL; } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } | tCONTEXTHANDLENOSERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ } | tCONTEXTHANDLESERIALIZE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ } + | tCONTRACTVERSION '(' contract_ver ')' { $$ = make_attrv(ATTR_CONTRACTVERSION, $3); } | tCONTROL { $$ = make_attr(ATTR_CONTROL); } | tCUSTOM '(' uuid_string ',' expr_const ')' { $$ = make_custom_attr($3, $5); } | tDECODE { $$ = make_attr(ATTR_DECODE); } @@ -2155,6 +2164,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_CODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "code" }, /* ATTR_COMMSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "comm_status" }, /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "context_handle" }, + /* ATTR_CONTRACTVERSION */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "contractversion" }, /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, /* ATTR_CUSTOM */ { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, "custom" }, /* ATTR_DECODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "decode" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7a43e517698..78401cf8278 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -84,6 +84,7 @@ enum attr_type ATTR_CODE, ATTR_COMMSTATUS, ATTR_CONTEXTHANDLE, + ATTR_CONTRACTVERSION, ATTR_CONTROL, ATTR_CUSTOM, ATTR_DECODE, -- 2.29.2

Dec. 1, 2020

[PATCH v2 1/4] widl: Add abi_prefix parameter to format_namespace.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Just add the explicit abi_prefix parameter, we don't really need the buffer management for now. I'll add a strappend helper in some future series. Supersedes: 196372-196375 tools/widl/header.c | 2 +- tools/widl/parser.y | 2 +- tools/widl/typetree.c | 18 +++++++++--------- tools/widl/widltypes.h | 3 ++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 015bbe2ece7..a892243fb54 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -132,7 +132,7 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid) { - char *name = format_namespace(type->namespace, "", "::", type->name); + char *name = format_namespace(type->namespace, "", "::", type->name, use_abi_namespace ? "ABI" : NULL); fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 160e4029a6e..1bbb2e78f7e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1922,7 +1922,7 @@ type_t *reg_type(type_t *type, const char *name, struct namespace *namespace, in if (is_global_namespace(namespace)) type->c_name = name; else - type->c_name = format_namespace(namespace, "__x_", "_C", name); + type->c_name = format_namespace(namespace, "__x_", "_C", name, use_abi_namespace ? "ABI" : NULL); nt->type = type; nt->t = t; nt->next = namespace->type_hash[hash]; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index c0547b36a96..df883576915 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -89,38 +89,38 @@ const char *type_get_name(const type_t *type, enum name_type name_type) return NULL; } -static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) +static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator, const char *abi_prefix) { if(is_global_namespace(namespace)) { - if(!use_abi_namespace) - return ptr; - strcpy(ptr, "ABI"); + if(!abi_prefix) return ptr; + strcpy(ptr, abi_prefix); strcat(ptr, separator); return ptr + strlen(ptr); } - ptr = append_namespace(ptr, namespace->parent, separator); + ptr = append_namespace(ptr, namespace->parent, separator, abi_prefix); strcpy(ptr, namespace->name); strcat(ptr, separator); return ptr + strlen(ptr); } -char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix) +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, + const char *abi_prefix) { unsigned len = strlen(prefix) + strlen(suffix); unsigned sep_len = strlen(separator); struct namespace *iter; char *ret, *ptr; - if(use_abi_namespace && !is_global_namespace(namespace)) - len += 3 /* strlen("ABI") */ + sep_len; + if(abi_prefix) + len += strlen(abi_prefix) + sep_len; for(iter = namespace; !is_global_namespace(iter); iter = iter->parent) len += strlen(iter->name) + sep_len; ret = xmalloc(len+1); strcpy(ret, prefix); - ptr = append_namespace(ret + strlen(ret), namespace, separator); + ptr = append_namespace(ret + strlen(ret), namespace, separator, abi_prefix); strcpy(ptr, suffix); return ret; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b02b80e122c..7a43e517698 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -613,7 +613,8 @@ var_list_t *append_var(var_list_t *list, var_t *var); void init_loc_info(loc_info_t *); -char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix); +char *format_namespace(struct namespace *namespace, const char *prefix, const char *separator, const char *suffix, + const char *abi_prefix); static inline enum type_type type_get_type_detect_alias(const type_t *type) { -- 2.29.2

Dec. 1, 2020

[PATCH v2] conhost: Respect the StartupInfo's wShowWindow.

by Gabriel Ivăncescu

Since 859b526c81a2af841b5b7b28d06f3d782bccdab5, console windows are always shown even if they're supposed to start in some other state, e.g. minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This fixes the regression. programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index e3a9a25..f864bbb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2756,7 +2756,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!init_window( &console )) return 1; GetStartupInfoW( &si ); set_console_title( &console, si.lpTitle, wcslen( si.lpTitle ) * sizeof(WCHAR) ); - ShowWindow( console.win, SW_SHOW ); + ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) ? si.wShowWindow : SW_SHOW ); } return main_loop( &console, signal ); -- 2.21.0

Dec. 1, 2020

Re: [PATCH 7/7] mf/topoloader: Add copier transform automatically for D3D-aware outputs.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82861 Your paranoid android. === wvistau64 (64 bit report) === mf: mf: Timeout

Dec. 1, 2020

Re: [PATCH 6/7] mf/topoloader: Set MF_TOPONODE_MEDIASTART for all source nodes.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82860 Your paranoid android. === wvistau64 (64 bit report) === mf: mf: Timeout

Dec. 1, 2020

Re: [PATCH 5/7] mf/topoloader: Make sure MF_TOPONODE_STREAMID is set for all outputs.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82859 Your paranoid android. === wvistau64 (64 bit report) === mf: mf: Timeout

Dec. 1, 2020

Re: [PATCH 4/7] mf/topoloader: Set MF_TOPONODE_TRANSFORM_OBJECTID for created transforms when CLSID is available.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82858 Your paranoid android. === wvistau64 (64 bit report) === mf: mf: Timeout

Dec. 1, 2020

Re: [PATCH 3/7] mf/topoloader: Set MF_TOPONODE_DECODER for the decoders.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82857 Your paranoid android. === wvistau64 (64 bit report) === mf: mf: Timeout

Dec. 1, 2020

[PATCH 15/15] msvcrt: Remove MSVCRT_ prefix from data.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr100/msvcr100.spec | 30 ++++++++++----------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr70/msvcr70.spec | 26 +++++++++---------- dlls/msvcr71/msvcr71.spec | 26 +++++++++---------- dlls/msvcr80/msvcr80.spec | 38 +++++++++++++-------------- dlls/msvcr90/msvcr90.spec | 30 ++++++++++----------- dlls/msvcrt/data.c | 38 +++++++++++++-------------- dlls/msvcrt/file.c | 10 ++++--- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 38 +++++++++++++-------------- dlls/msvcrt/process.c | 5 ++-- dlls/msvcrtd/msvcrtd.spec | 22 ++++++++-------- dlls/ucrtbase/ucrtbase.spec | 52 ++++++++++++++++++------------------- include/msvcrt/stdlib.h | 3 +++ 15 files changed, 193 insertions(+), 186 deletions(-)

Dec. 1, 2020

[PATCH 14/15] msvcrt: Remove MSVCRT_ prefix from ctype.c functions.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 44 +++++----- dlls/msvcr100/msvcr100.spec | 78 ++++++++--------- dlls/msvcr110/msvcr110.spec | 78 ++++++++--------- dlls/msvcr120/msvcr120.spec | 82 +++++++++--------- dlls/msvcr70/msvcr70.spec | 48 +++++------ dlls/msvcr71/msvcr71.spec | 48 +++++------ dlls/msvcr80/msvcr80.spec | 78 ++++++++--------- dlls/msvcr90/msvcr90.spec | 78 ++++++++--------- dlls/msvcrt/ctype.c | 144 ++++++++++++++++---------------- dlls/msvcrt/file.c | 14 ++-- dlls/msvcrt/mbcs.c | 24 +++--- dlls/msvcrt/msvcrt.h | 10 --- dlls/msvcrt/msvcrt.spec | 76 ++++++++--------- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/string.c | 34 ++++---- dlls/msvcrt/time.c | 2 +- dlls/msvcrt/undname.c | 2 +- dlls/msvcrtd/msvcrtd.spec | 48 +++++------ dlls/ucrtbase/ucrtbase.spec | 128 ++++++++++++++-------------- include/msvcrt/corecrt_wctype.h | 1 + include/msvcrt/ctype.h | 2 + 21 files changed, 507 insertions(+), 514 deletions(-)

Dec. 1, 2020

[PATCH 13/15] msvcrt: Use FPU control word definitions from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 290 +++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 27 ---- 2 files changed, 145 insertions(+), 172 deletions(-)

Dec. 1, 2020

[PATCH 12/15] msvcrt: Use fpclassify constants from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.h | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-)

Dec. 1, 2020

[PATCH 11/15] msvcrt: Use signal definitions from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 87 ++++++++++++++++++++++---------------------- dlls/msvcrt/exit.c | 5 ++- dlls/msvcrt/msvcrt.h | 16 -------- 3 files changed, 47 insertions(+), 61 deletions(-)

Dec. 1, 2020

[PATCH 10/15] msvcrt: Use floating point exception signals definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 19 ++++++++++--------- dlls/msvcrt/msvcrt.h | 12 ------------ 2 files changed, 10 insertions(+), 21 deletions(-)

Dec. 1, 2020

[PATCH 09/15] msvcrt: Use _ARGMAX from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-)

Dec. 1, 2020

[PATCH 08/15] msvcrt: Use fpclass constants from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 34 +++++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 12 ------------ 2 files changed, 17 insertions(+), 29 deletions(-)

Dec. 1, 2020

[PATCH 07/15] msvcrt: Use status word flags from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 72 ++++++++++++++++++++++---------------------- dlls/msvcrt/msvcrt.h | 14 --------- 2 files changed, 36 insertions(+), 50 deletions(-)

Dec. 1, 2020

[PATCH 06/15] msvcrt: Use ctype definition from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/ctype.c | 104 +++++++++++++++++++++---------------------- dlls/msvcrt/locale.c | 4 +- dlls/msvcrt/msvcrt.h | 12 ----- dlls/msvcrt/wcs.c | 28 ++++++------ 4 files changed, 68 insertions(+), 80 deletions(-)

Dec. 1, 2020

[PATCH 05/15] msvcrt: Use __utimbuf{32,64} from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crtdll/crtdll.spec | 6 ++-- dlls/msvcr70/msvcr70.spec | 9 ++++-- dlls/msvcr71/msvcr71.spec | 9 ++++-- dlls/msvcrt/file.c | 64 ++++++--------------------------------- dlls/msvcrt/msvcrt.h | 12 -------- dlls/msvcrt/msvcrt.spec | 9 ++++-- dlls/msvcrtd/msvcrtd.spec | 9 ++++-- 7 files changed, 38 insertions(+), 80 deletions(-)

Dec. 1, 2020

[PATCH 04/15] Revert "msvcrt: Avoid conflict with mingw __iob_func declaration."

by Piotr Caban

This reverts commit 873a90e6f36b9acc74eb637a230ffee491398cd0. It's no longer needed. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 1 - 1 file changed, 1 deletion(-)

Dec. 1, 2020

[PATCH 03/15] msvcrt: Use FILE from public header.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 236 +++++++++++++++++++++--------------------- dlls/msvcrt/msvcrt.h | 54 +++++----- dlls/msvcrt/process.c | 12 +-- dlls/msvcrt/scanf.c | 20 ++-- dlls/msvcrt/scanf.h | 10 +- 5 files changed, 165 insertions(+), 167 deletions(-)

Dec. 1, 2020

[PATCH 02/15] msvcrt: Remove MSVCRT_ prefix from heap.c functions.

by Piotr Caban

Dec. 1, 2020

[PATCH 01/15] msvcrt: Remove MSVCRT_ prefix from errno.c functions.

by Piotr Caban

Dec. 1, 2020

Re: [PATCH 2/7] mfplat/mediatype: Do not add user data when converting from WAVE_FORMAT_EXTENSIBLE.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=82856 Your paranoid android. === wvistau64 (64 bit report) === mfplat: mfplat: Timeout

Dec. 1, 2020

Re: [PATCH 1/4] widl: Introduce format_namespace_buffer helper.

by Alexandre Julliard

Rémi Bernon <rbernon(a)codeweavers.com> writes: > @@ -89,41 +89,41 @@ const char *type_get_name(const type_t *type, enum name_type name_type) > return NULL; > } > > -static char *append_namespace(char *ptr, struct namespace *namespace, const char *separator) > +#define append_buf(f, ...) \ > + do { \ > + int r = f(buf + ret, max(ret, len) - ret, ## __VA_ARGS__); \ > + assert(r >= 0); \ > + ret += r; \ > + } while(0) > + That sort of macro hiding a function call is not very nice. Please use strmake() or similar helpers instead. -- Alexandre Julliard julliard(a)winehq.org

Dec. 1, 2020

[PATCH v2 6/6] gdi32/tests: Test changing system default font smoothing.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/tests/dib.c | 45 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d16cb0df5c0..8cd054f7183 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -3007,7 +3007,7 @@ static inline COLORREF aa_colorref( COLORREF dst, COLORREF text, BYTE glyph ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; -static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BYTE quality, BOOL expected_aa ) { DWORD dib_size = get_dib_size(bmi), ret; LOGFONTA lf; @@ -3029,7 +3029,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) memset( &lf, 0, sizeof(lf) ); strcpy( lf.lfFaceName, "Tahoma" ); lf.lfHeight = 24; - lf.lfQuality = aa ? ANTIALIASED_QUALITY : NONANTIALIASED_QUALITY; + lf.lfQuality = quality; font = CreateFontIndirectA( &lf ); font = SelectObject( hdc, font ); @@ -3054,12 +3054,12 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) for(i = 0; i < dib_size; i++) bits[i] = vals[i % 4]; - if (bmi->bmiHeader.biBitCount <= 8) aa = FALSE; + if (bmi->bmiHeader.biBitCount <= 8) expected_aa = FALSE; text_color = GetTextColor( hdc ); for (i = 0; i < strlen(str); i++) { - DWORD ggo_flags = aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; + DWORD ggo_flags = expected_aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; ret = GetGlyphOutlineA( hdc, str[i], ggo_flags, &gm, 0, NULL, &identity ); @@ -3075,7 +3075,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) if (!ret) continue; - if (aa) + if (expected_aa) { stride = (gm.gmBlackBoxX + 3) & ~3; @@ -3114,7 +3114,7 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) } diy_hash = hash_dib( hdc, bmi, bits ); - ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - aa %d\n", aa ); + ok( !strcmp( eto_hash, diy_hash ), "hash mismatch - quality %#x, expected_aa %d\n", quality, expected_aa ); HeapFree( GetProcessHeap(), 0, diy_hash ); HeapFree( GetProcessHeap(), 0, eto_hash ); @@ -3125,14 +3125,43 @@ static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) static void draw_text( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) { - draw_text_2( hdc, bmi, bits, FALSE ); + UINT smoothing, type; + BOOL ret; + + draw_text_2( hdc, bmi, bits, NONANTIALIASED_QUALITY, FALSE ); + + ret = SystemParametersInfoA(SPI_GETFONTSMOOTHING, 0, &smoothing, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, 0, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + draw_text_2( hdc, bmi, bits, DEFAULT_QUALITY, FALSE ); /* Rounding errors make these cases hard to test */ if ((bmi->bmiHeader.biCompression == BI_BITFIELDS && ((DWORD*)bmi->bmiColors)[0] == 0x3f000) || (bmi->bmiHeader.biBitCount == 16)) + { + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); return; + } + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, 1, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + ret = SystemParametersInfoA(SPI_GETFONTSMOOTHINGTYPE, 0, &type, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)FE_FONTSMOOTHINGSTANDARD, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + draw_text_2( hdc, bmi, bits, DEFAULT_QUALITY, TRUE ); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)(ULONG_PTR)type, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); + + ret = SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + ok(ret, "SystemParametersInfoA failed, GetLastError() %u.\n", GetLastError()); - draw_text_2( hdc, bmi, bits, TRUE ); + draw_text_2( hdc, bmi, bits, ANTIALIASED_QUALITY, TRUE ); } static void test_simple_graphics(void) -- 2.28.0

Dec. 1, 2020

[PATCH v2 5/6] gdi32: Update default font AA parameters on system parameters update.

by Paul Gofman

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45857 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c545274c46e..c393599eeed 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); static HKEY wine_fonts_key; static HKEY wine_fonts_cache_key; +static HKEY volatile_parameters_key; +static HANDLE volatile_parameters_changed_event; struct font_physdev { @@ -97,6 +99,8 @@ static struct font_gamma_ramp font_gamma_ramp; static void add_face_to_cache( struct gdi_font_face *face ); static void remove_face_from_cache( struct gdi_font_face *face ); +static void update_font_options(void); + static inline WCHAR facename_tolower( WCHAR c ) { if (c >= 'A' && c <= 'Z') return c - 'A' + 'a'; @@ -3739,6 +3743,8 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) *aa_flags = font->aa_flags; if (!*aa_flags) { + update_font_options(); + if (lf.lfQuality == CLEARTYPE_QUALITY || lf.lfQuality == CLEARTYPE_NATURAL_QUALITY) *aa_flags = subpixel_orientation; else @@ -3919,6 +3925,9 @@ static void init_font_options(void) antialias_fakes = (wcschr(L"yYtT1", buffer[0]) != NULL); } + font_smoothing = 0; + subpixel_orientation = 0; + if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) { RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", @@ -3967,6 +3976,30 @@ static void init_font_options(void) TRACE("gamma %d\n", font_gamma_ramp.gamma); } +static void update_font_options(void) +{ + EnterCriticalSection( &font_cs ); + if (!volatile_parameters_key) + { + if (RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", + &volatile_parameters_key )) + goto done; + volatile_parameters_changed_event = CreateEventA( NULL, FALSE, TRUE, NULL ); + } + if (WaitForSingleObject( volatile_parameters_changed_event, 0 ) == WAIT_OBJECT_0) + { + if (RegNotifyChangeKeyValue( volatile_parameters_key, FALSE, + REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_THREAD_AGNOSTIC, + volatile_parameters_changed_event, TRUE)) + ERR("Error registering registry change notification.\n"); + + init_font_options(); + } + +done: + LeaveCriticalSection( &font_cs ); +} + static void FONT_LogFontAToW( const LOGFONTA *fontA, LPLOGFONTW fontW ) { -- 2.28.0

Dec. 1, 2020

[PATCH v2 4/6] winex11.drv: Do not set AA flags for font default AA in xrender backend.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 14ce9e73975..f4f1ab64401 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -856,17 +856,6 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) case NONANTIALIASED_QUALITY: case ANTIALIASED_QUALITY: break; - default: - if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; - TRACE( "got antialias '%s'\n", value ); - if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !_strnicmp( value, "off", -1 )) - { - ret = GGO_BITMAP; - break; - } - ret = GGO_GRAY4_BITMAP; - /* fall through */ case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: if (!(value = XGetDefault( gdi_display, "Xft", "rgba" ))) break; -- 2.28.0

Dec. 1, 2020

[PATCH v2 3/6] gdi32: Handle Wine specific vertical orientations in init_font_options().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cb170c0b862..c545274c46e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3909,7 +3909,7 @@ static DWORD get_key_value( HKEY key1, HKEY key2, const WCHAR *name, DWORD *valu static void init_font_options(void) { HKEY key, volatile_key = NULL; - DWORD i, type, size, val, gamma = 1400; + DWORD i, type, size, val, gamma = 1400, vertical = 0; WCHAR buffer[20]; size = sizeof(buffer); @@ -3923,16 +3923,18 @@ static void init_font_options(void) { RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", &volatile_key ); - /* FIXME: handle vertical orientations even though Windows doesn't */ + + get_key_value( volatile_key, key, L"FontSmoothingVertical", &vertical ); + if (!get_key_value( volatile_key, key, L"FontSmoothingOrientation", &val )) { switch (val) { case 0: /* FE_FONTSMOOTHINGORIENTATIONBGR */ - subpixel_orientation = WINE_GGO_HBGR_BITMAP; + subpixel_orientation = vertical ? WINE_GGO_VBGR_BITMAP : WINE_GGO_HBGR_BITMAP; break; case 1: /* FE_FONTSMOOTHINGORIENTATIONRGB */ - subpixel_orientation = WINE_GGO_HRGB_BITMAP; + subpixel_orientation = vertical ? WINE_GGO_VRGB_BITMAP : WINE_GGO_HRGB_BITMAP; break; } } -- 2.28.0

Dec. 1, 2020

[PATCH v2 2/6] winex11.drv: Init font smoothing system default parameters in X11DRV_XRender_Init().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/xrender.c | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3376cee517d..14ce9e73975 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -32,6 +32,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "x11drv.h" #include "winternl.h" #include "wine/unicode.h" @@ -314,6 +315,64 @@ static int load_xrender_formats(void) return count; } +static void set_default_font_smoothing(void) +{ + DWORD smoothing_type, orientation, vertical; + BOOL smoothing; + HKEY sysparam_key; + char *value; + + if ((value = XGetDefault( gdi_display, "Xft", "antialias" ))) + { + TRACE( "got antialias '%s'.\n", value ); + smoothing = !(tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || + value[0] == '0' || !_strnicmp( value, "off", -1 )); + SystemParametersInfoA(SPI_SETFONTSMOOTHING, smoothing, NULL, 0); + } + else + { + if (!SystemParametersInfoA(SPI_GETFONTSMOOTHING, 0, &smoothing, 0)) + smoothing = FALSE; + } + + if ((value = XGetDefault( gdi_display, "Xft", "rgba" ))) + { + TRACE( "got rgba '%s'.\n", value ); + + vertical = 0; + orientation = smoothing_type = ~0u; + if (!strcmp( value, "rgb" ) || (vertical = !strcmp( value, "vrgb" ))) + { + smoothing_type = FE_FONTSMOOTHINGCLEARTYPE; + orientation = FE_FONTSMOOTHINGORIENTATIONRGB; + } + else if (!strcmp( value, "bgr" ) || (vertical = !strcmp( value, "vbgr" ))) + { + smoothing_type = FE_FONTSMOOTHINGCLEARTYPE; + orientation = FE_FONTSMOOTHINGORIENTATIONBGR; + } + else if (!strcmp( value, "none" )) + { + smoothing_type = FE_FONTSMOOTHINGSTANDARD; + } + + if (smoothing) + { + if (smoothing_type != ~0u) + SystemParametersInfoA(SPI_SETFONTSMOOTHINGTYPE, 0, (void *)(ULONG_PTR)smoothing_type, 0); + if (orientation != ~0u) + SystemParametersInfoA(SPI_SETFONTSMOOTHINGORIENTATION, 0, (void *)(ULONG_PTR)orientation, 0); + } + + if (smoothing_type != ~0u && !RegOpenKeyA( HKEY_CURRENT_USER, + "Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", &sysparam_key )) + { + RegSetValueExA( sysparam_key, "FontSmoothingVertical", 0, REG_DWORD, (BYTE *)&vertical, sizeof(vertical) ); + RegCloseKey( sysparam_key ); + } + } +} + /*********************************************************************** * X11DRV_XRender_Init * @@ -379,6 +438,8 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) } glyphsetCache[i-1].next = -1; + set_default_font_smoothing(); + return &xrender_funcs; } -- 2.28.0

Dec. 1, 2020

[PATCH v2 1/6] gdi32: Mind temporary system parameters in init_font_options().

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/font.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index db87a283b13..cb170c0b862 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3891,23 +3891,24 @@ const struct gdi_dc_funcs font_driver = GDI_PRIORITY_FONT_DRV /* priority */ }; -static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) +static DWORD get_key_value( HKEY key1, HKEY key2, const WCHAR *name, DWORD *value ) { WCHAR buf[12]; DWORD count = sizeof(buf), type, err; - err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); - if (!err) - { - if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); - else *value = wcstol( buf, NULL, 10 ); - } - return err; + if ((err = RegQueryValueExW( key1, name, NULL, &type, (BYTE *)buf, &count )) + && (err = RegQueryValueExW( key2, name, NULL, &type, (BYTE *)buf, &count ))) + return err; + + if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); + else *value = wcstol( buf, NULL, 10 ); + + return 0; } static void init_font_options(void) { - HKEY key; + HKEY key, volatile_key = NULL; DWORD i, type, size, val, gamma = 1400; WCHAR buffer[20]; @@ -3920,8 +3921,10 @@ static void init_font_options(void) if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", &key )) { + RegOpenKeyW( HKEY_CURRENT_USER, L"Software\\Wine\\Temporary System Parameters\\Control Panel\\Desktop", + &volatile_key ); /* FIXME: handle vertical orientations even though Windows doesn't */ - if (!get_key_value( key, L"FontSmoothingOrientation", &val )) + if (!get_key_value( volatile_key, key, L"FontSmoothingOrientation", &val )) { switch (val) { @@ -3933,18 +3936,20 @@ static void init_font_options(void) break; } } - if (!get_key_value( key, L"FontSmoothing", &val ) && val /* enabled */) + if (!get_key_value( volatile_key, key, L"FontSmoothing", &val ) && val /* enabled */) { - if (!get_key_value( key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) + if (!get_key_value( volatile_key, key, L"FontSmoothingType", &val ) && val == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) font_smoothing = subpixel_orientation; else font_smoothing = GGO_GRAY4_BITMAP; } - if (!get_key_value( key, L"FontSmoothingGamma", &val ) && val) + if (!get_key_value( volatile_key, key, L"FontSmoothingGamma", &val ) && val) { gamma = min( max( val, 1000 ), 2200 ); } RegCloseKey( key ); + if (volatile_key) + RegCloseKey( volatile_key ); } /* Calibrating the difference between the registry value and the Wine gamma value. -- 2.28.0

Dec. 1, 2020

[PATCH 7/7] mf/topoloader: Add copier transform automatically for D3D-aware outputs.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/copier.c | 8 +++ dlls/mf/mf_private.h | 2 + dlls/mf/tests/mf.c | 2 +- dlls/mf/topology.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index ba8e316f7e9..cbdac97292b 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -561,6 +561,14 @@ static const IMFTransformVtbl sample_copier_transform_vtbl = sample_copier_transform_ProcessOutput, }; +BOOL mf_is_sample_copier_transform(IUnknown *transform) +{ + return transform->lpVtbl == (IUnknownVtbl *)&sample_copier_transform_vtbl; +} + +/*********************************************************************** + * MFCreateSampleCopierMFT (mf.@) + */ HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) { struct sample_copier *object; diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 66d970dfce5..0c4dde0c4fc 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -79,3 +79,5 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } + +extern BOOL mf_is_sample_copier_transform(IUnknown *transform) DECLSPEC_HIDDEN; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2cb45668cb..a5b23e35773 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2139,6 +2139,7 @@ static void test_topology_loader_evr(void) UINT64 value64; HWND window; HRESULT hr; + GUID guid; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -2213,7 +2214,6 @@ static void test_topology_loader_evr(void) hr = IMFTopology_GetNodeCount(full_topology, &node_count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(node_count == 3, "Unexpected node count %u.\n", node_count); for (i = 0; i < node_count; ++i) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 825b9d538f3..e33dbc2efc7 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2364,6 +2364,119 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, return hr; } +static BOOL topology_loader_is_node_d3d_aware(IMFTopologyNode *node) +{ + IMFAttributes *attributes; + unsigned int d3d_aware = 0; + IUnknown *object = NULL; + + if (FAILED(IMFTopologyNode_GetObject(node, &object))) + return FALSE; + + if (SUCCEEDED(IUnknown_QueryInterface(object, &IID_IMFAttributes, (void **)&attributes))) + { + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware); + IMFAttributes_Release(attributes); + } + + if (!d3d_aware) + d3d_aware = mf_is_sample_copier_transform(object); + + IUnknown_Release(object); + + return !!d3d_aware; +} + +static HRESULT topology_loader_create_copier(IMFTopologyNode *upstream_node, unsigned int upstream_output, + IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform **copier) +{ + IMFMediaType *input_type = NULL, *output_type = NULL; + IMFTransform *transform; + HRESULT hr; + + if (FAILED(hr = MFCreateSampleCopierMFT(&transform))) + return hr; + + if (FAILED(hr = MFGetTopoNodeCurrentType(upstream_node, upstream_output, TRUE, &input_type))) + WARN("Failed to get upstream media type hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = MFGetTopoNodeCurrentType(downstream_node, downstream_input, FALSE, &output_type))) + WARN("Failed to get downstream media type hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) + WARN("Input type wasn't accepted, hr %#x.\n", hr); + + if (SUCCEEDED(hr) && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0))) + WARN("Output type wasn't accepted, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + *copier = transform; + IMFTransform_AddRef(*copier); + } + + if (input_type) + IMFMediaType_Release(input_type); + if (output_type) + IMFMediaType_Release(output_type); + + IMFTransform_Release(transform); + + return hr; +} + +static HRESULT topology_loader_connect_copier(struct topoloader_context *context, IMFTopologyNode *upstream_node, + unsigned int upstream_output, IMFTopologyNode *downstream_node, unsigned int downstream_input, IMFTransform *copier) +{ + IMFTopologyNode *copier_node; + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &copier_node))) + return hr; + + IMFTopologyNode_SetObject(copier_node, (IUnknown *)copier); + IMFTopology_AddNode(context->output_topology, copier_node); + IMFTopologyNode_ConnectOutput(upstream_node, upstream_output, copier_node, 0); + IMFTopologyNode_ConnectOutput(copier_node, 0, downstream_node, downstream_input); + + IMFTopologyNode_Release(copier_node); + + return S_OK; +} + +/* Right now this should be used for output nodes only. */ +static HRESULT topology_loader_connect_d3d_aware_input(struct topoloader_context *context, + IMFTopologyNode *node) +{ + IMFTopologyNode *upstream_node; + unsigned int upstream_output; + IMFStreamSink *stream_sink; + IMFTransform *copier = NULL; + HRESULT hr = S_OK; + + IMFTopologyNode_GetObject(node, (IUnknown **)&stream_sink); + + if (topology_loader_is_node_d3d_aware(node)) + { + if (SUCCEEDED(IMFTopologyNode_GetInput(node, 0, &upstream_node, &upstream_output))) + { + if (!topology_loader_is_node_d3d_aware(upstream_node)) + { + if (SUCCEEDED(hr = topology_loader_create_copier(upstream_node, upstream_output, node, 0, &copier))) + { + hr = topology_loader_connect_copier(context, upstream_node, upstream_output, node, 0, copier); + IMFTransform_Release(copier); + } + } + IMFTopologyNode_Release(upstream_node); + } + } + + IMFStreamSink_Release(stream_sink); + + return hr; +} + static void topology_loader_resolve_complete(struct topoloader_context *context) { MF_TOPOLOGY_TYPE node_type; @@ -2383,6 +2496,8 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) /* Set MF_TOPONODE_STREAMID for all outputs. */ if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); + + topology_loader_connect_d3d_aware_input(context, node); } else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) { -- 2.29.2

Dec. 1, 2020

[PATCH 6/7] mf/topoloader: Set MF_TOPONODE_MEDIASTART for all source nodes.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 8 ++++++++ dlls/mf/topology.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c36a76d83bb..b2cb45668cb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2136,6 +2136,7 @@ static void test_topology_loader_evr(void) IMFTopoLoader *loader; IMFMediaSink *sink; WORD node_count; + UINT64 value64; HWND window; HRESULT hr; @@ -2232,6 +2233,13 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!value, "Unexpected stream id %u.\n", value); } + else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + value64 = 1; + hr = IMFTopologyNode_GetUINT64(node, &MF_TOPONODE_MEDIASTART, &value64); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value64, "Unexpected value.\n"); + } } IMFTopology_Release(full_topology); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 6f73bb859cd..825b9d538f3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2380,10 +2380,16 @@ static void topology_loader_resolve_complete(struct topoloader_context *context) if (node_type == MF_TOPOLOGY_OUTPUT_NODE) { - /* Make sure MF_TOPONODE_STREAMID is set for all outputs. */ + /* Set MF_TOPONODE_STREAMID for all outputs. */ if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); } + else if (node_type == MF_TOPOLOGY_SOURCESTREAM_NODE) + { + /* Set MF_TOPONODE_MEDIASTART for all sources. */ + if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_MEDIASTART, NULL))) + IMFTopologyNode_SetUINT64(node, &MF_TOPONODE_MEDIASTART, 0); + } IMFTopologyNode_Release(node); } -- 2.29.2

Dec. 1, 2020

[PATCH 5/7] mf/topoloader: Make sure MF_TOPONODE_STREAMID is set for all outputs.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/topology.c | 29 ++++++++++ 2 files changed, 158 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4d4c6283be8..c36a76d83bb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1622,8 +1622,11 @@ static void init_source_node(IMFMediaType *mediatype, IMFMediaSource *source, IM hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); - hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_SOURCE, (IUnknown *)source); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (source) + { + hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } IMFStreamDescriptor_Release(sd); } @@ -2121,6 +2124,129 @@ todo_wine { ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } +static void test_topology_loader_evr(void) +{ + IMFTopologyNode *node, *source_node, *evr_node; + IMFTopology *topology, *full_topology; + IMFMediaTypeHandler *handler; + unsigned int i, count, value; + IMFStreamSink *stream_sink; + IMFMediaType *media_type; + IMFActivate *activate; + IMFTopoLoader *loader; + IMFMediaSink *sink; + WORD node_count; + HWND window; + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = MFCreateTopoLoader(&loader); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Source node. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &source_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + init_source_node(media_type, NULL, source_node); + + /* EVR sink node. */ + window = create_window(); + + hr = MFCreateVideoRendererActivate(window, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &evr_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(evr_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &handler); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaTypeHandler_Release(handler); + + IMFStreamSink_Release(stream_sink); + IMFMediaSink_Release(sink); + + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, source_node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, evr_node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyNode_ConnectOutput(source_node, 0, evr_node, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(evr_node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_DIRECT); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_GetCount(evr_node, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected attribute count %u.\n", count); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count %u.\n", node_count); + + for (i = 0; i < node_count; ++i) + { + MF_TOPOLOGY_TYPE node_type; + + hr = IMFTopology_GetNode(full_topology, i, &node); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_GetNodeType(node, &node_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (node_type == MF_TOPOLOGY_OUTPUT_NODE) + { + value = 1; + hr = IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_STREAMID, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!value, "Unexpected stream id %u.\n", value); + } + } + + IMFTopology_Release(full_topology); + + IMFTopoLoader_Release(loader); + + IMFTopologyNode_Release(source_node); + IMFTopologyNode_Release(evr_node); + IMFTopology_Release(topology); + IMFMediaType_Release(media_type); + DestroyWindow(window); + + CoUninitialize(); +} + static HRESULT WINAPI testshutdown_QueryInterface(IMFShutdown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IMFShutdown) || @@ -4859,6 +4985,7 @@ START_TEST(mf) test_topology(); test_topology_tee_node(); test_topology_loader(); + test_topology_loader_evr(); test_MFGetService(); test_sequencer_source(); test_media_session(); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 77baa1128c4..6f73bb859cd 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -2364,6 +2364,32 @@ static HRESULT topology_loader_resolve_nodes(struct topoloader_context *context, return hr; } +static void topology_loader_resolve_complete(struct topoloader_context *context) +{ + MF_TOPOLOGY_TYPE node_type; + IMFTopologyNode *node; + WORD i, node_count; + + IMFTopology_GetNodeCount(context->output_topology, &node_count); + + for (i = 0; i < node_count; ++i) + { + if (SUCCEEDED(IMFTopology_GetNode(context->output_topology, i, &node))) + { + IMFTopologyNode_GetNodeType(node, &node_type); + + if (node_type == MF_TOPOLOGY_OUTPUT_NODE) + { + /* Make sure MF_TOPONODE_STREAMID is set for all outputs. */ + if (FAILED(IMFTopologyNode_GetItem(node, &MF_TOPONODE_STREAMID, NULL))) + IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_STREAMID, 0); + } + + IMFTopologyNode_Release(node); + } + } +} + static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *input_topology, IMFTopology **ret_topology, IMFTopology *current_topology) { @@ -2451,6 +2477,9 @@ static HRESULT WINAPI topology_loader_Load(IMFTopoLoader *iface, IMFTopology *in break; } + if (SUCCEEDED(hr)) + topology_loader_resolve_complete(&context); + *ret_topology = output_topology; return hr; -- 2.29.2

Dec. 1, 2020

[PATCH 4/7] mf/topoloader: Set MF_TOPONODE_TRANSFORM_OBJECTID for created transforms when CLSID is available.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 6 ++++++ dlls/mf/topology.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index d7d7fdfa60e..4d4c6283be8 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2045,6 +2045,9 @@ todo_wine { ok(value == 1, "Unexpected value.\n"); } + hr = IMFTopologyNode_GetItem(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, NULL); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); IUnknown_Release(node_object); @@ -2068,6 +2071,9 @@ todo_wine { ok(hr == S_OK, "Failed to get transform node type in resolved topology, hr %#x.\n", hr); ok(node_type == MF_TOPOLOGY_TRANSFORM_NODE, "Unexpected node type %u.\n", node_type); + hr = IMFTopologyNode_GetItem(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, NULL); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + hr = IMFTopologyNode_GetObject(mft_node, &node_object); ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index efa28e9f457..77baa1128c4 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1996,7 +1996,7 @@ struct transform_output_type { IMFMediaType *type; IMFTransform *transform; - const GUID *category; + IMFActivate *activate; }; struct connect_context @@ -2054,7 +2054,7 @@ static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFM unsigned int output_count = 0; output_type.transform = transform; - output_type.category = category; + output_type.activate = activates[i]; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, output_count++, &output_type.type))) { hr = connect_func(&output_type, context); @@ -2079,17 +2079,22 @@ static HRESULT topology_loader_create_transform(const struct transform_output_ty IMFTopologyNode **node) { HRESULT hr; + GUID guid; if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, node))) return hr; IMFTopologyNode_SetObject(*node, (IUnknown *)output_type->transform); - if (IsEqualGUID(output_type->category, &MFT_CATEGORY_AUDIO_DECODER) || - IsEqualGUID(output_type->category, &MFT_CATEGORY_VIDEO_DECODER)) + + if (SUCCEEDED(IMFActivate_GetGUID(output_type->activate, &MF_TRANSFORM_CATEGORY_Attribute, &guid)) && + (IsEqualGUID(&guid, &MFT_CATEGORY_AUDIO_DECODER) || IsEqualGUID(&guid, &MFT_CATEGORY_VIDEO_DECODER))) { IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_DECODER, 1); } + if (SUCCEEDED(IMFActivate_GetGUID(output_type->activate, &MFT_TRANSFORM_CLSID_Attribute, &guid))) + IMFTopologyNode_SetGUID(*node, &MF_TOPONODE_TRANSFORM_OBJECTID, &guid); + return hr; } -- 2.29.2

Dec. 1, 2020

[PATCH 3/7] mf/topoloader: Set MF_TOPONODE_DECODER for the decoders.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 10 ++++++++-- dlls/mf/topology.c | 27 ++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 20e3e8713c6..d7d7fdfa60e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1740,7 +1740,6 @@ static void test_topology_loader(void) { /* PCM -> PCM, different bps. */ &MFMediaType_Audio, - /* Source type */ { { { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, @@ -1751,7 +1750,6 @@ static void test_topology_loader(void) { &MF_MT_AUDIO_BITS_PER_SAMPLE, 8 }, } }, - /* Sink type */ { { { &MF_MT_SUBTYPE, WAVE_FORMAT_PCM }, @@ -2039,6 +2037,14 @@ todo_wine { hr = IMFTopologyNode_GetObject(mft_node, &node_object); ok(hr == S_OK, "Failed to get object of transform node, hr %#x.\n", hr); + if (test->flags & LOADER_EXPECTED_DECODER) + { + value = 0; + hr = IMFTopologyNode_GetUINT32(mft_node, &MF_TOPONODE_DECODER, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(value == 1, "Unexpected value.\n"); + } + hr = IUnknown_QueryInterface(node_object, &IID_IMFTransform, (void **)&transform); ok(hr == S_OK, "Failed to get IMFTransform from transform node's object, hr %#x.\n", hr); IUnknown_Release(node_object); diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 7001a33f088..efa28e9f457 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1996,6 +1996,7 @@ struct transform_output_type { IMFMediaType *type; IMFTransform *transform; + const GUID *category; }; struct connect_context @@ -2053,6 +2054,7 @@ static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFM unsigned int output_count = 0; output_type.transform = transform; + output_type.category = category; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, output_count++, &output_type.type))) { hr = connect_func(&output_type, context); @@ -2073,6 +2075,24 @@ static HRESULT topology_loader_enumerate_output_types(const GUID *category, IMFM return hr; } +static HRESULT topology_loader_create_transform(const struct transform_output_type *output_type, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, node))) + return hr; + + IMFTopologyNode_SetObject(*node, (IUnknown *)output_type->transform); + if (IsEqualGUID(output_type->category, &MFT_CATEGORY_AUDIO_DECODER) || + IsEqualGUID(output_type->category, &MFT_CATEGORY_VIDEO_DECODER)) + { + IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_DECODER, 1); + } + + return hr; +} + static HRESULT connect_to_sink(struct transform_output_type *output_type, struct connect_context *context) { IMFTopologyNode *node; @@ -2081,10 +2101,9 @@ static HRESULT connect_to_sink(struct transform_output_type *output_type, struct if (FAILED(IMFMediaTypeHandler_IsMediaTypeSupported(context->sink_handler, output_type->type, NULL))) return MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION; - if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + if (FAILED(hr = topology_loader_create_transform(output_type, &node))) return hr; - IMFTopologyNode_SetObject(node, (IUnknown *)output_type->transform); IMFTopology_AddNode(context->context->output_topology, node); IMFTopologyNode_ConnectOutput(context->upstream_node, 0, node, 0); IMFTopologyNode_ConnectOutput(node, 0, context->sink, 0); @@ -2107,11 +2126,9 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s if (SUCCEEDED(connect_to_sink(output_type, context))) return S_OK; - if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + if (FAILED(hr = topology_loader_create_transform(output_type, &node))) return hr; - IMFTopologyNode_SetObject(node, (IUnknown *)output_type->transform); - sink_ctx = *context; sink_ctx.upstream_node = node; -- 2.29.2

Dec. 1, 2020

[PATCH 2/7] mfplat/mediatype: Do not add user data when converting from WAVE_FORMAT_EXTENSIBLE.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 2 +- dlls/mfplat/tests/mfplat.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 62d75e80146..2bf9b674ea7 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3011,7 +3011,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); } - if (format->cbSize) + if (format->cbSize && format->wFormatTag != WAVE_FORMAT_EXTENSIBLE) mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38e8acb966e..b361d4da162 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5625,9 +5625,13 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) waveformatext.dwChannelMask = 0x8; memcpy(&waveformatext.SubFormat, &MFAudioFormat_Base, sizeof(waveformatext.SubFormat)); waveformatext.SubFormat.Data1 = waveformatex_tests[i].wFormatTag; + hr = MFInitMediaTypeFromWaveFormatEx(mediatype, &waveformatext.Format, sizeof(waveformatext)); ok(hr == S_OK, "Failed to initialize media type, hr %#x.\n", hr); + hr = IMFMediaType_GetItem(mediatype, &MF_MT_USER_DATA, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + validate_media_type(mediatype, &waveformatext.Format); } -- 2.29.2

Dec. 1, 2020

[PATCH 1/7] mfplat: Remove duplicated attribute from tracing.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6394784593e..e4cd1c397ad 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1579,7 +1579,6 @@ const char *debugstr_attr(const GUID *guid) X(MF_SA_D3D_AWARE), X(MF_MT_MAX_KEYFRAME_SPACING), X(MFT_TRANSFORM_CLSID_Attribute), - X(MFT_TRANSFORM_CLSID_Attribute), X(MF_SOURCE_READER_ENABLE_ADVANCED_VIDEO_PROCESSING), X(MF_MT_AM_FORMAT_TYPE), X(MF_SESSION_APPROX_EVENT_OCCURRENCE_TIME), -- 2.29.2

Dec. 1, 2020

[PATCH 5/5] dwrite: Use font data access helpers when reading metrics tables.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 200 ++++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 103 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index d7a0aaf8e51..68da6e4ecfb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -126,7 +126,7 @@ enum opentype_cmap_table_encoding /* PANOSE is 10 bytes in size, need to pack the structure properly */ #include "pshpack2.h" -typedef struct +struct tt_head { USHORT majorVersion; USHORT minorVersion; @@ -146,9 +146,9 @@ typedef struct SHORT direction_hint; SHORT index_format; SHORT glyphdata_format; -} TT_HEAD; +}; -enum TT_HEAD_MACSTYLE +enum tt_head_macstyle { TT_HEAD_MACSTYLE_BOLD = 1 << 0, TT_HEAD_MACSTYLE_ITALIC = 1 << 1, @@ -159,7 +159,7 @@ enum TT_HEAD_MACSTYLE TT_HEAD_MACSTYLE_EXTENDED = 1 << 6, }; -typedef struct +struct tt_post { ULONG Version; ULONG italicAngle; @@ -170,9 +170,9 @@ typedef struct ULONG maxmemType42; ULONG minmemType1; ULONG maxmemType1; -} TT_POST; +}; -typedef struct +struct tt_os2 { USHORT version; SHORT xAvgCharWidth; @@ -217,9 +217,10 @@ typedef struct USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} TT_OS2_V2; +}; -typedef struct { +struct tt_hhea +{ USHORT majorVersion; USHORT minorVersion; SHORT ascender; @@ -235,7 +236,7 @@ typedef struct { SHORT reserved[4]; SHORT metricDataFormat; USHORT numberOfHMetrics; -} TT_HHEA; +}; struct sbix_header { @@ -1878,31 +1879,25 @@ HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigne void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsigned int *ascent, unsigned int *descent) { struct dwrite_fonttable os2; - const TT_OS2_V2 *data; opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); - data = (const TT_OS2_V2 *)os2.data; *ascent = *descent = 0; - if (os2.size >= FIELD_OFFSET(TT_OS2_V2, sTypoLineGap)) + if (os2.size >= FIELD_OFFSET(struct tt_os2, sTypoLineGap)) { - SHORT value = GET_BE_WORD(data->sTypoDescender); - *ascent = GET_BE_WORD(data->sTypoAscender); + SHORT value = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sTypoDescender)); + *ascent = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sTypoAscender)); *descent = value < 0 ? -value : 0; } - if (data) + if (os2.data) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); } void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT_METRICS1 *metrics, DWRITE_CARET_METRICS *caret) { struct dwrite_fonttable os2, head, post, hhea; - const TT_OS2_V2 *tt_os2; - const TT_HEAD *tt_head; - const TT_POST *tt_post; - const TT_HHEA *tt_hhea; memset(metrics, 0, sizeof(*metrics)); @@ -1911,88 +1906,89 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT opentype_get_font_table(stream_desc, MS_POST_TAG, &post); opentype_get_font_table(stream_desc, MS_HHEA_TAG, &hhea); - tt_head = (const TT_HEAD *)head.data; - tt_os2 = (const TT_OS2_V2 *)os2.data; - tt_post = (const TT_POST *)post.data; - tt_hhea = (const TT_HHEA *)hhea.data; - - if (tt_head) { - metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); - metrics->glyphBoxLeft = GET_BE_WORD(tt_head->xMin); - metrics->glyphBoxTop = GET_BE_WORD(tt_head->yMax); - metrics->glyphBoxRight = GET_BE_WORD(tt_head->xMax); - metrics->glyphBoxBottom = GET_BE_WORD(tt_head->yMin); + if (head.data) + { + metrics->designUnitsPerEm = table_read_be_word(&head, FIELD_OFFSET(struct tt_head, unitsPerEm)); + metrics->glyphBoxLeft = table_read_be_word(&head, FIELD_OFFSET(struct tt_head, xMin)); + metrics->glyphBoxTop = table_read_be_word(&head, FIELD_OFFSET(struct tt_head, yMax)); + metrics->glyphBoxRight = table_read_be_word(&head, FIELD_OFFSET(struct tt_head, xMax)); + metrics->glyphBoxBottom = table_read_be_word(&head, FIELD_OFFSET(struct tt_head, yMin)); } if (caret) { - if (tt_hhea) { - caret->slopeRise = GET_BE_WORD(tt_hhea->caretSlopeRise); - caret->slopeRun = GET_BE_WORD(tt_hhea->caretSlopeRun); - caret->offset = GET_BE_WORD(tt_hhea->caretOffset); - } - else { - caret->slopeRise = 0; - caret->slopeRun = 0; - caret->offset = 0; + if (hhea.data) + { + caret->slopeRise = table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, caretSlopeRise)); + caret->slopeRun = table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, caretSlopeRun)); + caret->offset = table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, caretOffset)); } + else + memset(caret, 0, sizeof(*caret)); } - if (tt_os2) { - USHORT version = GET_BE_WORD(tt_os2->version); + if (os2.data) + { + USHORT version = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, version)); - metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); + metrics->ascent = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, usWinAscent)); /* Some fonts have usWinDescent value stored as signed short, which could be wrongly interpreted as large unsigned value. */ - metrics->descent = abs((SHORT)GET_BE_WORD(tt_os2->usWinDescent)); + metrics->descent = abs((SHORT)table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, usWinDescent))); - /* line gap is estimated using two sets of ascender/descender values and 'hhea' line gap */ - if (tt_hhea) { - SHORT descender = (SHORT)GET_BE_WORD(tt_hhea->descender); + /* Line gap is estimated using two sets of ascender/descender values and 'hhea' line gap. */ + if (hhea.data) + { + SHORT descender = (SHORT)table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, descender)); INT32 linegap; - linegap = GET_BE_WORD(tt_hhea->ascender) + abs(descender) + GET_BE_WORD(tt_hhea->linegap) - - metrics->ascent - metrics->descent; + linegap = table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, ascender)) + abs(descender) + + table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, linegap)) - metrics->ascent - metrics->descent; metrics->lineGap = linegap > 0 ? linegap : 0; } - metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); - metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); - metrics->subscriptPositionX = GET_BE_WORD(tt_os2->ySubscriptXOffset); + metrics->strikethroughPosition = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, yStrikeoutPosition)); + metrics->strikethroughThickness = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, yStrikeoutSize)); + metrics->subscriptPositionX = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySubscriptXOffset)); /* Y offset is stored as positive offset below baseline */ - metrics->subscriptPositionY = -GET_BE_WORD(tt_os2->ySubscriptYOffset); - metrics->subscriptSizeX = GET_BE_WORD(tt_os2->ySubscriptXSize); - metrics->subscriptSizeY = GET_BE_WORD(tt_os2->ySubscriptYSize); - metrics->superscriptPositionX = GET_BE_WORD(tt_os2->ySuperscriptXOffset); - metrics->superscriptPositionY = GET_BE_WORD(tt_os2->ySuperscriptYOffset); - metrics->superscriptSizeX = GET_BE_WORD(tt_os2->ySuperscriptXSize); - metrics->superscriptSizeY = GET_BE_WORD(tt_os2->ySuperscriptYSize); + metrics->subscriptPositionY = -table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySubscriptYOffset)); + metrics->subscriptSizeX = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySubscriptXSize)); + metrics->subscriptSizeY = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySubscriptYSize)); + metrics->superscriptPositionX = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySuperscriptXOffset)); + metrics->superscriptPositionY = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySuperscriptYOffset)); + metrics->superscriptSizeX = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySuperscriptXSize)); + metrics->superscriptSizeY = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, ySuperscriptYSize)); /* version 2 fields */ - if (version >= 2) { - metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); - metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight); + if (version >= 2) + { + metrics->capHeight = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sCapHeight)); + metrics->xHeight = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sxHeight)); } - if (GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_USE_TYPO_METRICS) { - SHORT descent = GET_BE_WORD(tt_os2->sTypoDescender); - metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); + if (table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, fsSelection)) & OS2_FSSELECTION_USE_TYPO_METRICS) + { + SHORT descent = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sTypoDescender)); + metrics->ascent = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sTypoAscender)); metrics->descent = descent < 0 ? -descent : 0; - metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); + metrics->lineGap = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, sTypoLineGap)); metrics->hasTypographicMetrics = TRUE; } } - else { + else + { metrics->strikethroughPosition = metrics->designUnitsPerEm / 3; - if (tt_hhea) { - metrics->ascent = GET_BE_WORD(tt_hhea->ascender); - metrics->descent = abs((SHORT)GET_BE_WORD(tt_hhea->descender)); + if (hhea.data) + { + metrics->ascent = table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, ascender)); + metrics->descent = abs((SHORT)table_read_be_word(&hhea, FIELD_OFFSET(struct tt_hhea, descender))); } } - if (tt_post) { - metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); - metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); + if (post.data) + { + metrics->underlinePosition = table_read_be_word(&post, FIELD_OFFSET(struct tt_post, underlinePosition)); + metrics->underlineThickness = table_read_be_word(&post, FIELD_OFFSET(struct tt_post, underlineThickness)); } if (metrics->underlineThickness == 0) @@ -2006,13 +2002,13 @@ void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT if (metrics->capHeight == 0) metrics->capHeight = metrics->designUnitsPerEm * 7 / 10; - if (tt_os2) + if (os2.data) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2.context); - if (tt_head) + if (head.data) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head.context); - if (tt_post) + if (post.data) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post.context); - if (tt_hhea) + if (hhea.data) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, hhea.context); } @@ -2020,15 +2016,10 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d { struct dwrite_fonttable os2, head, colr, cpal; BOOL is_symbol, is_monospaced; - const TT_OS2_V2 *tt_os2; - const TT_HEAD *tt_head; opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); opentype_get_font_table(stream_desc, MS_HEAD_TAG, &head); - tt_os2 = (const TT_OS2_V2 *)os2.data; - tt_head = (const TT_HEAD *)head.data; - /* default stretch, weight and style to normal */ props->stretch = DWRITE_FONT_STRETCH_NORMAL; props->weight = DWRITE_FONT_WEIGHT_NORMAL; @@ -2039,12 +2030,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->flags = 0; /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ - if (tt_os2) + if (os2.data) { - USHORT version = GET_BE_WORD(tt_os2->version); - USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); - USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); - USHORT usWidthClass = GET_BE_WORD(tt_os2->usWidthClass); + USHORT version = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, version)); + USHORT fsSelection = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, fsSelection)); + USHORT usWeightClass = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, usWeightClass)); + USHORT usWidthClass = table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, usWidthClass)); + const void *panose; if (usWidthClass > DWRITE_FONT_STRETCH_UNDEFINED && usWidthClass <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) props->stretch = usWidthClass; @@ -2063,22 +2055,24 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->style = DWRITE_FONT_STYLE_ITALIC; props->lf.lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); - memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); + if ((panose = table_read_ensure(&os2, FIELD_OFFSET(struct tt_os2, panose), sizeof(props->panose)))) + memcpy(&props->panose, panose, sizeof(props->panose)); /* FONTSIGNATURE */ - props->fontsig.fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); - props->fontsig.fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); - props->fontsig.fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); - props->fontsig.fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + props->fontsig.fsUsb[0] = table_read_be_dword(&os2, FIELD_OFFSET(struct tt_os2, ulUnicodeRange1)); + props->fontsig.fsUsb[1] = table_read_be_dword(&os2, FIELD_OFFSET(struct tt_os2, ulUnicodeRange2)); + props->fontsig.fsUsb[2] = table_read_be_dword(&os2, FIELD_OFFSET(struct tt_os2, ulUnicodeRange3)); + props->fontsig.fsUsb[3] = table_read_be_dword(&os2, FIELD_OFFSET(struct tt_os2, ulUnicodeRange4)); if (version) { - props->fontsig.fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - props->fontsig.fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + props->fontsig.fsCsb[0] = table_read_be_dword(&os2, FIELD_OFFSET(struct tt_os2, ulCodePageRange1)); + props->fontsig.fsCsb[1] = table_read_be_dword(&os2, FIELD_OFFSET(struct tt_os2, ulCodePageRange2)); } } - else if (tt_head) { - USHORT macStyle = GET_BE_WORD(tt_head->macStyle); + else if (head.data) + { + USHORT macStyle = table_read_be_word(&head, FIELD_OFFSET(struct tt_head, macStyle)); if (macStyle & TT_HEAD_MACSTYLE_CONDENSED) props->stretch = DWRITE_FONT_STRETCH_CONDENSED; @@ -2137,7 +2131,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (post.data) { - is_monospaced = !!table_read_dword(&post, FIELD_OFFSET(TT_POST, fixed_pitch)); + is_monospaced = !!table_read_dword(&post, FIELD_OFFSET(struct tt_post, fixed_pitch)); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post.context); } @@ -2544,20 +2538,20 @@ HRESULT opentype_get_font_info_strings(const struct file_stream_desc *stream_des HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) { struct dwrite_fonttable os2, name; - const TT_OS2_V2 *tt_os2; const void *name_table; + UINT16 fsselection; HRESULT hr; opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); - tt_os2 = (const TT_OS2_V2 *)os2.data; name_table = (const void *)name.data; *names = NULL; - /* if Preferred Family doesn't conform to WWS model try WWS name */ - if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + /* If Preferred Family doesn't conform to WWS model try WWS name. */ + fsselection = os2.data ? table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, fsSelection)) : 0; + if (os2.data && !(fsselection & OS2_FSSELECTION_WWS)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_FAMILY_NAME, names); else hr = E_FAIL; @@ -2581,20 +2575,20 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * { struct dwrite_fonttable os2, name; IDWriteLocalizedStrings *lfnames; - const TT_OS2_V2 *tt_os2; const void *name_table; + UINT16 fsselection; HRESULT hr; opentype_get_font_table(stream_desc, MS_OS2_TAG, &os2); opentype_get_font_table(stream_desc, MS_NAME_TAG, &name); - tt_os2 = (const TT_OS2_V2 *)os2.data; name_table = name.data; *names = NULL; /* if Preferred Family doesn't conform to WWS model try WWS name */ - if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + fsselection = os2.data ? table_read_be_word(&os2, FIELD_OFFSET(struct tt_os2, fsSelection)) : 0; + if (os2.data && !(fsselection & OS2_FSSELECTION_WWS)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_SUBFAMILY_NAME, names); else hr = E_FAIL; -- 2.29.2

Dec. 1, 2020

[PATCH 4/5] dwrite/font: Reimplement HasVerticalGlyphVariants() flag using general shaping logic.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/opentype.c | 175 ++++++++++++++--------------------- dlls/dwrite/tests/font.c | 9 +- 4 files changed, 74 insertions(+), 114 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index be3f4b719e8..7c9fe8a6873 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -408,7 +408,6 @@ extern unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable extern unsigned int opentype_get_cpal_paletteentrycount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; extern HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *table, unsigned int palette, unsigned int first_entry_index, unsigned int entry_count, DWRITE_COLOR_F *entries) DECLSPEC_HIDDEN; -extern BOOL opentype_has_vertical_variants(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern UINT32 opentype_get_glyph_image_formats(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern DWRITE_CONTAINER_TYPE opentype_analyze_container_type(void const *, UINT32) DECLSPEC_HIDDEN; @@ -650,6 +649,7 @@ extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *co extern BOOL opentype_layout_check_feature(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, struct shaping_feature *feature, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; +extern BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) DECLSPEC_HIDDEN; extern HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, unsigned int glyph_count, const UINT16 *nominal_glyphs, UINT16 *glyphs) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9889add8899..02ac75d2419 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4970,7 +4970,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li if (freetype_has_kerning_pairs(&fontface->IDWriteFontFace5_iface)) fontface->flags |= FONTFACE_HAS_KERNING_PAIRS; - if (opentype_has_vertical_variants(&fontface->IDWriteFontFace5_iface)) + if (opentype_has_vertical_variants(fontface)) fontface->flags |= FONTFACE_HAS_VERTICAL_VARIANTS; fontface->glyph_image_formats = opentype_get_glyph_image_formats(&fontface->IDWriteFontFace5_iface); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 53925465a12..d7a0aaf8e51 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2945,81 +2945,6 @@ void opentype_colr_next_glyph(const struct dwrite_fonttable *colr, struct dwrite } } -BOOL opentype_has_vertical_variants(IDWriteFontFace5 *fontface) -{ - const struct gpos_gsub_header *header; - const struct ot_feature_list *featurelist; - const struct ot_lookup_list *lookup_list; - BOOL exists = FALSE, ret = FALSE; - unsigned int i, j; - const void *data; - void *context; - UINT32 size; - HRESULT hr; - - hr = IDWriteFontFace5_TryGetFontTable(fontface, MS_GSUB_TAG, &data, &size, &context, &exists); - if (FAILED(hr) || !exists) - return FALSE; - - header = data; - featurelist = (struct ot_feature_list *)((BYTE*)header + GET_BE_WORD(header->feature_list)); - lookup_list = (const struct ot_lookup_list *)((BYTE*)header + GET_BE_WORD(header->lookup_list)); - - for (i = 0; i < GET_BE_WORD(featurelist->feature_count); i++) { - if (featurelist->features[i].tag == DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING) { - const struct ot_feature *feature = (const struct ot_feature*)((BYTE*)featurelist + GET_BE_WORD(featurelist->features[i].offset)); - UINT16 lookup_count = GET_BE_WORD(feature->lookup_count), index, count, type; - const GSUB_SingleSubstFormat2 *subst2; - const struct ot_lookup_table *lookup_table; - UINT32 offset; - - if (lookup_count == 0) - continue; - - for (j = 0; j < lookup_count; ++j) { - /* check if lookup is empty */ - index = GET_BE_WORD(feature->lookuplist_index[j]); - lookup_table = (const struct ot_lookup_table *)((BYTE*)lookup_list + GET_BE_WORD(lookup_list->lookup[index])); - - type = GET_BE_WORD(lookup_table->lookup_type); - if (type != GSUB_LOOKUP_SINGLE_SUBST && type != GSUB_LOOKUP_EXTENSION_SUBST) - continue; - - count = GET_BE_WORD(lookup_table->subtable_count); - if (count == 0) - continue; - - offset = GET_BE_WORD(lookup_table->subtable[0]); - if (type == GSUB_LOOKUP_EXTENSION_SUBST) { - const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)lookup_table + offset); - if (GET_BE_WORD(ext->SubstFormat) == 1) - offset += GET_BE_DWORD(ext->ExtensionOffset); - else - FIXME("Unhandled Extension Substitution Format %u\n", GET_BE_WORD(ext->SubstFormat)); - } - - subst2 = (const GSUB_SingleSubstFormat2*)((BYTE*)lookup_table + offset); - index = GET_BE_WORD(subst2->SubstFormat); - if (index == 1) - FIXME("Validate Single Substitution Format 1\n"); - else if (index == 2) { - /* SimSun-ExtB has 0 glyph count for this substitution */ - if (GET_BE_WORD(subst2->GlyphCount) > 0) { - ret = TRUE; - break; - } - } - else - WARN("Unknown Single Substitution Format, %u\n", index); - } - } - } - - IDWriteFontFace5_ReleaseFontTable(fontface, context); - - return ret; -} - static BOOL opentype_has_font_table(IDWriteFontFace5 *fontface, UINT32 tag) { BOOL exists = FALSE; @@ -4329,10 +4254,16 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap } static unsigned int opentype_layout_adjust_extension_subtable(struct scriptshaping_context *context, - unsigned int *subtable_offset) + unsigned int *subtable_offset, const struct lookup *lookup) { const struct ot_gsubgpos_extension_format1 *format1; + if ((context->table == &context->cache->gsub && lookup->type != GSUB_LOOKUP_EXTENSION_SUBST) || + (context->table == &context->cache->gpos && lookup->type != GPOS_LOOKUP_EXTENSION_POSITION)) + { + return lookup->type; + } + if (!(format1 = table_read_ensure(&context->table->table, *subtable_offset, sizeof(*format1)))) return 0; @@ -4361,14 +4292,7 @@ static BOOL opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont { unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - if (lookup->type == GPOS_LOOKUP_EXTENSION_POSITION) - { - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset); - if (!lookup_type) - continue; - } - else - lookup_type = lookup->type; + lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); switch (lookup_type) { @@ -5679,14 +5603,7 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont { unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) - { - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset); - if (!lookup_type) - continue; - } - else - lookup_type = lookup->type; + lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); switch (lookup_type) { @@ -6005,14 +5922,7 @@ static BOOL opentype_layout_gsub_lookup_is_glyph_covered(struct scriptshaping_co { unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - if (lookup->type == GSUB_LOOKUP_EXTENSION_SUBST) - { - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset); - if (!lookup_type) - continue; - } - else - lookup_type = lookup->type; + lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); format = table_read_be_word(gsub, subtable_offset); @@ -6079,14 +5989,7 @@ static BOOL opentype_layout_gpos_lookup_is_glyph_covered(struct scriptshaping_co { unsigned int subtable_offset = opentype_layout_get_gsubgpos_subtable(context, lookup->offset, i); - if (lookup->type == GPOS_LOOKUP_EXTENSION_POSITION) - { - lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset); - if (!lookup_type) - continue; - } - else - lookup_type = lookup->type; + lookup_type = opentype_layout_adjust_extension_subtable(context, &subtable_offset, lookup); format = table_read_be_word(gpos, subtable_offset); @@ -6178,6 +6081,61 @@ BOOL opentype_layout_check_feature(struct scriptshaping_context *context, unsign return ret; } +BOOL opentype_has_vertical_variants(struct dwrite_fontface *fontface) +{ + unsigned int i, j, count = 0, lookup_type, subtable_offset; + struct shaping_features features = { 0 }; + struct shaping_feature vert_feature = { 0 }; + struct scriptshaping_context context = { 0 }; + struct lookups lookups = { 0 }; + UINT16 format; + + context.cache = fontface_get_shaping_cache(fontface); + context.table = &context.cache->gsub; + + vert_feature.tag = DWRITE_MAKE_OPENTYPE_TAG('v','e','r','t'); + vert_feature.flags = FEATURE_GLOBAL | FEATURE_GLOBAL_SEARCH; + vert_feature.max_value = 1; + vert_feature.default_value = 1; + + features.features = &vert_feature; + features.count = features.capacity = 1; + + opentype_layout_collect_lookups(&context, ~0u, ~0u, &features, context.table, &lookups); + + for (i = 0; i < lookups.count && !count; ++i) + { + const struct dwrite_fonttable *table = &context.table->table; + const struct lookup *lookup = &lookups.lookups[i]; + + for (j = 0; j < lookup->subtable_count && !count; ++j) + { + subtable_offset = opentype_layout_get_gsubgpos_subtable(&context, lookup->offset, j); + lookup_type = opentype_layout_adjust_extension_subtable(&context, &subtable_offset, lookup); + + if (lookup_type != GSUB_LOOKUP_SINGLE_SUBST) + continue; + + format = table_read_be_word(table, subtable_offset); + + if (format == 1) + { + count = 1; + } + else if (format == 2) + { + count = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); + } + else + WARN("Unrecognized single substitution format %u.\n", format); + } + } + + heap_free(lookups.lookups); + + return !!count; +} + HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, unsigned int glyph_count, const UINT16 *nominal_glyphs, UINT16 *glyphs) { @@ -6215,6 +6173,7 @@ HRESULT opentype_get_vertical_glyph_variants(struct dwrite_fontface *fontface, u { const struct lookup *lookup = &lookups.lookups[i]; + /* FIXME: should probably handle extension subtables. */ if (lookup->type != GSUB_LOOKUP_SINGLE_SUBST) continue; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index becb1a741f7..193f8ed9c48 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8208,16 +8208,17 @@ static BOOL has_vertical_glyph_variants(IDWriteFontFace1 *fontface) subst2 = (const GSUB_SingleSubstFormat2*)((BYTE*)lookup_table + offset); index = GET_BE_WORD(subst2->SubstFormat); if (index == 1) - ok(0, "validate Single Substitution Format 1\n"); + ret = TRUE; else if (index == 2) { /* SimSun-ExtB has 0 glyph count for this substitution */ - if (GET_BE_WORD(subst2->GlyphCount) > 0) { + if (GET_BE_WORD(subst2->GlyphCount) > 0) ret = TRUE; - break; - } } else ok(0, "unknown Single Substitution Format, %u\n", index); + + if (ret) + break; } } } -- 2.29.2

Dec. 1, 2020

[PATCH 3/5] dwrite/gdiinterop: Use consistent traces for the interop object.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/gdiinterop.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 47924011fd3..81cfc3a586b 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -637,9 +637,7 @@ static HRESULT create_rendertarget(IDWriteFactory7 *factory, HDC hdc, UINT32 wid static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop1 *iface, REFIID riid, void **obj) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteGdiInterop1) || IsEqualIID(riid, &IID_IDWriteGdiInterop) || @@ -686,9 +684,7 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop1 *iface) static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, IDWriteFont **font) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, logfont, font); + TRACE("%p, %p, %p.\n", iface, logfont, font); return IDWriteGdiInterop1_CreateFontFromLOGFONT(iface, logfont, NULL, font); } @@ -696,12 +692,11 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); IDWriteFontCollection *collection; IDWriteFontFamily *family; HRESULT hr; - TRACE("(%p)->(%p %p %p)\n", This, font, logfont, is_systemfont); + TRACE("%p, %p, %p, %p.\n", iface, font, logfont, is_systemfont); *is_systemfont = FALSE; @@ -732,9 +727,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, fontface, logfont); + TRACE("%p, %p, %p.\n", iface, fontface, logfont); memset(logfont, 0, sizeof(*logfont)); @@ -841,9 +834,11 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop1 *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget(This->factory, hdc, width, height, target); + struct gdiinterop *interop = impl_from_IDWriteGdiInterop1(iface); + + TRACE("%p, %p, %u, %u, %p.\n", iface, hdc, width, height, target); + + return create_rendertarget(interop->factory, hdc, width, height, target); } static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, @@ -897,9 +892,7 @@ done: static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, IDWriteFontFace *fontface, FONTSIGNATURE *fontsig) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - TRACE("(%p)->(%p %p)\n", This, fontface, fontsig); + TRACE("%p, %p, %p.\n", iface, fontface, fontsig); return get_fontsig_from_fontface(fontface, fontsig); } @@ -919,9 +912,7 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, ID static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, IDWriteFontSet *fontset, IDWriteFontSet **subset) { - struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - - FIXME("(%p)->(%p %p %p): stub\n", This, logfont, fontset, subset); + FIXME("%p, %p, %p, %p: stub.\n", iface, logfont, fontset, subset); return E_NOTIMPL; } -- 2.29.2

Dec. 1, 2020

[PATCH 2/5] dwrite/gdiinterop: Use consistent trace format for the bitmap render target.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/gdiinterop.c | 116 +++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 7e88f7490ca..47924011fd3 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -46,7 +46,7 @@ struct rendertarget IDWriteFactory7 *factory; DWRITE_TEXT_ANTIALIAS_MODE antialiasmode; - FLOAT ppdip; + float ppdip; DWRITE_MATRIX m; SIZE size; HDC hdc; @@ -149,20 +149,20 @@ static HRESULT WINAPI rendertarget_sink_QueryInterface(ID2D1SimplifiedGeometrySi static ULONG WINAPI rendertarget_sink_AddRef(ID2D1SimplifiedGeometrySink *iface) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); - return IDWriteBitmapRenderTarget1_AddRef(&This->IDWriteBitmapRenderTarget1_iface); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); + return IDWriteBitmapRenderTarget1_AddRef(&target->IDWriteBitmapRenderTarget1_iface); } static ULONG WINAPI rendertarget_sink_Release(ID2D1SimplifiedGeometrySink *iface) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); - return IDWriteBitmapRenderTarget1_Release(&This->IDWriteBitmapRenderTarget1_iface); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); + return IDWriteBitmapRenderTarget1_Release(&target->IDWriteBitmapRenderTarget1_iface); } static void WINAPI rendertarget_sink_SetFillMode(ID2D1SimplifiedGeometrySink *iface, D2D1_FILL_MODE mode) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); - SetPolyFillMode(This->hdc, mode == D2D1_FILL_MODE_ALTERNATE ? ALTERNATE : WINDING); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); + SetPolyFillMode(target->hdc, mode == D2D1_FILL_MODE_ALTERNATE ? ALTERNATE : WINDING); } static void WINAPI rendertarget_sink_SetSegmentFlags(ID2D1SimplifiedGeometrySink *iface, D2D1_PATH_SEGMENT vertexFlags) @@ -171,26 +171,28 @@ static void WINAPI rendertarget_sink_SetSegmentFlags(ID2D1SimplifiedGeometrySink static void WINAPI rendertarget_sink_BeginFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); - MoveToEx(This->hdc, startPoint.x, startPoint.y, NULL); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); + MoveToEx(target->hdc, startPoint.x, startPoint.y, NULL); } static void WINAPI rendertarget_sink_AddLines(ID2D1SimplifiedGeometrySink *iface, const D2D1_POINT_2F *points, UINT32 count) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); - while (count--) { - LineTo(This->hdc, points->x, points->y); + while (count--) + { + LineTo(target->hdc, points->x, points->y); points++; } } static void WINAPI rendertarget_sink_AddBeziers(ID2D1SimplifiedGeometrySink *iface, const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); POINT points[3]; - while (count--) { + while (count--) + { points[0].x = beziers->point1.x; points[0].y = beziers->point1.y; points[1].x = beziers->point2.x; @@ -198,15 +200,15 @@ static void WINAPI rendertarget_sink_AddBeziers(ID2D1SimplifiedGeometrySink *ifa points[2].x = beziers->point3.x; points[2].y = beziers->point3.y; - PolyBezierTo(This->hdc, points, 3); + PolyBezierTo(target->hdc, points, 3); beziers++; } } static void WINAPI rendertarget_sink_EndFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_FIGURE_END figureEnd) { - struct rendertarget *This = impl_from_ID2D1SimplifiedGeometrySink(iface); - CloseFigure(This->hdc); + struct rendertarget *target = impl_from_ID2D1SimplifiedGeometrySink(iface); + CloseFigure(target->hdc); } static HRESULT WINAPI rendertarget_sink_Close(ID2D1SimplifiedGeometrySink *iface) @@ -214,7 +216,8 @@ static HRESULT WINAPI rendertarget_sink_Close(ID2D1SimplifiedGeometrySink *iface return S_OK; } -static const ID2D1SimplifiedGeometrySinkVtbl rendertargetsinkvtbl = { +static const ID2D1SimplifiedGeometrySinkVtbl rendertargetsinkvtbl = +{ rendertarget_sink_QueryInterface, rendertarget_sink_AddRef, rendertarget_sink_Release, @@ -229,9 +232,7 @@ static const ID2D1SimplifiedGeometrySinkVtbl rendertargetsinkvtbl = { static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget1 *iface, REFIID riid, void **obj) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteBitmapRenderTarget1) || IsEqualIID(riid, &IID_IDWriteBitmapRenderTarget) || @@ -490,93 +491,101 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget1 *iface) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)\n", This); - return This->hdc; + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); + + TRACE("%p.\n", iface); + + return target->hdc; } -static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface) +static float WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)\n", This); - return This->ppdip; + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); + + TRACE("%p.\n", iface); + + return target->ppdip; } -static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface, FLOAT ppdip) +static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface, float ppdip) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%.2f)\n", This, ppdip); + TRACE("%p, %.2f.\n", iface, ppdip); if (ppdip <= 0.0f) return E_INVALIDARG; - This->ppdip = ppdip; + target->ppdip = ppdip; return S_OK; } static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget1 *iface, DWRITE_MATRIX *transform) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%p)\n", This, transform); + TRACE("%p, %p.\n", iface, transform); - *transform = This->m; + *transform = target->m; return S_OK; } static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget1 *iface, DWRITE_MATRIX const *transform) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%p)\n", This, transform); + TRACE("%p, %p.\n", iface, transform); - This->m = transform ? *transform : identity; + target->m = transform ? *transform : identity; return S_OK; } static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget1 *iface, SIZE *size) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%p)\n", This, size); - *size = This->size; + TRACE("%p, %p.\n", iface, size); + + *size = target->size; return S_OK; } static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget1 *iface, UINT32 width, UINT32 height) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%u %u)\n", This, width, height); + TRACE("%p, %u, %u.\n", iface, width, height); - if (This->size.cx == width && This->size.cy == height) + if (target->size.cx == width && target->size.cy == height) return S_OK; - return create_target_dibsection(This, width, height); + return create_target_dibsection(target, width, height); } static DWRITE_TEXT_ANTIALIAS_MODE WINAPI rendertarget_GetTextAntialiasMode(IDWriteBitmapRenderTarget1 *iface) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)\n", This); - return This->antialiasmode; + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); + + TRACE("%p.\n", iface); + + return target->antialiasmode; } static HRESULT WINAPI rendertarget_SetTextAntialiasMode(IDWriteBitmapRenderTarget1 *iface, DWRITE_TEXT_ANTIALIAS_MODE mode) { - struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); + struct rendertarget *target = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%d)\n", This, mode); + TRACE("%p, %d.\n", iface, mode); if ((DWORD)mode > DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE) return E_INVALIDARG; - This->antialiasmode = mode; + target->antialiasmode = mode; return S_OK; } -static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = { +static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = +{ rendertarget_QueryInterface, rendertarget_AddRef, rendertarget_Release, @@ -592,7 +601,8 @@ static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = { rendertarget_SetTextAntialiasMode }; -static HRESULT create_rendertarget(IDWriteFactory7 *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) +static HRESULT create_rendertarget(IDWriteFactory7 *factory, HDC hdc, UINT32 width, UINT32 height, + IDWriteBitmapRenderTarget **ret) { struct rendertarget *target; HRESULT hr; -- 2.29.2

Dec. 1, 2020

[PATCH 1/5] dwrite/font: Use consistent traces for the font object.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 121 +++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 53 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aa51c744297..9889add8899 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -151,9 +151,10 @@ struct dwrite_fontlist struct dwrite_fontfamily *family; }; -struct dwrite_font { +struct dwrite_font +{ IDWriteFont3 IDWriteFont3_iface; - LONG ref; + LONG refcount; DWRITE_FONT_STYLE style; struct dwrite_font_data *data; @@ -1848,9 +1849,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid, void **obj) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IDWriteFont3) || IsEqualIID(riid, &IID_IDWriteFont2) || @@ -1871,57 +1870,67 @@ static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont3 *iface, REFIID riid static ULONG WINAPI dwritefont_AddRef(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); - return ref; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + ULONG refcount = InterlockedIncrement(&font->refcount); + + TRACE("%p, refcount %d.\n", iface, refcount); + + return refcount; } static ULONG WINAPI dwritefont_Release(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + ULONG refcount = InterlockedDecrement(&font->refcount); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %d.\n", iface, refcount); - if (!ref) { - IDWriteFontFamily2_Release(&This->family->IDWriteFontFamily2_iface); - release_font_data(This->data); - heap_free(This); + if (!refcount) + { + IDWriteFontFamily2_Release(&font->family->IDWriteFontFamily2_iface); + release_font_data(font->data); + heap_free(font); } - return ref; + return refcount; } static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont3 *iface, IDWriteFontFamily **family) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, family); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, family); - *family = (IDWriteFontFamily*)This->family; + *family = (IDWriteFontFamily *)font->family; IDWriteFontFamily_AddRef(*family); return S_OK; } static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->weight; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->weight; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->stretch; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->stretch; } static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->style; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont3 *iface) @@ -1960,17 +1969,20 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)\n", This); - return This->data->simulations; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p.\n", iface); + + return font->data->simulations; } static void WINAPI dwritefont_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS *metrics) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, metrics); - memcpy(metrics, &This->data->metrics, sizeof(*metrics)); + TRACE("%p, %p.\n", iface, metrics); + + memcpy(metrics, &font->data->metrics, sizeof(*metrics)); } static BOOL dwritefont_has_character(struct dwrite_font *font, UINT32 ch) @@ -2003,16 +2015,20 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFont static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, metrics); - *metrics = This->data->metrics; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, metrics); + + *metrics = font->data->metrics; } static void WINAPI dwritefont1_GetPanose(IDWriteFont3 *iface, DWRITE_PANOSE *panose) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, panose); - *panose = This->data->panose; + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, panose); + + *panose = font->data->panose; } static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 max_count, DWRITE_UNICODE_RANGE *ranges, @@ -2093,8 +2109,8 @@ static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p): stub\n", This); + FIXME("%p: stub.\n", iface); + return DWRITE_LOCALITY_LOCAL; } @@ -2179,23 +2195,22 @@ HRESULT get_fontsig_from_fontface(IDWriteFontFace *iface, FONTSIGNATURE *fontsig static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWriteFont3 **font) { - struct dwrite_font *This; + struct dwrite_font *object; *font = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) + if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; - This->IDWriteFont3_iface.lpVtbl = &dwritefontvtbl; - This->ref = 1; - This->family = family; + object->IDWriteFont3_iface.lpVtbl = &dwritefontvtbl; + object->refcount = 1; + object->family = family; IDWriteFontFamily2_AddRef(&family->IDWriteFontFamily2_iface); - This->data = family->data->fonts[index]; - This->style = This->data->style; - addref_font_data(This->data); + object->data = family->data->fonts[index]; + object->style = object->data->style; + addref_font_data(object->data); - *font = &This->IDWriteFont3_iface; + *font = &object->IDWriteFont3_iface; return S_OK; } -- 2.29.2

Dec. 1, 2020

Re: [PATCH 2/2] plugplay: Send WM_DEVICECHANGE with DBT_DEVNODES_CHANGED with each event.

by Arkadiusz Hiler

On Wed, Nov 25, 2020 at 09:42:37AM -0600, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=82429 > > Your paranoid android. > > > === debiant (32 bit report) === > > user32: > monitor: Timeout > win.c:10147: Test failed: GetActiveWindow() = 00000000 > win.c:10147: Test failed: GetFocus() = 00000000 > win.c:10149: Test failed: Expected foreground window 001B0140, got 00E10102 > win.c:10152: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. > win.c:10159: Test failed: Expected foreground window 001B0140, got 00000000 > win.c:10161: Test failed: GetActiveWindow() = 00000000 > win.c:10161: Test failed: GetFocus() = 00000000 > win.c:10169: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. > > === debiant (32 bit WoW report) === > > user32: > monitor: Timeout > > === debiant (64 bit WoW report) === > > user32: > clipboard.c:760: Test failed: 2: gle 5 > clipboard.c:765: Test failed: 2.0: got 0000 instead of 000d > clipboard.c:805: Test failed: 2: gle 1418 > clipboard.c:815: Test failed: 2: count 4 > clipboard.c:818: Test failed: 2: gle 1418 > clipboard.c:853: Test failed: 2.0: formats 00000000 have been rendered > clipboard.c:858: Test failed: 2.0: formats 00000000 have been rendered > clipboard.c:853: Test failed: 2.2: formats 00000000 have been rendered > clipboard.c:858: Test failed: 2.2: formats 00000000 have been rendered > clipboard.c:853: Test failed: 2.3: formats 00000000 have been rendered > clipboard.c:858: Test failed: 2.3: formats 00000000 have been rendered > monitor: Timeout Just in case someone wonders - both those and 1/2 results are false negatives that are quite usual for user32 changes as far as I have noticed. -- Cheers, Arek

Dec. 1, 2020