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

Józef Kucia : dxgi: Improve d3d11_swapchain_GetContainingOutput() implementation.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 5a676c2ff5b8dd9d47f03fd5a058f3b6579a3dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a676c2ff5b8dd9d47f03fd5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 11:28:56 2019 +0100 dxgi: Improve d3d11_swapchain_GetContainingOutput() implementation. Use MonitorFromWindow() to find the containing IDXGIOutput. This matches our DXGI tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 68 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 849b94a..5e66a5f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -110,6 +110,46 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } +static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +{ + DXGI_OUTPUT_DESC desc; + IDXGIOutput *output; + unsigned int index; + HMONITOR monitor; + HRESULT hr; + + if (!(monitor = MonitorFromWindow(window, MONITOR_DEFAULTTONEAREST))) + { + WARN("Failed to get monitor from window.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + index = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + { + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Failed to get output desc %u, hr %#x.\n", index, hr); + ++index; + continue; + } + + if (desc.Monitor == monitor) + { + *dxgi_output = output; + return S_OK; + } + + IDXGIOutput_Release(output); + ++index; + } + if (hr != DXGI_ERROR_NOT_FOUND) + WARN("Failed to enumerate outputs, hr %#x.\n", hr); + + WARN("Output could not be found.\n"); + return DXGI_ERROR_NOT_FOUND; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -450,6 +490,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; @@ -462,25 +503,26 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (FAILED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) - return hr; - - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); - if (FAILED(hr)) + if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) { - WARN("GetAdapter failed, hr %#x.\n", hr); - return hr; + hr = IDXGIDevice_GetAdapter(device, &adapter); + IDXGIDevice_Release(device); } - if (SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, 1, output))) + if (SUCCEEDED(hr)) + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + + hr = dxgi_get_output_from_window(adapter, swapchain_desc.device_window, output); + IDXGIAdapter_Release(adapter); + } + else { - FIXME("Adapter has got multiple outputs, returning the first one.\n"); - IDXGIOutput_Release(*output); + WARN("Failed to get adapter, hr %#x.\n", hr); } - hr = IDXGIAdapter_EnumOutputs(adapter, 0, output); - IDXGIAdapter_Release(adapter); return hr; }

1 0

Józef Kucia : dxgi: Implement d3d12_swapchain_GetContainingOutput().
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: f0f16e255e46f579945ef0b72f4076657ddd305c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f16e255e46f579945ef0b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 11:28:57 2019 +0100 dxgi: Implement d3d12_swapchain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5e66a5f..1998e48 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -852,6 +852,7 @@ cleanup: 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; static PFN_vkd3d_get_vk_device vkd3d_get_vk_device; static PFN_vkd3d_get_vk_format vkd3d_get_vk_format; static PFN_vkd3d_get_vk_physical_device vkd3d_get_vk_physical_device; @@ -1936,9 +1937,26 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *i static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapChain3 *iface, IDXGIOutput **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + IUnknown *device_parent; + IDXGIAdapter *adapter; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, output %p.\n", iface, output); + + device_parent = vkd3d_get_device_parent(swapchain->device); + + if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) + { + hr = dxgi_get_output_from_window(adapter, swapchain->window, output); + IDXGIAdapter_Release(adapter); + } + else + { + WARN("Failed to get adapter, hr %#x.\n", hr); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapChain3 *iface, @@ -2407,6 +2425,7 @@ static BOOL load_vkd3d_functions(void *vkd3d_handle) #define LOAD_FUNCPTR(f) if (!(f = wine_dlsym(vkd3d_handle, #f, NULL, 0))) return FALSE; LOAD_FUNCPTR(vkd3d_acquire_vk_queue) LOAD_FUNCPTR(vkd3d_create_image_resource) + LOAD_FUNCPTR(vkd3d_get_device_parent) LOAD_FUNCPTR(vkd3d_get_vk_device) LOAD_FUNCPTR(vkd3d_get_vk_format) LOAD_FUNCPTR(vkd3d_get_vk_physical_device)

1 0

Józef Kucia : d3d12: Add test for creating device with adapter.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 35fe945471555b53ee78ebcc167ca466f5b71ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35fe945471555b53ee78ebcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 11:28:58 2019 +0100 d3d12: Add test for creating device with adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 156 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 131 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35fe945471555b53ee78…

1 0

Józef Kucia : d3d12: Set ordinal for D3D12CreateDevice().
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 2f622ac50a9ba65a834c0a31bcb2666db11ccb45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f622ac50a9ba65a834c0a31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 11 11:28:59 2019 +0100 d3d12: Set ordinal for D3D12CreateDevice(). It seems that D3D12CreateDevice() is imported by ordinal on Windows. Reported by Sveinar Søpler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 10 +++++----- dlls/d3d12/tests/d3d12.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 5c4f4cf..7c2ae98 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -1,11 +1,11 @@ -@ stub GetBehaviorValue -@ stdcall D3D12CreateDevice(ptr long ptr ptr) -@ stdcall D3D12GetDebugInterface(ptr ptr) +100 stub GetBehaviorValue +101 stdcall D3D12CreateDevice(ptr long ptr ptr) +102 stdcall D3D12GetDebugInterface(ptr ptr) @ stub D3D12CoreCreateLayeredDevice @ stub D3D12CoreGetLayeredDeviceSize @ stub D3D12CoreRegisterLayers @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -@ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) -@ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) #@ stub D3D12CreateVersionedRootSignatureDeserializer +@ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) +@ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) @ stdcall D3D12SerializeVersionedRootSignature(ptr ptr ptr) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 6b6f056..76efb56 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -774,6 +774,21 @@ static void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, release_resource_readback(&rb); } +static void test_ordinals(void) +{ + PFN_D3D12_CREATE_DEVICE pfn_D3D12CreateDevice, pfn_101; + HMODULE d3d12; + + d3d12 = GetModuleHandleA("d3d12.dll"); + ok(!!d3d12, "Failed to get module handle.\n"); + + pfn_D3D12CreateDevice = (void *)GetProcAddress(d3d12, "D3D12CreateDevice"); + ok(!!pfn_D3D12CreateDevice, "Failed to get D3D12CreateDevice() proc address.\n"); + + pfn_101 = (void *)GetProcAddress(d3d12, (const char *)101); + ok(pfn_101 == pfn_D3D12CreateDevice, "Got %p, expected %p.\n", pfn_101, pfn_D3D12CreateDevice); +} + static void test_interfaces(void) { D3D12_COMMAND_QUEUE_DESC desc; @@ -1368,6 +1383,7 @@ START_TEST(d3d12) print_adapter_info(); + test_ordinals(); test_interfaces(); test_create_device(); test_draw();

1 0

Gijs Vermeulen : wmvcore: Upgrade to IWMProfileManager2.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 3106cef4007473f2a8844cd7d219566b5eb41cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3106cef4007473f2a8844cd7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 10 14:04:48 2019 +0100 wmvcore: Upgrade to IWMProfileManager2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28847 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore_main.c | 73 ++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 10ed18a..af23ab8 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -87,25 +87,28 @@ HRESULT WINAPI WMCreateBackupRestorer(IUnknown *callback, IWMLicenseBackup **lic } typedef struct { - IWMProfileManager IWMProfileManager_iface; + IWMProfileManager2 IWMProfileManager2_iface; LONG ref; } WMProfileManager; -static inline WMProfileManager *impl_from_IWMProfileManager(IWMProfileManager *iface) +static inline WMProfileManager *impl_from_IWMProfileManager2(IWMProfileManager2 *iface) { - return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager_iface); + return CONTAINING_RECORD(iface, WMProfileManager, IWMProfileManager2_iface); } -static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, REFIID riid, void **ppv) +static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager2 *iface, REFIID riid, void **ppv) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; }else if(IsEqualGUID(&IID_IWMProfileManager, riid)) { TRACE("(%p)->(IID_IWMProfileManager %p)\n", This, ppv); - *ppv = &This->IWMProfileManager_iface; + *ppv = &This->IWMProfileManager2_iface; + }else if(IsEqualGUID(&IID_IWMProfileManager2, riid)) { + TRACE("(%p)->(IID_IWMProfileManager2 %p)\n", This, ppv); + *ppv = &This->IWMProfileManager2_iface; }else { FIXME("Unsupported iface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -116,9 +119,9 @@ static HRESULT WINAPI WMProfileManager_QueryInterface(IWMProfileManager *iface, return S_OK; } -static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -126,9 +129,9 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager *iface) return ref; } -static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) +static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -139,49 +142,63 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager *iface) return ref; } -static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager *iface, WMT_VERSION version, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_CreateEmptyProfile(IWMProfileManager2 *iface, WMT_VERSION version, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%x %p)\n", This, version, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager *iface, REFGUID guid, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByID(IWMProfileManager2 *iface, REFGUID guid, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager *iface, const WCHAR *profile, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadProfileByData(IWMProfileManager2 *iface, const WCHAR *profile, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%s %p)\n", This, debugstr_w(profile), ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) +static HRESULT WINAPI WMProfileManager_SaveProfile(IWMProfileManager2 *iface, IWMProfile *profile, WCHAR *profile_str, DWORD *len) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p %p %p)\n", This, profile, profile_str, len); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager *iface, DWORD *ret) +static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 *iface, DWORD *ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%p)\n", This, ret); return E_NOTIMPL; } -static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager *iface, DWORD index, IWMProfile **ret) +static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { - WMProfileManager *This = impl_from_IWMProfileManager(iface); + WMProfileManager *This = impl_from_IWMProfileManager2(iface); FIXME("(%p)->(%d %p)\n", This, index, ret); return E_NOTIMPL; } -static const IWMProfileManagerVtbl WMProfileManagerVtbl = { +static HRESULT WINAPI WMProfileManager2_GetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION *version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%p)\n", This, version); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMProfileManager2_SetSystemProfileVersion(IWMProfileManager2 *iface, WMT_VERSION version) +{ + WMProfileManager *This = impl_from_IWMProfileManager2(iface); + FIXME("(%p)->(%x)\n", This, version); + return E_NOTIMPL; +} + +static const IWMProfileManager2Vtbl WMProfileManager2Vtbl = { WMProfileManager_QueryInterface, WMProfileManager_AddRef, WMProfileManager_Release, @@ -190,7 +207,9 @@ static const IWMProfileManagerVtbl WMProfileManagerVtbl = { WMProfileManager_LoadProfileByData, WMProfileManager_SaveProfile, WMProfileManager_GetSystemProfileCount, - WMProfileManager_LoadSystemProfile + WMProfileManager_LoadSystemProfile, + WMProfileManager2_GetSystemProfileVersion, + WMProfileManager2_SetSystemProfileVersion }; HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) @@ -203,9 +222,9 @@ HRESULT WINAPI WMCreateProfileManager(IWMProfileManager **ret) if(!profile_mgr) return E_OUTOFMEMORY; - profile_mgr->IWMProfileManager_iface.lpVtbl = &WMProfileManagerVtbl; + profile_mgr->IWMProfileManager2_iface.lpVtbl = &WMProfileManager2Vtbl; profile_mgr->ref = 1; - *ret = &profile_mgr->IWMProfileManager_iface; + *ret = (IWMProfileManager *)&profile_mgr->IWMProfileManager2_iface; return S_OK; }

1 0

Gijs Vermeulen : ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 199b5d2ca2f1452ce8b3d532a125dc15e96f20de URL: https://source.winehq.org/git/wine.git/?a=commit;h=199b5d2ca2f1452ce8b3d532… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 11 16:56:17 2019 +0100 ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46761 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 67024b9..cf71dcf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2554,6 +2554,14 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS } /*********************************************************************** + * MmBuildMdlForNonPagedPool (NTOSKRNL.EXE.@) + */ +void WINAPI MmBuildMdlForNonPagedPool(MDL *mdl) +{ + FIXME("stub: %p\n", mdl); +} + +/*********************************************************************** * MmCreateSection (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 438f720..dbe381f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -672,7 +672,7 @@ @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) @ stdcall MmAllocatePagesForMdl(int64 int64 int64 long) -@ stub MmBuildMdlForNonPagedPool +@ stdcall MmBuildMdlForNonPagedPool(ptr) @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stdcall MmCopyVirtualMemory(ptr ptr ptr ptr long long ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 293da50..53e064f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1542,6 +1542,7 @@ NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEA PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); +void WINAPI MmBuildMdlForNonPagedPool(MDL*); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG);

1 0

Gijs Vermeulen : ntoskrnl.exe: Add ExSetTimerResolution stub.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 66c321a4b8ef71e21614884cf4a0519e1003a7ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=66c321a4b8ef71e21614884c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 11 16:56:18 2019 +0100 ntoskrnl.exe: Add ExSetTimerResolution stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46762 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf71dcf..2e78e45 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4197,3 +4197,12 @@ NTSTATUS WINAPI ExUuidCreate(UUID *uuid) return STATUS_SUCCESS; } + +/*********************************************************************** + * ExSetTimerResolution (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExSetTimerResolution(ULONG time, BOOLEAN set_resolution) +{ + FIXME("stub: %u %d\n", time, set_resolution); + return KeQueryTimeIncrement(); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dbe381f..da16bc2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -181,7 +181,7 @@ @ stdcall ExReleaseResourceForThreadLite(ptr long) @ extern ExSemaphoreObjectType @ stub ExSetResourceOwnerPointer -@ stub ExSetTimerResolution +@ stdcall ExSetTimerResolution(long long) @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime @ stub ExUnregisterCallback diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 53e064f..02c1bf3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1473,6 +1473,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); +ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*);

1 0

Jacek Caban : server: Connect pipe servers in order that they enter listening state.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: be3ae0131ee79156178c6f34d31aae2561e9ab97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3ae0131ee79156178c6f34… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 17:03:23 2019 +0100 server: Connect pipe servers in order that they enter listening state. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 114 ++++++++++++++++++++++++++++++++++++++++++--- server/named_pipe.c | 52 ++++++--------------- 2 files changed, 122 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be3ae0131ee79156178c…

1 0

Jacek Caban : server: Wake waiters when new pipe server instance is created.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: c8b50c98a34f6f6e32a946ffcc8c758dcabb819c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b50c98a34f6f6e32a946ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 17:03:33 2019 +0100 server: Wake waiters when new pipe server instance is created. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 1 + 2 files changed, 79 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7817fd5..4c7df3d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3808,6 +3808,83 @@ static void test_multiple_instances(void) } } +static DWORD WINAPI wait_pipe_proc(void *arg) +{ + BOOL ret; + ret = WaitNamedPipeA(PIPENAME, 1000); + ok(ret, "WaitNamedPipe failed (%u)\n", GetLastError()); + return 0; +} + +static HANDLE async_wait_pipe(void) +{ + HANDLE thread; + BOOL ret; + + thread = CreateThread(NULL, 0, wait_pipe_proc, NULL, 0, NULL); + ok(thread != NULL, "CreateThread failed: %u\n", GetLastError()); + + ret = WaitNamedPipeA(PIPENAME, 1); + ok(!ret && GetLastError() == ERROR_SEM_TIMEOUT, "WaitNamedPipe failed %x(%u)\n", ret, GetLastError()); + + return thread; +} + +static void test_wait_pipe(void) +{ + HANDLE server[2], client, wait; + OVERLAPPED ov; + DWORD res; + BOOL ret; + + ret = WaitNamedPipeA(PIPENAME, 0); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "WaitNamedPipe failed %x(%u)\n", ret, GetLastError()); + + server[0] = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_READMODE_BYTE | PIPE_WAIT, ARRAY_SIZE(server), 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(server[0] != INVALID_HANDLE_VALUE, "got invalid handle\n"); + + ret = WaitNamedPipeA(PIPENAME, 1); + ok(ret, "WaitNamedPipe failed (%u)\n", GetLastError()); + + client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "got invalid handle\n"); + + /* Creating a new pipe server wakes waiters */ + wait = async_wait_pipe(); + server[1] = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_READMODE_BYTE | PIPE_WAIT, ARRAY_SIZE(server), 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(server[1] != INVALID_HANDLE_VALUE, "got invalid handle\n"); + + res = WaitForSingleObject(wait, 100); + ok(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); + + CloseHandle(wait); + CloseHandle(server[1]); + + CloseHandle(client); + ret = DisconnectNamedPipe(server[0]); + ok(ret, "DisconnectNamedPipe failed (%u)\n", GetLastError()); + + /* Putting pipe server into waiting listening state wakes waiters */ + wait = async_wait_pipe(); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = ConnectNamedPipe(server[0], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "got %d\n", GetLastError()); + + res = WaitForSingleObject(wait, 100); + ok(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); + CloseHandle(server[0]); + + res = WaitForSingleObject(ov.hEvent, 0); + ok(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); + CloseHandle(ov.hEvent); +} + START_TEST(pipe) { char **argv; @@ -3874,4 +3951,5 @@ START_TEST(pipe) test_namedpipe_process_id(); test_namedpipe_session_id(); test_multiple_instances(); + test_wait_pipe(); } diff --git a/server/named_pipe.c b/server/named_pipe.c index 85e7286..a6ec8ae 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1173,6 +1173,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned } allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); + async_wake_up( &pipe->waiters, STATUS_SUCCESS ); return server; }

1 0

Vincent Povirk : mscoree: Implement an override setting for .net libraries.
by Alexandre Julliard 11 Mar '19

11 Mar '19

Module: wine Branch: master Commit: 5baadda536172d6713fa6fef1196dc2baa773904 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5baadda536172d6713fa6fef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 8 15:40:41 2019 -0600 mscoree: Implement an override setting for .net libraries. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 319 ++++++++++++++++++++++++++++++++++++++--- dlls/mscoree/mscoree_private.h | 1 + 2 files changed, 300 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5baadda536172d6713fa…

1 0