wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Michael Stefaniuc : dmime: Remove unused arguments from helper functions.
by Alexandre Julliard 15 Jun '15

15 Jun '15

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 15 Jun '15

15 Jun '15

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 : dmcompos/tests: Add IPersistStream tests for DM*Track.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: e8c778442b683bcc31f51d551a44eb6f14c27a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c778442b683bcc31f51d551… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:09:31 2015 +0200 dmcompos/tests: Add IPersistStream tests for DM*Track. --- dlls/dmcompos/tests/dmcompos.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ca12229..c4cf386 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -261,6 +261,68 @@ static void test_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_chordmaptrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMapTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicChordMapTrack 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); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), + "Expected class CLSID_DirectMusicChordMapTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine 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)); +} + +static void test_signposttrack(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSignPostTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack8, (void**)&dmt8); + ok(hr == S_OK, "DirectMusicSignPostTrack 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); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicSignPostTrack), + "Expected class CLSID_DirectMusicSignPostTrack got %s\n", wine_dbgstr_guid(&class)); + hr = IPersistStream_Save(ps, NULL, TRUE); + todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine 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); + + while (IDirectMusicTrack8_Release(dmt8)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -276,6 +338,8 @@ START_TEST(dmcompos) test_COM_template(); test_COM_track(); test_chordmap(); + test_chordmaptrack(); + test_signposttrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmband/tests: Add IPersistStream tests for DMBandTrack.
by Alexandre Julliard 15 Jun '15

15 Jun '15

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

Michael Stefaniuc : dmband: Use the generic DirectMusicObject implementation for DMBand.
by Alexandre Julliard 15 Jun '15

15 Jun '15

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 : dmband: Pass the object instead of the iface to helpers.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 6ac784ee827421e8ff19c8eb98447e9dd8243fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac784ee827421e8ff19c8eb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 15 01:04:41 2015 +0200 dmband: Pass the object instead of the iface to helpers. --- dlls/dmband/band.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 0ab7df7..bcb85d5 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -367,8 +367,9 @@ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_IsDirty (LPPERSISTSTRE return S_FALSE; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); +static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ @@ -418,7 +419,8 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR switch (Chunk.fccID) { case DMUS_FOURCC_REF_LIST: { FIXME_(dmfile)(": DMRF (DM References) list\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference (iface, &Chunk, pStm, &pObject); + hr = IDirectMusicUtils_IPersistStream_ParseReference((IPersistStream*)&This->PersistStreamVtbl, + &Chunk, pStm, &pObject); if (FAILED(hr)) { ERR(": could not load Reference\n"); return hr; @@ -471,8 +473,9 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR return S_OK; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - /*ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface);*/ +static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr; DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -499,7 +502,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_LIST: { TRACE_(dmfile)(": Instrument list\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseInstrument (iface, &Chunk, pStm); + hr = parse_instrument(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -525,9 +528,9 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (LPPERSI return S_OK; } -static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm) { - - ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); +static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *pChunk, + IStream *pStm) +{ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -591,7 +594,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseBandForm (LPPERSISTSTREA } case DMUS_FOURCC_INSTRUMENTS_LIST: { TRACE_(dmfile)(": INSTRUMENTS list\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseInstrumentsList (iface, &Chunk, pStm); + hr = parse_instruments_list(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; } @@ -636,7 +639,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_Load (LPPERSISTSTREAM switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { TRACE_(dmfile)(": Band form\n"); - hr = IDirectMusicBandImpl_IPersistStream_ParseBandForm (iface, &Chunk, pStm); + hr = parse_band_form(This, &Chunk, pStm); if (FAILED(hr)) return hr; break; }

1 0

Nikolay Sivov : dwrite: Fix the way drawing effects are reported for inline objects.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: b7fb00e9aa7b17c4fe9f90ac137b50a245528704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fb00e9aa7b17c4fe9f90ac1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 01:15:25 2015 +0300 dwrite: Fix the way drawing effects are reported for inline objects. --- dlls/dwrite/layout.c | 136 ++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 237 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 320 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7fb00e9aa7b17c4fe9f9…

1 0

Nikolay Sivov : dwrite: Call GetCount() once when looking for family name.
by Alexandre Julliard 15 Jun '15

15 Jun '15

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 15 Jun '15

15 Jun '15

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

Nikolay Sivov : dwrite: Check format directions in CreateEllipsisTrimmingSign().
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 6304a0f50a4852109e0ca78e23f4e9d853d290d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6304a0f50a4852109e0ca78e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 00:39:32 2015 +0300 dwrite: Check format directions in CreateEllipsisTrimmingSign(). --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 47 +++++++++++++++++++++++++++++++- dlls/dwrite/main.c | 4 +-- dlls/dwrite/tests/layout.c | 64 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cd6d08c..a692e38 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(IDWriteInlineObject**) DECLSPEC_HIDDEN; +extern HRESULT create_trimmingsign(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 bdd8ad6..bd50e8b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3439,12 +3439,47 @@ static const IDWriteInlineObjectVtbl dwritetrimmingsignvtbl = { dwritetrimmingsign_GetBreakConditions }; -HRESULT create_trimmingsign(IDWriteInlineObject **sign) +static inline BOOL is_reading_direction_horz(DWRITE_READING_DIRECTION direction) +{ + return (direction == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT) || + (direction == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); +} + +static inline BOOL is_reading_direction_vert(DWRITE_READING_DIRECTION direction) +{ + return (direction == DWRITE_READING_DIRECTION_TOP_TO_BOTTOM) || + (direction == DWRITE_READING_DIRECTION_BOTTOM_TO_TOP); +} + +static inline BOOL is_flow_direction_horz(DWRITE_FLOW_DIRECTION direction) +{ + return (direction == DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT) || + (direction == DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT); +} + +static inline BOOL is_flow_direction_vert(DWRITE_FLOW_DIRECTION direction) +{ + return (direction == DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM) || + (direction == DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP); +} + +HRESULT create_trimmingsign(IDWriteTextFormat *format, IDWriteInlineObject **sign) { struct dwrite_trimmingsign *This; + DWRITE_READING_DIRECTION reading; + DWRITE_FLOW_DIRECTION flow; *sign = NULL; + /* Validate reading/flow direction here, layout creation won't complain about + invalid combinations. */ + reading = IDWriteTextFormat_GetReadingDirection(format); + flow = IDWriteTextFormat_GetFlowDirection(format); + + if ((is_reading_direction_horz(reading) && is_flow_direction_horz(flow)) || + (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; @@ -3527,7 +3562,12 @@ static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *iface, DWRITE_READING_DIRECTION direction) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, direction); + + if ((UINT32)direction > DWRITE_READING_DIRECTION_BOTTOM_TO_TOP) + return E_INVALIDARG; + This->format.readingdir = direction; return S_OK; } @@ -3535,7 +3575,12 @@ static HRESULT WINAPI dwritetextformat_SetReadingDirection(IDWriteTextFormat1 *i static HRESULT WINAPI dwritetextformat_SetFlowDirection(IDWriteTextFormat1 *iface, DWRITE_FLOW_DIRECTION direction) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, direction); + + if ((UINT32)direction > DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT) + return E_INVALIDARG; + This->format.flow = direction; return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 20f9d36..10597f8 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1051,8 +1051,8 @@ static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory2 * IDWriteInlineObject **trimming_sign) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %p): semi-stub\n", This, format, trimming_sign); - return create_trimmingsign(trimming_sign); + TRACE("(%p)->(%p %p)\n", This, format, trimming_sign); + return create_trimmingsign(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 2b19961..f041979 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -883,8 +883,19 @@ 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); - IDWriteInlineObject_Release(sign); + + /* non-orthogonal flow/reading combination */ + hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* vista, win7 */, "got 0x%08x\n", hr); + if (hr == S_OK) { + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &sign); + ok(hr == DWRITE_E_FLOWDIRECTIONCONFLICTS, "got 0x%08x\n", hr); + } + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } @@ -2362,6 +2373,56 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_SetFlowDirection(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + DWRITE_READING_DIRECTION reading; + DWRITE_FLOW_DIRECTION flow; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + flow = IDWriteTextFormat_GetFlowDirection(format); + ok(flow == DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM, "got %d\n", flow); + + reading = IDWriteTextFormat_GetReadingDirection(format); + ok(reading == DWRITE_READING_DIRECTION_LEFT_TO_RIGHT, "got %d\n", reading); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* vista,win7 */, "got 0x%08x\n", hr); + if (hr == S_OK) { + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_TOP_TO_BOTTOM); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetFlowDirection(format, DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + } + else + win_skip("DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT is not supported\n"); + + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2399,6 +2460,7 @@ START_TEST(layout) test_SetFontStretch(); test_SetStrikethrough(); test_GetMetrics(); + test_SetFlowDirection(); IDWriteFactory_Release(factory); }

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015