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> +<p> Die Wartungsversion 3.0.2 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/3.0.2">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +<p>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. +</p></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> +<p> Die Entwicklungsversion 3.12 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/3.12">Neuerungen (en)</a> in dieser Version:</p> +<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> +<p>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. +</p></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

Francois Gouget : testbot/web: Tweak the 'Show full log' link labels.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: f49339ecdfeaa72640886c983ee3c266e377fc03 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f49339ecdfeaa72640886c9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:36:14 2018 +0200 testbot/web: Tweak the 'Show full log' link labels. Parts of the log may already be shown so make it clearer that this is to show all of it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3a5b307..28601d0 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -300,7 +300,7 @@ sub GenerateMoreInfoLink($$$;$) my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); - my $Action = "Show"; + my $Action = "Show". ($Set eq "Full" and $Label !~ /old/ ? " full" : ""); foreach my $Key (sort keys %{$self->{More}}) { my $MoreInfo = $self->{More}->{$Key};

1 0

Francois Gouget : testbot/web: Add a border around the link to hide the current log.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: a9eef3efc102d28b1d478218a7d7c468f8de50ee URL: https://source.winehq.org/git/tools.git/?a=commit;h=a9eef3efc102d28b1d47821… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:35:31 2018 +0200 testbot/web: Add a border around the link to hide the current log. This helps make it clearer which log is being shown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 8 ++++++-- testbot/web/WineTestBot.css | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e7e53d2..532d76d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -338,8 +338,12 @@ sub GenerateMoreInfoLink($$$;$) } $Url .= "#k" . uri_escape($LinkKey); - print "<div class='TaskMoreInfoLink'><a href='", - $self->CGI->escapeHTML($Url), "'>$Action $Label</a></div>\n"; + my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; + if ($Action eq "Hide") + { + $Html = "<span class='TaskMoreInfoSelected'>$Html</span>"; + } + print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } sub GenerateBody($) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 593c38f..0055ec0 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -310,6 +310,12 @@ h2 margin-right: 2em; } +.TaskMoreInfoSelected +{ + border: 1px solid #a50d0d; + padding: 2px; +} + .LogDllName { font-weight: bold;

1 0

Francois Gouget : testbot/build: Avoid an undefined $Action error in WineTest.pl.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: eb6ac033804ceb256c222bd263ee523625d8ad5c URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb6ac033804ceb256c222bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:35:04 2018 +0200 testbot/build: Avoid an undefined $Action error in WineTest.pl. This would only happen if running WineTest.pl from the command line, to get the usage message for instance. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 2b2ea2b..5ef8e61 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -315,9 +315,9 @@ if (!defined $Usage) $Usage = 2; } - if (!defined $FileName and $Action eq "build") + if (!defined $FileName and ($Action || "") eq "build") { - Error "you must provide a patch file\n"; + Error "you must provide a patch to test\n"; $Usage = 2; } }

1 0

Francois Gouget : testbot/build: Standardize some Build.pl and WineTest.pl messages.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: 5863db28e114a7dc81a8a409be0c2773ffaf3cb9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5863db28e114a7dc81a8a40… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:33:04 2018 +0200 testbot/build: Standardize some Build.pl and WineTest.pl messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 4 ++-- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index a3cb170..1a69669 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -223,13 +223,13 @@ while (@ARGV) $PatchFile = "$DataDir/staging/$Arg"; if (!-r $PatchFile) { - Error "patch file '$Arg' is not readable\n"; + Error "'$Arg' is not readable\n"; $Usage = 2; } } else { - Error "the patch filename '$Arg' contains invalid characters\n"; + Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; last; } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1c43a9b..2b2ea2b 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -252,7 +252,7 @@ while (@ARGV) } else { - Error "invalid file name '$Arg'\n"; + Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; last; }

1 0

Francois Gouget : testbot/web: Use IsValidFileName() to validate executable filenames.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: tools Branch: master Commit: f9b8b65011eff1959436a851962f024e53bba193 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f9b8b65011eff1959436a85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 10 10:33:22 2018 +0200 testbot/web: Use IsValidFileName() to validate executable filenames. Submit.pl should not have its own way to check that the executable filename is a valid Windows filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 38aa75f..cb6a124 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -484,7 +484,7 @@ sub Validate($) { if (($self->GetParam("FileType") eq "patchdlls" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) + !IsValidFileName($self->GetParam("TestExecutable"))) { $self->{ErrField} = "TestExecutable"; $self->{ErrMessage} = "Invalid test executable filename";

1 0

Alexandre Julliard : Wine release 3.12
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: website Branch: master Commit: 8633d247f40a09ca7e6d4f611c217b2636d910ce URL: https://source.winehq.org/git/website.git/?a=commit;h=8633d247f40a09ca7e6d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 23:01:07 2018 +0200 Wine release 3.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018070901.xml b/news/en/2018070901.xml new file mode 100644 index 0000000..28582b3 --- /dev/null +++ b/news/en/2018070901.xml @@ -0,0 +1,16 @@ +<news> +<date>July 9, 2018</date> +<title>Wine 3.12 Released</title> +<body> +<p> The Wine development release 3.12 is now available.</p> +<p> <a href="{$root}/announce/3.12">What's new</a> in this release: +<ul> + <li>Unicode data updated to Unicode 11.0.0.</li> + <li>Proxy configuration dialog in the Internet control panel.</li> + <li>Syntax fixes in the Cmd.exe command intepreter.</li> + <li>Some more glyphs in the Wingdings font.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-3.12 : Alexandre Julliard : Release 3.12
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: refs/tags/wine-3.12 Tag: 49c531c4e78d5787496586062b3bebd263bb6ebe URL: https://source.winehq.org/git/wine.git/?a=tag;h=49c531c4e78d5787496586062b3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:58:16 2018 +0200 Release 3.12

1 0

Alexandre Julliard : Release 3.12.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 8ef224fa43869a8c977921d6bec08863382d6e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef224fa43869a8c977921d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:58:15 2018 +0200 Release 3.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 519 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 294 insertions(+), 246 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef224fa43869a8c9779…

1 0

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

July 9, 2018

Module: wine Branch: master Commit: 4341c4495f1b21e8067d806989f41c8cf13c5e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4341c4495f1b21e8067d8069… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:15 2018 +0200 oleview: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/details.c | 16 +++++++--------- programs/oleview/interface.c | 10 ++++------ programs/oleview/oleview.c | 21 ++++++++++----------- programs/oleview/tree.c | 25 +++++++++++-------------- programs/oleview/typelib.c | 16 +++++++--------- 5 files changed, 39 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4341c4495f1b21e8067d…

1 0

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

July 9, 2018

Module: wine Branch: master Commit: 2f4f1399d17318a8be5c449a25e4994c9e9cbc35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4f1399d17318a8be5c449a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:17 2018 +0200 netapi32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/nbt.c | 8 +++----- dlls/netapi32/netapi32.c | 12 ++++++------ dlls/netapi32/netbios.c | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 207bd66..4816630 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1095,8 +1095,7 @@ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb) wsaBufs[1].len = ncb->ncb_length; wsaBufs[1].buf = (char*)ncb->ncb_buffer; - r = WSASend(session->fd, wsaBufs, sizeof(wsaBufs) / sizeof(wsaBufs[0]), - &bytesSent, 0, NULL, NULL); + r = WSASend(session->fd, wsaBufs, ARRAY_SIZE(wsaBufs), &bytesSent, 0, NULL, NULL); if (r == SOCKET_ERROR) { NetBIOSHangupSession(ncb); @@ -1523,10 +1522,9 @@ void NetBTInit(void) char nsString[16]; DWORD size, ndx; - for (ndx = 0; ndx < sizeof(nsValueNames) / sizeof(nsValueNames[0]); - ndx++) + for (ndx = 0; ndx < ARRAY_SIZE(nsValueNames); ndx++) { - size = sizeof(nsString) / sizeof(char); + size = ARRAY_SIZE(nsString); if (RegQueryValueExA(hKey, nsValueNames[ndx], NULL, NULL, (LPBYTE)nsString, &size) == ERROR_SUCCESS) { diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index ff57c22..afeada6 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -923,7 +923,7 @@ static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *buf static BOOL NETAPI_IsLocalComputer( LMCSTR name ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD size = sizeof(buf) / sizeof(buf[0]); + DWORD size = ARRAY_SIZE(buf); BOOL ret; if (!name || !name[0]) return TRUE; @@ -2360,7 +2360,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, { NET_API_STATUS status; WCHAR user[UNLEN + 1]; - DWORD size, len = sizeof(user)/sizeof(user[0]); + DWORD size, len = ARRAY_SIZE(user); TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -3477,8 +3477,8 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu TRACE("(%s %p %p)\n", debugstr_w(http_path), buf, buflen); while (*p && *p != ':') { p++; len++; }; - if (len == sizeof(httpW)/sizeof(httpW[0]) && !memicmpW( http_path, httpW, len )) ssl = FALSE; - else if (len == sizeof(httpsW)/sizeof(httpsW[0]) && !memicmpW( http_path, httpsW, len )) ssl = TRUE; + if (len == ARRAY_SIZE(httpW) && !memicmpW( http_path, httpW, len )) ssl = FALSE; + else if (len == ARRAY_SIZE(httpsW) && !memicmpW( http_path, httpsW, len )) ssl = TRUE; else return ERROR_INVALID_PARAMETER; if (p[0] != ':' || p[1] != '/' || p[2] != '/') return ERROR_INVALID_PARAMETER; @@ -3506,7 +3506,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu len = len_server + 2; /* \\ */ if (ssl) len += 4; /* @SSL */ if (port) len += len_port + 1 /* @ */; - len += sizeof(davrootW)/sizeof(davrootW[0]); + len += ARRAY_SIZE(davrootW); len += len_path + 1; /* nul */ if (*buflen < len) @@ -3531,7 +3531,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu buf += len_port; } memcpy( buf, davrootW, sizeof(davrootW) ); - buf += sizeof(davrootW)/sizeof(davrootW[0]); + buf += ARRAY_SIZE(davrootW); for (i = 0; i < len_path; i++) { if (path[i] == '/') *buf++ = '\\'; diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index e16c5dc..0d2bb0e 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -135,7 +135,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport) TRACE(": transport 0x%08x, p %p\n", id, transport); if (!transport) ret = FALSE; - else if (gNumTransports >= sizeof(gTransports) / sizeof(gTransports[0])) + else if (gNumTransports >= ARRAY_SIZE(gTransports)) { FIXME("Too many transports %d\n", gNumTransports + 1); ret = FALSE;

1 0

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

July 9, 2018

Module: wine Branch: master Commit: 973ac43d653e3bdfe51388ba0d414ae75f105f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=973ac43d653e3bdfe51388ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:18 2018 +0200 credui: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index a4df9fe..bf9f7d1 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -206,7 +206,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * SetWindowPos(params->hwndBalloonTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, sizeof(wszText)/sizeof(wszText[0]))) + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, ARRAY_SIZE(wszText))) { ERR("failed to load IDS_INCORRECTPASSWORD\n"); return; @@ -223,7 +223,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * toolinfo.lpReserved = NULL; SendMessageW(params->hwndBalloonTip, TTM_ADDTOOLW, 0, (LPARAM)&toolinfo); - if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, sizeof(wszText)/sizeof(wszText[0]))) + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, ARRAY_SIZE(wszText))) { ERR("failed to load IDS_CAPSLOCKON\n"); return; @@ -251,7 +251,7 @@ static void CredDialogShowIncorrectPasswordBalloon(HWND hwndDlg, struct cred_dia if (params->fBalloonTipActive) return; - if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, ARRAY_SIZE(wszTitle))) { ERR("failed to load IDS_INCORRECTPASSWORDTITLE\n"); return; @@ -289,7 +289,7 @@ static void CredDialogShowCapsLockBalloon(HWND hwndDlg, struct cred_dialog_param if (params->fBalloonTipActive) return; - if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, ARRAY_SIZE(wszTitle))) { ERR("failed to load IDS_IDSCAPSLOCKONTITLE\n"); return; @@ -383,8 +383,8 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { WCHAR format[256]; WCHAR message[256]; - LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(message, sizeof(message)/sizeof(message[0]), format, params->pszTargetName); + LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, ARRAY_SIZE(format)); + snprintfW(message, ARRAY_SIZE(message), format, params->pszTargetName); SetDlgItemTextW(hwndDlg, IDC_MESSAGE, message); } SetWindowTextW(hwndUsername, params->pszUsername); @@ -408,8 +408,8 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { WCHAR format[256]; WCHAR title[256]; - LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(title, sizeof(title)/sizeof(title[0]), format, params->pszTargetName); + LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, ARRAY_SIZE(format)); + snprintfW(title, ARRAY_SIZE(title), format, params->pszTargetName); SetWindowTextW(hwndDlg, title); } @@ -867,8 +867,8 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0}; WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0}; - DWORD len_username = sizeof(username) / sizeof(username[0]); - DWORD len_password = sizeof(password) / sizeof(password[0]); + DWORD len_username = ARRAY_SIZE(username); + DWORD len_password = ARRAY_SIZE(password); DWORD ret, flags; CREDUI_INFOW *cred_info = info; SEC_WINNT_AUTH_IDENTITY_W *id = input_id;

1 0

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

July 9, 2018

Module: wine Branch: master Commit: e9e96bc39afd3acaf9ca6bb0f5f68ad017de138f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e96bc39afd3acaf9ca6bb0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:14 2018 +0200 view: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/view.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 0adade7..3191529 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -214,12 +214,12 @@ static void UpdateWindowCaption(void) WCHAR szView[MAX_PATH]; static const WCHAR hyphenW[] = { ' ','-',' ',0 }; - LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); if (szFileTitle[0] != '\0') { lstrcpyW(szCaption, szFileTitle); - LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); lstrcatW(szCaption, hyphenW); lstrcatW(szCaption, szView); } @@ -260,10 +260,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM case IDM_OPEN: { WCHAR filename[MAX_PATH]; - if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) + if (FileOpen(hwnd, filename, ARRAY_SIZE(filename))) { szFileTitle[0] = 0; - GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); + GetFileTitleW(filename, szFileTitle, ARRAY_SIZE(szFileTitle)); DoOpenFile(filename); UpdateWindowCaption(); } @@ -323,7 +323,7 @@ static BOOL InitApplication(HINSTANCE hInstance) WNDCLASSEXW wc; /* Load the application description strings */ - LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, sizeof(szTitle)/sizeof(WCHAR)); + LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, ARRAY_SIZE(szTitle)); /* Fill in window class structure with parameters that describe the main window */ @@ -390,7 +390,7 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline[lstrlenW(cmdline) - 1] = 0; } szFileTitle[0] = 0; - GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); + GetFileTitleW(cmdline, szFileTitle, ARRAY_SIZE(szFileTitle)); DoOpenFile(cmdline); UpdateWindowCaption(); }

1 0

Nikolay Sivov : urlmon: Use ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 8665a60680079e71d3ea63329f8d818b288d7494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8665a60680079e71d3ea6332… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 5 18:22:32 2018 +0300 urlmon: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 24 ++++++++++++------------ dlls/urlmon/binding.c | 2 +- dlls/urlmon/file.c | 2 +- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/internet.c | 2 +- dlls/urlmon/mimefilter.c | 14 +++++++------- dlls/urlmon/sec_mgr.c | 8 ++++---- dlls/urlmon/session.c | 10 ++++------ dlls/urlmon/umon.c | 4 ++-- dlls/urlmon/uri.c | 18 +++++++++--------- 10 files changed, 43 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8665a60680079e71d3ea…

1 0

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

July 9, 2018

Module: wine Branch: master Commit: 56c4c7c57e74f2237b7d52c7d5f03996e96f66f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c4c7c57e74f2237b7d52c7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:13 2018 +0200 cryptui: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 221 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56c4c7c57e74f2237b7d…

1 0

Michael Stefaniuc : msvcr100/test: Replace a macro with ARRAY_SIZE.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 47ba18d601b56a4026c53ecb33b3d436e7a430dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ba18d601b56a4026c53ecb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:18 2018 +0200 msvcr100/test: Replace a macro with ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index bd95991..db5a4cb 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -363,8 +363,6 @@ static BOOL init(void) return TRUE; } -#define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) - #define okwchars(dst, b0, b1, b2, b3, b4, b5, b6, b7) \ ok(dst[0] == b0 && dst[1] == b1 && dst[2] == b2 && dst[3] == b3 && \ dst[4] == b4 && dst[5] == b5 && dst[6] == b6 && dst[7] == b7, \ @@ -384,7 +382,7 @@ static void test_wmemcpy_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Copying a buffer into a big enough destination returned %d, expected 0\n", ret); okwchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], XX, XX); @@ -392,7 +390,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(errno == ERANGE, "Copying a big buffer to a small destination errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Copying a big buffer to a small destination returned %d, expected ERANGE\n", ret); okwchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -402,7 +400,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a NULL source buffer errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a NULL source buffer returned %d, expected EINVAL\n", ret); okwchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -412,7 +410,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(errno == ERANGE, "Copying into a destination of size 0 errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Copying into a destination of size 0 returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -421,7 +419,7 @@ static void test_wmemcpy_s(void) /* Replace dest with NULL */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); - ret = p_wmemcpy_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a tiny buffer to a big NULL destination errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler); @@ -430,7 +428,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a NULL buffer into a destination of size 0 errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -453,13 +451,13 @@ static void test_wmemmove_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Moving a buffer into a big enough destination returned %d, expected 0\n", ret); okwchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], XX, XX); /* Overlapping */ memcpy(dest, big, sizeof(dest)); - ret = p_wmemmove_s(dest+1, NUMELMS(dest)-1, dest, NUMELMS(dest)-1); + ret = p_wmemmove_s(dest+1, ARRAY_SIZE(dest)-1, dest, ARRAY_SIZE(dest)-1); ok(ret == 0, "Moving a buffer up one char returned %d, expected 0\n", ret); okwchars(dest, big[0], big[0], big[1], big[2], big[3], big[4], big[5], big[6]); @@ -467,7 +465,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(errno == ERANGE, "Moving a big buffer to a small destination errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Moving a big buffer to a small destination returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -477,7 +475,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a NULL source buffer errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a NULL source buffer returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -487,7 +485,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(errno == ERANGE, "Moving into a destination of size 0 errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Moving into a destination of size 0 returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -496,7 +494,7 @@ static void test_wmemmove_s(void) /* Replace dest with NULL */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); - ret = p_wmemmove_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a tiny buffer to a big NULL destination errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler); @@ -505,7 +503,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a NULL buffer into a destination of size 0 errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -824,7 +822,7 @@ static void test_event(void) event evt; event *evts[70]; HANDLE thread; - HANDLE threads[NUMELMS(evts)]; + HANDLE threads[ARRAY_SIZE(evts)]; call_func1(p_event_ctor, &evt); @@ -851,7 +849,7 @@ static void test_event(void) if (0) /* crashes on Windows */ p_event_wait_for_multiple(NULL, 10, TRUE, 0); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { evts[i] = malloc(sizeof(evt)); call_func1(p_event_ctor, evts[i]); } @@ -859,17 +857,17 @@ static void test_event(void) ret = p_event_wait_for_multiple(evts, 0, TRUE, 100); ok(!ret, "expected 0, got %d\n", ret); - ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 100); + ret = p_event_wait_for_multiple(evts, ARRAY_SIZE(evts), TRUE, 100); ok(ret == -1, "expected -1, got %d\n", ret); /* reset and test wait for multiple with all */ - for (i = 0; i < NUMELMS(evts); i++) + for (i = 0; i < ARRAY_SIZE(evts); i++) threads[i] = CreateThread(NULL, 0, test_event_thread, (void*)evts[i], 0, NULL); - ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 5000); + ret = p_event_wait_for_multiple(evts, ARRAY_SIZE(evts), TRUE, 5000); ok(ret != -1, "didn't expect -1\n"); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { WaitForSingleObject(threads[i], INFINITE); CloseHandle(threads[i]); } @@ -896,7 +894,7 @@ static void test_event(void) ret = p_event_wait_for_multiple(evts, 2, FALSE, 0); ok(ret == 1, "expected 1, got %d\n", ret); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { call_func1(p_event_dtor, evts[i]); free(evts[i]); }

1 0

Rafał Mużyło : d3d9: Expand rectangles in debug strings.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 764df64f3756ad6058e793d0625ce57a467fcec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=764df64f3756ad6058e793d0… Author: Rafał Mużyło <galtgendo(a)o2.pl> Date: Fri Jul 6 16:55:26 2018 +0200 d3d9: Expand rectangles in debug strings. Most debug lines - except these three - expand the rectangles; so this puts things simply in sync with the rest. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a8d2652..a8dc709 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1014,8 +1014,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * unsigned int i; HRESULT hr; - TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", - iface, src_rect, dst_rect, dst_window_override, dirty_region); + TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", + iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); if (device->device_state != D3D9_DEVICE_STATE_OK) return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST; @@ -1512,8 +1512,8 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, struct wined3d_box src_box; HRESULT hr; - TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", - iface, src_surface, src_rect, dst_surface, dst_point); + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_point %p.\n", + iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, dst_point); wined3d_mutex_lock(); @@ -1630,8 +1630,8 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect HRESULT hr = D3DERR_INVALIDCALL; RECT d, s; - TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", - iface, src_surface, src_rect, dst_surface, dst_rect, filter); + TRACE("iface %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s, filter %#x.\n", + iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), filter); wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc);

1 0

Józef Kucia : d3d11/tests: Add test for unorm/ snorm immediate constants.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 7e46daa1bb072dd7086ab8970ce37319a25f783b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e46daa1bb072dd7086ab897… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:56 2018 +0200 d3d11/tests: Add test for unorm/snorm immediate constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ee8d465..be7c907 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18542,10 +18542,13 @@ static void test_uav_store_immediate_constant(void) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; ID3D11UnorderedAccessView *uav; ID3D11DeviceContext *context; struct resource_readback rb; + ID3D11Texture2D *texture; ID3D11ComputeShader *cs; + unsigned int uint_data; ID3D11Device *device; ID3D11Buffer *buffer; float float_data; @@ -18588,6 +18591,42 @@ static void test_uav_store_immediate_constant(void) 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, }; + static const DWORD cs_store_unorm_code[] = + { +#if 0 + RWTexture2D<unorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = 0.5f; + } +#endif + 0x43425844, 0x3623f1de, 0xe847109e, 0x8e3da13f, 0xb6787b06, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00001111, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const DWORD cs_store_snorm_code[] = + { +#if 0 + RWTexture2D<snorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = -0.5f; + } +#endif + 0x43425844, 0xce5397fc, 0x7464bc06, 0xc79aa56c, 0x881bd7ef, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00002222, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0xbf000000, 0xbf000000, 0xbf000000, 0xbf000000, 0x0100003e, + }; static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; static const unsigned int zero[4] = {0}; @@ -18635,7 +18674,57 @@ static void test_uav_store_immediate_constant(void) ok(float_data == 1.0f, "Got unexpected value %.8e.\n", float_data); release_resource_readback(&rb); + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_unorm_code, sizeof(cs_store_unorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0x80808080, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + + ID3D11Texture2D_Release(texture); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_SNORM; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_snorm_code, sizeof(cs_store_snorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0xc0c0c0c0, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + ID3D11Buffer_Release(buffer); + ID3D11Texture2D_Release(texture); ID3D11ComputeShader_Release(cs); ID3D11UnorderedAccessView_Release(uav); release_test_context(&test_context);

1 0

Józef Kucia : wined3d: Fix snorm/ unorm immediate values for UAV writes.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 7f1fe9385b7df27f28a252039f2340b2b755e650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1fe9385b7df27f28a25203… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:55 2018 +0200 wined3d: Fix snorm/unorm immediate values for UAV writes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af50c8b..1e922c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3094,6 +3094,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_SCALAR: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); @@ -3117,6 +3119,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_VEC4: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) {

1 0

Józef Kucia : dxgi: Avoid possible NULL pointer access in d3d11_swapchain_SetFullscreenState( ).
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 80120d62eb60c9932d2322a08e2da62fb1ae6e15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80120d62eb60c9932d2322a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 9 15:25:54 2018 +0200 dxgi: Avoid possible NULL pointer access in d3d11_swapchain_SetFullscreenState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb91eec..ae7bde7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -252,12 +252,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; - } - else - { - IDXGIOutput_Release(target); + return S_OK; } + if (target) + IDXGIOutput_Release(target); return hr; }

1 0

Fabian Maurer : ucrtbase: Add _crt_at_quick_exit stub.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: a63c8cab27aec2c83bd83234804b433d8232d857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63c8cab27aec2c83bd83234… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:03:51 2018 +0200 ucrtbase: Add _crt_at_quick_exit stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45295 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 24014a6..4bc8df7 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -28,7 +28,7 @@ @ cdecl _control87(long long) ucrtbase._control87 @ cdecl _controlfp(long long) ucrtbase._controlfp @ cdecl _controlfp_s(ptr long long) ucrtbase._controlfp_s -@ stub _crt_at_quick_exit +@ cdecl _crt_at_quick_exit(ptr) ucrtbase._crt_at_quick_exit @ cdecl _crt_atexit(ptr) ucrtbase._crt_atexit @ cdecl _crt_debugger_hook(long) ucrtbase._crt_debugger_hook @ cdecl _endthread() ucrtbase._endthread diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 77743d5..2a83e34 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -406,6 +406,15 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) #if _MSVCR_VER>=140 /********************************************************************* + * _crt_at_quick_exit (UCRTBASE.@) + */ +int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) +{ + FIXME("(%p) stub\n", func); + return -1; +} + +/********************************************************************* * _crt_atexit (UCRTBASE.@) */ int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b8e765c..83ac984 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -240,7 +240,7 @@ @ cdecl _cputws(wstr) @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale -@ stub _crt_at_quick_exit +@ cdecl _crt_at_quick_exit(ptr) MSVCRT__crt_at_quick_exit @ cdecl _crt_atexit(ptr) MSVCRT__crt_atexit @ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32

1 0

Fabian Maurer : ucrtbase: Implement quick_exit and _crt_at_quick_exit.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 89b8f3d712777e8b36b026e3e71ec54a862cc8be URL: https://source.winehq.org/git/wine.git/?a=commit;h=89b8f3d712777e8b36b026e3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:04:09 2018 +0200 ucrtbase: Implement quick_exit and _crt_at_quick_exit. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 12 +++++-- dlls/ucrtbase/tests/misc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 90efb76..b84c50a 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -40,6 +40,10 @@ typedef struct MSVCRT__onexit_table_t static MSVCRT__onexit_table_t MSVCRT_atexit_table; +#if _MSVCR_VER>=140 +static MSVCRT__onexit_table_t MSVCRT_quick_exit_table; +#endif + typedef void (__stdcall *_tls_callback_type)(void*,ULONG,void*); static _tls_callback_type tls_atexit_callback; @@ -410,8 +414,8 @@ int CDECL MSVCRT_atexit(void (__cdecl *func)(void)) */ int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) { - FIXME("(%p) stub\n", func); - return -1; + TRACE("(%p)\n", func); + return register_onexit_function(&MSVCRT_quick_exit_table, (MSVCRT__onexit_t)func); } /********************************************************************* @@ -419,7 +423,9 @@ int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) */ void CDECL MSVCRT_quick_exit(int exitcode) { - FIXME("(%d) semi-stub\n", exitcode); + TRACE("(%d)\n", exitcode); + + execute_onexit_table(&MSVCRT_quick_exit_table); MSVCRT__exit(exitcode); } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fad9311..555dc2d 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -127,6 +127,8 @@ static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); +static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); +static void (__cdecl *p_quick_exit)(int exitcode); static void test__initialize_onexit_table(void) { @@ -433,6 +435,8 @@ static BOOL init(void) p_asctime = (void*)GetProcAddress(module, "asctime"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); + p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); + p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); return TRUE; } @@ -797,11 +801,12 @@ static void test_exit(const char *argv0) PROCESS_INFORMATION proc; STARTUPINFOA startup = {0}; char path[MAX_PATH]; - HANDLE failures_map, exit_event; + HANDLE failures_map, exit_event, quick_exit_event; LONG *failures; DWORD ret; exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); + quick_exit_event = CreateEventA(NULL, FALSE, FALSE, "quick_exit_event"); failures = get_failures_counter(&failures_map); sprintf(path, "%s misc exit", argv0); @@ -819,11 +824,15 @@ static void test_exit(const char *argv0) ret = WaitForSingleObject(exit_event, 0); ok(ret == WAIT_OBJECT_0, "exit_event was not set (%x)\n", ret); + ret = WaitForSingleObject(quick_exit_event, 0); + ok(ret == WAIT_TIMEOUT, "quick_exit_event should not have be set (%x)\n", ret); CloseHandle(exit_event); + CloseHandle(quick_exit_event); } static int atexit_called; + static void CDECL at_exit_func1(void) { HANDLE exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); @@ -843,14 +852,85 @@ static void CDECL at_exit_func2(void) set_failures_counter(winetest_get_failures()); } +static int atquick_exit_called; + +static void CDECL at_quick_exit_func1(void) +{ + HANDLE quick_exit_event = CreateEventA(NULL, FALSE, FALSE, "quick_exit_event"); + + ok(quick_exit_event != NULL, "CreateEvent failed: %d\n", GetLastError()); + ok(atquick_exit_called == 1, "atquick_exit_called = %d\n", atquick_exit_called); + atquick_exit_called++; + SetEvent(quick_exit_event); + CloseHandle(quick_exit_event); + set_failures_counter(winetest_get_failures()); +} + +static void CDECL at_quick_exit_func2(void) +{ + ok(!atquick_exit_called, "atquick_exit_called = %d\n", atquick_exit_called); + atquick_exit_called++; + set_failures_counter(winetest_get_failures()); +} + static void test_call_exit(void) { ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); + + ok(!p_crt_at_quick_exit(at_quick_exit_func1), "_crt_at_quick_exit failed\n"); + ok(!p_crt_at_quick_exit(at_quick_exit_func2), "_crt_at_quick_exit failed\n"); + set_failures_counter(winetest_get_failures()); p_exit(1); } +static void test_call_quick_exit(void) +{ + ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); + ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); + + ok(!p_crt_at_quick_exit(at_quick_exit_func1), "_crt_at_quick_exit failed\n"); + ok(!p_crt_at_quick_exit(at_quick_exit_func2), "_crt_at_quick_exit failed\n"); + + set_failures_counter(winetest_get_failures()); + p_quick_exit(2); +} + +static void test_quick_exit(const char *argv0) +{ + PROCESS_INFORMATION proc; + STARTUPINFOA startup = {0}; + char path[MAX_PATH]; + HANDLE failures_map, exit_event, quick_exit_event; + LONG *failures; + DWORD ret; + + exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); + quick_exit_event = CreateEventA(NULL, FALSE, FALSE, "quick_exit_event"); + + failures = get_failures_counter(&failures_map); + sprintf(path, "%s misc quick_exit", argv0); + startup.cb = sizeof(startup); + CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &proc); + ret = WaitForSingleObject(proc.hProcess, INFINITE); + ok(ret == WAIT_OBJECT_0, "child process wait failed\n"); + GetExitCodeProcess(proc.hProcess, &ret); + ok(ret == 2, "child process exited with code %d\n", ret); + CloseHandle(proc.hProcess); + CloseHandle(proc.hThread); + ok(!*failures, "%d tests failed in child process\n", *failures); + free_failures_counter(failures, failures_map); + + ret = WaitForSingleObject(quick_exit_event, 0); + ok(ret == WAIT_OBJECT_0, "quick_exit_event was not set (%x)\n", ret); + ret = WaitForSingleObject(exit_event, 0); + ok(ret == WAIT_TIMEOUT, "exit_event should not have be set (%x)\n", ret); + + CloseHandle(exit_event); + CloseHandle(quick_exit_event); +} + START_TEST(misc) { int arg_c; @@ -865,6 +945,8 @@ START_TEST(misc) test__get_narrow_winmain_command_line(NULL); else if(!strcmp(arg_v[2], "exit")) test_call_exit(); + else if(!strcmp(arg_v[2], "quick_exit")) + test_call_quick_exit(); return; } @@ -881,4 +963,5 @@ START_TEST(misc) test_math_errors(); test_asctime(); test_exit(arg_v[0]); + test_quick_exit(arg_v[0]); }

1 0

Piotr Caban : ucrtbase: Report child process test failures in exit() tests.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: f90a32d5abf04bfc3a2249662f25f1d4aab9850c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f90a32d5abf04bfc3a224966… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 9 18:03:29 2018 +0200 ucrtbase: Report child process test failures in exit() tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 99b9fd2..fad9311 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -769,16 +769,41 @@ static void test_asctime(void) ok(!strcmp(ret, "Thu Jan 1 00:00:00 1970\n"), "asctime returned %s\n", ret); } +static LONG* get_failures_counter(HANDLE *map) +{ + *map = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, + 0, sizeof(LONG), "winetest_failures_counter"); + return MapViewOfFile(*map, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(LONG)); +} + +static void free_failures_counter(LONG *mem, HANDLE map) +{ + UnmapViewOfFile(mem); + CloseHandle(map); +} + +static void set_failures_counter(LONG add) +{ + HANDLE failures_map; + LONG *failures; + + failures = get_failures_counter(&failures_map); + *failures = add; + free_failures_counter(failures, failures_map); +} + static void test_exit(const char *argv0) { PROCESS_INFORMATION proc; STARTUPINFOA startup = {0}; char path[MAX_PATH]; - HANDLE exit_event; + HANDLE failures_map, exit_event; + LONG *failures; DWORD ret; exit_event = CreateEventA(NULL, FALSE, FALSE, "exit_event"); + failures = get_failures_counter(&failures_map); sprintf(path, "%s misc exit", argv0); startup.cb = sizeof(startup); CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &proc); @@ -788,6 +813,9 @@ static void test_exit(const char *argv0) ok(ret == 1, "child process exited with code %d\n", ret); CloseHandle(proc.hProcess); CloseHandle(proc.hThread); + ok(!*failures, "%d tests failed in child process\n", *failures); + free_failures_counter(failures, failures_map); + ret = WaitForSingleObject(exit_event, 0); ok(ret == WAIT_OBJECT_0, "exit_event was not set (%x)\n", ret); @@ -805,18 +833,21 @@ static void CDECL at_exit_func1(void) atexit_called++; SetEvent(exit_event); CloseHandle(exit_event); + set_failures_counter(winetest_get_failures()); } static void CDECL at_exit_func2(void) { ok(!atexit_called, "atexit_called = %d\n", atexit_called); atexit_called++; + set_failures_counter(winetest_get_failures()); } static void test_call_exit(void) { ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); + set_failures_counter(winetest_get_failures()); p_exit(1); }

1 0

Piotr Caban : ucrtbase: Test child process exit code.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 27de76e3df6b276c25eddb9788d509797f45d422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27de76e3df6b276c25eddb97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 9 18:03:19 2018 +0200 ucrtbase: Test child process exit code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 1c56f73..99b9fd2 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -782,7 +782,12 @@ static void test_exit(const char *argv0) sprintf(path, "%s misc exit", argv0); startup.cb = sizeof(startup); CreateProcessA(NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &proc); - winetest_wait_child_process(proc.hProcess); + ret = WaitForSingleObject(proc.hProcess, INFINITE); + ok(ret == WAIT_OBJECT_0, "child process wait failed\n"); + GetExitCodeProcess(proc.hProcess, &ret); + ok(ret == 1, "child process exited with code %d\n", ret); + CloseHandle(proc.hProcess); + CloseHandle(proc.hThread); ret = WaitForSingleObject(exit_event, 0); ok(ret == WAIT_OBJECT_0, "exit_event was not set (%x)\n", ret); @@ -812,7 +817,7 @@ static void test_call_exit(void) { ok(!p__crt_atexit(at_exit_func1), "_crt_atexit failed\n"); ok(!p__crt_atexit(at_exit_func2), "_crt_atexit failed\n"); - p_exit(0); + p_exit(1); } START_TEST(misc)

1 0

Michał Janiszewski : msvcrt: Update size checks for secure scanf versions.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 08d98f0ff83d664fa08208fed19cb90140e2ff10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d98f0ff83d664fa08208fe… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Mon Jul 9 14:45:28 2018 +0200 msvcrt: Update size checks for secure scanf versions. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 734fe8b..0903d69 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -548,13 +548,13 @@ _FUNCTION_ { while (width && (nch != _EOF_)) { if (!suppress) { - *str++ = _CHAR2SUPPORTED_(nch); if(size) size--; else { _UNLOCK_FILE_(file); *pstr = 0; return rd; } + *str++ = _CHAR2SUPPORTED_(nch); } st++; width--; @@ -574,13 +574,13 @@ _FUNCTION_ { while (width && (nch != _EOF_)) { if (!suppress) { - *str++ = _WIDE2SUPPORTED_(nch); if(size) size--; else { _UNLOCK_FILE_(file); *pstr = 0; return rd; } + *str++ = _WIDE2SUPPORTED_(nch); } st++; width--; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 359b079..b724483 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -282,10 +282,17 @@ static void test_sscanf_s(void) ok(ret == 0, "Wrong number of arguments read: %d\n", ret); ok(buf[0]=='\0', "buf = %s\n", buf); - buf[0] = 'a'; + memset(buf, 'a', sizeof(buf)); ret = psscanf_s("123", "%3c", buf, 2); ok(ret == 0, "Wrong number of arguments read: %d\n", ret); ok(buf[0]=='\0', "buf = %s\n", buf); + ok(buf[1]=='2', "buf[1] = %d\n", buf[1]); + ok(buf[2]=='a', "buf[2] = %d\n", buf[2]); + + buf[3] = 'a'; + buf[4] = 0; + ret = psscanf_s("123", "%3c", buf, 3); + ok(!strcmp("123a", buf), "buf = %s\n", buf); i = 1; ret = psscanf_s("123 123", "%s %d", buf, 2, &i);

1 0

Fabian Maurer : ucrtbase: Add quick_exit.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 224f3312f87551cce4ea44381ab55e2bfa3e9734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=224f3312f87551cce4ea4438… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 9 18:04:03 2018 +0200 ucrtbase: Add quick_exit. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 4bc8df7..74d682b 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -97,7 +97,7 @@ @ cdecl fesetround(long) ucrtbase.fesetround @ stub fetestexcept @ cdecl perror(str) ucrtbase.perror -@ stub quick_exit +@ cdecl quick_exit(long) ucrtbase.quick_exit @ cdecl raise(long) ucrtbase.raise @ cdecl set_terminate(ptr) ucrtbase.set_terminate @ cdecl signal(long long) ucrtbase.signal diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 2a83e34..90efb76 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -415,6 +415,15 @@ int CDECL MSVCRT__crt_at_quick_exit(void (__cdecl *func)(void)) } /********************************************************************* + * quick_exit (MSVCRT.@) + */ +void CDECL MSVCRT_quick_exit(int exitcode) +{ + FIXME("(%d) semi-stub\n", exitcode); + MSVCRT__exit(exitcode); +} + +/********************************************************************* * _crt_atexit (UCRTBASE.@) */ int CDECL MSVCRT__crt_atexit(void (__cdecl *func)(void)) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 83ac984..6304663 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2454,7 +2454,7 @@ @ cdecl putwchar(long) MSVCRT__fputwchar @ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -@ stub quick_exit +@ cdecl quick_exit(long) MSVCRT_quick_exit @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand @ cdecl rand_s(ptr) MSVCRT_rand_s

1 0