wine-devel May 2018

wine-devel@winehq.org

74 participants
631 discussions

[PATCH] dxgi: Allow setting maximum frame latency parameter.
by Nikolay Sivov 15 May '18

15 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/device.c | 24 ++++++++++++++++++------ dlls/dxgi/tests/device.c | 19 +++++++++++-------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2c85c1da6b..0341bb0e99 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -258,22 +258,34 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic static HRESULT STDMETHODCALLTYPE dxgi_device_SetMaximumFrameLatency(IWineDXGIDevice *iface, UINT max_latency) { - FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + + TRACE("iface %p, max_latency %u.\n", iface, max_latency); if (max_latency > DXGI_FRAME_LATENCY_MAX) return DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + wined3d_mutex_lock(); + wined3d_device_set_max_frame_latency(device->wined3d_device, max_latency); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDevice *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - if (max_latency) - *max_latency = DXGI_FRAME_LATENCY_DEFAULT; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); - return E_NOTIMPL; + if (!max_latency) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + *max_latency = wined3d_device_get_max_frame_latency(device->wined3d_device); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 8172269e74..3ad968308e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3426,26 +3426,29 @@ static void test_maximum_frame_latency(void) if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1))) { + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* 0 does not reset to the default frame latency on all Windows versions. */ ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency), "Got unexpected maximum frame latency %u.\n", max_latency); -- 2.17.0

2 1

[PATCH 4/4] mshtml/tests: Added more COM aggregation tests.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/protocol.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)

1 0

[PATCH 3/4] mshtml: Properly support COM aggregation in about and res protocol handlers.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/main.c | 2 + dlls/mshtml/protocol.c | 146 ++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 76 deletions(-)

1 0

[PATCH 2/4] mshtml: Share more code between res and about protocol handlers.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 366 +++++++++++++++---------------------------------- 1 file changed, 112 insertions(+), 254 deletions(-)

1 0

[PATCH 1/4] mshtml: Share the same structure for about and res protocols.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 106 +++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 61 deletions(-)

1 0

[PATCH 1/4] jscript: Support accessor properties in getOwnPropertyDescriptor.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 9 +++++++++ dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+)

2 1

[PATCH v2] ntdll: Add LdrRegisterDllNotification stub
by Alex Henrie 15 May '18

15 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=45205 Based on a Wine Staging patch by Michael Müller. v2: Replaced some Hungarian notation in winternl.h. dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd801a1..01d7db7c0c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1461,6 +1461,16 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, return STATUS_SUCCESS; } +/****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub!\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a58d7e37d..73b3103ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index c84e6d7f88..07f42cf00d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 -- 2.17.0

1 0

[PATCH 4/4] jscript: Support setting accessor property value.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 30 +++++++++++++++++++++--------- dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 9 deletions(-)

1 0

[PATCH 3/4] jscript: Move handling PROPF_WRITABLE to property type specific code.
by Jacek Caban 15 May '18

15 May '18

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

1 0

[PATCH 2/4] jscript: Support getting value of accessor property.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/mshtml/tests/es5.js | 10 ++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-)

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2018