April 2016 - Wine-commits - list.winehq.org

Bernhard Übelacker : ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 64aec5d8dbae329958b9b677d3289de78142e289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64aec5d8dbae329958b9b677d… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Mar 29 22:13:16 2016 +0200 ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0e87b82..a52b5df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) { SIZE_T size; PIRP irp; + CCHAR loc_count = stack_size; TRACE( "%d, %d\n", stack_size, charge_quota ); - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); + if (loc_count < 8 && loc_count != 1) + loc_count = 8; + + size = sizeof(IRP) + loc_count * sizeof(IO_STACK_LOCATION); irp = ExAllocatePool( NonPagedPool, size ); if (irp == NULL) return NULL; IoInitializeIrp( irp, size, stack_size ); - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; + if (stack_size >= 1 && stack_size <= 8) + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; if (charge_quota) irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; return irp;

1 0

Jean-Christophe Cardot : winhlp32: Replace magic numbers by symbols.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 58f16273c307a240d7c149adbd2f9f7ced0e5d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58f16273c307a240d7c149adb… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:07 2016 +0200 winhlp32: Replace magic numbers by symbols. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 24 ++++++++++++------------ programs/winhlp32/hlpfile.h | 5 +++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index ab75b2a..8a68af5 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1258,13 +1258,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); - if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); *parlen = fetch_ushort(&format); } - if (buf[0x14] == 0x23) + if (buf[0x14] == HLP_TABLE) { char type; @@ -1326,7 +1326,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } else nc++; - if (buf[0x14] == 0x01) + if (buf[0x14] == HLP_DISPLAY30) format += 6; else format += 4; @@ -1799,12 +1799,12 @@ BOOL HLPFILE_BrowsePage(HLPFILE_PAGE* page, struct RtfData* rd, switch (buf[0x14]) { - case 0x02: + case HLP_TOPICHDR: if (count++) goto done; break; - case 0x01: - case 0x20: - case 0x23: + case HLP_DISPLAY30: + case HLP_DISPLAY: + case HLP_TABLE: if (!HLPFILE_BrowseParagraph(page, rd, buf, end, &parlen)) return FALSE; if (relative > index * 0x8000 + offs) rd->char_pos_rel = rd->char_pos; @@ -2605,7 +2605,7 @@ static BOOL HLPFILE_SkipParagraph(HLPFILE *hlpfile, const BYTE *buf, const BYTE if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; tmp = buf + 0x15; - if (buf[0x14] == 0x20 || buf[0x14] == 0x23) + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&tmp); *len = fetch_ushort(&tmp); @@ -2680,7 +2680,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) switch (buf[0x14]) { - case 0x02: + case HLP_TOPICHDR: /* Topic Header */ if (hlpfile->version <= 16) topicoffset = ref + index * 12; else @@ -2688,9 +2688,9 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) if (!HLPFILE_AddPage(hlpfile, buf, end, ref, topicoffset)) return FALSE; break; - case 0x01: - case 0x20: - case 0x23: + case HLP_DISPLAY30: + case HLP_DISPLAY: + case HLP_TABLE: if (!HLPFILE_SkipParagraph(hlpfile, buf, end, &len)) return FALSE; offs += len; break; diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index c3fa4b0..6c40c3a 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -199,3 +199,8 @@ struct RtfData { BOOL HLPFILE_BrowsePage(HLPFILE_PAGE*, struct RtfData* rd, unsigned font_scale, unsigned relative); + +#define HLP_DISPLAY30 0x01 /* version 3.0 displayable information */ +#define HLP_TOPICHDR 0x02 /* topic header information */ +#define HLP_DISPLAY 0x20 /* version 3.1 displayable information */ +#define HLP_TABLE 0x23 /* version 3.1 table */

1 0

Jean-Christophe Cardot : winhlp32: Add some trace calls.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: ae56f3d093c84b47248be6a66cebd58c0bb59668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae56f3d093c84b47248be6a66… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:08 2016 +0200 winhlp32: Add some trace calls. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 8a68af5..4c898e9 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -693,6 +693,7 @@ static BOOL HLPFILE_RtfAddRawString(struct RtfData* rd, const char* str, size_t static BOOL HLPFILE_RtfAddControl(struct RtfData* rd, const char* str) { + WINE_TRACE("%s\n", debugstr_a(str)); if (*str == '\\' || *str == '{') rd->in_text = FALSE; else if (*str == '}') rd->in_text = TRUE; return HLPFILE_RtfAddRawString(rd, str, strlen(str)); @@ -1258,6 +1259,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, format = buf + 0x15; format_end = buf + GET_UINT(buf, 0x10); + WINE_TRACE("Record type (buf[0x14]) = 0x%x\n", buf[0x14]); + if (buf[0x14] == HLP_DISPLAY || buf[0x14] == HLP_TABLE) { fetch_long(&format); @@ -1440,13 +1443,13 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, /* else: null text, keep on storing attributes */ text += textsize + 1; + WINE_TRACE("format=%02x\n", *format); if (*format == 0xff) { format++; break; } - WINE_TRACE("format=%02x\n", *format); switch (*format) { case 0x20:

1 0

Jean-Christophe Cardot : winhlp32: Add a warning trace.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: d55cb801bcbef7b61b25906e12d056f0b40a52ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55cb801bcbef7b61b25906e1… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:09 2016 +0200 winhlp32: Add a warning trace. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 4c898e9..b3106ff 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1620,6 +1620,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0xE3: case 0xE6: case 0xE7: + WINE_WARN("jump topic 1 => %u\n", GET_UINT(format, 1)); HLPFILE_AllocLink(rd, (*format & 1) ? hlp_link_link : hlp_link_popup, page->file->lpszPath, -1, GET_UINT(format, 1), !(*format & 4), FALSE, -1);

1 0

Jean-Christophe Cardot : winhlp32: Prepare winhlp32 for more font types.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 5200dc9b05c5919c9d03b34f75f63c544ba0d372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5200dc9b05c5919c9d03b34f7… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:10 2016 +0200 winhlp32: Prepare winhlp32 for more font types. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 20 ++++++++++++++++++++ programs/winhlp32/hlpfile.h | 3 +++ 2 files changed, 23 insertions(+) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index b3106ff..141af62 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1865,6 +1865,26 @@ static BOOL HLPFILE_ReadFont(HLPFILE* hlpfile) hlpfile->fonts = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_FONT) * dscr_num); len = (dscr_offset - face_offset) / face_num; + + /* mvb font */ + if (face_offset >= 16) + { + hlpfile->scale = 1; + hlpfile->rounderr = 0; + WINE_FIXME("mvb font: not implemented\n"); + return FALSE; + } + /* new font */ + if (face_offset >= 12) + { + hlpfile->scale = 1; + hlpfile->rounderr = 0; + WINE_FIXME("new font: not implemented\n"); + return FALSE; + } + /* old font */ + hlpfile->scale = 10; + hlpfile->rounderr = 5; /* EPP for (i = face_offset; i < dscr_offset; i += len) */ /* EPP WINE_FIXME("[%d]: %*s\n", i / len, len, ref + i); */ for (i = 0; i < dscr_num; i++) diff --git a/programs/winhlp32/hlpfile.h b/programs/winhlp32/hlpfile.h index 6c40c3a..55ef681 100644 --- a/programs/winhlp32/hlpfile.h +++ b/programs/winhlp32/hlpfile.h @@ -149,6 +149,9 @@ typedef struct tagHlpFileFile COLORREF popup_color; LPSTR help_on_file; + + int scale; + int rounderr; } HLPFILE; /*

1 0

Jean-Christophe Cardot : winhlp32: Rework and rename HLPFILE_HalfPointsToTwips.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: a01c003007f6b2a7e53f6d726384d584710f1966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01c003007f6b2a7e53f6d726… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:11 2016 +0200 winhlp32: Rework and rename HLPFILE_HalfPointsToTwips. HLPFILE_HalfPointsToTwips was performing a useless transformation of the RTF measures, using a hardcoded 72 DPI. As winhlp32 makes use of the richedit component, it is counter productive to transform the measures, as this is taken care of by richedit himself. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 141af62..5e61bcf 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1199,16 +1199,9 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } -static unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +static unsigned HLPFILE_HalfPointsScale(HLPFILE_PAGE* page, unsigned pts) { - static unsigned logPxY; - if (!logPxY) - { - HDC hdc = GetDC(NULL); - logPxY = GetDeviceCaps(hdc, LOGPIXELSY); - ReleaseDC(NULL, hdc); - } - return MulDiv(pts, 72 * 10, logPxY); + return pts * page->file->scale - page->file->rounderr; } /*********************************************************************** @@ -1289,10 +1282,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { int pos; sprintf(tmp, "\\trgaph%d\\trleft%d", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; - pos = HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + pos = HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); for (nc = 0; nc < ncol; nc++) { WINE_TRACE("column(%d/%d) gap=%d width=%d\n", @@ -1300,7 +1293,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, GET_SHORT(format, nc*4+2)); pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); sprintf(tmp, "\\cellx%d", - HLPFILE_HalfPointsToTwips(MulDiv(pos, table_width, 32767))); + HLPFILE_HalfPointsScale(page, MulDiv(pos, table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1309,8 +1302,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("column(0/%d) gap=%d width=%d\n", ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); sprintf(tmp, "\\trleft%d\\cellx%d ", - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0), table_width, 32767)), - HLPFILE_HalfPointsToTwips(MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767)), + HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), table_width, 32767))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } @@ -1337,32 +1330,32 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) { - sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0004) { - sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0008) { - sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0010) { - sprintf(tmp, "\\li%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\li%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0020) { - sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0040) { - sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsScale(page, fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } if (bits & 0x0100) @@ -1383,7 +1376,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, w = GET_SHORT(format, 0); format += 2; if (w) { - sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsToTwips(w)); + sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsScale(page, w)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1407,7 +1400,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, } /* FIXME: do kind */ sprintf(tmp, "%s\\tx%d", - kind, HLPFILE_HalfPointsToTwips(tab & 0x3FFF)); + kind, HLPFILE_HalfPointsScale(page, tab & 0x3FFF)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } }

1 0

Jean-Christophe Cardot : winhlp32: Fix table formatting.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 706145c563115afadc4eaab2a4f8ae8a7c8b26e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=706145c563115afadc4eaab2a… Author: Jean-Christophe Cardot <wine(a)cardot.net> Date: Sun Apr 10 22:06:12 2016 +0200 winhlp32: Fix table formatting. Signed-off-by: Jean-Christophe Cardot <wine(a)cardot.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winhlp32/hlpfile.c | 54 ++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 5e61bcf..10484a9 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1216,9 +1216,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, char *text, *text_base, *text_end; LONG size, blocksize, datalen; unsigned short bits; - unsigned nc, ncol = 1; - short table_width; - BOOL in_table = FALSE; + unsigned ncol = 1; + short nc, lastcol, table_width; char tmp[256]; BOOL ret = FALSE; @@ -1262,9 +1261,8 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, if (buf[0x14] == HLP_TABLE) { - char type; + unsigned char type; - in_table = TRUE; ncol = *format++; if (!HLPFILE_RtfAddControl(rd, "\\trowd")) goto done; @@ -1273,6 +1271,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { table_width = GET_SHORT(format, 0); format += 2; + if (!HLPFILE_RtfAddControl(rd, "\\trqc")) goto done; } else table_width = 32767; @@ -1282,10 +1281,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, { int pos; sprintf(tmp, "\\trgaph%d\\trleft%d", - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6), table_width, 32767)), - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767))); + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 6)), table_width, 32767), + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 2) - GET_SHORT(format, 6)), table_width, 32767) - 1); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; - pos = HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 6) / 2, table_width, 32767)); + pos = GET_SHORT(format, 6) / 2; for (nc = 0; nc < ncol; nc++) { WINE_TRACE("column(%d/%d) gap=%d width=%d\n", @@ -1293,7 +1292,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, GET_SHORT(format, nc*4+2)); pos += GET_SHORT(format, nc * 4) + GET_SHORT(format, nc * 4 + 2); sprintf(tmp, "\\cellx%d", - HLPFILE_HalfPointsScale(page, MulDiv(pos, table_width, 32767))); + MulDiv(HLPFILE_HalfPointsScale(page, pos), table_width, 32767)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } @@ -1302,22 +1301,27 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, WINE_TRACE("column(0/%d) gap=%d width=%d\n", ncol, GET_SHORT(format, 0), GET_SHORT(format, 2)); sprintf(tmp, "\\trleft%d\\cellx%d ", - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0), table_width, 32767)), - HLPFILE_HalfPointsScale(page, MulDiv(GET_SHORT(format, 0) + GET_SHORT(format, 2), - table_width, 32767))); + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 2)), table_width, 32767) - 1, + MulDiv(HLPFILE_HalfPointsScale(page, GET_SHORT(format, 0)), table_width, 32767)); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } format += ncol * 4; } + lastcol = -1; for (nc = 0; nc < ncol; /**/) { WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); if (!HLPFILE_RtfAddControl(rd, "\\pard")) goto done; - if (in_table) + if (buf[0x14] == HLP_TABLE) { - nc = GET_SHORT(format, 0); - if (nc == -1) break; + nc = lastcol = GET_SHORT(format, 0); + if (nc == -1) /* last column */ + { + if (!HLPFILE_RtfAddControl(rd, "\\row")) goto done; + rd->char_pos += 2; + break; + } format += 5; if (!HLPFILE_RtfAddControl(rd, "\\intbl")) goto done; } @@ -1436,7 +1440,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, /* else: null text, keep on storing attributes */ text += textsize + 1; - WINE_TRACE("format=%02x\n", *format); + WINE_TRACE("format=0x%02x\n", *format); if (*format == 0xff) { format++; @@ -1490,15 +1494,24 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, break; case 0x82: - if (in_table) + if (buf[0x14] == HLP_TABLE) { if (format[1] != 0xFF) { if (!HLPFILE_RtfAddControl(rd, "\\par\\intbl")) goto done; } + else if (GET_SHORT(format, 2) == -1) + { + if (!HLPFILE_RtfAddControl(rd, "\\cell\\intbl\\row")) goto done; + rd->char_pos += 2; + } + else if (GET_SHORT(format, 2) == lastcol) + { + if (!HLPFILE_RtfAddControl(rd, "\\par\\pard")) goto done; + } else { - if (!HLPFILE_RtfAddControl(rd, "\\cell\\pard\\intbl")) goto done; + if (!HLPFILE_RtfAddControl(rd, "\\cell\\pard")) goto done; } } else if (!HLPFILE_RtfAddControl(rd, "\\par")) goto done; @@ -1664,11 +1677,6 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, } } } - if (in_table) - { - if (!HLPFILE_RtfAddControl(rd, "\\row\\par\\pard\\plain")) goto done; - rd->char_pos += 2; - } ret = TRUE; done:

1 0

Ken Thomases : ntoskrnl.exe: Fix SIB_INDEX() to use REX_X, not REX_R.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: f8220cbe93b1c0f86ef1091be2ef7e23e9a4337d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8220cbe93b1c0f86ef1091be… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 12 01:19:19 2016 -0500 ntoskrnl.exe: Fix SIB_INDEX() to use REX_X, not REX_R. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 85b872e..48f16f2 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -492,7 +492,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); #define REGMODRM_RM( regmodrm, rex ) (((regmodrm) & 7) | (((rex) & REX_B) ? 8 : 0)) #define SIB_SS( sib, rex ) ((sib) >> 6) -#define SIB_INDEX( sib, rex ) (((sib) >> 3) & 7) | (((rex) & REX_R) ? 8 : 0) +#define SIB_INDEX( sib, rex ) (((sib) >> 3) & 7) | (((rex) & REX_X) ? 8 : 0) #define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) /* keep in sync with dlls/ntdll/thread.c:thread_init */

1 0

Huw Davies : oleaut32/tests: Test against floats not integers to silence a clang warning.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: fcb9ff957bd8df1a572cf4770265b177379c4a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb9ff957bd8df1a572cf4770… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 08:42:43 2016 +0100 oleaut32/tests: Test against floats not integers to silence a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 4ba453c..00b2919 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2544,7 +2544,7 @@ static void test_VarSub(void) hres = pVarSub(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VarSub: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0), + ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0.0), "VarSub: BSTR + BSTR, expected %f got %f\n", 0.0, V_R8(&result)); /* Manually test some VT_CY and VT_DECIMAL variants */ @@ -2565,7 +2565,7 @@ static void test_VarSub(void) ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4702), + ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), "VarSub: CY value %f, expected %f\n", r, (double)4720); hres = pVarSub(&left, &dec, &result); @@ -5384,7 +5384,7 @@ static void test_VarMul(void) hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 42399), "VarMul: CY value %f, expected %f\n", r, (double)42399); + ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, (double)42399); hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); @@ -5555,7 +5555,7 @@ static void test_VarAdd(void) hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); + ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); VariantClear(&result); /* Manuly test some VT_CY and VT_DECIMAL variants */ @@ -5575,7 +5575,7 @@ static void test_VarAdd(void) hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4720), "VarAdd: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, (double)4720); hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result)));

1 0

Huw Davies : oleaut32/tests: Fix the size test in the case of an underflow of Lo.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 9bb541563a933645aae9e530da6ecbcf3149d060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb541563a933645aae9e530d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 09:17:39 2016 +0100 oleaut32/tests: Fix the size test in the case of an underflow of Lo. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olefont.c | 74 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 4f421e4..1536619 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -58,9 +58,8 @@ static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); /* SetRatio to ratio_logical, ratio_himetric, */ /* check that resulting hfont has height hfont_height. */ /* Various checks along the way. */ -static void test_ifont_size(LONG lo_size, LONG hi_size, - LONG ratio_logical, LONG ratio_himetric, - LONG hfont_height, const char * test_name) +static void test_ifont_size(LONGLONG size, LONG ratio_logical, LONG ratio_himetric, + LONG hfont_height, const char * test_name) { FONTDESC fd; LPVOID pvObj = NULL; @@ -73,8 +72,7 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, fd.cbSizeofstruct = sizeof(FONTDESC); fd.lpstrName = arial_font; /* using scalable instead of bitmap font reduces errors due to font realization */ - S(fd.cySize).Lo = lo_size; - S(fd.cySize).Hi = hi_size; + fd.cySize.int64 = size; fd.sWeight = 0; fd.sCharset = 0; fd.fItalic = FALSE; @@ -99,9 +97,9 @@ static void test_ifont_size(LONG lo_size, LONG hi_size, test_name, hres); /* Check returned size - allow for errors due to rounding & font realization. */ - ok((abs(S(psize).Lo - lo_size) < 10000) && S(psize).Hi == hi_size, + ok((psize.int64 - size) < 10000 && (psize.int64 - size) > -10000, "%s: IFont_get_Size: Lo=%d, Hi=%d; expected Lo=%d, Hi=%d.\n", - test_name, S(psize).Lo, S(psize).Hi, lo_size, hi_size); + test_name, S(psize).Lo, S(psize).Hi, fd.cySize.Lo, fd.cySize.Hi); /* Check hFont size. */ hres = IFont_get_hFont (ifnt, &hfont); @@ -130,59 +128,59 @@ static void test_ifont_sizes(void) ReleaseDC(0, hdc); if(dpi == 96) /* normal resolution display */ { - test_ifont_size(180000, 0, 0, 0, -24, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -25, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -24, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -25, "rounding"); /* test rounding */ } else if(dpi == 72) /* low resolution display */ { - test_ifont_size(180000, 0, 0, 0, -18, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -19, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -18, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -19, "rounding"); /* test rounding */ } else if(dpi == 120) /* high resolution display */ { - test_ifont_size(180000, 0, 0, 0, -30, "default"); /* normal font */ - test_ifont_size(186000, 0, 0, 0, -31, "rounding"); /* test rounding */ + test_ifont_size(180000, 0, 0, -30, "default"); /* normal font */ + test_ifont_size(186000, 0, 0, -31, "rounding"); /* test rounding */ } else skip("Skipping resolution dependent font size tests - display resolution is %d\n", dpi); /* Next 4 tests specify a scaling ratio, so display resolution is not a factor. */ - test_ifont_size(180000, 0, 72, 2540, -18, "ratio1"); /* change ratio */ - test_ifont_size(180000, 0, 144, 2540, -36, "ratio2"); /* another ratio */ - test_ifont_size(180000, 0, 72, 1270, -36, "ratio3"); /* yet another ratio */ - test_ifont_size(186000, 0, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ + test_ifont_size(180000, 72, 2540, -18, "ratio1"); /* change ratio */ + test_ifont_size(180000, 144, 2540, -36, "ratio2"); /* another ratio */ + test_ifont_size(180000, 72, 1270, -36, "ratio3"); /* yet another ratio */ + test_ifont_size(186000, 72, 2540, -19, "rounding+ratio"); /* test rounding with ratio */ /* test various combinations of logical == himetric */ - test_ifont_size(180000, 0, 10, 10, -635, "identical ratio 1"); - test_ifont_size(240000, 0, 10, 10, -848, "identical ratio 2"); - test_ifont_size(300000, 0, 10, 10, -1058, "identical ratio 3"); + test_ifont_size(180000, 10, 10, -635, "identical ratio 1"); + test_ifont_size(240000, 10, 10, -848, "identical ratio 2"); + test_ifont_size(300000, 10, 10, -1058, "identical ratio 3"); /* test various combinations of logical and himetric both set to 1 */ - test_ifont_size(180000, 0, 1, 1, -24, "1:1 ratio 1"); - test_ifont_size(240000, 0, 1, 1, -32, "1:1 ratio 2"); - test_ifont_size(300000, 0, 1, 1, -40, "1:1 ratio 3"); + test_ifont_size(180000, 1, 1, -24, "1:1 ratio 1"); + test_ifont_size(240000, 1, 1, -32, "1:1 ratio 2"); + test_ifont_size(300000, 1, 1, -40, "1:1 ratio 3"); /* test various combinations of logical set to 1 */ - test_ifont_size(180000, 0, 1, 0, -24, "1:0 ratio 1"); - test_ifont_size(240000, 0, 1, 0, -32, "1:0 ratio 2"); - test_ifont_size(300000, 0, 1, 0, -40, "1:0 ratio 3"); + test_ifont_size(180000, 1, 0, -24, "1:0 ratio 1"); + test_ifont_size(240000, 1, 0, -32, "1:0 ratio 2"); + test_ifont_size(300000, 1, 0, -40, "1:0 ratio 3"); /* test various combinations of himetric set to 1 */ - test_ifont_size(180000, 0, 0, 1, -24, "0:1 ratio 1"); - test_ifont_size(240000, 0, 0, 1, -32, "0:1 ratio 2"); - test_ifont_size(300000, 0, 0, 1, -40, "0:1 ratio 3"); + test_ifont_size(180000, 0, 1, -24, "0:1 ratio 1"); + test_ifont_size(240000, 0, 1, -32, "0:1 ratio 2"); + test_ifont_size(300000, 0, 1, -40, "0:1 ratio 3"); /* test various combinations of 2:1 logical:himetric */ - test_ifont_size(180000, 0, 2, 1, -1270, "2:1 ratio 1"); - test_ifont_size(240000, 0, 2, 1, -1694, "2:1 ratio 2"); - test_ifont_size(300000, 0, 2, 1, -2117, "2:1 ratio 3"); + test_ifont_size(180000, 2, 1, -1270, "2:1 ratio 1"); + test_ifont_size(240000, 2, 1, -1694, "2:1 ratio 2"); + test_ifont_size(300000, 2, 1, -2117, "2:1 ratio 3"); /* test various combinations of 1:2 logical:himetric */ - test_ifont_size(180000, 0, 1, 2, -318, "1:2 ratio 1"); - test_ifont_size(240000, 0, 1, 2, -424, "1:2 ratio 2"); - test_ifont_size(300000, 0, 1, 2, -529, "1:2 ratio 3"); + test_ifont_size(180000, 1, 2, -318, "1:2 ratio 1"); + test_ifont_size(240000, 1, 2, -424, "1:2 ratio 2"); + test_ifont_size(300000, 1, 2, -529, "1:2 ratio 3"); /* test various combinations of logical and himetric both set to 2 */ - test_ifont_size(180000, 0, 2, 2, -635, "2:2 ratio 1"); - test_ifont_size(240000, 0, 2, 2, -848, "2:2 ratio 2"); - test_ifont_size(300000, 0, 2, 2, -1058, "2:2 ratio 3"); + test_ifont_size(180000, 2, 2, -635, "2:2 ratio 1"); + test_ifont_size(240000, 2, 2, -848, "2:2 ratio 2"); + test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } static void test_QueryInterface(void)

1 0