October 2016 - Wine-commits

Huw Davies : wordpad: Add list labelling menu.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: c11d931ea33068faeae931430de7a23a722310e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11d931ea33068faeae931430… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 13:13:05 2016 +0100 wordpad: Add list labelling menu. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 38 +++++++++++++++++++++++++++++++------- programs/wordpad/wordpad.h | 12 +++++++++--- programs/wordpad/wordpad.rc | 10 +++++++++- 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index ea6e11d..dc3918e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -79,6 +79,8 @@ static WCHAR units_inW[MAX_STRING_LEN]; static WCHAR units_inchW[MAX_STRING_LEN]; static WCHAR units_ptW[MAX_STRING_LEN]; +static int last_bullet = PFN_BULLET; + static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ); typedef enum @@ -1886,7 +1888,7 @@ static LRESULT OnCreate( HWND hWnd ) AddButton(hFormatBarWnd, 5, ID_ALIGN_CENTER); AddButton(hFormatBarWnd, 6, ID_ALIGN_RIGHT); AddSeparator(hFormatBarWnd); - AddButton(hFormatBarWnd, 7, ID_BULLET); + AddButton(hFormatBarWnd, 7, ID_BULLETONOFF); SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0); @@ -1994,7 +1996,7 @@ static LRESULT OnUser( HWND hWnd ) SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_CENTER, (pf.wAlignment == PFA_CENTER)); SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_ALIGN_RIGHT, (pf.wAlignment == PFA_RIGHT)); - SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLET, (pf.wNumbering & PFN_BULLET)); + SendMessageW(hwndFormatBar, TB_CHECKBUTTON, ID_BULLETONOFF, pf.wNumbering ? TRUE : FALSE); return 0; } @@ -2351,30 +2353,45 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_REDO, 0, 0); return 0; + case ID_BULLETONOFF: case ID_BULLET: + case ID_NUMBERING: + case ID_LCLETTER: + case ID_UCLETTER: + case ID_LCROMAN: + case ID_UCROMAN: { PARAFORMAT2 pf; - + WORD new_number = LOWORD(wParam) - ID_BULLET + PFN_BULLET; pf.cbSize = sizeof(pf); pf.dwMask = PFM_NUMBERING; SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); - pf.dwMask = PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGTAB | PFM_OFFSET | PFM_OFFSETINDENT; + pf.dwMask = PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGSTYLE | PFM_NUMBERINGTAB | PFM_OFFSET | PFM_OFFSETINDENT; - if(pf.wNumbering == PFN_BULLET) + if(pf.wNumbering && ((pf.wNumbering == new_number) || (LOWORD(wParam) == ID_BULLETONOFF))) { pf.wNumbering = 0; pf.wNumberingStart = 0; + pf.wNumberingStyle = 0; pf.wNumberingTab = 0; pf.dxOffset = 0; pf.dxStartIndent = -360; } else { - pf.wNumbering = PFN_BULLET; + pf.dxStartIndent = pf.wNumbering ? 0 : 360; + + if (LOWORD(wParam) == ID_BULLETONOFF) + pf.wNumbering = last_bullet; + else + { + pf.wNumbering = new_number; + last_bullet = pf.wNumbering; + } pf.wNumberingStart = 1; + pf.wNumberingStyle = PFNS_PERIOD; pf.wNumberingTab = 360; pf.dxOffset = 360; - pf.dxStartIndent = 360; } SendMessageW(hwndEditor, EM_SETPARAFORMAT, 0, (LPARAM)&pf); @@ -2502,7 +2519,14 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) CheckMenuItem(hMenu, ID_ALIGN_LEFT, (nAlignment == PFA_LEFT) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_ALIGN_CENTER, (nAlignment == PFA_CENTER) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_ALIGN_RIGHT, (nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_BULLET, ((pf.wNumbering == PFN_BULLET) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_NUMBERING, ((pf.wNumbering == PFN_ARABIC) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_LCLETTER, ((pf.wNumbering == PFN_LCLETTER) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_UCLETTER, ((pf.wNumbering == PFN_UCLETTER) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_LCROMAN, ((pf.wNumbering == PFN_LCROMAN) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(hMenu, ID_UCROMAN, ((pf.wNumbering == PFN_UCROMAN) ? MF_CHECKED : MF_UNCHECKED)); + EnableMenuItem(hMenu, ID_EDIT_UNDO, SendMessageW(hwndEditor, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(hMenu, ID_EDIT_REDO, SendMessageW(hwndEditor, EM_CANREDO, 0, 0) ? diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 0cde557..901b19c 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -73,9 +73,15 @@ #define ID_EDIT_CUT 1311 #define ID_EDIT_PASTE 1312 #define ID_EDIT_CLEAR 1313 -#define ID_BULLET 1314 - -#define ID_FONTSETTINGS 1315 +#define ID_BULLETONOFF 1314 +#define ID_BULLET 1315 +#define ID_NUMBERING 1316 +#define ID_LCLETTER 1317 +#define ID_UCLETTER 1318 +#define ID_LCROMAN 1319 +#define ID_UCROMAN 1320 + +#define ID_FONTSETTINGS 1330 #define ID_FORMAT_BOLD 1400 #define ID_FORMAT_ITALIC 1401 diff --git a/programs/wordpad/wordpad.rc b/programs/wordpad/wordpad.rc index ff4f823..147beea 100644 --- a/programs/wordpad/wordpad.rc +++ b/programs/wordpad/wordpad.rc @@ -81,7 +81,15 @@ BEGIN POPUP "F&ormat" BEGIN MENUITEM "&Font...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET + POPUP "&Lists" + BEGIN + MENUITEM "&Bullet points" ID_BULLET + MENUITEM "Numbers" ID_NUMBERING + MENUITEM "Letters - lower case" ID_LCLETTER + MENUITEM "Letters - upper case" ID_UCLETTER + MENUITEM "Roman numerals - lower case" ID_LCROMAN + MENUITEM "Roman numerals - upper case" ID_UCROMAN + END MENUITEM "&Paragraph..." ID_PARAFORMAT MENUITEM "&Tabs..." ID_TABSTOPS POPUP "Backgroun&d"

1 0

Akihiro Sagawa : webservices: Avoid decoding a nul character reference.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 064edd2d8b3f02b57fd881d40e89cf7ae9c1adba URL: http://source.winehq.org/git/wine.git/?a=commit;h=064edd2d8b3f02b57fd881d40… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 10 22:53:12 2016 +0900 webservices: Avoid decoding a nul character reference. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 ++ dlls/webservices/tests/reader.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8b9faf2..655288a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1166,6 +1166,8 @@ static HRESULT parse_name( const unsigned char *str, unsigned int len, static int codepoint_to_utf8( int cp, unsigned char *dst ) { + if (!cp) + return -1; if (cp < 0x80) { *dst = cp; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 06c18b2..76de14a 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3610,6 +3610,7 @@ static void test_entities(void) static const char str25[] = "<t></t>"; static const char str26[] = "<t></t>"; static const char str27[] = "<t>&LT;</t>"; + static const char str28[] = "<t></t>"; static const char res4[] = {0xea, 0xaa, 0xaa, 0x00}; static const char res5[] = {0xf2, 0xaa, 0xaa, 0xaa, 0x00}; static const char res21[] = {0xed, 0x9f, 0xbf, 0x00}; @@ -3649,6 +3650,7 @@ static void test_entities(void) { str25, WS_E_INVALID_FORMAT }, { str26, WS_E_INVALID_FORMAT }, { str27, WS_E_INVALID_FORMAT }, + { str28, WS_E_INVALID_FORMAT }, }; HRESULT hr; WS_XML_READER *reader;

1 0

Akihiro Sagawa : webservices: Add support for decoding decimal numeric character references.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: dd4c126e956281269dca5a9025159dd1c802ed27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4c126e956281269dca5a902… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 10 22:53:14 2016 +0900 webservices: Add support for decoding decimal numeric character references. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 50 +++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 7 ++++++ 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 655288a..de92603 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1249,23 +1249,45 @@ static HRESULT decode_text( const unsigned char *str, ULONG len, unsigned char * int len_utf8, cp = 0; p++; len--; - if (!len || *p != 'x') return WS_E_INVALID_FORMAT; - p++; len--; - - start = len; - while (len && isxdigit( *p )) { p++; len--; }; if (!len) return WS_E_INVALID_FORMAT; - - p -= nb_digits = start - len; - if (!nb_digits || nb_digits > 5 || p[nb_digits] != ';') return WS_E_INVALID_FORMAT; - for (i = 0; i < nb_digits; i++) + else if (*p == 'x') + { + p++; len--; + + start = len; + while (len && isxdigit( *p )) { p++; len--; }; + if (!len) return WS_E_INVALID_FORMAT; + + p -= nb_digits = start - len; + if (!nb_digits || nb_digits > 5 || p[nb_digits] != ';') return WS_E_INVALID_FORMAT; + for (i = 0; i < nb_digits; i++) + { + cp *= 16; + if (*p >= '0' && *p <= '9') cp += *p - '0'; + else if (*p >= 'a' && *p <= 'f') cp += *p - 'a' + 10; + else cp += *p - 'A' + 10; + p++; + } + } + else if (isdigit( *p )) { - cp *= 16; - if (*p >= '0' && *p <= '9') cp += *p - '0'; - else if (*p >= 'a' && *p <= 'f') cp += *p - 'a' + 10; - else cp += *p - 'A' + 10; - p++; + while (len && *p == '0') { p++; len--; }; + if (!len) return WS_E_INVALID_FORMAT; + + start = len; + while (len && isdigit( *p )) { p++; len--; }; + if (!len) return WS_E_INVALID_FORMAT; + + p -= nb_digits = start - len; + if (!nb_digits || nb_digits > 7 || p[nb_digits] != ';') return WS_E_INVALID_FORMAT; + for (i = 0; i < nb_digits; i++) + { + cp *= 10; + cp += *p - '0'; + p++; + } } + else return WS_E_INVALID_FORMAT; p++; len--; if ((len_utf8 = codepoint_to_utf8( cp, q )) < 0) return WS_E_INVALID_FORMAT; *ret_len += len_utf8; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 76de14a..f0fe729 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3611,10 +3611,14 @@ static void test_entities(void) static const char str26[] = "<t></t>"; static const char str27[] = "<t>&LT;</t>"; static const char str28[] = "<t></t>"; + static const char str29[] = "<t></t>"; + static const char str30[] = "<t>A</t>"; + static const char str31[] = "<t>ｱ</t>"; static const char res4[] = {0xea, 0xaa, 0xaa, 0x00}; static const char res5[] = {0xf2, 0xaa, 0xaa, 0xaa, 0x00}; static const char res21[] = {0xed, 0x9f, 0xbf, 0x00}; static const char res24[] = {0xee, 0x80, 0x80, 0x00}; + static const char res31[] = {0xef, 0xbd, 0xb1, 0x00}; static const struct { const char *str; @@ -3651,6 +3655,9 @@ static void test_entities(void) { str26, WS_E_INVALID_FORMAT }, { str27, WS_E_INVALID_FORMAT }, { str28, WS_E_INVALID_FORMAT }, + { str29, WS_E_INVALID_FORMAT }, + { str30, S_OK, "A" }, + { str31, S_OK, res31 }, }; HRESULT hr; WS_XML_READER *reader;

1 0

Akihiro Sagawa : webservices: Add support for decoding supplementary characters' references.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: b98293e405eda13a67cae6da654d9774c90f3650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98293e405eda13a67cae6da6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Oct 10 22:53:15 2016 +0900 webservices: Add support for decoding supplementary characters' references. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 3 ++- dlls/webservices/tests/reader.c | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index de92603..a6f5d6b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1190,6 +1190,7 @@ static int codepoint_to_utf8( int cp, unsigned char *dst ) dst[0] = 0xe0 | cp; return 3; } + if (cp >= 0x110000) return -1; dst[3] = 0x80 | (cp & 0x3f); cp >>= 6; dst[2] = 0x80 | (cp & 0x3f); @@ -1259,7 +1260,7 @@ static HRESULT decode_text( const unsigned char *str, ULONG len, unsigned char * if (!len) return WS_E_INVALID_FORMAT; p -= nb_digits = start - len; - if (!nb_digits || nb_digits > 5 || p[nb_digits] != ';') return WS_E_INVALID_FORMAT; + if (!nb_digits || nb_digits > 6 || p[nb_digits] != ';') return WS_E_INVALID_FORMAT; for (i = 0; i < nb_digits; i++) { cp *= 16; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index f0fe729..a020c01 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3614,11 +3614,16 @@ static void test_entities(void) static const char str29[] = "<t></t>"; static const char str30[] = "<t>A</t>"; static const char str31[] = "<t>ｱ</t>"; + static const char str32[] = "<t>􏿿</t>"; + static const char str33[] = "<t>&#x110000;</t>"; + static const char str34[] = "<t>􏿿</t>"; + static const char str35[] = "<t>&#1114112;</t>"; static const char res4[] = {0xea, 0xaa, 0xaa, 0x00}; static const char res5[] = {0xf2, 0xaa, 0xaa, 0xaa, 0x00}; static const char res21[] = {0xed, 0x9f, 0xbf, 0x00}; static const char res24[] = {0xee, 0x80, 0x80, 0x00}; static const char res31[] = {0xef, 0xbd, 0xb1, 0x00}; + static const char res32[] = {0xf4, 0x8f, 0xbf, 0xbf, 0x00}; static const struct { const char *str; @@ -3658,6 +3663,10 @@ static void test_entities(void) { str29, WS_E_INVALID_FORMAT }, { str30, S_OK, "A" }, { str31, S_OK, res31 }, + { str32, S_OK, res32 }, + { str33, WS_E_INVALID_FORMAT }, + { str34, S_OK, res32 }, + { str35, WS_E_INVALID_FORMAT }, }; HRESULT hr; WS_XML_READER *reader;

1 0

Marcus Meissner : gdiplus: Assign error return (Coverity).
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 4c3f494aa099c7213dcbaa829dfafb4ad6f3d521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3f494aa099c7213dcbaa829… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 9 09:24:52 2016 +0200 gdiplus: Assign error return (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 9de584c..f9ed14c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1361,7 +1361,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return stat; } - GdipBeginContainer2(metafile->playback_graphics, &cont->state); + stat = GdipBeginContainer2(metafile->playback_graphics, &cont->state); if (stat != Ok) {

1 0

Vincent Povirk : gdiplus: Add FIXME for EMF records we need to implement.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 2054c8fe6ffcab3ea22756a664eb00cadece1bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2054c8fe6ffcab3ea22756a66… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 7 16:03:42 2016 -0500 gdiplus: Add FIXME for EMF records we need to implement. These records cause state tracking in gdi32, but the state tracking doesn't work correctly because we didn't pass a DC to EnumEnhMetaFile. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f9ed14c..409a6c4 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1131,6 +1131,26 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { ENHMETARECORD *record; + switch (recordType) + { + case EMR_SETMAPMODE: + case EMR_SAVEDC: + case EMR_RESTOREDC: + case EMR_SETWINDOWORGEX: + case EMR_SETWINDOWEXTEX: + case EMR_SETVIEWPORTORGEX: + case EMR_SETVIEWPORTEXTEX: + case EMR_EXTSELECTCLIPRGN: + case EMR_SETWORLDTRANSFORM: + case EMR_SCALEVIEWPORTEXTEX: + case EMR_SCALEWINDOWEXTEX: + case EMR_MODIFYWORLDTRANSFORM: + FIXME("not implemented for record type %x\n", recordType); + break; + default: + break; + } + record = heap_alloc_zero(dataSize + 8); if (record)

1 0

Vincent Povirk : gdiplus/tests: Add test for gdi32 SetWorldTransform record.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 094516d47a0e6f2776787c05b5b73189f5103e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094516d47a0e6f2776787c05b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 7 16:03:43 2016 -0500 gdiplus/tests: Add test for gdi32 SetWorldTransform record. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 136 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 132 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 7251ff3..83054ca 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -36,6 +36,8 @@ typedef struct emfplus_record BOOL todo; ULONG record_type; BOOL playback_todo; + void (*playback_fn)(GpMetafile* metafile, EmfPlusRecordType record_type, + unsigned int flags, unsigned int dataSize, const unsigned char *pStr); } emfplus_record; typedef struct emfplus_check_state @@ -205,12 +207,19 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned emfplus_check_state *state = (emfplus_check_state*)userdata; GpStatus stat; - stat = GdipPlayMetafileRecord(state->metafile, record_type, flags, dataSize, pStr); - if (state->expected[state->count].record_type) { - todo_wine_if (state->expected[state->count].playback_todo) - ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); + BOOL match = (state->expected[state->count].record_type == record_type); + + if (match && state->expected[state->count].playback_fn) + state->expected[state->count].playback_fn(state->metafile, record_type, flags, dataSize, pStr); + else + { + stat = GdipPlayMetafileRecord(state->metafile, record_type, flags, dataSize, pStr); + todo_wine_if (state->expected[state->count].playback_todo) + ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); + } + todo_wine_if (state->expected[state->count].todo) ok(state->expected[state->count].record_type == record_type, "%s.%i: expected record type 0x%x, got 0x%x\n", state->desc, state->count, @@ -2145,6 +2154,124 @@ static void test_clipping(void) expect(Ok, stat); } +static void test_gditransform_cb(GpMetafile* metafile, EmfPlusRecordType record_type, + unsigned int flags, unsigned int dataSize, const unsigned char *pStr) +{ + static const XFORM xform = {0.5, 0, 0, 0.5, 0, 0}; + static const RECTL rectangle = {0,0,100,100}; + GpStatus stat; + + stat = GdipPlayMetafileRecord(metafile, EMR_SETWORLDTRANSFORM, 0, sizeof(xform), (void*)&xform); + expect(Ok, stat); + + stat = GdipPlayMetafileRecord(metafile, EMR_RECTANGLE, 0, sizeof(rectangle), (void*)&rectangle); + expect(Ok, stat); +} + +static const emfplus_record gditransform_records[] = { + {0, EMR_HEADER}, + {0, EMR_CREATEBRUSHINDIRECT}, + {0, EMR_SELECTOBJECT}, + {0, EMR_GDICOMMENT, 0, test_gditransform_cb}, + {0, EMR_SELECTOBJECT}, + {0, EMR_DELETEOBJECT}, + {0, EMR_EOF}, + {0} +}; + +static void test_gditransform(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc, metafile_dc; + HENHMETAFILE hemf; + MetafileHeader header; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{40.0,0.0},{0.0,40.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + HBRUSH hbrush, holdbrush; + GpBitmap *bitmap; + ARGB color; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + memset(&header, 0xaa, sizeof(header)); + stat = GdipGetMetafileHeaderFromMetafile(metafile, &header); + expect(Ok, stat); + expect(MetafileTypeEmf, header.Type); + ok(header.Version == 0xdbc01001 || header.Version == 0xdbc01002, "Unexpected version %x\n", header.Version); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &metafile_dc); + expect(Ok, stat); + + if (stat != Ok) + { + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)metafile); + return; + } + + hbrush = CreateSolidBrush(0xff); + + holdbrush = SelectObject(metafile_dc, hbrush); + + GdiComment(metafile_dc, 8, (const BYTE*)"winetest"); + + SelectObject(metafile_dc, holdbrush); + + DeleteObject(hbrush); + + stat = GdipReleaseDC(graphics, metafile_dc); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, gditransform_records, "gditransform metafile", dst_points, &frame, UnitPixel); + + sync_metafile(&metafile, "gditransform.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, gditransform_records, "gditransform playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 10, 10, &color); + expect(Ok, stat); + expect(0xffff0000, color); + + stat = GdipBitmapGetPixel(bitmap, 30, 30, &color); + expect(Ok, stat); + todo_wine expect(0x00000000, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2181,6 +2308,7 @@ START_TEST(metafile) test_frameunit(); test_containers(); test_clipping(); + test_gditransform(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Implement EMR_SETWORLDTRANSFORM playback.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 28cfa306b467abb026da1f9442bc247c4c9dc790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cfa306b467abb026da1f944… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 7 16:03:44 2016 -0500 gdiplus: Implement EMR_SETWORLDTRANSFORM playback. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 50 +++++++++++++++++++++++++++++------------- dlls/gdiplus/tests/metafile.c | 2 +- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 86a29a0..340e9bd 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -374,6 +374,7 @@ struct GpMetafile{ GpRectF src_rect; HANDLETABLE *handle_table; int handle_count; + XFORM gdiworldtransform; GpMatrix *world_transform; GpUnit page_unit; REAL page_scale; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 409a6c4..32cd04e 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1040,6 +1040,30 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +static GpStatus METAFILE_PlaybackUpdateGdiTransform(GpMetafile *metafile) +{ + XFORM combined, final; + const GpRectF *rect; + const GpPointF *pt; + + /* This transforms metafile device space to output points. */ + rect = &metafile->src_rect; + pt = metafile->playback_points; + final.eM11 = (pt[1].X - pt[0].X) / rect->Width; + final.eM21 = (pt[2].X - pt[0].X) / rect->Height; + final.eDx = pt[0].X - final.eM11 * rect->X - final.eM21 * rect->Y; + final.eM12 = (pt[1].Y - pt[0].Y) / rect->Width; + final.eM22 = (pt[2].Y - pt[0].Y) / rect->Height; + final.eDy = pt[0].Y - final.eM12 * rect->X - final.eM22 * rect->Y; + + CombineTransform(&combined, &metafile->gdiworldtransform, &final); + + SetGraphicsMode(metafile->playback_dc, GM_ADVANCED); + SetWorldTransform(metafile->playback_dc, &combined); + + return Ok; +} + static GpStatus METAFILE_PlaybackGetDC(GpMetafile *metafile) { GpStatus stat = Ok; @@ -1048,20 +1072,10 @@ static GpStatus METAFILE_PlaybackGetDC(GpMetafile *metafile) if (stat == Ok) { - /* The result of GdipGetDC always expects device co-ordinates, but the - * device co-ordinates of the source metafile do not correspond to - * device co-ordinates of the destination. Therefore, we set up the DC - * so that the metafile's bounds map to the destination points where we - * are drawing this metafile. */ - SetMapMode(metafile->playback_dc, MM_ANISOTROPIC); - - SetWindowOrgEx(metafile->playback_dc, metafile->bounds.X, metafile->bounds.Y, NULL); - SetWindowExtEx(metafile->playback_dc, metafile->bounds.Width, metafile->bounds.Height, NULL); - - SetViewportOrgEx(metafile->playback_dc, metafile->playback_points[0].X, metafile->playback_points[0].Y, NULL); - SetViewportExtEx(metafile->playback_dc, - metafile->playback_points[1].X - metafile->playback_points[0].X, - metafile->playback_points[2].Y - metafile->playback_points[0].Y, NULL); + static const XFORM identity = {1, 0, 0, 1, 0, 0}; + + metafile->gdiworldtransform = identity; + METAFILE_PlaybackUpdateGdiTransform(metafile); } return stat; @@ -1141,12 +1155,18 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, case EMR_SETVIEWPORTORGEX: case EMR_SETVIEWPORTEXTEX: case EMR_EXTSELECTCLIPRGN: - case EMR_SETWORLDTRANSFORM: case EMR_SCALEVIEWPORTEXTEX: case EMR_SCALEWINDOWEXTEX: case EMR_MODIFYWORLDTRANSFORM: FIXME("not implemented for record type %x\n", recordType); break; + case EMR_SETWORLDTRANSFORM: + { + const XFORM* xform = (void*)data; + real_metafile->gdiworldtransform = *xform; + METAFILE_PlaybackUpdateGdiTransform(real_metafile); + break; + } default: break; } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 83054ca..a61206d 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2260,7 +2260,7 @@ static void test_gditransform(void) stat = GdipBitmapGetPixel(bitmap, 30, 30, &color); expect(Ok, stat); - todo_wine expect(0x00000000, color); + expect(0x00000000, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Nikolay Sivov : include: Update to latest dwrite revision.
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 04e64b138fbfff60e974cef31584e8bbaad72102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e64b138fbfff60e974cef31… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 9 23:35:59 2016 +0300 include: Update to latest dwrite revision. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2dbasetypes.h | 12 ------ include/dcommon.h | 14 +++++++ include/dwrite_3.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 12 deletions(-) diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index e5acff2..b231081 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -29,12 +29,6 @@ typedef struct D3DCOLORVALUE typedef D3DCOLORVALUE D2D_COLOR_F; -typedef struct D2D_POINT_2F -{ - FLOAT x; - FLOAT y; -} D2D_POINT_2F; - typedef struct D2D_MATRIX_3X2_F { float _11; @@ -59,12 +53,6 @@ typedef struct D2D_SIZE_F float height; } D2D_SIZE_F; -typedef struct D2D_SIZE_U -{ - UINT32 width; - UINT32 height; -} D2D_SIZE_U; - typedef struct D2D_POINT_2U { UINT32 x; diff --git a/include/dcommon.h b/include/dcommon.h index 56445a3..a516e8a 100644 --- a/include/dcommon.h +++ b/include/dcommon.h @@ -43,4 +43,18 @@ typedef struct D2D1_PIXEL_FORMAT D2D1_ALPHA_MODE alphaMode; } D2D1_PIXEL_FORMAT; +typedef struct D2D_POINT_2F +{ + FLOAT x; + FLOAT y; +} D2D_POINT_2F, D2D1_POINT_2F; + +typedef POINT D2D_POINT_2L, D2D1_POINT_2L; + +typedef struct D2D_SIZE_U +{ + UINT32 width; + UINT32 height; +} D2D_SIZE_U, D2D1_SIZE_U; + #endif /* __WINE_DCOMMON_H */ diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 9e7a4c6..afe7e84 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -397,3 +397,104 @@ interface IDWriteFactory3 : IDWriteFactory2 HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); } + +typedef enum DWRITE_GLYPH_IMAGE_FORMATS +{ + DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, + DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, + DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, + DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, + DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, + DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, + DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, + DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 +} DWRITE_GLYPH_IMAGE_FORMATS; + +typedef struct DWRITE_GLYPH_IMAGE_DATA +{ + void const *imageData; + UINT32 imageDataSize; + UINT32 uniqueDataId; + UINT32 pixelsPerEm; + D2D1_SIZE_U pixelSize; + D2D1_POINT_2L horizontalLeftOrigin; + D2D1_POINT_2L horizontalRightOrigin; + D2D1_POINT_2L verticalTopOrigin; + D2D1_POINT_2L verticalBottomOrigin; +} DWRITE_GLYPH_IMAGE_DATA; + +[ + local, + object, + uuid(27f2a904-4eb8-441d-9678-0563f53e3e2f) +] +interface IDWriteFontFace4 : IDWriteFontFace3 +{ + HRESULT GetGlyphImageFormats_( + UINT16 glyph, + UINT32 ppem_first, + UINT32 ppem_last, + DWRITE_GLYPH_IMAGE_FORMATS *formats); + DWRITE_GLYPH_IMAGE_FORMATS GetGlyphImageFormats(); + HRESULT GetGlyphImageData( + UINT16 glyph, + UINT32 ppem, + DWRITE_GLYPH_IMAGE_FORMATS format, + DWRITE_GLYPH_IMAGE_DATA *data, + void **context); + void ReleaseGlyphImageData(void *context); +} + +typedef struct DWRITE_COLOR_GLYPH_RUN1 +{ + DWRITE_GLYPH_RUN glyphRun; + DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription; + FLOAT baselineOriginX; + FLOAT baselineOriginY; + DWRITE_COLOR_F runColor; + UINT16 paletteIndex; + DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat; + DWRITE_MEASURING_MODE measuringMode; +} DWRITE_COLOR_GLYPH_RUN1; + +[ + local, + object, + uuid(7c5f86da-c7a1-4f05-b8e1-55a179fe5a35) +] +interface IDWriteColorGlyphRunEnumerator1 : IDWriteColorGlyphRunEnumerator +{ + HRESULT GetCurrentRun( + DWRITE_COLOR_GLYPH_RUN1 const **run); +} + +[ + local, + object, + uuid(4b0b5bd3-0797-4549-8ac5-fe915cc53856) +] +interface IDWriteFactory4 : IDWriteFactory3 +{ + HRESULT TranslateColorGlyphRun( + D2D1_POINT_2F baseline_origin, + DWRITE_GLYPH_RUN const *run, + DWRITE_GLYPH_RUN_DESCRIPTION const *run_desc, + DWRITE_GLYPH_IMAGE_FORMATS desired_formats, + DWRITE_MEASURING_MODE measuring_mode, + DWRITE_MATRIX const *transform, + UINT32 palette, + IDWriteColorGlyphRunEnumerator1 **layers); + + HRESULT ComputeGlyphOrigins_( + DWRITE_GLYPH_RUN const *run, + D2D1_POINT_2F baseline_origin, + D2D1_POINT_2F *origins); + + HRESULT ComputeGlyphOrigins( + DWRITE_GLYPH_RUN const *run, + DWRITE_MEASURING_MODE measuring_mode, + D2D1_POINT_2F baseline_origin, + DWRITE_MATRIX const *transform, + D2D1_POINT_2F *origins); +}

1 0

Marcus Meissner : webservices: Add error checking (Coverity).
by Alexandre Julliard 10 Oct '16

10 Oct '16

Module: wine Branch: master Commit: 9767b5ebcf15d40811448cd013e0c55a20edfbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9767b5ebcf15d40811448cd01… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 9 09:40:57 2016 +0200 webservices: Add error checking (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 445d877..2b9c9d7 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -466,7 +466,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS if (!handle || !msg || !desc) return E_INVALIDARG; - WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + if ((hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL )) != S_OK) return hr; if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr;

1 0