wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alistair Leslie-Hughes : mshtml: Implement IHTMLDOMNode replaceChild.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 531a07db142c28026fec1ea7ad1c4048eb1ebfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=531a07db142c28026fec1ea7a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Feb 19 15:58:30 2011 +1100 mshtml: Implement IHTMLDOMNode replaceChild. --- dlls/mshtml/htmlnode.c | 33 +++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index dbb5888..8962acf 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -580,8 +580,37 @@ static HRESULT WINAPI HTMLDOMNode_replaceChild(IHTMLDOMNode *iface, IHTMLDOMNode IHTMLDOMNode *oldChild, IHTMLDOMNode **node) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - FIXME("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); - return E_NOTIMPL; + HTMLDOMNode *node_new; + HTMLDOMNode *node_old; + nsIDOMNode *nsnode; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p %p %p)\n", This, newChild, oldChild, node); + + node_new = get_node_obj(This->doc, (IUnknown*)newChild); + if(!node_new) + return E_FAIL; + + node_old = get_node_obj(This->doc, (IUnknown*)oldChild); + if(!node_old) + return E_FAIL; + + nsres = nsIDOMNode_ReplaceChild(This->nsnode, node_new->nsnode, node_old->nsnode, &nsnode); + if(NS_FAILED(nsres)) { + return E_FAIL; + } + + nsnode = node_new->nsnode; + + hres = get_node(This->doc, nsnode, TRUE, &node_new); + nsIDOMNode_Release(nsnode); + if(FAILED(hres)) + return hres; + + *node = &node_new->IHTMLDOMNode_iface; + IHTMLDOMNode_AddRef(*node); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_cloneNode(IHTMLDOMNode *iface, VARIANT_BOOL fDeep, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0ce3ead..6cc1733 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5639,6 +5639,41 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLElement_Release(body); } +static void test_replacechild_elems(IHTMLDocument2 *doc) +{ + IHTMLElement *body; + IHTMLDOMNode *node, *node2, *node3; + IHTMLDOMNode *nodeBody, *nodeNew; + HRESULT hres; + VARIANT var; + + body = doc_get_body(doc); + + node = test_create_text(doc, "insert"); + + V_VT(&var) = VT_NULL; + V_DISPATCH(&var) = NULL; + node2 = test_node_insertbefore((IUnknown*)body, node, &var); + IHTMLDOMNode_Release(node); + + test_elem_innertext(body, "insert"); + + node3 = test_create_text(doc, "replaced"); + + nodeBody = _get_node_iface(__LINE__, (IUnknown *)body); + + hres = IHTMLDOMNode_replaceChild(nodeBody, node3, node2, &nodeNew); + ok(hres == S_OK, "Expected S_OK, got 0x%08x\n", hres); + + test_elem_innertext(body, "replaced"); + + IHTMLDOMNode_Release(node2); + IHTMLDOMNode_Release(node3); + IHTMLDOMNode_Release(nodeBody); + + IHTMLElement_Release(body); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -6201,6 +6236,7 @@ START_TEST(dom) run_domtest(cond_comment_str, test_cond_comment); run_domtest(frameset_str, test_frameset); run_domtest(emptydiv_str, test_docfrag); + run_domtest(doc_blank, test_replacechild_elems); CoUninitialize(); }

1 0

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

12 Oct '11

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

Huw Davies : gdi32: Use the helper to get the bounding rectangle.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: db6fe9ee9b962de4826ce2655fcaa0536a9a5ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6fe9ee9b962de4826ce2655… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 13:07:32 2011 +0100 gdi32: Use the helper to get the bounding rectangle. --- dlls/gdi32/dibdrv/bitblt.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index f78f9a2..25554bb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1034,13 +1034,7 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit src_start.x, src_start.y, h_params.src_inc, v_params.src_inc, h_params.length, v_params.length); - rect.left = dst_start.x; - rect.top = dst_start.y; - rect.right = dst_end.x; - rect.bottom = dst_end.y; - - if (rect.right < rect.left) { INT tmp = rect.left; rect.left = rect.right+1; rect.right = tmp+1; } - if (rect.bottom < rect.top) { INT tmp = rect.top; rect.top = rect.bottom+1; rect.bottom = tmp+1; } + get_bounding_rect( &rect, dst_start.x, dst_start.y, dst_end.x - dst_start.x, dst_end.y - dst_start.y ); intersect_rect( &dst->visrect, &dst->visrect, &rect ); dst_start.x -= dst->visrect.left;

1 0

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

12 Oct '11

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

Huw Davies : gdi32: Move to a more scalable mechanism for picking the default fonts.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: 230b42055cd87d0cd27b50af108d9ba7a7fe5541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230b42055cd87d0cd27b50af1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 11:55:12 2011 +0100 gdi32: Move to a more scalable mechanism for picking the default fonts. --- dlls/gdi32/freetype.c | 56 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fd00d0f..6bd49ed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -415,6 +415,35 @@ static const WCHAR Gulim[] = {'G','u','l','i','m',0}; static const WCHAR PMingLiU[] = {'P','M','i','n','g','L','i','U',0}; static const WCHAR Batang[] = {'B','a','t','a','n','g',0}; +static const WCHAR arial[] = {'A','r','i','a','l',0}; +static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; +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 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, + bitstream_vera_serif, + NULL +}; + +static const WCHAR *default_fixed_list[] = +{ + courier_new, + bitstream_vera_sans_mono, + NULL +}; + +static const WCHAR *default_sans_list[] = +{ + arial, + bitstream_vera_sans, + NULL +}; + + static const WCHAR ArabicW[] = {'A','r','a','b','i','c','\0'}; static const WCHAR BalticW[] = {'B','a','l','t','i','c','\0'}; static const WCHAR CHINESE_BIG5W[] = {'C','H','I','N','E','S','E','_','B','I','G','5','\0'}; @@ -3092,23 +3121,22 @@ static BOOL move_to_front(const WCHAR *name) return FALSE; } -static const WCHAR arial[] = {'A','r','i','a','l',0}; -static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; -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 times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; - -static void reorder_font_list(void) +static BOOL set_default(const WCHAR **name_list) { - if(!move_to_front(times_new_roman)) - move_to_front(bitstream_vera_serif); + while (*name_list) + { + if (move_to_front(*name_list)) return TRUE; + name_list++; + } - if(!move_to_front(courier_new)) - move_to_front(bitstream_vera_sans_mono); + return FALSE; +} - if(!move_to_front(arial)) - move_to_front(bitstream_vera_sans); +static void reorder_font_list(void) +{ + set_default( default_serif_list ); + set_default( default_fixed_list ); + set_default( default_sans_list ); } /*************************************************************

1 0

Piotr Caban : msvcrt: Added _mbtowc_l implementation.
by Alexandre Julliard 12 Oct '11

12 Oct '11

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

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

12 Oct '11

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: Use _ismbblead instead of _isleadbyte in mbcodepage dependent functions.
by Alexandre Julliard 12 Oct '11

12 Oct '11

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

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

12 Oct '11

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: Handle C locale in _setmbcp.
by Alexandre Julliard 12 Oct '11

12 Oct '11

Module: wine Branch: master Commit: c9cdb550665fbfa99eef0aea10e33c8c8d571664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9cdb550665fbfa99eef0aea1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 12 11:55:20 2011 +0200 msvcrt: Handle C locale in _setmbcp. --- 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 4c2b6c8..af5a2a9 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -209,7 +209,9 @@ int CDECL _setmbcp(int cp) break; case _MB_CP_LOCALE: newcp = locinfo->lc_codepage; - break; + if(newcp) + break; + /* fall through (C locale) */ case _MB_CP_SBCS: newcp = 20127; /* ASCII */ break;

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011