February 2021 - Wine-Commits

Rémi Bernon : d3d11: Make SwapDeviceContextState truly no-op when state is NULL.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: bde070fcf42eb7ed346dd15de943bdb9326d2aff URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde070fcf42eb7ed346dd15d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 16 13:56:00 2021 +0100 d3d11: Make SwapDeviceContextState truly no-op when state is NULL. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 +++ dlls/d3d11/tests/d3d11.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8e5beb8893b..914b64d6019 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2761,6 +2761,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 FIXME("iface %p, state %p, prev_state %p semi-stub!\n", iface, state, prev_state); + if (prev_state) *prev_state = NULL; + if (!state) return; + wined3d_mutex_lock(); if (prev_state) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 044c1ce5a17..1505b3fddbc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7078,8 +7078,7 @@ static void test_device_context_state(void) previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); - todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); - if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state); + ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); ok(previous_context_state != NULL, "Failed to get previous context state\n");

1 0

Rémi Bernon : d3d11: Create an initial device ID3DDeviceContextState.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 943d48896e97240499351b7f78480811d6abb320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=943d48896e97240499351b7f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 16 13:56:01 2021 +0100 d3d11: Create an initial device ID3DDeviceContextState. And use its emulated_interface. This adds a private_refcount to track hidden references, and a reference to the wined3d_device, to keep the d3d_device alive while not publicly referencing it. This uses d3d_device_context_state_AddRef on init so that the initial references are also traced, making it easier to verify that nothing is leaked. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 1 - dlls/d3d11/d3d11_private.h | 6 ++-- dlls/d3d11/device.c | 69 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 6666876049d..dac59d09999 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -137,7 +137,6 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return E_FAIL; } d3d_device->d3d11_only = TRUE; - d3d_device->emulated_interface = IID_ID3D11Device2; return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cdae1104efa..650b5c35871 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -520,7 +520,7 @@ struct d3d_query *unsafe_impl_from_ID3D11Asynchronous(ID3D11Asynchronous *iface) struct d3d_device_context_state { ID3DDeviceContextState ID3DDeviceContextState_iface; - LONG refcount; + LONG refcount, private_refcount; struct wined3d_private_store private_store; struct @@ -546,6 +546,8 @@ struct d3d_device_context_state } ps; GUID emulated_interface; + + struct wined3d_device *wined3d_device; ID3D11Device2 *device; }; @@ -572,8 +574,8 @@ struct d3d_device D3D_FEATURE_LEVEL feature_level; BOOL d3d11_only; - GUID emulated_interface; + struct d3d_device_context_state *state; struct d3d11_immediate_context immediate_context; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 914b64d6019..87bdd594d81 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -31,8 +31,9 @@ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops = static inline BOOL d3d_device_is_d3d10_active(struct d3d_device *device) { - return IsEqualGUID(&device->emulated_interface, &IID_ID3D10Device) - || IsEqualGUID(&device->emulated_interface, &IID_ID3D10Device1); + return !device->state + || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device) + || IsEqualGUID(&device->state->emulated_interface, &IID_ID3D10Device1); } /* ID3DDeviceContextState methods */ @@ -62,6 +63,15 @@ static HRESULT STDMETHODCALLTYPE d3d_device_context_state_QueryInterface(ID3DDev return E_NOINTERFACE; } +static ULONG d3d_device_context_state_private_addref(struct d3d_device_context_state *state) +{ + ULONG refcount = InterlockedIncrement(&state->private_refcount); + + TRACE("%p increasing private refcount to %u.\n", state, refcount); + + return refcount; +} + static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContextState *iface) { struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); @@ -69,16 +79,21 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_AddRef(ID3DDeviceContext TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + d3d_device_context_state_private_addref(state); + ID3D11Device2_AddRef(state->device); + } + return refcount; } -static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContextState *iface) +static void d3d_device_context_state_private_release(struct d3d_device_context_state *state) { - struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); - ULONG refcount = InterlockedDecrement(&state->refcount); + ULONG refcount = InterlockedDecrement(&state->private_refcount); unsigned int i; - TRACE("%p decreasing refcount to %u.\n", state, refcount); + TRACE("%p decreasing private refcount to %u.\n", state, refcount); if (!refcount) { @@ -104,9 +119,23 @@ static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContex if (state->gs.cbs[i]) ID3D11Buffer_Release(state->gs.cbs[i]); if (state->ps.cbs[i]) ID3D11Buffer_Release(state->ps.cbs[i]); } - ID3D11Device2_Release(state->device); + wined3d_device_decref(state->wined3d_device); heap_free(state); } +} + +static ULONG STDMETHODCALLTYPE d3d_device_context_state_Release(ID3DDeviceContextState *iface) +{ + struct d3d_device_context_state *state = impl_from_ID3DDeviceContextState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); + + TRACE("%p decreasing refcount to %u.\n", state, refcount); + + if (!refcount) + { + ID3D11Device2_Release(state->device); + d3d_device_context_state_private_release(state); + } return refcount; } @@ -169,7 +198,7 @@ static void d3d_device_context_state_init(struct d3d_device_context_state *state REFIID emulated_interface) { state->ID3DDeviceContextState_iface.lpVtbl = &d3d_device_context_state_vtbl; - state->refcount = 1; + state->refcount = state->private_refcount = 0; wined3d_private_store_init(&state->private_store); memset(&state->vs, 0, sizeof(state->vs)); @@ -177,8 +206,10 @@ static void d3d_device_context_state_init(struct d3d_device_context_state *state memset(&state->ps, 0, sizeof(state->ps)); state->emulated_interface = *emulated_interface; + wined3d_device_incref(state->wined3d_device = device->wined3d_device); state->device = &device->ID3D11Device2_iface; - ID3D11Device2_AddRef(state->device); + + d3d_device_context_state_AddRef(&state->ID3DDeviceContextState_iface); } /* ID3D11DeviceContext - immediate context methods */ @@ -2770,7 +2801,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 *prev_state = NULL; if ((state_impl = heap_alloc(sizeof(*state_impl)))) { - d3d_device_context_state_init(state_impl, device, &device->emulated_interface); + d3d_device_context_state_init(state_impl, device, &device->state->emulated_interface); d3d11_immediate_context_capture_state(iface, state_impl); *prev_state = &state_impl->ID3DDeviceContextState_iface; } @@ -2779,7 +2810,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SwapDeviceContextState(ID3 if ((state_impl = impl_from_ID3DDeviceContextState(state))) { d3d11_immediate_context_restore_state(iface, state_impl); - device->emulated_interface = state_impl->emulated_interface; + device->state->emulated_interface = state_impl->emulated_interface; if (d3d_device_is_d3d10_active(device)) FIXME("D3D10 interface emulation not fully implemented yet!\n"); } @@ -4175,6 +4206,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) if (!refcount) { + if (device->state) d3d_device_context_state_private_release(device->state); d3d11_immediate_context_destroy(&device->immediate_context); if (device->wined3d_device) { @@ -6352,6 +6384,8 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par struct wined3d_device *wined3d_device) { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); + ID3DDeviceContextState *state; + HRESULT hr; TRACE("device_parent %p, wined3d_device %p.\n", device_parent, wined3d_device); @@ -6359,6 +6393,17 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->wined3d_device = wined3d_device; device->feature_level = d3d_feature_level_from_wined3d(wined3d_device_get_feature_level(wined3d_device)); + + if (FAILED(hr = d3d11_device_CreateDeviceContextState(&device->ID3D11Device2_iface, 0, &device->feature_level, + 1, D3D11_SDK_VERSION, device->d3d11_only ? &IID_ID3D11Device2 : &IID_ID3D10Device1, NULL, + &state))) + ERR("Failed to create the initial device context state, hr %#x.\n", hr); + else + { + device->state = impl_from_ID3DDeviceContextState(state); + d3d_device_context_state_private_addref(device->state); + ID3DDeviceContextState_Release(state); + } } static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) @@ -6488,7 +6533,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; device->d3d11_only = FALSE; - device->emulated_interface = GUID_NULL; + device->state = NULL; d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface);

1 0

Jacek Caban : mshtml: Add nsICacheInfoChannel stub implementation.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: edbddef57ecdd0dab5d691f9a202749375823725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edbddef57ecdd0dab5d691f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 17 14:31:17 2021 +0100 mshtml: Add nsICacheInfoChannel stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/binding.h | 1 + dlls/mshtml/nsiface.idl | 17 +++++++++ dlls/mshtml/nsio.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 9926fa0dc33..3d1ea6ecc8d 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -35,6 +35,7 @@ typedef struct { nsIHttpChannel nsIHttpChannel_iface; nsIUploadChannel nsIUploadChannel_iface; nsIHttpChannelInternal nsIHttpChannelInternal_iface; + nsICacheInfoChannel nsICacheInfoChannel_iface; LONG ref; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index a621007b0cc..2ecd8d93854 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -728,6 +728,23 @@ interface nsIFormPOSTActionChannel : nsIUploadChannel { } +[ + object, + uuid(72c34415-c6eb-48af-851f-772fa9ee5972), + local +] +interface nsICacheInfoChannel : nsISupports +{ + nsresult GetCacheTokenExpirationTime(uint32_t *aCacheTokenExpirationTime); + nsresult GetCacheTokenCachedCharset(nsACString *aCacheTokenCachedCharset); + nsresult SetCacheTokenCachedCharset(const nsACString *aCacheTokenCachedCharset); + nsresult IsFromCache(bool *_retval); + nsresult GetCacheKey(nsISupports **aCacheKey); + nsresult SetCacheKey(nsISupports *aCacheKey); + nsresult GetAllowStaleCacheContent(bool *aAllowStaleCacheContent); + nsresult SetAllowStaleCacheContent(bool aAllowStaleCacheContent); +} + [ object, uuid(8d171460-a716-41f1-92be-8c659db39b45), diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ee709645873..9ba5a6c8612 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -521,6 +521,9 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r }else if(IsEqualGUID(&IID_nsIHttpChannelInternal, riid)) { TRACE("(%p)->(IID_nsIHttpChannelInternal %p)\n", This, result); *result = is_http_channel(This) ? &This->nsIHttpChannelInternal_iface : NULL; + }else if(IsEqualGUID(&IID_nsICacheInfoChannel, riid)) { + TRACE("(%p)->(IID_nsICacheInfoChannel %p)\n", This, result); + *result = is_http_channel(This) ? &This->nsICacheInfoChannel_iface : NULL; }else { TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); *result = NULL; @@ -2138,6 +2141,100 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_SetBlockAuthPrompt }; +static inline nsChannel *impl_from_nsICacheInfoChannel(nsICacheInfoChannel *iface) +{ + return CONTAINING_RECORD(iface, nsChannel, nsICacheInfoChannel_iface); +} + +static nsresult NSAPI nsCacheInfoChannel_QueryInterface(nsICacheInfoChannel *iface, nsIIDRef riid, + void **result) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + return nsIHttpChannel_QueryInterface(&This->nsIHttpChannel_iface, riid, result); +} + +static nsrefcnt NSAPI nsCacheInfoChannel_AddRef(nsICacheInfoChannel *iface) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + return nsIHttpChannel_AddRef(&This->nsIHttpChannel_iface); +} + +static nsrefcnt NSAPI nsCacheInfoChannel_Release(nsICacheInfoChannel *iface) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + return nsIHttpChannel_Release(&This->nsIHttpChannel_iface); +} + +static nsresult NSAPI nsCacheInfoChannel_GetCacheTokenExpirationTime(nsICacheInfoChannel *iface, UINT32 *p) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static nsresult NSAPI nsCacheInfoChannel_GetCacheTokenCachedCharset(nsICacheInfoChannel *iface, nsACString *p) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static nsresult NSAPI nsCacheInfoChannel_SetCacheTokenCachedCharset(nsICacheInfoChannel *iface, const nsACString *p) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, debugstr_nsacstr(p)); + return E_NOTIMPL; +} + +static nsresult NSAPI nsCacheInfoChannel_IsFromCache(nsICacheInfoChannel *iface, cpp_bool *p) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, p); + *p = FALSE; + return NS_OK; +} + +static nsresult NSAPI nsCacheInfoChannel_GetCacheKey(nsICacheInfoChannel *iface, nsISupports **p) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static nsresult NSAPI nsCacheInfoChannel_SetCacheKey(nsICacheInfoChannel *iface, nsISupports *key) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, key); + return E_NOTIMPL; +} + +static nsresult NSAPI nsCacheInfoChannel_GetAllowStaleCacheContent(nsICacheInfoChannel *iface, cpp_bool *p) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static nsresult NSAPI nsCacheInfoChannel_SetAllowStaleCacheContent(nsICacheInfoChannel *iface, cpp_bool allow) +{ + nsChannel *This = impl_from_nsICacheInfoChannel(iface); + FIXME("(%p)->(%x)\n", This, allow); + return E_NOTIMPL; +} + +static const nsICacheInfoChannelVtbl nsCacheInfoChannelVtbl = { + nsCacheInfoChannel_QueryInterface, + nsCacheInfoChannel_AddRef, + nsCacheInfoChannel_Release, + nsCacheInfoChannel_GetCacheTokenExpirationTime, + nsCacheInfoChannel_GetCacheTokenCachedCharset, + nsCacheInfoChannel_SetCacheTokenCachedCharset, + nsCacheInfoChannel_IsFromCache, + nsCacheInfoChannel_GetCacheKey, + nsCacheInfoChannel_SetCacheKey, + nsCacheInfoChannel_GetAllowStaleCacheContent, + nsCacheInfoChannel_SetAllowStaleCacheContent +}; static void invalidate_uri(nsWineURI *This) { @@ -3382,6 +3479,7 @@ static nsresult create_nschannel(nsWineURI *uri, nsChannel **ret) channel->nsIHttpChannel_iface.lpVtbl = &nsChannelVtbl; channel->nsIUploadChannel_iface.lpVtbl = &nsUploadChannelVtbl; channel->nsIHttpChannelInternal_iface.lpVtbl = &nsHttpChannelInternalVtbl; + channel->nsICacheInfoChannel_iface.lpVtbl = &nsCacheInfoChannelVtbl; channel->ref = 1; channel->request_method = METHOD_GET; list_init(&channel->response_headers);

1 0

Akihiro Sagawa : advapi32/tests: Add another key unloading test with NtUnloadKey.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 2f93be4bddd6e6370cbd710e983c518d7c1dc163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f93be4bddd6e6370cbd710e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 12 20:30:16 2021 +0900 advapi32/tests: Add another key unloading test with NtUnloadKey. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c8f9adf7732..dfadd13ea8c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -22,6 +22,8 @@ #include <assert.h> #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -48,8 +50,10 @@ static LONG (WINAPI *pRegDeleteTreeA)(HKEY,const char *); static DWORD (WINAPI *pRegDeleteKeyExA)(HKEY,LPCSTR,REGSAM,DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); +static NTSTATUS (WINAPI * pNtUnloadKey)(POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); +static NTSTATUS (WINAPI * pRtlInitUnicodeString)(PUNICODE_STRING,PCWSTR); static LONG (WINAPI *pRegDeleteKeyValueA)(HKEY,LPCSTR,LPCSTR); static LONG (WINAPI *pRegSetKeyValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD); static LONG (WINAPI *pRegLoadMUIStringA)(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); @@ -90,7 +94,9 @@ static void InitFunctionPtrs(void) pIsWow64Process = (void *)GetProcAddress( hkernel32, "IsWow64Process" ); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); + pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); pNtDeleteKey = (void *)GetProcAddress( hntdll, "NtDeleteKey" ); + pNtUnloadKey = (void *)GetProcAddress( hntdll, "NtUnloadKey" ); } /* delete key and all its subkeys */ @@ -1561,7 +1567,11 @@ static void test_reg_load_key(void) static void test_reg_unload_key(void) { + UNICODE_STRING key_name; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; DWORD ret; + HKEY key; if (!set_privileges(SE_RESTORE_NAME, TRUE) || !set_privileges(SE_BACKUP_NAME, FALSE)) @@ -1570,6 +1580,17 @@ static void test_reg_unload_key(void) return; } + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Test", 0, KEY_READ, &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + /* try to unload though the key handle is live */ + pRtlInitUnicodeString(&key_name, L"\\REGISTRY\\Machine\\Test"); + InitializeObjectAttributes(&attr, &key_name, OBJ_CASE_INSENSITIVE, NULL, NULL); + status = pNtUnloadKey(&attr); + ok(status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status); + + RegCloseKey(key); + ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret);

1 0

Nikolay Sivov : mfreadwrite/reader: Subscribe to allocator's release notifications.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: a0a6fad695d2f9d1eb2601725ac27c9a9949026b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a6fad695d2f9d1eb260172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 16:14:04 2021 +0300 mfreadwrite/reader: Subscribe to allocator's release notifications. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 6a69196054a..ec7d3fd62e6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -112,12 +112,14 @@ struct media_stream IMFMediaType *current; IMFTransform *decoder; IMFVideoSampleAllocatorEx *allocator; + IMFVideoSampleAllocatorNotify notify_cb; unsigned int id; unsigned int index; enum media_stream_state state; unsigned int flags; unsigned int requests; unsigned int responses; + struct source_reader *reader; }; enum source_reader_async_op @@ -126,6 +128,7 @@ enum source_reader_async_op SOURCE_READER_ASYNC_SEEK, SOURCE_READER_ASYNC_FLUSH, SOURCE_READER_ASYNC_SAMPLE_READY, + SOURCE_READER_ASYNC_SA_READY, }; struct source_reader_async_command @@ -153,6 +156,10 @@ struct source_reader_async_command { unsigned int stream_index; } sample; + struct + { + unsigned int stream_index; + } sa; } u; }; @@ -216,6 +223,11 @@ static struct source_reader_async_command *impl_from_async_command_IUnknown(IUnk return CONTAINING_RECORD(iface, struct source_reader_async_command, IUnknown_iface); } +static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface) +{ + return CONTAINING_RECORD(iface, struct media_stream, notify_cb); +} + static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -1533,6 +1545,7 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader IMFMediaType *media_type) { struct media_stream *stream = &reader->streams[index]; + IMFVideoSampleAllocatorCallback *callback; GUID major = { 0 }; HRESULT hr; @@ -1568,6 +1581,13 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, media_type))) WARN("Failed to initialize sample allocator, hr %#x.\n", hr); + if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&callback))) + { + if (FAILED(hr = IMFVideoSampleAllocatorCallback_SetCallback(callback, &stream->notify_cb))) + WARN("Failed to set allocator callback, hr %#x.\n", hr); + IMFVideoSampleAllocatorCallback_Release(callback); + } + return hr; } @@ -2126,6 +2146,54 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor return MF_SOURCE_READER_INVALID_STREAM_INDEX; } +static HRESULT WINAPI stream_sample_allocator_cb_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI stream_sample_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + return 2; +} + +static ULONG WINAPI stream_sample_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) +{ + return 1; +} + +static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + struct media_stream *stream = impl_stream_from_IMFVideoSampleAllocatorNotify(iface); + struct source_reader_async_command *command; + + if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command))) + { + command->u.sa.stream_index = stream->index; + MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &stream->reader->async_commands_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + } + + return S_OK; +} + +static const IMFVideoSampleAllocatorNotifyVtbl stream_sample_allocator_cb_vtbl = +{ + stream_sample_allocator_cb_QueryInterface, + stream_sample_allocator_cb_AddRef, + stream_sample_allocator_cb_Release, + stream_sample_allocator_cb_NotifyRelease, +}; + static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, BOOL shutdown_on_release, REFIID riid, void **out) { @@ -2195,6 +2263,8 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr)) break; + object->streams[i].notify_cb.lpVtbl = &stream_sample_allocator_cb_vtbl; + object->streams[i].reader = object; object->streams[i].index = i; }

1 0

Zebediah Figura : ntdll: Implement NtQueryInformationToken(TokenElevation).
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 3c677c3f08d7523c9473777c8c373ee37254f681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c677c3f08d7523c9473777c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 16 23:31:13 2021 -0600 ntdll: Implement NtQueryInformationToken(TokenElevation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/ntdll/unix/security.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8fddd635f55..f43ac2431e1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8130,7 +8130,7 @@ static void test_elevation(void) ok(type == TokenElevationTypeLimited, "got type %#x\n", type); ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); + ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8141,7 +8141,7 @@ static void test_elevation(void) ok(type == TokenElevationTypeLimited, "got type %#x\n", type); ret = GetTokenInformation(linked2.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); + ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); check_different_token(linked.LinkedToken, linked2.LinkedToken); diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index c8cd04b70f3..48bdb5a3689 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -403,11 +403,15 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c break; case TokenElevation: + SERVER_START_REQ( get_token_elevation ) { TOKEN_ELEVATION *elevation = info; - FIXME("QueryInformationToken( ..., TokenElevation, ...) semi-stub\n"); - elevation->TokenIsElevated = TRUE; + + req->handle = wine_server_obj_handle( token ); + status = wine_server_call( req ); + if (!status) elevation->TokenIsElevated = (reply->elevation == TokenElevationTypeFull); } + SERVER_END_REQ; break; case TokenSessionId:

1 0

Nikolay Sivov : dwrite: Fix character range to glyph range matching for user features.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: d4784a9211a18f247e1698f79d1dd02338df068a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4784a9211a18f247e1698f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 13:33:23 2021 +0300 dwrite: Fix character range to glyph range matching for user features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 125b7353031..39943c52c9a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4733,7 +4733,7 @@ static void opentype_layout_get_glyph_range_for_text(struct scriptshaping_contex if (end_char >= context->length - 1) *end_glyph = context->glyph_count - 1; else - *end_glyph = context->u.buffer.clustermap[end_char + 1] - 1; + *end_glyph = context->u.buffer.clustermap[end_char] - 1; } static void opentype_layout_set_glyph_masks(struct scriptshaping_context *context, const struct shaping_features *features) @@ -4754,6 +4754,9 @@ static void opentype_layout_set_glyph_masks(struct scriptshaping_context *contex if (start_char >= context->length) break; + if (!context->user_features.range_lengths[r]) + continue; + opentype_layout_get_glyph_range_for_text(context, start_char, start_char + context->user_features.range_lengths[r], &start_glyph, &end_glyph); start_char += context->user_features.range_lengths[r];

1 0

Jacek Caban : winebuild: Restore x86_64 FPU context and nonvolatile registers in syscall dispatcher.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: be8729c9f57e555148c4dde7cc2001ae316d124b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8729c9f57e555148c4dde7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:59:16 2021 +0100 winebuild: Restore x86_64 FPU context and nonvolatile registers in syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 1 + tools/winebuild/import.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6e34e0d9979..892d208e43a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2152,6 +2152,7 @@ __ASM_GLOBAL_FUNC( call_raise_user_exception_dispatcher, "movq 0x8(%rax),%rbx\n\t" /* frame->rbx */ "movq 0x20(%rax),%rsi\n\t" /* frame->rsi */ "movq 0x28(%rax),%rdi\n\t" /* frame->rdi */ + "movq 0x50(%rax),%r12\n\t" /* frame->r12 */ "movq 0x98(%rax),%rbp\n\t" /* frame->rbp */ "movq $0,0x328(%rdx)\n\t" "leaq 0xa8(%rax),%rsp\n\t" diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6b5f704c8f1..5645d3aa9af 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1519,6 +1519,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%rdi,-0x70(%%rbp)\n" ); output_cfi( ".cfi_rel_offset %%rdi,-112" ); output( "\tmovq %%r12,-0x48(%%rbp)\n" ); + output_cfi( ".cfi_rel_offset %%r12,-72" ); output( "\tmovq %%r13,-0x40(%%rbp)\n" ); output( "\tmovq %%r14,-0x38(%%rbp)\n" ); output( "\tmovq %%r15,-0x30(%%rbp)\n" ); @@ -1535,7 +1536,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovw %%fs,-0x1a(%%rbp)\n" ); output( "\tmovw %%ss,-0x8(%%rbp)\n" ); output( "\tmovw %%gs,-0x6(%%rbp)\n" ); - output( "\tfxsave64 (%%rsp)\n" ); + output( "\tmovq %%rsp,%%r12\n" ); + output( "\tfxsave64 (%%r12)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,0x328(%%rcx)\n" ); /* amd64_thread_data()->syscall_frame */ @@ -1558,6 +1560,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tcallq *(%%r10,%%rax,8)\n" ); output( "2:\tmovq %%gs:0x30,%%rcx\n" ); output( "\tmovq $0,0x328(%%rcx)\n" ); + output( "\tfxrstor64 (%%r12)\n" ); + output( "\tmovq -0x30(%%rbp),%%r15\n" ); + output( "\tmovq -0x38(%%rbp),%%r14\n" ); + output( "\tmovq -0x40(%%rbp),%%r13\n" ); + output( "\tmovq -0x48(%%rbp),%%r12\n" ); + output_cfi( ".cfi_same_value %%r12" ); output( "\tmovq -0x70(%%rbp),%%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tmovq -0x78(%%rbp),%%rsi\n" );

1 0

Jacek Caban : winebuild: Restore all x86_64 control registers in syscall dispatcher.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 9b6f715b28a5fad471a7c4800881f93ecf28787e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6f715b28a5fad471a7c480… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:59:02 2021 +0100 winebuild: Restore all x86_64 control registers in syscall dispatcher. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 863d17c2734..6b5f704c8f1 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1564,11 +1564,12 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_same_value %%rsi" ); output( "\tmovq -0x90(%%rbp),%%rbx\n" ); output_cfi( ".cfi_same_value %%rbx" ); + output( "\tleaq -0x28(%%rbp),%%rsp\n" ); output_cfi( ".cfi_def_cfa_register %%rsp" ); - output( "\tleave\n" ); - output_cfi( ".cfi_adjust_cfa_offset -8" ); + output_cfi( ".cfi_adjust_cfa_offset 40" ); + output( "\tmovq (%%rbp),%%rbp\n" ); output_cfi( ".cfi_same_value %%rbp" ); - output( "\tret\n" ); + output( "\tiretq\n" ); output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); output( "\tjmp 2b\n" ); break;

1 0

Jacek Caban : ntdll: Store segment registers in x86_64 syscall frame.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: f72940de8e5709605e517f7fe4ac1605ca519c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72940de8e5709605e517f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 15 21:58:37 2021 +0100 ntdll: Store segment registers in x86_64 syscall frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 12 ++++++------ tools/winebuild/import.c | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 6477bf8a953..35395283619 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1945,16 +1945,16 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->Rbp = frame->rbp; context->Rip = frame->rip; context->EFlags = frame->eflags; - __asm__( "movw %%cs,%0" : "=g" (context->SegCs) ); - __asm__( "movw %%ss,%0" : "=g" (context->SegSs) ); + context->SegCs = frame->cs; + context->SegSs = frame->ss; context->ContextFlags |= CONTEXT_CONTROL; } if (needed_flags & CONTEXT_SEGMENTS) { - __asm__( "movw %%ds,%0" : "=g" (context->SegDs) ); - __asm__( "movw %%es,%0" : "=g" (context->SegEs) ); - __asm__( "movw %%fs,%0" : "=g" (context->SegFs) ); - __asm__( "movw %%gs,%0" : "=g" (context->SegGs) ); + context->SegDs = frame->ds; + context->SegEs = frame->es; + context->SegFs = frame->fs; + context->SegGs = frame->gs; context->ContextFlags |= CONTEXT_SEGMENTS; } if (needed_flags & CONTEXT_FLOATING_POINT) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 12ba189aa0a..863d17c2734 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1529,6 +1529,12 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovq %%rbx,-0x28(%%rbp)\n" ); output( "\tleaq 0x10(%%rbp),%%rbx\n" ); output( "\tmovq %%rbx,-0x10(%%rbp)\n" ); + output( "\tmovw %%cs,-0x20(%%rbp)\n" ); + output( "\tmovw %%ds,-0x1e(%%rbp)\n" ); + output( "\tmovw %%es,-0x1c(%%rbp)\n" ); + output( "\tmovw %%fs,-0x1a(%%rbp)\n" ); + output( "\tmovw %%ss,-0x8(%%rbp)\n" ); + output( "\tmovw %%gs,-0x6(%%rbp)\n" ); output( "\tfxsave64 (%%rsp)\n" ); output( "\tmovq %%gs:0x30,%%rcx\n" ); output( "\tleaq -0x98(%%rbp),%%rbx\n" );

1 0