July 2019 - Wine-Devel - list.winehq.org

Re: [PATCH 3/4] mscoree: Fix the signature for StrongNameSignatureVerification[Ex]().

by Vincent Povirk (they/them)

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

July 12, 2019

Re: [PATCH 4/4] mscoree: Fake success from StrongNameSignatureVerificationEx().

by Vincent Povirk (they/them)

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

July 12, 2019

Re: [PATCH 1/4] mscorwks: New DLL.

by Vincent Povirk (they/them)

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

July 12, 2019

[PATCH] d3dcompiler: Parse type name strings.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 16 ++++++++++++++++ dlls/d3dcompiler_43/tests/reflection.c | 12 +++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e492011c55f..050ddc47829 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -51,6 +51,7 @@ struct d3dcompiler_shader_reflection_type D3D11_SHADER_TYPE_DESC desc; struct d3dcompiler_shader_reflection_type_member *members; + char *name_string; }; struct d3dcompiler_shader_reflection_type_member @@ -222,6 +223,7 @@ static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *ent HeapFree(GetProcessHeap(), 0, t->members); } + heap_free(t->name_string); HeapFree(GetProcessHeap(), 0, t); } @@ -1244,6 +1246,20 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type } } + if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) + { + read_dword(&ptr, &offset); + if (!(type->name_string = heap_alloc(strlen(data + offset) + 1))) + { + ERR("Failed to allocate name memory.\n"); + heap_free(members); + return E_OUTOFMEMORY; + } + strcpy(type->name_string, data + offset); + desc->Name = type->name_string; + TRACE("Name %s\n", debugstr_a(type->name_string)); + } + type->members = members; return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 2c1c9028bbb..1b9d2d418d9 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1207,11 +1207,11 @@ static const struct { static const D3D11_SHADER_TYPE_DESC test_reflection_constant_buffer_type_result[] = { - {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0}, - {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0}, - {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0}, + {D3D11_SVC_INTERFACE_POINTER, D3D11_SVT_INTERFACE_POINTER, 1, 4, 0, 1, 0, "iTest"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 2, 1, 0, "float"}, + {D3D_SVC_SCALAR, D3D_SVT_INT, 1, 1, 0, 1, 0, "int"}, + {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 2, 0, 1, 0, "s"}, }; static void test_reflection_constant_buffer(void) @@ -1459,6 +1459,8 @@ static void test_reflection_constant_buffer(void) i, tdesc.Elements, ptdesc->Elements); ok(tdesc.Offset == ptdesc->Offset, "GetDesc(%u) Offset failed, got %u, expected %u\n", i, tdesc.Offset, ptdesc->Offset); + ok(!strcmp(tdesc.Name, ptdesc->Name), "GetDesc(%u) Name failed, got %s, expected %s\n", + i, tdesc.Name, ptdesc->Name); } /* types */ -- 2.20.1

July 12, 2019

Re: how to change Wine operating system emulation with no need to use winecfg

by Austin English

On Wed, Jul 10, 2019 at 3:41 AM Mgr. Janusz Chmiel <janusz.chmiel(a)volny.cz> wrote: > Because Winecfg run by using Wine, it is impossible to work with it > without OCR function, because screen reader compatible with Wine do not > exist. So please, which registry keys or other values should I change to > set Wine emulation to Windows XP from default Windows 7? > I need to test some screen readers which work differently in XP mode > than in Windows 7 mode. > Including Windows light translingual. it is written in C++ with not many > depednecies. > So I need to try it. > NVDA will never work, because it depend on many Microsoft visual C > redistributable and on their registry values. And on UI automation when > Windows is Vista or newer. > Sure, NVDA can also work differently when operating system is Windows > XP. But also in those cases, there are issues with missing oleacc.dll > MSAA specific functions. > This is really question for the forums, not the development list. In any case, you can either use winetricks (winetricks win7) or duplicate the registry logic it has. Unfortunately winecfg doesn't support command line arguments for that, see https://bugs.winehq.org/show_bug.cgi?id=41559 -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

July 11, 2019

[PATCH v2] winex11.drv: Support child window rendering for Vulkan via XComposite

by Felix Hädicke

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277 Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> --- Changes in v2: - add missing XUniqueContext() initialisation for vulkan_swapchain_surface_context dlls/winex11.drv/vulkan.c | 60 +++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 28ae1a9e0e..a482109408 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -33,6 +33,7 @@ #include "wine/heap.h" #include "wine/library.h" #include "x11drv.h" +#include "xcomposite.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST @@ -55,6 +56,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static XContext vulkan_hwnd_context; +static XContext vulkan_swapchain_surface_context; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 @@ -62,6 +64,7 @@ struct wine_vk_surface { LONG ref; Window window; + HDC child_window_dc; VkSurfaceKHR surface; /* native surface */ }; @@ -135,6 +138,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) #undef LOAD_OPTIONAL_FUNCPTR vulkan_hwnd_context = XUniqueContext(); + vulkan_swapchain_surface_context = XUniqueContext(); return TRUE; @@ -252,16 +256,24 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain) { + VkResult res; VkSwapchainCreateInfoKHR create_info_host; + struct wine_vk_surface *x11_surface = surface_from_handle(create_info->surface); + TRACE("%p %p %p %p\n", device, create_info, allocator, swapchain); if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); create_info_host = *create_info; - create_info_host.surface = surface_from_handle(create_info->surface)->surface; + create_info_host.surface = x11_surface->surface; - return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); + res = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); + if (res == VK_SUCCESS) + { + XSaveContext(gdi_display, (XID)(*swapchain), vulkan_swapchain_surface_context, (char *)x11_surface); + } + return res; } static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, @@ -277,13 +289,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - /* TODO: support child window rendering. */ - if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow()) - { - FIXME("Application requires child window rendering, which is not implemented yet!\n"); - return VK_ERROR_INCOMPATIBLE_DRIVER; - } - x11_surface = heap_alloc_zero(sizeof(*x11_surface)); if (!x11_surface) return VK_ERROR_OUT_OF_HOST_MEMORY; @@ -300,6 +305,27 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + /* child window rendering. */ + if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow()) + { +#ifdef SONAME_LIBXCOMPOSITE + if (usexcomposite) + { + pXCompositeRedirectWindow(gdi_display, x11_surface->window, CompositeRedirectManual); + x11_surface->child_window_dc = GetDC(create_info->hwnd); + } +#else + if (0) + { + } +#endif + else + { + FIXME("Child window rendering is not supported without X Composite Extension!\n"); + return VK_ERROR_INCOMPATIBLE_DRIVER; + } + } + create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ @@ -369,6 +395,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha FIXME("Support for allocation callbacks not implemented yet\n"); pvkDestroySwapchainKHR(device, swapchain, NULL /* allocator */); + XDeleteContext(gdi_display, (XID)swapchain, vulkan_swapchain_surface_context); } static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -541,6 +568,21 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * } } + for (uint32_t i = 0 ; i < present_info->swapchainCount; ++i) + { + struct wine_vk_surface *x11_surface; + if (!XFindContext(gdi_display, (XID)present_info->pSwapchains[i], + vulkan_swapchain_surface_context, (char **)&x11_surface) && + x11_surface->child_window_dc) + { + struct x11drv_escape_flush_gl_drawable escape; + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = x11_surface->window; + escape.flush = TRUE; + ExtEscape(x11_surface->child_window_dc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL); + } + } + return res; } -- 2.22.0

July 11, 2019

[PATCH 4/4] mscoree: Fake success from StrongNameSignatureVerificationEx().

by Zebediah Figura

Game Maker Studio 2 Desktop needs this to launch. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mscoree/mscoree_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6afeafe8f0e..af0321a7609 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -558,7 +558,8 @@ BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified) { FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); - return FALSE; + *pVerified = TRUE; + return TRUE; } HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppv) -- 2.20.1

July 11, 2019

[PATCH 3/4] mscoree: Fix the signature for StrongNameSignatureVerification[Ex]().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mscoree/mscoree_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 15bbc235207..6afeafe8f0e 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "ocidl.h" #include "shellapi.h" +#include "strongname.h" #include "initguid.h" #include "msxml2.h" @@ -548,13 +549,13 @@ STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) return ret; } -BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) +BOOLEAN WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD *pOutFlags) { FIXME("(%s, 0x%X, %p): stub\n", debugstr_w(filename), inFlags, pOutFlags); return FALSE; } -BOOL WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOL forceVerification, BOOL* pVerified) +BOOLEAN WINAPI StrongNameSignatureVerificationEx(LPCWSTR filename, BOOLEAN forceVerification, BOOLEAN *pVerified) { FIXME("(%s, %u, %p): stub\n", debugstr_w(filename), forceVerification, pVerified); return FALSE; -- 2.20.1

July 11, 2019

[PATCH 2/4] include: Add strongname.h.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/strongname.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 include/strongname.h diff --git a/include/strongname.h b/include/strongname.h new file mode 100644 index 00000000000..f05861ad28d --- /dev/null +++ b/include/strongname.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2019 Zebediah Figura 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 + */ + +#ifndef __STRONG_NAME_H +#define __STRONG_NAME_H + +#include <windows.h> +#include <wincrypt.h> +#include <ole2.h> +#include <corerror.h> + +#define SN_INFLAG_FORCE_VER 0x00000001 +#define SN_INFLAG_INSTALL 0x00000002 +#define SN_INFLAG_ADMIN_ACCESS 0x00000004 +#define SN_INFLAG_USER_ACCESS 0x00000008 +#define SN_INFLAG_ALL_ACCESS 0x00000010 +#define SN_INFLAG_RUNTIME 0x80000000 + +#define SN_OUTFLAG_WAS_VERIFIED 0x00000001 + +BOOLEAN __stdcall StrongNameSignatureVerification(const WCHAR *path, DWORD flags, DWORD *ret_flags); +BOOLEAN __stdcall StrongNameSignatureVerificationEx(const WCHAR *path, BOOLEAN force, BOOLEAN *verified); + +#endif -- 2.20.1

July 11, 2019

[PATCH 1/4] mscorwks: New DLL.

by Zebediah Figura

Game Maker Studio 2 Desktop needs this to launch. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mscorwks/Makefile.in | 1 + dlls/mscorwks/mscorwks.spec | 110 ++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + tools/make_specfiles | 4 ++ 4 files changed, 117 insertions(+) create mode 100644 dlls/mscorwks/Makefile.in create mode 100644 dlls/mscorwks/mscorwks.spec diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in new file mode 100644 index 00000000000..4527266171c --- /dev/null +++ b/dlls/mscorwks/Makefile.in @@ -0,0 +1 @@ +MODULE = mscorwks.dll diff --git a/dlls/mscorwks/mscorwks.spec b/dlls/mscorwks/mscorwks.spec new file mode 100644 index 00000000000..617cde3173d --- /dev/null +++ b/dlls/mscorwks/mscorwks.spec @@ -0,0 +1,110 @@ +@ stdcall LoadStringRC(long ptr long long) mscoree.LoadStringRC +@ stub ReOpenMetaDataWithMemory +@ stub CorDllMainForThunk +@ stub CreateActContextInternal +@ stub CreateCMSFromXmlInternal +@ stub GetAddrOfContractShutoffFlag +@ stub GetCLRFunction +@ stub GetUserStateManagerInternal +@ stub GetUserStoreInternal +@ stub ParseManifestInternal +@ stub _AxlGetIssuerPublicKeyHash +@ stub _AxlPublicKeyBlobToPublicKeyToken +@ stub _AxlRSAKeyValueToPublicKeyToken +@ stub CertCreateAuthenticodeLicense +@ stub CertFreeAuthenticodeSignerInfo +@ stub CertFreeAuthenticodeTimestamperInfo +@ stub CertTimestampAuthenticodeLicense +@ stub CertVerifyAuthenticodeLicense +@ stub ClearDownloadCache +@ stdcall ClrCreateManagedInstance(wstr ptr ptr) mscoree.ClrCreateManagedInstance +@ stdcall CoEEShutDownCOM() mscoree.CoEEShutDownCOM +@ stdcall CoInitializeCor(long) mscoree.CoInitializeCor +@ stub CoInitializeEE +@ stub CoUninitializeCor +@ stub CoUninitializeEE +@ stub CompareAssemblyIdentity +@ stub CopyPDBs +@ stdcall CorExitProcess(long) mscoree.CorExitProcess +@ stub CorLaunchApplication +@ stub CorMarkThreadInThreadPool +@ stub CreateActContext +@ stub CreateApplicationContext +@ stub CreateAssemblyCache +@ stub CreateAssemblyEnum +@ stub CreateAssemblyNameObject +@ stub CreateCMSFromXml +@ stub CreateHistoryReader +@ stub CreateInstallReferenceEnum +@ stub DeleteShadowCache +@ stub DllCanUnloadNowInternal +@ stub DllGetClassObjectInternal +@ stub DllRegisterServerInternal +@ stub DllUnregisterServerInternal +@ stub EEDllRegisterServer +@ stub EEDllUnregisterServer +@ stub GetAppIdAuthority +@ stub GetAssemblyIdentityFromFile +@ stdcall GetAssemblyMDImport(wstr ptr ptr) mscoree.GetAssemblyMDImport +@ stub GetCLRIdentityManager +@ stub GetCachePath +@ stub GetHashFromAssemblyFile +@ stub GetHashFromAssemblyFileW +@ stub GetHashFromBlob +@ stub GetHashFromFile +@ stub GetHashFromFileW +@ stub GetHashFromHandle +@ stub GetHistoryFileDirectory +@ stub GetIdentityAuthority +@ stub GetMetaDataInternalInterface +@ stub GetMetaDataInternalInterfaceFromPublic +@ stub GetMetaDataPublicInterfaceFromInternal +@ stub GetPermissionRequests +@ stub GetPrivateContextsPerfCounters +@ stub GetUserStateManager +@ stub GetUserStore +@ stub IEE +@ stub InitializeFusion +@ stub InstallCustomAssembly +@ stub InstallCustomModule +@ stub LegacyNGenCompile +@ stub LegacyNGenCreateZapper +@ stub LegacyNGenFreeZapper +@ stub LegacyNGenTryEnumerateFusionCache +@ stdcall LoadStringRCEx(long long ptr long long ptr) mscoree.LoadStringRCEx +@ stub LogHelp_LogAssert +@ stub LogHelp_NoGuiOnAssert +@ stub LogHelp_TerminateOnAssert +@ stub LookupHistoryAssembly +@ stub MetaDataGetDispenser +@ stub NGenCreateNGenWorker +@ stub NukeDownloadedCache +@ stub ParseManifest +@ stub PostErrorVA +@ stub PreBindAssembly +@ stub PreBindAssemblyEx +@ stub ReOpenMetaDataWithMemoryEx +@ stub StrongNameCompareAssemblies +@ stub StrongNameErrorInfo +@ stub StrongNameFreeBuffer +@ stub StrongNameGetBlob +@ stub StrongNameGetBlobFromImage +@ stub StrongNameGetPublicKey +@ stub StrongNameHashSize +@ stub StrongNameKeyDelete +@ stub StrongNameKeyGen +@ stub StrongNameKeyGenEx +@ stub StrongNameKeyInstall +@ stub StrongNameSignatureGeneration +@ stub StrongNameSignatureGenerationEx +@ stub StrongNameSignatureSize +@ stdcall StrongNameSignatureVerification(wstr long ptr) mscoree.StrongNameSignatureVerification +@ stdcall StrongNameSignatureVerificationEx(wstr long ptr) mscoree.StrongNameSignatureVerificationEx +@ stub StrongNameSignatureVerificationFromImage +@ stub StrongNameTokenFromAssembly +@ stub StrongNameTokenFromAssemblyEx +@ stub StrongNameTokenFromPublicKey +@ stub TranslateSecurityAttributes +@ stdcall _CorDllMain(long long ptr) mscoree._CorDllMain +@ stdcall _CorExeMain2(ptr long ptr ptr ptr) mscoree._CorExeMain2 +@ stdcall _CorExeMain() mscoree._CorExeMain diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c3d3b770b5c..2ac524afdb6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- 11,,servicemodelreg.exe,- @@ -2603,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- 11,,servicemodelreg.exe,- diff --git a/tools/make_specfiles b/tools/make_specfiles index 64c25d12593..5c30ce50038 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -483,6 +483,10 @@ my @dll_groups = "ntoskrnl.exe", "hal", ], + [ + "mscoree", + "mscorwks", + ], ); my $update_flags = 0; -- 2.20.1

July 11, 2019