April 2020 - Wine-devel - list.winehq.org

[PATCH] explorer: add support for /cd
by Ilie Halip 01 Apr '20

01 Apr '20

This option is implemented in the same way as /root. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48816 Signed-off-by: Ilie Halip <ilie.halip(a)gmail.com> --- programs/explorer/explorer.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index dcd09ac969..f4c5c74af1 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -720,6 +720,7 @@ static void copy_path_root(LPWSTR root, LPWSTR path) * [/e,] Uses Windows Explorer View * [/root,object] Specifies the root level of the view * [/select,object] parent folder is opened and specified object is selected + * [/cd,object] Behaves like /root */ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) { @@ -729,6 +730,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; static const WCHAR arg_desktop_quotes[] = {'"','/','d','e','s','k','t','o','p'}; + static const WCHAR arg_cd[] = {'/','c','d',','}; LPWSTR p = commandline; @@ -769,6 +771,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } + else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + { + p += ARRAY_SIZE( arg_cd ); + p = copy_path_string(parameters->root,p); + } else { /* left over command line is generally the path to be opened */ -- 2.17.1

1 0

[PATCH 2/2] rpcrt4: Remove double spaces in spec file.
by Serge Gautherie 01 Apr '20

01 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/rpcrt4.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 877221c..323c9d5 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -340,7 +340,7 @@ @ stub RpcAsyncRegisterInfo @ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) -@ stdcall RpcBindingFromStringBindingA(str ptr) +@ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr) @ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr) @ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long) @@ -434,7 +434,7 @@ @ stdcall RpcServerInqDefaultPrincNameW(long ptr) @ stub RpcServerInqIf @ stdcall RpcServerListen(long long long) -@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) +@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr) @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr) @ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr) @@ -448,8 +448,8 @@ @ stub RpcServerUseAllProtseqsIf @ stub RpcServerUseAllProtseqsIfEx @ stdcall RpcServerUseProtseqA(str long ptr) -@ stdcall RpcServerUseProtseqEpA(str long str ptr) -@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) +@ stdcall RpcServerUseProtseqEpA(str long str ptr) +@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr) @ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr) @ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr) @ stub RpcServerUseProtseqExA @@ -483,9 +483,9 @@ @ stub RpcSsSetClientAllocFree @ stub RpcSsSetThreadHandle @ stub RpcSsSwapClientAllocFree -@ stdcall RpcStringBindingComposeA(str str str str str ptr) +@ stdcall RpcStringBindingComposeA(str str str str str ptr) @ stdcall RpcStringBindingComposeW(wstr wstr wstr wstr wstr ptr) -@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) +@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr) @ stdcall RpcStringBindingParseW(wstr ptr ptr ptr ptr ptr) @ stdcall RpcStringFreeA(ptr) @ stdcall RpcStringFreeW(ptr) -- 2.10.0.windows.1

1 0

[PATCH 2/2] adsldp: Add IDirectoryObject stubs.
by Dmitry Timoshkov 01 Apr '20

01 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 35 +++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c4557667cc..9a3ac63407 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -383,6 +383,7 @@ typedef struct IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; IDirectorySearch IDirectorySearch_iface; + IDirectoryObject IDirectoryObject_iface; LONG ref; LDAP *ld; BSTR host; @@ -445,6 +446,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectoryObject)) + { + IADs_AddRef(iface); + *obj = &ldap->IDirectoryObject_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1558,6 +1566,86 @@ static const IDirectorySearchVtbl IDirectorySearch_vtbl = search_CloseSearchHandle }; +static inline LDAP_namespace *impl_from_IDirectoryObject(IDirectoryObject *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IDirectoryObject_iface); +} + +static HRESULT WINAPI dirobj_QueryInterface(IDirectoryObject *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IDirectoryObject) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IDirectoryObject_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI dirobj_AddRef(IDirectoryObject *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + return IADs_AddRef(&ldap->IADs_iface); +} + +static ULONG WINAPI dirobj_Release(IDirectoryObject *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectoryObject(iface); + return IADs_Release(&ldap->IADs_iface); +} + +static HRESULT WINAPI dirobj_GetObjectInformation(IDirectoryObject *iface, PADS_OBJECT_INFO *info) +{ + FIXME("%p,%p: stub\n", iface, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_GetObjectAttributes(IDirectoryObject *iface, LPWSTR *names, + DWORD count, PADS_ATTR_INFO *attrs, DWORD *count_returned) +{ + FIXME("%p,%p,%u,%p,%p: stub\n", iface, names, count, attrs, count_returned); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_SetObjectAttributes(IDirectoryObject *iface, PADS_ATTR_INFO attrs, + DWORD count, DWORD *count_set) +{ + FIXME("%p,%p,%u,%p: stub\n", iface, attrs, count, count_set); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_CreateDSObject(IDirectoryObject *iface, LPWSTR name, + PADS_ATTR_INFO attrs, DWORD count, IDispatch **obj) +{ + FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(name), attrs, count, obj); + return E_NOTIMPL; +} + +static HRESULT WINAPI dirobj_DeleteDSObject(IDirectoryObject *iface, LPWSTR name) +{ + FIXME("%p,%s: stub\n", iface, debugstr_w(name)); + return E_NOTIMPL; +} + +static const IDirectoryObjectVtbl IDirectoryObject_vtbl = +{ + dirobj_QueryInterface, + dirobj_AddRef, + dirobj_Release, + dirobj_GetObjectInformation, + dirobj_GetObjectAttributes, + dirobj_SetObjectAttributes, + dirobj_CreateDSObject, + dirobj_DeleteDSObject +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -1569,6 +1657,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; ldap->IDirectorySearch_iface.lpVtbl = &IDirectorySearch_vtbl; + ldap->IDirectoryObject_iface.lpVtbl = &IDirectoryObject_vtbl; ldap->ref = 1; ldap->ld = NULL; ldap->host = NULL; diff --git a/include/iads.idl b/include/iads.idl index c9d1687524..b04ed0846a 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -344,6 +344,24 @@ typedef struct ads_search_column HANDLE hReserved; } ADS_SEARCH_COLUMN, *PADS_SEARCH_COLUMN; +typedef struct _ads_object_info +{ + LPWSTR pszRDN; + LPWSTR pszObjectDN; + LPWSTR pszParentDN; + LPWSTR pszSchemaDN; + LPWSTR pszClassName; +} ADS_OBJECT_INFO, *PADS_OBJECT_INFO; + +typedef struct _ads_attr_info +{ + LPWSTR pszAttrName; + DWORD dwControlCode; + ADSTYPE dwADsType; + PADSVALUE pADsValues; + DWORD dwNumValues; +} ADS_ATTR_INFO, *PADS_ATTR_INFO; + /***************************************************************************** * IADsContainer interface */ @@ -799,6 +817,23 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IDirectoryObject interface + */ +[ + odl, + local, + uuid(e798de2c-22e4-11d0-84fe-00c04fd8d503) +] +interface IDirectoryObject : IUnknown +{ + HRESULT GetObjectInformation(PADS_OBJECT_INFO *info); + HRESULT GetObjectAttributes(LPWSTR *names, DWORD count, PADS_ATTR_INFO *attrs, DWORD *count_returned); + HRESULT SetObjectAttributes(PADS_ATTR_INFO attrs, DWORD count, DWORD *count_set); + HRESULT CreateDSObject(LPWSTR name, PADS_ATTR_INFO attrs, DWORD count, IDispatch **obj); + HRESULT DeleteDSObject(LPWSTR name); +} + /***************************************************************************** * IID_IADsOpenDSObject interface */ -- 2.25.1

1 0

[PATCH 1/2] activeds: Make IADsPathname::Set() and IADsPathname::Retrieve() return success.
by Dmitry Timoshkov 01 Apr '20

01 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/activeds/pathname.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 63b86ab778..52a94cbb18 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -39,6 +39,7 @@ typedef struct { IADsPathname IADsPathname_iface; LONG ref; + BSTR adspath; } Pathname; static inline Pathname *impl_from_IADsPathname(IADsPathname *iface) @@ -112,10 +113,16 @@ static HRESULT WINAPI path_Invoke(IADsPathname *iface, DISPID dispid, REFIID rii return E_NOTIMPL; } -static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR path, LONG type) +static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) { - FIXME("%p,%s,%d: stub\n", iface, debugstr_w(path), type); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + + FIXME("%p,%s,%d: stub\n", iface, debugstr_w(adspath), type); + + if (!adspath) return E_INVALIDARG; + + path->adspath = SysAllocString(adspath); + return path->adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) @@ -124,10 +131,16 @@ static HRESULT WINAPI path_SetDisplayType(IADsPathname *iface, LONG type) return E_NOTIMPL; } -static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *path) +static HRESULT WINAPI path_Retrieve(IADsPathname *iface, LONG type, BSTR *adspath) { - FIXME("%p,%d,%p: stub\n", iface, type, path); - return E_NOTIMPL; + Pathname *path = impl_from_IADsPathname(iface); + + FIXME("%p,%d,%p: stub\n", iface, type, adspath); + + if (!adspath) return E_INVALIDARG; + + *adspath = SysAllocString(path->adspath); + return *adspath ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI path_GetNumElements(IADsPathname *iface, LONG *count) @@ -210,6 +223,7 @@ static HRESULT Pathname_create(REFIID riid, void **obj) path->IADsPathname_iface.lpVtbl = &IADsPathname_vtbl; path->ref = 1; + path->adspath = NULL; hr = IADsPathname_QueryInterface(&path->IADsPathname_iface, riid, obj); IADsPathname_Release(&path->IADsPathname_iface); -- 2.25.1

1 0

[PATCH 3/3] comctl32/imagelist: Add support for ILD_PRESERVEALPHA.
by Ziqing Hui 01 Apr '20

01 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 38 +++++++++++++++++++++------------ dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-)

1 0

[PATCH 2/3] comctl32/tests/imagelist: Add more tests for ILD_PRESERVEALPHA.
by Ziqing Hui 01 Apr '20

01 Apr '20

The added code is to prove that ILD_PRESERVEALPHA won't take effect if ILS_ALPHA or ILS_SATURATE is set. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 1/3] comctl32/tests/imagelist: Check alpha channel in ImageList_DrawIndirect tests.
by Ziqing Hui 01 Apr '20

01 Apr '20

version6 comctl32 support alpha blend. So it would be good for us to check alpha channel in the tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 70 ++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 32 deletions(-)

1 0

[PATCH 6/6] kernel32/tests: Test timeout behaviour on system clock change.
by Piotr Caban 01 Apr '20

01 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/timer.c | 188 ++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+)

1 0

[PATCH 5/6] server: Use correct clock in select.
by Piotr Caban 01 Apr '20

01 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/server.c | 15 +++++++++---- dlls/ntdll/sync.c | 15 +++++++++---- server/protocol.def | 3 +-- server/thread.c | 55 ++++++++++++++++++++++----------------------- server/trace.c | 6 +++++ tools/make_requests | 1 + 6 files changed, 57 insertions(+), 38 deletions(-)

1 0

[PATCH 4/6] server: Use monotonic clock in waitable timers.
by Piotr Caban 01 Apr '20

01 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/sync.c | 11 +++++++++-- server/protocol.def | 2 +- server/timer.c | 14 ++++++++------ 3 files changed, 18 insertions(+), 9 deletions(-)

1 0