October 2011 - Wine-Commits

Piotr Caban : msvcrt: Don't overwrite mbcinfo inside setlocale.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: cf27cb49276f333c83e56b62781ca32b30e52735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf27cb49276f333c83e56b627… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 12 11:54:53 2011 +0200 msvcrt: Don't overwrite mbcinfo inside setlocale. --- dlls/msvcrt/locale.c | 5 ++--- dlls/msvcrt/main.c | 1 - dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index d83f8db..2f646e7 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -364,7 +364,7 @@ MSVCRT_pthreadlocinfo get_locinfo(void) { } /* INTERNAL: returns pthreadlocinfo struct */ -static MSVCRT_pthreadmbcinfo get_mbcinfo(void) { +MSVCRT_pthreadmbcinfo get_mbcinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !data->have_locale) @@ -1172,8 +1172,6 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) swap_pointers((void**)&locinfo->pclmap, (void**)&loc->locinfo->pclmap); swap_pointers((void**)&locinfo->pcumap, (void**)&loc->locinfo->pcumap); - memcpy(get_mbcinfo(), loc->mbcinfo, sizeof(MSVCRT_threadmbcinfo)); - if(category != MSVCRT_LC_ALL) break; /* fall through */ @@ -1323,5 +1321,6 @@ BOOL msvcrt_init_locale(void) MSVCRT__pctype = MSVCRT_locale->locinfo->pctype; for(i=MSVCRT_LC_MIN; i<=MSVCRT_LC_MAX; i++) MSVCRT___lc_handle[i] = MSVCRT_locale->locinfo->lc_handle[i]; + _setmbcp(_MB_CP_ANSI); return TRUE; } diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 45191cd..736c068 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -110,7 +110,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_init_console(); msvcrt_init_args(); msvcrt_init_signals(); - _setmbcp(_MB_CP_LOCALE); /* don't allow unloading msvcrt, we can't setup file handles twice */ LdrAddRefDll( 0, hinstDLL ); TRACE("finished process init\n"); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3741842..963e227 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -883,6 +883,7 @@ int __cdecl MSVCRT_raise(int sig); extern MSVCRT__locale_t MSVCRT_locale; MSVCRT_pthreadlocinfo get_locinfo(void); +MSVCRT_pthreadmbcinfo get_mbcinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); void free_mbcinfo(MSVCRT_pthreadmbcinfo);

1 0

Piotr Caban : msvcrt: Move _pctype definition to locale.c.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 0f53100ade56f365f3355c71bf8910a972114ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f53100ade56f365f3355c71b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 12 11:56:04 2011 +0200 msvcrt: Move _pctype definition to locale.c. --- dlls/msvcrt/ctype.c | 7 ------- dlls/msvcrt/locale.c | 1 + dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 6bf4948..ca8b5fd 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -51,13 +51,6 @@ WORD MSVCRT__ctype [257] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -/* pctype is used by macros in the Win32 headers. It must point - * To a table of flags exactly like ctype. To allow locale - * changes to affect ctypes (i.e. isleadbyte), we use a second table - * and update its flags whenever the current locale changes. - */ -unsigned short *MSVCRT__pctype = NULL; - /********************************************************************* * __p__pctype (MSVCRT.@) */ diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index d5003de..7e9cebe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define MAX_ELEM_LEN 64 /* Max length of country/language/CP string */ #define MAX_LOCALE_LENGTH 256 MSVCRT__locale_t MSVCRT_locale = NULL; +unsigned short *MSVCRT__pctype = NULL; int MSVCRT___lc_codepage = 0; int MSVCRT___lc_collate_cp = 0; LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c743a9c..29a3520 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -202,7 +202,6 @@ extern MSVCRT__locale_t MSVCRT_locale; extern int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -extern unsigned short *MSVCRT__pctype; void msvcrt_set_errno(int);

1 0

Piotr Caban : msvcrt: Added _mbtowc_l implementation.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 99579ca42acfe425ab6bae421d103762386b5da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99579ca42acfe425ab6bae421… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 12 11:56:13 2011 +0200 msvcrt: Added _mbtowc_l implementation. --- dlls/msvcrt/mbcs.c | 57 ++++++++++++++++++++++++++++------------------ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 87c482c..96cea86 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1009,28 +1009,6 @@ unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) } /********************************************************************* - * mbtowc(MSVCRT.@) - */ -int CDECL MSVCRT_mbtowc(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n) -{ - /* temp var needed because MultiByteToWideChar wants non NULL destination */ - MSVCRT_wchar_t tmpdst = '\0'; - - if(n <= 0 || !str) - return 0; - if(!MultiByteToWideChar(CP_ACP, 0, str, n, &tmpdst, 1)) - return -1; - if(dst) - *dst = tmpdst; - /* return the number of bytes from src that have been used */ - if(!*str) - return 0; - if(n >= 2 && MSVCRT_isleadbyte(*str) && str[1]) - return 2; - return 1; -} - -/********************************************************************* * _mbbtombc(MSVCRT.@) */ unsigned int CDECL _mbbtombc(unsigned int c) @@ -1869,6 +1847,41 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str) } /********************************************************************* + * _mbtowc_l(MSVCRT.@) + */ +int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + MSVCRT_wchar_t tmpdst = '\0'; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(n <= 0 || !str) + return 0; + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) + return -1; + if(dst) + *dst = tmpdst; + /* return the number of bytes from src that have been used */ + if(!*str) + return 0; + if(n >= 2 && MSVCRT__isleadbyte_l(*str, locale) && str[1]) + return 2; + return 1; +} + +/********************************************************************* + * mbtowc(MSVCRT.@) + */ +int CDECL MSVCRT_mbtowc(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n) +{ + return MSVCRT_mbtowc_l(dst, str, n, NULL); +} + +/********************************************************************* * _mbstowcs_l(MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 29a3520..65e00a1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -850,6 +850,7 @@ int __cdecl MSVCRT_iswalpha(MSVCRT_wint_t); int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); int __cdecl MSVCRT_isleadbyte(int); +int __cdecl MSVCRT__isleadbyte_l(int, MSVCRT__locale_t); void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fe07099..c8c710d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -792,7 +792,7 @@ # stub _mbsupr_l(str ptr) @ cdecl _mbsupr_s(str long) # stub _mbsupr_s_l(str long ptr) -# stub _mbtowc_l(ptr str long ptr) +@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) ntdll._memicmp # stub _memicmp_l(str str long ptr)

1 0

Nikolay Sivov : ntdll: Fix SID data copy length.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 7c648cb6956ac1f47cd0f4d88850482740628a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c648cb6956ac1f47cd0f4d88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 10 12:07:30 2011 -0500 ntdll: Fix SID data copy length. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 6a919aa..30d3e34 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -348,7 +348,7 @@ NTSTATUS WINAPI NtQueryInformationToken( groups->GroupCount = tg->count; memcpy( sids, (char *)buffer + non_sid_portion, - reply->user_len - non_sid_portion - FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); + reply->user_len - FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); for (i = 0; i < tg->count; i++) {

1 0

Piotr Caban : msvcrt: Use ismbcodepage instead of mb_cur_max in mbcodepage dependent functions.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: cfca12e48608d9f32b87f78e2545b4ba967b56af URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfca12e48608d9f32b87f78e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 12 11:55:35 2011 +0200 msvcrt: Use ismbcodepage instead of mb_cur_max in mbcodepage dependent functions. --- dlls/msvcrt/locale.c | 3 +- dlls/msvcrt/mbcs.c | 134 +++++++++++++++++++++++-------------------- dlls/msvcrt/msvcrt.h | 7 +- dlls/msvcrt/tests/string.c | 3 +- 4 files changed, 79 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfca12e48608d9f32b87f…

1 0

Piotr Caban : msvcrt: Use _ismbblead instead of _isleadbyte in mbcodepage dependent functions.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: c32d4e8840421c698a63d77c44b62ad0da3b1de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c32d4e8840421c698a63d77c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 12 11:55:51 2011 +0200 msvcrt: Use _ismbblead instead of _isleadbyte in mbcodepage dependent functions. --- dlls/msvcrt/mbcs.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 92b4060..87c482c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -344,7 +344,7 @@ unsigned int CDECL _mbsnextc(const unsigned char* str) */ unsigned int CDECL _mbctolower(unsigned int c) { - if (MSVCRT_isleadbyte(c)) + if (_ismbblead(c)) { FIXME("Handle MBC chars\n"); return c; @@ -357,7 +357,7 @@ unsigned int CDECL _mbctolower(unsigned int c) */ unsigned int CDECL _mbctoupper(unsigned int c) { - if (MSVCRT_isleadbyte(c)) + if (_ismbblead(c)) { FIXME("Handle MBC chars\n"); return c; @@ -803,7 +803,7 @@ int CDECL _mbsnbcmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_s return *cmp ? -1 : 0; if(!*cmp) return 1; - if (MSVCRT_isleadbyte(*str)) + if (_ismbblead(*str)) { strc=(len>=2)?_mbsnextc(str):0; clen=2; @@ -813,7 +813,7 @@ int CDECL _mbsnbcmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_s strc=*str; clen=1; } - if (MSVCRT_isleadbyte(*cmp)) + if (_ismbblead(*cmp)) cmpc=(len>=2)?_mbsnextc(cmp):0; else cmpc=*str; @@ -874,7 +874,7 @@ int CDECL _mbsnbicmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_ return *cmp ? -1 : 0; if(!*cmp) return 1; - if (MSVCRT_isleadbyte(*str)) + if (_ismbblead(*str)) { strc=(len>=2)?_mbsnextc(str):0; clen=2; @@ -884,7 +884,7 @@ int CDECL _mbsnbicmp(const unsigned char* str, const unsigned char* cmp, MSVCRT_ strc=*str; clen=1; } - if (MSVCRT_isleadbyte(*cmp)) + if (_ismbblead(*cmp)) cmpc=(len>=2)?_mbsnextc(cmp):0; else cmpc=*str; @@ -1392,7 +1392,7 @@ MSVCRT_size_t CDECL _mbsnccnt(const unsigned char* str, MSVCRT_size_t len) ret=0; while(*str && len-- > 0) { - if(MSVCRT_isleadbyte(*str)) + if(_ismbblead(*str)) { if (!len) break; @@ -1420,7 +1420,7 @@ MSVCRT_size_t CDECL _mbsnbcnt(const unsigned char* str, MSVCRT_size_t len) const unsigned char* xstr = str; while(*xstr && len-- > 0) { - if (MSVCRT_isleadbyte(*xstr++)) + if (_ismbblead(*xstr++)) xstr++; } return xstr-str; @@ -1438,7 +1438,7 @@ unsigned char* CDECL _mbsnbcat(unsigned char* dst, const unsigned char* src, MSV { unsigned char *res = dst; while (*dst) { - if (MSVCRT_isleadbyte(*dst++)) { + if (_ismbblead(*dst++)) { if (*dst) { dst++; } else { @@ -1485,7 +1485,7 @@ int CDECL _mbsnbcat_s(unsigned char *dst, MSVCRT_size_t size, const unsigned cha /* If necessary, check that the character preceding the null terminator is * a lead byte and move the pointer back by one for later overwrite. */ - if (ptr != dst && get_mbcinfo()->ismbcodepage && MSVCRT_isleadbyte(*(ptr - 1))) + if (ptr != dst && get_mbcinfo()->ismbcodepage && _ismbblead(*(ptr - 1))) size++, ptr--; for (i = 0; *src && i < len; i++) @@ -1515,13 +1515,13 @@ unsigned char* CDECL _mbsncat(unsigned char* dst, const unsigned char* src, MSVC unsigned char *res = dst; while (*dst) { - if (MSVCRT_isleadbyte(*dst++)) + if (_ismbblead(*dst++)) dst++; } while (*src && len--) { *dst++ = *src; - if(MSVCRT_isleadbyte(*src++)) + if(_ismbblead(*src++)) *dst++ = *src++; } *dst = '\0'; @@ -1676,7 +1676,7 @@ MSVCRT_size_t CDECL _mbsspn(const unsigned char* string, const unsigned char* se for (p = string; *p; p++) { - if (MSVCRT_isleadbyte(*p)) + if (_ismbblead(*p)) { for (q = set; *q; q++) { @@ -1708,7 +1708,7 @@ unsigned char* CDECL _mbsspnp(const unsigned char* string, const unsigned char* for (p = string; *p; p++) { - if (MSVCRT_isleadbyte(*p)) + if (_ismbblead(*p)) { for (q = set; *q; q++) { @@ -1758,7 +1758,7 @@ unsigned char* CDECL _mbsrev(unsigned char* str) p=str; for(i=0; i<len; i++) { - if (MSVCRT_isleadbyte(*p)) + if (_ismbblead(*p)) { temp[i*2]=*p++; temp[i*2+1]=*p++; @@ -1774,7 +1774,7 @@ unsigned char* CDECL _mbsrev(unsigned char* str) p=str; for(i=len-1; i>=0; i--) { - if(MSVCRT_isleadbyte(temp[i*2])) + if(_ismbblead(temp[i*2])) { *p++=temp[i*2]; *p++=temp[i*2+1]; @@ -1799,13 +1799,13 @@ unsigned char* CDECL _mbspbrk(const unsigned char* str, const unsigned char* acc while(*str) { - for(p = accept; *p; p += (MSVCRT_isleadbyte(*p)?2:1) ) + for(p = accept; *p; p += (_ismbblead(*p)?2:1) ) { if (*p == *str) - if( !MSVCRT_isleadbyte(*p) || ( *(p+1) == *(str+1) ) ) + if( !_ismbblead(*p) || ( *(p+1) == *(str+1) ) ) return (unsigned char*)str; } - str += (MSVCRT_isleadbyte(*str)?2:1); + str += (_ismbblead(*str)?2:1); } return NULL; }

1 0

Huw Davies : gdi32: Add the liberation fonts to the default fallback lists.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 3b9669017bc8425f04860f331d8a1f689c8d63e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9669017bc8425f04860f331… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 11:55:13 2011 +0100 gdi32: Add the liberation fonts to the default fallback lists. --- dlls/gdi32/freetype.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6bd49ed..086fdab 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -420,11 +420,15 @@ static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m', static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; +static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o',0}; +static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; +static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; static const WCHAR *default_serif_list[] = { times_new_roman, + liberation_serif, bitstream_vera_serif, NULL }; @@ -432,6 +436,7 @@ static const WCHAR *default_serif_list[] = static const WCHAR *default_fixed_list[] = { courier_new, + liberation_mono, bitstream_vera_sans_mono, NULL }; @@ -439,6 +444,7 @@ static const WCHAR *default_fixed_list[] = static const WCHAR *default_sans_list[] = { arial, + liberation_sans, bitstream_vera_sans, NULL };

1 0

Alexander Morozov : server: Fix overlapping shared and exclusive locks support.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: d0451f6b3f1c6ad9501fcf11ac1d8e6bd202a121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0451f6b3f1c6ad9501fcf11a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Oct 12 14:58:57 2011 +0400 server: Fix overlapping shared and exclusive locks support. --- dlls/kernel32/tests/file.c | 1 - server/fd.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f607cfd..a720d52 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1671,7 +1671,6 @@ static void test_LockFile(void) ok( !LockFileEx( handle2, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ), "LockFileEx handle2 300,100 succeeded\n" ); ret = LockFileEx( handle, LOCKFILE_FAIL_IMMEDIATELY, 0, 100, 0, &overlapped ); - todo_wine ok( ret, "LockFileEx 300,100 failed\n" ); ok( UnlockFileEx( handle, 0, 100, 0, &overlapped ), "UnlockFileEx 300,100 failed\n" ); /* exclusive lock is removed first */ diff --git a/server/fd.c b/server/fd.c index 798f99e..a8b3a5f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1321,9 +1321,9 @@ static struct file_lock *add_lock( struct fd *fd, int shared, file_pos_t start, release_object( lock ); return NULL; } - list_add_head( &fd->locks, &lock->fd_entry ); - list_add_head( &fd->inode->locks, &lock->inode_entry ); - list_add_head( &lock->process->locks, &lock->proc_entry ); + list_add_tail( &fd->locks, &lock->fd_entry ); + list_add_tail( &fd->inode->locks, &lock->inode_entry ); + list_add_tail( &lock->process->locks, &lock->proc_entry ); return lock; } @@ -1395,7 +1395,7 @@ obj_handle_t lock_fd( struct fd *fd, file_pos_t start, file_pos_t count, int sha { struct file_lock *lock = LIST_ENTRY( ptr, struct file_lock, inode_entry ); if (!lock_overlaps( lock, start, end )) continue; - if (lock->shared && shared) continue; + if (shared && (lock->shared || lock->fd == fd)) continue; /* found one */ if (!wait) {

1 0

Alexandre Julliard : gdi32: Add an all-one alpha channel when converting a DIB for blending.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 8f4d50ea4b7bec42597a92d2b24b1521e93b8591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4d50ea4b7bec42597a92d2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 17:57:02 2011 +0200 gdi32: Add an all-one alpha channel when converting a DIB for blending. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 6 +++--- dlls/gdi32/dibdrv/dc.c | 13 ++++++++++++- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index a2a7698..e03a5c1 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -160,7 +160,7 @@ void free_heap_bits( struct gdi_image_bits *bits ) } static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, - BITMAPINFO *dst_info, struct gdi_image_bits *bits ) + BITMAPINFO *dst_info, struct gdi_image_bits *bits, BOOL add_alpha ) { void *ptr; DWORD err; @@ -169,7 +169,7 @@ static DWORD convert_bits( const BITMAPINFO *src_info, struct bitblt_coords *src if (!(ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) return ERROR_OUTOFMEMORY; - err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr ); + err = convert_bitmapinfo( src_info, bits->ptr, src, dst_info, ptr, add_alpha ); if (bits->free) bits->free( bits ); bits->ptr = ptr; bits->is_copy = TRUE; @@ -252,7 +252,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, dst_info->bmiHeader.biClrUsed = 1; } - if (!(err = convert_bits( src_info, src, dst_info, &bits ))) + if (!(err = convert_bits( src_info, src, dst_info, &bits, FALSE ))) { /* get rid of the fake 1-bpp table */ if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; @@ -309,7 +309,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, src_info->bmiHeader.biClrUsed = 2; } - err = convert_bits( src_info, src, dst_info, &bits ); + err = convert_bits( src_info, src, dst_info, &bits, TRUE ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3739cb7..56efda7 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -591,7 +591,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); if (ptr) { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); if (src_bits.free) src_bits.free( &src_bits ); src_bits.ptr = ptr; src_bits.is_copy = TRUE; @@ -721,7 +721,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); if (ptr) { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr, FALSE ); if (src_bits.free) src_bits.free( &src_bits ); src_bits.ptr = ptr; src_bits.is_copy = TRUE; @@ -1226,7 +1226,7 @@ INT WINAPI GetDIBits( else dst_info->bmiHeader.biHeight = -src.height; - convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); + convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits, FALSE ); if (src_bits.free) src_bits.free( &src_bits ); ret = lines; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f610390..883a60a 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -278,7 +278,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) } DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits ) + const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) { dib_info src_dib, dst_dib; DWORD ret; @@ -306,6 +306,17 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit src->x -= src->visrect.left; src->y -= src->visrect.top; offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); + + if (add_alpha && dst_dib.funcs == &funcs_8888 && src_dib.funcs != &funcs_8888) + { + DWORD *pixel = dst_dib.bits.ptr; + int x, y; + + for (y = src->visrect.top; y < src->visrect.bottom; y++, pixel += dst_dib.stride / 4) + for (x = src->visrect.left; x < src->visrect.right; x++) + pixel[x] |= 0xff000000; + } + return ERROR_SUCCESS; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6a600a4..76e146b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -252,7 +252,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, - const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN; + const BITMAPINFO *dst_info, void *dst_bits, BOOL add_alpha ) DECLSPEC_HIDDEN; extern DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits, struct bitblt_coords *dst,

1 0

Alexandre Julliard : gdi32: Add a helper function to look up color table entries, and default to 0 for missing entries.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 8a41d75e295f96d48f58b8bd13b7b75195dc5754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a41d75e295f96d48f58b8bd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 12 20:14:13 2011 +0200 gdi32: Add a helper function to look up color table entries, and default to 0 for missing entries. --- dlls/gdi32/dibdrv/primitives.c | 95 +++++++++++++--------------------------- 1 files changed, 31 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a41d75e295f96d48f58b…

1 0