October 2012 - Wine-Commits

Rafał Mużyło : gdiplus: Mark regions as unclipped correctly.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: fc2bb3bdc148f3071414cc9f1622fa1f0bc38518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2bb3bdc148f3071414cc9f1… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Mon Oct 29 23:52:51 2012 +0100 gdiplus: Mark regions as unclipped correctly. --- dlls/gdiplus/graphics.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1cea50b..c428b6b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5164,9 +5164,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Height = rect->Height * args.rel_height; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; if (scaled_rect.Width >= 0.5) { @@ -5174,8 +5174,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); - if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; get_font_hfont(graphics, font, format, &gdifont); oldfont = SelectObject(hdc, gdifont); @@ -5343,9 +5343,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Height = rel_height * rect->Height; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if ((format_flags & StringFormatFlagsNoClip) || - scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; if (scaled_rect.Width >= 0.5) { @@ -5353,8 +5353,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); - if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23)

1 0

Alexandre Julliard : ntdll: Add a helper function to set file times.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 7b704102a8f172ae307b10914c70851b8c9ac44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b704102a8f172ae307b10914… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 11:44:10 2012 +0100 ntdll: Add a helper function to set file times. --- dlls/ntdll/file.c | 67 +++++++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca1e5cb..5f5e7fe 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1558,6 +1558,42 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( return 0; } +static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_INTEGER *atime ) +{ + struct timeval tv[2]; + struct stat st; + + if (!atime->QuadPart || !mtime->QuadPart) + { + + tv[0].tv_sec = tv[0].tv_usec = 0; + tv[1].tv_sec = tv[1].tv_usec = 0; + if (!fstat( fd, &st )) + { + tv[0].tv_sec = st.st_atime; + tv[1].tv_sec = st.st_mtime; +#ifdef HAVE_STRUCT_STAT_ST_ATIM + tv[0].tv_usec = st.st_atim.tv_nsec / 1000; +#endif +#ifdef HAVE_STRUCT_STAT_ST_MTIM + tv[1].tv_usec = st.st_mtim.tv_nsec / 1000; +#endif + } + } + if (atime->QuadPart) + { + tv[0].tv_sec = atime->QuadPart / 10000000 - SECS_1601_TO_1970; + tv[0].tv_usec = (atime->QuadPart % 10000000) / 10; + } + if (mtime->QuadPart) + { + tv[1].tv_sec = mtime->QuadPart / 10000000 - SECS_1601_TO_1970; + tv[1].tv_usec = (mtime->QuadPart % 10000000) / 10; + } + if (!futimes( fd, tv )) return STATUS_SUCCESS; + return FILE_GetNtStatus(); +} + static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, LARGE_INTEGER *ctime, LARGE_INTEGER *atime, LARGE_INTEGER *creation ) { @@ -2047,36 +2083,7 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, return io->u.Status; if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart) - { - struct timeval tv[2]; - - if (!info->LastAccessTime.QuadPart || !info->LastWriteTime.QuadPart) - { - - tv[0].tv_sec = tv[0].tv_usec = 0; - tv[1].tv_sec = tv[1].tv_usec = 0; - if (!fstat( fd, &st )) - { - tv[0].tv_sec = st.st_atime; - tv[1].tv_sec = st.st_mtime; - } - } - if (info->LastAccessTime.QuadPart) - { - ULONGLONG sec = info->LastAccessTime.QuadPart / 10000000; - UINT nsec = info->LastAccessTime.QuadPart % 10000000; - tv[0].tv_sec = sec - SECS_1601_TO_1970; - tv[0].tv_usec = nsec / 10; - } - if (info->LastWriteTime.QuadPart) - { - ULONGLONG sec = info->LastWriteTime.QuadPart / 10000000; - UINT nsec = info->LastWriteTime.QuadPart % 10000000; - tv[1].tv_sec = sec - SECS_1601_TO_1970; - tv[1].tv_usec = nsec / 10; - } - if (futimes( fd, tv ) == -1) io->u.Status = FILE_GetNtStatus(); - } + io->u.Status = set_file_times( fd, &info->LastAccessTime, &info->LastWriteTime ); if (io->u.Status == STATUS_SUCCESS && info->FileAttributes) {

1 0

Jörg Höhle : winmm: Turn some MCI parser ERR into FIXME.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 1fc362ce55e820f01e1e078c4fcfaf237c8ba527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc362ce55e820f01e1e078c4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 20 17:13:24 2012 +0200 winmm: Turn some MCI parser ERR into FIXME. --- dlls/winmm/mci.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 1448b16..8f26c1e 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1099,7 +1099,7 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, break; case MCI_RETURN: if (offset != _offset) { - ERR("MCI_RETURN not in first position\n"); + FIXME("MCI_RETURN not in first position\n"); return MCIERR_PARSER_INTERNAL; } } @@ -1186,7 +1186,7 @@ static DWORD MCI_ParseOptArgs(DWORD* data, int _offset, LPCWSTR lpCmd, return MCIERR_UNRECOGNIZED_COMMAND; } if (offset == MCI_DATA_SIZE) { - ERR("Internal data[] buffer overflow\n"); + FIXME("Internal data[] buffer overflow\n"); return MCIERR_PARSER_INTERNAL; } } @@ -1304,7 +1304,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret snprintfW(lpstrRet, uRetLen, fmt_d4, data[0], data[1], data[2], data[3]); break; } - default: ERR("oops\n"); + default: FIXME("Unknown MCI return type %d\n", retType); } } return LOWORD(dwRet); @@ -1507,7 +1507,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, break; #endif default: - ERR("oops\n"); + FIXME("Unknown MCI return type %d\n", retType); + dwRet = MCIERR_PARSER_INTERNAL; + goto errCleanUp; } TRACE("verb=%s on dev=%s; offset=%d\n", @@ -1536,7 +1538,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, case MCI_OPEN: if (strcmpW(verb, wszOpen)) { FIXME("Cannot open with command %s\n", debugstr_w(verb)); - dwRet = MCIERR_INTERNAL; + dwRet = MCIERR_DRIVER_INTERNAL; wMsg = 0; goto errCleanUp; }

1 0

Frédéric Delanoy : crypt32: Avoid double free in CRYPT_LoadSIP on error path (coverity).
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: e078c872a07e40b12b865bb26583ff9f9c5ca749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e078c872a07e40b12b865bb26… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 29 21:17:31 2012 +0100 crypt32: Avoid double free in CRYPT_LoadSIP on error path (coverity). --- dlls/crypt32/sip.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index e43ebc7..4a32cad 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -634,14 +634,17 @@ static BOOL CRYPT_LoadSIP(const GUID *pgSubject) if (!sip.pfPut || temp != lib) goto error; FreeLibrary(temp); + temp = NULL; sip.pfCreate = CRYPT_LoadSIPFunc(pgSubject, szCreate, &temp); if (!sip.pfCreate || temp != lib) goto error; FreeLibrary(temp); + temp = NULL; sip.pfVerify = CRYPT_LoadSIPFunc(pgSubject, szVerify, &temp); if (!sip.pfVerify || temp != lib) goto error; FreeLibrary(temp); + temp = NULL; sip.pfRemove = CRYPT_LoadSIPFunc(pgSubject, szRemoveSigned, &temp); if (!sip.pfRemove || temp != lib) goto error;

1 0

Frédéric Delanoy : gdiplus/tests: Cleanup resources on error path in test_font_height_scaling (coverity).
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: c97066370cc7a1fbf6d276f69dc311ae5538066c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97066370cc7a1fbf6d276f69… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 30 08:55:37 2012 +0100 gdiplus/tests: Cleanup resources on error path in test_font_height_scaling (coverity). --- dlls/gdiplus/tests/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4ed13ea..5fc1626 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3790,7 +3790,7 @@ static void test_font_height_scaling(void) if (fabs(scale - 1.0) > 0.1) { win_skip("GdipGetRegionBounds is broken, scale %f (should be near 1.0)\n", scale); - return; + goto cleanup; } status = GdipScaleWorldTransform(graphics, 0.01, 0.01, MatrixOrderAppend); @@ -3893,6 +3893,7 @@ todo_wine GdipDeleteFont(font); } +cleanup: status = GdipDeleteGraphics(graphics); expect(Ok, status); DeleteDC(hdc);

1 0

Alexandre Julliard : ntdll: Avoid using Low/ HighPart of a large integer when not necessary.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: aacc450955ed5871e3ef68346fec2467c785799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacc450955ed5871e3ef68346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 11:43:05 2012 +0100 ntdll: Avoid using Low/HighPart of a large integer when not necessary. --- dlls/ntdll/cdrom.c | 8 +++----- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tape.c | 4 ++-- dlls/ntdll/time.c | 18 ++++++------------ 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 9137bb3..5ce3f7d 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -756,9 +756,8 @@ static NTSTATUS CDROM_GetDriveGeometry(int dev, int fd, DISK_GEOMETRY* dg) fsize = FRAME_OF_TOC(toc, toc.LastTrack+1) - FRAME_OF_TOC(toc, 1); /* Total size in frames */ - - dg->Cylinders.u.LowPart = fsize / (64 * 32); - dg->Cylinders.u.HighPart = 0; + + dg->Cylinders.QuadPart = fsize / (64 * 32); dg->MediaType = RemovableMedia; dg->TracksPerCylinder = 64; dg->SectorsPerTrack = 32; @@ -2511,8 +2510,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, struct dvd_manufact manufact; } s; - if (structure->BlockByteOffset.u.HighPart || structure->BlockByteOffset.u.LowPart) - FIXME(": BlockByteOffset is not handled\n"); + if (structure->BlockByteOffset.QuadPart) FIXME(": BlockByteOffset is not handled\n"); switch (structure->Format) { diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e54b42a..ca1e5cb 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2857,7 +2857,7 @@ NTSTATUS WINAPI NtCancelIoFileEx( HANDLE hFile, PIO_STATUS_BLOCK iosb, PIO_STATU * of the queued APC, but not yet run. This is needed to ensure proper * clean-up of allocated data. */ - timeout.u.LowPart = timeout.u.HighPart = 0; + timeout.QuadPart = 0; NtDelayExecution( TRUE, &timeout ); return io_status->u.Status; } @@ -2889,7 +2889,7 @@ NTSTATUS WINAPI NtCancelIoFile( HANDLE hFile, PIO_STATUS_BLOCK io_status ) * of the queued APC, but not yet run. This is needed to ensure proper * clean-up of allocated data. */ - timeout.u.LowPart = timeout.u.HighPart = 0; + timeout.QuadPart = 0; NtDelayExecution( TRUE, &timeout ); return io_status->u.Status; } diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 2667e18..df46015 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -223,8 +223,8 @@ static NTSTATUS TAPE_GetMediaParams( int fd, TAPE_GET_MEDIA_PARAMETERS *data ) if (status != STATUS_SUCCESS) return status; - data->Capacity.u.LowPart = 1024 * 1024 * 1024; - data->Remaining.u.LowPart = 1024 * 1024 * 1024; + data->Capacity.QuadPart = 1024 * 1024 * 1024; + data->Remaining.QuadPart = 1024 * 1024 * 1024; #ifdef HAVE_STRUCT_MTGET_MT_BLKSIZ data->BlockSize = get.mt_blksiz; #else diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index d233f23..a8b1376 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -331,10 +331,9 @@ NTSTATUS WINAPI RtlSystemTimeToLocalTime( const LARGE_INTEGER *SystemTime, */ BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *Time, LPDWORD Seconds ) { - ULONGLONG tmp = ((ULONGLONG)Time->u.HighPart << 32) | Time->u.LowPart; - tmp = tmp / TICKSPERSEC - SECS_1601_TO_1970; + ULONGLONG tmp = Time->QuadPart / TICKSPERSEC - SECS_1601_TO_1970; if (tmp > 0xffffffff) return FALSE; - *Seconds = (DWORD)tmp; + *Seconds = tmp; return TRUE; } @@ -353,10 +352,9 @@ BOOLEAN WINAPI RtlTimeToSecondsSince1970( const LARGE_INTEGER *Time, LPDWORD Sec */ BOOLEAN WINAPI RtlTimeToSecondsSince1980( const LARGE_INTEGER *Time, LPDWORD Seconds ) { - ULONGLONG tmp = ((ULONGLONG)Time->u.HighPart << 32) | Time->u.LowPart; - tmp = tmp / TICKSPERSEC - SECS_1601_TO_1980; + ULONGLONG tmp = Time->QuadPart / TICKSPERSEC - SECS_1601_TO_1980; if (tmp > 0xffffffff) return FALSE; - *Seconds = (DWORD)tmp; + *Seconds = tmp; return TRUE; } @@ -374,9 +372,7 @@ BOOLEAN WINAPI RtlTimeToSecondsSince1980( const LARGE_INTEGER *Time, LPDWORD Sec */ void WINAPI RtlSecondsSince1970ToTime( DWORD Seconds, LARGE_INTEGER *Time ) { - ULONGLONG secs = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - Time->u.LowPart = (DWORD)secs; - Time->u.HighPart = (DWORD)(secs >> 32); + Time->QuadPart = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; } /****************************************************************************** @@ -393,9 +389,7 @@ void WINAPI RtlSecondsSince1970ToTime( DWORD Seconds, LARGE_INTEGER *Time ) */ void WINAPI RtlSecondsSince1980ToTime( DWORD Seconds, LARGE_INTEGER *Time ) { - ULONGLONG secs = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1980; - Time->u.LowPart = (DWORD)secs; - Time->u.HighPart = (DWORD)(secs >> 32); + Time->QuadPart = Seconds * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1980; } /******************************************************************************

1 0

Jacek Caban : vbscript: Print more informative FIXME when parser fails.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 0e56e99698c21f0ead4ff6dc3c6f4fcd1f27d67e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e56e99698c21f0ead4ff6dc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 09:48:21 2012 +0100 vbscript: Print more informative FIXME when parser fails. --- dlls/vbscript/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 45f9169..b71b92d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -952,7 +952,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite if(FAILED(ctx->hres)) return ctx->hres; if(!ctx->parse_complete) { - FIXME("parser failed on parsing %s\n", debugstr_w(ctx->ptr)); + FIXME("parser failed around %s\n", debugstr_w(ctx->code+20 > ctx->ptr ? ctx->code : ctx->ptr-20)); return E_FAIL; }

1 0

Nikolay Sivov : dwrite: Support for Greek and Cyrillic ranges.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: bbc0137f8a125a51df2fdd8066c587194de9972d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc0137f8a125a51df2fdd806… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 30 11:53:19 2012 -0400 dwrite: Support for Greek and Cyrillic ranges. --- dlls/dwrite/analyzer.c | 30 +++++++++++++++++++++++------- dlls/dwrite/tests/analyzer.c | 29 +++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3e22f84..541914b 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -30,8 +30,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, Script_C1Controls = 12, + Script_Coptic = 13, + Script_Cyrillic = 16, + Script_Greek = 23, Script_Latin = 38, - Script_Latin_Symb = 77, + Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -46,15 +49,15 @@ static const struct script_range script_ranges[] = { /* ASCII punctuation and symbols: U+0020–U+002F */ /* ASCII digits: U+0030–U+0039 */ /* ASCII punctuation and symbols: U+003A–U+0040 */ - { Script_Latin_Symb, 0x00, 0x040 }, + { Script_Symbol, 0x00, 0x040 }, /* Latin uppercase: U+0041–U+005A */ { Script_Latin, 0x41, 0x5a }, /* ASCII punctuation and symbols: U+005B–U+0060 */ - { Script_Latin_Symb, 0x5b, 0x060 }, + { Script_Symbol, 0x5b, 0x060 }, /* Latin lowercase: U+0061–U+007A */ { Script_Latin, 0x61, 0x7a }, /* ASCII punctuation and symbols, control char DEL: U+007B–U+007F */ - { Script_Latin_Symb, 0x7b, 0x7f }, + { Script_Symbol, 0x7b, 0x7f }, /* C1 Controls: U+0080–U+009F */ { Script_C1Controls, 0x80, 0x9f }, /* Latin-1 Supplement: U+00A0–U+00FF */ @@ -63,9 +66,22 @@ static const struct script_range script_ranges[] = { /* IPA Extensions: U+0250–U+02AF */ /* Spacing Modifier Letters: U+02B0–U+02FF */ { Script_Latin, 0xa0, 0x2ff }, + /* Combining Diacritical Marks: U+0300–U+036F */ + { Script_Symbol, 0x300, 0x36f }, + /* Greek: U+0370–U+03E1 */ + { Script_Greek, 0x370, 0x3e1 }, + /* Coptic: U+03E2–U+03Ef */ + { Script_Coptic, 0x3e2, 0x3ef }, + /* Greek: U+03F0–U+03FF */ + { Script_Greek, 0x3f0, 0x3ff }, + /* Cyrillic: U+0400–U+04FF */ + /* Cyrillic Supplement: U+0500–U+052F */ + /* Cyrillic Supplement range is incomplete cause it's based on Unicode 5.2 + that doesn't define some Abkhaz and Azerbaijani letters, we support Unicode 6.0 range here */ + { Script_Cyrillic, 0x400, 0x52f }, /* Arabic: U+0600–U+06FF */ { Script_Arabic, 0x600, 0x6ef }, - /* unsuppoted range */ + /* unsupported range */ { Script_Unknown } }; @@ -102,8 +118,8 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis UINT16 script = get_char_script(text[i]); /* Script_Latin_Symb script type is ignored when preceded or followed by another script */ - if (sa.script == Script_Latin_Symb) sa.script = script; - if (script == Script_Latin_Symb) script = sa.script; + if (sa.script == Script_Symbol) sa.script = script; + if (script == Script_Symbol) script = sa.script; /* this is a length of a sequence to be reported next */ if (sa.script == script) length++; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index d68cbcd..c610357 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -399,8 +399,11 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, Script_C1Controls = 12, + Script_Coptic = 13, + Script_Cyrillic = 16, + Script_Greek = 23, Script_Latin = 38, - Script_Latin_Symb = 77 + Script_Symbol = 77 }; static struct sa_test sa_tests[] = { @@ -415,16 +418,16 @@ static struct sa_test sa_tests[] = { }, { {' ',' ',' ',' ','!','$','[','^','{','~',0}, 1, - { { 0, 10, { Script_Latin_Symb, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 10, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { {' ',' ',' ','1','2',' ',0}, 1, - { { 0, 6, { Script_Latin_Symb, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 6, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* digits only */ {'1','2',0}, 1, - { { 0, 2, { Script_Latin_Symb, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 2, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Arabic */ @@ -484,6 +487,24 @@ static struct sa_test sa_tests[] = { {0x2b0,0x2ba,0x2d7,0x2dd,0x2ef,0x2ff,0}, 1, { { 0, 6, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Combining Diacritical Marks */ + {0x300,0x320,0x340,0x345,0x350,0x36f,0}, 1, + { { 0, 6, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Greek and Coptic */ + {0x370,0x388,0x3d8,0x3e1,0x3e2,0x3fa,0x3ff,0}, 3, + { { 0, 4, { Script_Greek, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 4, 1, { Script_Coptic, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 5, 2, { Script_Greek, DWRITE_SCRIPT_SHAPES_DEFAULT } } + } + }, + { + /* Cyrillic and Cyrillic Supplement */ + {0x400,0x40f,0x410,0x44f,0x450,0x45f,0x460,0x481,0x48a,0x4f0,0x4fa,0x4ff,0x500,0x510,0x520,0}, 1, + { { 0, 15, { Script_Cyrillic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 05d641188451655512f5fd2d54bf99e39ff85245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d641188451655512f5fd2d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 29 21:13:46 2012 +0100 po: Update French translation. --- po/fr.po | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/po/fr.po b/po/fr.po index fb2aff7..d159431 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-07-23 07:34+0100\n" +"PO-Revision-Date: 2012-10-29 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3475,6 +3475,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"Après l'activation ou désactivation d'un périphérique, la liste des " +"joysticks connectés ne sera pas mise à jour à moins de redémarrer l'applet." #: joy.rc:47 msgid "Test Joystick" @@ -10195,6 +10197,8 @@ msgstr " (Oui|Non|Tous)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" +"Ne reconnaît pas « %1 » comme commande interne ou externe, ou fichier de " +"traitement par lots.\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool"

1 0

Henri Verbeet : d3d9/tests: Avoid LPDIRECT3DVERTEXBUFFER9.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 64ffe6476e8dccbefcca054388d6b47ad0872021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ffe6476e8dccbefcca05438… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 01:01:45 2012 +0100 d3d9/tests: Avoid LPDIRECT3DVERTEXBUFFER9. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 03678d0..8d49fa4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7014,14 +7014,14 @@ out: static void shademode_test(IDirect3DDevice9 *device) { /* Render a quad and try all of the different fixed function shading models. */ + struct IDirect3DVertexBuffer9 *vb_strip = NULL; + struct IDirect3DVertexBuffer9 *vb_list = NULL; HRESULT hr; DWORD color0, color1; DWORD color0_gouraud = 0, color1_gouraud = 0; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; LPVOID data = NULL; - LPDIRECT3DVERTEXBUFFER9 vb_strip = NULL; - LPDIRECT3DVERTEXBUFFER9 vb_list = NULL; UINT i, j; struct vertex quad_strip[] = {

1 0