July 2018 - Wine-devel - list.winehq.org

[PATCH 3/6] dmband: Reimplement ParseDescriptor() for DirectMusicBand
by Michael Stefaniuc 15 Jul '18

15 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/band.c | 184 +++++++++------------------------------------ dlls/dmband/tests/dmband.c | 25 ++++-- 2 files changed, 57 insertions(+), 152 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index b35d94f2d8..4338791971 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -123,153 +123,43 @@ static const IDirectMusicBandVtbl dmband_vtbl = { }; /* IDirectMusicBandImpl IDirectMusicObject part: */ -static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, - IStream *pStream, DMUS_OBJECTDESC *pDesc) +static HRESULT WINAPI band_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - TRACE("(%p, %p)\n", pStream, pDesc); - - /* FIXME: should this be determined from stream? */ - pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = CLSID_DirectMusicBand; - - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; - if (Chunk.fccID == DMUS_FOURCC_BAND_FORM) { - TRACE_(dmfile)(": band form\n"); - do { - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStream, &pDesc->guidObject, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStream, &pDesc->vVersion, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStream, pDesc->wszCategory, Chunk.dwSize, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (Chunk.fccID) { - /* evil M$ UNFO list, which can (!?) contain INFO elements */ - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes - (though strings seem to be valid unicode) */ - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStream, pDesc->wszName, Chunk.dwSize, NULL); - break; - } - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - } else { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_INVALIDFILE; - } - } - - TRACE(": returning descriptor:\n"); debug_DMUS_OBJECTDESC (pDesc); - - return S_OK; + struct chunk_entry riff = {0}; + STATSTG stat; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", iface, stream, desc); + + if (!stream || !desc) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &riff)) != S_OK) + return hr; + if (riff.id != FOURCC_RIFF || riff.type != DMUS_FOURCC_BAND_FORM) { + TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); + stream_skip_chunk(stream, &riff); + return DMUS_E_INVALID_BAND; + } + + hr = dmobj_parsedescriptor(stream, &riff, desc, + DMUS_OBJ_OBJECT|DMUS_OBJ_NAME|DMUS_OBJ_NAME_INAM|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION); + if (FAILED(hr)) + return hr; + + desc->guidClass = CLSID_DirectMusicBand; + desc->dwValidData |= DMUS_OBJ_CLASS; + + if (desc->dwValidData & DMUS_OBJ_CATEGORY) { + IStream_Stat(stream, &stat, STATFLAG_NONAME); + desc->ftDate = stat.mtime; + desc->dwValidData |= DMUS_OBJ_DATE; + } + + TRACE("returning descriptor:\n"); + debug_DMUS_OBJECTDESC(desc); + return S_OK; } static const IDirectMusicObjectVtbl dmobject_vtbl = { @@ -278,7 +168,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicObjectImpl_ParseDescriptor + band_IDirectMusicObject_ParseDescriptor }; /* IDirectMusicBandImpl IPersistStream part: */ diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 6c615f6056..b7a3a5b2b5 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -345,6 +345,7 @@ static void test_parsedescriptor(void) FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 }; FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, 0}; + FOURCC catdate[] = {FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, DMUS_FOURCC_CATEGORY_CHUNK, 0}; FOURCC inam[] = { FOURCC_RIFF, DMUS_FOURCC_BAND_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, @@ -376,21 +377,36 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); IStream_Release(stream); + /* NULL pointers */ + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - todo_wine ok(hr == DMUS_E_INVALID_BAND, + ok(hr == DMUS_E_INVALID_BAND, "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + /* A category chunk adds DMUS_OBJ_DATE too */ + stream = gen_riff_stream(catdate); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_CLASS | DMUS_OBJ_CATEGORY | DMUS_OBJ_DATE; + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + IStream_Release(stream); + /* All desc chunks, extra DMUS_OBJ_DATE */ stream = gen_riff_stream(alldesc); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", - desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", wine_dbgstr_guid(&desc.guidClass)); @@ -431,8 +447,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - todo_wine ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", - desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.14.4

1 0

[PATCH 2/6] dmusic: Reimplement ParseDescriptor() for DirectMusicCollection
by Michael Stefaniuc 15 Jul '18

15 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/collection.c | 208 ++++----------------------------------------- dlls/dmusic/tests/dmusic.c | 18 ++-- 2 files changed, 28 insertions(+), 198 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index ec9914faa1..28202228bc 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -176,210 +176,34 @@ static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = }; /* IDirectMusicCollectionImpl IDirectMusicObject part: */ -static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) -{ - ULONG read; - HRESULT hr; - - hr = IStream_Read(stream, data, size, &read); - if (FAILED(hr)) { - TRACE("IStream_Read failed: %08x\n", hr); - return hr; - } - if (read < size) { - TRACE("Didn't read full chunk: %u < %u\n", read, size); - return E_FAIL; - } - - return S_OK; -} - -static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, +static HRESULT WINAPI col_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { - struct dmobject *This = impl_from_IDirectMusicObject(iface); - DMUS_PRIVATE_CHUNK chunk; - DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry riff = {0}; HRESULT hr; - TRACE("(%p)->(%p, %p)\n", This, stream, desc); + TRACE("(%p, %p, %p)\n", iface, stream, desc); - /* FIXME: should this be determined from stream? */ - desc->dwValidData |= DMUS_OBJ_CLASS; - desc->guidClass = This->desc.guidClass; + if (!stream || !desc) + return E_POINTER; - hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); - if (FAILED(hr)) + if ((hr = stream_get_chunk(stream, &riff)) != S_OK) return hr; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); - - if (chunk.fccID != FOURCC_RIFF) { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_INVALIDFILE; + if (riff.id != FOURCC_RIFF || riff.type != FOURCC_DLS) { + TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); + stream_skip_chunk(stream, &riff); + return DMUS_E_NOTADLSCOL; } - hr = read_from_stream(stream, &chunk.fccID, sizeof(FOURCC)); + hr = dmobj_parsedescriptor(stream, &riff, desc, DMUS_OBJ_NAME_INFO|DMUS_OBJ_VERSION); if (FAILED(hr)) return hr; - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID)); - StreamSize = chunk.dwSize - sizeof(FOURCC); - - if (chunk.fccID != FOURCC_DLS) { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - - StreamCount = 0; - TRACE_(dmfile)(": collection form\n"); - - do { - hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); - if (FAILED(hr)) - return hr; - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); - switch (chunk.fccID) { - case FOURCC_DLID: - TRACE_(dmfile)(": GUID chunk\n"); - desc->dwValidData |= DMUS_OBJ_OBJECT; - hr = read_from_stream(stream, &desc->guidObject, chunk.dwSize); - if (FAILED(hr)) - return hr; - break; - - case DMUS_FOURCC_VERSION_CHUNK: - TRACE_(dmfile)(": version chunk\n"); - desc->dwValidData |= DMUS_OBJ_VERSION; - hr = read_from_stream(stream, &desc->vVersion, chunk.dwSize); - if (FAILED(hr)) - return hr; - break; - - case DMUS_FOURCC_CATEGORY_CHUNK: - TRACE_(dmfile)(": category chunk\n"); - desc->dwValidData |= DMUS_OBJ_CATEGORY; - hr = read_from_stream(stream, desc->wszCategory, chunk.dwSize); - if (FAILED(hr)) - return hr; - break; - - case FOURCC_LIST: - hr = read_from_stream(stream, &chunk.fccID, sizeof(FOURCC)); - if (FAILED(hr)) - return hr; - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(chunk.fccID)); - ListSize[0] = chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (chunk.fccID) { - /* pure INFO list, such can be found in dls collections */ - case DMUS_FOURCC_INFO_LIST: - TRACE_(dmfile)(": INFO list\n"); - do { - hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); - if (FAILED(hr)) - return hr; - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); - switch (chunk.fccID) { - case mmioFOURCC('I','N','A','M'): { - CHAR szName[DMUS_MAX_NAME]; - TRACE_(dmfile)(": name chunk\n"); - desc->dwValidData |= DMUS_OBJ_NAME; - hr = read_from_stream(stream, szName, chunk.dwSize); - if (FAILED(hr)) - return hr; - MultiByteToWideChar (CP_ACP, 0, szName, -1, desc->wszName, DMUS_MAX_NAME); - if (even_or_odd(chunk.dwSize)) { - ListCount[0]++; - liMove.QuadPart = 1; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - } - break; - } - - case mmioFOURCC('I','A','R','T'): - TRACE_(dmfile)(": artist chunk (ignored)\n"); - if (even_or_odd(chunk.dwSize)) { - ListCount[0]++; - chunk.dwSize++; - } - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - - case mmioFOURCC('I','C','O','P'): - TRACE_(dmfile)(": copyright chunk (ignored)\n"); - if (even_or_odd(chunk.dwSize)) { - ListCount[0]++; - chunk.dwSize++; - } - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - - case mmioFOURCC('I','S','B','J'): - TRACE_(dmfile)(": subject chunk (ignored)\n"); - if (even_or_odd(chunk.dwSize)) { - ListCount[0]++; - chunk.dwSize++; - } - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - case mmioFOURCC('I','C','M','T'): - TRACE_(dmfile)(": comment chunk (ignored)\n"); - if (even_or_odd(chunk.dwSize)) { - ListCount[0]++; - chunk.dwSize++; - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - - default: - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - if (even_or_odd(chunk.dwSize)) { - ListCount[0] ++; - chunk.dwSize++; - } - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - - default: - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = chunk.dwSize - sizeof(FOURCC); - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - break; - - default: - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = chunk.dwSize; - IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - - TRACE_(dmfile)(": reading finished\n"); - - if (TRACE_ON(dmusic)) { - TRACE("Returning descriptor:\n"); - dump_DMUS_OBJECTDESC(desc); - } + desc->guidClass = CLSID_DirectMusicCollection; + desc->dwValidData |= DMUS_OBJ_CLASS; + TRACE("returning descriptor:\n"); + dump_DMUS_OBJECTDESC(desc); return S_OK; } @@ -389,7 +213,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicObjectImpl_ParseDescriptor + col_IDirectMusicObject_ParseDescriptor }; /* IDirectMusicCollectionImpl IPersistStream part: */ diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index e69de25e9f..19890d17dc 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -627,7 +627,7 @@ static IStream *gen_riff_stream(const FOURCC *ids) ck->size = 5; p += CHUNK_HDR_SIZE; strcpy(p, "INAM"); - p += ck->size; + p += ck->size + 1; /* WORD aligned */ break; default: { @@ -700,7 +700,7 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - todo_wine ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), @@ -708,19 +708,25 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); IStream_Release(stream); + /* NULL pointers */ + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - todo_wine ok(hr == DMUS_E_NOTADLSCOL, - "ParseDescriptor failed: %08x, expected DMUS_E_NOTADLSCOL\n", hr); + ok(hr == DMUS_E_NOTADLSCOL, "ParseDescriptor failed: %08x, expected DMUS_E_NOTADLSCOL\n", hr); /* All desc chunks */ stream = gen_riff_stream(alldesc); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_VERSION), + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_VERSION\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), "Got class guid %s, expected CLSID_DirectMusicCollection\n", @@ -759,7 +765,7 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), + ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", desc.dwValidData); ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", -- 2.14.4

1 0

[PATCH] winemac: Interpret Windows bitmap data, especially window surfaces, as sRGB.
by Ken Thomases 15 Jul '18

15 Jul '18

This makes the display match that of native apps. For example, the UI of Mac Steam vs. Windows Steam or a PNG shown in iexplore.exe vs. Preview. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/image.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winemac.drv/surface.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index 4090350..e5f3a4c 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -85,7 +85,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol else alpha_format = kCGImageAlphaNoneSkipFirst; - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); if (!colorspace) { WARN("failed to create colorspace\n"); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 67e0dce..91c5b88 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -357,7 +357,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, for (i = 0; i < count; i++) data_bits[i] ^= xor_bits[i]; - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGray); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericGrayGamma2_2); if (!colorspace) { WARN("failed to create colorspace\n"); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 1230bbe..73daeca 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -384,7 +384,7 @@ CGImageRef create_surface_image(void *window_surface, CGRect *rect, int copy_dat visrect = CGRectOffset(*rect, -surface->header.rect.left, -surface->header.rect.top); - colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB); + colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); bytes_per_row = get_dib_stride(width, 32); offset = CGRectGetMinX(visrect) * 4 + (height - CGRectGetMaxY(visrect)) * bytes_per_row; size = min(CGRectGetHeight(visrect) * bytes_per_row, -- 2.10.2

1 0

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev 15 Jul '18

15 Jul '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 103 +++++++++++++------------------------------------------ 1 file changed, 23 insertions(+), 80 deletions(-) diff --git a/po/uk.po b/po/uk.po index 85264edf92..e640b2d388 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-04-12 17:02+0300\n" +"PO-Revision-Date: 2018-07-15 16:35+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -3432,46 +3432,36 @@ msgid "Publishers..." msgstr "Видавці..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Підключення по локальній мережі" +msgstr "Підключення" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Параметри Wine" +msgstr "Автоматичне налаштування" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Використовувати автоматичне виявлення веб-проксі (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Використовувати автоматичне налаштування проксі (PAC)" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Адреса" +msgstr "Адреса:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Локальний сервер" +msgstr "Проксі-сервер" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Використовувати проксі-сервер" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Нема портів" +msgstr "Порт:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3742,18 +3732,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Властивість 'writable' не може бути встановлена на 'true' для цього об'єкта" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Неможливо перевизначити властивість, яка не підлягає налаштуванню '|'" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Неможливо змінити властивість, яка не підлягає запису '|'" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Властивість не може одночасно мати доступ і значення" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8635,10 +8626,8 @@ msgid "&Browse..." msgstr "&Огляд..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Тип файлу" +msgstr "Тип файлу:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8649,14 +8638,10 @@ msgid "Size:" msgstr "Розмір:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Дата створення" +msgstr "Дата створення:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" msgstr "&Властивості:" @@ -8669,28 +8654,20 @@ msgid "&Archive" msgstr "&Архівний" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Відкрити:" +msgstr "Відкрити за допомогою:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "З&мінити значок..." +msgstr "З&мінити..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Змінено" +msgstr "Остання зміна:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Останні зміни:" +msgstr "Останній доступ:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -12945,10 +12922,8 @@ msgid "Confirm Value Delete" msgstr "Підтвердження видалення значення" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" +msgstr "Ви впевнені, що хочете видалити вибране значення реєстру?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14918,6 +14893,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Програма зазнала збій, але WineDbg не вдалося приєднатись до процесу, щоб " +"отримати більш детальну інформацію." #: winedbg.rc:41 msgid "(unidentified)" @@ -15782,41 +15759,6 @@ msgid "D" msgstr "Д" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15882,6 +15824,7 @@ msgstr "" "[/A] Копіює лише файли з властивістю АРХІВНИЙ.\n" "[/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n" "\tвластивість АРХІВНИЙ.\n" +"[/K] Копіює властивості файлу, без цього властивості не зберігаються.\n" "[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після " "вказаної дати.\n" "\tЯкщо дата не вказана, копіює лише ті файли, які новіші в початковій теці.\n" -- 2.17.1

1 0

[PATCH] winemac: Don't change the window's color space.
by Ken Thomases 14 Jul '18

14 Jul '18

This was originally done to improve performance at the expense of visually- correct rendering. I've reconsidered that trade-off. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4c59faf..4143d14 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -385,7 +385,6 @@ @interface WineWindow () @property (readonly, copy, nonatomic) NSArray* childWineWindows; - - (void) updateColorSpace; - (void) updateForGLSubviews; - (BOOL) becameEligibleParentOrChild; @@ -968,7 +967,6 @@ + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)w [window setShowsResizeIndicator:NO]; [window setHasShadow:wf->shadow]; [window setAcceptsMouseMovedEvents:YES]; - [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; [window setBackgroundColor:[NSColor clearColor]]; [window setOpaque:NO]; @@ -1927,9 +1925,6 @@ - (void) setFrameFromWine:(NSRect)contentRect if (needEnableScreenUpdates) NSEnableScreenUpdates(); - if (!equalSizes) - [self updateColorSpace]; - if (!enteringFullScreen && [[NSProcessInfo processInfo] systemUptime] - enteredFullScreenTime > 1.0) nonFullscreenFrame = frame; @@ -2601,35 +2596,8 @@ - (NSArray*) childWineWindows return [childWindows objectsAtIndexes:indexes]; } - // We normally use the generic/calibrated RGB color space for the window, - // rather than the device color space, to avoid expensive color conversion - // which slows down drawing. However, for windows displaying OpenGL, having - // a different color space than the screen greatly reduces frame rates, often - // limiting it to the display refresh rate. - // - // To avoid this, we switch back to the screen color space whenever the - // window is covered by a view with an attached OpenGL context. - - (void) updateColorSpace - { - NSRect contentRect = [[self contentView] frame]; - BOOL coveredByGLView = FALSE; - WineContentView* view = (WineContentView*)[[self contentView] hitTest:NSMakePoint(NSMidX(contentRect), NSMidY(contentRect))]; - if ([view isKindOfClass:[WineContentView class]] && view.everHadGLContext) - { - NSRect frame = [view convertRect:[view bounds] toView:nil]; - if (NSContainsRect(frame, contentRect)) - coveredByGLView = TRUE; - } - - if (coveredByGLView) - [self setColorSpace:nil]; - else - [self setColorSpace:[NSColorSpace genericRGBColorSpace]]; - } - - (void) updateForGLSubviews { - [self updateColorSpace]; if (gl_surface_mode == GL_SURFACE_BEHIND) [self checkTransparency]; } -- 2.10.2

1 0

[PATCH v2 2/2] user32/tests: Sleep when sending mouse clicks too fast.
by Zhiyi Zhang 14 Jul '18

14 Jul '18

A thread is used to send test data. If the thread sends mouse clicks before pop-up menu initialization, it would report send input failure and skip the tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: simplify the loop. dlls/user32/tests/menu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 54a5ea232a..41c5e15ced 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2253,7 +2253,7 @@ static struct menu_mouse_tests_s { { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, - { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } }; @@ -2307,7 +2307,7 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) for (i = 0; menu_tests[i].type != -1; i++) { BOOL ret = TRUE; - int elapsed = 0; + int elapsed; got_input = i && menu_tests[i-1].bMenuVisible; @@ -2316,7 +2316,16 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) send_key(menu_tests[i].wVk[j]); else for (j = 0; menu_tests[i].menu_item_pairs[j].uMenu != 0; j++) - if (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) break; + { + /* Maybe clicking too fast before menu is initialized. Sleep 100 ms and retry */ + elapsed = 0; + while (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) + { + if (elapsed > 1000) break; + elapsed += 100; + Sleep(100); + } + } if (!ret) { @@ -2324,6 +2333,8 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) PostMessageA( hWnd, WM_CANCELMODE, 0, 0 ); return 0; } + + elapsed = 0; while (menu_tests[i].bMenuVisible != bMenuVisible) { if (elapsed > 200) -- 2.18.0

1 0

[PATCH 2/2] user32/tests: Sleep when sending mouse clicks too fast.
by Zhiyi Zhang 14 Jul '18

14 Jul '18

A thread is used to send mouse clicks to test mouse click handling for menu. If the thread sends mouse clicks before pop-up menu initialization, it would report send input failure and skip the tests. This patch make the message send thread sleeps for a while when failure and retry. Also the sleep at the start of the loop is not necessary, thus removed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/menu.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 54a5ea232a..3f882d83c7 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2253,7 +2253,7 @@ static struct menu_mouse_tests_s { { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, - { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } }; @@ -2302,12 +2302,11 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) int i, j; HANDLE hWnd = lpParameter; - Sleep(500); /* mixed keyboard/mouse test */ for (i = 0; menu_tests[i].type != -1; i++) { BOOL ret = TRUE; - int elapsed = 0; + int elapsed; got_input = i && menu_tests[i-1].bMenuVisible; @@ -2315,8 +2314,18 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) for (j = 0; menu_tests[i].wVk[j] != 0; j++) send_key(menu_tests[i].wVk[j]); else + { + elapsed = 0; for (j = 0; menu_tests[i].menu_item_pairs[j].uMenu != 0; j++) - if (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) break; + if (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) + { + /* Maybe clicking too fast before menu is initialized. Sleep 100 ms and retry */ + if (elapsed > 500) break; + j--; + elapsed += 100; + Sleep(100); + } + } if (!ret) { @@ -2324,6 +2333,8 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) PostMessageA( hWnd, WM_CANCELMODE, 0, 0 ); return 0; } + + elapsed = 0; while (menu_tests[i].bMenuVisible != bMenuVisible) { if (elapsed > 200) -- 2.18.0

1 0

[PATCH 1/2] user32: Fix menu item rectangle calculation in GetMenuItemRect().
by Zhiyi Zhang 14 Jul '18

14 Jul '18

This fixes the menu of BibleWorks 10 not showing up and some todo in tests. Sysmenu is in non-client area. And because MapWindowPoints() should not be used with non-client area coordinates. Doing so results in wrong coordinates for sysmenu item rectangles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/menu.c | 10 +++++- dlls/user32/tests/menu.c | 67 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab1ae9bc1b..27e6430cc5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5306,6 +5306,7 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { POPUPMENU *menu; UINT pos; + RECT window_rect; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); @@ -5326,7 +5327,14 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); release_menu_ptr(menu); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Popup menu item draws in the client area */ + if (menu->wFlags & MF_POPUP) MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Sysmenu draws in the non-client area, can't use MapWindowPoints in non-client area */ + else + { + GetWindowRect(hwnd, &window_rect); + OffsetRect(rect, window_rect.left, window_rect.top); + } return TRUE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7f338ce9b1..54a5ea232a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -341,6 +341,62 @@ static void test_getmenubarinfo(void) DestroyWindow(hwnd); } +static void test_GetMenuItemRect(void) +{ + HWND hwnd; + HMENU hmenu; + HMENU popup_hmenu; + RECT window_rect; + RECT item_rect; + POINT client_top_left; + INT caption_height; + BOOL ret; + + hwnd = CreateWindowW((LPCWSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, + NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed with error %d\n", GetLastError()); + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + popup_hmenu = CreatePopupMenu(); + ok(popup_hmenu != NULL, "CreatePopupMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(popup_hmenu, MF_STRING, 0, "Popup"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(hmenu, MF_STRING | MF_POPUP, (UINT_PTR)popup_hmenu, "Menu"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + /* Get the menu item rectangle of the displayed sysmenu item */ + ret = GetMenuItemRect(hwnd, hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + GetWindowRect(hwnd, &window_rect); + /* Get the screen coordinate of the left top corner of the client rectangle */ + client_top_left.x = 0; + client_top_left.y = 0; + MapWindowPoints(hwnd, 0, &client_top_left, 1); + caption_height = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION); + + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right <= window_rect.right, "Expect item_rect.right %d <= %d\n", item_rect.right, window_rect.right); + /* A gap of 1 pixel is added deliberately in commit 75f9e64, so using equal operator would fail on Wine. + * Check that top and bottom are correct with 1 pixel margin tolerance */ + ok(item_rect.top - (window_rect.top + caption_height) <= 1, "Expect item_rect.top %d - %d <= 1\n", item_rect.top, + window_rect.top + caption_height); + ok(item_rect.bottom - (client_top_left.y - 1) <= 1, "Expect item_rect.bottom %d - %d <= 1\n", item_rect.bottom, + client_top_left.y - 1); + + /* Get the item rectangle of the not yet displayed popup menu item. */ + ret = GetMenuItemRect(hwnd, popup_hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right == client_top_left.x, "Expect item_rect.right %d == %d\n", item_rect.right, client_top_left.x); + ok(item_rect.top == client_top_left.y, "Expect item_rect.top %d == %d\n", item_rect.top, client_top_left.y); + ok(item_rect.bottom == client_top_left.y, "Expect item_rect.bottom %d == %d\n", item_rect.bottom, + client_top_left.y); + + DestroyWindow(hwnd); +} + static void test_system_menu(void) { WCHAR testW[] = {'t','e','s','t',0}; @@ -2188,15 +2244,15 @@ static struct menu_mouse_tests_s { { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, FALSE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{2, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } @@ -4199,6 +4255,7 @@ START_TEST(menu) test_subpopup_locked_by_menu(); test_menu_ownerdraw(); test_getmenubarinfo(); + test_GetMenuItemRect(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo(); -- 2.18.0

1 0

[PATCH] ntoskrnl.exe: add a stub for KeFlushQueuedDpcs
by Austin English 13 Jul '18

13 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45448 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 41f3862d45..a061241925 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3546,3 +3546,8 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); return TRUE; } + +void WINAPI KeFlushQueuedDpcs(void) +{ + FIXME("stub!\n"); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 64597c41df..907fba8d99 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -532,7 +532,7 @@ @ stub KeFindConfigurationEntry @ stub KeFindConfigurationNextEntry @ stub KeFlushEntireTb -@ stub KeFlushQueuedDpcs +@ stdcall KeFlushQueuedDpcs() @ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment -- 2.16.4

1 0

[PATCH] oleauto.h: Fix a MsVC warning about VarCyMul().
by Serge Gautherie 13 Jul '18

13 Jul '18

"...\dll\win32\oleaut32\vartype.c(3808) : error C4028: formal parameter 2 different from declaration" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- include/oleauto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/oleauto.h b/include/oleauto.h index 07c46ad..e5127b1 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -567,7 +567,7 @@ HRESULT WINAPI VarCyCmp(const CY,const CY); HRESULT WINAPI VarCyCmpR8(const CY,DOUBLE); HRESULT WINAPI VarCyFix(const CY,CY*); HRESULT WINAPI VarCyInt(const CY,CY*); -HRESULT WINAPI VarCyMul(const CY,CY,CY*); +HRESULT WINAPI VarCyMul(const CY,const CY,CY*); HRESULT WINAPI VarCyMulI4(const CY,LONG,CY*); HRESULT WINAPI VarCyMulI8(const CY,LONG64,CY*); HRESULT WINAPI VarCyNeg(const CY,CY*); -- 2.10.0.windows.1

2 2