October 2012 - Wine-commits

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

30 Oct '12

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

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

30 Oct '12

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

Jacek Caban : d3dx9mesh.h: Fixed D3DXConvertMeshSubsetToStrips declaration.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: wine Branch: master Commit: 12caf31af2986d4e2923760b889efe2f2a25d593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12caf31af2986d4e2923760b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 09:56:00 2012 +0100 d3dx9mesh.h: Fixed D3DXConvertMeshSubsetToStrips declaration. --- include/d3dx9mesh.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index ff45762..149c199 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -770,7 +770,7 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, HRESULT WINAPI D3DXComputeTangent(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, CONST DWORD *); HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count); -HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh mesh_in, DWORD attribute_id, +HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count, struct ID3DXBuffer **strip_lengths, DWORD *strip_count); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]);

1 0

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

30 Oct '12

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

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

30 Oct '12

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

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

30 Oct '12

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

Alexandre Julliard : testbot/scripts: Use exit instead of return to set the script exit status.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: tools Branch: master Commit: 85cffa35d83404131335a6805cf887f584136eb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=85cffa35d83404131335a680… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 29 19:01:56 2012 +0100 testbot/scripts: Use exit instead of return to set the script exit status. --- testbot/scripts/initd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 262fa54..8853f6c 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -108,16 +108,16 @@ then if $PING -q then log_success_msg "The WineTestBot server is running" - return 0 + exit 0 fi log_failure_msg "The WineTestBot server is running but not responding" - return 1 + exit 1 elif [ "$status" = 4 ]; then log_failure_msg "could not access PID file for the WineTestBot server" - return $status + exit $status else log_failure_msg "The WineTestBot server is not running" - return $status + exit $status fi ;;

1 0

Francois Gouget : testbot: Autodetect where the WineTestBot is running from .
by Alexandre Julliard 30 Oct '12

30 Oct '12

Module: tools Branch: master Commit: ec745f28cd7491880662fc6fe0119d2d7ed4d11e URL: http://source.winehq.org/git/tools.git/?a=commit;h=ec745f28cd7491880662fc6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 20:10:36 2012 +0100 testbot: Autodetect where the WineTestBot is running from. This avoids having to hardcode paths in the configuration file. --- testbot/bin/CheckForWinetestUpdate.pl | 9 +++++---- testbot/bin/Engine.pl | 9 +++++---- testbot/bin/Janitor.pl | 9 +++++---- testbot/bin/PingEngine.pl | 9 +++++---- testbot/bin/RevertVM.pl | 9 +++++---- testbot/bin/WinePatchesMLSubmit.pl | 9 +++++---- testbot/bin/WinePatchesWebGet.pl | 9 +++++---- testbot/bin/WinePatchesWebNotify.pl | 9 +++++---- testbot/bin/WineRunBuild.pl | 9 +++++---- testbot/bin/WineRunReconfig.pl | 9 +++++---- testbot/bin/WineRunTask.pl | 9 +++++---- testbot/bin/WineSendLog.pl | 9 +++++---- testbot/bin/build/Build.pl | 11 ++++++----- testbot/bin/build/Reconfig.pl | 13 +++++++------ testbot/doc/vhost_winetestbot.conf | 6 +++++- testbot/lib/WineTestBot/Config.pm | 10 +++++----- testbot/scripts/CheckWineTestBot.pl | 9 +++++---- testbot/scripts/TestAgent | 17 +++++++++-------- 18 files changed, 97 insertions(+), 77 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index de8befb..5ca5aa9 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -22,13 +22,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use Fcntl; use File::Compare; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7834619..b3cfbee 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use Errno qw(EAGAIN); use Fcntl; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6ae3c8f..6c398d7 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/bin/PingEngine.pl b/testbot/bin/PingEngine.pl index 4faddf6..ef43807 100755 --- a/testbot/bin/PingEngine.pl +++ b/testbot/bin/PingEngine.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index ee46218..7104a28 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -23,13 +23,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Log; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 9ab8b3c..7ee4ecf 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -22,13 +22,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use File::Copy; use WineTestBot::Config; diff --git a/testbot/bin/WinePatchesWebGet.pl b/testbot/bin/WinePatchesWebGet.pl index d6b3f2b..ed84a50 100755 --- a/testbot/bin/WinePatchesWebGet.pl +++ b/testbot/bin/WinePatchesWebGet.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use LWP::UserAgent; use HTTP::Request; diff --git a/testbot/bin/WinePatchesWebNotify.pl b/testbot/bin/WinePatchesWebNotify.pl index 185a0f1..6940d76 100755 --- a/testbot/bin/WinePatchesWebNotify.pl +++ b/testbot/bin/WinePatchesWebNotify.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use File::Copy; use WineTestBot::Config; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 86f03c7..cc0746f 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 89fe3da..9cc1e5e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index bfbffe8..9ec499f 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use POSIX qw(:fcntl_h); use WineTestBot::Config; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 95814fe..768e129 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use Algorithm::Diff; use WineTestBot::Config; diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index a37537e..7a20c1a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -22,14 +22,15 @@ use strict; -my $Dir; sub BEGIN { - $main::BuildEnv = 1; - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } + $::BuildEnv = 1; } -use lib "$Dir/../../lib"; use WineTestBot::Config; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index daa03b1..89296bc 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -22,14 +22,15 @@ use strict; -my $Dir; sub BEGIN { - $main::BuildEnv = 1; - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; -} -use lib "$Dir/../../lib"; + if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } + $::BuildEnv = 1; + } use WineTestBot::Config; diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 9c53876..735292e 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -7,7 +7,11 @@ PerlSwitches -Tw <Perl> use strict; - use lib qw(/home/winehq/tools/testbot/lib); + BEGIN + { + $::RootDir = "/home/winehq/tools/testbot"; + unshift @INC, "$::RootDir/lib"; + } use ObjectModel::CGI::Page; use WineTestBot::CGI::PageBase; SetPageBaseCreator(\&CreatePageBase); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 98fcbb0..aa9f3e2 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -48,9 +48,9 @@ require Exporter; $JobPurgeDays $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); -$LogDir = "/home/winehq/tools/testbot/var"; -$DataDir = "/home/winehq/tools/testbot/var"; -$BinDir = "/home/winehq/tools/testbot/bin"; +$LogDir = "$::RootDir/var"; +$DataDir = "$::RootDir/var"; +$BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; $MaxRunningVMs = 2; @@ -77,9 +77,9 @@ $LDAPEMailAttribute = undef; $JobPurgeDays = 7; $JobArchiveDays = 0; -if (!$main::BuildEnv) +if (!$::BuildEnv) { - $main::BuildEnv = 0; + $::BuildEnv = 0; eval 'require "WineTestBot/ConfigLocal.pl";'; if ($@) { diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index f6f0666..b749eff 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Engine::Notify; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 2e9850d..a16bd5f 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -18,19 +18,20 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -use strict; - -my $name0=$0; -$name0 =~ s+^.*/++; +use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; + +my $name0=$0; +$name0 =~ s+^.*/++; use WineTestBot::Config; use WineTestBot::TestAgent;

1 0

Hans Leidekker : msi: Add a length parameter to msi_set_property and use it where appropriate.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 0f1d3474a820875268c99c4985cc702d9124abe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1d3474a820875268c99c498… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:15:21 2012 +0100 msi: Add a length parameter to msi_set_property and use it where appropriate. --- dlls/msi/action.c | 32 ++++---- dlls/msi/appsearch.c | 4 +- dlls/msi/custom.c | 20 ++--- dlls/msi/dialog.c | 4 +- dlls/msi/events.c | 10 +- dlls/msi/install.c | 7 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 208 +++++++++++++++++++++++++------------------------- dlls/msi/patch.c | 2 +- dlls/msi/upgrade.c | 2 +- 10 files changed, 144 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f1d3474a820875268c99…

1 0

Hans Leidekker : msi: Return length instead of size from deformat_string.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 929d234072e53755ea54ead840b223dbefd75bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=929d234072e53755ea54ead84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:15:47 2012 +0100 msi: Return length instead of size from deformat_string. --- dlls/msi/action.c | 4 ++-- dlls/msi/format.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0017de7..ffcc003 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2549,7 +2549,7 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, DWORD if (!strncmpW(value, szMulti, 3)) ptr = value + 3; - *size = deformat_string(package, ptr,(LPWSTR*)&data); + *size = deformat_string( package, ptr, (LPWSTR *)&data ) * sizeof(WCHAR); /* add double NULL terminator */ if (*type == REG_MULTI_SZ) @@ -4943,7 +4943,7 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) { msi_reg_set_val_dword( hkey, szSystemComponent, 1 ); } - size = deformat_string(package, modpath_fmt, &buffer); + size = deformat_string(package, modpath_fmt, &buffer) * sizeof(WCHAR); RegSetValueExW(hkey, szModifyPath, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size); RegSetValueExW(hkey, szUninstallString, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size); msi_free(buffer); diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 8188f13..08522a0 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -1026,19 +1026,19 @@ DWORD deformat_string( MSIPACKAGE *package, const WCHAR *ptr, WCHAR **data ) { if (ptr) { - DWORD size = 0; + DWORD len = 0; MSIRECORD *rec = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( rec, 0, ptr ); - MSI_FormatRecordW( package, rec, NULL, &size ); + MSI_FormatRecordW( package, rec, NULL, &len ); - size++; - *data = msi_alloc( size * sizeof(WCHAR) ); - if (size > 1) MSI_FormatRecordW( package, rec, *data, &size ); + len++; + *data = msi_alloc( len * sizeof(WCHAR) ); + if (len > 1) MSI_FormatRecordW( package, rec, *data, &len ); else *data[0] = 0; msiobj_release( &rec->hdr ); - return size * sizeof(WCHAR); + return len; } *data = NULL; return 0;

1 0