June 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmime: Remove unused arguments from helper functions.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 48ce352ea1ba55958fa6d2969397035b5710777f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ce352ea1ba55958fa6d2969… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:14:47 2015 +0200 dmime: Remove unused arguments from helper functions. --- dlls/dmime/segment.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 02bc773..36eea14 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1038,8 +1038,9 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicSegment8Impl* This) { - +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, ListSize[3], ListCount[3]; @@ -1091,8 +1092,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicSegment8Impl* This) { - +static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -1191,7 +1193,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI } case DMUS_FOURCC_TRACK_LIST: { TRACE_(dmfile)(": TRACK list\n"); - hr = IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (iface, &Chunk, pStm, This); + hr = parse_track_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -1218,8 +1220,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadWave (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicObject** ppWaveObject) { - +static HRESULT load_wave(IStream *pClonedStream, IDirectMusicObject **ppWaveObject) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -1271,7 +1273,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_FORM: { TRACE_(dmfile)(": segment form\n"); - hr = IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (iface, &Chunk, pStm, This); + hr = parse_segment_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -1285,8 +1287,8 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR liMove.QuadPart = - (LONGLONG)(sizeof(FOURCC) * 2 + sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicSegment8Impl_IPersistStream_LoadWave (iface, pClonedStream, &pWave); + + hr = load_wave(pClonedStream, &pWave); if (FAILED(hr)) { ERR(": could not load track\n"); return hr;

1 0

Michael Stefaniuc : dmime: Pass objects instead of ifaces to helpers.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 49dd9739dd5fafd6360aea436d9337a1bb40da5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dd9739dd5fafd6360aea436… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:11:40 2015 +0200 dmime: Pass objects instead of ifaces to helpers. --- dlls/dmime/segment.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index d17b341..02bc773 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -841,10 +841,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_IsDirty (LPPERSIST return S_FALSE; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadTrack (LPPERSISTSTREAM iface, IStream* pClonedStream, IDirectMusicTrack** ppTrack, - DMUS_IO_TRACK_HEADER* pTrack_hdr) { - - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); +static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream, + IDirectMusicTrack **ppTrack, DMUS_IO_TRACK_HEADER *pTrack_hdr) +{ HRESULT hr = E_FAIL; IPersistStream* pPersistStream = NULL; @@ -879,9 +878,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadTrack (LPPERSISTSTREA return S_OK; } -static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - /*ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);*/ +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3]; @@ -941,8 +940,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicSegment8Impl_IPersistStream_LoadTrack (iface, pClonedStream, &pTrack, &track_hdr); + + hr = load_track(This, pClonedStream, &pTrack, &track_hdr); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -978,8 +977,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = IDirectMusicSegment8Impl_IPersistStream_LoadTrack (iface, pClonedStream, &pTrack, &track_hdr); + + hr = load_track(This, pClonedStream, &pTrack, &track_hdr); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -1012,7 +1011,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST liMove.QuadPart -= (sizeof(FOURCC) + sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - hr = IDirectMusicSegment8Impl_IPersistStream_LoadTrack (iface, pClonedStream, &pTrack, &track_hdr); + hr = load_track(This, pClonedStream, &pTrack, &track_hdr); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; @@ -1066,7 +1065,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST switch (Chunk.fccID) { case DMUS_FOURCC_TRACK_FORM: { TRACE_(dmfile)(": TRACK form\n"); - hr = IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (iface, &Chunk, pStm); + hr = parse_track_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Michael Stefaniuc : dmband: Use the generic DirectMusicObject implementation for DMBand.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 3f0bd6526930c4410679a02ac9d19b94906dfed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0bd6526930c4410679a02ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:07:17 2015 +0200 dmband: Use the generic DirectMusicObject implementation for DMBand. --- dlls/dmband/Makefile.in | 1 + dlls/dmband/band.c | 167 +++++++++------------------------------- dlls/dmband/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 55 ++++++++++++++ dlls/dmband/tests/dmband.c | 2 +- 5 files changed, 279 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f0bd6526930c4410679a…

1 0

Michael Stefaniuc : dmime: Use the generic DMObject implementation for DMAudioPathConfig.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 93e61eb4e8f32f17a3f20c33cf7754def83a51fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e61eb4e8f32f17a3f20c33c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:19:37 2015 +0200 dmime: Use the generic DMObject implementation for DMAudioPathConfig. --- dlls/dmime/audiopath.c | 152 ++++++++--------------------------------------- dlls/dmime/tests/dmime.c | 6 +- 2 files changed, 28 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93e61eb4e8f32f17a3f20…

1 0

Michael Müller : wininet: Use random names when caching very long urls.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 95649404615fedf1b84d99ab951ae7c84897ce57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95649404615fedf1b84d99ab9… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 28 22:47:20 2015 +0200 wininet: Use random names when caching very long urls. --- dlls/wininet/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 276132b..0e5fe3c 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2630,7 +2630,7 @@ static BOOL urlcache_entry_create(const char *url, const char *ext, WCHAR *full_ if(!InternetCrackUrlA(url, 0, 0, &uc)) uc.dwUrlPathLength = 0; - if(!uc.dwUrlPathLength) { + if(!uc.dwUrlPathLength || uc.dwUrlPathLength >= sizeof(file_name)) { file_name[0] = 0; }else { char *p, *e;

1 0

Michael Stefaniuc : dmime: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 2c66b4b23525c4bfb4e0a6c4d2f6df44fc247f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c66b4b23525c4bfb4e0a6c4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:20:16 2015 +0200 dmime: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmime/audiopath.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index dc1c1c5..04f0af0 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -27,10 +27,6 @@ struct IDirectMusicAudioPathImpl { IDirectMusicAudioPath IDirectMusicAudioPath_iface; struct dmobject dmobj; LONG ref; - - /* IDirectMusicAudioPathImpl fields */ - LPDMUS_OBJECTDESC pDesc; - IDirectMusicPerformance8* pPerf; IDirectMusicGraph* pToolGraph; IDirectSoundBuffer* pDSBuffer; @@ -278,7 +274,7 @@ static HRESULT WINAPI DirectMusicObject_ParseDescriptor(IDirectMusicObject *ifac /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = This->pDesc->guidClass; + pDesc->guidClass = This->dmobj.desc.guidClass; IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -455,20 +451,20 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -490,8 +486,8 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -602,7 +598,6 @@ HRESULT WINAPI create_dmaudiopath(REFIID riid, void **ppobj) (IUnknown *)&obj->IDirectMusicAudioPath_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; hr = IDirectMusicAudioPath_QueryInterface(&obj->IDirectMusicAudioPath_iface, riid, ppobj); IDirectMusicAudioPath_Release(&obj->IDirectMusicAudioPath_iface);

1 0

Michael Stefaniuc : dmband/tests: Add IPersistStream tests for DMBandTrack.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 7bb3e793636648c33d6efbf59ffc02ae230a9547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb3e793636648c33d6efbf59… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:08:38 2015 +0200 dmband/tests: Add IPersistStream tests for DMBandTrack. --- dlls/dmband/tests/dmband.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 185dd7e..0041807 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -173,6 +173,37 @@ static void test_dmband(void) while (IDirectMusicBand_Release(dmb)); } +static void test_bandtrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicBandTrack), + "Expected class CLSID_DirectMusicBandTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -187,6 +218,7 @@ START_TEST(dmband) test_COM(); test_COM_bandtrack(); test_dmband(); + test_bandtrack(); CoUninitialize(); }

1 0

Nikolay Sivov : dwrite: Call GetCount() once when looking for family name.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 6655b0c93adeaf9db1dd3771cebbc2ee6fe280f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6655b0c93adeaf9db1dd3771c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 01:14:25 2015 +0300 dwrite: Call GetCount() once when looking for family name. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4c7fdcf..587dc05 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1435,10 +1435,10 @@ static UINT32 collection_find_family(struct dwrite_fontcollection *collection, c for (i = 0; i < collection->family_count; i++) { IDWriteLocalizedStrings *family_name = collection->family_data[i]->familyname; + UINT32 j, count = IDWriteLocalizedStrings_GetCount(family_name); HRESULT hr; - int j; - for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { + for (j = 0; j < count; j++) { WCHAR buffer[255]; hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); if (SUCCEEDED(hr) && !strcmpiW(buffer, name))

1 0

Nikolay Sivov : dwrite: Initial implementation of Draw() for trimming sign.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 6fd4f963f69f50c3a062e305b89635ff872238b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd4f963f69f50c3a062e305b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 01:13:00 2015 +0300 dwrite: Initial implementation of Draw() for trimming sign. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 33 +++++++++++++++++++++++++-------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/layout.c | 15 +++++++++++++++ 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a692e38..34f67f0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -103,7 +103,7 @@ extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdicompat_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,FLOAT,const DWRITE_MATRIX*,BOOL,IDWriteTextLayout**) DECLSPEC_HIDDEN; -extern HRESULT create_trimmingsign(IDWriteTextFormat*,IDWriteInlineObject**) DECLSPEC_HIDDEN; +extern HRESULT create_trimmingsign(IDWriteFactory2*,IDWriteTextFormat*,IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory2*,IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern void release_gdiinterop(IDWriteGdiInterop*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index bd50e8b..74cdc46 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -243,6 +243,8 @@ struct dwrite_textformat { struct dwrite_trimmingsign { IDWriteInlineObject IDWriteInlineObject_iface; LONG ref; + + IDWriteTextLayout *layout; }; struct dwrite_typography { @@ -3371,7 +3373,6 @@ static HRESULT WINAPI dwritetrimmingsign_QueryInterface(IDWriteInlineObject *ifa *obj = NULL; return E_NOINTERFACE; - } static ULONG WINAPI dwritetrimmingsign_AddRef(IDWriteInlineObject *iface) @@ -3389,18 +3390,24 @@ static ULONG WINAPI dwritetrimmingsign_Release(IDWriteInlineObject *iface) TRACE("(%p)->(%d)\n", This, ref); - if (!ref) + if (!ref) { + IDWriteTextLayout_Release(This->layout); heap_free(This); + } return ref; } static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void *context, IDWriteTextRenderer *renderer, - FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *drawing_effect) + FLOAT originX, FLOAT originY, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); - FIXME("(%p)->(%p %p %f %f %d %d %p): stub\n", This, context, renderer, originX, originY, is_sideways, is_rtl, drawing_effect); - return E_NOTIMPL; + DWRITE_TEXT_RANGE range = { 0, ~0u }; + + TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, is_sideways, is_rtl, effect); + + IDWriteTextLayout_SetDrawingEffect(This->layout, effect, range); + return IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY); } static HRESULT WINAPI dwritetrimmingsign_GetMetrics(IDWriteInlineObject *iface, DWRITE_INLINE_OBJECT_METRICS *metrics) @@ -3463,11 +3470,13 @@ static inline BOOL is_flow_direction_vert(DWRITE_FLOW_DIRECTION direction) (direction == DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP); } -HRESULT create_trimmingsign(IDWriteTextFormat *format, IDWriteInlineObject **sign) +HRESULT create_trimmingsign(IDWriteFactory2 *factory, IDWriteTextFormat *format, IDWriteInlineObject **sign) { + static const WCHAR ellipsisW = 0x2026; struct dwrite_trimmingsign *This; DWRITE_READING_DIRECTION reading; DWRITE_FLOW_DIRECTION flow; + HRESULT hr; *sign = NULL; @@ -3480,12 +3489,20 @@ HRESULT create_trimmingsign(IDWriteTextFormat *format, IDWriteInlineObject **sig (is_reading_direction_vert(reading) && is_flow_direction_vert(flow))) return DWRITE_E_FLOWDIRECTIONCONFLICTS; - This = heap_alloc(sizeof(struct dwrite_trimmingsign)); - if (!This) return E_OUTOFMEMORY; + This = heap_alloc(sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; This->IDWriteInlineObject_iface.lpVtbl = &dwritetrimmingsignvtbl; This->ref = 1; + hr = IDWriteFactory2_CreateTextLayout(factory, &ellipsisW, 1, format, 0.0, 0.0, &This->layout); + if (FAILED(hr)) { + heap_free(This); + return hr; + } + + IDWriteTextLayout_SetWordWrapping(This->layout, DWRITE_WORD_WRAPPING_NO_WRAP); *sign = &This->IDWriteInlineObject_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 10597f8..96b4925 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1052,7 +1052,7 @@ static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory2 * { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); TRACE("(%p)->(%p %p)\n", This, format, trimming_sign); - return create_trimmingsign(format, trimming_sign); + return create_trimmingsign(iface, format, trimming_sign); } static HRESULT WINAPI dwritefactory_CreateTextAnalyzer(IDWriteFactory2 *iface, IDWriteTextAnalyzer **analyzer) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f041979..d03d14a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -856,12 +856,18 @@ static void test_GetLocaleName(void) IDWriteFactory_Release(factory); } +static const struct drawcall_entry drawellipsis_seq[] = { + { DRAW_GLYPHRUN, {0x2026, 0} }, + { DRAW_LAST_KIND } +}; + static void test_CreateEllipsisTrimmingSign(void) { DWRITE_BREAK_CONDITION before, after; IDWriteTextFormat *format; IDWriteInlineObject *sign; IDWriteFactory *factory; + IUnknown *unk; HRESULT hr; factory = create_factory(); @@ -875,6 +881,9 @@ static void test_CreateEllipsisTrimmingSign(void) ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(format, 1); + hr = IDWriteInlineObject_QueryInterface(sign, &IID_IDWriteTextLayout, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + if (0) /* crashes on native */ hr = IDWriteInlineObject_GetBreakConditions(sign, NULL, NULL); @@ -883,6 +892,12 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(before == DWRITE_BREAK_CONDITION_NEUTRAL, "got %d\n", before); ok(after == DWRITE_BREAK_CONDITION_NEUTRAL, "got %d\n", after); + + /* Draw tests */ + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteInlineObject_Draw(sign, NULL, &testrenderer, 0.0, 0.0, FALSE, FALSE, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, drawellipsis_seq, "ellipsis sign draw test", FALSE); IDWriteInlineObject_Release(sign); /* non-orthogonal flow/reading combination */

1 0

André Hentschel : ntdll: Implement RtlCaptureContext on ARM64.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: cd258bef79f738cf53b06e813b2136fb1a3f9c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd258bef79f738cf53b06e813… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 14 23:24:54 2015 +0200 ntdll: Implement RtlCaptureContext on ARM64. --- dlls/ntdll/signal_arm64.c | 51 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e8dedd3..f5c62d1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -179,11 +179,52 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -void WINAPI RtlCaptureContext( CONTEXT *context ) -{ - FIXME( "Not implemented on ARM64\n" ); - memset( context, 0, sizeof(*context) ); -} +/* FIXME: Use the Stack instead of the actual register values? */ +__ASM_STDCALL_FUNC( RtlCaptureContext, 8, + "stp x0, x1, [sp, #-32]!\n\t" + "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ + "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ + "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ + "mrs x1, DAIF\n\t" + "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ + "ldp x0, x1, [sp], #32\n\t" + "str x0, [x0, #0x8]\n\t" /* context->X0 */ + "str x1, [x0, #0x10]\n\t" /* context->X1 */ + "str x2, [x0, #0x18]\n\t" /* context->X2 */ + "str x3, [x0, #0x20]\n\t" /* context->X3 */ + "str x4, [x0, #0x28]\n\t" /* context->X4 */ + "str x5, [x0, #0x30]\n\t" /* context->X5 */ + "str x6, [x0, #0x38]\n\t" /* context->X6 */ + "str x7, [x0, #0x40]\n\t" /* context->X7 */ + "str x8, [x0, #0x48]\n\t" /* context->X8 */ + "str x9, [x0, #0x50]\n\t" /* context->X9 */ + "str x10, [x0, #0x58]\n\t" /* context->X10 */ + "str x11, [x0, #0x60]\n\t" /* context->X11 */ + "str x12, [x0, #0x68]\n\t" /* context->X12 */ + "str x13, [x0, #0x70]\n\t" /* context->X13 */ + "str x14, [x0, #0x78]\n\t" /* context->X14 */ + "str x15, [x0, #0x80]\n\t" /* context->X15 */ + "str x16, [x0, #0x88]\n\t" /* context->X16 */ + "str x17, [x0, #0x90]\n\t" /* context->X17 */ + "str x18, [x0, #0x98]\n\t" /* context->X18 */ + "str x19, [x0, #0xa0]\n\t" /* context->X19 */ + "str x20, [x0, #0xa8]\n\t" /* context->X20 */ + "str x21, [x0, #0xb0]\n\t" /* context->X21 */ + "str x22, [x0, #0xb8]\n\t" /* context->X22 */ + "str x23, [x0, #0xc0]\n\t" /* context->X23 */ + "str x24, [x0, #0xc8]\n\t" /* context->X24 */ + "str x25, [x0, #0xd0]\n\t" /* context->X25 */ + "str x26, [x0, #0xd8]\n\t" /* context->X26 */ + "str x27, [x0, #0xe0]\n\t" /* context->X27 */ + "str x28, [x0, #0xe8]\n\t" /* context->X28 */ + "str x29, [x0, #0xf0]\n\t" /* context->Fp */ + "str x30, [x0, #0xf8]\n\t" /* context->Lr */ + "mov x1, sp\n\t" + "str x1, [x0, #0x100]\n\t" /* context->Sp */ + "adr x1, 1f\n\t" + "1: str x1, [x0, #0x108]\n\t" /* context->Pc */ + "ret" + ) /*********************************************************************** * set_cpu_context

1 0