November 2012 - Wine-commits

Piotr Caban : msvcp60: Added basic_stringbuf::_Mode implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

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

Piotr Caban : msvcp60: Export basic_ostream constructors.
by Alexandre Julliard 19 Nov '12

19 Nov '12

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: Fixed handling of empty strings.
by Alexandre Julliard 19 Nov '12

19 Nov '12

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

Detlef Riekenberg : ktmw32: Add a stub for CommitTransaction.
by Alexandre Julliard 16 Nov '12

16 Nov '12

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

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

16 Nov '12

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

Alexandre Julliard : user32: Maintain a cache of registry keys for the various parameters.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 9c729720a9d824d1c695e4043b3a562e7c5418bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c729720a9d824d1c695e4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 12:39:43 2012 +0100 user32: Maintain a cache of registry keys for the various parameters. --- dlls/user32/sysparams.c | 86 +++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 47 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e1b8b72..6d10642 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -558,65 +558,44 @@ static void SYSPARAMS_NotifyChange( UINT uiAction, UINT fWinIni ) } } - -/*********************************************************************** - * Saves system parameter to user profile. - */ - -/* Save data as-is */ -static BOOL SYSPARAMS_SaveRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, - const void *lpValue, DWORD valueSize, - DWORD type, UINT fWinIni ) +/* retrieve the cached base keys for a given entry */ +static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { - HKEY hKey; - HKEY hBaseKey; - DWORD dwOptions; - BOOL ret = FALSE; + static HKEY base_keys[NB_PARAM_KEYS]; + static HKEY volatile_keys[NB_PARAM_KEYS]; + HKEY key; - if (fWinIni & SPIF_UPDATEINIFILE) - { - hBaseKey = HKEY_CURRENT_USER; - dwOptions = 0; - } - else + if (!base_keys[index] && base_key) { - hBaseKey = get_volatile_regkey(); - dwOptions = REG_OPTION_VOLATILE; + if (RegCreateKeyW( HKEY_CURRENT_USER, parameter_key_names[index], &key )) return FALSE; + if (InterlockedCompareExchangePointer( (void **)&base_keys[index], key, 0 )) + RegCloseKey( key ); } - - if (RegCreateKeyExW( hBaseKey, lpRegKey, - 0, 0, dwOptions, KEY_ALL_ACCESS, - 0, &hKey, 0 ) == ERROR_SUCCESS) + if (!volatile_keys[index] && volatile_key) { - if (RegSetValueExW( hKey, lpValName, 0, type, - lpValue, valueSize) == ERROR_SUCCESS) - { - ret = TRUE; - if (hBaseKey == HKEY_CURRENT_USER) - RegDeleteKeyW( get_volatile_regkey(), lpRegKey ); - } - RegCloseKey( hKey ); + if (RegCreateKeyExW( get_volatile_regkey(), parameter_key_names[index], + 0, 0, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &key, 0 )) return FALSE; + if (InterlockedCompareExchangePointer( (void **)&volatile_keys[index], key, 0 )) + RegCloseKey( key ); } - return ret; + if (base_key) *base_key = base_keys[index]; + if (volatile_key) *volatile_key = volatile_keys[index]; + return TRUE; } /* load a value to a registry entry */ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) { DWORD type, count = 0; - HKEY key; + HKEY base_key, volatile_key; - if (!RegOpenKeyW( get_volatile_regkey(), parameter_key_names[entry->regval[0]], &key )) - { - count = size; - if (RegQueryValueExW( key, entry->regval + 1, NULL, &type, data, &count )) count = 0; - RegCloseKey( key ); - } - if (!count && !RegOpenKeyW( HKEY_CURRENT_USER, parameter_key_names[entry->regval[0]], &key )) + if (!get_base_keys( entry->regval[0], &base_key, &volatile_key )) return FALSE; + + count = size; + if (RegQueryValueExW( volatile_key, entry->regval + 1, NULL, &type, data, &count )) { count = size; - if (RegQueryValueExW( key, entry->regval + 1, NULL, &type, data, &count )) count = 0; - RegCloseKey( key ); + if (RegQueryValueExW( base_key, entry->regval + 1, NULL, &type, data, &count )) count = 0; } /* make sure strings are null-terminated */ if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count - 1] = 0; @@ -628,9 +607,22 @@ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) static BOOL save_entry( const struct sysparam_entry *entry, const void *data, DWORD size, DWORD type, UINT flags ) { - if (!SYSPARAMS_SaveRaw( parameter_key_names[entry->regval[0]], entry->regval + 1, data, size, type, flags )) - return FALSE; - if (entry->mirror) SYSPARAMS_SaveRaw( parameter_key_names[entry->mirror[0]], entry->mirror + 1, data, size, type, flags ); + HKEY base_key, volatile_key; + + if (flags & SPIF_UPDATEINIFILE) + { + if (!get_base_keys( entry->regval[0], &base_key, &volatile_key )) return FALSE; + if (RegSetValueExW( base_key, entry->regval + 1, 0, type, data, size )) return FALSE; + RegDeleteValueW( volatile_key, entry->regval + 1 ); + + if (entry->mirror && get_base_keys( entry->mirror[0], &base_key, NULL )) + RegSetValueExW( base_key, entry->mirror + 1, 0, type, data, size ); + } + else + { + if (!get_base_keys( entry->regval[0], NULL, &volatile_key )) return FALSE; + if (RegSetValueExW( volatile_key, entry->regval + 1, 0, type, data, size )) return FALSE; + } return TRUE; }

1 0

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

16 Nov '12

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

Jacek Caban : wininet: Store both proxy and destination host in http_request_t.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: c8da35729c89d634cecc6438f2b8ebda9c229e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8da35729c89d634cecc6438f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 14:38:56 2012 +0100 wininet: Store both proxy and destination host in http_request_t. --- dlls/wininet/http.c | 24 +++++++++++++----------- dlls/wininet/internet.h | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8937a39..1c24153 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1729,8 +1729,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(!new_server) return FALSE; - server_release(request->server); - request->server = new_server; + request->proxy = new_server; TRACE("proxy server=%s port=%d\n", debugstr_w(new_server->name), new_server->port); return TRUE; @@ -1738,7 +1737,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static DWORD HTTP_ResolveName(http_request_t *request) { - server_t *server = request->server; + server_t *server = request->proxy ? request->proxy : request->server; socklen_t addr_len; void *addr; @@ -1829,6 +1828,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) if(request->server) server_release(request->server); + if(request->proxy) + server_release(request->proxy); heap_free(request->path); heap_free(request->verb); @@ -3933,8 +3934,6 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) { http_session_t *session = request->session; - appinfo_t *hIC = session->appInfo; - BOOL using_proxy = hIC->proxy && hIC->proxy[0]; WCHAR path[INTERNET_MAX_PATH_LENGTH]; int index; @@ -4020,7 +4019,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) reset_data_stream(request); - if(!using_proxy && (strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort)) { + if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { server_t *new_server; new_server = get_server(hostName, urlComponents.nPort, TRUE); @@ -4084,6 +4083,7 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static DWORD HTTP_SecureProxyConnect(http_request_t *request) { + server_t *server = request->server; LPWSTR lpszPath; LPWSTR requestString; INT len; @@ -4093,12 +4093,11 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) DWORD res; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR szFormat[] = {'%','s',':','%','u',0}; - http_session_t *session = request->session; TRACE("\n"); - lpszPath = heap_alloc((lstrlenW( session->hostName ) + 13)*sizeof(WCHAR)); - sprintfW( lpszPath, szFormat, session->hostName, session->hostPort ); + lpszPath = heap_alloc((lstrlenW(server->name) + 13)*sizeof(WCHAR)); + sprintfW(lpszPath, szFormat, server->name, server->port); requestString = HTTP_BuildHeaderRequestString( request, szConnect, lpszPath, g_szHttp1_1 ); heap_free( lpszPath ); @@ -4712,12 +4711,15 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) return ERROR_SUCCESS; } + TRACE("connecting to %s, proxy %s\n", debugstr_w(request->server->name), + request->proxy ? debugstr_w(request->proxy->name) : "(null)"); + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, request->server->addr_str, strlen(request->server->addr_str)+1); - res = create_netconn(is_https, request->server, request->security_flags, + res = create_netconn(is_https, request->proxy ? request->proxy : request->server, request->security_flags, (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { @@ -4738,7 +4740,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if(request->session->appInfo->proxy) + if(request->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) res = NETCON_secure_connect(request->netconn); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 181ef4c..3873855 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -314,6 +314,7 @@ typedef struct object_header_t hdr; http_session_t *session; server_t *server; + server_t *proxy; LPWSTR path; LPWSTR verb; LPWSTR rawHeaders;

1 0

Jacek Caban : wininet: Fixed HTTP CONNECT secure connection.
by Alexandre Julliard 16 Nov '12

16 Nov '12

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

Nikolay Sivov : msxml3: Store handler pointers so casts to particular type are avoided.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a644bad2afa3f2689a254f953857cae58c1b3597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a644bad2afa3f2689a254f953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 15 22:34:58 2012 -0500 msxml3: Store handler pointers so casts to particular type are avoided. --- dlls/msxml3/saxreader.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9ebdc0f..21c5b4f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -173,7 +173,7 @@ enum saxhandler_type SAXHandler_Last }; -struct saxhandler_iface +struct saxanyhandler_iface { IUnknown *handler; IUnknown *vbhandler; @@ -197,6 +197,16 @@ struct saxlexicalhandler_iface IVBSAXLexicalHandler *vbhandler; }; +struct saxhandler_iface +{ + union { + struct saxcontenthandler_iface content; + struct saxerrorhandler_iface error; + struct saxlexicalhandler_iface lexical; + struct saxanyhandler_iface anyhandler; + } u; +}; + typedef struct { DispatchEx dispex; @@ -215,7 +225,7 @@ typedef struct static HRESULT saxreader_put_handler(saxreader *reader, enum saxhandler_type type, void *ptr, BOOL vb) { - struct saxhandler_iface *iface = &reader->saxhandlers[type]; + struct saxanyhandler_iface *iface = &reader->saxhandlers[type].u.anyhandler; IUnknown *unk = (IUnknown*)ptr; if (unk) @@ -234,7 +244,7 @@ static HRESULT saxreader_put_handler(saxreader *reader, enum saxhandler_type typ static HRESULT saxreader_get_handler(const saxreader *reader, enum saxhandler_type type, BOOL vb, void **ret) { - const struct saxhandler_iface *iface = &reader->saxhandlers[type]; + const struct saxanyhandler_iface *iface = &reader->saxhandlers[type].u.anyhandler; if (!ret) return E_POINTER; @@ -253,17 +263,17 @@ static HRESULT saxreader_get_handler(const saxreader *reader, enum saxhandler_ty static struct saxcontenthandler_iface *saxreader_get_contenthandler(saxreader *reader) { - return (struct saxcontenthandler_iface*)&reader->saxhandlers[SAXContentHandler]; + return &reader->saxhandlers[SAXContentHandler].u.content; } static struct saxerrorhandler_iface *saxreader_get_errorhandler(saxreader *reader) { - return (struct saxerrorhandler_iface*)&reader->saxhandlers[SAXErrorHandler]; + return &reader->saxhandlers[SAXErrorHandler].u.error; } static struct saxlexicalhandler_iface *saxreader_get_lexicalhandler(saxreader *reader) { - return (struct saxlexicalhandler_iface*)&reader->saxhandlers[SAXLexicalHandler]; + return &reader->saxhandlers[SAXLexicalHandler].u.lexical; } typedef struct @@ -327,8 +337,8 @@ static inline saxlocator *impl_from_ISAXAttributes( ISAXAttributes *iface ) static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandler_type type) { - return (locator->vbInterface && locator->saxreader->saxhandlers[type].vbhandler) || - (!locator->vbInterface && locator->saxreader->saxhandlers[type].handler); + struct saxanyhandler_iface *iface = &locator->saxreader->saxhandlers[type].u.anyhandler; + return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler); } /* property names */ @@ -2734,7 +2744,7 @@ static ULONG WINAPI saxxmlreader_Release( for (i = 0; i < SAXHandler_Last; i++) { - struct saxhandler_iface *iface = &This->saxhandlers[i]; + struct saxanyhandler_iface *iface = &This->saxhandlers[i].u.anyhandler; if (iface->handler) IUnknown_Release(iface->handler);

1 0