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

Piotr Caban : msvcrt: Added _wtol_l implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 06c677384402d30c2868feca59d0708bdcf635cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c677384402d30c2868feca5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:32 2013 +0100 msvcrt: Added _wtol_l implementation. --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 07e2984..69ad7a7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -42,6 +42,7 @@ #include "winbase.h" #define MSVCRT_LONG_MAX 0x7fffffffL +#define MSVCRT_LONG_MIN (-MSVCRT_LONG_MAX-1) #define MSVCRT_ULONG_MAX 0xffffffffUL #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ef5823c..36e1510 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1226,8 +1226,8 @@ @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l -@ cdecl _wtol(wstr) ntdll._wtol -# stub _wtol_l(wstr ptr) +@ cdecl _wtol(wstr) MSVCRT__wtol +@ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l @ cdecl _wunlink(wstr) MSVCRT__wunlink @ cdecl _wutime(wstr ptr) @ cdecl _wutime32(wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e00cb83..b0a52d7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1472,6 +1472,31 @@ int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) } /********************************************************************* + * _wtol_l (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); + + if(ret > MSVCRT_LONG_MAX) { + ret = MSVCRT_LONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < MSVCRT_LONG_MIN) { + ret = MSVCRT_LONG_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* + * _wtol (MSVCRT.@) + */ +MSVCRT_long __cdecl MSVCRT__wtol(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtol_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Jacek Caban : secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation .
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e413b8a5054bc1c4ca1ddb35b6d21e3379b6a79b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e413b8a5054bc1c4ca1ddb35b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:35 2013 +0100 secur32: Added SECPKG_ATTR_SUPPORTED_PROTOCOLS implementation. --- dlls/secur32/schannel.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 87bb942..9a83a76 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -281,14 +281,14 @@ static SECURITY_STATUS schan_QueryCredentialsAttributes( ret = SEC_E_INTERNAL_ERROR; break; case SECPKG_ATTR_SUPPORTED_PROTOCOLS: - if (pBuffer) - { - /* FIXME: get from OpenSSL? */ - FIXME("SECPKG_ATTR_SUPPORTED_PROTOCOLS: stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; - } - else + if(pBuffer) { + /* Regardless of MSDN documentation, tests show that this attribute takes into account + * what protocols are enabled for given credential. */ + ((SecPkgCred_SupportedProtocols*)pBuffer)->grbitProtocol = cred->enabled_protocols; + ret = SEC_E_OK; + }else { ret = SEC_E_INTERNAL_ERROR; + } break; default: ret = SEC_E_UNSUPPORTED_FUNCTION;

1 0

Akihiro Sagawa : msvcrt: Fix mbtowc_l in C locale.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 23b8c4df1910832dd409f6c8cc8906ac64be4279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b8c4df1910832dd409f6c8c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Mar 27 23:16:44 2013 +0900 msvcrt: Fix mbtowc_l in C locale. --- dlls/msvcrt/mbcs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 121edbb..fdc5422 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2016,7 +2016,9 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, if(n <= 0 || !str) return 0; - if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) + if(!locinfo->lc_codepage) + tmpdst = (unsigned char)*str; + else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) return -1; if(dst) *dst = tmpdst;

1 0

Piotr Caban : msvcrt: Don't forward _wtoi to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 5c03a35f7a78f158e79b86ab0cfb72b594439da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c03a35f7a78f158e79b86ab0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:11:23 2013 +0100 msvcrt: Don't forward _wtoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b648f88..ef5823c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1222,7 +1222,7 @@ # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l -@ cdecl _wtoi(wstr) ntdll._wtoi +@ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fe0b6ac..e00cb83 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1449,7 +1449,7 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, /********************************************************************* * _wtoi_l (MSVCRT.@) */ -int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); @@ -1464,6 +1464,14 @@ int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) } /********************************************************************* + * _wtoi (MSVCRT.@) + */ +int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtoi_l(str, NULL); +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Jacek Caban : secur32: Added support for grbitEnabledProtocols in schan_AcquireClientCredentials.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 0f2e0365ea1f5c6baba4cfd9c0ff69defe66d7ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2e0365ea1f5c6baba4cfd9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 12:22:23 2013 +0100 secur32: Added support for grbitEnabledProtocols in schan_AcquireClientCredentials. --- dlls/secur32/schannel.c | 169 ++++++++++++++++++++++++++++++++++++------- dlls/secur32/secur32_priv.h | 1 + 2 files changed, 145 insertions(+), 25 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 387eaad..87bb942 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -25,10 +25,13 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winnls.h" #include "sspi.h" #include "schannel.h" #include "secur32_priv.h" + +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -62,6 +65,12 @@ static struct schan_handle *schan_free_handles; static SIZE_T schan_handle_table_size; static SIZE_T schan_handle_count; +/* Protocols enabled, only those may be used for the connection. */ +static DWORD config_enabled_protocols; + +/* Protocols disabled by default. They are enabled for using, but disabled when caller asks for default settings. */ +static DWORD config_default_disabled_protocols; + static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) { struct schan_handle *handle; @@ -141,11 +150,110 @@ static void *schan_get_object(ULONG_PTR handle_idx, enum schan_handle_type type) return handle->object; } +static void read_config(void) +{ + DWORD enabled = 0, default_disabled = 0; + HKEY protocols_key, key; + WCHAR subkey_name[64]; + unsigned i; + DWORD res; + + static BOOL config_read = FALSE; + + static const WCHAR protocol_config_key_name[] = { + 'S','Y','S','T','E','M','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','c','u','r','i','t','y','P','r','o','v','i','d','e','r','s','\\', + 'S','C','H','A','N','N','E','L','\\', + 'P','r','o','t','o','c','o','l','s',0 }; + + static const WCHAR clientW[] = {'\\','C','l','i','e','n','t',0}; + static const WCHAR enabledW[] = {'e','n','a','b','l','e','d',0}; + static const WCHAR disabledbydefaultW[] = {'D','i','s','a','b','l','e','d','B','y','D','e','f','a','u','l','t',0}; + + static const struct { + WCHAR key_name[20]; + DWORD prot_client_flag; + 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',' ','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 */ }, + {{'T','L','S',' ','1','.','2',0}, SP_PROT_TLS1_2_CLIENT, TRUE, FALSE /* NOTE: not enabled by default on Windows */ } + }; + + /* No need for thread safety */ + if(config_read) + return; + + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, protocol_config_key_name, 0, KEY_READ, &protocols_key); + if(res == ERROR_SUCCESS) { + DWORD type, size, value; + + for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + strcpyW(subkey_name, protocol_config_keys[i].key_name); + strcatW(subkey_name, clientW); + res = RegOpenKeyExW(protocols_key, subkey_name, 0, KEY_READ, &key); + if(res != ERROR_SUCCESS) { + if(protocol_config_keys[i].enabled) + enabled |= protocol_config_keys[i].prot_client_flag; + if(protocol_config_keys[i].disabled_by_default) + default_disabled |= protocol_config_keys[i].prot_client_flag; + continue; + } + + size = sizeof(value); + res = RegQueryValueExW(key, enabledW, NULL, &type, (BYTE*)&value, &size); + if(res == ERROR_SUCCESS) { + if(type == REG_DWORD && value) + enabled |= protocol_config_keys[i].prot_client_flag; + }else if(protocol_config_keys[i].enabled) { + enabled |= protocol_config_keys[i].prot_client_flag; + } + + size = sizeof(value); + res = RegQueryValueExW(key, disabledbydefaultW, NULL, &type, (BYTE*)&value, &size); + if(res == ERROR_SUCCESS) { + 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; + } + + RegCloseKey(key); + } + }else { + /* No config, enable all known protocols. */ + for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + if(protocol_config_keys[i].enabled) + enabled |= protocol_config_keys[i].prot_client_flag; + if(protocol_config_keys[i].disabled_by_default) + default_disabled |= protocol_config_keys[i].prot_client_flag; + } + } + + RegCloseKey(protocols_key); + + config_enabled_protocols = enabled; + config_default_disabled_protocols = default_disabled; + config_read = TRUE; + + TRACE("enabled %x, disabled by default %x\n", config_enabled_protocols, config_default_disabled_protocols); +} + static SECURITY_STATUS schan_QueryCredentialsAttributes( PCredHandle phCredential, ULONG ulAttribute, VOID *pBuffer) { + struct schan_credentials *cred; SECURITY_STATUS ret; + cred = schan_get_object(phCredential->dwLower, SCHAN_HANDLE_CRED); + if(!cred) + return SEC_E_INVALID_HANDLE; + switch (ulAttribute) { case SECPKG_ATTR_SUPPORTED_ALGS: @@ -285,6 +393,8 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan PCredHandle phCredential, PTimeStamp ptsExpiry) { struct schan_credentials *creds; + unsigned enabled_protocols; + ULONG_PTR handle; SECURITY_STATUS st = SEC_E_OK; TRACE("schanCred %p, phCredential %p, ptsExpiry %p\n", schanCred, phCredential, ptsExpiry); @@ -292,40 +402,49 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (schanCred) { st = schan_CheckCreds(schanCred); - if (st == SEC_E_NO_CREDENTIALS) - st = SEC_E_OK; + if (st != SEC_E_OK && st != SEC_E_NO_CREDENTIALS) + return st; + + st = SEC_E_OK; + } + + read_config(); + if(schanCred && schanCred->grbitEnabledProtocols) + enabled_protocols = schanCred->grbitEnabledProtocols & config_enabled_protocols; + else + enabled_protocols = config_enabled_protocols & ~config_default_disabled_protocols; + if(!enabled_protocols) { + ERR("Could not find matching protocol\n"); + return SEC_E_NO_AUTHENTICATING_AUTHORITY; } /* For now, the only thing I'm interested in is the direction of the * connection, so just store it. */ - if (st == SEC_E_OK) - { - ULONG_PTR handle; + creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); + if (!creds) return SEC_E_INSUFFICIENT_MEMORY; - creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); - if (!creds) return SEC_E_INSUFFICIENT_MEMORY; - - handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); - if (handle == SCHAN_INVALID_HANDLE) goto fail; + handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); + if (handle == SCHAN_INVALID_HANDLE) goto fail; - creds->credential_use = SECPKG_CRED_OUTBOUND; - if (!schan_imp_allocate_certificate_credentials(creds)) - { - schan_free_handle(handle, SCHAN_HANDLE_CRED); - goto fail; - } + creds->credential_use = SECPKG_CRED_OUTBOUND; + if (!schan_imp_allocate_certificate_credentials(creds)) + { + schan_free_handle(handle, SCHAN_HANDLE_CRED); + goto fail; + } - phCredential->dwLower = handle; - phCredential->dwUpper = 0; + creds->enabled_protocols = enabled_protocols; + phCredential->dwLower = handle; + phCredential->dwUpper = 0; - /* Outbound credentials have no expiry */ - if (ptsExpiry) - { - ptsExpiry->LowPart = 0; - ptsExpiry->HighPart = 0; - } + /* Outbound credentials have no expiry */ + if (ptsExpiry) + { + ptsExpiry->LowPart = 0; + ptsExpiry->HighPart = 0; } + return st; fail: @@ -348,7 +467,7 @@ static SECURITY_STATUS schan_AcquireServerCredentials(const SCHANNEL_CRED *schan ULONG_PTR handle; struct schan_credentials *creds; - creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); + creds = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*creds)); if (!creds) return SEC_E_INSUFFICIENT_MEMORY; creds->credential_use = SECPKG_CRED_INBOUND; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index bc4b74b..5b2ac89 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -214,6 +214,7 @@ typedef struct schan_credentials { ULONG credential_use; void *credentials; + DWORD enabled_protocols; } schan_credentials; struct schan_transport;

1 0

Ken Thomases : winemac: Set the ordering of color modes explicitly to reduce chance of picking an odd one .
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 81d1bfd65d45c6565bce7effaf54aa4507bcd450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d1bfd65d45c6565bce7effa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 27 07:01:37 2013 -0500 winemac: Set the ordering of color modes explicitly to reduce chance of picking an odd one. --- dlls/winemac.drv/opengl.c | 91 ++++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 42 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 58fd951..8a29d89 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -115,33 +115,55 @@ struct color_mode { int blue_bits, blue_shift; GLint alpha_bits, alpha_shift; BOOL is_float; + int color_ordering; }; +/* The value of "color_ordering" is somewhat arbitrary. It incorporates some + observations of the behavior of Windows systems, but also subjective judgments + about what color formats are more "normal" than others. + + On at least some Windows systems, integer color formats are listed before + floating-point formats. Within the integer formats, higher color bits were + usually listed before lower color bits, while for floating-point formats it + was the reverse. However, that leads D3D to select 64-bit integer formats in + preference to 32-bit formats when the latter would be sufficient. It seems + that a 32-bit format is much more likely to be normally used in that case. + + Also, there are certain odd color formats supported on the Mac which seem like + they would be less appropriate than more common ones. For instance, the color + formats with alpha in a separate byte (e.g. kCGLRGB888A8Bit with R8G8B8 in one + 32-bit value and A8 in a separate 8-bit value) and the formats with 10-bit RGB + components. + + For two color formats which differ only in whether or not they have alpha bits, + we use the same ordering. pixel_format_comparator() gives alpha bits a + different weight than color formats. + */ static const struct color_mode color_modes[] = { - { kCGLRGB444Bit, 16, 12, 4, 8, 4, 4, 4, 0, 0, 0, FALSE }, - { kCGLARGB4444Bit, 16, 16, 4, 8, 4, 4, 4, 0, 4, 12, FALSE }, - { kCGLRGB444A8Bit, 24, 20, 4, 8, 4, 4, 4, 0, 8, 16, FALSE }, - { kCGLRGB555Bit, 16, 15, 5, 10, 5, 5, 5, 0, 0, 0, FALSE }, - { kCGLARGB1555Bit, 16, 16, 5, 10, 5, 5, 5, 0, 1, 15, FALSE }, - { kCGLRGB555A8Bit, 24, 23, 5, 10, 5, 5, 5, 0, 8, 16, FALSE }, - { kCGLRGB565Bit, 16, 16, 5, 11, 6, 5, 5, 0, 0, 0, FALSE }, - { kCGLRGB565A8Bit, 24, 24, 5, 11, 6, 5, 5, 0, 8, 16, FALSE }, - { kCGLRGB888Bit, 32, 24, 8, 16, 8, 8, 8, 0, 0, 0, FALSE }, - { kCGLARGB8888Bit, 32, 32, 8, 16, 8, 8, 8, 0, 8, 24, FALSE }, - { kCGLRGB888A8Bit, 40, 32, 8, 16, 8, 8, 8, 0, 8, 32, FALSE }, - { kCGLRGB101010Bit, 32, 30, 10, 20, 10, 10, 10, 0, 0, 0, FALSE }, - { kCGLARGB2101010Bit, 32, 32, 10, 20, 10, 10, 10, 0, 2, 30, FALSE }, - { kCGLRGB101010_A8Bit, 40, 38, 10, 20, 10, 10, 10, 0, 8, 32, FALSE }, - { kCGLRGB121212Bit, 48, 36, 12, 24, 12, 12, 12, 0, 0, 0, FALSE }, - { kCGLARGB12121212Bit, 48, 48, 12, 24, 12, 12, 12, 0, 12, 36, FALSE }, - { kCGLRGB161616Bit, 64, 48, 16, 48, 16, 32, 16, 16, 0, 0, FALSE }, - { kCGLRGBA16161616Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, FALSE }, - { kCGLRGBFloat64Bit, 64, 48, 16, 32, 16, 16, 16, 0, 0, 0, TRUE }, - { kCGLRGBAFloat64Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, TRUE }, - { kCGLRGBFloat128Bit, 128, 96, 32, 96, 32, 64, 32, 32, 0, 0, TRUE }, - { kCGLRGBAFloat128Bit, 128, 128, 32, 96, 32, 64, 32, 32, 32, 0, TRUE }, - { kCGLRGBFloat256Bit, 256, 192, 64, 192, 64, 128, 64, 64, 0, 0, TRUE }, - { kCGLRGBAFloat256Bit, 256, 256, 64, 192, 64, 128, 64, 64, 64, 0, TRUE }, + { kCGLRGB444Bit, 16, 12, 4, 8, 4, 4, 4, 0, 0, 0, FALSE, 5 }, + { kCGLARGB4444Bit, 16, 16, 4, 8, 4, 4, 4, 0, 4, 12, FALSE, 5 }, + { kCGLRGB444A8Bit, 24, 20, 4, 8, 4, 4, 4, 0, 8, 16, FALSE, 10 }, + { kCGLRGB555Bit, 16, 15, 5, 10, 5, 5, 5, 0, 0, 0, FALSE, 4 }, + { kCGLARGB1555Bit, 16, 16, 5, 10, 5, 5, 5, 0, 1, 15, FALSE, 4 }, + { kCGLRGB555A8Bit, 24, 23, 5, 10, 5, 5, 5, 0, 8, 16, FALSE, 9 }, + { kCGLRGB565Bit, 16, 16, 5, 11, 6, 5, 5, 0, 0, 0, FALSE, 3 }, + { kCGLRGB565A8Bit, 24, 24, 5, 11, 6, 5, 5, 0, 8, 16, FALSE, 8 }, + { kCGLRGB888Bit, 32, 24, 8, 16, 8, 8, 8, 0, 0, 0, FALSE, 0 }, + { kCGLARGB8888Bit, 32, 32, 8, 16, 8, 8, 8, 0, 8, 24, FALSE, 0 }, + { kCGLRGB888A8Bit, 40, 32, 8, 16, 8, 8, 8, 0, 8, 32, FALSE, 7 }, + { kCGLRGB101010Bit, 32, 30, 10, 20, 10, 10, 10, 0, 0, 0, FALSE, 6 }, + { kCGLARGB2101010Bit, 32, 32, 10, 20, 10, 10, 10, 0, 2, 30, FALSE, 6 }, + { kCGLRGB101010_A8Bit, 40, 38, 10, 20, 10, 10, 10, 0, 8, 32, FALSE, 11 }, + { kCGLRGB121212Bit, 48, 36, 12, 24, 12, 12, 12, 0, 0, 0, FALSE, 2 }, + { kCGLARGB12121212Bit, 48, 48, 12, 24, 12, 12, 12, 0, 12, 36, FALSE, 2 }, + { kCGLRGB161616Bit, 64, 48, 16, 48, 16, 32, 16, 16, 0, 0, FALSE, 1 }, + { kCGLRGBA16161616Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, FALSE, 1 }, + { kCGLRGBFloat64Bit, 64, 48, 16, 32, 16, 16, 16, 0, 0, 0, TRUE, 12 }, + { kCGLRGBAFloat64Bit, 64, 64, 16, 48, 16, 32, 16, 16, 16, 0, TRUE, 12 }, + { kCGLRGBFloat128Bit, 128, 96, 32, 96, 32, 64, 32, 32, 0, 0, TRUE, 13 }, + { kCGLRGBAFloat128Bit, 128, 128, 32, 96, 32, 64, 32, 32, 32, 0, TRUE, 13 }, + { kCGLRGBFloat256Bit, 256, 192, 64, 192, 64, 128, 64, 64, 0, 0, TRUE, 14 }, + { kCGLRGBAFloat256Bit, 256, 256, 64, 192, 64, 128, 64, 64, 64, 0, TRUE, 15 }, }; @@ -837,25 +859,10 @@ static CFComparisonResult pixel_format_comparator(const void *val1, const void * if (!pf1.accelerated && pf2.accelerated) return kCFCompareGreaterThan; - /* Integer color modes before floating-point. */ - if (!color_modes[pf1.color_mode].is_float && color_modes[pf2.color_mode].is_float) - return kCFCompareLessThan; - if (color_modes[pf1.color_mode].is_float && !color_modes[pf2.color_mode].is_float) - return kCFCompareGreaterThan; - - /* For integer color modes, higher color bits before lower. For floating-point mode, - the reverse. */ - if (color_modes[pf1.color_mode].color_bits - color_modes[pf1.color_mode].alpha_bits > - color_modes[pf2.color_mode].color_bits - color_modes[pf2.color_mode].alpha_bits) - return color_modes[pf1.color_mode].is_float ? kCFCompareGreaterThan : kCFCompareLessThan; - if (color_modes[pf1.color_mode].color_bits - color_modes[pf1.color_mode].alpha_bits < - color_modes[pf2.color_mode].color_bits - color_modes[pf2.color_mode].alpha_bits) - return color_modes[pf1.color_mode].is_float ? kCFCompareLessThan : kCFCompareGreaterThan; - - /* Mac-ism: in the rare case that color bits are equal but bpp are not, prefer fewer bpp. */ - if (color_modes[pf1.color_mode].bits_per_pixel < color_modes[pf2.color_mode].bits_per_pixel) + /* Explicit color mode ordering. */ + if (color_modes[pf1.color_mode].color_ordering < color_modes[pf2.color_mode].color_ordering) return kCFCompareLessThan; - if (color_modes[pf1.color_mode].bits_per_pixel > color_modes[pf2.color_mode].bits_per_pixel) + if (color_modes[pf1.color_mode].color_ordering > color_modes[pf2.color_mode].color_ordering) return kCFCompareGreaterThan; /* Non-pbuffer-capable before pbuffer-capable. */

1 0

Alexandre Julliard : winetest: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: c94d461731bd64f831e0bafd932e1125fa2e9dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94d461731bd64f831e0bafd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:02:29 2013 +0100 winetest: Add a 256x256 icon. --- programs/winetest/winetest.ico | Bin 25214 -> 56697 bytes programs/winetest/winetest.svg | 1587 +++++++++++++++++++++++++++++++++++----- 2 files changed, 1396 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c94d461731bd64f831e0b…

1 0

Alexandre Julliard : winemine: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 182fbdc64f0b719aa763a51c960da2f6ff4589d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182fbdc64f0b719aa763a51c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 15:02:23 2013 +0100 winemine: Add a 256x256 icon. --- programs/winemine/winemine.ico | Bin 25214 -> 67842 bytes programs/winemine/winemine.svg | 994 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 896 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=182fbdc64f0b719aa763a…

1 0

Alexandre Julliard : winefile: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e8cc9c69a4d55a3c37de8f80752c6251c1b179c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cc9c69a4d55a3c37de8f807… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:58:39 2013 +0100 winefile: Add a 256x256 icon. --- programs/winefile/winefile.ico | Bin 25214 -> 47032 bytes programs/winefile/winefile.svg | 1775 +++++++++++++++++++++++++++++++++++----- 2 files changed, 1575 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cc9c69a4d55a3c37de8…

1 0

Alexandre Julliard : winecfg: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 5a0e0717c323e4eb9ed53b9e71743602e395e763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a0e0717c323e4eb9ed53b9e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:56:19 2013 +0100 winecfg: Add a 256x256 icon. --- programs/winecfg/winecfg.ico | Bin 25214 -> 65188 bytes programs/winecfg/winecfg.svg | 2604 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2305 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a0e0717c323e4eb9ed53…

1 0