July 2018 - Wine-Commits - list.winehq.org

Michał Janiszewski : ntdll: Prevent Find{Set, Clear}Run from reading past the end of bitmap.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 3d5d8903b89803f5b2ec12a2d20ae9a171047fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5d8903b89803f5b2ec12a2… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Sun Jul 8 21:57:43 2018 +0200 ntdll: Prevent Find{Set, Clear}Run from reading past the end of bitmap. This can be happen in sample arrays (hex): FindSetRun: 00 00 00 00 00 00 00 ff FindClearRun: ff ff ff ff ff ff ff 00 Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtlbitmap.c | 12 ++++++++++++ dlls/ntdll/tests/rtlbitmap.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c index 20108f5..d0a4e5c 100644 --- a/dlls/ntdll/rtlbitmap.c +++ b/dlls/ntdll/rtlbitmap.c @@ -731,6 +731,12 @@ static ULONG NTDLL_FindSetRun(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpSize) return ~0U; } + /* Check if reached the end of bitmap */ + if (ulStart >= lpBits->SizeOfBitMap) { + *lpSize = ulCount - (ulStart - lpBits->SizeOfBitMap); + return ulFoundAt; + } + /* Count blocks of 8 set bits */ while (*lpOut == 0xff) { @@ -822,6 +828,12 @@ static ULONG NTDLL_FindClearRun(PCRTL_BITMAP lpBits, ULONG ulStart, PULONG lpSiz return ~0U; } + /* Check if reached the end of bitmap */ + if (ulStart >= lpBits->SizeOfBitMap) { + *lpSize = ulCount - (ulStart - lpBits->SizeOfBitMap); + return ulFoundAt; + } + /* Count blocks of 8 clear bits */ while (!*lpOut) { diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index 10ee5f6..3c3992e 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -635,7 +635,6 @@ static void test_RtlFindNextForwardRunSet(void) pRtlInitializeBitMap(&bm, mask, 62); ulCount = pRtlFindNextForwardRunSet(&bm, ulStart, &lpPos); - todo_wine ok(ulCount == 6, "Invalid length of found set run: %d, expected 6\n", ulCount); ok(lpPos == 56, "Invalid position of found set run: %d, expected 56\n", lpPos); } @@ -650,7 +649,6 @@ static void test_RtlFindNextForwardRunClear(void) pRtlInitializeBitMap(&bm, mask, 62); ulCount = pRtlFindNextForwardRunClear(&bm, ulStart, &lpPos); - todo_wine ok(ulCount == 6, "Invalid length of found clear run: %d, expected 6\n", ulCount); ok(lpPos == 56, "Invalid position of found clear run: %d, expected 56\n", lpPos); }

1 0

Michał Janiszewski : ntdll/tests: Add RtlFindNextForwardRun{Set, Clear} tests.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 961061419a9058f50d3b00511dcaf4d7b3df1e3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=961061419a9058f50d3b0051… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Sun Jul 8 21:57:42 2018 +0200 ntdll/tests: Add RtlFindNextForwardRun{Set, Clear} tests. The tests in particular should trigger an edge case in implementation. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlbitmap.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c index 9552318..10ee5f6 100644 --- a/dlls/ntdll/tests/rtlbitmap.c +++ b/dlls/ntdll/tests/rtlbitmap.c @@ -40,6 +40,8 @@ static CCHAR (WINAPI *pRtlFindMostSignificantBit)(ULONGLONG); static CCHAR (WINAPI *pRtlFindLeastSignificantBit)(ULONGLONG); static ULONG (WINAPI *pRtlFindSetRuns)(PRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); static ULONG (WINAPI *pRtlFindClearRuns)(PRTL_BITMAP,PRTL_BITMAP_RUN,ULONG,BOOLEAN); +static ULONG (WINAPI *pRtlFindNextForwardRunSet)(PRTL_BITMAP,ULONG,PULONG); +static ULONG (WINAPI *pRtlFindNextForwardRunClear)(PRTL_BITMAP,ULONG,PULONG); static ULONG (WINAPI *pRtlNumberOfSetBits)(PRTL_BITMAP); static ULONG (WINAPI *pRtlNumberOfClearBits)(PRTL_BITMAP); static ULONG (WINAPI *pRtlFindLongestRunSet)(PRTL_BITMAP,PULONG); @@ -69,6 +71,8 @@ static void InitFunctionPtrs(void) pRtlFindLeastSignificantBit = (void *)GetProcAddress(hntdll, "RtlFindLeastSignificantBit"); pRtlFindSetRuns = (void *)GetProcAddress(hntdll, "RtlFindSetRuns"); pRtlFindClearRuns = (void *)GetProcAddress(hntdll, "RtlFindClearRuns"); + pRtlFindNextForwardRunSet = (void *)GetProcAddress(hntdll, "RtlFindNextForwardRunSet"); + pRtlFindNextForwardRunClear = (void *)GetProcAddress(hntdll, "RtlFindNextForwardRunClear"); pRtlFindLongestRunSet = (void *)GetProcAddress(hntdll, "RtlFindLongestRunSet"); pRtlFindLongestRunClear = (void *)GetProcAddress(hntdll, "RtlFindLongestRunClear"); } @@ -620,6 +624,37 @@ static void test_RtlFindClearRuns(void) } } + +static void test_RtlFindNextForwardRunSet(void) +{ + BYTE mask[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff }; + ULONG ulStart = 0; + ULONG ulCount, lpPos; + if (!pRtlFindNextForwardRunSet) + return; + + pRtlInitializeBitMap(&bm, mask, 62); + ulCount = pRtlFindNextForwardRunSet(&bm, ulStart, &lpPos); + todo_wine + ok(ulCount == 6, "Invalid length of found set run: %d, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found set run: %d, expected 56\n", lpPos); +} + +static void test_RtlFindNextForwardRunClear(void) +{ + BYTE mask[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }; + ULONG ulStart = 0; + ULONG ulCount, lpPos; + if (!pRtlFindNextForwardRunClear) + return; + + pRtlInitializeBitMap(&bm, mask, 62); + ulCount = pRtlFindNextForwardRunClear(&bm, ulStart, &lpPos); + todo_wine + ok(ulCount == 6, "Invalid length of found clear run: %d, expected 6\n", ulCount); + ok(lpPos == 56, "Invalid position of found clear run: %d, expected 56\n", lpPos); +} + #endif START_TEST(rtlbitmap) @@ -645,6 +680,8 @@ START_TEST(rtlbitmap) test_RtlFindLeastSignificantBit(); test_RtlFindSetRuns(); test_RtlFindClearRuns(); + test_RtlFindNextForwardRunSet(); + test_RtlFindNextForwardRunClear(); } #endif }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 9be5eadee4b60d28b732d342ad94c4a47eaea0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be5eadee4b60d28b732d342… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 10 14:57:05 2018 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/de.po b/po/de.po index 2b4f422..5a05d59 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-05 11:58+0200\n" +"PO-Revision-Date: 2018-07-10 14:47+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -15768,41 +15768,6 @@ msgid "D" msgstr "V" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15866,6 +15831,7 @@ msgstr "" "[/A] Nur Dateien mit Archivbit kopieren.\n" "[/M] Nur Dateien mit Archivbit kopieren, danach\n" "\tdas Archivbit löschen.\n" +"[/K] Dateiattribute kopieren; Attribute bleiben sonst nicht erhalten.\n" "[/D | /D:M-T-J] Kopiere neue Dateien oder Dateien, die neuer als das\n" "\t\tangegebene Datum sind. Wird kein Datum angegeben, werden nur\n" "\t\tQuelldateien kopiert, die neuer sind als die Zieldatei.\n"

1 0

Dmitry Timoshkov : winedump: Add support for SLTG typelibs.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 4d55a3f33cfb0bb38b9733275917092cad896c3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d55a3f33cfb0bb38b973327… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:59 2018 +0800 winedump: Add support for SLTG typelibs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/dump.c | 2 +- tools/winedump/tlb.c | 1145 ++++++++++++++++++++++++++++++++++++++++++++- tools/winedump/winedump.h | 6 +- 3 files changed, 1136 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d55a3f33cfb0bb38b97…

1 0

Dmitry Timoshkov : winedump: Use common binary dumper for typelib.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 3d26b00fce20b80b423f7c15e1975eb50166fc5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d26b00fce20b80b423f7c15… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:54 2018 +0800 winedump: Use common binary dumper for typelib. This is an adapted code from dump.c. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 52 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index d288359..5d009fc 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -283,25 +283,47 @@ static void print_ctl2(const char *name) printf("\n"); } -static void dump_binary(int n) +static int tlb_isprint(unsigned char c) { - int i; + return c >= 32; +} - for(i = 1; i <= n; i++) { - switch(i & 0x0f) { - case 0: - printf("%02x\n", tlb_read_byte()); - break; - case 1: - print_offset(); - /* fall through */ - default: - printf("%02x ", tlb_read_byte()); +static void dump_binary(int size) +{ + const unsigned char *ptr; + int i, j; + + if (!size) return; + + ptr = tlb_read(size); + if (!ptr) return; + + print_offset(); + printf("%08x: ", offset - size); + + for (i = 0; i < size; i++) + { + printf("%02x%c", ptr[i], (i % 16 == 7) ? '-' : ' '); + if ((i % 16) == 15) + { + printf( " " ); + for (j = 0; j < 16; j++) + printf("%c", tlb_isprint(ptr[i-15+j]) ? ptr[i-15+j] : '.'); + if (i < size-1) + { + printf("\n"); + print_offset(); + printf("%08x: ", offset - size + i + 1); + } } } - - if(n&0x0f) - printf("\n"); + if (i % 16) + { + printf("%*s ", 3 * (16-(i%16)), ""); + for (j = 0; j < i % 16; j++) + printf("%c", tlb_isprint(ptr[i-(i%16)+j]) ? ptr[i-(i%16)+j] : '.'); + } + printf("\n"); } static int dump_msft_varflags(void)

1 0

Dmitry Timoshkov : winedump: Add print_string() helper.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 9723142c2ad0f5b68156461a8df8015422dd6c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9723142c2ad0f5b68156461a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:49 2018 +0800 winedump: Add print_string() helper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 330fee8..d288359 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -517,11 +517,17 @@ static BOOL dump_msft_namehashtab(seg_t *seg) return TRUE; } -static void dump_string(int len, int align_off) +static void print_string(int len) { printf("\""); fwrite(tlb_read(len), len, 1, stdout); - printf("\" "); + printf("\""); +} + +static void dump_string(int len, int align_off) +{ + print_string(len); + printf(" "); while((len++ + align_off) & 3) printf("\\%2.2x", tlb_read_byte()); }

1 0

Dmitry Timoshkov : winedump: Correctly declare the array of segments.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 3e6b1296c1b599c8a0b494eba1d7c94675b78c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b1296c1b599c8a0b494eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:13 2018 +0800 winedump: Correctly declare the array of segments. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index df1ea4b..5c71036 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -109,7 +109,7 @@ typedef struct seg_t { int offset; int length; } seg_t; -static seg_t segdir[]; +static seg_t segdir[15]; enum SEGDIRTYPE { SEGDIR_TYPEINFO,

1 0

Mark Jansen : ntdll/tests: Tests for RtlIpv6StringToAddressEx.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 1b1e3476b8d6a547cc5b57de4211f83710b978c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b1e3476b8d6a547cc5b57de… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Tue Jul 10 05:12:52 2018 +0000 ntdll/tests: Tests for RtlIpv6StringToAddressEx. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1e3476b8d6a547cc5b…

1 0

Akihiro Sagawa : winmm: Preserve fractions in microseconds to compensate rounding errors.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 381012f75d6363dcdab570cca6c142290fe5ebf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=381012f75d6363dcdab570cc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 26 22:10:47 2018 +0900 winmm: Preserve fractions in microseconds to compensate rounding errors. Otherwise, a song is played faster than expected in some cases. For instance, we assume that 40 pan control change (CC#10) messages are expressed in 12.5ms each, * Prior art omits fractions, i.e. 12ms + 12ms + ... = 480ms. * Proposal technique saves fractions, i.e. 12ms + 13ms + ... = 500ms. Ideal duration is 500ms. So, the proposed method is better than prior one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4bba1a7..0328721 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -921,6 +921,7 @@ typedef struct WINE_MIDIStream { DWORD dwElapsedMS; WORD wFlags; WORD status; + WORD remainder; HANDLE hEvent; LPMIDIHDR lpMidiHdr; } WINE_MIDIStream; @@ -965,13 +966,13 @@ static DWORD MMSYSTEM_MidiStream_Convert(WINE_MIDIStream* lpMidiStrm, DWORD puls } else if (lpMidiStrm->dwTimeDiv > 0x8000) { /* SMPTE, unchecked FIXME? */ int nf = 256 - HIBYTE(lpMidiStrm->dwTimeDiv); /* number of frames */ int nsf = LOBYTE(lpMidiStrm->dwTimeDiv); /* number of sub-frames */ - ret = (pulse * 1000) / (nf * nsf); + ret = (pulse * 1000000) / (nf * nsf); } else { - ret = (DWORD)((double)pulse * ((double)lpMidiStrm->dwTempo / 1000) / + ret = (DWORD)((double)pulse * (double)lpMidiStrm->dwTempo / (double)lpMidiStrm->dwTimeDiv); } - return ret; + return ret; /* in microseconds */ } static DWORD midistream_get_playing_position(WINE_MIDIStream* lpMidiStrm) @@ -1007,6 +1008,8 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->status = MSM_STATUS_STOPPED; lpMidiStrm->dwPulses = 0; lpMidiStrm->dwElapsedMS = 0; + lpMidiStrm->dwPositionMS = 0; + lpMidiStrm->remainder = 0; LeaveCriticalSection(&lpMidiStrm->lock); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); @@ -1178,8 +1181,11 @@ start_header: /* do we have to wait ? */ if (me->dwDeltaTime) { + DWORD delta; EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwPositionMS += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); + delta = lpMidiStrm->remainder + MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); + lpMidiStrm->dwPositionMS += delta / 1000; + lpMidiStrm->remainder = delta % 1000; lpMidiStrm->dwPulses += me->dwDeltaTime; LeaveCriticalSection(&lpMidiStrm->lock); @@ -1331,6 +1337,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->dwPositionMS = 0; + lpMidiStrm->remainder = 0; lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0;

1 0

Michael Stefaniuc : winmm: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 8ce75cc5d497ca445c67a461dc0fa931ebeb81b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce75cc5d497ca445c67a461… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Jul 7 23:39:09 2018 +0200 winmm: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/lolvldrv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 3f63e5f..35bd6a0 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -68,7 +68,6 @@ static BOOL drivers_loaded; static int MMDrvsHi; static WINE_MM_DRIVER MMDrvs[8]; static LPWINE_MLD MM_MLDrvs[40]; -#define MAX_MM_MLDRVS (sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) static void MMDRV_Init(void); @@ -146,9 +145,9 @@ LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, if (!mld) return NULL; /* find an empty slot in MM_MLDrvs table */ - for (i = 0; i < MAX_MM_MLDRVS; i++) if (!MM_MLDrvs[i]) break; + for (i = 0; i < ARRAY_SIZE(MM_MLDrvs); i++) if (!MM_MLDrvs[i]) break; - if (i == MAX_MM_MLDRVS) { + if (i == ARRAY_SIZE(MM_MLDrvs)) { /* the MM_MLDrvs table could be made growable in the future if needed */ ERR("Too many open drivers\n"); HeapFree(GetProcessHeap(), 0, mld);

1 0

Alex Henrie : ole32: Return IUnknown from GITCF_CreateInstance if requested.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 6187e8db0ba73b580c50c9068184d737ed6a1634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6187e8db0ba73b580c50c906… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 10 11:45:46 2018 +0200 ole32: Return IUnknown from GITCF_CreateInstance if requested. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/git.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460..8683f35 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -122,9 +122,14 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, /* Do we implement that interface? */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IGlobalInterfaceTable, riid)) + { *ppvObject = iface; + } else + { + FIXME("(%s), not supported.\n", debugstr_guid(riid)); return E_NOINTERFACE; + } /* Now inc the refcount */ IGlobalInterfaceTable_AddRef(iface); @@ -314,13 +319,10 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - IGlobalInterfaceTable *git = get_std_git(); - return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - } - - FIXME("(%s), not supported.\n",debugstr_guid(riid)); - return E_NOINTERFACE; + IGlobalInterfaceTable *git = get_std_git(); + HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, ppv); + IGlobalInterfaceTable_Release(git); + return hr; } static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock)

1 0

Dmitry Timoshkov : winedump: Fix version printing.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 597b1804c1b2d8ec2d123a226776aa93309d2224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=597b1804c1b2d8ec2d123a22… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:44 2018 +0800 winedump: Fix version printing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index bc19087..330fee8 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -321,10 +321,10 @@ static int dump_msft_varflags(void) static void dump_msft_version(void) { - int version; + unsigned version; print_offset(); version = tlb_read_int(); - printf("version = %d.%d\n", version & 0xff, version >> 16); + printf("version = %u.%u\n", version & 0xffff, version >> 16); } static void dump_msft_header(void)

1 0

Dmitry Timoshkov : winedump: Consistently print hex numbers with leading zeros and 'h' suffix.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: ed6e1dfc72a7fea14a322668ba7355ae6a9475a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6e1dfc72a7fea14a322668… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:40 2018 +0800 winedump: Consistently print hex numbers with leading zeros and 'h' suffix. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 0d8f059..bc19087 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -204,7 +204,7 @@ static int print_hex(const char *name) { int ret; print_offset(); - printf("%s = %08x\n", name, ret=tlb_read_int()); + printf("%s = %08xh\n", name, ret=tlb_read_int()); return ret; } @@ -219,7 +219,7 @@ static int print_short_hex(const char *name) { int ret; print_offset(); - printf("%s = %xh\n", name, ret=tlb_read_short()); + printf("%s = %04xh\n", name, ret=tlb_read_short()); return ret; }

1 0

Dmitry Timoshkov : winedump: Stop prepending every line of information with an offset.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: a6d08adcdbf50b7c13692fb466840b51982f5c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d08adcdbf50b7c13692fb4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:30 2018 +0800 winedump: Stop prepending every line of information with an offset. This makes typelib output consistent with other dumpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index e307615..0d8f059 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -173,9 +173,6 @@ static int tlb_read_byte(void) static void print_offset(void) { int i; - - printf("%04x: ", offset); - for(i=0; i<indent; i++) printf(" "); }

1 0

Dmitry Timoshkov : winedump: Avoid sign extension in tlb_read_short().
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 193d0921c9889ba909e3c8dc3ea760ac93f0f339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=193d0921c9889ba909e3c8dc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:22 2018 +0800 winedump: Avoid sign extension in tlb_read_short(). tlb_read_byte() already behaves this way. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 5c71036..e307615 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -160,7 +160,7 @@ static int tlb_read_int(void) static int tlb_read_short(void) { - const short *ret = tlb_read(sizeof(short)); + const unsigned short *ret = tlb_read(sizeof(short)); return ret ? *ret : -1; }

1 0

Michael Stefaniuc : comctl32: Remove redundant NULL checks before Free().
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: cf37c6c422222779f4423272edbbd49e25b444c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf37c6c422222779f4423272… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 10 12:36:09 2018 +0200 comctl32: Remove redundant NULL checks before Free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ee3b273..4631899 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -429,7 +429,7 @@ static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const W if (syslink) style |= WS_TABSTOP; textW = taskdialog_gettext(dialog_info, TRUE, text); hwnd = CreateWindowW(class, textW, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); - if (textW) Free(textW); + Free(textW); SendMessageW(hwnd, WM_SETFONT, (WPARAM)font, 0); return hwnd; @@ -825,9 +825,9 @@ static void taskdialog_destroy(struct taskdialog_info *dialog_info) if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); - if (dialog_info->buttons) Free(dialog_info->buttons); - if (dialog_info->radio_buttons) Free(dialog_info->radio_buttons); - if (dialog_info->command_links) Free(dialog_info->command_links); + Free(dialog_info->buttons); + Free(dialog_info->radio_buttons); + Free(dialog_info->command_links); } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

Michael Stefaniuc : jscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: ef64f2763200830a62e8334bf4c1948fd384336d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef64f2763200830a62e8334b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:12 2018 +0200 jscript: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 8 ++++---- dlls/jscript/bool.c | 2 +- dlls/jscript/date.c | 26 +++++++++++++------------- dlls/jscript/decode.c | 10 +++++----- dlls/jscript/dispex.c | 2 +- dlls/jscript/error.c | 6 +++--- dlls/jscript/function.c | 14 +++++++------- dlls/jscript/global.c | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/jsregexp.c | 10 +++++----- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 2 +- dlls/jscript/math.c | 4 ++-- dlls/jscript/number.c | 2 +- dlls/jscript/object.c | 4 ++-- dlls/jscript/string.c | 8 ++++---- dlls/jscript/vbarray.c | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef64f2763200830a62e8…

1 0

Michael Stefaniuc : riched20: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: f002aec139f1cc8b36232806d7de195156fe53aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f002aec139f1cc8b36232806… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 10 08:31:50 2018 +0100 riched20: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/reader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 0310109..339ca04 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2175,14 +2175,13 @@ static RTFKey rtfKey[] = { 0, -1, NULL, 0 } }; -#define RTF_KEY_COUNT (sizeof(rtfKey) / sizeof(RTFKey)) typedef struct tagRTFHashTableEntry { int count; RTFKey **value; } RTFHashTableEntry; -static RTFHashTableEntry rtfHashTable[RTF_KEY_COUNT * 2]; +static RTFHashTableEntry rtfHashTable[ARRAY_SIZE(rtfKey) * 2]; /* @@ -2199,7 +2198,7 @@ void LookupInit(void) int index; rp->rtfKHash = Hash (rp->rtfKStr); - index = rp->rtfKHash % (RTF_KEY_COUNT * 2); + index = rp->rtfKHash % (ARRAY_SIZE(rtfKey) * 2); if (!rtfHashTable[index].count) rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *)); else @@ -2212,7 +2211,7 @@ void LookupCleanup(void) { unsigned int i; - for (i=0; i<RTF_KEY_COUNT*2; i++) + for (i = 0; i < ARRAY_SIZE(rtfKey) * 2; i++) { heap_free( rtfHashTable[i].value ); rtfHashTable[i].value = NULL; @@ -2235,7 +2234,7 @@ static void Lookup(RTF_Info *info, char *s) ++s; /* skip over the leading \ character */ hash = Hash (s); - entry = &rtfHashTable[hash % (RTF_KEY_COUNT * 2)]; + entry = &rtfHashTable[hash % (ARRAY_SIZE(rtfKey) * 2)]; for (i = 0; i < entry->count; i++) { rp = entry->value[i];

1 0

Akihiro Sagawa : winmm: Don' t allow to set time division property while playing.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 2cb326260b68634fec7a3a402808710fea159d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cb326260b68634fec7a3a40… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 26 22:10:45 2018 +0900 winmm: Don't allow to set time division property while playing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 6 ++++++ dlls/winmm/winmm.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 3b8bd22..c46286b 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -885,6 +885,12 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); expected = ret; + /* shouldn't set time division property while playing */ + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + midiprop.tdiv.dwTimeDiv = 24; + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TIMEDIV); + ok(rc == MMSYSERR_INVALPARAM, "midiStreamProperty(SET|TIMEDIV, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + ret = WaitForSingleObject(records.done, INFINITE); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, got %d\n", ret); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index ef7dcdf..4bba1a7 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1539,9 +1539,13 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; + if (lpMidiStrm->status != MSM_STATUS_PLAYING) { + lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; + TRACE("Setting time div to %d\n", mptd->dwTimeDiv); + } + else + ret = MMSYSERR_INVALPARAM; LeaveCriticalSection(&lpMidiStrm->lock); - TRACE("Setting time div to %d\n", mptd->dwTimeDiv); } else if (dwProperty & MIDIPROP_GET) { mptd->dwTimeDiv = lpMidiStrm->dwTimeDiv; TRACE("Getting time div <= %d\n", mptd->dwTimeDiv);

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman July 10, 2018

July 10, 2018

Module: website Branch: master Commit: 48fb772078f075c0fbadae7612cddcf47e752822 URL: https://source.winehq.org/git/website.git/?a=commit;h=48fb772078f075c0fbada… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 13:38:39 2018 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Julian Rüger : German translation for release 3.0.2
by Jeremy Newman July 10, 2018

July 10, 2018

Module: website Branch: master Commit: 1a9bef00ace69e878adc170c2a62de607f25872a URL: https://source.winehq.org/git/website.git/?a=commit;h=1a9bef00ace69e878adc1… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 10 14:46:36 2018 +0200 German translation for release 3.0.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018062601.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/de/2018062601.xml b/news/de/2018062601.xml new file mode 100644 index 0000000..9a0d812 --- /dev/null +++ b/news/de/2018062601.xml @@ -0,0 +1,12 @@ +<news> +<date>26. Juni 2018</date> +<title>Wine 3.0.2 freigegeben</title> +<body> + Die Wartungsversion 3.0.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.0.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.0/wine-3.0.2.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 3.12
by Jeremy Newman July 10, 2018

July 10, 2018

Module: website Branch: master Commit: c775bd64d93fedc6a1770cc6f15f359c98fb5961 URL: https://source.winehq.org/git/website.git/?a=commit;h=c775bd64d93fedc6a1770… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 10 14:46:47 2018 +0200 German translation for release 3.12 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018070901.xml b/news/de/2018070901.xml new file mode 100644 index 0000000..241a643 --- /dev/null +++ b/news/de/2018070901.xml @@ -0,0 +1,16 @@ +<news> +<date>9. Juli 2018</date> +<title>Wine 3.12 freigegeben</title> +<body> + Die Entwicklungsversion 3.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unicode-Daten auf Unicode 11.0.0 aktualisiert.</li> + <li>Proxykonfigurations-Dialog in der Systemsteuerung unter Internet.</li> + <li>Syntaxkorrekturen im Befehlsinterpreter cmd.exe.</li> + <li>Zusätzliche Glyphen in der Schriftart Wingdings.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot/web: Also highlight the 'unknown target' make errors.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: 4b50aec2f0d3d3a5f4f3f612575c02cdf35fc2c3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4b50aec2f0d3d3a5f4f3f61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:36:08 2018 +0200 testbot/web: Also highlight the 'unknown target' make errors. In case a makefile patch gets things wrong (or there is a TestBot bug). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 98fe9cf..0ef9609 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -423,6 +423,7 @@ sub GetLogLineCategory($) $Line =~ /^error: corrupt patch / or # Build errors $Line =~ /: error: / or + $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors

1 0

Francois Gouget : testbot/build: Remove support for the old Build.pl parameters.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: def79fd13a535c9d9d02b3b9c57d71f4da2b9889 URL: https://source.winehq.org/git/tools.git/?a=commit;h=def79fd13a535c9d9d02b3b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:33:46 2018 +0200 testbot/build: Remove support for the old Build.pl parameters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 1a69669..da14583 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -193,19 +193,10 @@ my %AllTargets; map { $AllTargets{$_} = 1 } qw(exe32 exe64); my ($Usage, $PatchFile, $TargetList); -my $IgnoreNext = 0; # FIXME Backward compatibility while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg =~ /^patch(?:dlls|programs)$/) - { - $IgnoreNext ||= 1; # Ignore this legacy parameter - } - elsif ($IgnoreNext == 1) - { - $IgnoreNext = 2; # Ignore this legacy parameter - } - elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + if ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; last;

1 0

Francois Gouget : testbot/web: Also detect and highlight the TestBot error messages.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: 35dc4c4148b815d7fbcda4f724d79dc675fcac21 URL: https://source.winehq.org/git/tools.git/?a=commit;h=35dc4c4148b815d7fbcda4f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:36:03 2018 +0200 testbot/web: Also detect and highlight the TestBot error messages. This means calling GetHtmlLine() to highlight and escape the error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ testbot/web/JobDetails.pl | 4 ++-- testbot/web/WineTestBot.css | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bccf30d..98fe9cf 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -430,6 +430,10 @@ sub GetLogLineCategory($) { return "error"; } + if ($Line =~ /^BotError:/) + { + return "boterror"; + } if ($Line =~ /^\+ \S/ or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or # Build messages diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 532d76d..3a5b307 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -250,7 +250,7 @@ sub GetHtmlLine($$$) my ($self, $FullLog, $Line) = @_; my $Category = GetLogLineCategory($Line); - return undef if ($Category ne "error" and !$FullLog); + return undef if ($Category !~ /error/ and !$FullLog); my $Html = $self->escapeHTML($Line); if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) @@ -481,7 +481,7 @@ sub GenerateBody($) print "<pre><code>"; $ErrFirst = 0; } - print $self->escapeHTML($Line), "\n"; + print $self->GetHtmlLine(1, $Line), "\n"; } close($ErrFile); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 0055ec0..ae20382 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -377,6 +377,7 @@ pre .log-skip { color: blue; } .log-todo { color: #d08000; } .log-error { color: red; } +.log-boterror { color: #cc0052; } a.title { color:inherit; text-decoration: none; }

1 0