November 2012 - Wine-Commits

Piotr Caban : msvcp60: Fixed handling of empty strings.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 95c4284822853c1a0c7227aa38174e61337a07fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c4284822853c1a0c7227aa3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:08 2012 +0100 msvcp60: Fixed handling of empty strings. --- dlls/msvcp60/string.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index d2e1c81..2b890fa 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -236,7 +236,8 @@ void __thiscall basic_string_char__Split(basic_string_char *this) len = this->size; basic_string_char__Tidy(this, TRUE); if(basic_string_char__Grow(this, len, FALSE)) { - char_traits_char__Copy_s(this->ptr, this->res, ptr, len); + if(ptr) + char_traits_char__Copy_s(this->ptr, this->res, ptr, len); basic_string_char__Eos(this, len); } } @@ -345,8 +346,8 @@ basic_string_char* __thiscall basic_string_char_assign_substr( basic_string_char_erase(this, pos+len, basic_string_char_npos); basic_string_char_erase(this, 0, pos); } else if(basic_string_char__Grow(this, len, FALSE)) { - char_traits_char__Copy_s(this->ptr, this->res, - assign->ptr+pos, len); + if(assign->ptr) + char_traits_char__Copy_s(this->ptr, this->res, assign->ptr+pos, len); basic_string_char__Eos(this, len); } @@ -1149,8 +1150,9 @@ basic_string_char* __thiscall basic_string_char_append_substr(basic_string_char _Xlen(); if(basic_string_char__Grow(this, this->size+count, FALSE)) { - char_traits_char__Copy_s(this->ptr+this->size, - this->res-this->size, append->ptr+offset, count); + if(append->ptr) + char_traits_char__Copy_s(this->ptr+this->size, this->res-this->size, + append->ptr+offset, count); basic_string_char__Eos(this, this->size+count); } @@ -1763,7 +1765,8 @@ MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, _Xran(); if(count > this->size-off) count = this->size-off; - char_traits_char__Copy_s(dest, count, this->ptr+off, count); + if(this->ptr) + char_traits_char__Copy_s(dest, count, this->ptr+off, count); return count; } @@ -1949,7 +1952,8 @@ void __thiscall basic_string_wchar__Split(basic_string_wchar *this) len = this->size; basic_string_wchar__Tidy(this, TRUE); if(basic_string_wchar__Grow(this, len, FALSE)) { - char_traits_wchar__Copy_s(this->ptr, this->res, ptr, len); + if(ptr) + char_traits_wchar__Copy_s(this->ptr, this->res, ptr, len); basic_string_wchar__Eos(this, len); } } @@ -2058,8 +2062,9 @@ basic_string_wchar* __thiscall basic_string_wchar_assign_substr( basic_string_wchar_erase(this, pos+len, basic_string_wchar_npos); basic_string_wchar_erase(this, 0, pos); } else if(basic_string_wchar__Grow(this, len, FALSE)) { - char_traits_wchar__Copy_s(this->ptr, this->res, - assign->ptr+pos, len); + if(assign->ptr) + char_traits_wchar__Copy_s(this->ptr, this->res, + assign->ptr+pos, len); basic_string_wchar__Eos(this, len); } @@ -2861,8 +2866,9 @@ basic_string_wchar* __thiscall basic_string_wchar_append_substr(basic_string_wch _Xlen(); if(basic_string_wchar__Grow(this, this->size+count, FALSE)) { - char_traits_wchar__Copy_s(this->ptr+this->size, - this->res-this->size, append->ptr+offset, count); + if(append->ptr) + char_traits_wchar__Copy_s(this->ptr+this->size, this->res-this->size, + append->ptr+offset, count); basic_string_wchar__Eos(this, this->size+count); } @@ -3475,7 +3481,8 @@ MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, _Xran(); if(count > this->size-off) count = this->size-off; - char_traits_wchar__Copy_s(dest, count, this->ptr+off, count); + if(this->ptr) + char_traits_wchar__Copy_s(dest, count, this->ptr+off, count); return count; }

1 0

Piotr Caban : msvcp60: Export basic_ostream constructors.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 4f4f93802a1472e12c499d50a2d30c3e78877723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4f93802a1472e12c499d50a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:43:58 2012 +0100 msvcp60: Export basic_ostream constructors. --- dlls/msvcp60/ios.c | 110 +++++++++++++++++++++------------------------ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 60 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f4f93802a1472e12c499…

1 0

Piotr Caban : msvcp60: Added basic_stringbuf::_Mode implementation.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: eae21a1fbf9f157ae172d227de49645330dafb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae21a1fbf9f157ae172d227d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:43:48 2012 +0100 msvcp60: Added basic_stringbuf::_Mode implementation. --- dlls/msvcp60/ios.c | 12 +++++++++--- dlls/msvcp60/msvcp60.spec | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 02e903d..e597a7e 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -275,9 +275,9 @@ typedef enum { typedef struct { basic_streambuf_char base; - streamsize minsize; char *endsave; char *seekhigh; + streamsize minsize; int strmode; void* (__cdecl *palloc)(MSVCP_size_t); void (__cdecl *pfree)(void*); @@ -3279,7 +3279,10 @@ int __thiscall basic_filebuf_wchar_sync(basic_filebuf_wchar *this) /* ?_Getstate@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEHH(a)Z */ /* ?_Getstate@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAHH(a)Z */ -static int basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode) +/* ?_Mode@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEHH(a)Z */ +/* ?_Mode@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAHH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_stringbuf_char__Getstate, 8) +int __thiscall basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode) { int state = 0; @@ -3645,7 +3648,10 @@ basic_string_char* __thiscall basic_stringbuf_char_str_get(const basic_stringbuf /* ?_Getstate@?$basic_stringbuf(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@AEAAHH(a)Z */ /* ?_Getstate@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEHH(a)Z */ /* ?_Getstate@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAAHH(a)Z */ -static int basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode) +/* ?_Mode@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEHH(a)Z */ +/* ?_Mode@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAAHH(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_stringbuf_wchar__Getstate, 8) +int __thiscall basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode) { int state = 0; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 8dcf374..abcc88e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2303,10 +2303,10 @@ @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)D@std@@AEAAXAEAUpattern(a)money_base@2(a)DDD@Z @ stub -arch=win32 ?_Makpat@?$_Mpunct(a)G@std@@AAEXAAUpattern(a)money_base@2(a)DDD@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct(a)G@std@@AEAAXAEAUpattern(a)money_base@2(a)DDD@Z -@ stub -arch=win32 ?_Mode@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEHH(a)Z -@ stub -arch=win64 ?_Mode@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAHH(a)Z -@ stub -arch=win32 ?_Mode@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEHH(a)Z -@ stub -arch=win64 ?_Mode@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAAHH(a)Z +@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEHH(a)Z(ptr long) basic_stringbuf_char__Getstate +@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAHH(a)Z(ptr long) basic_stringbuf_char__Getstate +@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEHH(a)Z(ptr long) basic_stringbuf_wchar__Getstate +@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AEAAHH(a)Z(ptr long) basic_stringbuf_wchar__Getstate @ stub ?_Nanv@?$_Ctr(a)M@std@@SAMM(a)Z @ stub ?_Nanv@?$_Ctr(a)N@std@@SANN(a)Z @ stub ?_Nanv@?$_Ctr(a)O@std@@SAOO(a)Z

1 0

Nikolay Sivov : msxml3: Stub support for external entity resolver.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 7a00f31ecf0b5bf86cf38cb262540419d571de44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a00f31ecf0b5bf86cf38cb26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 16:46:36 2012 -0500 msxml3: Stub support for external entity resolver. --- dlls/msxml3/saxreader.c | 49 +++++++++++++++++++--------------------- dlls/msxml3/tests/saxreader.c | 9 +++++++ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 21c5b4f..073a00c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -168,6 +168,7 @@ enum saxhandler_type SAXContentHandler = 0, SAXDeclHandler, SAXDTDHandler, + SAXEntityResolver, SAXErrorHandler, SAXLexicalHandler, SAXHandler_Last @@ -197,10 +198,17 @@ struct saxlexicalhandler_iface IVBSAXLexicalHandler *vbhandler; }; +struct saxentityresolver_iface +{ + ISAXEntityResolver *handler; + IVBSAXEntityResolver *vbhandler; +}; + struct saxhandler_iface { union { struct saxcontenthandler_iface content; + struct saxentityresolver_iface entityresolver; struct saxerrorhandler_iface error; struct saxlexicalhandler_iface lexical; struct saxanyhandler_iface anyhandler; @@ -1843,6 +1851,12 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) This->column += 4+end-cur; } +static xmlParserInputPtr libxmlresolveentity(void *ctx, const xmlChar *publicid, const xmlChar *systemid) +{ + FIXME("entity resolving not implemented, %s, %s\n", publicid, systemid); + return xmlSAX2ResolveEntity(ctx, publicid, systemid); +} + /*** IVBSAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI ivbsaxlocator_QueryInterface(IVBSAXLocator* iface, REFIID riid, void **ppvObject) @@ -2377,24 +2391,6 @@ static HRESULT internal_parseStream(saxreader *This, ISequentialStream *stream, return hr; } -static HRESULT internal_getEntityResolver( - saxreader *This, - void *pEntityResolver, - BOOL vbInterface) -{ - FIXME("(%p)->(%p) stub\n", This, pEntityResolver); - return E_NOTIMPL; -} - -static HRESULT internal_putEntityResolver( - saxreader *This, - void *pEntityResolver, - BOOL vbInterface) -{ - FIXME("(%p)->(%p) stub\n", This, pEntityResolver); - return E_NOTIMPL; -} - static HRESULT internal_parse( saxreader* This, VARIANT varInput, @@ -2877,18 +2873,18 @@ static HRESULT WINAPI saxxmlreader_putProperty( static HRESULT WINAPI saxxmlreader_get_entityResolver( IVBSAXXMLReader* iface, - IVBSAXEntityResolver **pEntityResolver) + IVBSAXEntityResolver **resolver) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - return internal_getEntityResolver(This, pEntityResolver, TRUE); + return saxreader_get_handler(This, SAXEntityResolver, TRUE, (void**)resolver); } static HRESULT WINAPI saxxmlreader_put_entityResolver( IVBSAXXMLReader* iface, - IVBSAXEntityResolver *pEntityResolver) + IVBSAXEntityResolver *resolver) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - return internal_putEntityResolver(This, pEntityResolver, TRUE); + return saxreader_put_handler(This, SAXEntityResolver, resolver, TRUE); } static HRESULT WINAPI saxxmlreader_get_contentHandler( @@ -3084,18 +3080,18 @@ static HRESULT WINAPI isaxxmlreader_putProperty( static HRESULT WINAPI isaxxmlreader_getEntityResolver( ISAXXMLReader* iface, - ISAXEntityResolver **ppEntityResolver) + ISAXEntityResolver **resolver) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return internal_getEntityResolver(This, ppEntityResolver, FALSE); + return saxreader_get_handler(This, SAXEntityResolver, FALSE, (void**)resolver); } static HRESULT WINAPI isaxxmlreader_putEntityResolver( ISAXXMLReader* iface, - ISAXEntityResolver *pEntityResolver) + ISAXEntityResolver *resolver) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return internal_putEntityResolver(This, pEntityResolver, FALSE); + return saxreader_put_handler(This, SAXEntityResolver, resolver, FALSE); } static HRESULT WINAPI isaxxmlreader_getContentHandler( @@ -3264,6 +3260,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->sax.error = libxmlFatalError; reader->sax.fatalError = libxmlFatalError; reader->sax.cdataBlock = libxmlCDataBlock; + reader->sax.resolveEntity = libxmlresolveentity; *ppObj = &reader->IVBSAXXMLReader_iface; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bcf7529..02bc00c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1903,6 +1903,7 @@ static void test_saxreader(void) while (table->clsid) { struct call_entry *test_seq; + ISAXEntityResolver *resolver; BSTR str; if (!is_clsid_supported(table->clsid, reader_support_data)) @@ -2220,6 +2221,14 @@ static void test_saxreader(void) EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + resolver = (void*)0xdeadbeef; + hr = ISAXXMLReader_getEntityResolver(reader, &resolver); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resolver == NULL, "got %p\n", resolver); + + hr = ISAXXMLReader_putEntityResolver(reader, NULL); + ok(hr == S_OK || broken(hr == E_FAIL), "got 0x%08x\n", hr); + ISAXXMLReader_Release(reader); table++; }

1 0

Detlef Riekenberg : ktmw32: Add a stub for CommitTransaction.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 6e53b8dd577439560ee9dee934c19706d2c59033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e53b8dd577439560ee9dee93… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 16 01:07:59 2012 +0100 ktmw32: Add a stub for CommitTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index cda7bbd..0d549bf 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -1,6 +1,6 @@ @ stub CommitComplete @ stub CommitEnlistment -@ stub CommitTransaction +@ stdcall CommitTransaction(ptr) @ stub CommitTransactionAsync @ stub CreateEnlistment @ stub CreateResourceManager diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 0650b09..6aee549 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -44,6 +44,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /*********************************************************************** + * CommitTransaction (ktmw32.@) + */ +BOOL WINAPI CommitTransaction(HANDLE transaction) +{ + FIXME("(%p): stub\n", transaction); + return TRUE; +} + +/*********************************************************************** * CreateTransaction (ktmw32.@) */ HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD options,

1 0

Frédéric Delanoy : msi: Fix leaks in ITERATE_InstallService (coverity).
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 098b3c72941c810a8b4f2712e70654312bba5857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098b3c72941c810a8b4f2712e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 16 11:50:28 2012 +0100 msi: Fix leaks in ITERATE_InstallService (coverity). --- dlls/msi/action.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2bf0ed5..246b90c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5752,6 +5752,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; + UINT ret = ERROR_SUCCESS; comp = MSI_RecordGetString( rec, 12 ); component = msi_get_loaded_component( package, comp ); @@ -5809,7 +5810,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { int len = strlenW(file->TargetPath) + strlenW(args) + 2; if (!(image_path = msi_alloc(len * sizeof(WCHAR)))) - return ERROR_OUTOFMEMORY; + { + ret = ERROR_OUTOFMEMORY; + goto done; + } strcpyW(image_path, file->TargetPath); strcatW(image_path, szSpace); @@ -5843,7 +5847,7 @@ done: msi_free(depends); msi_free(args); - return ERROR_SUCCESS; + return ret; } static UINT ACTION_InstallServices( MSIPACKAGE *package )

1 0

Frédéric Delanoy : msi: Fix leaks in stop_service_dependents (coverity).
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: cac26d47a0400788de4782691780f2db1aa04eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac26d47a0400788de4782691… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 16 11:50:27 2012 +0100 msi: Fix leaks in stop_service_dependents (coverity). --- dlls/msi/action.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 833bc67..2bf0ed5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6043,6 +6043,7 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) ENUM_SERVICE_STATUSW *dependencies; SERVICE_STATUS ss; SC_HANDLE depserv; + BOOL stopped, ret = FALSE; if (EnumDependentServicesW(service, SERVICE_ACTIVE, NULL, 0, &needed, &count)) @@ -6057,24 +6058,26 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) if (!EnumDependentServicesW(service, SERVICE_ACTIVE, dependencies, needed, &needed, &count)) - goto error; + goto done; for (i = 0; i < count; i++) { depserv = OpenServiceW(scm, dependencies[i].lpServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (!depserv) - goto error; + goto done; - if (!ControlService(depserv, SERVICE_CONTROL_STOP, &ss)) - goto error; + stopped = ControlService(depserv, SERVICE_CONTROL_STOP, &ss); + CloseServiceHandle(depserv); + if (!stopped) + goto done; } - return TRUE; + ret = TRUE; -error: +done: msi_free(dependencies); - return FALSE; + return ret; } static UINT stop_service( LPCWSTR name )

1 0

Jacek Caban : wininet: Fixed HTTP CONNECT secure connection.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: bd42c0416a5db8c607d7dd7bf1576d68af4ca895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd42c0416a5db8c607d7dd7bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 14:39:16 2012 +0100 wininet: Fixed HTTP CONNECT secure connection. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1c24153..3eb0b8d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4743,7 +4743,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if(request->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn); + res = NETCON_secure_connect(request->netconn, request->server); } if(res != ERROR_SUCCESS) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3873855..1baaf2a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -538,7 +538,7 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 2abb676..a792a92 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -707,7 +707,6 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(!netconn) return ERROR_OUTOFMEMORY; - netconn->useSSL = useSSL; netconn->socketFD = -1; netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; @@ -903,7 +902,7 @@ fail: * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(netconn_t *connection) +DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -914,6 +913,13 @@ DWORD NETCON_secure_connect(netconn_t *connection) return ERROR_INTERNET_CANNOT_CONNECT; } + connection->useSSL = TRUE; + if(server != connection->server) { + server_release(connection->server); + server_addref(server); + connection->server = server; + } + /* connect with given TLS options */ res = netcon_secure_connect_setup(connection, get_tls_option()); if (res == ERROR_SUCCESS)

1 0

Alexandre Julliard : user32: Initialize some system parameters in the registry on first run.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 7c2ce566dad0167279f4f2dc0cf416e82785545d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2ce566dad0167279f4f2dc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 16:52:40 2012 +0100 user32: Initialize some system parameters in the registry on first run. --- dlls/user32/sysparams.c | 249 ++++++++++++++++++++++++++++++++++++----------- tools/wine.inf.in | 19 ---- 2 files changed, 191 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c2ce566dad0167279f4f…

1 0

Alexandre Julliard : user32: Define a global list of parameter registry keys and store an index in the value string .
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 2959b312d99400fbf5f6e08e1c23f12bde61e596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2959b312d99400fbf5f6e08e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 12:22:31 2012 +0100 user32: Define a global list of parameter registry keys and store an index in the value string. --- dlls/user32/sysparams.c | 325 +++++++++++++++++++++-------------------------- 1 files changed, 142 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2959b312d99400fbf5f6e…

1 0