December 2011 - Wine-Commits

Alexandre Julliard : gdi32: Add missing check for empty visible rects in the non-stretching case.
by Alexandre Julliard Dec. 8, 2011

Dec. 8, 2011

Module: wine Branch: master Commit: 72fae39ce0385112fd4f4eb720e19912252103a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fae39ce0385112fd4f4eb72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 10:32:26 2011 +0100 gdi32: Add missing check for empty visible rects in the non-stretching case. --- dlls/gdi32/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index bfb56a6..abd4dfc 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -56,7 +56,7 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ { offset_rect( &src->visrect, dst->x - src->x, dst->y - src->y ); - intersect_rect( &rect, &src->visrect, &dst->visrect ); + if (!intersect_rect( &rect, &src->visrect, &dst->visrect )) return FALSE; src->visrect = dst->visrect = rect; offset_rect( &src->visrect, src->x - dst->x, src->y - dst->y ); }

1 0

Piotr Caban : msvcrt: Initialize lc_time_curr inside create_locale.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 344883fb853ce50ff4713c16b521c8e034032c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=344883fb853ce50ff4713c16b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 7 13:48:22 2011 +0100 msvcrt: Initialize lc_time_curr inside create_locale. --- dlls/msvcrt/locale.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.h | 21 ++++++++++++++++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6893685..1c91658 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -634,6 +634,8 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) MSVCRT_free(locinfo->pclmap); MSVCRT_free(locinfo->pcumap); + MSVCRT_free(locinfo->lc_time_curr); + MSVCRT_free(locinfo); } @@ -677,6 +679,23 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) /* _create_locale - not exported in native msvcrt */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) { + static const DWORD time_data[] = { + LOCALE_SABBREVDAYNAME7, LOCALE_SABBREVDAYNAME1, LOCALE_SABBREVDAYNAME2, + LOCALE_SABBREVDAYNAME3, LOCALE_SABBREVDAYNAME4, LOCALE_SABBREVDAYNAME5, + LOCALE_SABBREVDAYNAME6, + LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, + LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, + LOCALE_SABBREVMONTHNAME1, LOCALE_SABBREVMONTHNAME2, LOCALE_SABBREVMONTHNAME3, + LOCALE_SABBREVMONTHNAME4, LOCALE_SABBREVMONTHNAME5, LOCALE_SABBREVMONTHNAME6, + LOCALE_SABBREVMONTHNAME7, LOCALE_SABBREVMONTHNAME8, LOCALE_SABBREVMONTHNAME9, + LOCALE_SABBREVMONTHNAME10, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12, + LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, LOCALE_SMONTHNAME4, + LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, + LOCALE_SMONTHNAME9, LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12, + LOCALE_S1159, LOCALE_S2359, + LOCALE_SSHORTDATE, LOCALE_SLONGDATE, + LOCALE_STIMEFORMAT + }; static const char collate[] = "COLLATE="; static const char ctype[] = "CTYPE="; static const char monetary[] = "MONETARY="; @@ -686,7 +705,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) MSVCRT__locale_t loc; LCID lcid[6] = { 0 }; char buf[256]; - int i; + int i, ret, size; TRACE("(%d %s)\n", category, locale); @@ -1124,6 +1143,44 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } else loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = MSVCRT__strdup("C"); + size = sizeof(MSVCRT___lc_time_data); + for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + ret = GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i] + |LOCALE_NOUSEROVERRIDE, NULL, 0); + if(!ret) { + MSVCRT__free_locale(loc); + return NULL; + } + size += ret; + + ret = GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i] + |LOCALE_NOUSEROVERRIDE, NULL, 0); + if(!ret) { + MSVCRT__free_locale(loc); + return NULL; + } + size += ret*sizeof(MSVCRT_wchar_t); + } + + loc->locinfo->lc_time_curr = MSVCRT_malloc(size); + if(!loc->locinfo->lc_time_curr) { + MSVCRT__free_locale(loc); + return NULL; + } + + ret = 0; + for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + loc->locinfo->lc_time_curr->str[i] = &loc->locinfo->lc_time_curr->data[ret]; + ret += GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + &loc->locinfo->lc_time_curr->data[ret], size-ret); + } + for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + loc->locinfo->lc_time_curr->wstr[i] = (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret]; + ret += GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); + } + loc->locinfo->lc_time_curr->lcid = lcid[MSVCRT_LC_TIME]; + return loc; } @@ -1248,6 +1305,8 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) (void**)&loc->locinfo->lc_category[MSVCRT_LC_TIME].locale); swap_pointers((void**)&locinfo->lc_category[MSVCRT_LC_TIME].refcount, (void**)&loc->locinfo->lc_category[MSVCRT_LC_TIME].refcount); + swap_pointers((void**)&locinfo->lc_time_curr, + (void**)&loc->locinfo->lc_time_curr); if(category != MSVCRT_LC_ALL) break; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d9eb6bd..0695e6f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -108,6 +108,25 @@ typedef struct MSVCRT_tagLC_ID { unsigned short wCodePage; } MSVCRT_LC_ID, *MSVCRT_LPLC_ID; +typedef struct { + /* str table contains following strings: + * short weekday names [7]; + * weekday names [7]; + * short month names [12]; + * month names [12]; + * s1159 (AM); + * s2359 (PM); + * short date format; + * date format; + * time format; + */ + char *str[43]; + LCID lcid; + int unk[2]; + MSVCRT_wchar_t *wstr[43]; + char data[1]; +} MSVCRT___lc_time_data; + typedef struct MSVCRT_threadlocaleinfostruct { int refcount; unsigned int lc_codepage; @@ -131,7 +150,7 @@ typedef struct MSVCRT_threadlocaleinfostruct { unsigned short *pctype; unsigned char *pclmap; unsigned char *pcumap; - struct MSVCRT___lc_time_data *lc_time_curr; + MSVCRT___lc_time_data *lc_time_curr; } MSVCRT_threadlocinfo; typedef struct MSVCRT_threadmbcinfostruct {

1 0

Piotr Caban : msvcrt/tests: Added _Gettnames tests.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 516a65a605e579e5e813b71c736f7b1afc203905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516a65a605e579e5e813b71c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 7 13:50:03 2011 +0100 msvcrt/tests: Added _Gettnames tests. --- dlls/msvcrt/tests/locale.c | 122 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 0e8d0dd..8d6a34f 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -25,6 +25,7 @@ static BOOL (__cdecl *p__crtGetStringTypeW)(DWORD, DWORD, const wchar_t*, int, WORD*); static int (__cdecl *pmemcpy_s)(void *, size_t, void*, size_t); +void* __cdecl _Gettnames(void); static void init(void) { @@ -616,10 +617,131 @@ static void test_crtGetStringTypeW(void) ok(!ret, "ret == TRUE\n"); } +static void test__Gettnames(void) +{ + struct { + char *str[43]; + LCID lcid; + int unk[2]; + wchar_t *wstr[43]; + char data[1]; + } *ret; + int size; + + if(!setlocale(LC_ALL, "english")) + return; + + ret = _Gettnames(); + size = ret->data-(char*)ret; + /* Newer version of the structure stores both ascii and unicode strings. + * Unicode strings are only initialized on Windows 7 + */ + if(sizeof(void*) == 8) + ok(size==0x2c0 || broken(size==0x170), "strucure size: %x\n", size); + else + ok(size==0x164 || broken(size==0xb8), "strucure size: %x\n", size); + + ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); + ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); + ok(!strcmp(ret->str[2], "Tue"), "ret->str[2] = %s\n", ret->str[2]); + ok(!strcmp(ret->str[3], "Wed"), "ret->str[3] = %s\n", ret->str[3]); + ok(!strcmp(ret->str[4], "Thu"), "ret->str[4] = %s\n", ret->str[4]); + ok(!strcmp(ret->str[5], "Fri"), "ret->str[5] = %s\n", ret->str[5]); + ok(!strcmp(ret->str[6], "Sat"), "ret->str[6] = %s\n", ret->str[6]); + ok(!strcmp(ret->str[7], "Sunday"), "ret->str[7] = %s\n", ret->str[7]); + ok(!strcmp(ret->str[8], "Monday"), "ret->str[8] = %s\n", ret->str[8]); + ok(!strcmp(ret->str[9], "Tuesday"), "ret->str[9] = %s\n", ret->str[9]); + ok(!strcmp(ret->str[10], "Wednesday"), "ret->str[10] = %s\n", ret->str[10]); + ok(!strcmp(ret->str[11], "Thursday"), "ret->str[11] = %s\n", ret->str[11]); + ok(!strcmp(ret->str[12], "Friday"), "ret->str[12] = %s\n", ret->str[12]); + ok(!strcmp(ret->str[13], "Saturday"), "ret->str[13] = %s\n", ret->str[13]); + ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); + ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); + ok(!strcmp(ret->str[16], "Mar"), "ret->str[16] = %s\n", ret->str[16]); + ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); + ok(!strcmp(ret->str[18], "May"), "ret->str[18] = %s\n", ret->str[18]); + ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); + ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); + ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); + ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); + ok(!strcmp(ret->str[23], "Oct"), "ret->str[23] = %s\n", ret->str[23]); + ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); + ok(!strcmp(ret->str[25], "Dec"), "ret->str[25] = %s\n", ret->str[25]); + ok(!strcmp(ret->str[26], "January"), "ret->str[26] = %s\n", ret->str[26]); + ok(!strcmp(ret->str[27], "February"), "ret->str[27] = %s\n", ret->str[27]); + ok(!strcmp(ret->str[28], "March"), "ret->str[28] = %s\n", ret->str[28]); + ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); + ok(!strcmp(ret->str[30], "May"), "ret->str[30] = %s\n", ret->str[30]); + ok(!strcmp(ret->str[31], "June"), "ret->str[31] = %s\n", ret->str[31]); + ok(!strcmp(ret->str[32], "July"), "ret->str[32] = %s\n", ret->str[32]); + ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); + ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); + ok(!strcmp(ret->str[35], "October"), "ret->str[35] = %s\n", ret->str[35]); + ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); + ok(!strcmp(ret->str[37], "December"), "ret->str[37] = %s\n", ret->str[37]); + ok(!strcmp(ret->str[38], "AM"), "ret->str[38] = %s\n", ret->str[38]); + ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); + ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, + "ret->str[40] = %s\n", ret->str[40]); + ok(!strcmp(ret->str[41], "dddd, MMMM dd, yyyy"), "ret->str[41] = %s\n", ret->str[41]); + free(ret); + + if(!setlocale(LC_TIME, "german")) + return; + + ret = _Gettnames(); + ok(!strcmp(ret->str[0], "So"), "ret->str[0] = %s\n", ret->str[0]); + ok(!strcmp(ret->str[1], "Mo"), "ret->str[1] = %s\n", ret->str[1]); + ok(!strcmp(ret->str[2], "Di"), "ret->str[2] = %s\n", ret->str[2]); + ok(!strcmp(ret->str[3], "Mi"), "ret->str[3] = %s\n", ret->str[3]); + ok(!strcmp(ret->str[4], "Do"), "ret->str[4] = %s\n", ret->str[4]); + ok(!strcmp(ret->str[5], "Fr"), "ret->str[5] = %s\n", ret->str[5]); + ok(!strcmp(ret->str[6], "Sa"), "ret->str[6] = %s\n", ret->str[6]); + ok(!strcmp(ret->str[7], "Sonntag"), "ret->str[7] = %s\n", ret->str[7]); + ok(!strcmp(ret->str[8], "Montag"), "ret->str[8] = %s\n", ret->str[8]); + ok(!strcmp(ret->str[9], "Dienstag"), "ret->str[9] = %s\n", ret->str[9]); + ok(!strcmp(ret->str[10], "Mittwoch"), "ret->str[10] = %s\n", ret->str[10]); + ok(!strcmp(ret->str[11], "Donnerstag"), "ret->str[11] = %s\n", ret->str[11]); + ok(!strcmp(ret->str[12], "Freitag"), "ret->str[12] = %s\n", ret->str[12]); + ok(!strcmp(ret->str[13], "Samstag"), "ret->str[13] = %s\n", ret->str[13]); + ok(!strcmp(ret->str[14], "Jan"), "ret->str[14] = %s\n", ret->str[14]); + ok(!strcmp(ret->str[15], "Feb"), "ret->str[15] = %s\n", ret->str[15]); + ok(!strcmp(ret->str[16], "Mrz"), "ret->str[16] = %s\n", ret->str[16]); + ok(!strcmp(ret->str[17], "Apr"), "ret->str[17] = %s\n", ret->str[17]); + ok(!strcmp(ret->str[18], "Mai"), "ret->str[18] = %s\n", ret->str[18]); + ok(!strcmp(ret->str[19], "Jun"), "ret->str[19] = %s\n", ret->str[19]); + ok(!strcmp(ret->str[20], "Jul"), "ret->str[20] = %s\n", ret->str[20]); + ok(!strcmp(ret->str[21], "Aug"), "ret->str[21] = %s\n", ret->str[21]); + ok(!strcmp(ret->str[22], "Sep"), "ret->str[22] = %s\n", ret->str[22]); + ok(!strcmp(ret->str[23], "Okt"), "ret->str[23] = %s\n", ret->str[23]); + ok(!strcmp(ret->str[24], "Nov"), "ret->str[24] = %s\n", ret->str[24]); + ok(!strcmp(ret->str[25], "Dez"), "ret->str[25] = %s\n", ret->str[25]); + ok(!strcmp(ret->str[26], "Januar"), "ret->str[26] = %s\n", ret->str[26]); + ok(!strcmp(ret->str[27], "Februar"), "ret->str[27] = %s\n", ret->str[27]); + ok(!strcmp(ret->str[29], "April"), "ret->str[29] = %s\n", ret->str[29]); + ok(!strcmp(ret->str[30], "Mai"), "ret->str[30] = %s\n", ret->str[30]); + ok(!strcmp(ret->str[31], "Juni"), "ret->str[31] = %s\n", ret->str[31]); + ok(!strcmp(ret->str[32], "Juli"), "ret->str[32] = %s\n", ret->str[32]); + ok(!strcmp(ret->str[33], "August"), "ret->str[33] = %s\n", ret->str[33]); + ok(!strcmp(ret->str[34], "September"), "ret->str[34] = %s\n", ret->str[34]); + ok(!strcmp(ret->str[35], "Oktober"), "ret->str[35] = %s\n", ret->str[35]); + ok(!strcmp(ret->str[36], "November"), "ret->str[36] = %s\n", ret->str[36]); + ok(!strcmp(ret->str[37], "Dezember"), "ret->str[37] = %s\n", ret->str[37]); + ok(!strcmp(ret->str[38], ""), "ret->str[38] = %s\n", ret->str[38]); + ok(!strcmp(ret->str[39], ""), "ret->str[39] = %s\n", ret->str[39]); + ok(!strcmp(ret->str[40], "dd.MM.yyyy") || broken(!strcmp(ret->str[40], "dd.MM.yy"))/*NT*/, + "ret->str[40] = %s\n", ret->str[40]); + ok(!strcmp(ret->str[41], "dddd, d. MMMM yyyy"), "ret->str[41] = %s\n", ret->str[41]); + free(ret); + + setlocale(LC_ALL, "C"); +} + START_TEST(locale) { init(); test_crtGetStringTypeW(); test_setlocale(); + test__Gettnames(); }

1 0

Alexandre Julliard : winex11: Don' t call get_xrender_picture inside the X11 lock.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: b036c8a38d8f86ef797d39a2c0aa2b4d4ff827c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b036c8a38d8f86ef797d39a2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 17:57:32 2011 +0100 winex11: Don't call get_xrender_picture inside the X11 lock. --- dlls/winex11.drv/xrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index d81130d..21c1280 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2621,9 +2621,10 @@ static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG n colors[0].red, colors[0].green, colors[0].blue, colors[0].alpha, colors[1].red, colors[1].green, colors[1].blue, colors[1].alpha ); + dst_pict = get_xrender_picture( physdev, 0, NULL ); + wine_tsx11_lock(); src_pict = pXRenderCreateLinearGradient( gdi_display, &gradient, stops, colors, 2 ); - dst_pict = get_xrender_picture( physdev, 0, NULL ); xrender_blit( PictOpSrc, src_pict, 0, dst_pict, 0, 0, physdev->x11dev->dc_rect.left + min( pt[0].x, pt[1].x ), physdev->x11dev->dc_rect.top + min( pt[0].y, pt[1].y ),

1 0

Piotr Caban : msvcrt: Added _Gettnames implementation.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 4bb1e9c32ad64aa5e668fd1ae0a3fcb970b848e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb1e9c32ad64aa5e668fd1ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 7 13:48:36 2011 +0100 msvcrt: Added _Gettnames implementation. --- dlls/msvcrt/locale.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1c91658..aa5fe84 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -444,11 +444,28 @@ const char* CDECL _Getmonths(void) /********************************************************************* * _Gettnames (MSVCRT.@) */ -const char* CDECL _Gettnames(void) +void* CDECL _Gettnames(void) { - /* FIXME: */ - TRACE("(void) stub\n"); - return ""; + MSVCRT___lc_time_data *ret, *cur = get_locinfo()->lc_time_curr; + int i, size = sizeof(MSVCRT___lc_time_data); + + TRACE("\n"); + + for(i=0; i<sizeof(cur->str)/sizeof(cur->str[0]); i++) + size += strlen(cur->str[i])+1; + + ret = MSVCRT_malloc(size); + if(!ret) + return NULL; + memcpy(ret, cur, size); + + size = 0; + for(i=0; i<sizeof(cur->str)/sizeof(cur->str[0]); i++) { + ret->str[i] = &ret->data[size]; + size += strlen(&ret->data[size])+1; + } + + return ret; } /*********************************************************************

1 0

Aric Stewart : usp10: Handle dangling joiners when processing Indic GlyphProps.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 746679e186c1dfa50b799407d315e8fd030374a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=746679e186c1dfa50b799407d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 7 08:30:49 2011 -0600 usp10: Handle dangling joiners when processing Indic GlyphProps. --- dlls/usp10/shape.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5b9bb56..4ee658e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3302,7 +3302,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL break; case lex_ZWJ: case lex_ZWNJ: - k = char_count; + /* check for dangling joiners */ + if (pwcChars[char_index[k]-1] == 0x0020 || pwcChars[char_index[k]+1] == 0x0020) + pGlyphProp[i].sva.fClusterStart = 1; + else + k = char_count; break; default: pGlyphProp[i].sva.fClusterStart = 1;

1 0

Piotr Caban : msvcrt: Added _Getmonths implementation.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: d82dd2a4dbd50f09f7dec919c0879462fe109d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82dd2a4dbd50f09f7dec919c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 7 13:49:47 2011 +0100 msvcrt: Added _Getmonths implementation. --- dlls/msvcrt/locale.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 00cb0a9..c3a1c4b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -451,14 +451,35 @@ char* CDECL _Getdays(void) /********************************************************************* * _Getmonths (MSVCRT.@) */ -const char* CDECL _Getmonths(void) +char* CDECL _Getmonths(void) { - static const char MSVCRT_months[] = ":Jan:January:Feb:February:Mar:March:Apr:" - "April:May:May:Jun:June:Jul:July:Aug:August:Sep:September:Oct:" - "October:Nov:November:Dec:December"; - /* FIXME: Use locale */ - TRACE("(void) semi-stub\n"); - return MSVCRT_months; + static const int months_offset = 14; + + MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; + int i, len, size; + char *out; + + TRACE("\n"); + + size = cur->str[months_offset+2*12]-cur->str[months_offset]; + out = MSVCRT_malloc(size+1); + if(!out) + return NULL; + + size = 0; + for(i=0; i<12; i++) { + out[size++] = ':'; + len = strlen(cur->str[months_offset+i]); + memcpy(&out[size], cur->str[months_offset+i], len); + size += len; + + out[size++] = ':'; + len = strlen(cur->str[months_offset+12+i]); + memcpy(&out[size], cur->str[months_offset+12+i], len); + size += len; + } + + return out; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added _Getdays implementation.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 7a43f0cb8f2dcc3766256ebc81a62ae71689657a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a43f0cb8f2dcc3766256ebc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 7 13:49:09 2011 +0100 msvcrt: Added _Getdays implementation. --- dlls/msvcrt/locale.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index aa5fe84..00cb0a9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -419,13 +419,33 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* loc /********************************************************************* * _Getdays (MSVCRT.@) */ -const char* CDECL _Getdays(void) +char* CDECL _Getdays(void) { - static const char MSVCRT_days[] = ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:" - "Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday"; - /* FIXME: Use locale */ - TRACE("(void) semi-stub\n"); - return MSVCRT_days; + MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; + int i, len, size; + char *out; + + TRACE("\n"); + + size = cur->str[2*7]-cur->str[0]; + out = MSVCRT_malloc(size+1); + if(!out) + return NULL; + + size = 0; + for(i=0; i<7; i++) { + out[size++] = ':'; + len = strlen(cur->str[i]); + memcpy(&out[size], cur->str[i], len); + size += len; + + out[size++] = ':'; + len = strlen(cur->str[7+i]); + memcpy(&out[size], cur->str[7+i], len); + size += len; + } + + return out; } /*********************************************************************

1 0

Frédéric Delanoy : cmd: Avoid dead assignment ( Clang).
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: 15f65a0792e3863cdca7fb077d5e25f3da4a60eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f65a0792e3863cdca7fb077… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 7 12:46:17 2011 +0100 cmd: Avoid dead assignment (Clang). --- programs/cmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2d50c33..d82427a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -838,7 +838,7 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, /* Replace use of %* if in batch program*/ } else if (!justFors && context && *(p+1)=='*') { WCHAR *startOfParms = NULL; - t = WCMD_parameter(context -> command, 1, &startOfParms, NULL); + WCMD_parameter(context -> command, 1, &startOfParms, NULL); if (startOfParms != NULL) WCMD_strsubstW(p, p+2, startOfParms, -1); else

1 0

Jacek Caban : appwiz.cpl: Run winebrowser directly instead of using ShellExecute.
by Alexandre Julliard Dec. 7, 2011

Dec. 7, 2011

Module: wine Branch: master Commit: fd230c5d15b63883211ae1f7e7bea62b99664107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd230c5d15b63883211ae1f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 18:28:04 2011 +0100 appwiz.cpl: Run winebrowser directly instead of using ShellExecute. --- dlls/appwiz.cpl/addons.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4987ea3..9a410b8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -434,10 +434,45 @@ static DWORD WINAPI download_proc(PVOID arg) return 0; } -static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static void run_winebrowser(const WCHAR *url) { - static const WCHAR openW[] = {'o','p','e','n',0}; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + LONG len, url_len; + WCHAR *args; + BOOL ret; + + static const WCHAR winebrowserW[] = {'\\','w','i','n','e','b','r','o','w','s','e','r','.','e','x','e',0}; + + url_len = strlenW(url); + + len = GetSystemDirectoryW(app, MAX_PATH-sizeof(winebrowserW)/sizeof(WCHAR)); + memcpy(app+len, winebrowserW, sizeof(winebrowserW)); + len += sizeof(winebrowserW)/sizeof(WCHAR) -1; + + args = heap_alloc((len+1+url_len)*sizeof(WCHAR)); + if(!args) + return; + + memcpy(args, app, len*sizeof(WCHAR)); + args[len++] = ' '; + memcpy(args+len, url, (url_len+1) * sizeof(WCHAR)); + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + heap_free(args); + if (ret) { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } +} + +static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ switch(msg) { case WM_INITDIALOG: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); @@ -450,7 +485,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case NM_CLICK: case NM_RETURN: if (wParam == ID_DWL_STATUS) - ShellExecuteW( NULL, openW, ((NMLINK *)lParam)->item.szUrl, NULL, NULL, SW_SHOW ); + run_winebrowser(((NMLINK*)lParam)->item.szUrl); break; } break;

1 0