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

Huw Davies : riched20: Add support for saving enhanced metafiles.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 8477dcf909b529cb6c079e0579b265a16243a95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8477dcf909b529cb6c079e057… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 7 11:18:23 2016 +0100 riched20: Add support for saving enhanced metafiles. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 76cf5d7..f76d5a5 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -21,6 +21,8 @@ #include "config.h" #include "wine/port.h" +#define NONAMELESSUNION + #include "editor.h" #include "rtf.h" @@ -115,6 +117,32 @@ ME_StreamOutPrint(ME_OutStream *pStream, const char *format, ...) return ME_StreamOutMove(pStream, string, len); } +#define HEX_BYTES_PER_LINE 40 + +static BOOL +ME_StreamOutHexData(ME_OutStream *stream, const BYTE *data, UINT len) +{ + + char line[HEX_BYTES_PER_LINE * 2 + 1]; + UINT size, i; + static const char hex[] = "0123456789abcdef"; + + while (len) + { + size = min( len, HEX_BYTES_PER_LINE ); + for (i = 0; i < size; i++) + { + line[i * 2] = hex[(*data >> 4) & 0xf]; + line[i * 2 + 1] = hex[*data & 0xf]; + data++; + } + line[size * 2] = '\n'; + if (!ME_StreamOutMove( stream, line, size * 2 + 1 )) + return FALSE; + len -= size; + } + return TRUE; +} static BOOL ME_StreamOutRTFHeader(ME_OutStream *pStream, int dwFormat) @@ -783,6 +811,69 @@ ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars) return ME_StreamOutMove(pStream, buffer, pos); } +static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, + ME_Run *run ) +{ + IDataObject *data; + HRESULT hr; + FORMATETC fmt = { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }; + STGMEDIUM med = { TYMED_NULL }; + BOOL ret = FALSE; + ENHMETAHEADER *emf_bits = NULL; + UINT size; + SIZE goal, pic; + ME_Context c; + + hr = IOleObject_QueryInterface( run->ole_obj->poleobj, &IID_IDataObject, (void **)&data ); + if (FAILED(hr)) return FALSE; + + ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + hr = IDataObject_QueryGetData( data, &fmt ); + if (hr != S_OK) goto done; + + hr = IDataObject_GetData( data, &fmt, &med ); + if (FAILED(hr)) goto done; + if (med.tymed != TYMED_ENHMF) goto done; + + size = GetEnhMetaFileBits( med.u.hEnhMetaFile, 0, NULL ); + if (size < FIELD_OFFSET(ENHMETAHEADER, cbPixelFormat)) goto done; + + emf_bits = HeapAlloc( GetProcessHeap(), 0, size ); + if (!emf_bits) goto done; + + size = GetEnhMetaFileBits( med.u.hEnhMetaFile, size, (BYTE *)emf_bits ); + if (size < FIELD_OFFSET(ENHMETAHEADER, cbPixelFormat)) goto done; + + /* size_in_pixels = (frame_size / 100) * szlDevice / szlMillimeters + pic = size_in_pixels * 2540 / dpi */ + pic.cx = MulDiv( emf_bits->rclFrame.right - emf_bits->rclFrame.left, emf_bits->szlDevice.cx * 254, + emf_bits->szlMillimeters.cx * c.dpi.cx * 10 ); + pic.cy = MulDiv( emf_bits->rclFrame.bottom - emf_bits->rclFrame.top, emf_bits->szlDevice.cy * 254, + emf_bits->szlMillimeters.cy * c.dpi.cy * 10 ); + + /* convert goal size to twips */ + goal.cx = MulDiv( run->ole_obj->sizel.cx, 144, 254 ); + goal.cy = MulDiv( run->ole_obj->sizel.cy, 144, 254 ); + + if (!ME_StreamOutPrint( stream, "{\\*\\shppict{\\pict\\emfblip\\picw%d\\pich%d\\picwgoal%d\\pichgoal%d\n", + pic.cx, pic.cy, goal.cx, goal.cy )) + goto done; + + if (!ME_StreamOutHexData( stream, (BYTE *)emf_bits, size )) + goto done; + + if (!ME_StreamOutPrint( stream, "}}\n" )) + goto done; + + ret = TRUE; + +done: + ME_DestroyContext( &c ); + HeapFree( GetProcessHeap(), 0, emf_bits ); + ReleaseStgMedium( &med ); + IDataObject_Release( data ); + return ret; +} static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, const ME_Cursor *start, int nChars, int dwFormat) @@ -834,7 +925,8 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) continue; if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS) { - FIXME("embedded objects are not handled\n"); + if (!stream_out_graphics(editor, pStream, &cursor.pRun->member.run)) + return FALSE; } else if (cursor.pRun->member.run.nFlags & MERF_TAB) { if (editor->bEmulateVersion10 && /* v1.0 - 3.0 */ cursor.pPara->member.para.pFmt->dwMask & PFM_TABLE &&

1 0

Henri Verbeet : usp10/tests: Add an itemisation test for Persian numerals and punctuation.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: fd5860d2f2e6dfd90d6febf998770236bc8a7cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5860d2f2e6dfd90d6febf99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 20:05:25 2016 +0200 usp10/tests: Add an itemisation test for Persian numerals and punctuation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d0c698f..cf05ed8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -568,6 +568,26 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, static const itemTest t561[] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; static const itemTest t562[] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + /* Persian numerals and punctuation. */ + static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ + 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ + static const itemTest t571[] = {{{0,1,0,1,1,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,1,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,1,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,1,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t572[] = {{{0,0,0,1,1,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,1,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,1,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,1,0},11,0,0,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t573[] = {{{0,0,0,0,1,0}, 0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,1,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,1,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,1,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t574[] = {{{0,0,1,0,1,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,1,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,1,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,1,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -649,6 +669,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); test_items_ok(test56,6,NULL,NULL,1,t561,FALSE,0); + test_items_ok(test57,13,NULL,NULL,7,t571,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -712,6 +733,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t572,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -767,6 +789,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -823,6 +846,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t574,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; @@ -888,6 +912,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test54,7,&Control,&State,2,t542,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t552,FALSE,0); test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); + test_items_ok(test57,13,&Control,&State,7,t573,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,

1 0

Henri Verbeet : usp10: Fix the script tag and fallback font for Script_Persian.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: e49ad1cc5b99c2e551931858843f9884bcbcf279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49ad1cc5b99c2e5519318588… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 20:05:26 2016 +0200 usp10: Fix the script tag and fallback font for Script_Persian. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 32 ++++++++++++++++---------------- dlls/usp10/usp10.c | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cf05ed8..e74112b 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -571,22 +571,22 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, /* Persian numerals and punctuation. */ static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ - static const itemTest t571[] = {{{0,1,0,1,1,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,1,0,1,1,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,1,0,1,1,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,1,0,1,1,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t572[] = {{{0,0,0,1,1,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,1,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,1,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,1,0},11,0,0,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t573[] = {{{0,0,0,0,1,0}, 0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,0,0,1,arab_tag,FALSE}, - {{0,0,0,0,1,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE}, - {{0,0,0,0,1,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE}, - {{0,0,0,0,1,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t574[] = {{{0,0,1,0,1,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,1,0,1,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,1,0,1,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,0,1,0,1,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t571[] = {{{0,1,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,1,0,1,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t572[] = {{{0,0,0,1,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,0,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,0,0},11,0,0,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t573[] = {{{0,0,0,0,0,0}, 0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE}, + {{0,0,0,0,0,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t574[] = {{{0,0,1,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,1,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index db12934..e711c42 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -344,8 +344,8 @@ const scriptData scriptInformation[] = { {'E','s','t','r','a','n','g','e','l','o',' ','E','d','e','s','s','a',0}}, {{Script_Persian, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - MS_MAKE_TAG('s','y','r','c'), - {'E','s','t','r','a','n','g','e','l','o',' ','E','d','e','s','s','a',0}}, + MS_MAKE_TAG('a','r','a','b'), + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Thaana, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_DIVEHI, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','h','a','a'),

1 0

Henri Verbeet : usp10: Persian numerals are written left-to-right.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 8b114ddaf674d2d567400442a51441d5de6eb519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b114ddaf674d2d567400442a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 20:05:27 2016 +0200 usp10: Persian numerals are written left-to-right. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 8 ++++---- dlls/usp10/usp10.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e74112b..04a225c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -571,10 +571,10 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, /* Persian numerals and punctuation. */ static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ - static const itemTest t571[] = {{{0,1,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,1,0,1,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,1,0,1,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,1,0,1,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t571[] = {{{0,0,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,1,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t572[] = {{{0,0,0,1,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, {{0,0,0,1,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, {{0,0,0,1,0,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e711c42..cb5a879 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -342,7 +342,7 @@ const scriptData scriptInformation[] = { {LANG_SYRIAC, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 1, 0}, MS_MAKE_TAG('s','y','r','c'), {'E','s','t','r','a','n','g','e','l','o',' ','E','d','e','s','s','a',0}}, - {{Script_Persian, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Persian, 0, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('a','r','a','b'), {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}},

1 0

Henri Verbeet : usp10: Set the base embedding level for Script_Persian to 2.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: ae1c02a27f2d3677e2f9cbb9aa9e0d2834f710fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1c02a27f2d3677e2f9cbb9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 20:05:28 2016 +0200 usp10: Set the base embedding level for Script_Persian to 2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 8 ++++---- dlls/usp10/usp10.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 04a225c..6017241 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -571,10 +571,10 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, /* Persian numerals and punctuation. */ static const WCHAR test57[] = {0x06f1, 0x06f2, 0x066c, 0x06f3, 0x06f4, 0x06f5, 0x066c, /* ۱۲٬۳۴۵٬ */ 0x06f6, 0x06f7, 0x06f8, 0x066b, 0x06f9, 0x06f0}; /* ۶۷۸٫۹۰ */ - static const itemTest t571[] = {{{0,0,0,1,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t571[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t572[] = {{{0,0,0,1,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, {{0,0,0,1,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, {{0,0,0,1,0,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index cb5a879..7f6af24 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -342,7 +342,7 @@ const scriptData scriptInformation[] = { {LANG_SYRIAC, 0, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 1, 0}, MS_MAKE_TAG('s','y','r','c'), {'E','s','t','r','a','n','g','e','l','o',' ','E','d','e','s','s','a',0}}, - {{Script_Persian, 0, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Persian, 0, 1, 0, 0, 0, 0, { 2,0,0,0,0,0,0,0,0,0,0}}, {LANG_PERSIAN, 1, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('a','r','a','b'), {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}},

1 0

Henri Verbeet : usp10: Properly check for numeric scripts.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: e54bee4415a4ed6f428c7a2074d707005d700757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54bee4415a4ed6f428c7a207… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 20:05:29 2016 +0200 usp10: Properly check for numeric scripts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 16 ++++++++-------- dlls/usp10/usp10.c | 34 +++++++++++++++++----------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6017241..deb5da0 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -575,18 +575,18 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0}, 6,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,1,0,1,0,0},10,0,1,2,0,arab_tag,FALSE}, {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t572[] = {{{0,0,0,1,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,0,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,0,0,1,0,0},11,0,0,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t572[] = {{{0,0,0,0,0,0}, 0,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 3,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 7,0,0,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0},11,0,0,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; static const itemTest t573[] = {{{0,0,0,0,0,0}, 0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 2,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0}, 3,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0}, 6,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0}, 7,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},10,0,0,0,1,arab_tag,FALSE}, {{0,0,0,0,0,0},11,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; - static const itemTest t574[] = {{{0,0,1,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, - {{0,0,1,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, - {{0,0,1,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, - {{0,0,1,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; + static const itemTest t574[] = {{{0,0,0,0,0,0}, 0,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 2,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 3,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0}, 6,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0}, 7,0,1,2,0,arab_tag,FALSE},{{0,0,1,0,0,0},10,0,1,2,0,arab_tag,FALSE}, + {{0,0,0,0,0,0},11,0,1,2,0,arab_tag,FALSE},{{0,0,0,0,0,0},13,0,0,0,0,-1,FALSE}}; SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7f6af24..8c4991a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1253,6 +1253,10 @@ static inline WORD base_indic(WORD script) }; } +static BOOL script_is_numeric(WORD script) +{ + return scriptInformation[script].props.fNumeric; +} static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, int cMaxItems, const SCRIPT_CONTROL *psControl, @@ -1451,12 +1455,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, for (i = 0; i < cInChars; i++) { if (i > 0 && i < cInChars-1 && - scripts[i-1] == Script_Numeric && + script_is_numeric(scripts[i-1]) && strchrW(math_punc, pwcInChars[i])) { - if (scripts[i+1] == Script_Numeric) + if (script_is_numeric(scripts[i+1])) { - scripts[i] = Script_Numeric; + scripts[i] = scripts[i+1]; levels[i] = levels[i-1]; strength[i] = strength[i-1]; i++; @@ -1466,11 +1470,11 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, int j; for (j = i+1; j < cInChars; j++) { - if (scripts[j] == Script_Numeric) + if (script_is_numeric(scripts[j])) { for(;i<j; i++) { - scripts[i] = Script_Numeric; + scripts[i] = scripts[j]; levels[i] = levels[i-1]; strength[i] = strength[i-1]; } @@ -1483,8 +1487,9 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, for (i = 0; i < cInChars; i++) { - /* Script_Numeric at level 0 get bumped to level 2 */ - if (!overrides[i] && (levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) + /* Numerics at level 0 get bumped to level 2 */ + if (!overrides[i] && (levels[i] == 0 || (odd(psState->uBidiLevel) + && levels[i] == psState->uBidiLevel + 1)) && script_is_numeric(scripts[i])) { levels[i] = 2; } @@ -1576,8 +1581,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (overrides) pItems[index].a.s.fOverrideDirection = (overrides[cnt] != 0); pItems[index].a.fRTL = odd(levels[cnt]); - if (pItems[index].a.eScript == Script_Numeric || - pItems[index].a.eScript == Script_Numeric2) + if (script_is_numeric(pItems[index].a.eScript)) pItems[index].a.fLayoutRTL = layoutRTL; else pItems[index].a.fLayoutRTL = pItems[index].a.fRTL; @@ -1590,8 +1594,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, layoutRTL = odd(baselayout); pItems[index].a.s.uBidiLevel = baselevel; pItems[index].a.fRTL = odd(baselevel); - if (pItems[index].a.eScript == Script_Numeric || - pItems[index].a.eScript == Script_Numeric2) + if (script_is_numeric(pItems[index].a.eScript)) pItems[index].a.fLayoutRTL = odd(baselayout); else pItems[index].a.fLayoutRTL = pItems[index].a.fRTL; @@ -1646,8 +1649,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, if (!new_run && strength && str == BIDI_STRONG) { layoutRTL = odd(layout_levels[cnt]); - if (pItems[index].a.eScript == Script_Numeric || - pItems[index].a.eScript == Script_Numeric2) + if (script_is_numeric(pItems[index].a.eScript)) pItems[index].a.fLayoutRTL = layoutRTL; } @@ -1677,8 +1679,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, else layoutRTL = (layoutRTL || odd(layout_levels[cnt])); pItems[index].a.fRTL = odd(levels[cnt]); - if (pItems[index].a.eScript == Script_Numeric || - pItems[index].a.eScript == Script_Numeric2) + if (script_is_numeric(pItems[index].a.eScript)) pItems[index].a.fLayoutRTL = layoutRTL; else pItems[index].a.fLayoutRTL = pItems[index].a.fRTL; @@ -1690,8 +1691,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, pItems[index].a.s.fOverrideDirection = TRUE; pItems[index].a.s.uBidiLevel = baselevel; pItems[index].a.fRTL = odd(baselevel); - if (pItems[index].a.eScript == Script_Numeric|| - pItems[index].a.eScript == Script_Numeric2) + if (script_is_numeric(pItems[index].a.eScript)) pItems[index].a.fLayoutRTL = layoutRTL; else pItems[index].a.fLayoutRTL = pItems[index].a.fRTL;

1 0

Nikolay Sivov : msscript: Implement GetMiscStatus().
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: bcbacd7594c9163a61ae4b70f57c3ff53d755ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbacd7594c9163a61ae4b70f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 7 11:29:35 2016 +0300 msscript: Implement GetMiscStatus(). 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/msscript.ocx/Makefile.in | 2 +- dlls/msscript.ocx/msscript.c | 4 ++-- dlls/msscript.ocx/tests/msscript.c | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 959cd83..bc12e76 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,7 +1,7 @@ MODULE = msscript.ocx RC_SRCS = msscript.rc IDL_SRCS = msscript.idl -IMPORTS = oleaut32 +IMPORTS = ole32 oleaut32 C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 188980e..f837f1e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -618,9 +618,9 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD aspect, D { ScriptControl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, aspect, status); + TRACE("(%p)->(%d %p)\n", This, aspect, status); - return E_NOTIMPL; + return OleRegGetMiscStatus(&CLSID_ScriptControl, aspect, status); } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *logpal) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 89ce1ec..c9a409e 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -28,12 +28,21 @@ static void test_oleobject(void) { IOleObject *obj; + DWORD status; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&obj); ok(hr == S_OK, "got 0x%08x\n", hr); + if (0) /* crashes on w2k3 */ + hr = IOleObject_GetMiscStatus(obj, DVASPECT_CONTENT, NULL); + + status = 0; + hr = IOleObject_GetMiscStatus(obj, DVASPECT_CONTENT, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status != 0, "got 0x%08x\n", status); + IOleObject_Release(obj); }

1 0

Nikolay Sivov : msscript: Implement SetClientSite()/GetClientSite().
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: b67a6a3c4becc96c0dbcfc9c3f3e30d42bbd8102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67a6a3c4becc96c0dbcfc9c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 7 11:29:36 2016 +0300 msscript: Implement SetClientSite()/GetClientSite(). 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/msscript.ocx/msscript.c | 27 +++++++++--- dlls/msscript.ocx/tests/msscript.c | 87 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index f837f1e..a53266c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -32,6 +32,7 @@ struct ScriptControl { IScriptControl IScriptControl_iface; IOleObject IOleObject_iface; LONG ref; + IOleClientSite *site; }; static HINSTANCE msscript_instance; @@ -168,8 +169,11 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if (This->site) + IOleClientSite_Release(This->site); heap_free(This); + } return ref; } @@ -445,18 +449,30 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite { ScriptControl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, site); + TRACE("(%p)->(%p)\n", This, site); - return E_NOTIMPL; + if (This->site) + IOleClientSite_Release(This->site); + + if ((This->site = site)) + IOleClientSite_AddRef(site); + + return S_OK; } static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **site) { ScriptControl *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, site); + TRACE("(%p)->(%p)\n", This, site); - return E_NOTIMPL; + if (!site) + return E_POINTER; + + if ((*site = This->site)) + IOleClientSite_AddRef(*site); + + return S_OK; } static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR containerapp, LPCOLESTR containerobj) @@ -673,6 +689,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IScriptControl_iface.lpVtbl = &ScriptControlVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->ref = 1; + script_control->site = NULL; hres = IScriptControl_QueryInterface(&script_control->IScriptControl_iface, riid, ppv); IScriptControl_Release(&script_control->IScriptControl_iface); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index c9a409e..ab1c3c1 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -25,8 +25,77 @@ #include "msscript.h" #include "wine/test.h" +static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IOleClientSite) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IOleClientSite_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI OleClientSite_AddRef(IOleClientSite *iface) +{ + return 2; +} + +static ULONG WINAPI OleClientSite_Release(IOleClientSite *iface) +{ + return 1; +} + +static HRESULT WINAPI OleClientSite_SaveObject(IOleClientSite *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI OleClientSite_GetMoniker(IOleClientSite *iface, DWORD assign, + DWORD which, IMoniker **moniker) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI OleClientSite_GetContainer(IOleClientSite *iface, IOleContainer **container) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI OleClientSite_ShowObject(IOleClientSite *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI OleClientSite_OnShowWindow(IOleClientSite *iface, BOOL show) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI OleClientSite_RequestNewObjectLayout(IOleClientSite *iface) +{ + return E_NOTIMPL; +} + +static const IOleClientSiteVtbl OleClientSiteVtbl = { + OleClientSite_QueryInterface, + OleClientSite_AddRef, + OleClientSite_Release, + OleClientSite_SaveObject, + OleClientSite_GetMoniker, + OleClientSite_GetContainer, + OleClientSite_ShowObject, + OleClientSite_OnShowWindow, + OleClientSite_RequestNewObjectLayout +}; + +static IOleClientSite testclientsite = { &OleClientSiteVtbl }; + static void test_oleobject(void) { + IOleClientSite *site; IOleObject *obj; DWORD status; HRESULT hr; @@ -43,6 +112,24 @@ static void test_oleobject(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(status != 0, "got 0x%08x\n", status); + hr = IOleObject_SetClientSite(obj, &testclientsite); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (0) /* crashes on w2k3 */ + hr = IOleObject_GetClientSite(obj, NULL); + + hr = IOleObject_GetClientSite(obj, &site); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(site == &testclientsite, "got %p, %p\n", site, &testclientsite); + IOleClientSite_Release(site); + + hr = IOleObject_SetClientSite(obj, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IOleObject_GetClientSite(obj, &site); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(site == NULL, "got %p\n", site); + IOleObject_Release(obj); }

1 0

Józef Kucia : d3d11/tests: Add more tests for creating shader resource views.
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: bbe74e3461e2a69a90e66f2a09afa62a2d353b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe74e3461e2a69a90e66f2a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:35 2016 +0200 d3d11/tests: Add more tests for creating shader resource views. 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 | 209 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 144 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbe74e3461e2a69a90e66…

1 0

Józef Kucia : wined3d: Remove "view_type" from " wined3d_shader_resource_view_desc".
by Alexandre Julliard 07 Jun '16

07 Jun '16

Module: wine Branch: master Commit: 424532c5bd78b9861ea8aa653e6bae8015dfc778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424532c5bd78b9861ea8aa653… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 7 13:24:36 2016 +0200 wined3d: Remove "view_type" from "wined3d_shader_resource_view_desc". 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/view.c | 20 +++++++------------- include/wine/wined3d.h | 21 +++++++-------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 2b1be6a..7bec5b9 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1674,18 +1674,16 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); + wined3d_desc->flags = 0; switch (desc->ViewDimension) { case D3D11_SRV_DIMENSION_BUFFER: - wined3d_desc->view_type = WINED3D_VTYPE_BUFFER; wined3d_desc->u.buffer.start_idx = desc->u.Buffer.u1.FirstElement; wined3d_desc->u.buffer.count = desc->u.Buffer.u2.NumElements; - wined3d_desc->u.buffer.flags = 0; break; case D3D11_SRV_DIMENSION_TEXTURE1D: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_1D; wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture1D.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1693,7 +1691,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE1DARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_1D_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture1DArray.MipLevels; wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice; @@ -1701,7 +1699,6 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2D: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D; wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture2D.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1709,7 +1706,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2DARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture2DArray.MipLevels; wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice; @@ -1717,7 +1714,6 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2DMS: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D; wined3d_desc->u.texture.level_idx = 0; wined3d_desc->u.texture.level_count = 1; wined3d_desc->u.texture.layer_idx = 0; @@ -1725,7 +1721,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = 0; wined3d_desc->u.texture.level_count = 1; wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; @@ -1733,7 +1729,6 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURE3D: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_3D; wined3d_desc->u.texture.level_idx = desc->u.Texture3D.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.Texture3D.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1741,7 +1736,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURECUBE: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_CUBE; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_CUBE; wined3d_desc->u.texture.level_idx = desc->u.TextureCube.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.TextureCube.MipLevels; wined3d_desc->u.texture.layer_idx = 0; @@ -1749,7 +1744,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_TEXTURECUBEARRAY: - wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_CUBE_ARRAY; + wined3d_desc->flags = WINED3D_VIEW_TEXTURE_CUBE | WINED3D_VIEW_TEXTURE_ARRAY; wined3d_desc->u.texture.level_idx = desc->u.TextureCubeArray.MostDetailedMip; wined3d_desc->u.texture.level_count = desc->u.TextureCubeArray.MipLevels; wined3d_desc->u.texture.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; @@ -1757,10 +1752,9 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_BUFFEREX: - wined3d_desc->view_type = WINED3D_VTYPE_BUFFER; + wined3d_desc->flags = desc->u.BufferEx.Flags; wined3d_desc->u.buffer.start_idx = desc->u.BufferEx.FirstElement; wined3d_desc->u.buffer.count = desc->u.BufferEx.NumElements; - wined3d_desc->u.buffer.flags = desc->u.BufferEx.Flags; break; default: diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3ca9eeb..5ca03d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -665,18 +665,6 @@ enum wined3d_resource_type WINED3D_RTYPE_TEXTURE_3D = 3, }; -enum wined3d_view_type -{ - WINED3D_VTYPE_BUFFER = 1, - WINED3D_VTYPE_TEXTURE_1D = 2, - WINED3D_VTYPE_TEXTURE_1D_ARRAY = 3, - WINED3D_VTYPE_TEXTURE_2D = 4, - WINED3D_VTYPE_TEXTURE_2D_ARRAY = 5, - WINED3D_VTYPE_TEXTURE_3D = 6, - WINED3D_VTYPE_TEXTURE_CUBE = 7, - WINED3D_VTYPE_TEXTURE_CUBE_ARRAY = 8, -}; - enum wined3d_pool { WINED3D_POOL_DEFAULT = 0, @@ -1495,6 +1483,12 @@ enum wined3d_display_rotation #define WINED3D_OUTPUT_SLOT_SEMANTIC 0xffffffff #define WINED3D_OUTPUT_SLOT_UNUSED 0xfffffffe +#define WINED3D_VIEW_BUFFER_RAW 0x00000001 +#define WINED3D_VIEW_BUFFER_APPEND 0x00000002 +#define WINED3D_VIEW_BUFFER_COUNTER 0x00000004 +#define WINED3D_VIEW_TEXTURE_CUBE 0x00000008 +#define WINED3D_VIEW_TEXTURE_ARRAY 0x00000010 + struct wined3d_display_mode { UINT width; @@ -1957,14 +1951,13 @@ struct wined3d_shader_desc struct wined3d_shader_resource_view_desc { enum wined3d_format_id format_id; - enum wined3d_view_type view_type; + unsigned int flags; union { struct { unsigned int start_idx; unsigned int count; - unsigned int flags; } buffer; struct {

1 0