- wine-devel - winehq.org

[PATCH v3 1/2] uiautomationcore: Implement UiaHostProviderFromHwnd.
by Connor McAdams 21 Sep '21

21 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v3: Match recent Windows behavior, fix tests for earlier Windows behavior. dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 125 +++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..1f6ad85c24f 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..8d4f91947aa 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); @@ -84,10 +89,126 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) FIXME("(%p): stub\n", callback); } +typedef struct { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG ref; + + HWND hwnd; +} HwndProvider; + +static inline HwndProvider *impl_from_HwndProvider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, HwndProvider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI HwndProvider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || + IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI HwndProvider_AddRef(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI HwndProvider_Release(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + heap_free(This); + + return ref; +} + +HRESULT WINAPI HwndProvider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + *ret_val = ProviderOptions_ServerSideProvider; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID property_id, VARIANT *ret_val) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + + switch (property_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = ((long)This->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + V_VT(ret_val) = VT_EMPTY; + break; + } + + return S_OK; +} + +HRESULT WINAPI HwndProvider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl HwndProviderVtbl = { + HwndProvider_QueryInterface, + HwndProvider_AddRef, + HwndProvider_Release, + HwndProvider_get_ProviderOptions, + HwndProvider_GetPatternProvider, + HwndProvider_GetPropertyValue, + HwndProvider_get_HostRawElementProvider, +}; + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + HwndProvider *hwnd_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + *provider = NULL; + if (!IsWindow(hwnd)) + return E_INVALIDARG; + + hwnd_prov = heap_alloc_zero(sizeof(*hwnd_prov)); + if (!hwnd_prov) + return E_OUTOFMEMORY; + + hwnd_prov->IRawElementProviderSimple_iface.lpVtbl = &HwndProviderVtbl; + hwnd_prov->ref = 1; + hwnd_prov->hwnd = hwnd; + *provider = &hwnd_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) -- 2.25.1

2 2

[PATCH v2 1/2] uiautomationcore: Implement UiaHostProviderFromHwnd.
by Connor McAdams 21 Sep '21

21 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v2: Fix patch application failure by rebasing on top of current master. dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 125 +++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..1f6ad85c24f 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..84937f9d967 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); @@ -84,10 +89,126 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) FIXME("(%p): stub\n", callback); } +typedef struct { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG ref; + + HWND hwnd; +} HwndProvider; + +static inline HwndProvider *impl_from_HwndProvider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, HwndProvider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI HwndProvider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || + IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI HwndProvider_AddRef(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI HwndProvider_Release(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + heap_free(This); + + return ref; +} + +HRESULT WINAPI HwndProvider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + *ret_val = ProviderOptions_ClientSideProvider; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID property_id, VARIANT *ret_val) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + + switch (property_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = ((long)This->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + V_VT(ret_val) = VT_EMPTY; + break; + } + + return S_OK; +} + +HRESULT WINAPI HwndProvider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl HwndProviderVtbl = { + HwndProvider_QueryInterface, + HwndProvider_AddRef, + HwndProvider_Release, + HwndProvider_get_ProviderOptions, + HwndProvider_GetPatternProvider, + HwndProvider_GetPropertyValue, + HwndProvider_get_HostRawElementProvider, +}; + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + HwndProvider *hwnd_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + *provider = NULL; + if (!IsWindow(hwnd)) + return E_INVALIDARG; + + hwnd_prov = heap_alloc_zero(sizeof(*hwnd_prov)); + if (!hwnd_prov) + return E_OUTOFMEMORY; + + hwnd_prov->IRawElementProviderSimple_iface.lpVtbl = &HwndProviderVtbl; + hwnd_prov->ref = 1; + hwnd_prov->hwnd = hwnd; + *provider = &hwnd_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) -- 2.25.1

2 3

[PATCH 1/4] user32/tests: Fix existing winevents in test_button_messages() message sequences.
by Connor McAdams 21 Sep '21

21 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ee1f5ced292..b0ecbec5d83 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6270,7 +6270,7 @@ static const struct message WmSetFocusButtonSeq[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, { WM_CTLCOLORBTN, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, @@ -6280,7 +6280,7 @@ static const struct message WmSetFocusButtonSeq[] = static const struct message WmKillFocusButtonSeq[] = { { HCBT_SETFOCUS, hook }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, { WM_CTLCOLORBTN, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, @@ -6296,7 +6296,7 @@ static const struct message WmSetFocusStaticSeq[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, { WM_CTLCOLORSTATIC, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_SETFOCUS) }, @@ -6307,7 +6307,7 @@ static const struct message WmSetFocusStaticSeq[] = static const struct message WmKillFocusStaticSeq[] = { { HCBT_SETFOCUS, hook }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, { WM_CTLCOLORSTATIC, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_KILLFOCUS) }, @@ -6323,7 +6323,7 @@ static const struct message WmSetFocusOwnerdrawSeq[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, { WM_CTLCOLORBTN, sent|parent }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x001040e4 }, @@ -6334,7 +6334,7 @@ static const struct message WmSetFocusOwnerdrawSeq[] = static const struct message WmKillFocusOwnerdrawSeq[] = { { HCBT_SETFOCUS, hook }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, { WM_CTLCOLORBTN, sent|parent }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000040e4 }, @@ -6350,31 +6350,31 @@ static const struct message WmKillFocusOwnerdrawSeq[] = static const struct message WmLButtonDownSeq[] = { { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_CTLCOLORBTN, sent|defwinproc }, { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, { WM_CTLCOLORBTN, sent|defwinproc }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { 0 } }; static const struct message WmLButtonDownStaticSeq[] = { { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_CTLCOLORSTATIC, sent|defwinproc }, { BM_SETSTATE, sent|wparam|defwinproc, TRUE }, { WM_CTLCOLORSTATIC, sent|defwinproc }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { 0 } }; static const struct message WmLButtonUpSeq[] = @@ -6382,8 +6382,8 @@ static const struct message WmLButtonUpSeq[] = { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, { WM_CTLCOLORBTN, sent|defwinproc }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, { 0 } }; @@ -6392,8 +6392,8 @@ static const struct message WmLButtonUpStaticSeq[] = { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, { WM_CTLCOLORSTATIC, sent|defwinproc }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, { 0 } }; @@ -6402,8 +6402,8 @@ static const struct message WmLButtonUpAutoSeq[] = { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, { BM_SETSTATE, sent|wparam|defwinproc, FALSE }, { WM_CTLCOLORSTATIC, sent|defwinproc }, - { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|optional, 0, 0 }, { BM_SETCHECK, sent|defwinproc }, { WM_CTLCOLORSTATIC, sent|defwinproc, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, -- 2.25.1

2 6

[PATCH 1/2] uiautomationcore: Implement UiaHostProviderFromHwnd.
by Connor McAdams 20 Sep '21

20 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 125 +++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 5c4acb232a4..44967525ebc 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = oleaut32 user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..84937f9d967 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); @@ -84,10 +89,126 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) FIXME("(%p): stub\n", callback); } +typedef struct { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG ref; + + HWND hwnd; +} HwndProvider; + +static inline HwndProvider *impl_from_HwndProvider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, HwndProvider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI HwndProvider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || + IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI HwndProvider_AddRef(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI HwndProvider_Release(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + heap_free(This); + + return ref; +} + +HRESULT WINAPI HwndProvider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + *ret_val = ProviderOptions_ClientSideProvider; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID property_id, VARIANT *ret_val) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + + switch (property_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = ((long)This->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + V_VT(ret_val) = VT_EMPTY; + break; + } + + return S_OK; +} + +HRESULT WINAPI HwndProvider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl HwndProviderVtbl = { + HwndProvider_QueryInterface, + HwndProvider_AddRef, + HwndProvider_Release, + HwndProvider_get_ProviderOptions, + HwndProvider_GetPatternProvider, + HwndProvider_GetPropertyValue, + HwndProvider_get_HostRawElementProvider, +}; + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + HwndProvider *hwnd_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + *provider = NULL; + if (!IsWindow(hwnd)) + return E_INVALIDARG; + + hwnd_prov = heap_alloc_zero(sizeof(*hwnd_prov)); + if (!hwnd_prov) + return E_OUTOFMEMORY; + + hwnd_prov->IRawElementProviderSimple_iface.lpVtbl = &HwndProviderVtbl; + hwnd_prov->ref = 1; + hwnd_prov->hwnd = hwnd; + *provider = &hwnd_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) -- 2.25.1

2 3

[PATCH v6] dsound: Commit next audio chunk between play cursor and write cursor to playing.
by Eduard Permyakov 20 Sep '21

20 Sep '21

This region of the audio buffer is forbidden to be written to by the DirectSound specification. The documentation states: "The write cursor is the point after which it is safe to write data into the buffer. The block between the play cursor and the write cursor is already committed to be played, and cannot be changed safely." However, some applications still do this, which has lead to audio glitches only when using the Wine DirectSound implementation. Experiments showed that the native DirctSound implementation will still play the old audio the first time around when the buffer region gets overwritten. Use an approach of copying the next forbidden region into a "committed buffer" to add the same behavior to the Wine implementation. Out of performance considerations, only copy data to the committed buffer when we detect that an overwrite is possible (i.e. the current mixing region of the buffer gets locked). Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/buffer.c | 66 ++++++++++++++++++++++++++++++++++-- dlls/dsound/dsound_convert.c | 33 +++++++++--------- dlls/dsound/dsound_private.h | 11 ++++-- dlls/dsound/mixer.c | 48 ++++++++++++++++++++------ 4 files changed, 125 insertions(+), 33 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index dc3b54906ce..c595b19dd63 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -101,6 +101,27 @@ static int __cdecl notify_compar(const void *l, const void *r) return 1; } +static void commit_next_chunk(IDirectSoundBufferImpl *dsb) +{ + void *dstbuff = dsb->committedbuff, *srcbuff = dsb->buffer->memory; + DWORD srcoff = dsb->sec_mixpos, srcsize = dsb->buflen, cpysize = dsb->writelead; + + if(dsb->state != STATE_PLAYING) + return; + + if(cpysize > srcsize - srcoff) { + DWORD overflow = cpysize - (srcsize - srcoff); + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, srcsize - srcoff); + memcpy((BYTE*)dstbuff + (srcsize - srcoff), srcbuff, overflow); + }else{ + memcpy(dstbuff, (BYTE*)srcbuff + srcoff, cpysize); + } + + dsb->use_committed = TRUE; + dsb->committed_mixpos = 0; + TRACE("committing %u bytes from offset %u\n", dsb->writelead, dsb->sec_mixpos); +} + static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSoundNotify *iface, DWORD howmuch, const DSBPOSITIONNOTIFY *notify) { @@ -244,6 +265,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD oldFreq; + void *newcommitted; TRACE("(%p,%d)\n",This,freq); @@ -274,6 +296,13 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i This->freqAdjustDen = This->device->pwfx->nSamplesPerSec; This->nAvgBytesPerSec = freq * This->pwfx->nBlockAlign; DSOUND_RecalcFormat(This); + + newcommitted = HeapReAlloc(GetProcessHeap(), 0, This->committedbuff, This->writelead); + if(!newcommitted) { + ReleaseSRWLockExclusive(&This->lock); + return DSERR_OUTOFMEMORY; + } + This->committedbuff = newcommitted; } ReleaseSRWLockExclusive(&This->lock); @@ -319,6 +348,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) if (This->state == STATE_PLAYING || This->state == STATE_STARTING) { This->state = STATE_STOPPED; + This->use_committed = FALSE; + This->committed_mixpos = 0; DSOUND_CheckEvent(This, 0, 0); } @@ -503,8 +534,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW if (writecursor+writebytes <= This->buflen) { *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 1\n"); + commit_next_chunk(This); + } *audiobytes1 = writebytes; if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = NULL; @@ -519,16 +552,20 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; *audiobytes1 = This->buflen-writecursor; This->buffer->lockedbytes += *audiobytes1; - if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) + if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 2\n"); + commit_next_chunk(This); + } if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; if (audiobytes2) { *audiobytes2 = writebytes-(This->buflen-writecursor); This->buffer->lockedbytes += *audiobytes2; } - if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) + if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) { WARN("Overwriting mixing position, case 3\n"); + commit_next_chunk(This); + } TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); } @@ -552,6 +589,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(IDirectSoundBuff newpos -= newpos%This->pwfx->nBlockAlign; This->sec_mixpos = newpos; + This->use_committed = FALSE; + This->committed_mixpos = 0; + /* at this point, do not attempt to reset buffers, mess with primary mix position, or anything like that to reduce latency. The data already prebuffered cannot be changed */ @@ -1081,6 +1121,12 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds /* calculate fragment size and write lead */ DSOUND_RecalcFormat(dsb); + dsb->committedbuff = HeapAlloc(GetProcessHeap(), 0, dsb->writelead); + if(!dsb->committedbuff) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); + return DSERR_OUTOFMEMORY; + } + if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) { dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER); dsb->ds3db_ds3db.vPosition.x = 0.0; @@ -1135,6 +1181,7 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + HeapFree(GetProcessHeap(), 0, This->committedbuff); if (This->filters) { int i; @@ -1157,6 +1204,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( { IDirectSoundBufferImpl *dsb; HRESULT hres = DS_OK; + VOID *committedbuff; TRACE("(%p,%p,%p)\n", device, ppdsb, pdsb); dsb = HeapAlloc(GetProcessHeap(),0,sizeof(*dsb)); @@ -1166,6 +1214,13 @@ HRESULT IDirectSoundBufferImpl_Duplicate( return DSERR_OUTOFMEMORY; } + committedbuff = HeapAlloc(GetProcessHeap(),0,pdsb->writelead); + if (committedbuff == NULL) { + HeapFree(GetProcessHeap(),0,dsb); + *ppdsb = NULL; + return DSERR_OUTOFMEMORY; + } + AcquireSRWLockShared(&pdsb->lock); CopyMemory(dsb, pdsb, sizeof(*dsb)); @@ -1175,6 +1230,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( ReleaseSRWLockShared(&pdsb->lock); if (dsb->pwfx == NULL) { + HeapFree(GetProcessHeap(),0,committedbuff); HeapFree(GetProcessHeap(),0,dsb); *ppdsb = NULL; return DSERR_OUTOFMEMORY; @@ -1192,6 +1248,9 @@ HRESULT IDirectSoundBufferImpl_Duplicate( dsb->notifies = NULL; dsb->nrofnotifies = 0; dsb->device = device; + dsb->committedbuff = committedbuff; + dsb->use_committed = FALSE; + dsb->committed_mixpos = 0; DSOUND_RecalcFormat(dsb); InitializeSRWLock(&dsb->lock); @@ -1202,6 +1261,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( list_remove(&dsb->entry); dsb->buffer->ref--; HeapFree(GetProcessHeap(),0,dsb->pwfx); + HeapFree(GetProcessHeap(),0,dsb->committedbuff); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; }else diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4735178a9a8..67344565860 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -55,26 +55,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); #define le32(x) (x) #endif -static float get8(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get8(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - buf += pos + channel; + const BYTE *buf = base + channel; return (buf[0] - 0x80) / (float)0x80; } -static float get16(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get16(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const SHORT *sbuf = (const SHORT*)(buf + pos + 2 * channel); + const BYTE *buf = base + 2 * channel; + const SHORT *sbuf = (const SHORT*)(buf); SHORT sample = (SHORT)le16(*sbuf); return sample / (float)0x8000; } -static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get24(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { LONG sample; - const BYTE* buf = dsb->buffer->memory; - buf += pos + 3 * channel; + const BYTE *buf = base + 3 * channel; + /* The next expression deliberately has an overflow for buf[2] >= 0x80, this is how negative values are made. */ @@ -82,32 +81,32 @@ static float get24(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) return sample / (float)0x80000000U; } -static float get32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float get32(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const LONG *sbuf = (const LONG*)(buf + pos + 4 * channel); + const BYTE *buf = base + 4 * channel; + const LONG *sbuf = (const LONG*)(buf); LONG sample = le32(*sbuf); return sample / (float)0x80000000U; } -static float getieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +static float getieee32(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { - const BYTE* buf = dsb->buffer->memory; - const float *sbuf = (const float*)(buf + pos + 4 * channel); + const BYTE *buf = base + 4 * channel; + const float *sbuf = (const float*)(buf); /* The value will be clipped later, when put into some non-float buffer */ return *sbuf; } const bitsgetfunc getbpp[5] = {get8, get16, get24, get32, getieee32}; -float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) +float get_mono(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) { DWORD channels = dsb->pwfx->nChannels; DWORD c; float val = 0; /* XXX: does Windows include LFE into the mix? */ for (c = 0; c < channels; c++) - val += dsb->get_aux(dsb, pos, c); + val += dsb->get_aux(dsb, base, c); val /= channels; return val; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index bdb9ebee544..9ec96504a50 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -43,7 +43,7 @@ typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; typedef struct DirectSoundDevice DirectSoundDevice; /* dsound_convert.h */ -typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); +typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, BYTE *, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; @@ -153,7 +153,12 @@ struct IDirectSoundBufferImpl LONG64 freqAccNum; /* used for mixing */ DWORD sec_mixpos; - + /* Holds a copy of the next 'writelead' bytes, to be used for mixing. This makes it + * so that these bytes get played once even if this region of the buffer gets overwritten, + * which is more in-line with native DirectSound behavior. */ + BOOL use_committed; + LPVOID committedbuff; + DWORD committed_mixpos; /* IDirectSoundNotify fields */ LPDSBPOSITIONNOTIFY notifies; int nrofnotifies; @@ -171,7 +176,7 @@ struct IDirectSoundBufferImpl struct list entry; }; -float get_mono(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel) DECLSPEC_HIDDEN; +float get_mono(const IDirectSoundBufferImpl *dsb, BYTE *base, DWORD channel) DECLSPEC_HIDDEN; void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 124d1e4fba1..e9d8a6e3cdd 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -276,22 +276,35 @@ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len } static inline float get_current_sample(const IDirectSoundBufferImpl *dsb, - DWORD mixpos, DWORD channel) + BYTE *buffer, DWORD buflen, DWORD mixpos, DWORD channel) { - if (mixpos >= dsb->buflen && !(dsb->playflags & DSBPLAY_LOOPING)) + if (mixpos >= buflen && !(dsb->playflags & DSBPLAY_LOOPING)) return 0.0f; - return dsb->get(dsb, mixpos % dsb->buflen, channel); + return dsb->get(dsb, buffer + (mixpos % buflen), channel); } static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count) { UINT istride = dsb->pwfx->nBlockAlign; UINT ostride = dsb->device->pwfx->nChannels * sizeof(float); + UINT committed_samples = 0; DWORD channel, i; - for (i = 0; i < count; i++) + + if(dsb->use_committed) { + committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; + committed_samples = committed_samples <= count ? committed_samples : count; + } + + for (i = 0; i < committed_samples; i++) + for (channel = 0; channel < dsb->mix_channels; channel++) + dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, dsb->committedbuff, + dsb->writelead, dsb->committed_mixpos + i * istride, channel)); + + for (; i < count; i++) for (channel = 0; channel < dsb->mix_channels; channel++) - dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, - dsb->sec_mixpos + i * istride, channel)); + dsb->put(dsb, i * ostride, channel, get_current_sample(dsb, dsb->buffer->memory, + dsb->buflen, dsb->sec_mixpos + i * istride, channel)); + return count; } @@ -300,6 +313,7 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * UINT i, channel; UINT istride = dsb->pwfx->nBlockAlign; UINT ostride = dsb->device->pwfx->nChannels * sizeof(float); + UINT committed_samples = 0; LONG64 freqAcc_start = *freqAccNum; LONG64 freqAcc_end = freqAcc_start + count * dsb->freqAdjustNum; @@ -326,16 +340,24 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * fir_copy = dsb->device->cp_buffer; intermediate = fir_copy + fir_cachesize; + if(dsb->use_committed) { + committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; + committed_samples = committed_samples <= required_input ? committed_samples : required_input; + } /* Important: this buffer MUST be non-interleaved * if you want -msse3 to have any effect. * This is good for CPU cache effects, too. */ itmp = intermediate; - for (channel = 0; channel < channels; channel++) - for (i = 0; i < required_input; i++) - *(itmp++) = get_current_sample(dsb, - dsb->sec_mixpos + i * istride, channel); + for (channel = 0; channel < channels; channel++) { + for (i = 0; i < committed_samples; i++) + *(itmp++) = get_current_sample(dsb, dsb->committedbuff, + dsb->writelead, dsb->committed_mixpos + i * istride, channel); + for (; i < required_input; i++) + *(itmp++) = get_current_sample(dsb, dsb->buffer->memory, + dsb->buflen, dsb->sec_mixpos + i * istride, channel); + } for(i = 0; i < count; ++i) { UINT int_fir_steps = (freqAcc_start + i * dsb->freqAdjustNum) * dsbfirstep / dsb->freqAdjustDen; @@ -389,6 +411,12 @@ static void cp_fields(IDirectSoundBufferImpl *dsb, UINT count, LONG64 *freqAccNu } dsb->sec_mixpos = ipos; + + if(dsb->use_committed) { + dsb->committed_mixpos += adv * dsb->pwfx->nBlockAlign; + if(dsb->committed_mixpos >= dsb->writelead) + dsb->use_committed = FALSE; + } } /** -- 2.25.1

2 1

[PATCH v4 1/3] ntdll: Factor out get_vprot_range_size() function.
by Paul Gofman 20 Sep '21

20 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v4: - use 'char *' instead of 'BYTE *'. dlls/ntdll/unix/virtual.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..85739866ce1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,23 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked protection byte. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( char *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + char *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2064,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (char *)base - (char *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2092,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4196,7 +4215,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4223,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.31.1

2 3

[PATCH v3 1/3] ntdll: Factor out get_vprot_range_size() function.
by Paul Gofman 20 Sep '21

20 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 49 ++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..3028910ce5c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -943,6 +943,23 @@ static BYTE get_page_vprot( const void *addr ) } +/*********************************************************************** + * get_vprot_range_size + * + * Return the size of the region with equal masked protection byte. + * The function assumes that base and size are page aligned and + * base + size does not wrap around. */ +static SIZE_T get_vprot_range_size( BYTE *base, SIZE_T size, BYTE mask, BYTE *vprot ) +{ + BYTE *addr; + + *vprot = get_page_vprot( base ); + for (addr = base + page_size; addr != base + size; addr += page_size) + if ((*vprot ^ get_page_vprot( addr )) & mask) break; + + return addr - base; +} + /*********************************************************************** * set_page_vprot * @@ -2047,18 +2064,21 @@ done: */ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vprot ) { - SIZE_T i, start; + SIZE_T offset; - start = ((char *)base - (char *)view->base) >> page_shift; - *vprot = get_page_vprot( base ); + base = ROUND_ADDR( base, page_mask ); + offset = (BYTE *)base - (BYTE *)view->base; if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; + + *vprot = get_page_vprot( base ); + SERVER_START_REQ( get_mapping_committed_range ) { req->base = wine_server_client_ptr( view->base ); - req->offset = start << page_shift; + req->offset = offset; if (!wine_server_call( req )) { ret = reply->size; @@ -2072,9 +2092,8 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro SERVER_END_REQ; return ret; } - for (i = start + 1; i < view->size >> page_shift; i++) - if ((*vprot ^ get_page_vprot( (char *)view->base + (i << page_shift) )) & VPROT_COMMITTED) break; - return (i - start) << page_shift; + + return get_vprot_range_size( base, view->size - offset, VPROT_COMMITTED, vprot ); } @@ -4098,7 +4117,7 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, SIZE_T len, SIZE_T *res_len ) { struct file_view *view; - char *base, *alloc_base = 0, *alloc_end = working_set_limit; + BYTE *base, *alloc_base = 0, *alloc_end = working_set_limit; struct wine_rb_entry *ptr; sigset_t sigset; @@ -4145,20 +4164,20 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, while (ptr) { view = WINE_RB_ENTRY_VALUE( ptr, struct file_view, entry ); - if ((char *)view->base > base) + if ((BYTE *)view->base > base) { alloc_end = view->base; ptr = ptr->left; } - else if ((char *)view->base + view->size <= base) + else if ((BYTE *)view->base + view->size <= base) { - alloc_base = (char *)view->base + view->size; + alloc_base = (BYTE *)view->base + view->size; ptr = ptr->right; } else { alloc_base = view->base; - alloc_end = (char *)view->base + view->size; + alloc_end = (BYTE *)view->base + view->size; break; } } @@ -4196,7 +4215,6 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, else { BYTE vprot; - char *ptr; SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; @@ -4205,9 +4223,8 @@ static NTSTATUS get_basic_memory_info( HANDLE process, LPCVOID addr, if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT)) info->Type = MEM_MAPPED; else info->Type = MEM_PRIVATE; - for (ptr = base; ptr < base + range_size; ptr += page_size) - if ((get_page_vprot( ptr ) ^ vprot) & ~VPROT_WRITEWATCH) break; - info->RegionSize = ptr - base; + + info->RegionSize = get_vprot_range_size( base, range_size, ~VPROT_WRITEWATCH, &vprot ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.31.1

2 4

[PATCH v2] msvcrt: Support z length modifier in scanf.
by Piotr Caban 20 Sep '21

20 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 5 +++++ dlls/ucrtbase/tests/scanf.c | 7 +++++++ 2 files changed, 12 insertions(+)

1 0

[PATCH] msvcrt: Support z length modifier in scanf.
by Piotr Caban 20 Sep '21

20 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51574 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/scanf.h | 5 +++++ dlls/msvcrt/tests/scanf.c | 6 ++++++ 2 files changed, 11 insertions(+)

2 1

[PATCH 2/2] ntdll: Replace fstat and lstat with fstatat in get_file_info.
by Erich E. Hoover 20 Sep '21

20 Sep '21

Further simplify get_file_info by using fstatat for both path-based (lstat) and fd-based (fstat) modes of operation. Best, Erich

4 14

[PATCH 4/5 v3] oleacc: Introduce helper for checking accessibility object hwnd.
by Piotr Caban 20 Sep '21

20 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 47 ++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 28 deletions(-)

2 1

[PATCH] makefiles: Add libntdll.def to the dependencies for native Unix libraries.
by Zebediah Figura 20 Sep '21

20 Sep '21

These require libntdll.def to exist, otherwise -lntdll is not correctly detected as a DLL with an associated Unix library by winegcc, and is instead treated as a system dependency. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51749 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 59857762edd..b0091f0c461 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3369,6 +3369,7 @@ static void output_module( struct makefile *make ) { strarray_add( &unix_libs, "-lntdll" ); strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/ntdll.so" )); + strarray_add( &unix_deps, obj_dir_path( top_makefile, "dlls/ntdll/libntdll.def" )); } } else -- 2.33.0

2 2

[PATCH 3/5 v3] oleacc: Add Window_OleWindow_GetWindow implementation.
by Piotr Caban 20 Sep '21

20 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 12 ++++++------ dlls/oleacc/window.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 9 deletions(-)

2 1

[PATCH 5/5 v3] oleacc: Remove WINAPI from accessible_create internal type.
by Piotr Caban 20 Sep '21

20 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/5 v3] oleacc: Add Client_get_accFocus tests.
by Piotr Caban 20 Sep '21

20 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 99 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5 v3] oleacc: Add Client_get_accFocus implementation.
by Piotr Caban 20 Sep '21

20 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)

1 0

[PATCH] winhttp: Limit recursion for synchronous callback calls.
by Paul Gofman 20 Sep '21

20 Sep '21

Fixes a regression in Hitman 2, Death Stranding introduced by commit be5acd1c07e093c3b4fe079bff3db74f300ea83b. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- MSDN [1] explicitly warns about potential stack overflow when calling WinHttpReadData() from notification callback: "When the read buffer is very small, WinHttpReadData may complete synchronously, and if the WINHTTP_CALLBACK_STATUS_READ_COMPLETE completion then triggers another call to WinHttpReadData, a stack overflow can result. It is best to use a read buffer that is 8 Kilobytes or larger in size.". However, this exactly what happens in Hitman 2 in Wine with the referenced regression commit: the buffer size is 256, WinHttpReadData() is called from notification callback while much bigger amount of data is available and that eventually leads to stack overflow. Testing on Windows shows that the native implementation actually prevents too long recursion allowing maximum depth of 127 on older Windows (before Win7) and 2 on the newer Windows. Unlike Hitman 2 which depends on just the stack overflow not to happen, Death Stranding depends on the newer Windows recursion limit. It just hangs if it's notification callback is called recusrively for read. It doesn't happen with the max recursion level of 2 as it interleaves WinHttpQueryDataAvailable() and WinHttpReadData() from the notification callback (somewhat similar to what my unit test is doing). 1. https://docs.microsoft.com/en-us/windows/win32/api/winhttp/nf-winhttp-winht… dlls/winhttp/request.c | 11 ++- dlls/winhttp/session.c | 4 +- dlls/winhttp/tests/notification.c | 156 ++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 167 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f2cb24d4486..ed3b41a3155 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2825,6 +2825,11 @@ static DWORD query_data_ready( struct request *request ) return count; } +static BOOL skip_async_queue( struct request *request ) +{ + return request->hdr.recursion_count < 3 && (end_of_read_data( request ) || query_data_ready( request )); +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; @@ -2889,8 +2894,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) - && !query_data_ready( request )) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request )) { struct query_data *q; @@ -2947,8 +2951,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) - && !query_data_ready( request )) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request )) { struct read_data *r; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 659a1ec8cee..0c8ffec4fc3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -48,8 +48,10 @@ void send_callback( struct object_header *hdr, DWORD status, void *info, DWORD b { if (hdr->callback && (hdr->notify_mask & status)) { - TRACE("%p, 0x%08x, %p, %u\n", hdr, status, info, buflen); + TRACE("%p, 0x%08x, %p, %u, %u\n", hdr, status, info, buflen, hdr->recursion_count); + ++hdr->recursion_count; hdr->callback( hdr->handle, hdr->context, status, info, buflen ); + --hdr->recursion_count; TRACE("returning from 0x%08x callback\n", status); } } diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 4cfffe6687e..b71eb48754b 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1212,6 +1212,161 @@ static void test_persistent_connection(int port) CloseHandle( info.wait ); } +struct test_recursion_context +{ + HANDLE request; + HANDLE wait; + unsigned int recursion_count, max_recursion_query, max_recursion_read; + BOOL read_from_callback; + BOOL have_sync_callback; +}; + +/* The limit is 128 before Win7 and 3 on newer Windows. */ +#define TEST_RECURSION_LIMIT 128 + +static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR context_ptr, + DWORD status, void *buffer, DWORD buflen ) +{ + struct test_recursion_context *context = (struct test_recursion_context *)context_ptr; + DWORD err; + BOOL ret; + BYTE b; + + switch (status) + { + case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: + case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: + SetEvent( context->wait ); + break; + + case WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE: + if (!context->read_from_callback) + { + SetEvent( context->wait ); + break; + } + + if (!*(DWORD *)buffer) + { + SetEvent( context->wait ); + break; + } + + ok(context->recursion_count < TEST_RECURSION_LIMIT, + "Got unexpected context->recursion_count %u, thread %#x.\n", + context->recursion_count, GetCurrentThreadId()); + context->max_recursion_query = max( context->max_recursion_query, context->recursion_count ); + ++context->recursion_count; + ret = WinHttpReadData( context->request, &b, 1, NULL ); + err = GetLastError(); + ok(ret, "Failed to read data, GetLastError() %u.\n", err); + ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); + if (err == ERROR_SUCCESS) + context->have_sync_callback = TRUE; + --context->recursion_count; + break; + + case WINHTTP_CALLBACK_STATUS_READ_COMPLETE: + if (!buflen) + { + SetEvent( context->wait ); + break; + } + ok(context->recursion_count < TEST_RECURSION_LIMIT, + "Got unexpected context->recursion_count %u, thread %#x.\n", + context->recursion_count, GetCurrentThreadId()); + context->max_recursion_read = max( context->max_recursion_read, context->recursion_count ); + context->read_from_callback = TRUE; + ++context->recursion_count; + ret = WinHttpQueryDataAvailable( context->request, NULL ); + err = GetLastError(); + ok(ret, "Failed to query data available, GetLastError() %u.\n", err); + ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); + if (err == ERROR_SUCCESS) + context->have_sync_callback = TRUE; + --context->recursion_count; + break; + } +} + +static void test_recursion(void) +{ + struct test_recursion_context context; + HANDLE session, connection, request; + DWORD size, status, err; + BOOL ret; + BYTE b; + + memset( &context, 0, sizeof(context) ); + + context.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + + session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); + ok(!!session, "Failed to open session, GetLastError() %u.\n", GetLastError()); + + WinHttpSetStatusCallback( session, test_recursion_callback, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + + connection = WinHttpConnect( session, L"test.winehq.org", 0, 0 ); + ok(!!connection, "Failed to open a connection, GetLastError() %u.\n", GetLastError()); + + request = WinHttpOpenRequest( connection, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); + ok(!!request, "Failed to open a request, GetLastError() %u.\n", GetLastError()); + + context.request = request; + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) + { + skip("Connection failed, skipping\n"); + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( context.wait ); + return; + } + ok(ret, "Failed to send request, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + + ret = WinHttpReceiveResponse( request, NULL ); + ok(ret, "Failed to receive response, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + + size = sizeof(status); + ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, + &status, &size, NULL ); + ok(ret, "Request failed, GetLastError() %u.\n", GetLastError()); + ok(status == 200, "Request failed unexpectedly, status %u.\n", status); + + ret = WinHttpQueryDataAvailable( request, NULL ); + ok(ret, "Failed to query data available, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + + ret = WinHttpReadData( request, &b, 1, NULL ); + ok(ret, "Failed to read data, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + if (context.have_sync_callback) + { + ok(context.max_recursion_query >= 2, "Got unexpected max_recursion_query %u.\n", context.max_recursion_query); + ok(context.max_recursion_read >= 2, "Got unexpected max_recursion_read %u.\n", context.max_recursion_read); + } + else + { + skip("No sync callbacks.\n"); + } + + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( context.wait ); +} + START_TEST (notification) { HMODULE mod = GetModuleHandleA( "winhttp.dll" ); @@ -1230,6 +1385,7 @@ START_TEST (notification) test_redirect(); test_async(); test_websocket(); + test_recursion(); si.event = CreateEventW( NULL, 0, 0, NULL ); si.port = 7533; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 069951d4811..3b257b770f3 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -49,6 +49,7 @@ struct object_header LONG refs; WINHTTP_STATUS_CALLBACK callback; DWORD notify_mask; + unsigned int recursion_count; struct list entry; }; -- 2.31.1

2 1

[PATCH] msxml3/tests: Avoid double-free using BSTR helper.
by Daniel Lehman 20 Sep '21

20 Sep '21

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- same pattern as 001aa01760168cd7e21e70bc1bb5fcc39a8432c3 although they don't cause any crashes for me --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..a86c0b08d6b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5267,7 +5267,6 @@ static void test_cloneNode(void ) V_VT(&v) = VT_BSTR; hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&v); /* clone document node */ hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); @@ -8767,7 +8766,6 @@ static void test_put_nodeTypedValue(void) V_BSTR(&value) = _bstr_("1"); hr = IXMLDOMElement_put_nodeTypedValue(elem, value); EXPECT_HR(hr, S_OK); - VariantClear(&value); V_VT(&value) = VT_EMPTY; hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); -- 2.25.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Parse the abs() intrinsic.
by Zebediah Figura 20 Sep '21

20 Sep '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 9 +++++++++ tests/abs.shader_test | 13 +++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 tests/abs.shader_test diff --git a/Makefile.am b/Makefile.am index c9ad38893..3287ec75a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -273,6 +274,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fe3c3289d..bd2660389 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1555,6 +1555,14 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static bool intrinsic_abs(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {params->args[0]}; + + return !!add_expr(ctx, params->instrs, HLSL_OP1_ABS, args, &loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1594,6 +1602,7 @@ static const struct intrinsic_function } intrinsic_functions[] = { + {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/abs.shader_test b/tests/abs.shader_test new file mode 100644 index 000000000..6fa6d1ca7 --- /dev/null +++ b/tests/abs.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main(uniform float2 u) : sv_target +{ + return float4(abs(u), abs(u.x - 0.5), abs(-0.4)); +} + +[test] +uniform 0 float4 0.1 0.7 0.0 0.0 +draw quad +probe all rgba (0.1, 0.7, 0.4, 0.4) +uniform 0 float4 -0.7 0.1 0.0 0.0 +draw quad +probe all rgba (0.7, 0.1, 1.2, 0.4) -- 2.33.0

4 20

[PATCH vkd3d v2 3/5] vkd3d-shader/hlsl: Parse the pow() intrinsic.
by Henri Verbeet 20 Sep '21

20 Sep '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 214706. v2: Make the test less strict. My Intel SKL requires the same tolerance as reported by Giovanni. Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++++++++ tests/pow.shader_test | 10 ++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 tests/pow.shader_test diff --git a/Makefile.am b/Makefile.am index 32b76e19..34617c67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d539600..96473d05 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1093,7 +1093,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_MOD] = "%", [HLSL_OP2_MUL] = "*", [HLSL_OP2_NEQUAL] = "!=", - [HLSL_OP2_POW] = "pow", [HLSL_OP2_RSHIFT] = ">>", [HLSL_OP3_LERP] = "lerp", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9b579b72..ce1f1b75 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -318,7 +318,6 @@ enum hlsl_ir_expr_op HLSL_OP2_MOD, HLSL_OP2_MUL, HLSL_OP2_NEQUAL, - HLSL_OP2_POW, HLSL_OP2_RSHIFT, HLSL_OP3_LERP, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bd266038..2b381dc8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1585,6 +1585,28 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } +static bool intrinsic_pow(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {0}; + struct hlsl_ir_node *log, *exp; + struct hlsl_ir_expr *mul; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], loc))) + return false; + list_add_tail(params->instrs, &log->entry); + + args[0] = params->args[1]; + args[1] = log; + if (!(mul = add_expr(ctx, params->instrs, HLSL_OP2_MUL, args, &loc))) + return false; + + if (!(exp = hlsl_new_unary_expr(ctx, HLSL_OP1_EXP2, &mul->node, loc))) + return false; + list_add_tail(params->instrs, &exp->entry); + return true; +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1605,6 +1627,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, + {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/tests/pow.shader_test b/tests/pow.shader_test new file mode 100644 index 00000000..21011e6c --- /dev/null +++ b/tests/pow.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(uniform float2 u, uniform float2 v) : sv_target +{ + return float4(pow(u.y, 3), pow(u, v), pow(0.5, v.y)); +} + +[test] +uniform 0 float4 0.4 0.8 2.5 2.0 +draw quad +probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4 -- 2.20.1

1 0

[PATCH 4/4] gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW.
by Jacek Caban 20 Sep '21

20 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 101 ------------------------------------------ dlls/gdi32/text.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 103 deletions(-)

2 1

[PATCH 3/4] gdi32: Move CreateScalableFontResourceW to text.c.
by Jacek Caban 20 Sep '21

20 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 248 +------------------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/text.c | 251 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 244 deletions(-)

2 1

[PATCH 2/4] gdi32: Move load_script_name call to EnumFontFamiliesExW.
by Jacek Caban 20 Sep '21

20 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- So that ntgdi part does not depend on gdi32 resources. dlls/gdi32/font.c | 32 ++++---------------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-)

2 1

[PATCH 1/4] include: Add some missing ntgdi declarations.
by Jacek Caban 20 Sep '21

20 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 8 +++--- include/d3dukmdt.h | 13 +++++++++ include/ddk/d3dkmthk.h | 27 ++++++++++++++++++ include/ntgdi.h | 64 +++++++++++++++++++++++------------------- 4 files changed, 79 insertions(+), 33 deletions(-)

2 1

[PATCH v4 1/6] robocopy: Add stub
by Florian Eder 20 Sep '21

20 Sep '21

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v4: Identical to the patch sent in v3 --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index 00a5be6a504..a5767af3c60 100755 --- a/configure +++ b/configure @@ -21234,6 +21234,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22767,4 +22768,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index dea5fe61bf3..97c46565db3 100644 --- a/configure.ac +++ b/configure.ac @@ -3958,6 +3958,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5a48be3725b --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..00dacc8ab6c --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 0; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..edae5b71d86 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

2 7

[PATCH 1/4] ole32/tests: Get rid of some global variables in moniker tests.
by Nikolay Sivov 20 Sep '21

20 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 223 +++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 110 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5221be495f0..550ba802cfa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -36,8 +36,6 @@ #include "wine/test.h" #include "wine/heap.h" -#define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) -#define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define CHECK_EXPECTED_METHOD(method_name) \ @@ -138,18 +136,6 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } -static LONG cLocks; - -static void LockModule(void) -{ - InterlockedIncrement(&cLocks); -} - -static void UnlockModule(void) -{ - InterlockedDecrement(&cLocks); -} - static SIZE_T round_global_size(SIZE_T size) { static SIZE_T global_size_alignment = -1; @@ -163,7 +149,23 @@ static SIZE_T round_global_size(SIZE_T size) return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1)); } -static DWORD external_connections; +struct test_factory +{ + IClassFactory IClassFactory_iface; + IExternalConnection IExternalConnection_iface; + LONG refcount; + unsigned int external_connections; +}; + +static struct test_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct test_factory, IClassFactory_iface); +} + +static struct test_factory *impl_from_IExternalConnection(IExternalConnection *iface) +{ + return CONTAINING_RECORD(iface, struct test_factory, IExternalConnection_iface); +} static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { @@ -174,28 +176,31 @@ static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *ifa static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) { - return 2; + struct test_factory *factory = impl_from_IExternalConnection(iface); + return IClassFactory_AddRef(&factory->IClassFactory_iface); } static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) { - return 1; + struct test_factory *factory = impl_from_IExternalConnection(iface); + return IClassFactory_Release(&factory->IClassFactory_iface); } static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + struct test_factory *factory = impl_from_IExternalConnection(iface); + ok(extconn == EXTCONN_STRONG, "Unexpected connection type %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - return ++external_connections; + return ++factory->external_connections; } static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + struct test_factory *factory = impl_from_IExternalConnection(iface); + ok(extconn == EXTCONN_STRONG, "Unexpected connection type %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - - return --external_connections; + return --factory->external_connections; } static const IExternalConnectionVtbl ExternalConnectionVtbl = { @@ -206,70 +211,70 @@ static const IExternalConnectionVtbl ExternalConnectionVtbl = { ExternalConnection_ReleaseConnection }; -static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; - -static HRESULT WINAPI Test_IClassFactory_QueryInterface( - LPCLASSFACTORY iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI test_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - if (ppvObj == NULL) return E_POINTER; + struct test_factory *factory = impl_from_IClassFactory(iface); + + if (!obj) return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = iface; - IClassFactory_AddRef(iface); - return S_OK; + *obj = iface; } - - if(IsEqualGUID(riid, &IID_IExternalConnection)) { - *ppvObj = &ExternalConnection; - return S_OK; + else if (IsEqualGUID(riid, &IID_IExternalConnection)) + { + *obj = &factory->IExternalConnection_iface; + } + else + { + *obj = NULL; + return E_NOINTERFACE; } - *ppvObj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } -static ULONG WINAPI Test_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI test_factory_AddRef(IClassFactory *iface) { - LockModule(); - return 2; /* non-heap-based object */ + struct test_factory *factory = impl_from_IClassFactory(iface); + return InterlockedIncrement(&factory->refcount); } -static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI test_factory_Release(IClassFactory *iface) { - UnlockModule(); - return 1; /* non-heap-based object */ + struct test_factory *factory = impl_from_IClassFactory(iface); + return InterlockedDecrement(&factory->refcount); } -static HRESULT WINAPI Test_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI test_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **obj) { return E_NOTIMPL; } -static HRESULT WINAPI Test_IClassFactory_LockServer( - LPCLASSFACTORY iface, - BOOL fLock) +static HRESULT WINAPI test_factory_LockServer(IClassFactory *iface, BOOL lock) { return S_OK; } -static const IClassFactoryVtbl TestClassFactory_Vtbl = +static const IClassFactoryVtbl test_factory_vtbl = { - Test_IClassFactory_QueryInterface, - Test_IClassFactory_AddRef, - Test_IClassFactory_Release, - Test_IClassFactory_CreateInstance, - Test_IClassFactory_LockServer + test_factory_QueryInterface, + test_factory_AddRef, + test_factory_Release, + test_factory_CreateInstance, + test_factory_LockServer }; -static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; +static void test_factory_init(struct test_factory *factory) +{ + factory->IClassFactory_iface.lpVtbl = &test_factory_vtbl; + factory->IExternalConnection_iface.lpVtbl = &ExternalConnectionVtbl; + factory->refcount = 1; + factory->external_connections = 0; +} typedef struct { @@ -796,6 +801,7 @@ static void test_ROT(void) IMoniker *pMoniker = NULL; struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; + struct test_factory factory; DWORD dwCookie; static const char *methods_register_no_ROTData[] = { @@ -830,7 +836,7 @@ static void test_ROT(void) NULL }; - cLocks = 0; + test_factory_init(&factory); hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); @@ -839,15 +845,13 @@ static void test_ROT(void) test_moniker->no_IROTData = TRUE; expected_method_list = methods_register_no_ROTData; - external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, &test_moniker->IMoniker_iface, &dwCookie); ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); - ok(external_connections == 1, "external_connections = %d\n", external_connections); - - ok_more_than_one_lock(); + ok(factory.external_connections == 1, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_isrunning_no_ROTData; hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); @@ -856,19 +860,17 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - ok(external_connections == 0, "external_connections = %d\n", external_connections); - - ok_no_locks(); + ok(!factory.external_connections, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_register; /* try with our own moniker */ test_moniker->no_IROTData = FALSE; - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); - - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_isrunning; hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); @@ -877,50 +879,47 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = CreateFileMoniker(wszFileName, &pMoniker); ok_ole_success(hr, CreateClassMoniker); /* test flags: 0 */ - external_connections = 0; - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, - pMoniker, &dwCookie); + factory.external_connections = 0; + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - ok(external_connections == 0, "external_connections = %d\n", external_connections); - - ok_more_than_one_lock(); + ok(!factory.external_connections, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT */ /* only succeeds when process is started by SCM and has LocalService * or RunAs AppId values */ - hr = IRunningObjectTable_Register(pROT, - ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE | ROTFLAGS_ALLOWANYCLIENT, + (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); todo_wine { ok(hr == CO_E_WRONG_SERVER_IDENTITY, "Unexpected hr %#x.\n", hr); } + if (SUCCEEDED(hr)) + { + hr = IRunningObjectTable_Revoke(pROT, dwCookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } - hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); @@ -938,6 +937,9 @@ static void test_ROT_multiple_entries(void) IUnknown *pObject = NULL; static const WCHAR moniker_path[] = {'\\', 'w','i','n','d','o','w','s','\\','s','y','s','t','e','m','\\','t','e','s','t','1','.','d','o','c',0}; + struct test_factory factory; + + test_factory_init(&factory); hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); @@ -945,10 +947,10 @@ static void test_ROT_multiple_entries(void) hr = CreateFileMoniker(moniker_path, &pMoniker); ok_ole_success(hr, CreateFileMoniker); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie1); + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie1); ok_ole_success(hr, IRunningObjectTable_Register); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie2); + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie2); ok(hr == MK_S_MONIKERALREADYREGISTERED, "IRunningObjectTable_Register should have returned MK_S_MONIKERALREADYREGISTERED instead of 0x%08x\n", hr); ok(dwCookie1 != dwCookie2, "cookie returned for registering duplicate object shouldn't match cookie of original object (0x%x)\n", dwCookie1); @@ -1103,6 +1105,9 @@ static void test_MkParseDisplayName(void) {&pbc, wszEmpty, &eaten, NULL}, {&pbc, wszEmpty, &eaten, &pmk}, }; + struct test_factory factory; + + test_factory_init(&factory); hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); @@ -1143,7 +1148,7 @@ todo_wine ok_ole_success(hr, CreateFileMoniker); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); ok_ole_success(hr, IBindCtx_GetRunningObjectTable); - hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&factory.IClassFactory_iface, pmk, &pdwReg1); ok_ole_success(hr, IRunningObjectTable_Register); IMoniker_Release(pmk); pmk = NULL; @@ -1164,7 +1169,7 @@ todo_wine ok_ole_success(hr, CreateFileMoniker); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); ok_ole_success(hr, IBindCtx_GetRunningObjectTable); - hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&factory.IClassFactory_iface, pmk, &pdwReg1); ok_ole_success(hr, IRunningObjectTable_Register); IMoniker_Release(pmk); pmk = NULL; @@ -3032,6 +3037,7 @@ todo_wine static void test_pointer_moniker(void) { IMoniker *moniker, *moniker2, *prefix, *inverse, *anti; + struct test_factory factory; IEnumMoniker *enummoniker; DWORD hash, size; HRESULT hr; @@ -3045,13 +3051,13 @@ static void test_pointer_moniker(void) LARGE_INTEGER pos; CLSID clsid; - cLocks = 0; + test_factory_init(&factory); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, NULL); - ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); - ok_ole_success(hr, CreatePointerMoniker); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3089,7 +3095,7 @@ static void test_pointer_moniker(void) IMarshal_Release(marshal); - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); /* Display Name */ @@ -3122,9 +3128,7 @@ static void test_pointer_moniker(void) /* Hashing */ hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - ok(hash == PtrToUlong(&Test_ClassFactory), - "Hash value should have been 0x%08x, instead of 0x%08x\n", - PtrToUlong(&Test_ClassFactory), hash); + ok(hash == PtrToUlong(&factory.IClassFactory_iface), "Unexpected hash value %#x.\n", hash); /* IsSystemMoniker test */ TEST_MONIKER_TYPE(moniker, MKSYS_POINTERMONIKER); @@ -3154,8 +3158,7 @@ static void test_pointer_moniker(void) IMoniker_Release(moniker); -todo_wine - ok(cLocks == 0, "Number of locks should be 0, but actually is %d.\n", cLocks); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = CreatePointerMoniker(NULL, &moniker); ok_ole_success(hr, CreatePointerMoniker); @@ -3178,10 +3181,10 @@ todo_wine IMoniker_Release(moniker); /* CommonPrefixWith() */ - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker2); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker2); ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, NULL); -- 2.33.0

1 3

[PATCH 1/5] dinput: Pass output instance to get_object_info HID joystick callback.
by Rémi Bernon 20 Sep '21

20 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 709953be8f0..1614f5e8583 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -652,11 +652,11 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) return DIERR_INVALIDPARAM; - ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); if (ret != DIENUM_CONTINUE) return S_OK; - ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); if (ret != DIENUM_CONTINUE) return S_OK; - enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, instance ); return S_OK; } -- 2.33.0

2 9

[PATCH 1/5] winebus.sys: Add a VID and PID to mouse and keyboard devices.
by Rémi Bernon 20 Sep '21

20 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/unixlib.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 929997f1aa7..6b6a2595ca0 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -143,6 +143,8 @@ static const WCHAR mouse_bus_id[] = {'W','I','N','E','M','O','U','S','E',0}; static const struct device_desc mouse_device_desc = { .busid = mouse_bus_id, + .vid = 0x845e, + .pid = 0x0001, .input = -1, .manufacturer = {"The Wine Project"}, .product = {"Wine HID mouse"}, @@ -241,6 +243,8 @@ static const WCHAR keyboard_bus_id[] = {'W','I','N','E','K','E','Y','B','O','A', static const struct device_desc keyboard_device_desc = { .busid = keyboard_bus_id, + .vid = 0x845e, + .pid = 0x0002, .input = -1, .manufacturer = {"The Wine Project"}, .product = {"Wine HID keyboard"}, -- 2.33.0

1 4

[PATCH] winegcc: Correctly put the -munix manual section in its own paragraph.
by Zebediah Figura 20 Sep '21

20 Sep '21

Use a style consistent with the rest of the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tools/winegcc/winegcc.man.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 831a98323cf..87c1496fd18 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,9 +59,8 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. -.B \-munix +.IP \fB-munix\fR Set when building the Unix counterpart of a builtin module. -.TP .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and -- 2.33.0

1 0

[PATCH v2] gdi32: Implement D3DKMTOpenAdapterFromDeviceName().
by Paul Gofman 20 Sep '21

20 Sep '21

Fixes non functional setting page in Resident Evil Village. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use GUID_DISPLAY_DEVICE_ARRIVAL directly; - check for NULL device_name->pDeviceName explicitly; - call SetupDiEnumDeviceInterfaces() directly without SetupDiEnumDeviceInfo(); - curly braces around WARN(); - call release_display_device_init_mutex() sooner; - use %d to print BOOL; - send WM_NULL to desktop window to init driver instead of creating window; - actually pass device_name to pD3DKMTOpenAdapterFromDeviceName when testing NULL device_name->pDeviceName. dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/objects.c | 66 ++++++++++++++++++++++++ dlls/gdi32/tests/Makefile.in | 2 +- dlls/gdi32/tests/driver.c | 98 ++++++++++++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6dbc8a9bf12..46534796317 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory @ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 7f6893f0952..0acf736786b 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "devguid.h" #include "setupapi.h" +#include "ntddvdeo.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -889,6 +890,71 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/****************************************************************************** + * D3DKMTOpenAdapterFromDeviceName (GDI32.@) + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromDeviceName(D3DKMT_OPENADAPTERFROMDEVICENAME *device_name) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail_data; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + NTSTATUS status = STATUS_INVALID_PARAMETER; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + WCHAR iface_detail_buffer[256]; + BOOL found = FALSE; + DEVPROPTYPE type; + unsigned int i; + HDEVINFO set; + HANDLE mutex; + + TRACE( "device_name %p.\n", device_name ); + + if (!device_name || !device_name->pDeviceName) return STATUS_INVALID_PARAMETER; + + TRACE("device path %s.\n", debugstr_w( device_name->pDeviceName )); + + mutex = get_display_device_init_mutex(); + + set = SetupDiGetClassDevsW( &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + iface_detail_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_detail_data->cbSize = sizeof(*iface_detail_data); + + for (i = 0; SetupDiEnumDeviceInterfaces( set, NULL, &GUID_DISPLAY_DEVICE_ARRIVAL, i, &iface_data ); ++i) + { + if (!SetupDiGetDeviceInterfaceDetailW( set, &iface_data, iface_detail_data, + sizeof(iface_detail_buffer), NULL, &device_data )) + { + ERR( "Could not get interface detail, iface %u.\n", i ); + continue; + } + if (lstrcmpiW( device_name->pDeviceName, iface_detail_data->DevicePath )) continue; + + if (SetupDiGetDevicePropertyW( set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid_desc.AdapterLuid, + sizeof( luid_desc.AdapterLuid ), NULL, 0)) + found = TRUE; + else + ERR( "Could not get luid.\n" ); + + break; + } + + SetupDiDestroyDeviceInfoList( set ); + + release_display_device_init_mutex( mutex ); + + if (found && !(status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) + { + device_name->hAdapter = luid_desc.hAdapter; + device_name->AdapterLuid = luid_desc.AdapterLuid; + } + else + { + WARN( "Device %s not found.\n", debugstr_w(device_name->pDeviceName )); + } + return status; +} + /*********************************************************************** * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) */ diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 876f6a376a2..3eb478ff765 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = setupapi user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index eb0da18b32e..c05522c0394 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -29,16 +29,22 @@ #include "winternl.h" #include "dwmapi.h" #include "ddk/d3dkmthk.h" +#include "initguid.h" +#include "setupapi.h" +#include "ntddvdeo.h" #include "wine/test.h" static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFROMDEVICENAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); @@ -789,6 +795,96 @@ static void test_D3DKMTCheckOcclusion(void) DestroyWindow(hwnd); } +static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterface_guid, NTSTATUS expected_status) +{ + BYTE iface_detail_buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + 256 * sizeof(WCHAR)]; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_data; + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DEVPROPTYPE type; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + LUID luid; + BOOL ret; + + set = SetupDiGetClassDevsW(devinterface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed, error %u.\n", GetLastError()); + + iface_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_data->cbSize = sizeof(*iface_data); + device_name.pDeviceName = iface_data->DevicePath; + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, NULL, devinterface_guid, i, &iface)) + { + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, iface_data, + sizeof(iface_detail_buffer), NULL, &device_data ); + ok(ret, "Got unexpected ret %d, GetLastError() %u.\n", ret, GetLastError()); + + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == expected_status, "Got status %#x, expected %#x.\n", status, expected_status); + + if (!status) + { + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0); + ok(ret || GetLastError() == ERROR_NOT_FOUND, "Got unexpected ret %d, GetLastError() %u.\n", + ret, GetLastError()); + + if (ret) + { + ret = RtlEqualLuid( &luid, &device_name.AdapterLuid); + ok(ret, "Luid does not match.\n"); + } + else + { + skip("Luid not found.\n"); + } + + close_adapter_desc.hAdapter = device_name.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(!status, "Got unexpected status %#x.\n", status); + } + ++i; + } + if (!i) + win_skip("No devices found.\n"); + + SetupDiDestroyDeviceInfoList( set ); +} + +static void test_D3DKMTOpenAdapterFromDeviceName(void) +{ + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + NTSTATUS status; + + /* Make sure display devices are initialized. */ + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + + status = pD3DKMTOpenAdapterFromDeviceName(NULL); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("pD3DKMTOpenAdapterFromDeviceName() is not supported.\n"); + return; + } + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + memset(&device_name, 0, sizeof(device_name)); + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + winetest_push_context("GUID_DEVINTERFACE_DISPLAY_ADAPTER"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DEVINTERFACE_DISPLAY_ADAPTER, STATUS_INVALID_PARAMETER); + winetest_pop_context(); + + winetest_push_context("GUID_DISPLAY_DEVICE_ARRIVAL"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DISPLAY_DEVICE_ARRIVAL, STATUS_SUCCESS); + winetest_pop_context(); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -799,6 +895,7 @@ START_TEST(driver) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); + pD3DKMTOpenAdapterFromDeviceName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromDeviceName"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); @@ -814,6 +911,7 @@ START_TEST(driver) test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); + test_D3DKMTOpenAdapterFromDeviceName(); FreeLibrary(dwmapi); } -- 2.31.1

2 1

[PATCH] setupapi/tests: Add display device interface tests.
by Zhiyi Zhang 20 Sep '21

20 Sep '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/misc.c | 85 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f16f310b3f7..10ea7c0cba8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -28,6 +28,9 @@ #include "winnls.h" #include "winuser.h" #include "winreg.h" +#include "devguid.h" +#include "initguid.h" +#include "ntddvdeo.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -819,6 +822,87 @@ static void test_CM_Get_Version(void) ok(ret == 0x0400, "got version %#x\n", ret); } +#define check_device_interface(a, b) _check_device_interface(__LINE__, a, b) +static void _check_device_interface(int line, const char *instance_id, const GUID *guid) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + BOOL ret; + + devinfo = SetupDiGetClassDevsA(guid, instance_id, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ret = SetupDiEnumDeviceInfo(devinfo, 0, &device_data); + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win7 */, + "SetupDiEnumDeviceInfo failed, error %u.\n", GetLastError()); + if (!ret) + { + SetupDiDestroyDeviceInfoList(devinfo); + return; + } + ret = SetupDiEnumDeviceInterfaces(devinfo, &device_data, guid, 0, &iface_data); + ok_(__FILE__, line)(ret, "SetupDiEnumDeviceInterfaces failed, error %u.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&iface_data.InterfaceClassGuid, guid), + "Expected guid %s, got %s.\n", wine_dbgstr_guid(guid), + wine_dbgstr_guid(&iface_data.InterfaceClassGuid)); + + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void test_device_interfaces(void) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + char instance_id[MAX_DEVICE_ID_LEN]; + DWORD device_idx = 0, size, error; + HDEVINFO devinfo; + BOOL ret; + + /* GPUs */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("GPU %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_DISPLAY_ADAPTER); + check_device_interface(instance_id, &GUID_DISPLAY_DEVICE_ARRIVAL); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0, "Expected at least one GPU.\n"); + SetupDiDestroyDeviceInfoList(devinfo); + + /* Monitors */ + device_idx = 0; + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("Monitor %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_MONITOR); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0 || broken(device_idx == 0) /* w7u_2qxl TestBot */, + "Expected at least one monitor.\n"); + SetupDiDestroyDeviceInfoList(devinfo); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -841,4 +925,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); test_CM_Get_Version(); + test_device_interfaces(); } -- 2.30.2

1 0

[PATCH 1/5] d3d10/effect: Move effect creation API functions.
by Nikolay Sivov 19 Sep '21

19 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 53 ----------------------------------------- dlls/d3d10/effect.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 2d08c82a3c4..6961589ca31 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -230,50 +230,6 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } -static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) -{ - const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); - const DWORD *id = key; - - return *id - t->id; -} - -HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, - ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) -{ - struct d3d10_effect *object; - HRESULT hr; - - FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", - data, data_size, flags, device, effect_pool, effect); - - if (!(object = heap_alloc_zero(sizeof(*object)))) - { - ERR("Failed to allocate D3D10 effect object memory\n"); - return E_OUTOFMEMORY; - } - - wine_rb_init(&object->types, d3d10_effect_type_compare); - object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; - object->refcount = 1; - ID3D10Device_AddRef(device); - object->device = device; - - hr = d3d10_effect_parse(object, data, data_size); - if (FAILED(hr)) - { - ERR("Failed to parse effect\n"); - IUnknown_Release(&object->ID3D10Effect_iface); - return hr; - } - - *effect = &object->ID3D10Effect_iface; - - TRACE("Created ID3D10Effect %p\n", object); - - return S_OK; -} - HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) @@ -287,15 +243,6 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } -HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, - ID3D10Device *device, ID3D10EffectPool **effect_pool) -{ - FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", - data, data_size, fx_flags, device, effect_pool); - - return E_NOTIMPL; -} - const char * WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e77d0691fcf..7342c2dbe23 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8360,3 +8360,56 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl = d3d10_effect_type_GetMemberName, d3d10_effect_type_GetMemberSemantic, }; + +static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); + const DWORD *id = key; + + return *id - t->id; +} + +HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) +{ + struct d3d10_effect *object; + HRESULT hr; + + FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + data, data_size, flags, device, effect_pool, effect); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + { + ERR("Failed to allocate D3D10 effect object memory\n"); + return E_OUTOFMEMORY; + } + + wine_rb_init(&object->types, d3d10_effect_type_compare); + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; + object->refcount = 1; + ID3D10Device_AddRef(device); + object->device = device; + + hr = d3d10_effect_parse(object, data, data_size); + if (FAILED(hr)) + { + ERR("Failed to parse effect\n"); + IUnknown_Release(&object->ID3D10Effect_iface); + return hr; + } + + *effect = &object->ID3D10Effect_iface; + + TRACE("Created effect %p\n", object); + + return S_OK; +} + +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, + ID3D10Device *device, ID3D10EffectPool **effect_pool) +{ + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effect_pool %p stub.\n", + data, data_size, fx_flags, device, effect_pool); + + return E_NOTIMPL; +} -- 2.33.0

3 15

[PATCH] d3dx10_35/tests: Enable tests.
by Nikolay Sivov 19 Sep '21

19 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_35/Makefile.in | 1 + dlls/d3dx10_35/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) create mode 100644 dlls/d3dx10_35/tests/Makefile.in diff --git a/configure b/configure index 00a5be6a504..db592f0868d 100755 --- a/configure +++ b/configure @@ -20340,6 +20340,7 @@ wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 +wine_fn_config_makefile dlls/d3dx10_35/tests enable_tests wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_36/tests enable_tests wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 diff --git a/configure.ac b/configure.ac index dea5fe61bf3..0bc46a1427b 100644 --- a/configure.ac +++ b/configure.ac @@ -3064,6 +3064,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_35/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index 419c221b324..0cbbf1841de 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_35.dll +IMPORTLIB = d3dx10_35 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_35/tests/Makefile.in b/dlls/d3dx10_35/tests/Makefile.in new file mode 100644 index 00000000000..8f08bb1ca6a --- /dev/null +++ b/dlls/d3dx10_35/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_35.dll +IMPORTS = d3dx10_35 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c -- 2.33.0

2 1

[PATCH 1/4] user32/tests: Fix occasional failure in WmShowNoActivate_2 message sequence.
by Connor McAdams 19 Sep '21

19 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cdb162df765..9c086862cd3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13413,6 +13413,7 @@ static const struct message WmShowNoActivate_2[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|optional }, /* Sometimes sent on Win8+. */ + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, -- 2.25.1

2 6

[PATCH v2 1/2] oleacc: Add Client_get_accFocus implementation.
by Connor McAdams 18 Sep '21

18 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/client.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0c2215fe62e..38611520b38 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -303,11 +303,35 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, return S_OK; } -static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID) +static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *focus) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pvarID); - return E_NOTIMPL; + GUITHREADINFO info; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, focus); + + V_VT(focus) = VT_EMPTY; + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus) { + if(info.hwndFocus == This->hwnd) { + V_VT(focus) = VT_I4; + V_I4(focus) = CHILDID_SELF; + } + else if(IsChild(This->hwnd, info.hwndFocus)) { + IDispatch *disp; + + hr = AccessibleObjectFromWindow(info.hwndFocus, OBJID_WINDOW, + &IID_IDispatch, (void**)&disp); + if(FAILED(hr)) return hr; + if(!disp) return E_FAIL; + + V_VT(focus) = VT_DISPATCH; + V_DISPATCH(focus) = disp; + } + } + + return S_OK; } static HRESULT WINAPI Client_get_accSelection(IAccessible *iface, VARIANT *pvarID) -- 2.25.1

1 1

[PATCH v2 1/3] ntdll: Factor out SMBIOS table creation.
by Brendan Shanks 17 Sep '21

17 Sep '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: create_smbios_tables() now takes arguments in several structs. Also, dmidecode for Windows is helpful for verifying generated SMBIOS tables: http://gnuwin32.sourceforge.net/packages/dmidecode.htm dlls/ntdll/unix/system.c | 478 +++++++++++++++++++++++---------------- 1 file changed, 283 insertions(+), 195 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 2cdc6278f3d..41a7d70fa21 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -166,6 +166,60 @@ struct smbios_boot_info #include "poppack.h" +struct smbios_bios_args +{ + const char *vendor; + size_t vendor_len; + const char *version; + size_t version_len; + const char *date; + size_t date_len; +}; + +struct smbios_system_args +{ + const char *vendor; + size_t vendor_len; + const char *product; + size_t product_len; + const char *version; + size_t version_len; + const char *serial; + size_t serial_len; + GUID uuid; + const char *sku; + size_t sku_len; + const char *family; + size_t family_len; +}; + +struct smbios_board_args +{ + const char *vendor; + size_t vendor_len; + const char *product; + size_t product_len; + const char *version; + size_t version_len; + const char *serial; + size_t serial_len; + const char *asset_tag; + size_t asset_tag_len; +}; + +struct smbios_chassis_args +{ + const char *vendor; + size_t vendor_len; + BYTE type; + const char *version; + size_t version_len; + const char *serial; + size_t serial_len; + const char *asset_tag; + size_t asset_tag_len; +}; + /* Firmware table providers */ #define ACPI 0x41435049 #define FIRM 0x4649524D @@ -1264,13 +1318,194 @@ static NTSTATUS create_cpuset_info(SYSTEM_CPU_SET_INFORMATION *info) #ifdef linux -static void copy_smbios_string( char **buffer, char *s, size_t len ) +static void copy_smbios_string( char **buffer, const char *s, size_t len ) { if (!len) return; memcpy(*buffer, s, len + 1); *buffer += len + 1; } +static NTSTATUS create_smbios_tables( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, + ULONG *required_len, + const struct smbios_bios_args *bios_args, + const struct smbios_system_args *system_args, + const struct smbios_board_args *board_args, + const struct smbios_chassis_args *chassis_args ) +{ + char *buffer = (char*)sfti->TableBuffer; + BYTE string_count; + BYTE handle_count = 0; + struct smbios_prologue *prologue; + struct smbios_bios *bios; + struct smbios_system *system; + struct smbios_board *board; + struct smbios_chassis *chassis; + struct smbios_boot_info *boot_info; + struct smbios_header *end_of_table; + + *required_len = sizeof(struct smbios_prologue); + +#define L(l) (l + (l ? 1 : 0)) + *required_len += sizeof(struct smbios_bios); + *required_len += max(L(bios_args->vendor_len) + L(bios_args->version_len) + L(bios_args->date_len) + 1, 2); + + *required_len += sizeof(struct smbios_system); + *required_len += max(L(system_args->vendor_len) + L(system_args->product_len) + L(system_args->version_len) + + L(system_args->serial_len) + L(system_args->sku_len) + L(system_args->family_len) + 1, 2); + + *required_len += sizeof(struct smbios_board); + *required_len += max(L(board_args->vendor_len) + L(board_args->product_len) + L(board_args->version_len) + + L(board_args->serial_len) + L(board_args->asset_tag_len) + 1, 2); + + *required_len += sizeof(struct smbios_chassis); + *required_len += max(L(chassis_args->vendor_len) + L(chassis_args->version_len) + L(chassis_args->serial_len) + + L(chassis_args->asset_tag_len) + 1, 2); + + *required_len += sizeof(struct smbios_boot_info); + *required_len += 2; + + *required_len += sizeof(struct smbios_header); + *required_len += 2; +#undef L + + sfti->TableBufferLength = *required_len; + + *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + + if (available_len < *required_len) + return STATUS_BUFFER_TOO_SMALL; + + prologue = (struct smbios_prologue*)buffer; + prologue->calling_method = 0; + prologue->major_version = 2; + prologue->minor_version = 4; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); + buffer += sizeof(struct smbios_prologue); + + string_count = 0; + bios = (struct smbios_bios*)buffer; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = handle_count++; + bios->vendor = bios_args->vendor_len ? ++string_count : 0; + bios->version = bios_args->version_len ? ++string_count : 0; + bios->start = 0; + bios->date = bios_args->date_len ? ++string_count : 0; + bios->size = 0; + bios->characteristics = 0x4; /* not supported */ + bios->characteristics_ext[0] = 0; + bios->characteristics_ext[1] = 0; + bios->system_bios_major_release = 0xFF; /* not supported */ + bios->system_bios_minor_release = 0xFF; /* not supported */ + bios->ec_firmware_major_release = 0xFF; /* not supported */ + bios->ec_firmware_minor_release = 0xFF; /* not supported */ + buffer += sizeof(struct smbios_bios); + + copy_smbios_string(&buffer, bios_args->vendor, bios_args->vendor_len); + copy_smbios_string(&buffer, bios_args->version, bios_args->version_len); + copy_smbios_string(&buffer, bios_args->date, bios_args->date_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + system = (struct smbios_system*)buffer; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = handle_count++; + system->vendor = system_args->vendor_len ? ++string_count : 0; + system->product = system_args->product_len ? ++string_count : 0; + system->version = system_args->version_len ? ++string_count : 0; + system->serial = system_args->serial_len ? ++string_count : 0; + memcpy( system->uuid, &system_args->uuid, sizeof(GUID) ); + system->wake_up_type = 0x02; /* unknown */ + system->sku_number = system_args->sku_len ? ++string_count : 0; + system->family = system_args->family_len ? ++string_count : 0; + buffer += sizeof(struct smbios_system); + + copy_smbios_string(&buffer, system_args->vendor, system_args->vendor_len); + copy_smbios_string(&buffer, system_args->product, system_args->product_len); + copy_smbios_string(&buffer, system_args->version, system_args->version_len); + copy_smbios_string(&buffer, system_args->serial, system_args->serial_len); + copy_smbios_string(&buffer, system_args->sku, system_args->sku_len); + copy_smbios_string(&buffer, system_args->family, system_args->family_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + chassis = (struct smbios_chassis*)buffer; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = handle_count++; + chassis->vendor = chassis_args->vendor_len ? ++string_count : 0; + chassis->type = chassis_args->type; + chassis->version = chassis_args->version_len ? ++string_count : 0; + chassis->serial = chassis_args->serial_len ? ++string_count : 0; + chassis->asset_tag = chassis_args->asset_tag_len ? ++string_count : 0; + chassis->boot_state = 0x02; /* unknown */ + chassis->power_supply_state = 0x02; /* unknown */ + chassis->thermal_state = 0x02; /* unknown */ + chassis->security_status = 0x02; /* unknown */ + chassis->oem_defined = 0; + chassis->height = 0; /* undefined */ + chassis->num_power_cords = 0; /* unspecified */ + chassis->num_contained_elements = 0; + chassis->contained_element_rec_length = 3; + buffer += sizeof(struct smbios_chassis); + + copy_smbios_string(&buffer, chassis_args->vendor, chassis_args->vendor_len); + copy_smbios_string(&buffer, chassis_args->version, chassis_args->version_len); + copy_smbios_string(&buffer, chassis_args->serial, chassis_args->serial_len); + copy_smbios_string(&buffer, chassis_args->asset_tag, chassis_args->asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + string_count = 0; + board = (struct smbios_board*)buffer; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = handle_count++; + board->vendor = board_args->vendor_len ? ++string_count : 0; + board->product = board_args->product_len ? ++string_count : 0; + board->version = board_args->version_len ? ++string_count : 0; + board->serial = board_args->serial_len ? ++string_count : 0; + board->asset_tag = board_args->asset_tag_len ? ++string_count : 0; + board->feature_flags = 0x5; /* hosting board, removable */ + board->location = 0; + board->chassis_handle = chassis->hdr.handle; + board->board_type = 0xa; /* motherboard */ + board->num_contained_handles = 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_args->vendor, board_args->vendor_len); + copy_smbios_string(&buffer, board_args->product, board_args->product_len); + copy_smbios_string(&buffer, board_args->version, board_args->version_len); + copy_smbios_string(&buffer, board_args->serial, board_args->serial_len); + copy_smbios_string(&buffer, board_args->asset_tag, board_args->asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + boot_info = (struct smbios_boot_info*)buffer; + boot_info->hdr.type = 32; + boot_info->hdr.length = sizeof(struct smbios_boot_info); + boot_info->hdr.handle = handle_count++; + memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); + memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ + buffer += sizeof(struct smbios_boot_info); + *buffer++ = 0; + *buffer++ = 0; + + end_of_table = (struct smbios_header*)buffer; + end_of_table->type = 127; + end_of_table->length = sizeof(struct smbios_header); + end_of_table->handle = handle_count++; + buffer += sizeof(struct smbios_header); + *buffer++ = 0; + *buffer++ = 0; + + return STATUS_SUCCESS; +} + static size_t get_smbios_string( const char *path, char *str, size_t size ) { FILE *file; @@ -1333,210 +1568,63 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON case RSMB: { char bios_vendor[128], bios_version[128], bios_date[128]; - size_t bios_vendor_len, bios_version_len, bios_date_len; + struct smbios_bios_args bios_args; char system_vendor[128], system_product[128], system_version[128], system_serial[128]; - size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char system_sku[128], system_family[128]; - size_t system_sku_len, system_family_len; + struct smbios_system_args system_args; char board_vendor[128], board_product[128], board_version[128], board_serial[128], board_asset_tag[128]; - size_t board_vendor_len, board_product_len, board_version_len, board_serial_len, board_asset_tag_len; + struct smbios_board_args board_args; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; char chassis_type[11] = "2"; /* unknown */ - size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; - char *buffer = (char*)sfti->TableBuffer; - BYTE string_count; - BYTE handle_count = 0; - struct smbios_prologue *prologue; - struct smbios_bios *bios; - struct smbios_system *system; - struct smbios_board *board; - struct smbios_chassis *chassis; - struct smbios_boot_info *boot_info; - struct smbios_header *end_of_table; + struct smbios_chassis_args chassis_args; #define S(s) s, sizeof(s) - bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); - bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); - bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); - system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); - system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); - system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); - system_sku_len = get_smbios_string("/sys/class/dmi/id/product_sku", S(system_sku)); - system_family_len = get_smbios_string("/sys/class/dmi/id/product_family", S(system_family)); - board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); - board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); - board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); - board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); - board_asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); - chassis_vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); - chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); - chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); - chassis_asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); + bios_args.vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); + bios_args.vendor = bios_vendor; + bios_args.version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); + bios_args.version = bios_version; + bios_args.date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); + bios_args.date = bios_date; + + system_args.vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); + system_args.vendor = system_vendor; + system_args.product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); + system_args.product = system_product; + system_args.version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); + system_args.version = system_version; + system_args.serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); + system_args.serial = system_serial; + get_system_uuid(&system_args.uuid); + system_args.sku_len = get_smbios_string("/sys/class/dmi/id/product_sku", S(system_sku)); + system_args.sku = system_sku; + system_args.family_len = get_smbios_string("/sys/class/dmi/id/product_family", S(system_family)); + system_args.family = system_family; + + board_args.vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); + board_args.vendor = board_vendor; + board_args.product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); + board_args.product = board_product; + board_args.version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); + board_args.version = board_version; + board_args.serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); + board_args.serial = board_serial; + board_args.asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); + board_args.asset_tag = board_asset_tag; + + chassis_args.vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); + chassis_args.vendor = chassis_vendor; get_smbios_string("/sys/class/dmi/id/chassis_type", S(chassis_type)); + chassis_args.type = atoi(chassis_type); + chassis_args.version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); + chassis_args.version = chassis_version; + chassis_args.serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); + chassis_args.serial = chassis_serial; + chassis_args.asset_tag_len = get_smbios_string("/sys/class/dmi/id/chassis_tag", S(chassis_asset_tag)); + chassis_args.asset_tag = chassis_asset_tag; #undef S - *required_len = sizeof(struct smbios_prologue); - -#define L(l) (l + (l ? 1 : 0)) - *required_len += sizeof(struct smbios_bios); - *required_len += max(L(bios_vendor_len) + L(bios_version_len) + L(bios_date_len) + 1, 2); - - *required_len += sizeof(struct smbios_system); - *required_len += max(L(system_vendor_len) + L(system_product_len) + L(system_version_len) + - L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); - - *required_len += sizeof(struct smbios_board); - *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + - L(board_serial_len) + L(board_asset_tag_len) + 1, 2); - - *required_len += sizeof(struct smbios_chassis); - *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + - L(chassis_asset_tag_len) + 1, 2); - - *required_len += sizeof(struct smbios_boot_info); - *required_len += 2; - - *required_len += sizeof(struct smbios_header); - *required_len += 2; -#undef L - - sfti->TableBufferLength = *required_len; - - *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); - - if (available_len < *required_len) - return STATUS_BUFFER_TOO_SMALL; - - prologue = (struct smbios_prologue*)buffer; - prologue->calling_method = 0; - prologue->major_version = 2; - prologue->minor_version = 4; - prologue->revision = 0; - prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); - buffer += sizeof(struct smbios_prologue); - - string_count = 0; - bios = (struct smbios_bios*)buffer; - bios->hdr.type = 0; - bios->hdr.length = sizeof(struct smbios_bios); - bios->hdr.handle = handle_count++; - bios->vendor = bios_vendor_len ? ++string_count : 0; - bios->version = bios_version_len ? ++string_count : 0; - bios->start = 0; - bios->date = bios_date_len ? ++string_count : 0; - bios->size = 0; - bios->characteristics = 0x4; /* not supported */ - bios->characteristics_ext[0] = 0; - bios->characteristics_ext[1] = 0; - bios->system_bios_major_release = 0xFF; /* not supported */ - bios->system_bios_minor_release = 0xFF; /* not supported */ - bios->ec_firmware_major_release = 0xFF; /* not supported */ - bios->ec_firmware_minor_release = 0xFF; /* not supported */ - buffer += sizeof(struct smbios_bios); - - copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); - copy_smbios_string(&buffer, bios_version, bios_version_len); - copy_smbios_string(&buffer, bios_date, bios_date_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - system = (struct smbios_system*)buffer; - system->hdr.type = 1; - system->hdr.length = sizeof(struct smbios_system); - system->hdr.handle = handle_count++; - system->vendor = system_vendor_len ? ++string_count : 0; - system->product = system_product_len ? ++string_count : 0; - system->version = system_version_len ? ++string_count : 0; - system->serial = system_serial_len ? ++string_count : 0; - get_system_uuid( (GUID *)system->uuid ); - system->wake_up_type = 0x02; /* unknown */ - system->sku_number = system_sku_len ? ++string_count : 0; - system->family = system_family_len ? ++string_count : 0; - buffer += sizeof(struct smbios_system); - - copy_smbios_string(&buffer, system_vendor, system_vendor_len); - copy_smbios_string(&buffer, system_product, system_product_len); - copy_smbios_string(&buffer, system_version, system_version_len); - copy_smbios_string(&buffer, system_serial, system_serial_len); - copy_smbios_string(&buffer, system_sku, system_sku_len); - copy_smbios_string(&buffer, system_family, system_family_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - chassis = (struct smbios_chassis*)buffer; - chassis->hdr.type = 3; - chassis->hdr.length = sizeof(struct smbios_chassis); - chassis->hdr.handle = handle_count++; - chassis->vendor = chassis_vendor_len ? ++string_count : 0; - chassis->type = atoi(chassis_type); - chassis->version = chassis_version_len ? ++string_count : 0; - chassis->serial = chassis_serial_len ? ++string_count : 0; - chassis->asset_tag = chassis_asset_tag_len ? ++string_count : 0; - chassis->boot_state = 0x02; /* unknown */ - chassis->power_supply_state = 0x02; /* unknown */ - chassis->thermal_state = 0x02; /* unknown */ - chassis->security_status = 0x02; /* unknown */ - chassis->oem_defined = 0; - chassis->height = 0; /* undefined */ - chassis->num_power_cords = 0; /* unspecified */ - chassis->num_contained_elements = 0; - chassis->contained_element_rec_length = 3; - buffer += sizeof(struct smbios_chassis); - - copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_len); - copy_smbios_string(&buffer, chassis_version, chassis_version_len); - copy_smbios_string(&buffer, chassis_serial, chassis_serial_len); - copy_smbios_string(&buffer, chassis_asset_tag, chassis_asset_tag_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - string_count = 0; - board = (struct smbios_board*)buffer; - board->hdr.type = 2; - board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = handle_count++; - board->vendor = board_vendor_len ? ++string_count : 0; - board->product = board_product_len ? ++string_count : 0; - board->version = board_version_len ? ++string_count : 0; - board->serial = board_serial_len ? ++string_count : 0; - board->asset_tag = board_asset_tag_len ? ++string_count : 0; - board->feature_flags = 0x5; /* hosting board, removable */ - board->location = 0; - board->chassis_handle = chassis->hdr.handle; - board->board_type = 0xa; /* motherboard */ - board->num_contained_handles = 0; - buffer += sizeof(struct smbios_board); - - copy_smbios_string(&buffer, board_vendor, board_vendor_len); - copy_smbios_string(&buffer, board_product, board_product_len); - copy_smbios_string(&buffer, board_version, board_version_len); - copy_smbios_string(&buffer, board_serial, board_serial_len); - copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - - boot_info = (struct smbios_boot_info*)buffer; - boot_info->hdr.type = 32; - boot_info->hdr.length = sizeof(struct smbios_boot_info); - boot_info->hdr.handle = handle_count++; - memset(boot_info->reserved, 0, sizeof(boot_info->reserved)); - memset(boot_info->boot_status, 0, sizeof(boot_info->boot_status)); /* no errors detected */ - buffer += sizeof(struct smbios_boot_info); - *buffer++ = 0; - *buffer++ = 0; - - end_of_table = (struct smbios_header*)buffer; - end_of_table->type = 127; - end_of_table->length = sizeof(struct smbios_header); - end_of_table->handle = handle_count++; - buffer += sizeof(struct smbios_header); - *buffer++ = 0; - *buffer++ = 0; - - return STATUS_SUCCESS; + return create_smbios_tables( sfti, available_len, required_len, + &bios_args, &system_args, &board_args, &chassis_args ); } default: FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); -- 2.30.1 (Apple Git-130)

1 2

[PATCH] msvcrt: Avoid disallowed unaligned writes in memset on ARM
by Martin Storsjo 17 Sep '21

17 Sep '21

From: Martin Storsjö <martin(a)martin.st> This fixes a regression in memset on ARM since 7b17d7081512db52ef852705445762ac4016c29f. ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Two consecutive stores to uint32_t* pointers can also be fused into one single STRD, as a uint32_t* is supposed to be properly aligned - therefore, do these stores as stores to volatile uint32_t* to avoid fusing them. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/msvcrt/string.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2b1b4a5b11..bf491a91f40 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2878,15 +2878,37 @@ void *__cdecl memset(void *dst, int c, size_t n) if (n >= 16) { +#ifdef __arm__ + *(volatile uint32_t *)(d + 0) = v; + *(volatile uint32_t *)(d + 4) = v; + *(volatile uint32_t *)(d + 8) = v; + *(volatile uint32_t *)(d + 12) = v; + *(volatile uint32_t *)(d + n - 16) = v; + *(volatile uint32_t *)(d + n - 12) = v; + *(volatile uint32_t *)(d + n - 8) = v; + *(volatile uint32_t *)(d + n - 4) = v; +#else *(uint64_t *)(d + 0) = v; *(uint64_t *)(d + 8) = v; *(uint64_t *)(d + n - 16) = v; *(uint64_t *)(d + n - 8) = v; +#endif if (n <= 32) return dst; +#ifdef __arm__ + *(volatile uint32_t *)(d + 16) = v; + *(volatile uint32_t *)(d + 20) = v; + *(volatile uint32_t *)(d + 24) = v; + *(volatile uint32_t *)(d + 28) = v; + *(volatile uint32_t *)(d + n - 32) = v; + *(volatile uint32_t *)(d + n - 28) = v; + *(volatile uint32_t *)(d + n - 24) = v; + *(volatile uint32_t *)(d + n - 20) = v; +#else *(uint64_t *)(d + 16) = v; *(uint64_t *)(d + 24) = v; *(uint64_t *)(d + n - 32) = v; *(uint64_t *)(d + n - 24) = v; +#endif if (n <= 64) return dst; n = (n - a) & ~0x1f; @@ -2895,8 +2917,15 @@ void *__cdecl memset(void *dst, int c, size_t n) } if (n >= 8) { +#ifdef __arm__ + *(volatile uint32_t *)d = v; + *(volatile uint32_t *)(d + 4) = v; + *(volatile uint32_t *)(d + n - 4) = v; + *(volatile uint32_t *)(d + n - 8) = v; +#else *(uint64_t *)d = v; *(uint64_t *)(d + n - 8) = v; +#endif return dst; } if (n >= 4) -- 2.25.1

3 6

[PATCH resend 1/6] winegstreamer: Fix return code in init_gst failure case.
by Derek Lesho 17 Sep '21

17 Sep '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 5299f4dc2ed..a8e7e3d979f 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -982,7 +982,10 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons goto err; if (!filter->init_gst(filter)) + { + hr = E_FAIL; goto err; + } for (i = 0; i < filter->source_count; ++i) { -- 2.33.0

2 6

[PATCH] makefiles: Depend on winebuild even for unix libraries.
by Zebediah Figura 17 Sep '21

17 Sep '21

winegcc runs `winebuild --fixup-ctors` when building them. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index eff8e33d3a3..9fa6d8c7f56 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3394,7 +3394,7 @@ static void output_module( struct makefile *make ) output( "%s:", obj_dir_path( make, unix_lib )); output_filenames_obj_dir( make, make->unixobj_files ); output_filenames( unix_deps ); - if (!native_unix_lib) output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); output_winegcc_command( make, 0 ); -- 2.33.0

1 0

[PATCH v3 1/6] robocopy: Add stub
by Florian Eder 17 Sep '21

17 Sep '21

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43653 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v3: Identical to the patch sent in v2 --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index 00a5be6a504..a5767af3c60 100755 --- a/configure +++ b/configure @@ -21234,6 +21234,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22767,4 +22768,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index dea5fe61bf3..97c46565db3 100644 --- a/configure.ac +++ b/configure.ac @@ -3958,6 +3958,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5a48be3725b --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..00dacc8ab6c --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 0; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..edae5b71d86 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

3 13

[PATCH 1/2] oleacc: Add Client_get_accFocus implementation.
by Connor McAdams 17 Sep '21

17 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/client.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 0c2215fe62e..4c6dc0ab18b 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -306,8 +306,26 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pvarID); - return E_NOTIMPL; + GUITHREADINFO info; + + TRACE("(%p)->(%p)\n", This, pvarID); + + V_VT(pvarID) = VT_EMPTY; + info.cbSize = sizeof(info); + if(GetGUIThreadInfo(0, &info) && info.hwndFocus) { + if(info.hwndFocus == This->hwnd) { + V_VT(pvarID) = VT_I4; + V_I4(pvarID) = CHILDID_SELF; + } + else if(IsChild(This->hwnd, info.hwndFocus)) { + V_VT(pvarID) = VT_DISPATCH; + if(FAILED(AccessibleObjectFromWindow(info.hwndFocus, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(pvarID)))) + V_VT(pvarID) = VT_EMPTY; + } + } + + return S_OK; } static HRESULT WINAPI Client_get_accSelection(IAccessible *iface, VARIANT *pvarID) -- 2.25.1

2 3

[PATCH] makedep: Handle amd64 as x86-64.
by Gerald Pfeifer 17 Sep '21

17 Sep '21

For historic reasons FreeBSD call x86-64 by the name of amd64. And when building ports it uses a variable named ARCH to hold that value (or i386 for x86). Wine uses a variable by that name, too, which gets overriden by the one coming from the system, leading to Wine not finding some of its files (since "x86-64" is hardcoded elsewhere). I was thinking to rename Wine's variable from ARCH to WINEARCH, alas that name is already taken for a different purpose. So best have makedep accept amd64 as a synonym for x86-64 and convert the former to the latter. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- tools/makedep.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 59857762edd..ed7a58ed1f9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4446,6 +4446,13 @@ int main( int argc, char *argv[] ) if (!man_ext) man_ext = "3w"; if (arch) { + /* For historic reasons FreeBSD calls x86-64 by the name of amd64 + * and features a variable ARCH with that value in the environment + * when building ports. This breaks Wine in interesting ways, so + * revert to the industry standard name when we enouncter amd64. + */ + if ( !strcmp(arch,"amd64") ) + arch = "x86-64"; so_dir = strmake( "$(dlldir)/%s-unix", arch ); pe_dir = strmake( "$(dlldir)/%s-windows", arch ); } -- 2.31.1

2 1

[PATCH] mscoree: Update Wine Mono to 6.4.0.
by Esme Povirk 17 Sep '21

17 Sep '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dda94d34e1a..7ef7ca312ae 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.3.0" +#define MONO_VERSION "6.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "a5f02d32a0283692a4a625f541cfbbb451883128474c5c80362385317cd099f0" +#define MONO_SHA "db8b85f3b910590f61adbfa0005a995d613e299a1cc73d00553d70dc81010e36" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 985cdeff770..04844c8da69 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.3.0" +#define WINE_MONO_VERSION "6.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.30.2

2 1

[PATCH v4 1/4] user32/tests: Fix occasional test failure in test_ShowWindow().
by Connor McAdams 17 Sep '21

17 Sep '21

Windows 8+ sometimes sends an optional WM_WINDOWPOSCHANGED after an optional WM_WINDOWPOSCHANGING. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v4: Add fix for test_ShowWindow() failure, and remove test_mdi_messages() patches to shrink patch set for easier review. dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4c9f1dc6913..f2bfb81679f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13389,9 +13389,10 @@ static const struct message WmShowNoActivate_2[] = { { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|optional }, /* Sometimes sent on Win8+. */ { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Win7 sends this. */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { HCBT_SETFOCUS, hook|optional }, -- 2.25.1

2 7

Joint XDC + WineConf in Minneapolis, October 4-6
by Jeremy White 17 Sep '21

17 Sep '21

Hi folks, I wanted to let you know that, last night, the X.org conference committee accepted our proposal to host the X Developers conference in Minneapolis, Minnesota on October 4th, 5th, and 6th. The hope is that we will interleave WineConf with that event and that we will all have a joyful time together. Obviously, covid is far from done with us. We are trying to serve extra space so we have the greatest available flexibility, and we will adapt as the course of the pandemic progresses. We'll have more details as we begin some of the more detailed planning; we'll likely follow the XDC cadence for that. As they've just wrapped XDC 2021, I imagine it will be some time from now. At any rate, save the date, and hope to see you there! Cheers, Jeremy

1 0

[PATCH] gdi32: Implement D3DKMTOpenAdapterFromDeviceName().
by Paul Gofman 17 Sep '21

17 Sep '21

Fixes non functional setting page in Resident Evil Village. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/objects.c | 65 ++++++++++++++++++++++ dlls/gdi32/tests/Makefile.in | 2 +- dlls/gdi32/tests/driver.c | 103 +++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6dbc8a9bf12..46534796317 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory @ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape +@ stdcall D3DKMTOpenAdapterFromDeviceName(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc @ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 7f6893f0952..a4ae33442d3 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "devguid.h" #include "setupapi.h" +#include "ntddvdeo.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -889,6 +890,70 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/****************************************************************************** + * D3DKMTOpenAdapterFromDeviceName (GDI32.@) + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromDeviceName(D3DKMT_OPENADAPTERFROMDEVICENAME *device_name) +{ + static const GUID *iface_guid = &GUID_DISPLAY_DEVICE_ARRIVAL; + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_detail_data; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + NTSTATUS status = STATUS_INVALID_PARAMETER; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + WCHAR iface_detail_buffer[256]; + BOOL found = FALSE; + DEVPROPTYPE type; + unsigned int i; + HDEVINFO set; + HANDLE mutex; + + TRACE( "device_name %p.\n", device_name ); + + if (!device_name) return STATUS_INVALID_PARAMETER; + + TRACE("device path %s.\n", debugstr_w( device_name->pDeviceName )); + + mutex = get_display_device_init_mutex(); + + set = SetupDiGetClassDevsW( iface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT ); + iface_detail_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_detail_data->cbSize = sizeof(*iface_detail_data); + + for (i = 0; SetupDiEnumDeviceInfo( set, i, &device_data ); ++i) + { + if (!SetupDiEnumDeviceInterfaces( set, &device_data, iface_guid, 0, &iface_data ) + || !SetupDiGetDeviceInterfaceDetailW( set, &iface_data, iface_detail_data, + sizeof(iface_detail_buffer), NULL, &device_data )) + { + ERR( "Could not get interface detail, iface %u.\n", i ); + continue; + } + if (lstrcmpiW( device_name->pDeviceName, iface_detail_data->DevicePath )) continue; + + if (SetupDiGetDevicePropertyW( set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid_desc.AdapterLuid, + sizeof( luid_desc.AdapterLuid ), NULL, 0)) + found = TRUE; + else + ERR( "Could not get luid.\n" ); + + break; + } + + SetupDiDestroyDeviceInfoList( set ); + + if (found && !(status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) + { + device_name->hAdapter = luid_desc.hAdapter; + device_name->AdapterLuid = luid_desc.AdapterLuid; + } else WARN( "Device %s not found.\n", debugstr_w(device_name->pDeviceName )); + + release_display_device_init_mutex( mutex ); + + return status; +} + /*********************************************************************** * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) */ diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 876f6a376a2..3eb478ff765 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 advapi32 +IMPORTS = setupapi user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index eb0da18b32e..c20f8088d9c 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -29,16 +29,22 @@ #include "winternl.h" #include "dwmapi.h" #include "ddk/d3dkmthk.h" +#include "initguid.h" +#include "setupapi.h" +#include "ntddvdeo.h" #include "wine/test.h" static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); +static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromDeviceName)(D3DKMT_OPENADAPTERFROMDEVICENAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); @@ -789,6 +795,101 @@ static void test_D3DKMTCheckOcclusion(void) DestroyWindow(hwnd); } +static void test_D3DKMTOpenAdapterFromDeviceName_deviface(const GUID *devinterface_guid, NTSTATUS expected_status) +{ + BYTE iface_detail_buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + 256 * sizeof(WCHAR)]; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *iface_data; + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + D3DKMT_CLOSEADAPTER close_adapter_desc; + DEVPROPTYPE type; + NTSTATUS status; + unsigned int i; + HDEVINFO set; + LUID luid; + BOOL ret; + + set = SetupDiGetClassDevsW(devinterface_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevs failed, error %u.\n", GetLastError()); + + iface_data = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)iface_detail_buffer; + iface_data->cbSize = sizeof(*iface_data); + device_name.pDeviceName = iface_data->DevicePath; + + i = 0; + while ((ret = SetupDiEnumDeviceInfo(set, i, &device_data))) + { + ret = SetupDiEnumDeviceInterfaces(set, &device_data, devinterface_guid, 0, &iface); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, iface_data, + sizeof(iface_detail_buffer), NULL, NULL ); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + + status = pD3DKMTOpenAdapterFromDeviceName(&device_name); + ok(status == expected_status, "Got status %#x, expected %#x.\n", status, expected_status); + + if (!status) + { + ret = SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0); + ok(ret || GetLastError() == ERROR_NOT_FOUND, "Got unexpected ret %#x, GetLastError() %u.\n", + ret, GetLastError()); + + if (ret) + { + ret = RtlEqualLuid( &luid, &device_name.AdapterLuid); + ok(ret, "Luid does not match.\n"); + } + else + { + skip("Luid not found.\n"); + } + + close_adapter_desc.hAdapter = device_name.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(!status, "Got unexpected status %#x.\n", status); + } + ++i; + } + if (!i) + win_skip("No devices found.\n"); +} + +static void test_D3DKMTOpenAdapterFromDeviceName(void) +{ + D3DKMT_OPENADAPTERFROMDEVICENAME device_name; + NTSTATUS status; + HWND hwnd; + + /* Create window to make sure display devices are initialized before the test. */ + hwnd = CreateWindowA("static", "static1", WS_OVERLAPPED, 0, 0, 0, 0, 0, 0, 0, 0); + ok(!!hwnd, "Failed to create window.\n"); + + status = pD3DKMTOpenAdapterFromDeviceName(NULL); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("pD3DKMTOpenAdapterFromDeviceName() is not supported.\n"); + return; + } + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + memset(&device_name, 0, sizeof(device_name)); + status = pD3DKMTOpenAdapterFromDeviceName(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status); + + winetest_push_context("GUID_DEVINTERFACE_DISPLAY_ADAPTER"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DEVINTERFACE_DISPLAY_ADAPTER, STATUS_INVALID_PARAMETER); + winetest_pop_context(); + + winetest_push_context("GUID_DISPLAY_DEVICE_ARRIVAL"); + test_D3DKMTOpenAdapterFromDeviceName_deviface(&GUID_DISPLAY_DEVICE_ARRIVAL, STATUS_SUCCESS); + winetest_pop_context(); + + DestroyWindow(hwnd); +} + START_TEST(driver) { HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); @@ -799,6 +900,7 @@ START_TEST(driver) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); pD3DKMTDestroyDevice = (void *)GetProcAddress(gdi32, "D3DKMTDestroyDevice"); + pD3DKMTOpenAdapterFromDeviceName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromDeviceName"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromGdiDisplayName"); pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); @@ -814,6 +916,7 @@ START_TEST(driver) test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTSetVidPnSourceOwner(); test_D3DKMTCheckOcclusion(); + test_D3DKMTOpenAdapterFromDeviceName(); FreeLibrary(dwmapi); } -- 2.31.1

2 3

[PATCH v2] makedep: Handle amd64 as x86_64.
by Gerald Pfeifer 17 Sep '21

17 Sep '21

[ It's x86_64, with an underscore, not x86-64, with a dash. ] For historic reasons FreeBSD calls x86_64 by the name of amd64. And when building ports it uses a variable named ARCH to hold that value (or i386 for 32-bit). Wine uses a variable by that name, too, which gets overriden by the one coming from the system, leading to Wine not finding some of its files (since "x86_64" is hardcoded elsewhere). We could rename Wine's variable from ARCH to WINEARCH, alas that name is already taken for a different purpose. So best have makedep accept amd64 as a synonym for x86_64 and convert the former to the latter. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- tools/makedep.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 59857762edd..bb4a6cfd10e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4446,6 +4446,13 @@ int main( int argc, char *argv[] ) if (!man_ext) man_ext = "3w"; if (arch) { + /* For historic reasons FreeBSD calls x86_64 by the name of amd64 + * and features a variable ARCH with that value in the environment + * when building ports. This breaks Wine in interesting ways, so + * revert to the industry standard name when we enouncter amd64. + */ + if ( !strcmp(arch,"amd64") ) + arch = "x86_64"; so_dir = strmake( "$(dlldir)/%s-unix", arch ); pe_dir = strmake( "$(dlldir)/%s-windows", arch ); } -- 2.31.1

1 0

[PATCH 3/3] winhttp: Consistently validate the buffer in option query functions.
by Hans Leidekker 17 Sep '21

17 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 103 +++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 49 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 88e305da864..659a1ec8cee 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -82,6 +82,17 @@ static void session_destroy( struct object_header *hdr ) free( session ); } +static BOOL validate_buffer( void *buffer, DWORD *buflen, DWORD required ) +{ + if (!buffer || *buflen < required) + { + *buflen = required; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + return TRUE; +} + static BOOL session_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { struct session *session = (struct session *)hdr; @@ -90,38 +101,43 @@ static BOOL session_query_option( struct object_header *hdr, DWORD option, void { case WINHTTP_OPTION_REDIRECT_POLICY: { - if (!buffer || *buflen < sizeof(DWORD)) - { - *buflen = sizeof(DWORD); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; *(DWORD *)buffer = hdr->redirect_policy; *buflen = sizeof(DWORD); return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_CONNECT_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_SEND_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->send_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->receive_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = session->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -314,38 +330,43 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void { case WINHTTP_OPTION_PARENT_HANDLE: { - if (!buffer || *buflen < sizeof(HINTERNET)) - { - *buflen = sizeof(HINTERNET); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(HINTERNET) )) return FALSE; *(HINTERNET *)buffer = ((struct object_header *)connect->session)->handle; *buflen = sizeof(HINTERNET); return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_CONNECT_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->connect_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_SEND_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->send_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->receive_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = connect->session->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -669,12 +690,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void DWORD flags; int bits; - if (!buffer || *buflen < sizeof(flags)) - { - *buflen = sizeof(flags); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(flags) )) return FALSE; flags = request->security_flags; if (request->netconn) @@ -695,12 +711,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void { const CERT_CONTEXT *cert; - if (!buffer || *buflen < sizeof(cert)) - { - *buflen = sizeof(cert); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(cert) )) return FALSE; if (!(cert = CertDuplicateCertificateContext( request->server_cert ))) return FALSE; *(CERT_CONTEXT **)buffer = (CERT_CONTEXT *)cert; @@ -715,13 +726,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void FIXME("partial stub\n"); - if (!buffer || *buflen < sizeof(*ci)) - { - *buflen = sizeof(*ci); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } - if (!cert) return FALSE; + if (!validate_buffer( buffer, buflen, sizeof(*ci) ) || !cert) return FALSE; ci->ftExpiry = cert->pCertInfo->NotAfter; ci->ftStart = cert->pCertInfo->NotBefore; @@ -741,12 +746,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void } case WINHTTP_OPTION_SECURITY_KEY_BITNESS: { - if (!buffer || *buflen < sizeof(DWORD)) - { - *buflen = sizeof(DWORD); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; *(DWORD *)buffer = request->netconn ? netconn_get_cipher_strength( request->netconn ) : 0; *buflen = sizeof(DWORD); @@ -759,12 +759,8 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void socklen_t len = sizeof(local); const struct sockaddr *remote = (const struct sockaddr *)&request->connect->sockaddr; - if (!buffer || *buflen < sizeof(*info)) - { - *buflen = sizeof(*info); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(*info) )) return FALSE; + if (!request->netconn) { SetLastError( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); @@ -777,26 +773,36 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_CONNECT_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->connect_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_SEND_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->send_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->receive_timeout; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->receive_response_timeout; *buflen = sizeof(DWORD); return TRUE; @@ -818,11 +824,15 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return TRUE; case WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + *(DWORD *)buffer = request->max_redirects; *buflen = sizeof(DWORD); return TRUE; case WINHTTP_OPTION_HTTP_PROTOCOL_USED: + if (!validate_buffer( buffer, buflen, sizeof(DWORD) )) return FALSE; + FIXME("WINHTTP_OPTION_HTTP_PROTOCOL_USED\n"); *(DWORD *)buffer = 0; *buflen = sizeof(DWORD); @@ -1214,12 +1224,7 @@ static BOOL query_option( struct object_header *hdr, DWORD option, void *buffer, { case WINHTTP_OPTION_CONTEXT_VALUE: { - if (!buffer || *buflen < sizeof(DWORD_PTR)) - { - *buflen = sizeof(DWORD_PTR); - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } + if (!validate_buffer( buffer, buflen, sizeof(DWORD_PTR) )) return FALSE; *(DWORD_PTR *)buffer = hdr->context; *buflen = sizeof(DWORD_PTR); -- 2.30.2

1 0

[PATCH 2/3] winhttp: Add a stub for WinHttpQueryOption(WINHTTP_OPTION_HTTP_PROTOCOL_USED).
by Hans Leidekker 17 Sep '21

17 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b9635b8933f..88e305da864 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -822,6 +822,12 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void *buflen = sizeof(DWORD); return TRUE; + case WINHTTP_OPTION_HTTP_PROTOCOL_USED: + FIXME("WINHTTP_OPTION_HTTP_PROTOCOL_USED\n"); + *(DWORD *)buffer = 0; + *buflen = sizeof(DWORD); + return TRUE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_INVALID_PARAMETER ); -- 2.30.2

1 0

[PATCH 1/3] winhttp: Add a stub for WinHttpSetOption(WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL).
by Hans Leidekker 17 Sep '21

17 Sep '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e4e8f1cec56..b9635b8933f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1049,6 +1049,15 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b FIXME("WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL: + if (buflen == sizeof(DWORD)) + { + FIXME("WINHTTP_OPTION_ENABLE_HTTP_PROTOCOL %08x\n", *(DWORD *)buffer); + return TRUE; + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); -- 2.30.2

1 0

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