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

Piotr Caban : wininet: Fixed memory leak in load_persistent_cookie.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 97e0cf9f5fd5d53acd75270f8d1e8b180b1e9e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e0cf9f5fd5d53acd75270f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:11:57 2013 +0200 wininet: Fixed memory leak in load_persistent_cookie. --- dlls/wininet/cookie.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 76f9ac5..61aa53b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -234,6 +234,7 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) heap_free(name); heap_free(data); } + heap_free(str); heap_free(name); heap_free(data);

1 0

Jactry Zeng : msvcrt: Added _wcsicoll_l implementation.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: d2763e43d10160eaf5e0c057e32d68d4f9289b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2763e43d10160eaf5e0c057e… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Mar 30 22:59:02 2013 +0800 msvcrt: Added _wcsicoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 19 +++++++++++++++++-- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ab52ff7..0c363bd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1485,7 +1485,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 7776dee..2d9e69e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1848,7 +1848,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e635e96..0faa5f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1145,7 +1145,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9bcdccb..f7c751a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1139,7 +1139,7 @@ @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll -@ stub _wcsicoll_l +@ cdecl _wcsicoll_l(wstr wstr ptr) msvcrt._wcsicoll_l @ cdecl _wcslwr(wstr) msvcrt._wcslwr @ stub _wcslwr_l @ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 30ac113..5193104 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1104,7 +1104,7 @@ @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp # stub _wcsicmp_l(wstr wstr ptr) @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll -# stub _wcsicoll_l(wstr wstr ptr) +@ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l @ cdecl _wcslwr(wstr) ntdll._wcslwr # stub _wcslwr_l(wstr ptr) @ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9d45a24..776ef20 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -78,12 +78,27 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str } /********************************************************************* + * _wcsicoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, + str1, -1, str2, -1)-CSTR_EQUAL; +} + +/********************************************************************* * _wcsicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], - NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; + return MSVCRT__wcsicoll_l(str1, str2, NULL); } /*********************************************************************

1 0

Jactry Zeng : msvcrt: Added _wcsnicoll_l implementation.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 5af20ef18052f135fd989805d9913f206767d856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af20ef18052f135fd989805d… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Mar 31 00:00:30 2013 +0800 msvcrt: Added _wcsnicoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 20 ++++++++++++++++++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0c363bd..1531da9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1495,7 +1495,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2d9e69e..c851928 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1858,7 +1858,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0faa5f7..e33c694 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1155,7 +1155,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f7c751a..fb549cf 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1149,7 +1149,7 @@ @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp @ stub _wcsnicmp_l @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll -@ stub _wcsnicoll_l +@ cdecl _wcsnicoll_l(wstr wstr long ptr) msvcrt._wcsnicoll_l @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ stub _wcsnset_s @ cdecl _wcsrev(wstr) msvcrt._wcsrev diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5193104..ff96b36 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1114,7 +1114,7 @@ @ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp # stub _wcsnicmp_l(wstr wstr long ptr) @ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll -# stub _wcsnicoll_l(wstr wstr long ptr) +@ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l @ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset # stub _wcsnset_s(wstr long long) @ cdecl _wcsrev(wstr) MSVCRT__wcsrev diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 776ef20..a5795bd 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -102,12 +102,28 @@ INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st } /********************************************************************* + * _wcsnicoll_l (MSVCRT.@) + */ +int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, + str1, count, str2, count)-CSTR_EQUAL; +} + +/********************************************************************* * _wcsnicoll (MSVCRT.@) */ INT CDECL MSVCRT__wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count ) { - return CompareStringW(get_locinfo()->lc_handle[MSVCRT_LC_COLLATE], - NORM_IGNORECASE, str1, count, str2, count)-CSTR_EQUAL; + return MSVCRT__wcsnicoll_l(str1, str2, count, NULL); } /*********************************************************************

1 0

Piotr Caban : wininet: Do case-insensitive compare when looking for scheme.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: c8d1d7690913822897645f7db9d7e63dff8f7fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1d7690913822897645f7db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:11:37 2013 +0200 wininet: Do case-insensitive compare when looking for scheme. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b6e6948..82332b1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1580,7 +1580,7 @@ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) return INTERNET_SCHEME_UNKNOWN; for (i = 0; i < sizeof(url_schemes)/sizeof(url_schemes[0]); i++) - if (!strncmpW(lpszScheme, url_schemes[i], nMaxCmp)) + if (!strncmpiW(lpszScheme, url_schemes[i], nMaxCmp)) return INTERNET_SCHEME_FIRST + i; return INTERNET_SCHEME_UNKNOWN; diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 7817e8f..6d02aad 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -127,6 +127,9 @@ static const crack_url_test_t crack_url_tests[] = { {"http://www.winehq.org/myscript.php;test=123", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 22, -1, 0, "http", "www.winehq.org", "", "", "/myscript.php;test=123", ""}, + {"HtTp://www.winehq.org/scheme", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0, + "HtTp", "www.winehq.org", "", "", "/scheme", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0

Dmitry Timoshkov : winspool.drv: Move loading of libcups out of the init code protected by mutex.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 142c2982dc3ce33a09004a284a5b99328945a654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142c2982dc3ce33a09004a284… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 1 12:49:22 2013 +0900 winspool.drv: Move loading of libcups out of the init code protected by mutex. --- dlls/winspool.drv/info.c | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 27a6edd..141b2f4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -874,6 +874,28 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) return ret; } +static void load_cups(void) +{ + cupshandle = wine_dlopen( SONAME_LIBCUPS, RTLD_NOW, NULL, 0 ); + if (!cupshandle) return; + + TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); + +#define DO_FUNC(x) \ + p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); \ + if (!p##x) \ + { \ + ERR("failed to load symbol %s\n", #x); \ + cupshandle = NULL; \ + return; \ + } + CUPS_FUNCS; +#undef DO_FUNC +#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) + CUPS_OPT_FUNCS; +#undef DO_FUNC +} + static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -882,24 +904,11 @@ static BOOL CUPS_LoadPrinters(void) PRINTER_INFO_2W pi2; WCHAR *port, *ppd_dir = NULL, *ppd; HKEY hkeyPrinter, hkeyPrinters; - char loaderror[256]; WCHAR nameW[MAX_PATH]; HANDLE added_printer; cups_ptype_t printer_type; - cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); - if (!cupshandle) { - TRACE("%s\n", loaderror); - return FALSE; - } - TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); - -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); if (!p##x) return FALSE - CUPS_FUNCS; -#undef DO_FUNC -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) - CUPS_OPT_FUNCS; -#undef DO_FUNC + if (!cupshandle) return FALSE; if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) { @@ -1590,6 +1599,10 @@ void WINSPOOL_LoadSystemPrinters(void) WCHAR PrinterName[256]; BOOL done = FALSE; +#ifdef SONAME_LIBCUPS + load_cups(); +#endif + /* FIXME: The init code should be moved to spoolsv.exe */ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name ); if (!init_mutex)

1 0

Andrew Talbot : winmm: Remove unneeded address-of operator from function name.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 11ebf851b2e9fad063ab37e4a94c39ea931a644b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ebf851b2e9fad063ab37e4a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 30 22:42:00 2013 +0000 winmm: Remove unneeded address-of operator from function name. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index de081e9..76d624a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2546,7 +2546,7 @@ static BOOL WINMM_StartDevicesThread(void) /* The devices thread holds a reference to the winmm module * to prevent it from unloading while it's running. */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (const WCHAR *)&WINMM_StartDevicesThread, &g_devthread_module); + (const WCHAR *)WINMM_StartDevicesThread, &g_devthread_module); events[0] = CreateEventW(NULL, FALSE, FALSE, NULL);

1 0

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

April 1, 2013

Module: wine Branch: master Commit: 66f80b57a47394bd1a3b05fea74acb8f23a84a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f80b57a47394bd1a3b05fea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 30 16:25:30 2013 +0100 secur32: Pass enabled protocols to GnuTLS. --- dlls/secur32/schannel_gnutls.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b460505..70b8276 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -61,7 +61,7 @@ MAKE_FUNCPTR(gnutls_mac_get); MAKE_FUNCPTR(gnutls_mac_get_key_size); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); -MAKE_FUNCPTR(gnutls_set_default_priority); +MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); MAKE_FUNCPTR(gnutls_record_send); @@ -106,6 +106,17 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } +static const struct { + DWORD enable_flag; + const char *gnutls_flag; +} protocol_priority_flags[] = { + {SP_PROT_TLS1_2_CLIENT, "VERS-TLS1.2"}, + {SP_PROT_TLS1_1_CLIENT, "VERS-TLS1.1"}, + {SP_PROT_TLS1_0_CLIENT, "VERS-TLS1.0"}, + {SP_PROT_SSL3_CLIENT, "VERS-SSL3.0"} + /* {SP_PROT_SSL2_CLIENT} is not supported by GnuTLS */ +}; + DWORD schan_imp_enabled_protocols(void) { /* NOTE: No support for SSL 2.0 */ @@ -115,6 +126,8 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; + char priority[64] = "NORMAL", *p; + unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) @@ -123,9 +136,16 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre return FALSE; } - /* FIXME: We should be using the information from the credentials here. */ - FIXME("Using hardcoded \"NORMAL\" priority\n"); - err = pgnutls_set_default_priority(*s); + p = priority + strlen(priority); + for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + *p++ = ':'; + *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; + strcpy(p, protocol_priority_flags[i].gnutls_flag); + p += strlen(p); + } + + TRACE("Using %s priority\n", debugstr_a(priority)); + err = pgnutls_priority_set_direct(*s, priority, NULL); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -466,7 +486,7 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_mac_get_key_size) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_protocol_get_version) - LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); LOAD_FUNCPTR(gnutls_record_send);

1 0

Michael Stefaniuc : dplayx: Remove AddRef hacks for the parent DirectPlay object.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 6f370dff7f598a0ae9c0f1ca8f0a7b704243bf1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f370dff7f598a0ae9c0f1ca8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:47:39 2013 +0100 dplayx: Remove AddRef hacks for the parent DirectPlay object. --- dlls/dplayx/dplaysp.c | 23 ----------------------- dlls/dplayx/lobbysp.c | 16 ---------------- dlls/dplayx/tests/dplayx.c | 4 ++-- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index bd3e2c1..9ce6910 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -173,21 +173,6 @@ static BOOL DPSP_CreateDirectPlaySP( LPVOID lpSP, IDirectPlay2Impl* dp ) This->sp->dplay = dp; - /* Normally we should be keeping a reference, but since only the dplay - * interface that created us can destroy us, we do not keep a reference - * to it (ie we'd be stuck with always having one reference to the dplay - * object, and hence us, around). - * NOTE: The dp object does reference count us. - * - * FIXME: This is a kludge to get around a problem where a queryinterface - * is used to get a new interface and then is closed. We will then - * reference garbage. However, with this we will never deallocate - * the interface we store. The correct fix is to require all - * DP internal interfaces to use the This->dp2 interface which - * should be changed to This->dp - */ - IDirectPlayX_AddRef( (LPDIRECTPLAY2)dp ); - return TRUE; } @@ -195,14 +180,6 @@ static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) { IDirectPlaySPImpl *This = lpSP; - /* Normally we should be keeping a reference, but since only the dplay - * interface that created us can destroy us, we do not keep a reference - * to it (ie we'd be stuck with always having one reference to the dplay - * object, and hence us, around). - * NOTE: The dp object does reference count us. - */ - /*IDirectPlayX_Release( (LPDIRECTPLAY2)This->sp->dplay ); */ - HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData ); HeapFree( GetProcessHeap(), 0, This->sp->lpSpLocalData ); diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 3f545c1..737cb3f 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -148,22 +148,6 @@ static BOOL DPLSP_CreateDPLobbySP( LPVOID lpSP, IDirectPlay2Impl* dp ) This->sp->dplay = dp; - /* Normally we should be keeping a reference, but since only the dplay - * interface that created us can destroy us, we do not keep a reference - * to it (ie we'd be stuck with always having one reference to the dplay - * object, and hence us, around). - * NOTE: The dp object does reference count us. - * - * FIXME: This is a kludge to get around a problem where a queryinterface - * is used to get a new interface and then is closed. We will then - * reference garbage. However, with this we will never deallocate - * the interface we store. The correct fix is to require all - * DP internal interfaces to use the This->dp2 interface which - * should be changed to This->dp - */ - IDirectPlayX_AddRef( (LPDIRECTPLAY2)dp ); - - return TRUE; } diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index c8ec54d..b7bbac3 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6394,7 +6394,7 @@ static void test_COM(void) (void**)&dp4); ok(hr == S_OK, "DirectPlay create failed: %08x, expected S_OK\n", hr); refcount = IDirectPlayX_AddRef(dp4); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay2A, (void**)&dp2A); ok(hr == S_OK, "QueryInterface for IID_IDirectPlay2A failed: %08x\n", hr); @@ -6441,7 +6441,7 @@ static void test_COM(void) IDirectPlay2_Release(dp2A); IDirectPlayX_Release(dp4); refcount = IDirectPlayX_Release(dp4); - todo_wine ok(refcount == 0, "refcount == %u, expected 0\n", refcount); + ok(refcount == 0, "refcount == %u, expected 0\n", refcount); }

1 0

Alexander Monakov : winex11.drv: Simplify test for pbuffer availability.
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 7d61c7b1589df8c58b2da4531679f1afc1116022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d61c7b1589df8c58b2da4531… Author: Alexander Monakov <amonakov(a)gmail.com> Date: Sun Mar 31 19:07:57 2013 +0400 winex11.drv: Simplify test for pbuffer availability. --- dlls/winex11.drv/opengl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b11e8e3..bb3b366 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3005,10 +3005,7 @@ static void X11DRV_WineGL_LoadExtensions(void) if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_multisample")) register_extension( "WGL_ARB_multisample" ); - /* In general pbuffer functionality requires support in the X-server. The functionality is - * available either when the GLX_SGIX_pbuffer is present or when the GLX server version is 1.3. - */ - if ( glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") ) + if (glxRequireVersion(3)) { register_extension( "WGL_ARB_pbuffer" ); opengl_funcs.ext.p_wglCreatePbufferARB = X11DRV_wglCreatePbufferARB; @@ -3026,7 +3023,7 @@ static void X11DRV_WineGL_LoadExtensions(void) /* Support WGL_ARB_render_texture when there's support or pbuffer based emulation */ if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_render_texture") || - (glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") && use_render_texture_emulation)) + (glxRequireVersion(3) && use_render_texture_emulation)) { register_extension( "WGL_ARB_render_texture" ); opengl_funcs.ext.p_wglBindTexImageARB = X11DRV_wglBindTexImageARB;

1 0

Nikolay Sivov : mscms: Free memory and handle on error path (Coverity).
by Alexandre Julliard April 1, 2013

April 1, 2013

Module: wine Branch: master Commit: 3f3404d2487129db7da6ec5372b7158304292f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3404d2487129db7da6ec537… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 31 12:25:12 2013 +0400 mscms: Free memory and handle on error path (Coverity). --- dlls/mscms/profile.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index b0ffce4..8444e14 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1528,14 +1528,18 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (cmsprofile) { struct profile profile; + HPROFILE hprof; profile.file = handle; profile.access = access; profile.iccprofile = iccprofile; profile.cmsprofile = cmsprofile; - return create_profile( &profile ); + if ((hprof = create_profile( &profile ))) return hprof; + HeapFree( GetProcessHeap(), 0, iccprofile ); + cmsCloseProfile( cmsprofile ); } + CloseHandle( handle ); #endif /* HAVE_LCMS */ return NULL;

1 0