April 2013 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Moved string buffer to separated struct from jsstr_t .
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 29d9d668f7e72ae8ddab0669c982602c00e61177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d9d668f7e72ae8ddab0669c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 18:00:31 2013 +0100 jscript: Moved string buffer to separated struct from jsstr_t. --- dlls/jscript/jsstr.c | 18 +++++++++--------- dlls/jscript/jsstr.h | 19 ++++++++++++++----- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index 20e6760..a9dfc49 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -22,25 +22,25 @@ const char *debugstr_jsstr(jsstr_t *str) { - return debugstr_wn(str->str, jsstr_length(str)); + return debugstr_wn(jsstr_as_inline(str)->buf, jsstr_length(str)); } WCHAR *jsstr_alloc_buf(unsigned len, jsstr_t **r) { - jsstr_t *ret; + jsstr_inline_t *ret; if(len > JSSTR_MAX_LENGTH) return NULL; - ret = heap_alloc(FIELD_OFFSET(jsstr_t, str[len+1])); + ret = heap_alloc(FIELD_OFFSET(jsstr_inline_t, buf[len+1])); if(!ret) return NULL; - ret->length_flags = len << JSSTR_LENGTH_SHIFT; - ret->ref = 1; - ret->str[len] = 0; - *r = ret; - return ret->str; + ret->str.length_flags = len << JSSTR_LENGTH_SHIFT; + ret->str.ref = 1; + ret->buf[len] = 0; + *r = &ret->str; + return ret->buf; } jsstr_t *jsstr_alloc_len(const WCHAR *buf, unsigned len) @@ -61,7 +61,7 @@ int jsstr_cmp(jsstr_t *str1, jsstr_t *str2) int len2 = jsstr_length(str2); int ret; - ret = memcmp(str1->str, str2->str, min(len1, len2)*sizeof(WCHAR)); + ret = memcmp(jsstr_as_inline(str1)->buf, jsstr_as_inline(str2)->buf, min(len1, len2)*sizeof(WCHAR)); if(!ret) ret = len1 - len2; diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 28742ac..4d005dc 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -19,7 +19,6 @@ struct _jsstr_t { unsigned length_flags; unsigned ref; - WCHAR str[1]; }; #define JSSTR_LENGTH_SHIFT 4 @@ -33,6 +32,11 @@ static inline unsigned jsstr_length(jsstr_t *str) return str->length_flags >> JSSTR_LENGTH_SHIFT; } +typedef struct { + jsstr_t str; + WCHAR buf[1]; +} jsstr_inline_t; + jsstr_t *jsstr_alloc_len(const WCHAR*,unsigned) DECLSPEC_HIDDEN; WCHAR *jsstr_alloc_buf(unsigned,jsstr_t**) DECLSPEC_HIDDEN; @@ -53,27 +57,32 @@ static inline jsstr_t *jsstr_addref(jsstr_t *str) return str; } +static inline jsstr_inline_t *jsstr_as_inline(jsstr_t *str) +{ + return CONTAINING_RECORD(str, jsstr_inline_t, str); +} + /* This will be failable in the future. */ static inline const WCHAR *jsstr_flatten(jsstr_t *str) { - return str->str; + return jsstr_as_inline(str)->buf; } static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) { unsigned len = jsstr_length(str1); - return len == jsstr_length(str2) && !memcmp(str1->str, str2->str, len*sizeof(WCHAR)); + return len == jsstr_length(str2) && !memcmp(jsstr_as_inline(str1)->buf, jsstr_as_inline(str2)->buf, len*sizeof(WCHAR)); } static inline void jsstr_extract(jsstr_t *str, unsigned off, unsigned len, WCHAR *buf) { - memcpy(buf, str->str+off, len*sizeof(WCHAR)); + memcpy(buf, jsstr_as_inline(str)->buf+off, len*sizeof(WCHAR)); } static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) { unsigned len = jsstr_length(str); - memcpy(buf, str->str, len*sizeof(WCHAR)); + memcpy(buf, jsstr_as_inline(str)->buf, len*sizeof(WCHAR)); return len; }

1 0

Jacek Caban : secur32: Pass enabled protocols to Mac Secure Transport.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 8036bd14f9115fe793a96b756d5f29ac1a7c5479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8036bd14f9115fe793a96b756… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 16:25:44 2013 +0100 secur32: Pass enabled protocols to Mac Secure Transport. --- dlls/secur32/schannel_macosx.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index c562a98..5ec06cf 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -630,15 +630,28 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, return ret; } +static const struct { + DWORD enable_flag; + SSLProtocol mac_version; +} protocol_priority_flags[] = { + {SP_PROT_TLS1_2_CLIENT, kTLSProtocol12}, + {SP_PROT_TLS1_1_CLIENT, kTLSProtocol11}, + {SP_PROT_TLS1_0_CLIENT, kTLSProtocol1}, + {SP_PROT_SSL3_CLIENT, kSSLProtocol3}, + {SP_PROT_SSL2_CLIENT, kSSLProtocol2} +}; + +static DWORD supported_protocols; + DWORD schan_imp_enabled_protocols(void) { - /* NOTE: No support for TLS 1.1 and TLS 1.2 */ - return SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; + return supported_protocols; } BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { struct mac_session *s; + unsigned i; OSStatus status; TRACE("(%p)\n", session); @@ -668,11 +681,17 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } - status = SSLSetProtocolVersionEnabled(s->context, kSSLProtocol2, FALSE); - if (status != noErr) - { - ERR("Failed to disable SSL version 2: %ld\n", (long)status); - goto fail; + for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + if(!(protocol_priority_flags[i].enable_flag & supported_protocols)) + continue; + + status = SSLSetProtocolVersionEnabled(s->context, protocol_priority_flags[i].mac_version, + (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) != 0); + if (status != noErr) + { + ERR("Failed to set SSL version %d: %ld\n", protocol_priority_flags[i].mac_version, (long)status); + goto fail; + } } status = SSLSetIOFuncs(s->context, schan_pull_adapter, schan_push_adapter); @@ -984,6 +1003,13 @@ void schan_imp_free_certificate_credentials(schan_credentials *c) BOOL schan_imp_init(void) { TRACE("()\n"); + + supported_protocols = SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_0_CLIENT; + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 + /* FIXME: Test max allowed version for TLS 1.1 and TLS 1.2 */ +#endif + return TRUE; }

1 0

Nikolay Sivov : ole32: Fix possible return of freed pointer (Coverity).
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 611cf6bb0dcfb07549979c2ada1f7281e03c8c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611cf6bb0dcfb07549979c2ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 18:54:02 2013 +0400 ole32: Fix possible return of freed pointer (Coverity). --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 17bd7a1..04d65c9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -379,6 +379,7 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) entry->DllCanUnloadNow = DllCanUnloadNow; entry->DllGetClassObject = DllGetClassObject; list_add_tail(&openDllList, &entry->entry); + *ret = entry; } else { @@ -386,7 +387,6 @@ static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret) hr = E_OUTOFMEMORY; FreeLibrary(hLibrary); } - *ret = entry; } LeaveCriticalSection( &csOpenDllList );

1 0

Nikolay Sivov : comctl32: Initialize id field for message data (Coverity).
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 6ee869da6dac0e017517938b70ab05ac1025343c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee869da6dac0e017517938b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 12:11:36 2013 +0400 comctl32: Initialize id field for message data (Coverity). --- dlls/comctl32/tests/trackbar.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 17e8bb6..2e76000 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -391,6 +391,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + msg.id = 0; add_message(sequences, PARENT_SEQ_INDEX, &msg); }

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 4e3b8621c459fe3e1ada5a5ae4de980d81a02fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3b8621c459fe3e1ada5a5ae… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 31 08:54:43 2013 +0200 po: Update Polish translation. --- po/pl.po | 151 +++++++++++++++++++++---------------------------------------- 1 files changed, 52 insertions(+), 99 deletions(-) diff --git a/po/pl.po b/po/pl.po index 0a46fa6..74122ce 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,12 +1,12 @@ # Polish translations for Wine # -# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012. +# Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-05 17:26+0200\n" +"PO-Revision-Date: 2013-03-31 08:50+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -3460,11 +3460,11 @@ msgstr "&Włącz" #: joy.rc:38 msgid "Connected" -msgstr "Podłączony" +msgstr "Włączone" #: joy.rc:40 msgid "Disabled" -msgstr "Wyłączony" +msgstr "Wyłączone" #: joy.rc:42 msgid "" @@ -3560,7 +3560,7 @@ msgstr "Niezakończona stała znakowa" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "polecenie powrotu 'return' jest poza funkcją" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8290,44 +8290,37 @@ msgid "Security Warning" msgstr "Ostrzeżenie o zabezpieczeniach" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Czy mimo to chcesz kontynuować?" +msgstr "Czy chcesz zainstalować to oprogramowanie?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Położenie:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Zainstaluj/Odinstaluj" +msgstr "Nie instaluj" #: urlmon.rc:40 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"Składnik ActiveX ma pełny dostęp do twojego komputera, jeśli jest " +"zainstalowany. Nie klikaj zainstaluj dopóki nie masz pełnego zaufania do " +"powyższego źródła." #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Nieudane zastosowanie transformacji instalacji.\n" +msgstr "Nieudana instalacja składnika: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Zainstaluj" +msgstr "Zainstaluj (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Zainstaluj" +msgstr "Zainstaluj" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10146,10 +10139,8 @@ msgid "Wine Command Prompt" msgstr "Wiersz Poleceń Wine" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "Wersja CMD %1!S!\n" +msgstr "Wine CMD Wersja %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -10179,30 +10170,32 @@ msgstr " (Tak|Nie|Wszystkie)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" +"Nie można rozpoznać '%1' ani jako polecenia wewnętrznego, ani zewnętrznego, " +"czy nawet skryptu wsadowego.\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "Błąd dzielenia przez zero.\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "Oczekiwano zmiennej niezależnej.\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Nieoczekiwany błąd sieciowy.\n" +msgstr "Oczekiwano operatora.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "Nierówna liczba nawiasach.\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"Zły format liczbowy - musi on być jednym z formatów dziesiętnych (12),\n" +" szesnastkowych (0x34) lub ósemkowych (056).\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10251,13 +10244,11 @@ msgstr "Ethernet" #: ipconfig.rc:32 msgid "Connection-specific DNS suffix" -msgstr "Sufiks DNS konkretnego połączenia" +msgstr "Przedrostek DNS konkretnego połączenia" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "adres IP" +msgstr "Adres IPv4" #: ipconfig.rc:34 msgid "Hostname" @@ -10300,10 +10291,8 @@ msgid "Default gateway" msgstr "Brama domyślna" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "adres IP" +msgstr "Adres IPv6" #: net.rc:27 msgid "" @@ -10436,152 +10425,116 @@ msgid "The following services are running:\n" msgstr "Uruchomione są następujące usługi:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "Połączenie LAN" +msgstr "Aktywne połączenia" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Protokół" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "Adres e-mail" +msgstr "Adres lokalny" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Ulica" +msgstr "Adres zagraniczny" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "Stan" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Interfejsy" +msgstr "Statystyki interfejsu" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Wysłano" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Pobrano" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "bajty(ów)" +msgstr "Bajtów" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Pakiety unicast" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Pakiety nie-unikast" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Zrzeczenie" +msgstr "Odrzucenia" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Błąd" +msgstr "Błędy" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Nieznany port.\n" +msgstr "Nieznane protokoły" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "Statystyki TCP dla IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Opens" -msgstr "Połączenie LAN" +msgstr "Aktywne otwarcia" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Pasywne otwarcia" #: netstat.rc:44 -#, fuzzy -#| msgid "LAN Connection" msgid "Failed Connection Attempts" -msgstr "Połączenie LAN" +msgstr "Nieudane próby połączenia" #: netstat.rc:45 -#, fuzzy -#| msgid "LAN Connection" msgid "Reset Connections" -msgstr "Połączenie LAN" +msgstr "Wyzerowane połączenia" #: netstat.rc:46 -#, fuzzy -#| msgid "LAN Connection" msgid "Current Connections" -msgstr "Połączenie LAN" +msgstr "Bieżące połączenia" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segment zablokowany.\n" +msgstr "Pobranych segmentów" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segment zablokowany.\n" +msgstr "Wysłanych segmentów" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Ponownie przesłanych segmentów" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "Statystyki UDP dla IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segment zablokowany.\n" +msgstr "Pobranych Danogramów" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Port lokalny" +msgstr "Brak portów" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Błąd podczas dekodowania" +msgstr "Błędów pobrania" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Wysłanych Danogramów" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Andrew Talbot : msvcr90: void functions should not return a value.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: c072ac1071722bbd6136873b4de763a9ee257c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c072ac1071722bbd6136873b4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:41:56 2013 +0000 msvcr90: void functions should not return a value. --- dlls/msvcr90/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index dc97160..4787867 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -104,7 +104,7 @@ void* CDECL MSVCR90_operator_new(size_t size) */ void CDECL MSVCR90_operator_delete(void *ptr) { - return MSVCRT_operator_delete(ptr); + MSVCRT_operator_delete(ptr); } /*********************************************************************

1 0

Jacek Caban : jscript: Use helpers to access string buffers in jsregexp.c.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: c3cf79ac25d0f2be51572e8a9bf8589340127203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cf79ac25d0f2be51572e8a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 18:00:06 2013 +0100 jscript: Use helpers to access string buffers in jsregexp.c. --- dlls/jscript/jsregexp.c | 112 ++++++++++++++++++++++++++++++----------------- 1 files changed, 72 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3cf79ac25d0f2be51572…

1 0

Jacek Caban : jscript: Use helpers to access string buffer in string.c.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: c79180a9788501b7f139b019e258b09c7ccad602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79180a9788501b7f139b019e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 18:00:20 2013 +0100 jscript: Use helpers to access string buffer in string.c. --- dlls/jscript/string.c | 166 +++++++++++++++++++++++++++--------------------- 1 files changed, 93 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c79180a9788501b7f139b…

1 0

Jacek Caban : secur32: Disable SSL2 protocol in default settings.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 194cc70fbef13d4f3d724d8abbe2810f4fb1a53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=194cc70fbef13d4f3d724d8ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 16:25:58 2013 +0100 secur32: Disable SSL2 protocol in default settings. --- dlls/secur32/schannel.c | 4 ++-- tools/wine.inf.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index df75b67..ecc189d 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -178,7 +178,7 @@ static void read_config(void) BOOL enabled; /* If no config is present, enable the protocol */ BOOL disabled_by_default; /* Disable if caller asks for default protocol set */ } protocol_config_keys[] = { - {{'S','S','L',' ','2','.','0',0}, SP_PROT_SSL2_CLIENT, TRUE, TRUE}, + {{'S','S','L',' ','2','.','0',0}, SP_PROT_SSL2_CLIENT, FALSE, TRUE}, /* NOTE: TRUE, TRUE on Windows */ {{'S','S','L',' ','3','.','0',0}, SP_PROT_SSL3_CLIENT, TRUE, FALSE}, {{'T','L','S',' ','1','.','0',0}, SP_PROT_TLS1_0_CLIENT, TRUE, FALSE}, {{'T','L','S',' ','1','.','1',0}, SP_PROT_TLS1_1_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ }, @@ -220,7 +220,7 @@ static void read_config(void) if(type != REG_DWORD || value) default_disabled |= protocol_config_keys[i].prot_client_flag; }else if(protocol_config_keys[i].disabled_by_default) { - default_disabled |= protocol_config_keys[i].prot_client_flag; + default_disabled |= protocol_config_keys[i].prot_client_flag; } RegCloseKey(key); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e7cc5c7..84e40d2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -639,6 +639,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 +HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16

1 0

Nikolay Sivov : msi: Free records on error paths (Coverity).
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 58bbe5ac4c4d01de7a4d30bf20516254045ab376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bbe5ac4c4d01de7a4d30bf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 14:59:33 2013 +0400 msi: Free records on error paths (Coverity). --- dlls/msi/database.c | 6 ++++++ dlls/msi/dialog.c | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 9c0d346..b734031 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1376,7 +1376,10 @@ static UINT merge_verify_colnames(MSIQUERY *dbview, MSIQUERY *mergeview) r = MSI_ViewGetColumnInfo(mergeview, MSICOLINFO_NAMES, &mergerec); if (r != ERROR_SUCCESS) + { + msiobj_release(&dbrec->hdr); return r; + } count = MSI_RecordGetFieldCount(dbrec); for (i = 1; i <= count; i++) @@ -1401,7 +1404,10 @@ static UINT merge_verify_colnames(MSIQUERY *dbview, MSIQUERY *mergeview) r = MSI_ViewGetColumnInfo(mergeview, MSICOLINFO_TYPES, &mergerec); if (r != ERROR_SUCCESS) + { + msiobj_release(&dbrec->hdr); return r; + } count = MSI_RecordGetFieldCount(dbrec); for (i = 1; i <= count; i++) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1e0e23e..662d09a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3552,6 +3552,7 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) if (!dialog->default_font) { dialog->default_font = strdupW(dfv); + msiobj_release( &rec->hdr ); if (!dialog->default_font) return -1; }

1 0