August 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : combase: Move CoCopyProxy().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 011f071dd84eca0b4183b2f2bd9d92b6faaf21b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=011f071dd84eca0b4183b2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 09:13:07 2020 +0300 combase: Move CoCopyProxy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 21 +++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 35 ----------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 23 insertions(+), 37 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index b87c6f19ba..595a7569b0 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -503,3 +503,24 @@ HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD aut if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); return hr; } + +/*********************************************************************** + * CoCopyProxy (combase.@) + */ +HRESULT WINAPI CoCopyProxy(IUnknown *proxy, IUnknown **proxy_copy) +{ + IClientSecurity *client_security; + HRESULT hr; + + TRACE("%p, %p.\n", proxy, proxy_copy); + + hr = IUnknown_QueryInterface(proxy, &IID_IClientSecurity, (void **)&client_security); + if (SUCCEEDED(hr)) + { + hr = IClientSecurity_CopyProxy(client_security, proxy, proxy_copy); + IClientSecurity_Release(client_security); + } + + if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 88d3adeec9..669b42486f 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -75,7 +75,7 @@ @ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess @ stub CoAllowUnmarshalerCLSID @ stub CoCancelCall -@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy +@ stdcall CoCopyProxy(ptr ptr) @ stub CoCreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler @ stdcall CoCreateGuid(ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index aeb7c4d29c..b1fedf17c8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4192,41 +4192,6 @@ HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, void *pvReserved) return S_OK; } -/*********************************************************************** - * CoCopyProxy [OLE32.@] - * - * Copies a proxy. - * - * PARAMS - * pProxy [I] Pointer to the proxy object. - * ppCopy [O] Copy of the proxy. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoQueryProxyBlanket, CoSetProxyBlanket. - */ -HRESULT WINAPI CoCopyProxy(IUnknown *pProxy, IUnknown **ppCopy) -{ - IClientSecurity *pCliSec; - HRESULT hr; - - TRACE("%p\n", pProxy); - - hr = IUnknown_QueryInterface(pProxy, &IID_IClientSecurity, (void **)&pCliSec); - if (SUCCEEDED(hr)) - { - hr = IClientSecurity_CopyProxy(pCliSec, pProxy, ppCopy); - IClientSecurity_Release(pCliSec); - } - - if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr); - return hr; -} - - /*********************************************************************** * CoGetCallContext [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 54725e406a..c64392d523 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -9,7 +9,7 @@ @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr) @ stdcall CoBuildVersion() -@ stdcall CoCopyProxy(ptr ptr) +@ stdcall CoCopyProxy(ptr ptr) combase.CoCopyProxy @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr)

1 0

Nikolay Sivov : combase: Move CoQueryProxyBlanket().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: a59a847c4888b09244ef2b49d343c8e764a8c0ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=a59a847c4888b09244ef2b49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 09:13:05 2020 +0300 combase: Move CoQueryProxyBlanket(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 25 +++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 45 --------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 9bf2252fb8..c67cf2fbce 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -454,3 +454,28 @@ HRESULT WINAPI CoCreateGuid(GUID *guid) if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; return HRESULT_FROM_WIN32(status); } + +/****************************************************************************** + * CoQueryProxyBlanket (combase.@) + */ +HRESULT WINAPI CoQueryProxyBlanket(IUnknown *proxy, DWORD *authn_service, + DWORD *authz_service, OLECHAR **servername, DWORD *authn_level, + DWORD *imp_level, void **auth_info, DWORD *capabilities) +{ + IClientSecurity *client_security; + HRESULT hr; + + TRACE("%p, %p, %p, %p, %p, %p, %p, %p.\n", proxy, authn_service, authz_service, servername, authn_level, imp_level, + auth_info, capabilities); + + hr = IUnknown_QueryInterface(proxy, &IID_IClientSecurity, (void **)&client_security); + if (SUCCEEDED(hr)) + { + hr = IClientSecurity_QueryBlanket(client_security, proxy, authn_service, authz_service, servername, + authn_level, imp_level, auth_info, capabilities); + IClientSecurity_Release(client_security); + } + + if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ddfe5c5ca2..ed6767263d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -135,7 +135,7 @@ @ stub CoPushServiceDomain @ stub CoQueryAuthenticationServices @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryClientBlanket -@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryProxyBlanket +@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub CoReactivateObject @ stub CoRegisterActivationFilter @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f96d69c198..b96edf99bf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4191,51 +4191,6 @@ HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, void *pvReserved) FIXME("(%p, %p): stub\n", pUnk, pvReserved); return S_OK; } - -/*********************************************************************** - * CoQueryProxyBlanket [OLE32.@] - * - * Retrieves the security settings being used by a proxy. - * - * PARAMS - * pProxy [I] Pointer to the proxy object. - * pAuthnSvc [O] The type of authentication service. - * pAuthzSvc [O] The type of authorization service. - * ppServerPrincName [O] Optional. The server prinicple name. - * pAuthnLevel [O] The authentication level. - * pImpLevel [O] The impersonation level. - * ppAuthInfo [O] Information specific to the authorization/authentication service. - * pCapabilities [O] Flags affecting the security behaviour. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoCopyProxy, CoSetProxyBlanket. - */ -HRESULT WINAPI CoQueryProxyBlanket(IUnknown *pProxy, DWORD *pAuthnSvc, - DWORD *pAuthzSvc, OLECHAR **ppServerPrincName, DWORD *pAuthnLevel, - DWORD *pImpLevel, void **ppAuthInfo, DWORD *pCapabilities) -{ - IClientSecurity *pCliSec; - HRESULT hr; - - TRACE("%p\n", pProxy); - - hr = IUnknown_QueryInterface(pProxy, &IID_IClientSecurity, (void **)&pCliSec); - if (SUCCEEDED(hr)) - { - hr = IClientSecurity_QueryBlanket(pCliSec, pProxy, pAuthnSvc, - pAuthzSvc, ppServerPrincName, - pAuthnLevel, pImpLevel, ppAuthInfo, - pCapabilities); - IClientSecurity_Release(pCliSec); - } - - if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr); - return hr; -} /*********************************************************************** * CoSetProxyBlanket [OLE32.@] diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 0713a989ee..c737b2e386 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -62,7 +62,7 @@ @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @ stub CoQueryAuthenticationServices @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryProxyBlanket @ stub CoQueryReleaseObject @ stdcall CoRegisterChannelHook(ptr ptr) @ stdcall CoRegisterClassObject(ptr ptr long long ptr)

1 0

Henri Verbeet : vkd3d-shader: Introduce vkd3d_shader_get_supported_target_types().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: vkd3d Branch: master Commit: c326d75c1d89792615fdde4769dc706d5657dc8c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c326d75c1d89792615fdde4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 13:41:49 2020 +0430 vkd3d-shader: Introduce vkd3d_shader_get_supported_target_types(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 36 ++++++++++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 24 +++++++++++++++-------- 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3dc3bb0..af97b04 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -751,6 +751,8 @@ struct vkd3d_shader_signature const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); +const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( + enum vkd3d_shader_source_type source_type, unsigned int *count); int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); @@ -784,6 +786,8 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature */ typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); typedef const enum vkd3d_shader_source_type *(*PFN_vkd3d_shader_get_supported_source_types)(unsigned int *count); +typedef const enum vkd3d_shader_target_type *(*PFN_vkd3d_shader_get_supported_target_types)( + enum vkd3d_shader_source_type source_type, unsigned int *count); typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 15a1403..1937131 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -10,6 +10,7 @@ global: vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_get_supported_source_types; + vkd3d_shader_get_supported_target_types; vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 7a5c405..3e7b6cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -256,6 +256,7 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) { const enum vkd3d_shader_source_type *source_types; + const enum vkd3d_shader_target_type *target_types; unsigned int count, i; if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) @@ -276,13 +277,16 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_ return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_info->target_type) + target_types = vkd3d_shader_get_supported_target_types(compile_info->source_type, &count); + for (i = 0; i < count; ++i) { - case VKD3D_SHADER_TARGET_SPIRV_BINARY: + if (target_types[i] == compile_info->target_type) break; - default: - WARN("Invalid shader target type %#x.\n", compile_info->target_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (i == count) + { + WARN("Invalid shader target type %#x.\n", compile_info->target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; } return VKD3D_OK; @@ -1056,3 +1060,25 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns *count = ARRAY_SIZE(types); return types; } + +const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( + enum vkd3d_shader_source_type source_type, unsigned int *count) +{ + static const enum vkd3d_shader_target_type dxbc_tpf_types[] = + { + VKD3D_SHADER_TARGET_SPIRV_BINARY, + }; + + TRACE("source_type %#x, count %p.\n", source_type, count); + + switch (source_type) + { + case VKD3D_SHADER_SOURCE_DXBC_TPF: + *count = ARRAY_SIZE(dxbc_tpf_types); + return dxbc_tpf_types; + + default: + *count = 0; + return NULL; + } +} diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index df2a4f2..d0f3f5d 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -76,6 +76,7 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { PFN_vkd3d_shader_get_supported_source_types pfn_vkd3d_shader_get_supported_source_types; + PFN_vkd3d_shader_get_supported_target_types pfn_vkd3d_shader_get_supported_target_types; PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; @@ -92,12 +93,13 @@ static void test_vkd3d_shader_pfns(void) unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; const enum vkd3d_shader_source_type *source_types; + const enum vkd3d_shader_target_type *target_types; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; + unsigned int i, j, source_count, target_count; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; const char *version, *p; - unsigned int i, count; bool b; int rc; @@ -124,6 +126,7 @@ static void test_vkd3d_shader_pfns(void) static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; pfn_vkd3d_shader_get_supported_source_types = vkd3d_shader_get_supported_source_types; + pfn_vkd3d_shader_get_supported_target_types = vkd3d_shader_get_supported_target_types; pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; @@ -143,20 +146,25 @@ static void test_vkd3d_shader_pfns(void) ok(major == expected_major, "Got unexpected major version %u.\n", major); ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); - source_types = pfn_vkd3d_shader_get_supported_source_types(&count); + source_types = pfn_vkd3d_shader_get_supported_source_types(&source_count); ok(source_types, "Got unexpected source types array %p.\n", source_types); - ok(count, "Got unexpected source type count %u.\n", count); + ok(source_count, "Got unexpected source type count %u.\n", source_count); b = false; - for (i = 0; i < count; ++i) + for (i = 0; i < source_count; ++i) { - if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF) + target_types = pfn_vkd3d_shader_get_supported_target_types(source_types[i], &target_count); + ok(target_types, "Got unexpected target types array %p.\n", target_types); + ok(target_count, "Got unexpected target type count %u.\n", target_count); + + for (j = 0; j < target_count; ++j) { - b = true; - break; + if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF + && target_types[j] == VKD3D_SHADER_TARGET_SPIRV_BINARY) + b = true; } } - ok(b, "The dxbc-tpf source type is not supported.\n"); + ok(b, "The dxbc-tpf source type with spirv-binary target type is not supported.\n"); rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc);

1 0

Henri Verbeet : vkd3d-shader: Introduce vkd3d_shader_get_version().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: vkd3d Branch: master Commit: 7dda2339a27321d1ff610db29f4162b0dd0e177b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7dda2339a27321d1ff610db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 13:41:45 2020 +0430 vkd3d-shader: Introduce vkd3d_shader_get_version(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 21 ++++++++++++-------- include/.gitignore | 1 + include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 19 ++++++++++++++++++ libs/vkd3d/device.c | 3 ++- tests/vkd3d_shader_api.c | 37 +++++++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 00a5f58..b172517 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = @VKD3D_CFLAGS@ -AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private +AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include/private AM_LDFLAGS = -no-undefined widl_headers = \ @@ -58,7 +58,8 @@ vkd3d_demos_headers = \ demos/demo_win32.h \ demos/demo_xcb.h -BUILT_SOURCES = $(widl_headers) +BUILT_SOURCES = $(widl_headers) \ + include/private/vkd3d_version.h noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d_common_la_SOURCES = \ @@ -109,8 +110,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_main.c \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_shaders.h \ - libs/vkd3d/vulkan_procs.h \ - libs/vkd3d_version.c + libs/vkd3d/vulkan_procs.h libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT @@ -208,10 +208,15 @@ libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in Makefile -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ -libs/vkd3d_version.c: dummy-vkd3d-version - $(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/$.*$/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) -.SILENT: libs/vkd3d_version.c -CLEANFILES += libs/vkd3d_version.c +include/private/vkd3d_version.h: dummy-vkd3d-version + @$(MKDIR_P) include/private + version=`(GIT_DIR=$(top_srcdir)/.git git rev-parse --short HEAD 2>/dev/null || echo '') \ + | $(SED) -e 's!$..*$! (git \1)!' \ + | $(SED) -n -e '$$s!$.*$!#define VKD3D_VCS_ID "\1"!p'` \ + && (echo $$version | cmp -s - $@) \ + || echo $$version >$@ || ($(RM) $@ && exit 1) +.SILENT: include/private/vkd3d_version.h +CLEANFILES += include/private/vkd3d_version.h .PHONY: dummy-vkd3d-version dummy-vkd3d-version: diff --git a/include/.gitignore b/include/.gitignore index 7ed2b78..3c711da 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,5 +1,6 @@ config.h config.h.in +private/vkd3d_version.h stamp-h1 vkd3d_d3d12.h vkd3d_d3d12sdklayers.h diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index de2c0c7..92ce9b9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -749,6 +749,8 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES +const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); + int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); void vkd3d_shader_free_messages(char *messages); @@ -779,6 +781,8 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature /* * Function pointer typedefs for vkd3d-shader functions. */ +typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); + typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); typedef void (*PFN_vkd3d_shader_free_messages)(char *messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 9c9f0a5..eca7278 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,6 +9,7 @@ global: vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; vkd3d_shader_scan; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index cfac8e2..140bdd4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -17,6 +17,7 @@ */ #include "vkd3d_shader_private.h" +#include "vkd3d_version.h" #include <stdio.h> @@ -1027,3 +1028,21 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature vkd3d_free(signature->elements); signature->elements = NULL; } + +const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) +{ + int x, y; + + TRACE("major %p, minor %p.\n", major, minor); + + if (major || minor) + { + vkd3d_parse_version(PACKAGE_VERSION, &x, &y); + if (major) + *major = x; + if (minor) + *minor = y; + } + + return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d88fde9..bef6477 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -17,6 +17,7 @@ */ #include "vkd3d_private.h" +#include "vkd3d_version.h" #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -460,7 +461,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; - TRACE("Build: %s.\n", vkd3d_build); + TRACE("Build: " PACKAGE_STRING VKD3D_VCS_ID ".\n"); if (!create_info->pfn_signal_event) { diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index e25dd20..fab17ad 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -83,15 +83,18 @@ static void test_vkd3d_shader_pfns(void) PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; + PFN_vkd3d_shader_get_version pfn_vkd3d_shader_get_version; PFN_vkd3d_shader_compile pfn_vkd3d_shader_compile; PFN_vkd3d_shader_scan pfn_vkd3d_shader_scan; struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; + unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; + const char *version, *p; int rc; static const struct vkd3d_shader_versioned_root_signature_desc empty_rs_desc = @@ -124,9 +127,17 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; + pfn_vkd3d_shader_get_version = vkd3d_shader_get_version; pfn_vkd3d_shader_compile = vkd3d_shader_compile; pfn_vkd3d_shader_scan = vkd3d_shader_scan; + sscanf(PACKAGE_VERSION, "%d.%d", &expected_major, &expected_minor); + version = pfn_vkd3d_shader_get_version(&major, &minor); + p = strstr(version, "vkd3d-shader " PACKAGE_VERSION); + ok(p == version, "Got unexpected version string \"%s\"\n", version); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL); @@ -163,10 +174,36 @@ static void test_vkd3d_shader_pfns(void) pfn_vkd3d_shader_free_scan_descriptor_info(&descriptor_info); } +static void test_version(void) +{ + unsigned int major, minor, expected_major, expected_minor; + const char *version, *p; + + sscanf(PACKAGE_VERSION, "%d.%d", &expected_major, &expected_minor); + + version = vkd3d_shader_get_version(NULL, NULL); + p = strstr(version, "vkd3d-shader " PACKAGE_VERSION); + ok(p == version, "Got unexpected version string \"%s\"\n", version); + + major = ~0u; + vkd3d_shader_get_version(&major, NULL); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + + minor = ~0u; + vkd3d_shader_get_version(NULL, &minor); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + + major = minor = ~0u; + vkd3d_shader_get_version(&major, &minor); + ok(major == expected_major, "Got unexpected major version %u.\n", major); + ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); + run_test(test_version); }

1 0

Henri Verbeet : vkd3d-shader: Introduce vkd3d_shader_get_supported_source_types().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: vkd3d Branch: master Commit: 5f4bd618eda1d98c07b5079dbe1a462003eb8493 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f4bd618eda1d98c07b5079… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 13:41:48 2020 +0430 vkd3d-shader: Introduce vkd3d_shader_get_supported_source_types(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 29 ++++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 20 ++++++++++++++++++++ 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 92ce9b9..3dc3bb0 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -750,6 +750,7 @@ struct vkd3d_shader_signature #ifndef VKD3D_SHADER_NO_PROTOTYPES const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor); +const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count); int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); @@ -782,6 +783,7 @@ void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature * Function pointer typedefs for vkd3d-shader functions. */ typedef const char *(*PFN_vkd3d_shader_get_version)(unsigned int *major, unsigned int *minor); +typedef const enum vkd3d_shader_source_type *(*PFN_vkd3d_shader_get_supported_source_types)(unsigned int *count); typedef int (*PFN_vkd3d_shader_compile)(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index eca7278..15a1403 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,6 +9,7 @@ global: vkd3d_shader_free_scan_descriptor_info; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_get_supported_source_types; vkd3d_shader_get_version; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ab08620..7a5c405 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -255,19 +255,25 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info) { + const enum vkd3d_shader_source_type *source_types; + unsigned int count, i; + if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) { WARN("Invalid structure type %#x.\n", compile_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } - switch (compile_info->source_type) + source_types = vkd3d_shader_get_supported_source_types(&count); + for (i = 0; i < count; ++i) { - case VKD3D_SHADER_SOURCE_DXBC_TPF: + if (source_types[i] == compile_info->source_type) break; - default: - WARN("Invalid shader source type %#x.\n", compile_info->source_type); - return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (i == count) + { + WARN("Invalid shader source type %#x.\n", compile_info->source_type); + return VKD3D_ERROR_INVALID_ARGUMENT; } switch (compile_info->target_type) @@ -1037,3 +1043,16 @@ const char *vkd3d_shader_get_version(unsigned int *major, unsigned int *minor) return "vkd3d-shader " PACKAGE_VERSION VKD3D_VCS_ID; } + +const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(unsigned int *count) +{ + static const enum vkd3d_shader_source_type types[] = + { + VKD3D_SHADER_SOURCE_DXBC_TPF, + }; + + TRACE("count %p.\n", count); + + *count = ARRAY_SIZE(types); + return types; +} diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index fab17ad..df2a4f2 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -75,6 +75,7 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_get_supported_source_types pfn_vkd3d_shader_get_supported_source_types; PFN_vkd3d_shader_free_scan_descriptor_info pfn_vkd3d_shader_free_scan_descriptor_info; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; @@ -90,11 +91,14 @@ static void test_vkd3d_shader_pfns(void) struct vkd3d_shader_versioned_root_signature_desc root_signature_desc; unsigned int major, minor, expected_major, expected_minor; struct vkd3d_shader_scan_descriptor_info descriptor_info; + const enum vkd3d_shader_source_type *source_types; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_signature signature; struct vkd3d_shader_code dxbc, spirv; const char *version, *p; + unsigned int i, count; + bool b; int rc; static const struct vkd3d_shader_versioned_root_signature_desc empty_rs_desc = @@ -119,6 +123,7 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_get_supported_source_types = vkd3d_shader_get_supported_source_types; pfn_vkd3d_shader_free_scan_descriptor_info = vkd3d_shader_free_scan_descriptor_info; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; @@ -138,6 +143,21 @@ static void test_vkd3d_shader_pfns(void) ok(major == expected_major, "Got unexpected major version %u.\n", major); ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); + source_types = pfn_vkd3d_shader_get_supported_source_types(&count); + ok(source_types, "Got unexpected source types array %p.\n", source_types); + ok(count, "Got unexpected source type count %u.\n", count); + + b = false; + for (i = 0; i < count; ++i) + { + if (source_types[i] == VKD3D_SHADER_SOURCE_DXBC_TPF) + { + b = true; + break; + } + } + ok(b, "The dxbc-tpf source type is not supported.\n"); + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, &dxbc, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc, NULL);

1 0

Henri Verbeet : vkd3d-shader: Use vkd3d_shader_validate_compile_info() in vkd3d_shader_scan().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: vkd3d Branch: master Commit: af73e166333bfd17aa193583f29e9985c6233a6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af73e166333bfd17aa19358… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 13:41:47 2020 +0430 vkd3d-shader: Use vkd3d_shader_validate_compile_info() in vkd3d_shader_scan(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 140bdd4..ab08620 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -839,17 +839,8 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if (messages) *messages = NULL; - if (compile_info->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO) - { - WARN("Invalid structure type %#x.\n", compile_info->type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } - - if (compile_info->source_type != VKD3D_SHADER_SOURCE_DXBC_TPF) - { - WARN("Unsupported source type %#x.\n", compile_info->source_type); - return VKD3D_ERROR_INVALID_ARGUMENT; - } + if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) + return ret; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) {

1 0

Henri Verbeet : vkd3d-compiler: Also print the vkd3d-shader version when printing the vkd3d-compiler version.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: vkd3d Branch: master Commit: 805e13d975ee396bd17faf8842d541f692a92f62 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=805e13d975ee396bd17faf8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 13:41:46 2020 +0430 vkd3d-compiler: Also print the vkd3d-shader version when printing the vkd3d-compiler version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 9b50c10..e2f9ae5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -265,7 +265,9 @@ int main(int argc, char **argv) if (options.print_version) { - fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION "\n"); + const char *version = vkd3d_shader_get_version(NULL, NULL); + + fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION " using %s\n", version); return 0; }

1 0

Brendan Shanks : ntdll: Add additional fields to generated SMBIOS chassis info table.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: 734a7120b6ca73ac4286fc8efaddf74534b7a513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=734a7120b6ca73ac4286fc8e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 5 10:44:37 2020 -0700 ntdll: Add additional fields to generated SMBIOS chassis info table. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 69532669be..56f77a0766 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -143,6 +143,11 @@ struct smbios_chassis BYTE power_supply_state; BYTE thermal_state; BYTE security_status; + DWORD oem_defined; + BYTE height; + BYTE num_power_cords; + BYTE num_contained_elements; + BYTE contained_element_rec_length; }; #include "poppack.h" @@ -1393,6 +1398,11 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON chassis->power_supply_state = 0x02; /* unknown */ chassis->thermal_state = 0x02; /* unknown */ chassis->security_status = 0x02; /* unknown */ + chassis->oem_defined = 0; + chassis->height = 0; /* undefined */ + chassis->num_power_cords = 0; /* unspecified */ + chassis->num_contained_elements = 0; + chassis->contained_element_rec_length = 3; buffer += sizeof(struct smbios_chassis); copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len);

1 0

Brendan Shanks : ntdll: Generate "system boot information" SMBIOS table.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: f7895ef25a4cb2115ffbe04d28b87bcb6ee3c0b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7895ef25a4cb2115ffbe04d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 5 10:44:38 2020 -0700 ntdll: Generate "system boot information" SMBIOS table. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 56f77a0766..3148f23df3 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -150,6 +150,13 @@ struct smbios_chassis BYTE contained_element_rec_length; }; +struct smbios_boot_info +{ + struct smbios_header hdr; + BYTE reserved[6]; + BYTE boot_status[10]; +}; + #include "poppack.h" /* Firmware table providers */ @@ -1274,6 +1281,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON struct smbios_system *system; struct smbios_board *board; struct smbios_chassis *chassis; + struct smbios_boot_info *boot_info; struct smbios_header *end_of_table; #define S(s) s, sizeof(s) @@ -1316,6 +1324,9 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + L(chassis_asset_tag_len) + 1, 2); + *required_len += sizeof(struct smbios_boot_info); + *required_len += 2; + *required_len += sizeof(struct smbios_header); *required_len += 2; #undef L @@ -1437,6 +1448,16 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; + boot_info = (struct smbios_boot_info*)buffer; + boot_info->hdr.type = 32; + boot_info->hdr.length = sizeof(struct smbios_boot_info); + boot_info->hdr.handle = handle_count++; + memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); + memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ + buffer += sizeof(struct smbios_boot_info); + *buffer++ = 0; + *buffer++ = 0; + end_of_table = (struct smbios_header*)buffer; end_of_table->type = 127; end_of_table->length = sizeof(struct smbios_header);

1 0

Brendan Shanks : ntdll: Add additional fields to generated SMBIOS baseboard info table.
by Alexandre Julliard Aug. 5, 2020

Aug. 5, 2020

Module: wine Branch: master Commit: d29c33a35c56f9a348ca8a8de01b7fe7eb4c4ef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d29c33a35c56f9a348ca8a8d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 5 10:44:36 2020 -0700 ntdll: Add additional fields to generated SMBIOS baseboard info table. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 57 ++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4e0841175e..69532669be 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -123,6 +123,12 @@ struct smbios_board BYTE product; BYTE version; BYTE serial; + BYTE asset_tag; + BYTE feature_flags; + BYTE location; + WORD chassis_handle; + BYTE board_type; + BYTE num_contained_handles; }; struct smbios_chassis @@ -1250,8 +1256,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char system_sku[128], system_family[128]; size_t system_sku_len, system_family_len; - char board_vendor[128], board_product[128], board_version[128], board_serial[128]; - size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; + char board_vendor[128], board_product[128], board_version[128], board_serial[128], board_asset_tag[128]; + size_t board_vendor_len, board_product_len, board_version_len, board_serial_len, board_asset_tag_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; char chassis_type[11] = "2"; /* unknown */ size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; @@ -1279,6 +1285,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); + board_asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); chassis_vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); @@ -1297,7 +1304,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); *required_len += sizeof(struct smbios_board); - *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + L(board_serial_len) + 1, 2); + *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + + L(board_serial_len) + L(board_asset_tag_len) + 1, 2); *required_len += sizeof(struct smbios_chassis); *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + @@ -1371,24 +1379,6 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; - string_count = 0; - board = (struct smbios_board*)buffer; - board->hdr.type = 2; - board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = handle_count++; - board->vendor = board_vendor_len ? ++string_count : 0; - board->product = board_product_len ? ++string_count : 0; - board->version = board_version_len ? ++string_count : 0; - board->serial = board_serial_len ? ++string_count : 0; - buffer += sizeof(struct smbios_board); - - copy_smbios_string(&buffer, board_vendor, board_vendor_len); - copy_smbios_string(&buffer, board_product, board_product_len); - copy_smbios_string(&buffer, board_version, board_version_len); - copy_smbios_string(&buffer, board_serial, board_serial_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - string_count = 0; chassis = (struct smbios_chassis*)buffer; chassis->hdr.type = 3; @@ -1412,6 +1402,31 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; + string_count = 0; + board = (struct smbios_board*)buffer; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = handle_count++; + board->vendor = board_vendor_len ? ++string_count : 0; + board->product = board_product_len ? ++string_count : 0; + board->version = board_version_len ? ++string_count : 0; + board->serial = board_serial_len ? ++string_count : 0; + board->asset_tag = board_asset_tag_len ? ++string_count : 0; + board->feature_flags = 0x5; /* hosting board, removable */ + board->location = 0; + board->chassis_handle = chassis->hdr.handle; + board->board_type = 0xa; /* motherboard */ + board->num_contained_handles = 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_vendor, board_vendor_len); + copy_smbios_string(&buffer, board_product, board_product_len); + copy_smbios_string(&buffer, board_version, board_version_len); + copy_smbios_string(&buffer, board_serial, board_serial_len); + copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + end_of_table = (struct smbios_header*)buffer; end_of_table->type = 127; end_of_table->length = sizeof(struct smbios_header);

1 0