June 2015 - Wine-commits - list.winehq.org

André Hentschel : Add WWN 392
by Jeremy Newman 08 Jun '15

08 Jun '15

Module: website Branch: master Commit: 0ab94fa047fe24f5ef4497852c996d0a63a384bb URL: http://source.winehq.org/git/website.git/?a=commit;h=0ab94fa047fe24f5ef4497… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 7 18:56:57 2015 +0200 Add WWN 392 --- news/de/2015060701.xml | 15 + news/en/2015060701.xml | 15 + wwn/en/wn20150607_392.xml | 765 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 795 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0ab94fa047fe24f5ef…

1 0

Hans Leidekker : include: Add missing BITS interfaces.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: e1f9b916fddc0396b9496d1da4e04e11869a4f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f9b916fddc0396b9496d1da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 10:33:33 2015 +0200 include: Add missing BITS interfaces. --- dlls/qmgrprxy/qmgrprxy.idl | 2 + include/Makefile.in | 2 + include/bits2_0.idl | 95 ++++++++++++++++++++++++++++++++++++++++++ include/bits2_5.idl | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl index 97c1da3..046c9ca 100644 --- a/dlls/qmgrprxy/qmgrprxy.idl +++ b/dlls/qmgrprxy/qmgrprxy.idl @@ -24,6 +24,8 @@ #define DO_NO_IMPORTS #include "bits1_5.idl" +#include "bits2_0.idl" +#include "bits2_5.idl" #include "bits3_0.idl" [ diff --git a/include/Makefile.in b/include/Makefile.in index ad87f47..499c5d4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -15,6 +15,8 @@ PUBLIC_IDL_H_SRCS = \ bdaiface.idl \ bits.idl \ bits1_5.idl \ + bits2_0.idl \ + bits2_5.idl \ bits3_0.idl \ comcat.idl \ commoncontrols.idl \ diff --git a/include/bits2_0.idl b/include/bits2_0.idl new file mode 100644 index 0000000..efe6dde --- /dev/null +++ b/include/bits2_0.idl @@ -0,0 +1,95 @@ +/* + * Background Intelligent Transfer Service (BITS) 2.0 interface + * + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * 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 + * + */ + +#ifndef DO_NO_IMPORTS +import "bits.idl"; +import "bits1_5.idl"; +#endif + +cpp_quote("#define BG_COPY_FILE_OWNER 1") +cpp_quote("#define BG_COPY_FILE_GROUP 2") +cpp_quote("#define BG_COPY_FILE_DACL 4") +cpp_quote("#define BG_COPY_FILE_SACL 8") +cpp_quote("#define BG_COPY_FILE_ALL 15") + +cpp_quote("#define BG_LENGTH_TO_EOF (UINT64)(-1)") + +typedef struct _BG_FILE_RANGE +{ + UINT64 InitialOffset; + UINT64 Length; +} BG_FILE_RANGE; + +[ + uuid(443c8934-90ff-48ed-bcde-26f5c7450042), + odl +] +interface IBackgroundCopyJob3 : IBackgroundCopyJob2 +{ + HRESULT ReplaceRemotePrefix( + [in] LPCWSTR OldPrefix, + [in] LPCWSTR NewPrefix); + + HRESULT AddFileWithRanges( + [in] LPCWSTR RemoteUrl, + [in] LPCWSTR LocalName, + [in] DWORD RangeCount, + [in, size_is(RangeCount)] BG_FILE_RANGE Ranges[]); + + HRESULT SetFileACLFlags( + [in] DWORD Flags); + + HRESULT GetFileACLFlags( + [out, ref] DWORD *Flags); +} + +[ + uuid(83e81b93-0873-474d-8a8c-f2018b1a939c), + odl +] +interface IBackgroundCopyFile2 : IBackgroundCopyFile +{ + HRESULT GetFileRanges( + [in, out, unique] DWORD *RangeCount, + [out, size_is(, *RangeCount)] BG_FILE_RANGE **Ranges); + + HRESULT SetRemoteName( + LPCWSTR Val); +} + +[ + uuid(2289a9af-dc96-486e-b268-89c9e3397c3d), + version(1.0) +] +library BackgroundCopyManager2_0 +{ + [ + uuid(6d18ad12-bde3-4393-b311-099c346e6df9) + ] + coclass BackgroundCopyManager2_0 + { + [default] interface IBackgroundCopyManager; + }; + + interface IBackgroundCopyCallback; + interface IBackgroundCopyJob3; + interface IBackgroundCopyFile2; +} diff --git a/include/bits2_5.idl b/include/bits2_5.idl new file mode 100644 index 0000000..29ea75c --- /dev/null +++ b/include/bits2_5.idl @@ -0,0 +1,100 @@ +/* + * Background Intelligent Transfer Service (BITS) 2.5 interface + * + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * 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 + * + */ + +#ifndef DO_NO_IMPORTS +import "bits.idl"; +import "bits1_5.idl"; +import "bits2_0.idl"; +#endif + +[ + uuid(f1bd1079-9f01-4bdc-8036-f09b70095066), + odl +] +interface IBackgroundCopyJobHttpOptions : IUnknown +{ + typedef enum + { + BG_CERT_STORE_LOCATION_CURRENT_USER, + BG_CERT_STORE_LOCATION_LOCAL_MACHINE, + BG_CERT_STORE_LOCATION_CURRENT_SERVICE, + BG_CERT_STORE_LOCATION_SERVICES, + BG_CERT_STORE_LOCATION_USERS, + BG_CERT_STORE_LOCATION_CURRENT_USER_GROUP_POLICY, + BG_CERT_STORE_LOCATION_LOCAL_MACHINE_GROUP_POLICY, + BG_CERT_STORE_LOCATION_LOCAL_MACHINE_ENTERPRISE + } BG_CERT_STORE_LOCATION; + + HRESULT SetClientCertificateByID( + [in] BG_CERT_STORE_LOCATION StoreLocation, + [in] LPCWSTR StoreName, + [in, size_is(20), ref] BYTE *pCertHashBlob + ); + + HRESULT SetClientCertificateByName( + [in] BG_CERT_STORE_LOCATION StoreLocation, + [in] LPCWSTR StoreName, + [in] LPCWSTR SubjectName + ); + + HRESULT RemoveClientCertificate(); + + HRESULT GetClientCertificate( + [out, ref] BG_CERT_STORE_LOCATION *pStoreLocation, + [out, ref] LPWSTR *pStoreName, + [out, size_is(, 20), ref] BYTE **ppCertHashBlob, + [out, ref] LPWSTR *pSubjectName + ); + + HRESULT SetCustomHeaders( + [in, unique] LPCWSTR RequestHeaders + ); + + HRESULT GetCustomHeaders( + [out] LPWSTR *pRequestHeaders + ); + + HRESULT SetSecurityFlags( + [in] ULONG Flags + ); + + HRESULT GetSecurityFlags( + [out, ref] ULONG *pFlags + ); +} + +[ + uuid(4974177c-3bb6-4c37-9ff0-6b7426f0aba9), + version(1.0) +] +library BackgroundCopyManager2_5 +{ + [ + uuid(03ca98d6-ff5d-49b8-abc6-03dd84127020) + ] + coclass BackgroundCopyManager2_5 + { + [default] interface IBackgroundCopyManager; + }; + + interface IBackgroundCopyCallback; + interface IBackgroundCopyJobHttpOptions; +}

1 0

Hans Leidekker : qmgr: Update to IBackgroundCopyFile2.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 04f3c2bbb04a93d3939b6b4feb3a821312636320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f3c2bbb04a93d3939b6b4fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 10:33:53 2015 +0200 qmgr: Update to IBackgroundCopyFile2. --- dlls/qmgr/enum_files.c | 14 +++--- dlls/qmgr/factory.c | 2 - dlls/qmgr/file.c | 122 ++++++++++++++++++++++++++++------------------- dlls/qmgr/job.c | 1 - dlls/qmgr/qmgr.h | 8 ++-- dlls/qmgr/qmgr_local.idl | 2 + dlls/qmgr/qmgr_main.c | 4 +- dlls/qmgr/service.c | 3 -- 8 files changed, 87 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04f3c2bbb04a93d3939b6…

1 0

Hans Leidekker : qmgr: Update to IBackgroundCopyJob3.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 72103ab7d194fa75dedd718787a087ee2f291380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72103ab7d194fa75dedd71878… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 10:34:21 2015 +0200 qmgr: Update to IBackgroundCopyJob3. --- dlls/qmgr/enum_jobs.c | 15 ++- dlls/qmgr/file.c | 4 +- dlls/qmgr/job.c | 246 ++++++++++++++++++++++++++++++-------------------- dlls/qmgr/qmgr.c | 10 +- dlls/qmgr/qmgr.h | 2 +- 5 files changed, 162 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72103ab7d194fa75dedd7…

1 0

Hans Leidekker : qmgr: Add IHttpNegotiate support to the bind status callback.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 6aeeddbad79dfbab4f7981b7c641dba6fe5deb68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aeeddbad79dfbab4f7981b7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 10:34:44 2015 +0200 qmgr: Add IHttpNegotiate support to the bind status callback. --- dlls/qmgr/file.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 95dc55b..1ed34d3 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -238,6 +238,7 @@ static DWORD CALLBACK copyProgressCallback(LARGE_INTEGER totalSize, typedef struct { IBindStatusCallback IBindStatusCallback_iface; + IHttpNegotiate IHttpNegotiate_iface; BackgroundCopyFileImpl *file; LONG ref; } DLBindStatusCallback; @@ -254,16 +255,24 @@ static HRESULT WINAPI DLBindStatusCallback_QueryInterface( { DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IBindStatusCallback)) + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBindStatusCallback)) { *ppvObject = &This->IBindStatusCallback_iface; - IBindStatusCallback_AddRef(iface); - return S_OK; + } + else if (IsEqualGUID(riid, &IID_IHttpNegotiate)) + { + *ppvObject = &This->IHttpNegotiate_iface; + } + else + { + *ppvObject = NULL; + return E_NOINTERFACE; } - *ppvObject = NULL; - return E_NOINTERFACE; + IBindStatusCallback_AddRef(iface); + return S_OK; } static ULONG WINAPI DLBindStatusCallback_AddRef(IBindStatusCallback *iface) @@ -381,6 +390,58 @@ static const IBindStatusCallbackVtbl DLBindStatusCallback_Vtbl = DLBindStatusCallback_OnObjectAvailable }; +static inline DLBindStatusCallback *impl_from_IHttpNegotiate(IHttpNegotiate *iface) +{ + return CONTAINING_RECORD(iface, DLBindStatusCallback, IHttpNegotiate_iface); +} + +static HRESULT WINAPI http_negotiate_QueryInterface( + IHttpNegotiate *iface, REFIID riid, void **ppv) +{ + DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); + return IBindStatusCallback_QueryInterface(&callback->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI http_negotiate_AddRef( + IHttpNegotiate *iface) +{ + DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); + return IBindStatusCallback_AddRef(&callback->IBindStatusCallback_iface); +} + +static ULONG WINAPI http_negotiate_Release( + IHttpNegotiate *iface) +{ + DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); + return IBindStatusCallback_Release(&callback->IBindStatusCallback_iface); +} + +static HRESULT WINAPI http_negotiate_BeginningTransaction( + IHttpNegotiate *iface, LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR *add_headers) +{ + DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); + FIXME("(%p)->(%s %s %u %p)\n", callback, debugstr_w(url), debugstr_w(headers), reserved, add_headers); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_negotiate_OnResponse( + IHttpNegotiate *iface, DWORD code, LPCWSTR resp_headers, LPCWSTR req_headers, LPWSTR *add_reqheaders) +{ + DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); + FIXME("(%p)->(%d %s %s %p)\n", callback, code, debugstr_w(resp_headers), debugstr_w(req_headers), + add_reqheaders); + return E_NOTIMPL; +} + +static const IHttpNegotiateVtbl http_negotiate_vtbl = +{ + http_negotiate_QueryInterface, + http_negotiate_AddRef, + http_negotiate_Release, + http_negotiate_BeginningTransaction, + http_negotiate_OnResponse +}; + static DLBindStatusCallback *DLBindStatusCallbackConstructor( BackgroundCopyFileImpl *file) { @@ -389,6 +450,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( return NULL; This->IBindStatusCallback_iface.lpVtbl = &DLBindStatusCallback_Vtbl; + This->IHttpNegotiate_iface.lpVtbl = &http_negotiate_vtbl; IBackgroundCopyFile2_AddRef(&file->IBackgroundCopyFile2_iface); This->file = file; This->ref = 1;

1 0

Hans Leidekker : qmgr: Implement IBackgroundCopyError.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 69175fa9e1777c4b6ac542db8a28e13201f54b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69175fa9e1777c4b6ac542db8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 10:35:09 2015 +0200 qmgr: Implement IBackgroundCopyError. --- dlls/qmgr/file.c | 50 +++++++++++++++- dlls/qmgr/job.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/qmgr/qmgr.h | 6 ++ 3 files changed, 226 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 1ed34d3..f00fa3f 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -424,13 +424,53 @@ static HRESULT WINAPI http_negotiate_BeginningTransaction( return E_NOTIMPL; } +static HRESULT error_from_http_response(DWORD code) +{ + switch (code) + { + case 200: return S_OK; + case 400: return BG_E_HTTP_ERROR_400; + case 401: return BG_E_HTTP_ERROR_401; + case 404: return BG_E_HTTP_ERROR_404; + case 407: return BG_E_HTTP_ERROR_407; + case 414: return BG_E_HTTP_ERROR_414; + case 501: return BG_E_HTTP_ERROR_501; + case 503: return BG_E_HTTP_ERROR_503; + case 504: return BG_E_HTTP_ERROR_504; + case 505: return BG_E_HTTP_ERROR_505; + default: + FIXME("unhandled response code %u\n", code); + return S_OK; + } +} + static HRESULT WINAPI http_negotiate_OnResponse( IHttpNegotiate *iface, DWORD code, LPCWSTR resp_headers, LPCWSTR req_headers, LPWSTR *add_reqheaders) { DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); - FIXME("(%p)->(%d %s %s %p)\n", callback, code, debugstr_w(resp_headers), debugstr_w(req_headers), + BackgroundCopyJobImpl *job = callback->file->owner; + + TRACE("(%p)->(%d %s %s %p)\n", callback, code, debugstr_w(resp_headers), debugstr_w(req_headers), add_reqheaders); - return E_NOTIMPL; + + if ((job->error.code = error_from_http_response(code))) + { + job->error.context = BG_ERROR_CONTEXT_REMOTE_FILE; + if (job->error.file) IBackgroundCopyFile2_Release(job->error.file); + job->error.file = &callback->file->IBackgroundCopyFile2_iface; + IBackgroundCopyFile2_AddRef(job->error.file); + } + else + { + job->error.context = 0; + if (job->error.file) + { + IBackgroundCopyFile2_Release(job->error.file); + job->error.file = NULL; + } + } + *add_reqheaders = NULL; + return S_OK; } static const IHttpNegotiateVtbl http_negotiate_vtbl = @@ -523,6 +563,12 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); return FALSE; } + else if (job->error.code) + { + ERR("transfer error: 0x%08x\n", job->error.code); + transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); + return FALSE; + } if (transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_QUEUED)) { diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 912c23e..d342041 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -27,6 +27,167 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +struct copy_error +{ + IBackgroundCopyError IBackgroundCopyError_iface; + LONG refs; + BG_ERROR_CONTEXT context; + HRESULT code; + IBackgroundCopyFile2 *file; +}; + +static inline struct copy_error *impl_from_IBackgroundCopyError(IBackgroundCopyError *iface) +{ + return CONTAINING_RECORD(iface, struct copy_error, IBackgroundCopyError_iface); +} + +static HRESULT WINAPI copy_error_QueryInterface( + IBackgroundCopyError *iface, + REFIID riid, + void **obj) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + + TRACE("(%p)->(%s %p)\n", error, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyError)) + { + *obj = &error->IBackgroundCopyError_iface; + } + else + { + *obj = NULL; + WARN("interface %s not supported\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IBackgroundCopyError_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI copy_error_AddRef( + IBackgroundCopyError *iface) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + LONG refs = InterlockedIncrement(&error->refs); + TRACE("(%p)->(%d)\n", error, refs); + return refs; +} + +static ULONG WINAPI copy_error_Release( + IBackgroundCopyError *iface) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + LONG refs = InterlockedDecrement(&error->refs); + + TRACE("(%p)->(%d)\n", error, refs); + + if (!refs) + { + if (error->file) IBackgroundCopyFile2_Release(error->file); + HeapFree(GetProcessHeap(), 0, error); + } + return refs; +} + +static HRESULT WINAPI copy_error_GetError( + IBackgroundCopyError *iface, + BG_ERROR_CONTEXT *pContext, + HRESULT *pCode) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + + TRACE("(%p)->(%p %p)\n", error, pContext, pCode); + + *pContext = error->context; + *pCode = error->code; + + TRACE("returning context %u error code 0x%08x\n", error->context, error->code); + return S_OK; +} + +static HRESULT WINAPI copy_error_GetFile( + IBackgroundCopyError *iface, + IBackgroundCopyFile **pVal) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + + TRACE("(%p)->(%p)\n", error, pVal); + + if (error->file) + { + IBackgroundCopyFile2_AddRef(error->file); + *pVal = (IBackgroundCopyFile *)error->file; + return S_OK; + } + *pVal = NULL; + return BG_E_FILE_NOT_AVAILABLE; +} + +static HRESULT WINAPI copy_error_GetErrorDescription( + IBackgroundCopyError *iface, + DWORD LanguageId, + LPWSTR *pErrorDescription) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + FIXME("(%p)->(%p)\n", error, pErrorDescription); + return E_NOTIMPL; +} + +static HRESULT WINAPI copy_error_GetErrorContextDescription( + IBackgroundCopyError *iface, + DWORD LanguageId, + LPWSTR *pContextDescription) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + FIXME("(%p)->(%p)\n", error, pContextDescription); + return E_NOTIMPL; +} + +static HRESULT WINAPI copy_error_GetProtocol( + IBackgroundCopyError *iface, + LPWSTR *pProtocol) +{ + struct copy_error *error = impl_from_IBackgroundCopyError(iface); + FIXME("(%p)->(%p)\n", error, pProtocol); + return E_NOTIMPL; +} + +static const IBackgroundCopyErrorVtbl copy_error_vtbl = +{ + copy_error_QueryInterface, + copy_error_AddRef, + copy_error_Release, + copy_error_GetError, + copy_error_GetFile, + copy_error_GetErrorDescription, + copy_error_GetErrorContextDescription, + copy_error_GetProtocol +}; + +static HRESULT create_copy_error( + BG_ERROR_CONTEXT context, + HRESULT code, + IBackgroundCopyFile2 *file, + IBackgroundCopyError **obj) +{ + struct copy_error *error; + + TRACE("context %u code %08x file %p\n", context, code, file); + + if (!(error = HeapAlloc(GetProcessHeap(), 0, sizeof(*error) ))) return E_OUTOFMEMORY; + error->IBackgroundCopyError_iface.lpVtbl = &copy_error_vtbl; + error->refs = 1; + error->context = context; + error->code = code; + error->file = file; + if (error->file) IBackgroundCopyFile2_AddRef(error->file); + + *obj = &error->IBackgroundCopyError_iface; + TRACE("returning iface %p\n", *obj); + return S_OK; +} + static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) { return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; @@ -312,9 +473,13 @@ static HRESULT WINAPI BackgroundCopyJob_GetError( IBackgroundCopyJob3 *iface, IBackgroundCopyError **ppError) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, ppError); - return E_NOTIMPL; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob3(iface); + + TRACE("(%p)->(%p)\n", job, ppError); + + if (!job->error.context) return BG_E_ERROR_INFORMATION_UNAVAILABLE; + + return create_copy_error(job->error.context, job->error.code, job->error.file, ppError); } static HRESULT WINAPI BackgroundCopyJob_GetOwner( @@ -788,6 +953,10 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->callback = NULL; This->callback2 = FALSE; + This->error.context = 0; + This->error.code = 0; + This->error.file = NULL; + *job = This; TRACE("created job %s:%p\n", debugstr_guid(&This->jobId), This); diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 87145fd..80a3e97 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -51,6 +51,12 @@ typedef struct /* Protects file list, and progress */ CRITICAL_SECTION cs; struct list entryFromQmgr; + struct + { + BG_ERROR_CONTEXT context; + HRESULT code; + IBackgroundCopyFile2 *file; + } error; } BackgroundCopyJobImpl; /* Background copy file vtbl and related data */

1 0

Nikolay Sivov : iphlpapi: Added ConvertInterfaceLuidToGuid() stub.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 6444290aceba182cbddd7175052648a3369fec50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6444290aceba182cbddd71750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 5 11:48:57 2015 +0300 iphlpapi: Added ConvertInterfaceLuidToGuid() stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 228f64f..d7a52b7 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -15,7 +15,7 @@ #@ stub ConvertInterfaceGuidToLuid #@ stub ConvertInterfaceIndexToLuid #@ stub ConvertInterfaceLuidToAlias -#@ stub ConvertInterfaceLuidToGuid +@ stdcall ConvertInterfaceLuidToGuid( ptr ptr ) #@ stub ConvertInterfaceLuidToIndex #@ stub ConvertInterfaceLuidToNameA #@ stub ConvertInterfaceLuidToNameW diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 3eaefab..69ebca2 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2658,3 +2658,12 @@ ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) FIXME("pTcp6Table2 %p, size %p, order %d: stub\n", table, size, order); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * ConvertInterfaceLuidToGuid (IPHLPAPI.@) + */ +DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID *luid, GUID *guid) +{ + FIXME("(%p %p) stub\n", luid, guid); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Ken Thomases : ntdll: Add partial support for version 3 of DWARF CIEs which are generated by Clang /LLVM.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: 82dd799d5243e246c30bfb5fb463d740c6cc71f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd799d5243e246c30bfb5fb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jun 5 01:19:14 2015 -0500 ntdll: Add partial support for version 3 of DWARF CIEs which are generated by Clang/LLVM. --- dlls/ntdll/signal_x86_64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 9c58363..9b98894 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1342,7 +1342,7 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex /* parse the CIE first */ - if (cie->version != 1) + if (cie->version != 1 && cie->version != 3) { FIXME( "unknown CIE version %u at %p\n", cie->version, cie ); return STATUS_INVALID_DISPOSITION; @@ -1351,7 +1351,10 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex info.code_align = dwarf_get_uleb128( &ptr ); info.data_align = dwarf_get_sleb128( &ptr ); - info.retaddr_reg = *ptr++; + if (cie->version == 1) + info.retaddr_reg = *ptr++; + else + info.retaddr_reg = dwarf_get_uleb128( &ptr ); info.state.cfa_rule = RULE_CFA_OFFSET; TRACE( "function %lx base %p cie %p len %x id %x version %x aug '%s' code_align %lu data_align %ld retaddr %s\n",

1 0

Charles Davis : server: Get debug registers on 64-bit Mac OS.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: b2aa984743cb568f8e6a634a1536bf65950167db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2aa984743cb568f8e6a634a1… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jun 4 16:52:27 2015 -0600 server: Get debug registers on 64-bit Mac OS. --- server/mach.c | 125 +++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 88 insertions(+), 37 deletions(-) diff --git a/server/mach.c b/server/mach.c index be84457..2ef6e59 100644 --- a/server/mach.c +++ b/server/mach.c @@ -151,8 +151,8 @@ void finish_process_tracing( struct process *process ) /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { -#ifdef __i386__ - x86_debug_state32_t state; +#if defined(__i386__) || defined(__x86_64__) + x86_debug_state_t state; mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); @@ -168,24 +168,45 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int return; } - if (!thread_get_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, &count )) + if (!thread_get_state( port, x86_DEBUG_STATE, (thread_state_t)&state, &count )) { +#ifdef __x86_64__ + assert( state.dsh.flavor == x86_DEBUG_STATE32 || + state.dsh.flavor == x86_DEBUG_STATE64 ); +#else + assert( state.dsh.flavor == x86_DEBUG_STATE32 ); +#endif + +#ifdef __x86_64__ + if (state.dsh.flavor == x86_DEBUG_STATE64) + { + context->debug.x86_64_regs.dr0 = state.uds.ds64.__dr0; + context->debug.x86_64_regs.dr1 = state.uds.ds64.__dr1; + context->debug.x86_64_regs.dr2 = state.uds.ds64.__dr2; + context->debug.x86_64_regs.dr3 = state.uds.ds64.__dr3; + context->debug.x86_64_regs.dr6 = state.uds.ds64.__dr6; + context->debug.x86_64_regs.dr7 = state.uds.ds64.__dr7; + } + else +#endif + { /* work around silly renaming of struct members in OS X 10.5 */ #if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) - context->debug.i386_regs.dr0 = state.__dr0; - context->debug.i386_regs.dr1 = state.__dr1; - context->debug.i386_regs.dr2 = state.__dr2; - context->debug.i386_regs.dr3 = state.__dr3; - context->debug.i386_regs.dr6 = state.__dr6; - context->debug.i386_regs.dr7 = state.__dr7; + context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; + context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; + context->debug.i386_regs.dr2 = state.uds.ds32.__dr2; + context->debug.i386_regs.dr3 = state.uds.ds32.__dr3; + context->debug.i386_regs.dr6 = state.uds.ds32.__dr6; + context->debug.i386_regs.dr7 = state.uds.ds32.__dr7; #else - context->debug.i386_regs.dr0 = state.dr0; - context->debug.i386_regs.dr1 = state.dr1; - context->debug.i386_regs.dr2 = state.dr2; - context->debug.i386_regs.dr3 = state.dr3; - context->debug.i386_regs.dr6 = state.dr6; - context->debug.i386_regs.dr7 = state.dr7; + context->debug.i386_regs.dr0 = state.uds.ds32.dr0; + context->debug.i386_regs.dr1 = state.uds.ds32.dr1; + context->debug.i386_regs.dr2 = state.uds.ds32.dr2; + context->debug.i386_regs.dr3 = state.uds.ds32.dr3; + context->debug.i386_regs.dr6 = state.uds.ds32.dr6; + context->debug.i386_regs.dr7 = state.uds.ds32.dr7; #endif + } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } mach_port_deallocate( mach_task_self(), port ); @@ -195,8 +216,8 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* set the thread x86 registers */ void set_thread_context( struct thread *thread, const context_t *context, unsigned int flags ) { -#ifdef __i386__ - x86_debug_state32_t state; +#if defined(__i386__) || defined(__x86_64__) + x86_debug_state_t state; mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); @@ -213,32 +234,62 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } - /* Mac OS doesn't allow setting the global breakpoint flags */ - dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1); +#ifdef __x86_64__ + if (thread->process->cpu == CPU_x86_64) + { + /* Mac OS doesn't allow setting the global breakpoint flags */ + dr7 = (context->debug.x86_64_regs.dr7 & ~0xaa) | ((context->debug.x86_64_regs.dr7 & 0xaa) >> 1); + + state.dsh.flavor = x86_DEBUG_STATE64; + state.dsh.count = sizeof(state.uds.ds64) / sizeof(int); + state.uds.ds64.__dr0 = context->debug.x86_64_regs.dr0; + state.uds.ds64.__dr1 = context->debug.x86_64_regs.dr1; + state.uds.ds64.__dr2 = context->debug.x86_64_regs.dr2; + state.uds.ds64.__dr3 = context->debug.x86_64_regs.dr3; + state.uds.ds64.__dr4 = 0; + state.uds.ds64.__dr5 = 0; + state.uds.ds64.__dr6 = context->debug.x86_64_regs.dr6; + state.uds.ds64.__dr7 = dr7; + } + else +#endif + { + dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1); + + state.dsh.flavor = x86_DEBUG_STATE32; + state.dsh.count = sizeof(state.uds.ds32) / sizeof(int); #if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) - state.__dr0 = context->debug.i386_regs.dr0; - state.__dr1 = context->debug.i386_regs.dr1; - state.__dr2 = context->debug.i386_regs.dr2; - state.__dr3 = context->debug.i386_regs.dr3; - state.__dr4 = 0; - state.__dr5 = 0; - state.__dr6 = context->debug.i386_regs.dr6; - state.__dr7 = dr7; + state.uds.ds32.__dr0 = context->debug.i386_regs.dr0; + state.uds.ds32.__dr1 = context->debug.i386_regs.dr1; + state.uds.ds32.__dr2 = context->debug.i386_regs.dr2; + state.uds.ds32.__dr3 = context->debug.i386_regs.dr3; + state.uds.ds32.__dr4 = 0; + state.uds.ds32.__dr5 = 0; + state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; + state.uds.ds32.__dr7 = dr7; #else - state.dr0 = context->debug.i386_regs.dr0; - state.dr1 = context->debug.i386_regs.dr1; - state.dr2 = context->debug.i386_regs.dr2; - state.dr3 = context->debug.i386_regs.dr3; - state.dr4 = 0; - state.dr5 = 0; - state.dr6 = context->debug.i386_regs.dr6; - state.dr7 = dr7; + state.uds.ds32.dr0 = context->debug.i386_regs.dr0; + state.uds.ds32.dr1 = context->debug.i386_regs.dr1; + state.uds.ds32.dr2 = context->debug.i386_regs.dr2; + state.uds.ds32.dr3 = context->debug.i386_regs.dr3; + state.uds.ds32.dr4 = 0; + state.uds.ds32.dr5 = 0; + state.uds.ds32.dr6 = context->debug.i386_regs.dr6; + state.uds.ds32.dr7 = dr7; #endif - if (!thread_set_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, count )) + } + if (!thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count )) { if (thread->context) /* update the cached values */ - thread->context->debug.i386_regs = context->debug.i386_regs; + { +#ifdef __x86_64__ + if (thread->process->cpu == CPU_x86_64) + thread->context->debug.x86_64_regs = context->debug.x86_64_regs; + else +#endif + thread->context->debug.i386_regs = context->debug.i386_regs; + } } mach_port_deallocate( mach_task_self(), port ); #endif

1 0

Joachim Priesner : comdlg32: File dialog: Append multi-part extensions like .abc.def.
by Alexandre Julliard 05 Jun '15

05 Jun '15

Module: wine Branch: master Commit: c5ad37baf0d4a4d14dd9bb07ca7a033ca0cdd018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ad37baf0d4a4d14dd9bb07c… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Wed Jun 3 00:14:08 2015 +0200 comdlg32: File dialog: Append multi-part extensions like .abc.def. --- dlls/comdlg32/filedlg.c | 5 +++-- dlls/comdlg32/tests/filedlg.c | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2890108..1453396 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2596,10 +2596,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) filterSearchIndex[0] = '\0'; } + /* find the file extension by searching for the first dot in filterExt */ /* strip the * or anything else from the extension, "*.abc" becomes "abc" */ /* if the extension is invalid or contains a glob, ignore it */ - filterSearchIndex = PathFindExtensionW(filterExt); - if (*filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) + filterSearchIndex = strchrW(filterExt, '.'); + if (filterSearchIndex++ && !strchrW(filterSearchIndex, '*') && !strchrW(filterSearchIndex, '?')) { strcpyW(filterExt, filterSearchIndex); } diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index e3d9bc7..49a430c 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1130,6 +1130,11 @@ static void test_extension(void) for (i = 0; i < ARRAY_SIZE(defext_wildcard_filters); i++) { test_extension_helper(&ofn, defext_wildcard_filters[i], "deadbeef.xyz"); } + + /* Append valid extensions consisting of multiple parts */ + test_extension_helper(&ofn, "TestFilter (*.abc.def)\0*.abc.def\0", "deadbeef.abc.def"); + test_extension_helper(&ofn, "TestFilter (.abc.def)\0.abc.def\0", "deadbeef.abc.def"); + test_extension_helper(&ofn, "TestFilter (*.*.def)\0*.*.def\0", "deadbeef.xyz"); } #undef ARRAY_SIZE

1 0