April 2010 - Wine-commits - list.winehq.org

Kai Blin : secur32: Use NTLM2 instead of NTLMv2.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 9dd206d28e96a9e27ac7f204cab757cd3ec9db4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd206d28e96a9e27ac7f204c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 19 10:15:15 2010 +0200 secur32: Use NTLM2 instead of NTLMv2. In the current code NTLMv2 is used when talking about second generation NTLM crypto algorithms. Most other publiations call this NTLM2, and use NTLMv2 to describe a different crypto handshake that can be used by either NTLM1 or NTLM2 crypto. --- dlls/secur32/hmac_md5.c | 2 +- dlls/secur32/ntlm.c | 10 +++++----- dlls/secur32/secur32_priv.h | 6 +++--- dlls/secur32/util.c | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/hmac_md5.c b/dlls/secur32/hmac_md5.c index 6dafa31..3479178 100644 --- a/dlls/secur32/hmac_md5.c +++ b/dlls/secur32/hmac_md5.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * This file implements RFC 2104 (HMAC) for the MD5 provider. - * It is needed for NTLMv2 signing and sealing. + * It is needed for NTLM2 signing and sealing. */ #include "hmac_md5.h" diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a7330e2..0ef5b51 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -593,15 +593,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( MultiByteToWideChar(CP_ACP, 0, password ? password : ntlm_cred->password, password ? pwlen : ntlm_cred->pwlen, unicode_password, passwd_lenW); - SECUR32_CreateNTLMv1SessionKey((PBYTE)unicode_password, - passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); + SECUR32_CreateNTLM1SessionKey((PBYTE)unicode_password, + passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); HeapFree(GetProcessHeap(), 0, unicode_password); } else memset(helper->session_key, 0, 16); - /* Allocate space for a maximal string of + /* Allocate space for a maximal string of * "SF NTLMSSP_FEATURE_SIGN NTLMSSP_FEATURE_SEAL * NTLMSSP_FEATURE_SESSION_KEY" */ @@ -913,7 +913,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->crypt.ntlm.a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm.a4i, helper->session_key, 16); helper->crypt.ntlm.seq_num = 0l; - SECUR32_CreateNTLMv2SubKeys(helper); + SECUR32_CreateNTLM2SubKeys(helper); helper->crypt.ntlm2.send_a4i = SECUR32_arc4Alloc(); helper->crypt.ntlm2.recv_a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm2.send_a4i, @@ -1471,7 +1471,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_RevertSecurityContext(PCtxtHandle phContex /*********************************************************************** * ntlm_CreateSignature * As both MakeSignature and VerifySignature need this, but different keys - * are needed for NTLMv2, the logic goes into a helper function. + * are needed for NTLM2, the logic goes into a helper function. * To ensure maximal reusability, we can specify the direction as NTLM_SEND for * signing/encrypting and NTLM_RECV for verfying/decrypting. When encrypting, * the signature is encrypted after the message was encrypted, so diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 7b4f3ff..e2b0cd0 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -138,7 +138,7 @@ void cleanup_helper(PNegoHelper helper); void check_version(PNegoHelper helper); /* Functions from base64_codec.c used elsewhere */ -SECURITY_STATUS encodeBase64(PBYTE in_buf, int in_len, char* out_buf, +SECURITY_STATUS encodeBase64(PBYTE in_buf, int in_len, char* out_buf, int max_len, int *out_len); SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, @@ -146,8 +146,8 @@ SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, /* Functions from util.c */ ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc); -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key); -SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper); +SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key); +SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper); arc4_info *SECUR32_arc4Alloc(void); void SECUR32_arc4Init(arc4_info *a4i, const BYTE *key, unsigned int keyLen); void SECUR32_arc4Process(arc4_info *a4i, BYTE *inoutString, unsigned int length); diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index a226bf5..ab52251 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -121,7 +121,7 @@ ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) return ~crc; } -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key) +SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) { MD4_CTX ctx; BYTE ntlm_hash[16]; @@ -143,7 +143,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE se return SEC_E_OK; } -static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) +static void SECUR32_CalcNTLM2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) { MD5_CTX ctx; @@ -155,7 +155,7 @@ static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, } /* This assumes we do have a valid NTLM2 user session key */ -SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper) +SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper) { helper->crypt.ntlm2.send_sign_key = HeapAlloc(GetProcessHeap(), 0, 16); helper->crypt.ntlm2.send_seal_key = HeapAlloc(GetProcessHeap(), 0, 16); @@ -164,24 +164,24 @@ SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper) if(helper->mode == NTLM_CLIENT) { - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_sign_constant, helper->crypt.ntlm2.send_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_seal_constant, helper->crypt.ntlm2.send_seal_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_sign_constant, helper->crypt.ntlm2.recv_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_seal_constant, helper->crypt.ntlm2.recv_seal_key); } else { - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_sign_constant, helper->crypt.ntlm2.send_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_seal_constant, helper->crypt.ntlm2.send_seal_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_sign_constant, helper->crypt.ntlm2.recv_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_seal_constant, helper->crypt.ntlm2.recv_seal_key); }

1 0

Michael Stefaniuc : user32: Avoid using HIWORD on a string pointer.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 8797fb52cf7ffb8a98473bf84b0290104bb0f759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8797fb52cf7ffb8a98473bf84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 19 10:29:49 2010 +0200 user32: Avoid using HIWORD on a string pointer. --- dlls/user32/lstr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 8fff22f..25a935a 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -230,7 +230,7 @@ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d ) */ LPSTR WINAPI CharLowerA(LPSTR str) { - if (!HIWORD(str)) + if (IS_INTRESOURCE(str)) { char ch = LOWORD(str); CharLowerBuffA( &ch, 1 ); @@ -256,7 +256,7 @@ LPSTR WINAPI CharLowerA(LPSTR str) */ LPSTR WINAPI CharUpperA(LPSTR str) { - if (!HIWORD(str)) + if (IS_INTRESOURCE(str)) { char ch = LOWORD(str); CharUpperBuffA( &ch, 1 ); @@ -282,7 +282,7 @@ LPSTR WINAPI CharUpperA(LPSTR str) */ LPWSTR WINAPI CharLowerW(LPWSTR x) { - if (HIWORD(x)) return strlwrW(x); + if (!IS_INTRESOURCE(x)) return strlwrW(x); else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); } @@ -292,7 +292,7 @@ LPWSTR WINAPI CharLowerW(LPWSTR x) */ LPWSTR WINAPI CharUpperW(LPWSTR x) { - if (HIWORD(x)) return struprW(x); + if (!IS_INTRESOURCE(x)) return struprW(x); else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); }

1 0

Hans Leidekker : msi: Remove unused and redundant name field from STORAGE structure.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 111d33b393b359dc9a8c7a500cb2a1d9c50d9ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=111d33b393b359dc9a8c7a500… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:02 2010 +0200 msi: Remove unused and redundant name field from STORAGE structure. --- dlls/msi/storages.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 6a8134b..144f8fd 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tabSTORAGE { UINT str_index; - LPWSTR name; IStorage *storage; } STORAGE; @@ -78,14 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg) if (!storage) return NULL; - storage->name = strdupW(name); - if (!storage->name) - { - msi_free(storage); - return NULL; - } - - storage->str_index = msi_addstringW(sv->db->strings, 0, storage->name, -1, 1, StringNonPersistent); + storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); storage->storage = stg; if (storage->storage) @@ -436,8 +428,6 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view) { if (sv->storages[i]->storage) IStorage_Release(sv->storages[i]->storage); - - msi_free(sv->storages[i]->name); msi_free(sv->storages[i]); }

1 0

Hans Leidekker : msi: Make the name parameter of create_storage and create_stream constant.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: fc15e565d308437477302695a72e8feaf2e4d955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc15e565d308437477302695a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:20 2010 +0200 msi: Make the name parameter of create_storage and create_stream constant. --- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 144f8fd..5b555ba 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -69,7 +69,7 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) return TRUE; } -static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg) +static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) { STORAGE *storage; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index fc660c8..e4204a2 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -68,7 +68,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) return TRUE; } -static STREAM *create_stream(MSISTREAMSVIEW *sv, LPWSTR name, BOOL encoded, IStream *stm) +static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; WCHAR decoded[MAX_STREAM_NAME_LEN];

1 0

Hans Leidekker : msi: Remove the string index parameter from msi_addstringW .
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 8f534055444f992bcce91f437bc8f88569729c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f534055444f992bcce91f437… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:38 2010 +0200 msi: Remove the string index parameter from msi_addstringW. --- dlls/msi/msipriv.h | 3 +-- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- dlls/msi/string.c | 36 +++++++++++------------------------- dlls/msi/table.c | 2 +- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2b7d6ba..fada8c6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,8 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); - +extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 5b555ba..3e88874 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) if (!storage) return NULL; - storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); + storage->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); storage->storage = stg; if (storage->storage) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index e4204a2..59e845d 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -84,7 +84,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, ISt name = decoded; } - stream->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); + stream->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); stream->stream = stm; return stream; } diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 84f4e71..21b1db2 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -288,42 +288,28 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { + UINT n; LPWSTR str; - /* TRACE("[%2d] = %s\n", string_no, debugstr_an(data,len) ); */ - if( !data ) return 0; if( !data[0] ) return 0; - if( n > 0 ) - { - if( st->strings[n].persistent_refcount || - st->strings[n].nonpersistent_refcount ) - return -1; - } - else + + if( msi_string2idW( st, data, &n ) == ERROR_SUCCESS ) { - if( ERROR_SUCCESS == msi_string2idW( st, data, &n ) ) - { - if (persistence == StringPersistent) - st->strings[n].persistent_refcount += refcount; - else - st->strings[n].nonpersistent_refcount += refcount; - return n; - } - n = st_find_free_entry( st ); - if( n == -1 ) - return -1; + if (persistence == StringPersistent) + st->strings[n].persistent_refcount += refcount; + else + st->strings[n].nonpersistent_refcount += refcount; + return n; } - if( n < 1 ) - { - ERR("invalid index adding %s (%d)\n", debugstr_w( data ), n ); + n = st_find_free_entry( st ); + if( n == -1 ) return -1; - } /* allocate a new string */ if(len<0) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6737ac5..3b117ae 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1383,7 +1383,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, + val = msi_addstringW( tv->db->strings, sval, -1, 1, persistent ? StringPersistent : StringNonPersistent ); }

1 0

Hans Leidekker : msi: Add beginnings of a test module that concentrates on patches.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: f08c355e09009ace0c82b4dfd41d9362a68f2cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08c355e09009ace0c82b4dfd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:38:16 2010 +0200 msi: Add beginnings of a test module that concentrates on patches. --- dlls/msi/tests/Makefile.in | 1 + dlls/msi/tests/patch.c | 748 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 749 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f08c355e09009ace0c82b…

1 0

Austin English : winedump: Output Makefile. in the right way for the new build system.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 62781a6b3cec40844071ba742c9fffb386ae6ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62781a6b3cec40844071ba742… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 16 15:21:50 2010 -0500 winedump: Output Makefile.in the right way for the new build system. --- tools/winedump/output.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index c2a69d3..e0697f8 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -459,9 +459,7 @@ void output_makefile (void) if (globals.forward_dll) fprintf (makefile, " %s", globals.forward_dll); - fprintf (makefile, - "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n" - "@DEPENDENCIES@ # everything below this line is overwritten by make depend", + fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n", OUTPUT_DLL_NAME); if (globals.forward_dll)

1 0

Vincent Povirk : gdiplus: Fix the non-trivial case in color_over.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 6b53cb27bc51b53c2ce10e7e177c7b74bfd3264a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b53cb27bc51b53c2ce10e7e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 17 11:31:15 2010 -0500 gdiplus: Fix the non-trivial case in color_over. --- dlls/gdiplus/gdiplus_private.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5ff7125..2313cd5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -94,9 +94,9 @@ static inline ARGB color_over(ARGB bg, ARGB fg) if (bg_alpha == 0) return fg; a = bg_alpha + fg_alpha; - b = ((bg&0xff)*bg_alpha + (fg&0xff)*fg_alpha)*0xff/a; - g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*fg_alpha)*0xff/a; - r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*fg_alpha)*0xff/a; + b = ((bg&0xff)*bg_alpha + (fg&0xff)*fg_alpha)/a; + g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*fg_alpha)/a; + r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*fg_alpha)/a; return (a<<24)|(r<<16)|(g<<8)|b; }

1 0

Vincent Povirk : gdiplus: Prevent integer overflows when rounding text bounds.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 68ce9e925a37eac5c9d972cd29119d39a087d326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ce9e925a37eac5c9d972cd2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 17 12:04:03 2010 -0500 gdiplus: Prevent integer overflows when rounding text bounds. Mono calls GdipMeasureString with a height so large that rounding and converting it to an integer gives a negative result. --- dlls/gdiplus/graphics.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7a6fad3..eb24008 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3493,7 +3493,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, gdip_format_string_callback callback, void *user_data) { WCHAR* stringdup; - INT sum = 0, height = 0, fit, fitcpy, i, j, lret, nwidth, + int sum = 0, height = 0, fit, fitcpy, i, j, lret, nwidth, nheight, lineend, lineno = 0; RectF bounds; StringAlignment halign; @@ -3508,8 +3508,8 @@ static GpStatus gdip_format_string(GpGraphics *graphics, nwidth = roundr(rect->Width); nheight = roundr(rect->Height); - if (nwidth == 0) nwidth = INT_MAX; - if (nheight == 0) nheight = INT_MAX; + if (nwidth == 0 || rect->Width >= INT_MAX) nwidth = INT_MAX; + if (nheight == 0 || rect->Height >= INT_MAX) nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ /* FIXME: This makes the indexes passed to callback inaccurate. */

1 0

Vincent Povirk : gdiplus: Use ddb's instead of dib' s to create texture brushes.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: aa76490d0739342592a588c40ee43e9ba10f34bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa76490d0739342592a588c40… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 17 15:38:44 2010 -0500 gdiplus: Use ddb's instead of dib's to create texture brushes. --- dlls/gdiplus/brush.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8994b87..57db380 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -794,7 +794,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) { - HBITMAP hbm; + HBITMAP hbm=NULL; GpStatus status; GpImage *new_image=NULL; @@ -815,7 +815,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, if (status != Ok) return status; - hbm = ((GpBitmap*)new_image)->hbitmap; + status = GdipCreateHBITMAPFromBitmap((GpBitmap*)new_image, &hbm, 0); if(!hbm) { status = GenericError; @@ -861,6 +861,8 @@ exit: TRACE("<-- error %u\n", status); } + DeleteObject(hbm); + return status; }

1 0