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

Jacek Caban : wininet: Get rid of no longer needed read_chunked field.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 7fa7e9bd3b27d3fe37c71089fc7fb3047d84f76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa7e9bd3b27d3fe37c71089f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 19:46:04 2015 +0200 wininet: Get rid of no longer needed read_chunked field. --- dlls/wininet/http.c | 3 +-- dlls/wininet/internet.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 45183cf..b7c4661 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -408,7 +408,7 @@ static void reset_data_stream(http_request_t *req) destroy_data_stream(req->data_stream); req->data_stream = &req->netconn_stream.data_stream; req->read_pos = req->read_size = req->netconn_stream.content_read = 0; - req->read_chunked = req->read_gzip = FALSE; + req->read_gzip = FALSE; } static void remove_header( http_request_t *request, const WCHAR *str, BOOL from_request ) @@ -2955,7 +2955,6 @@ static DWORD set_content_length(http_request_t *request) request->data_stream = &chunked_stream->data_stream; request->contentLength = ~0u; - request->read_chunked = TRUE; } if(request->decoding) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 925bfd0..40951b6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -355,7 +355,6 @@ typedef struct CRITICAL_SECTION read_section; /* section to protect the following fields */ DWORD contentLength; /* total number of bytes to be read */ - BOOL read_chunked; /* are we reading in chunked mode? */ BOOL read_gzip; /* are we reading in gzip mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */

1 0

Piotr Caban : msvcrt: Add _getwche implementation.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: d4fab07110aeb5d61339aa917ea0b1b6d7f77fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fab07110aeb5d61339aa917… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:23 2015 +0200 msvcrt: Add _getwche implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/console.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2a3ab47..ce36cdf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -909,8 +909,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d0a4c05..8cf1202 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1256,8 +1256,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a86edff..bbf8f90 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1254,8 +1254,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 0905603..299a645 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -344,7 +344,7 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwch() -@ stub _getwche +@ cdecl _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 35e515e..4741b85 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -339,7 +339,7 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwch() -@ stub _getwche +@ cdecl _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7b37e71..8f1f6f9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -583,8 +583,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f7a9818..109e2ad 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -560,8 +560,8 @@ @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock @ cdecl _getwch() @ cdecl _getwch_nolock() -@ stub _getwche -@ stub _getwche_nolock +@ cdecl _getwche() +@ cdecl _getwche_nolock() @ cdecl _getws(ptr) MSVCRT__getws @ stub _getws_s @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 9c3cccf..59b1dbb 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -354,6 +354,31 @@ int CDECL _getche(void) } /********************************************************************* + * _getwche_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _getwche_nolock(void) +{ + MSVCRT_wchar_t wch; + wch = _getch_nolock(); + if (wch == MSVCRT_WEOF) + return wch; + return _putwch_nolock(wch); +} + +/********************************************************************* + * _getwche (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _getwche(void) +{ + MSVCRT_wchar_t ret; + + LOCK_CONSOLE; + ret = _getwche_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _cgets (MSVCRT.@) */ char* CDECL _cgets(char* str) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4ac232c..b81ebf9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -534,7 +534,7 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwch() -# stub _getwche() +@ cdecl _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime32(ptr) MSVCRT__gmtime32

1 0

Hans Leidekker : qmgr/tests: Add tests.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: c5a969904f9f06cbe9d29bf14f7d4efc7d78f590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a969904f9f06cbe9d29bf14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:07:46 2015 +0200 qmgr/tests: Add tests. --- dlls/qmgr/tests/enum_files.c | 1 + dlls/qmgr/tests/job.c | 250 ++++++++++++++++++++++++++++++++++++++----- dlls/qmgr/tests/qmgr.c | 1 - 3 files changed, 223 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5a969904f9f06cbe9d29…

1 0

Hans Leidekker : qmgr: Implement IBackgroundCopyJobHttpOptions:: SetSecurityFlags and IBackgroundCopyJobHttpOptions::GetSecurityFlags.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: dcfe6648f877abcaf7f3a9afa6b0a3de30b1cedd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfe6648f877abcaf7f3a9afa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:05:31 2015 +0200 qmgr: Implement IBackgroundCopyJobHttpOptions::SetSecurityFlags and IBackgroundCopyJobHttpOptions::GetSecurityFlags. --- dlls/qmgr/job.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 5cb85ae..8ee6498 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -992,16 +992,24 @@ static HRESULT WINAPI http_options_SetSecurityFlags( IBackgroundCopyJobHttpOptions *iface, ULONG Flags) { - FIXME("\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + + TRACE("(%p)->(0x%08x)\n", iface, Flags); + + job->http_options.flags = Flags; + return S_OK; } static HRESULT WINAPI http_options_GetSecurityFlags( IBackgroundCopyJobHttpOptions *iface, ULONG *pFlags) { - FIXME("\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + + TRACE("(%p)->(%p)\n", iface, pFlags); + + *pFlags = job->http_options.flags; + return S_OK; } static const IBackgroundCopyJobHttpOptionsVtbl http_options_vtbl =

1 0

Hans Leidekker : qmgr: Use winhttp for HTTP transfers instead of wininet.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 230b52da181eb4fc78c153c1950dd54936586cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230b52da181eb4fc78c153c19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:04:44 2015 +0200 qmgr: Use winhttp for HTTP transfers instead of wininet. --- dlls/qmgr/Makefile.in | 2 +- dlls/qmgr/file.c | 477 +++++++++++++++++++++----------------------------- dlls/qmgr/qmgr.h | 12 +- 3 files changed, 204 insertions(+), 287 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=230b52da181eb4fc78c15…

1 0

Hans Leidekker : qmgr: Don't inline transitionJobState.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: bda14f61fc9abc86b03a8e72ed58f861806b831f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda14f61fc9abc86b03a8e72e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:07:22 2015 +0200 qmgr: Don't inline transitionJobState. --- dlls/qmgr/job.c | 14 ++++++++++++++ dlls/qmgr/qmgr.h | 16 +--------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 37ef5f9..8ca04ad 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -27,6 +27,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) +{ + BOOL ret = FALSE; + + EnterCriticalSection(&globalMgr.cs); + if (job->state == from) + { + job->state = to; + ret = TRUE; + } + LeaveCriticalSection(&globalMgr.cs); + return ret; +} + struct copy_error { IBackgroundCopyError IBackgroundCopyError_iface; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 611896d..2bc5b8b 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -113,6 +113,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl*, IEnumBackgrou DWORD WINAPI fileTransfer(void *param) DECLSPEC_HIDDEN; void processJob(BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; +BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) DECLSPEC_HIDDEN; /* Little helper functions */ static inline WCHAR *strdupW(const WCHAR *src) @@ -142,19 +143,4 @@ static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret) return S_OK; } -static inline BOOL -transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE fromState, - BG_JOB_STATE toState) -{ - BOOL rv = FALSE; - EnterCriticalSection(&globalMgr.cs); - if (job->state == fromState) - { - job->state = toState; - rv = TRUE; - } - LeaveCriticalSection(&globalMgr.cs); - return rv; -} - #endif /* __QMGR_H__ */

1 0

Hans Leidekker : qmgr: Implement IBackgroundCopyJob:: SetCredentials and IBackgroundCopyJob::RemoveCredentials.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 63aa94573f0dd0e595d9430da4ede38218b3098d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63aa94573f0dd0e595d9430da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:06:26 2015 +0200 qmgr: Implement IBackgroundCopyJob::SetCredentials and IBackgroundCopyJob::RemoveCredentials. --- dlls/qmgr/file.c | 50 ++++++++++++++++++++++++++++++++++++++ dlls/qmgr/job.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- dlls/qmgr/qmgr.h | 2 +- 3 files changed, 119 insertions(+), 6 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 55e93aa..a5a41d1 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -321,6 +321,55 @@ static DWORD wait_for_completion(BackgroundCopyJobImpl *job) return error; } +static UINT target_from_index(UINT index) +{ + switch (index) + { + case 0: return WINHTTP_AUTH_TARGET_SERVER; + case 1: return WINHTTP_AUTH_TARGET_PROXY; + default: + ERR("unhandled index %u\n", index); + break; + } + return 0; +} + +static UINT scheme_from_index(UINT index) +{ + switch (index) + { + case 0: return WINHTTP_AUTH_SCHEME_BASIC; + case 1: return WINHTTP_AUTH_SCHEME_NTLM; + case 2: return WINHTTP_AUTH_SCHEME_PASSPORT; + case 3: return WINHTTP_AUTH_SCHEME_DIGEST; + case 4: return WINHTTP_AUTH_SCHEME_NEGOTIATE; + default: + ERR("unhandled index %u\n", index); + break; + } + return 0; +} + +static BOOL set_request_credentials(HINTERNET req, BackgroundCopyJobImpl *job) +{ + UINT i, j; + + for (i = 0; i < BG_AUTH_TARGET_PROXY; i++) + { + UINT target = target_from_index(i); + for (j = 0; j < BG_AUTH_SCHEME_PASSPORT; j++) + { + UINT scheme = scheme_from_index(j); + const WCHAR *username = job->http_options.creds[i][j].Credentials.Basic.UserName; + const WCHAR *password = job->http_options.creds[i][j].Credentials.Basic.Password; + + if (!username) continue; + if (!WinHttpSetCredentials(req, target, scheme, username, password, NULL)) return FALSE; + } + } + return TRUE; +} + static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc, const WCHAR *tmpfile) { @@ -339,6 +388,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc if (!(con = WinHttpConnect(ses, uc->lpszHostName, uc->nPort, 0))) goto done; if (!(req = WinHttpOpenRequest(con, NULL, uc->lpszUrlPath, NULL, NULL, NULL, flags))) goto done; + if (!set_request_credentials(req, job)) goto done; if (!(WinHttpSendRequest(req, job->http_options.headers, ~0u, NULL, 0, 0, (DWORD_PTR)file))) goto done; if (wait_for_completion(job) || job->error.code) goto done; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 9595616..bf48480 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -237,7 +237,7 @@ static ULONG WINAPI BackgroundCopyJob_AddRef(IBackgroundCopyJob3 *iface) static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob3 *iface) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG i, j, ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(%d)\n", This, ref); @@ -250,6 +250,15 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob3 *iface) HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This->description); HeapFree(GetProcessHeap(), 0, This->http_options.headers); + for (i = 0; i < BG_AUTH_TARGET_PROXY; i++) + { + for (j = 0; j < BG_AUTH_SCHEME_PASSPORT; j++) + { + BG_AUTH_CREDENTIALS *cred = &This->http_options.creds[i][j]; + HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.UserName); + HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.Password); + } + } HeapFree(GetProcessHeap(), 0, This); } @@ -795,12 +804,49 @@ static HRESULT WINAPI BackgroundCopyJob_GetReplyFileName( return E_NOTIMPL; } +static int index_from_target(BG_AUTH_TARGET target) +{ + if (!target || target > BG_AUTH_TARGET_PROXY) return -1; + return target - 1; +} + +static int index_from_scheme(BG_AUTH_SCHEME scheme) +{ + if (!scheme || scheme > BG_AUTH_SCHEME_PASSPORT) return -1; + return scheme - 1; +} + static HRESULT WINAPI BackgroundCopyJob_SetCredentials( IBackgroundCopyJob3 *iface, BG_AUTH_CREDENTIALS *cred) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%p): stub\n", This, cred); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob3(iface); + BG_AUTH_CREDENTIALS *new_cred; + int idx_target, idx_scheme; + + TRACE("(%p)->(%p)\n", job, cred); + + if ((idx_target = index_from_target(cred->Target)) < 0) return BG_E_INVALID_AUTH_TARGET; + if ((idx_scheme = index_from_scheme(cred->Scheme)) < 0) return BG_E_INVALID_AUTH_SCHEME; + new_cred = &job->http_options.creds[idx_target][idx_scheme]; + + EnterCriticalSection(&job->cs); + + new_cred->Target = cred->Target; + new_cred->Scheme = cred->Scheme; + + if (cred->Credentials.Basic.UserName) + { + HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); + new_cred->Credentials.Basic.UserName = strdupW(cred->Credentials.Basic.UserName); + } + if (cred->Credentials.Basic.Password) + { + HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); + new_cred->Credentials.Basic.Password = strdupW(cred->Credentials.Basic.Password); + } + + LeaveCriticalSection(&job->cs); return S_OK; } @@ -809,8 +855,25 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( BG_AUTH_TARGET target, BG_AUTH_SCHEME scheme) { - BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p)->(%d %d): stub\n", This, target, scheme); + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob3(iface); + BG_AUTH_CREDENTIALS *new_cred; + int idx_target, idx_scheme; + + TRACE("(%p)->(%u %u)\n", job, target, scheme); + + if ((idx_target = index_from_target(target)) < 0) return BG_E_INVALID_AUTH_TARGET; + if ((idx_scheme = index_from_scheme(scheme)) < 0) return BG_E_INVALID_AUTH_SCHEME; + new_cred = &job->http_options.creds[idx_target][idx_scheme]; + + EnterCriticalSection(&job->cs); + + new_cred->Target = new_cred->Scheme = 0; + HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); + new_cred->Credentials.Basic.UserName = NULL; + HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); + new_cred->Credentials.Basic.Password = NULL; + + LeaveCriticalSection(&job->cs); return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 268fabc..611896d 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -56,7 +56,7 @@ typedef struct { WCHAR *headers; ULONG flags; - BG_AUTH_CREDENTIALS creds; + BG_AUTH_CREDENTIALS creds[BG_AUTH_TARGET_PROXY][BG_AUTH_SCHEME_PASSPORT]; } http_options; struct {

1 0

Hans Leidekker : qmgr: Implement IBackgroundCopyJobHttpOptions:: SetCustomHeaders and IBackgroundCopyJobHttpOptions::GetCustomHeaders.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 1e800c7b944e79e85268290510322bf888d637c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e800c7b944e79e8526829051… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:05:59 2015 +0200 qmgr: Implement IBackgroundCopyJobHttpOptions::SetCustomHeaders and IBackgroundCopyJobHttpOptions::GetCustomHeaders. --- dlls/qmgr/file.c | 2 +- dlls/qmgr/job.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/qmgr/qmgr.h | 14 ++++++++++++++ 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 3c92bb0..55e93aa 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -340,7 +340,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc if (!(con = WinHttpConnect(ses, uc->lpszHostName, uc->nPort, 0))) goto done; if (!(req = WinHttpOpenRequest(con, NULL, uc->lpszUrlPath, NULL, NULL, NULL, flags))) goto done; - if (!(WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, (DWORD_PTR)file))) goto done; + if (!(WinHttpSendRequest(req, job->http_options.headers, ~0u, NULL, 0, 0, (DWORD_PTR)file))) goto done; if (wait_for_completion(job) || job->error.code) goto done; if (!(WinHttpReceiveResponse(req, NULL))) goto done; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 8ee6498..9595616 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -976,16 +976,59 @@ static HRESULT WINAPI http_options_SetCustomHeaders( IBackgroundCopyJobHttpOptions *iface, LPCWSTR RequestHeaders) { - FIXME("\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + + TRACE("(%p)->(%s)\n", iface, debugstr_w(RequestHeaders)); + + EnterCriticalSection(&job->cs); + + if (RequestHeaders) + { + WCHAR *headers = strdupW(RequestHeaders); + if (!headers) + { + LeaveCriticalSection(&job->cs); + return E_OUTOFMEMORY; + } + HeapFree(GetProcessHeap(), 0, job->http_options.headers); + job->http_options.headers = headers; + } + else + { + HeapFree(GetProcessHeap(), 0, job->http_options.headers); + job->http_options.headers = NULL; + } + + LeaveCriticalSection(&job->cs); + return S_OK; } static HRESULT WINAPI http_options_GetCustomHeaders( IBackgroundCopyJobHttpOptions *iface, LPWSTR *pRequestHeaders) { - FIXME("\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + + TRACE("(%p)->(%p)\n", iface, pRequestHeaders); + + EnterCriticalSection(&job->cs); + + if (job->http_options.headers) + { + WCHAR *headers = co_strdupW(job->http_options.headers); + if (!headers) + { + LeaveCriticalSection(&job->cs); + return E_OUTOFMEMORY; + } + *pRequestHeaders = headers; + LeaveCriticalSection(&job->cs); + return S_OK; + } + + *pRequestHeaders = NULL; + LeaveCriticalSection(&job->cs); + return S_FALSE; } static HRESULT WINAPI http_options_SetSecurityFlags( diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 4b9d2fb..268fabc 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -115,6 +115,20 @@ void processJob(BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; /* Little helper functions */ +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1) * sizeof(WCHAR)); + if (dst) strcpyW(dst, src); + return dst; +} + +static inline WCHAR *co_strdupW(const WCHAR *src) +{ + WCHAR *dst = CoTaskMemAlloc((strlenW(src) + 1) * sizeof(WCHAR)); + if (dst) strcpyW(dst, src); + return dst; +} + static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret) { int len;

1 0

Hans Leidekker : qmgr: Add a stub implementation of IBackgroundCopyJobHttpOptions.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: faa65f629119f1388f46a16b300b14e814f4cb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa65f629119f1388f46a16b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:05:11 2015 +0200 qmgr: Add a stub implementation of IBackgroundCopyJobHttpOptions. --- dlls/qmgr/job.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.h | 7 ++++ 2 files changed, 129 insertions(+) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index d342041..5cb85ae 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -212,6 +212,10 @@ static HRESULT WINAPI BackgroundCopyJob_QueryInterface( { *obj = &This->IBackgroundCopyJob3_iface; } + else if (IsEqualGUID(riid, &IID_IBackgroundCopyJobHttpOptions)) + { + *obj = &This->IBackgroundCopyJobHttpOptions_iface; + } else { *obj = NULL; @@ -245,6 +249,7 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob3 *iface) IBackgroundCopyCallback2_Release(This->callback); HeapFree(GetProcessHeap(), 0, This->displayName); HeapFree(GetProcessHeap(), 0, This->description); + HeapFree(GetProcessHeap(), 0, This->http_options.headers); HeapFree(GetProcessHeap(), 0, This); } @@ -900,6 +905,120 @@ static const IBackgroundCopyJob3Vtbl BackgroundCopyJob3Vtbl = BackgroundCopyJob_GetFileACLFlags }; +static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJobHttpOptions( + IBackgroundCopyJobHttpOptions *iface) +{ + return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJobHttpOptions_iface); +} + +static HRESULT WINAPI http_options_QueryInterface( + IBackgroundCopyJobHttpOptions *iface, + REFIID riid, + void **ppvObject) +{ + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + return IBackgroundCopyJob3_QueryInterface(&job->IBackgroundCopyJob3_iface, riid, ppvObject); +} + +static ULONG WINAPI http_options_AddRef( + IBackgroundCopyJobHttpOptions *iface) +{ + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + return IBackgroundCopyJob3_AddRef(&job->IBackgroundCopyJob3_iface); +} + +static ULONG WINAPI http_options_Release( + IBackgroundCopyJobHttpOptions *iface) +{ + BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); + return IBackgroundCopyJob3_Release(&job->IBackgroundCopyJob3_iface); +} + +static HRESULT WINAPI http_options_SetClientCertificateByID( + IBackgroundCopyJobHttpOptions *iface, + BG_CERT_STORE_LOCATION StoreLocation, + LPCWSTR StoreName, + BYTE *pCertHashBlob) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_SetClientCertificateByName( + IBackgroundCopyJobHttpOptions *iface, + BG_CERT_STORE_LOCATION StoreLocation, + LPCWSTR StoreName, + LPCWSTR SubjectName) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_RemoveClientCertificate( + IBackgroundCopyJobHttpOptions *iface) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_GetClientCertificate( + IBackgroundCopyJobHttpOptions *iface, + BG_CERT_STORE_LOCATION *pStoreLocation, + LPWSTR *pStoreName, + BYTE **ppCertHashBlob, + LPWSTR *pSubjectName) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_SetCustomHeaders( + IBackgroundCopyJobHttpOptions *iface, + LPCWSTR RequestHeaders) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_GetCustomHeaders( + IBackgroundCopyJobHttpOptions *iface, + LPWSTR *pRequestHeaders) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_SetSecurityFlags( + IBackgroundCopyJobHttpOptions *iface, + ULONG Flags) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI http_options_GetSecurityFlags( + IBackgroundCopyJobHttpOptions *iface, + ULONG *pFlags) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const IBackgroundCopyJobHttpOptionsVtbl http_options_vtbl = +{ + http_options_QueryInterface, + http_options_AddRef, + http_options_Release, + http_options_SetClientCertificateByID, + http_options_SetClientCertificateByName, + http_options_RemoveClientCertificate, + http_options_GetClientCertificate, + http_options_SetCustomHeaders, + http_options_GetCustomHeaders, + http_options_SetSecurityFlags, + http_options_GetSecurityFlags +}; + HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *job_id, BackgroundCopyJobImpl **job) { HRESULT hr; @@ -913,6 +1032,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID return E_OUTOFMEMORY; This->IBackgroundCopyJob3_iface.lpVtbl = &BackgroundCopyJob3Vtbl; + This->IBackgroundCopyJobHttpOptions_iface.lpVtbl = &http_options_vtbl; InitializeCriticalSection(&This->cs); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BackgroundCopyJobImpl.cs"); @@ -957,6 +1077,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->error.code = 0; This->error.file = NULL; + memset(&This->http_options, 0, sizeof(This->http_options)); + *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 9595f22..4b9d2fb 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -37,6 +37,7 @@ typedef struct { IBackgroundCopyJob3 IBackgroundCopyJob3_iface; + IBackgroundCopyJobHttpOptions IBackgroundCopyJobHttpOptions_iface; LONG ref; LPWSTR displayName; LPWSTR description; @@ -53,6 +54,12 @@ typedef struct struct list entryFromQmgr; struct { + WCHAR *headers; + ULONG flags; + BG_AUTH_CREDENTIALS creds; + } http_options; + struct + { BG_ERROR_CONTEXT context; HRESULT code; IBackgroundCopyFile2 *file;

1 0

Hans Leidekker : qmgr: Implement IBackgroundCopyJob::Cancel.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 13c3f7ac2b563596a74811590239ebee535a0889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c3f7ac2b563596a74811590… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:06:59 2015 +0200 qmgr: Implement IBackgroundCopyJob::Cancel. --- dlls/qmgr/file.c | 1 + dlls/qmgr/job.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index a5a41d1..0321ab6 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -201,6 +201,7 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, This->fileProgress.Completed = FALSE; This->owner = owner; This->read_size = 0; + This->tempFileName[0] = 0; IBackgroundCopyJob3_AddRef(&owner->IBackgroundCopyJob3_iface); *file = This; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index bf48480..37ef5f9 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -259,6 +259,9 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob3 *iface) HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.Password); } } + CloseHandle(This->wait); + CloseHandle(This->cancel); + CloseHandle(This->done); HeapFree(GetProcessHeap(), 0, This); } @@ -365,8 +368,48 @@ static HRESULT WINAPI BackgroundCopyJob_Cancel( IBackgroundCopyJob3 *iface) { BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob3(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + HRESULT rv = S_OK; + + TRACE("(%p)\n", This); + + EnterCriticalSection(&This->cs); + + if (is_job_done(This)) + { + rv = BG_E_INVALID_STATE; + } + else + { + BackgroundCopyFileImpl *file; + + if (This->state == BG_JOB_STATE_CONNECTING || This->state == BG_JOB_STATE_TRANSFERRING) + { + This->state = BG_JOB_STATE_CANCELLED; + SetEvent(This->cancel); + + LeaveCriticalSection(&This->cs); + WaitForSingleObject(This->done, INFINITE); + EnterCriticalSection(&This->cs); + } + + LIST_FOR_EACH_ENTRY(file, &This->files, BackgroundCopyFileImpl, entryFromJob) + { + if (file->tempFileName[0] && !DeleteFileW(file->tempFileName)) + { + WARN("Couldn't delete %s (%u)\n", debugstr_w(file->tempFileName), GetLastError()); + rv = BG_S_UNABLE_TO_DELETE_FILES; + } + if (file->info.LocalName && !DeleteFileW(file->info.LocalName)) + { + WARN("Couldn't delete %s (%u)\n", debugstr_w(file->info.LocalName), GetLastError()); + rv = BG_S_UNABLE_TO_DELETE_FILES; + } + } + This->state = BG_JOB_STATE_CANCELLED; + } + + LeaveCriticalSection(&This->cs); + return rv; } static HRESULT WINAPI BackgroundCopyJob_Complete( @@ -1193,6 +1236,10 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID memset(&This->http_options, 0, sizeof(This->http_options)); + This->wait = CreateEventW(NULL, FALSE, FALSE, NULL); + This->cancel = CreateEventW(NULL, FALSE, FALSE, NULL); + This->done = CreateEventW(NULL, FALSE, FALSE, NULL); + *job = This; TRACE("created job %s:%p\n", debugstr_guid(&This->jobId), This);

1 0