March 2019 - Wine-devel - list.winehq.org

[PATCH 1/6] d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init()
by Michael Stefaniuc 21 Mar '19

21 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1379c26206..b8fb9041c2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6173,11 +6173,11 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns return new_alloc; } -static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, - const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool, - const char *skip_constants_string) +static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *data, SIZE_T data_size, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, unsigned int eflags, ID3DBlob **errors, + struct d3dx_effect_pool *pool, const char *skip_constants_string) { + struct d3dx9_base_effect *base = &effect->base_effect; DWORD tag, offset; const char *ptr = data; HRESULT hr; @@ -6192,9 +6192,9 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, #endif unsigned int i, j; - TRACE("base %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " - "effect %p, pool %p, skip_constants %s.\n", - base, data, data_size, defines, include, eflags, errors, effect, pool, + TRACE("effect %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " + "pool %p, skip_constants %s.\n", + effect, data, data_size, defines, include, eflags, errors, pool, debugstr_a(skip_constants_string)); base->effect = effect; @@ -6339,8 +6339,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev IDirect3DDevice9_AddRef(device); effect->device = device; - if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, - eflags, error_messages, effect, pool_impl, skip_constants))) + if (FAILED(hr = d3dx9_base_effect_init(effect, data, data_size, defines, include, eflags, + error_messages, pool_impl, skip_constants))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); -- 2.20.1

2 1

[PATCH 2/2] d3d12: Add support for building with Win32 Vulkan.
by Józef Kucia 21 Mar '19

21 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- One way to fix the reference counting for vulkan-1.dll is to move the loading of Vulkan and vkd3d to a single place in DXGI, and manage a single vkd3d instance per IDXGIFactory. However, it requires to pass vkd3d instance and Vulkan functions in internal IWineDXGI* interfaces, and the patches didn't turn out particulary nice. --- dlls/d3d12/d3d12_main.c | 73 +++++++++++++++++++++++++++-------------- 1 file changed, 48 insertions(+), 25 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 2c6472acb06d..8a199aadc35f 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -24,7 +24,9 @@ #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES +#ifndef USE_WIN32_VULKAN #define WINE_VK_HOST +#endif #include "wine/debug.h" #include "wine/heap.h" @@ -43,6 +45,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d12); WINE_DECLARE_DEBUG_CHANNEL(winediag); +#ifdef USE_WIN32_VULKAN + +/* FIXME: We should unload vulkan-1.dll. */ +static PFN_vkGetInstanceProcAddr load_vulkan(void) +{ + HMODULE vulkan = LoadLibraryA("vulkan-1.dll"); + return (void *)GetProcAddress(vulkan, "vkGetInstanceProcAddr"); +} + +#else + +static PFN_vkGetInstanceProcAddr load_vulkan(void) +{ + const struct vulkan_funcs *vk_funcs; + HDC hdc; + + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); + + if (vk_funcs) + return (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; + + return NULL; +} + +#endif /* USE_WIN32_VULKAN */ + HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { TRACE("iid %s, debug %p.\n", debugstr_guid(iid), debug); @@ -111,17 +141,6 @@ static HRESULT d3d12_join_thread(void *handle) return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; } -static const struct vulkan_funcs *get_vk_funcs(void) -{ - const struct vulkan_funcs *vk_funcs; - HDC hdc; - - hdc = GetDC(0); - vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); - ReleaseDC(0, hdc); - return vk_funcs; -} - static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adapter) { IDXGIAdapter *dxgi_adapter = NULL; @@ -157,20 +176,25 @@ done: return hr; } -static BOOL check_vk_instance_extension(const struct vulkan_funcs *vk_funcs, const char *name) +static BOOL check_vk_instance_extension(VkInstance vk_instance, + PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr, const char *name) { + PFN_vkEnumerateInstanceExtensionProperties pfn_vkEnumerateInstanceExtensionProperties; VkExtensionProperties *properties; BOOL ret = FALSE; unsigned int i; uint32_t count; - if (vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL) < 0) + pfn_vkEnumerateInstanceExtensionProperties + = (void *)pfn_vkGetInstanceProcAddr(vk_instance, "vkEnumerateInstanceExtensionProperties"); + + if (pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL) < 0) return FALSE; if (!(properties = heap_calloc(count, sizeof(*properties)))) return FALSE; - if (vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &count, properties) >= 0) + if (pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, properties) >= 0) { for (i = 0; i < count; ++i) { @@ -187,7 +211,7 @@ static BOOL check_vk_instance_extension(const struct vulkan_funcs *vk_funcs, con } static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *instance, - const struct vulkan_funcs *vk_funcs, const struct wine_dxgi_adapter_info *adapter_info) + PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr, const struct wine_dxgi_adapter_info *adapter_info) { PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2 = NULL; PFN_vkGetPhysicalDeviceProperties pfn_vkGetPhysicalDeviceProperties; @@ -204,11 +228,11 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst vk_instance = vkd3d_instance_get_vk_instance(instance); - pfn_vkEnumeratePhysicalDevices = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkEnumeratePhysicalDevices"); + pfn_vkEnumeratePhysicalDevices = (void *)pfn_vkGetInstanceProcAddr(vk_instance, "vkEnumeratePhysicalDevices"); - pfn_vkGetPhysicalDeviceProperties = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties"); - if (check_vk_instance_extension(vk_funcs, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) - pfn_vkGetPhysicalDeviceProperties2 = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + pfn_vkGetPhysicalDeviceProperties = (void *)pfn_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties"); + if (check_vk_instance_extension(vk_instance, pfn_vkGetInstanceProcAddr, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) + pfn_vkGetPhysicalDeviceProperties2 = (void *)pfn_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, NULL)) < 0) { @@ -279,9 +303,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe { struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; + PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr; struct vkd3d_device_create_info device_create_info; struct wine_dxgi_adapter_info adapter_info; - const struct vulkan_funcs *vk_funcs; struct vkd3d_instance *instance; IWineDXGIAdapter *wine_adapter; HRESULT hr; @@ -303,9 +327,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe TRACE("adapter %p, minimum_feature_level %#x, iid %s, device %p.\n", adapter, minimum_feature_level, debugstr_guid(iid), device); - if (!(vk_funcs = get_vk_funcs())) + if (!(pfn_vkGetInstanceProcAddr = load_vulkan())) { - ERR_(winediag)("Failed to load Wine Vulkan driver.\n"); + ERR_(winediag)("Failed to load Vulkan library.\n"); return E_FAIL; } @@ -329,8 +353,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe instance_create_info.pfn_create_thread = d3d12_create_thread; instance_create_info.pfn_join_thread = d3d12_join_thread; instance_create_info.wchar_size = sizeof(WCHAR); - instance_create_info.pfn_vkGetInstanceProcAddr - = (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; + instance_create_info.pfn_vkGetInstanceProcAddr = pfn_vkGetInstanceProcAddr; instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); @@ -345,7 +368,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe device_create_info.minimum_feature_level = minimum_feature_level; device_create_info.instance = instance; device_create_info.instance_create_info = NULL; - device_create_info.vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info); + device_create_info.vk_physical_device = d3d12_get_vk_physical_device(instance, pfn_vkGetInstanceProcAddr, &adapter_info); device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); device_create_info.parent = (IUnknown *)wine_adapter; -- 2.19.2

3 2

[PATCH 1/2] dxgi: Add support for building with Win32 Vulkan.
by Józef Kucia 21 Mar '19

21 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 102 +++++++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 4c6217e52a15..17f9a1e43d69 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -27,7 +27,9 @@ #define VKD3D_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES +#ifndef USE_WIN32_VULKAN #define WINE_VK_HOST +#endif #include "wine/library.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" @@ -858,6 +860,67 @@ cleanup: #ifdef SONAME_LIBVKD3D +#ifdef USE_WIN32_VULKAN + +static void *load_library(const char *name) +{ + return LoadLibraryA(name); +} + +static void *get_library_proc(void *handle, const char *name) +{ + return (void *)GetProcAddress(handle, name); +} + +static void close_library(void *handle) +{ + if (handle) + FreeLibrary(handle); +} + +static PFN_vkGetInstanceProcAddr load_vulkan(void **vulkan_handle) +{ + *vulkan_handle = LoadLibraryA("vulkan-1.dll"); + return (void *)GetProcAddress(*vulkan_handle, "vkGetInstanceProcAddr"); +} + +#else + +static void *load_library(const char *name) +{ + return wine_dlopen(name, RTLD_NOW, NULL, 0); +} + +static void *get_library_proc(void *handle, const char *name) +{ + return wine_dlsym(handle, name, NULL, 0); +} + +static void close_library(void *handle) +{ + if (handle) + wine_dlclose(handle, NULL, 0); +} + +static PFN_vkGetInstanceProcAddr load_vulkan(void **vulkan_handle) +{ + const struct vulkan_funcs *vk_funcs; + HDC hdc; + + *vulkan_handle = NULL; + + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); + + if (vk_funcs) + return (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; + + return NULL; +} + +#endif /* USE_WIN32_VULKAN */ + static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; static PFN_vkd3d_create_image_resource vkd3d_create_image_resource; static PFN_vkd3d_get_device_parent vkd3d_get_device_parent; @@ -908,6 +971,8 @@ struct dxgi_vk_funcs PFN_vkQueueWaitIdle p_vkQueueWaitIdle; PFN_vkResetFences p_vkResetFences; PFN_vkWaitForFences p_vkWaitForFences; + + void *vulkan_module; }; static HRESULT hresult_from_vk_result(VkResult vr) @@ -1705,6 +1770,7 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + void *vulkan_module = vk_funcs->vulkan_module; d3d12_swapchain_destroy_buffers(swapchain, TRUE); @@ -1727,6 +1793,8 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->factory) IWineDXGIFactory_Release(swapchain->factory); + + close_library(vulkan_module); } static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) @@ -2424,20 +2492,9 @@ static const struct IDXGISwapChain3Vtbl d3d12_swapchain_vtbl = d3d12_swapchain_ResizeBuffers1, }; -static const struct vulkan_funcs *get_vk_funcs(void) -{ - const struct vulkan_funcs *vk_funcs; - HDC hdc; - - hdc = GetDC(0); - vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); - ReleaseDC(0, hdc); - return vk_funcs; -} - static BOOL load_vkd3d_functions(void *vkd3d_handle) { -#define LOAD_FUNCPTR(f) if (!(f = wine_dlsym(vkd3d_handle, #f, NULL, 0))) return FALSE; +#define LOAD_FUNCPTR(f) if (!(f = get_library_proc(vkd3d_handle, #f))) return FALSE; LOAD_FUNCPTR(vkd3d_acquire_vk_queue) LOAD_FUNCPTR(vkd3d_create_image_resource) LOAD_FUNCPTR(vkd3d_get_device_parent) @@ -2461,13 +2518,13 @@ static BOOL WINAPI init_vkd3d_once(INIT_ONCE *once, void *param, void **context) { TRACE("Loading vkd3d %s.\n", SONAME_LIBVKD3D); - if (!(vkd3d_handle = wine_dlopen(SONAME_LIBVKD3D, RTLD_NOW, NULL, 0))) + if (!(vkd3d_handle = load_library(SONAME_LIBVKD3D))) return FALSE; if (!load_vkd3d_functions(vkd3d_handle)) { ERR("Failed to load vkd3d functions.\n"); - wine_dlclose(vkd3d_handle, NULL, 0); + close_library(vkd3d_handle); vkd3d_handle = NULL; return FALSE; } @@ -2484,20 +2541,24 @@ static BOOL init_vkd3d(void) static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, VkDevice vk_device) { - const struct vulkan_funcs *vk; + PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; + PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr; + + dxgi->vulkan_module = NULL; - if (!(vk = get_vk_funcs())) + if (!(vkGetInstanceProcAddr = load_vulkan(&dxgi->vulkan_module))) { - ERR_(winediag)("Failed to load Wine Vulkan driver.\n"); + ERR_(winediag)("Failed to load Vulkan.\n"); return FALSE; } - dxgi->p_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk->p_vkGetInstanceProcAddr; + vkGetDeviceProcAddr = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetDeviceProcAddr"); #define LOAD_INSTANCE_PFN(name) \ - if (!(dxgi->p_##name = vk->p_vkGetInstanceProcAddr(vk_instance, #name))) \ + if (!(dxgi->p_##name = (void *)vkGetInstanceProcAddr(vk_instance, #name))) \ { \ ERR("Failed to get instance proc "#name".\n"); \ + close_library(dxgi->vulkan_module); \ return FALSE; \ } LOAD_INSTANCE_PFN(vkCreateWin32SurfaceKHR) @@ -2511,9 +2572,10 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk #undef LOAD_INSTANCE_PFN #define LOAD_DEVICE_PFN(name) \ - if (!(dxgi->p_##name = vk->p_vkGetDeviceProcAddr(vk_device, #name))) \ + if (!(dxgi->p_##name = (void *)vkGetDeviceProcAddr(vk_device, #name))) \ { \ ERR("Failed to get device proc "#name".\n"); \ + close_library(dxgi->vulkan_module); \ return FALSE; \ } LOAD_DEVICE_PFN(vkAcquireNextImageKHR) -- 2.19.2

3 2

[PATCH v2] ntoskrnl.exe: Implement ObGetObjectType.
by Derek Lesho 21 Mar '19

21 Mar '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- v2: Add test for ObGetObjectType. dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++--- dlls/ntoskrnl.exe/tests/driver.c | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4ff4a75972..d84f1250c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2914,9 +2914,8 @@ USHORT WINAPI ObGetFilterVersion(void) */ POBJECT_TYPE WINAPI ObGetObjectType(void *object) { - FIXME("stub: %p\n", object); - - return NULL; + struct object_header *header = (struct object_header *)object - 1; + return header->type; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 73d067c2bc..faa3b763bb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -696,10 +696,12 @@ static void WINAPI thread_proc(void *arg) static void test_ob_reference(const WCHAR *test_path) { + POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; HANDLE event_handle, file_handle, file_handle2, thread_handle; FILE_OBJECT *file; void *obj1, *obj2; + POBJECT_TYPE obj1_type; UNICODE_STRING pathU; IO_STATUS_BLOCK io; WCHAR *tmp_path; @@ -708,6 +710,9 @@ static void test_ob_reference(const WCHAR *test_path) static const WCHAR tmpW[] = {'.','t','m','p',0}; + pObGetObjectType = get_proc_address("ObGetObjectType"); + ok(!!pObGetObjectType, "ObGetObjectType not found\n"); + InitializeObjectAttributes(&attr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); status = ZwCreateEvent(&event_handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE); ok(!status, "ZwCreateEvent failed: %#x\n", status); @@ -742,6 +747,9 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, NULL, KernelMode, &obj1, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + obj1_type = pObGetObjectType(obj1); + ok(obj1_type == *pExEventObjectType, "ObGetObjectType returned %p\n", obj1_type); + if (sizeof(void *) != 4) /* avoid dealing with fastcall */ { ObfReferenceObject(obj1); -- 2.20.1

2 1

[PATCH 1/3] wintrust: Update spec file.
by Gijs Vermeulen 21 Mar '19

21 Mar '19

File version: 10.0.17763.348 (Windows 10). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wintrust/wintrust.spec | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index b8c70add2c..055ba0b142 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -1,14 +1,20 @@ @ stub AddPersonalTrustDBPages @ stub CatalogCompactHashDatabase +#@ stub ComputeFirstPageHash +#@ stub ConfigCiFinalPolicy +#@ stub ConfigCiPackageFamilyNameCheck @ stdcall CryptCATAdminAcquireContext(ptr ptr long) +#@ stub CryptCATAdminAcquireContext2 @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) +#@ stub CryptCATAdminCalcHashFromFileHandle2 @ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr) @ stub CryptCATAdminPauseServiceForBackup @ stdcall CryptCATAdminReleaseCatalogContext(long long long) @ stdcall CryptCATAdminReleaseContext(long long) @ stdcall CryptCATAdminRemoveCatalog(ptr wstr long) @ stdcall CryptCATAdminResolveCatalogPath(ptr wstr ptr long) +#@ stub CryptCATAllocSortedMemberInfo @ stdcall CryptCATCDFClose(ptr) @ stub CryptCATCDFEnumAttributes @ stub CryptCATCDFEnumAttributesWithCDFTag @@ -22,6 +28,7 @@ @ stdcall CryptCATEnumerateAttr(ptr ptr ptr) @ stdcall CryptCATEnumerateCatAttr(ptr ptr) @ stdcall CryptCATEnumerateMember(long ptr) +#@ stub CryptCATFreeSortedMemberInfo @ stdcall CryptCATGetAttrInfo(ptr ptr wstr) @ stdcall CryptCATGetCatAttrInfo(ptr wstr ) @ stdcall CryptCATGetMemberInfo(ptr wstr) @@ -34,8 +41,10 @@ @ stub CryptCATStoreFromHandle @ stub CryptCATVerifyMember @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) +#@ stub CryptSIPGetCaps @ stub CryptSIPGetInfo @ stub CryptSIPGetRegWorkingFlags +#@ stub CryptSIPGetSealedDigest @ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) @ stdcall CryptSIPPutSignedDataMsg(ptr long ptr long ptr) @ stdcall CryptSIPRemoveSignedDataMsg(ptr long) @@ -48,6 +57,7 @@ @ stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) @ stdcall GenericChainCertificateTrust(ptr) @ stdcall GenericChainFinalProv(ptr) +#@ stub GetAuthenticodeSha256Hash @ stdcall HTTPSCertificateTrust(ptr) @ stdcall HTTPSFinalProv(ptr) @ stdcall IsCatalogFile(ptr wstr) @@ -56,6 +66,7 @@ @ stub OfficeCleanupPolicy @ stub OfficeInitializePolicy @ stdcall OpenPersonalTrustDBDialog(ptr) +#@ stub OpenPersonalTrustDBDialogEx @ stdcall SoftpubAuthenticode(ptr) @ stdcall SoftpubCheckCert(ptr long long long) @ stdcall SoftpubCleanup(ptr) @@ -68,29 +79,48 @@ @ stub SoftpubLoadDefUsageCallData @ stdcall SoftpubLoadMessage(ptr) @ stdcall SoftpubLoadSignature(ptr) +#@ stub SrpCheckSmartlockerEAandProcessToken @ stub TrustDecode @ stub TrustFindIssuerCertificate @ stub TrustFreeDecode @ stdcall TrustIsCertificateSelfSigned(ptr) @ stub TrustOpenStores +#@ stub WTGetBioSignatureInfo +#@ stub WTGetPluginSignatureInfo +#@ stub WTGetSignatureInfo @ stdcall WTHelperCertCheckValidSignature(ptr) @ stub WTHelperCertFindIssuerCertificate @ stub WTHelperCertIsSelfSigned @ stub WTHelperCheckCertUsage @ stub WTHelperGetAgencyInfo @ stdcall WTHelperGetFileHandle(ptr) +#@ stub WTHelperGetFileHash @ stdcall WTHelperGetFileName(ptr) @ stdcall WTHelperGetKnownUsages(long ptr) @ stdcall WTHelperGetProvCertFromChain(ptr long) @ stdcall WTHelperGetProvPrivateDataFromChain(ptr ptr) @ stdcall WTHelperGetProvSignerFromChain(ptr long long long) +#@ stub WTHelperIsChainedToMicrosoft +#@ stub WTHelperIsChainedToMicrosoftFromStateData @ stub WTHelperIsInRootStore @ stub WTHelperOpenKnownStores @ stdcall WTHelperProvDataFromStateData(ptr) +#@ stub WTIsFirstConfigCiResultPreferred +#@ stub WTLogConfigCiScriptEvent +#@ stub WTLogConfigCiSignerEvent +#@ stub WTValidateBioSignaturePolicy +#@ stub WVTAsn1CatMemberInfo2Decode +#@ stub WVTAsn1CatMemberInfo2Encode @ stdcall WVTAsn1CatMemberInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1CatNameValueDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatNameValueEncode(long str ptr ptr ptr) +#@ stub WVTAsn1IntentToSealAttributeDecode +#@ stub WVTAsn1IntentToSealAttributeEncode +#@ stub WVTAsn1SealingSignatureAttributeDecode +#@ stub WVTAsn1SealingSignatureAttributeEncode +#@ stub WVTAsn1SealingTimestampAttributeDecode +#@ stub WVTAsn1SealingTimestampAttributeEncode @ stdcall WVTAsn1SpcFinancialCriteriaInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1SpcFinancialCriteriaInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1SpcIndirectDataContentDecode(long str ptr long long ptr ptr) @@ -118,6 +148,7 @@ @ stdcall WintrustGetRegPolicyFlags(ptr) @ stdcall WintrustLoadFunctionPointers(ptr ptr) @ stdcall WintrustRemoveActionID(ptr) +#@ stub WintrustSetDefaultIncludePEPageHashes @ stdcall WintrustSetRegPolicyFlags(long) @ stdcall mscat32DllRegisterServer() @ stdcall mscat32DllUnregisterServer() -- 2.21.0

1 2

[PATCH] ntoskrnl.exe: Add IoWMIOpenBlock stub.
by Derek Lesho 21 Mar '19

21 Mar '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d84f1250c5..bdbeafdf0f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3188,6 +3188,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti return STATUS_SUCCESS; } +/***************************************************** + * IoWMIOpenBlock (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_block_obj) +{ + FIXME("(%p %u %p) stub\n", guid, desired_access, data_block_obj); + return STATUS_NOT_IMPLEMENTED; +} + /***************************************************** * PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index da16bc2e2a..43f47470a9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -490,7 +490,7 @@ @ stub IoWMIDeviceObjectToInstanceName @ stub IoWMIExecuteMethod @ stub IoWMIHandleToInstanceName -@ stub IoWMIOpenBlock +@ stdcall IoWMIOpenBlock(ptr long ptr) @ stub IoWMIQueryAllData @ stub IoWMIQueryAllDataMultiple @ stub IoWMIQuerySingleInstance -- 2.20.1

1 0

[PATCH] ntoskrnl.exe: Implement ObGetObjectType.
by Derek Lesho 21 Mar '19

21 Mar '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4ff4a75972..d84f1250c5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2914,9 +2914,8 @@ USHORT WINAPI ObGetFilterVersion(void) */ POBJECT_TYPE WINAPI ObGetObjectType(void *object) { - FIXME("stub: %p\n", object); - - return NULL; + struct object_header *header = (struct object_header *)object - 1; + return header->type; } /*********************************************************************** -- 2.20.1

2 1

[PATCH] appwiz.cpl: Search /opt/wine for addons.
by Vincent Povirk 21 Mar '19

21 Mar '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 225f9158ed8..b0703073ddb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -330,6 +330,8 @@ static enum install_res install_from_default_dir(void) ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); + if (ret == INSTALL_NEXT) + ret = install_from_unix_file("/opt/wine/", addon->subdir_name, addon->file_name); return ret; } @@ -794,6 +796,7 @@ BOOL install_addon(addon_t addon_type) * - $datadir/$addon_subdir/ * - $INSTALL_DATADIR/wine/$addon_subdir/ * - /usr/share/wine/$addon_subdir/ + * - /opt/wine/$addon_subdir/ * - download from URL stored in $url_config_key value of HKCU/Software/Wine/$config_key key */ if (install_from_registered_dir() == INSTALL_NEXT -- 2.17.1

1 0

[PATCH v2] ntoskrnl.exe: Add emulation of rdmsr for MSR_LSTAR control register.
by Derek Lesho 21 Mar '19

21 Mar '19

v2: Added definition for MSR_LSTAR instead of hard-coding it in. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/instr.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 67cdd327ee..2e5b95cbe6 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -473,6 +473,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define REX_R 4 #define REX_W 8 +#define MSR_LSTAR 0xc0000082 + #define REGMODRM_MOD( regmodrm, rex ) ((regmodrm) >> 6) #define REGMODRM_REG( regmodrm, rex ) (((regmodrm) >> 3) & 7) | (((rex) & REX_R) ? 8 : 0) #define REGMODRM_RM( regmodrm, rex ) (((regmodrm) & 7) | (((rex) & REX_B) ? 8 : 0)) @@ -586,6 +588,12 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, } +static void fake_syscall_function(void) +{ + TRACE("() stub\n"); +} + + /*********************************************************************** * emulate_instruction * @@ -757,6 +765,25 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Rip += prefixlen + 3; return ExceptionContinueExecution; } + case 0x32: /* rdmsr */ + { + int reg = context->Rcx & 0xffffffff; + TRACE("rdmsr CR 0x%08x\n", reg); + switch (reg) + { + case MSR_LSTAR: + { + ULONGLONG syscall_address = (ULONGLONG) fake_syscall_function; + + context->Rdx = (syscall_address >> 32) & 0xffffffff; + context->Rax = syscall_address & 0xffffffff; + } + break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 2; + return ExceptionContinueExecution; + } case 0xb6: /* movzx Eb, Gv */ case 0xb7: /* movzx Ew, Gv */ { -- 2.20.1

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 21 Mar '19

21 Mar '19

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 258 +++++++++++++++---------------------------------------- 1 file changed, 71 insertions(+), 187 deletions(-) diff --git a/po/fi.po b/po/fi.po index cf1930f345..365e4b614c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6806,403 +6806,287 @@ msgstr "Lähetä postia" #: mferror.mc:249 mferror.mc:256 msgid "Begin request has already been made.\n" -msgstr "" +msgstr "Aloituspyyntö on jo tehty.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "Asennusalustaa ei tueta.\n" +msgstr "Media Foundation platform -kirjastoa ei ole alustettu.\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Tavumäärä on liian pieni.\n" +msgstr "Puskuri on liian pieni.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Kyselyn syntaksi ei kelpaa.\n" +msgstr "Pyyntö ei kelpaa.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Segmentin numero ei kelpaa.\n" +msgstr "Virran numero ei kelpaa.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "Tietotyyppi ei kelpaa.\n" +msgstr "Mediatyyppi ei kelpaa.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "Ei enempää merkintöjä.\n" +msgstr "Enempää syötettä ei hyväksytä.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "Objektin UUID:tä ei löydy.\n" +msgstr "Objektia ei ole alustettu.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "Tehtävää ei tueta.\n" +msgstr "Esitystapaa ei tueta.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Ehdotettujen mediatyyppien listalla ei ole enempää tyyppejä.\n" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Palvelua ei tueta.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Odottamaton verkkovirhe.\n" +msgstr "Odottamaton virhe.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Aika ei kelpaa.\n" +msgstr "Tyyppi ei kelpaa.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Pikselimuoto ei kelpaa.\n" +msgstr "Tiedostomuoto ei kelpaa.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Aika ei kelpaa.\n" +msgstr "Aikaleima ei kelpaa.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Skeemaa ei tueta.\n" #: mferror.mc:151 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported bytestream type.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Tavuvirran tyyppiä ei tueta.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Ajan muotoa ei tueta.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" -msgstr "" +msgstr "Näytteelle ei ole asetettu aikaleimaa.\n" #: mferror.mc:172 msgid "No duration set for the sample.\n" -msgstr "" +msgstr "Näytteelle ei ole asetettu kestoa.\n" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Data ei kelpaa.\n" +msgstr "Virran data ei kelpaa.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "Ohjetta ei saatavilla." +msgstr "Reaaliaikaisuus ei ole käytettävissä.\n" #: mferror.mc:193 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported rate.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Nopeutta ei tueta.\n" #: mferror.mc:200 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported thinning.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Ohennusta ei tueta.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "Pyyntöä ei tueta.\n" +msgstr "Kääntämistä ei tueta.\n" #: mferror.mc:214 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported rate transition.\n" -msgstr "Valtuutuksen tasoa ei tueta.\n" +msgstr "Nopeuden vaihtoa ei tueta.\n" #: mferror.mc:221 msgid "Rate change was preempted.\n" -msgstr "" +msgstr "Nopeuden vaihto sivuutettiin.\n" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "Objektin UUID:tä ei löydy.\n" +msgstr "Objektia tai arvoa ei löydy.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Ohjetta ei saatavilla." +msgstr "Arvo ei saatavilla.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "Ohjetta ei saatavilla." +msgstr "Kello ei saatavilla.\n" #: mferror.mc:263 -#, fuzzy -#| msgid "Extended attributes not supported.\n" msgid "Multiple subscribers are not supported.\n" -msgstr "Lisämääritteitä ei tueta.\n" +msgstr "Useaa listautujaa ei tueta.\n" #: mferror.mc:270 -#, fuzzy -#| msgid "The driver was not enabled." msgid "The timer was orphaned.\n" -msgstr "Ajuri ei ollut käytössä." +msgstr "Ajastin jäi orvoksi.\n" #: mferror.mc:277 -#, fuzzy -#| msgid "Character translation table open failed.\n" msgid "State transition is pending.\n" -msgstr "Merkistönmuunnostaulua ei saatu avattua.\n" +msgstr "Tilan muutos odottaa.\n" #: mferror.mc:284 -#, fuzzy -#| msgid "Unsupported authorization level.\n" msgid "Unsupported state transition.\n" -msgstr "Valtuutuksen tasoa ei tueta.\n" +msgstr "Tilan muutosta ei tueta.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "On tapahtunut sisäinen virhe.\n" +msgstr "On tapahtunut peruuttamaton virhe.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" -msgstr "" +msgstr "Näytteellä on liian monta puskuria.\n" #: mferror.mc:305 -#, fuzzy -#| msgid "Temporary directory not writable.\n" msgid "Sample is not writable.\n" -msgstr "Väliaikaishakemistoon ei voida kirjoittaa.\n" +msgstr "Näyte ei ole kirjoitettava.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Polku on viallinen.\n" +msgstr "Avain on viallinen.\n" #: mferror.mc:319 -#, fuzzy -#| msgid "Wrong stub version.\n" msgid "Bad startup version.\n" -msgstr "Väärä tyngän versio.\n" +msgstr "Käynnistysversio ei kelpaa.\n" #: mferror.mc:326 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported caption.\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Tekstiä ei tueta.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Työasema ei kelpaa.\n" +msgstr "Paikka ei kelpaa.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Tiedostoa ei löydy.\n" +msgstr "Attribuuttia ei löydy.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "Koukun tyyppi ei ole sallittu.\n" +msgstr "Ominaisuuden tyyppi ei ole sallittu.\n" #: mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "Tehtävää ei tueta.\n" +msgstr "Ominaisuuden tyyppiä ei tueta.\n" #: mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "Hakemisto ei ole tyhjä.\n" +msgstr "Ominaisuus on tyhjä.\n" #: mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "Hakemisto ei ole tyhjä.\n" +msgstr "Ominaisuus ei ole tyhjä.\n" #: mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "Koukun tyyppi ei ole sallittu.\n" +msgstr "Vektoriominaisuus ei ole sallittu.\n" #: mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "Vektoriominaisuus vaaditaan.\n" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Käyttäjän keskeyttämä.\n" +msgstr "Toimenpide keskeytettiin.\n" #: mferror.mc:396 -#, fuzzy -#| msgid "Server not disabled.\n" msgid "Bytestream is not seekable.\n" -msgstr "Palvelin käytössä.\n" +msgstr "Tavuvirta ei ole haettava.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Alusta ei ole käytettävissä turvatilassa.\n" #: mferror.mc:410 -#, fuzzy -#| msgid "Cannot create service thread.\n" msgid "Cannot parse bytestream.\n" -msgstr "Ei voida luoda palvelusäiettä.\n" +msgstr "Tavuvirtaa ei voida jäsentää.\n" #: mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "" +msgstr "Lähteen jäsentäjälle on annettu toisensa poissulkevia valitsimia.\n" #: mferror.mc:424 -#, fuzzy -#| msgid "Unknown interface.\n" msgid "Unknown bytestream length.\n" -msgstr "Tuntematon rajapinta.\n" +msgstr "Tavuvirran pituutta ei tiedetä.\n" #: mferror.mc:431 -#, fuzzy -#| msgid "Invalid index.\n" msgid "Invalid work queue index.\n" -msgstr "Indeksi ei kelpaa.\n" +msgstr "Työjonon indeksi ei kelpaa.\n" #: mferror.mc:438 -#, fuzzy -#| msgid "No logon servers available.\n" msgid "No events available.\n" -msgstr "Ei kirjautumispalvelimia saatavilla.\n" +msgstr "Tapahtumia ei ole saatavilla.\n" #: mferror.mc:445 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown() kutsuttu.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Connection invalid.\n" msgid "Optional node is invalid.\n" -msgstr "Yhteys viallinen.\n" +msgstr "Valinnainen solmu ei kelpaa.\n" #: mferror.mc:459 -#, fuzzy -#| msgid "Cannot find the printer." msgid "Cannot find decryptor.\n" -msgstr "Tulostinta ei löydy." +msgstr "Salaukselle ei löydy purkajaa.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Moduulia ei löydy.\n" +msgstr "Koodekkia ei löydy.\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Cannot get call handle.\n" msgid "Cannot connect topology nodes.\n" -msgstr "Kutsun kahvaa ei saada.\n" +msgstr "Topologian solmuja ei voida yhdistää.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Topology request is not supported.\n" -msgstr "Pyyntöä ei tueta.\n" +msgstr "Topologiapyyntöä ei tueta.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Invalid group attributes.\n" msgid "Invalid topology time attributes.\n" -msgstr "Ryhmäominaisuudet eivät kelpaa.\n" +msgstr "Topologian aika-attribuutit eivät kelpaa.\n" #: mferror.mc:494 msgid "Found loops in topology.\n" -msgstr "" +msgstr "Topologiassa on silmukoita.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Installation source is missing.\n" msgid "Presentation descriptor is missing.\n" -msgstr "Asennuksen lähde puuttuu.\n" +msgstr "Esitystavan kuvaus puuttuu.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Stream descriptor is missing.\n" -msgstr "Hakemisto puuttuu.\n" +msgstr "Virran kuvaus puuttuu.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "The device is not connected.\n" msgid "Stream descriptor is not selected.\n" -msgstr "Laite ei ole yhdistetty.\n" +msgstr "Virran kuvausta ei ole valittu.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "Index is missing.\n" msgid "Source is missing.\n" -msgstr "Hakemisto puuttuu.\n" +msgstr "Lähde puuttuu.\n" #: mferror.mc:529 msgid "Topology loader does not support sink activates.\n" -msgstr "" +msgstr "Topologianlatain ei tue ulostulojen aktivointeja.\n" #: mferror.mc:536 msgid "Clock has no time source set.\n" -msgstr "" +msgstr "Kellolle ei ole asetettu ajan lähdettä.\n" #: mferror.mc:543 -#, fuzzy -#| msgid "Class already exists.\n" msgid "Clock state was already set.\n" -msgstr "Luokka on jo käytössä.\n" +msgstr "Kellon tila oli jo asetettu.\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" -- 2.21.0

1 0