wine-commits July 2018

wine-commits@winehq.org

2 participants
405 discussions

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

10 Jul '18

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 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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: Fix version printing.
by Alexandre Julliard 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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 10 Jul '18

10 Jul '18

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

← Newer
1
...
23
24
25
26
27
28
29
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2018