March 2018 - Wine-Devel - list.winehq.org

[PATCH 2/4] dmime: Reimplement ParseDescriptor for DMAudioPathConfig
by Michael Stefaniuc March 8, 2018

March 8, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/audiopath.c | 172 ++++++++--------------------------------------- dlls/dmime/tests/dmime.c | 13 ++-- 2 files changed, 35 insertions(+), 150 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index cc7e4d12c9..9ad91a0c51 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -262,153 +262,37 @@ static const IDirectMusicAudioPathVtbl DirectMusicAudioPathVtbl = { }; /* IDirectMusicObject */ -static HRESULT WINAPI DirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *pStream, DMUS_OBJECTDESC *pDesc) +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { - struct IDirectMusicAudioPathImpl *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, pStream, pDesc); + TRACE("(%p,%p, %p)\n", iface, stream, desc); - /* FIXME: should this be determined from stream? */ - pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = This->dmobj.desc.guidClass; + if (!stream) + return E_POINTER; + if (!desc || desc->dwSize != sizeof(*desc)) + return E_INVALIDARG; - 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_AUDIOPATH_FORM) { - TRACE_(dmfile)(": audio path 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%s\n", debugstr_DMUS_OBJECTDESC (pDesc)); - - return S_OK; + if ((hr = chunk_read(stream, &riff)) != S_OK) + return hr; + if (riff.id != FOURCC_RIFF || riff.type != DMUS_FOURCC_AUDIOPATH_FORM) { + TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); + chunk_skip(stream, &riff); + return DMUS_E_CHUNKNOTFOUND; + } + + hr = dmobj_parsedescriptor(stream, &riff, desc, + DMUS_OBJ_OBJECT|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION); + if (FAILED(hr)) + return hr; + + desc->guidClass = CLSID_DirectMusicAudioPathConfig; + desc->dwValidData |= DMUS_OBJ_CLASS; + + TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + return S_OK; } static const IDirectMusicObjectVtbl dmobject_vtbl = { @@ -417,7 +301,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - DirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; /* IPersistStream */ diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 848e4f5a28..f1a7c2df56 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -770,12 +770,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) { - todo_wine ok(hr == E_INVALIDARG, - "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); } - todo_wine_if(forms[i].needs_size) + todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) 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); @@ -790,11 +790,12 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) - todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) + ok(hr == DMUS_E_CHUNKNOTFOUND, "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); else ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - todo_wine_if(forms[i].needs_size) + todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); /* All desc chunks */ @@ -835,7 +836,7 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine_if(forms[i].needs_size) + todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); -- 2.14.3

1 0

[PATCH 1/4] dmime: Add a generic ParseDescriptor helper and use it for DMSegment
by Michael Stefaniuc March 8, 2018

March 8, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/dmobject.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/dmobject.h | 33 ++++++++ dlls/dmime/segment.c | 200 +++++++------------------------------------- dlls/dmime/tests/dmime.c | 21 ++--- 4 files changed, 286 insertions(+), 181 deletions(-) diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index cabb6f74db..47500dbcc8 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -21,12 +21,150 @@ */ #define COBJMACROS +#include <assert.h> #include "objbase.h" #include "dmusici.h" +#include "dmusicf.h" #include "dmobject.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); +WINE_DECLARE_DEBUG_CHANNEL(dmfile); + +/* RIFF format parsing */ +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} + +const char *debugstr_chunk(const struct chunk_entry *chunk) +{ + const char *type = ""; + + if (!chunk) + return "(null)"; + if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) + type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type)); + return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size); +} + +static HRESULT stream_read(IStream *stream, void *data, ULONG size) +{ + ULONG read; + HRESULT hr; + + hr = IStream_Read(stream, data, size, &read); + if (FAILED(hr)) + TRACE_(dmfile)("IStream_Read failed: %08x\n", hr); + else if (!read && read < size) { + /* All or nothing: Handle a partial read due to end of stream as an error */ + TRACE_(dmfile)("Short read: %u < %u\n", read, size); + return E_FAIL; + } + + return hr; +} + +HRESULT chunk_read(IStream *stream, struct chunk_entry *chunk) +{ + static const LARGE_INTEGER zero; + ULONGLONG ck_end = 0, p_end = 0; + HRESULT hr; + + hr = IStream_Seek(stream, zero, STREAM_SEEK_CUR, &chunk->offset); + if (FAILED(hr)) + return hr; + assert(!(chunk->offset.QuadPart & 1)); + if (chunk->parent) { + p_end = chunk->parent->offset.QuadPart + CHUNK_HDR_SIZE + ((chunk->parent->size + 1) & ~1); + if (chunk->offset.QuadPart == p_end) + return S_FALSE; + ck_end = chunk->offset.QuadPart + CHUNK_HDR_SIZE; + if (ck_end > p_end) { + WARN_(dmfile)("No space for sub-chunk header in parent chunk: ends at offset %s > %s\n", + wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end)); + return E_FAIL; + } + } + + hr = stream_read(stream, chunk, CHUNK_HDR_SIZE); + if (hr != S_OK) + return hr; + if (chunk->parent) { + ck_end += (chunk->size + 1) & ~1; + if (ck_end > p_end) { + WARN_(dmfile)("No space for sub-chunk data in parent chunk: ends at offset %s > %s\n", + wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end)); + return E_FAIL; + } + } + + if (chunk->id == FOURCC_LIST || chunk->id == FOURCC_RIFF) { + hr = stream_read(stream, &chunk->type, sizeof(FOURCC)); + if (hr != S_OK) + return hr != S_FALSE ? hr : E_FAIL; + } + + TRACE_(dmfile)("Returning %s\n", debugstr_chunk(chunk)); + + return S_OK; +} + +HRESULT chunk_skip(IStream *stream, struct chunk_entry *chunk) +{ + LARGE_INTEGER end; + + end.QuadPart = (chunk->offset.QuadPart + CHUNK_HDR_SIZE + chunk->size + 1) & ~(ULONGLONG)1; + + return IStream_Seek(stream, end, STREAM_SEEK_SET, NULL); +} + +HRESULT chunk_next(IStream *stream, struct chunk_entry *chunk) +{ + HRESULT hr; + + if (chunk->id) { + hr = chunk_skip(stream, chunk); + if (FAILED(hr)) + return hr; + } + + return chunk_read(stream, chunk); +} + +HRESULT chunk_read_data(IStream *stream, struct chunk_entry *chunk, void *data, ULONG size) +{ + if (chunk->size != size) { + WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n", + debugstr_fourcc(chunk->id), chunk->size, + wine_dbgstr_longlong(chunk->offset.QuadPart), size); + return E_FAIL; + } + return stream_read(stream, data, size); +} + +HRESULT chunk_read_wstr(IStream *stream, struct chunk_entry *chunk, WCHAR *str, ULONG size) +{ + ULONG len; + HRESULT hr; + + hr = IStream_Read(stream, str, min(chunk->size, size), &len); + if (FAILED(hr)) + return hr; + + /* Don't assume the string is properly zero terminated */ + str[min(len, size - 1)] = 0; + + if (len < chunk->size) + return S_FALSE; + return S_OK; +} + + /* Generic IDirectMusicObject methods */ static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface) @@ -110,6 +248,81 @@ HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface, return ret; } +/* Helper for IDirectMusicObject::ParseDescriptor */ +static inline void info_get_name(IStream *stream, const struct chunk_entry *info, + DMUS_OBJECTDESC *desc) +{ + struct chunk_entry chunk = {.parent = info}; + char name[DMUS_MAX_NAME]; + ULONG len; + HRESULT hr = E_FAIL; + + while (chunk_next(stream, &chunk) == S_OK) { + if (chunk.id == mmioFOURCC('I','N','A','M')) { + hr = IStream_Read(stream, name, min(chunk.size, sizeof(name)), &len); + } + } + + if (SUCCEEDED(hr)) { + len = MultiByteToWideChar(CP_ACP, 0, name, len, desc->wszName, sizeof(desc->wszName)); + desc->wszName[min(len, sizeof(desc->wszName) - 1)] = 0; + desc->dwValidData |= DMUS_OBJ_NAME; + } +} + +static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo, + DMUS_OBJECTDESC *desc, BOOL inam) +{ + struct chunk_entry chunk = {.parent = unfo}; + + while (chunk_next(stream, &chunk) == S_OK) { + if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M'))) + if (chunk_read_wstr(stream, &chunk, desc->wszName, sizeof(desc->wszName)) == S_OK) + desc->dwValidData |= DMUS_OBJ_NAME; + } +} + +HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, + DMUS_OBJECTDESC *desc, DWORD supported) +{ + struct chunk_entry chunk = {.parent = riff}; + HRESULT hr; + + TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff)); + + desc->dwValidData = 0; + desc->dwSize = sizeof(*desc); + + while ((hr = chunk_next(stream, &chunk) == S_OK)) { + switch (chunk.id) { + case DMUS_FOURCC_GUID_CHUNK: + if ((supported & DMUS_OBJ_OBJECT) && chunk_read_data(stream, &chunk, + &desc->guidObject, sizeof(desc->guidObject)) == S_OK) + desc->dwValidData |= DMUS_OBJ_OBJECT; + break; + case DMUS_FOURCC_CATEGORY_CHUNK: + if ((supported & DMUS_OBJ_CATEGORY) && chunk_read_wstr(stream, &chunk, + desc->wszCategory, sizeof(desc->wszCategory)) == S_OK) + desc->dwValidData |= DMUS_OBJ_CATEGORY; + break; + case DMUS_FOURCC_VERSION_CHUNK: + if ((supported & DMUS_OBJ_VERSION) && chunk_read_data(stream, &chunk, + &desc->guidObject, sizeof(desc->vVersion)) == S_OK) + desc->dwValidData |= DMUS_OBJ_VERSION; + break; + case FOURCC_LIST: + if (chunk.type == DMUS_FOURCC_UNFO_LIST && (supported & DMUS_OBJ_NAME)) + unfo_get_name(stream, &chunk, desc, supported & DMUS_OBJ_NAME_INAM); + else if (chunk.type == DMUS_FOURCC_INFO_LIST && (supported & DMUS_OBJ_NAME_INFO)) + info_get_name(stream, &chunk, desc); + break; + } + } + TRACE("Found %#x\n", desc->dwValidData); + + return hr; +} + /* Generic IPersistStream methods */ static inline struct dmobject *impl_from_IPersistStream(IPersistStream *iface) { diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index ad6bf6d14c..13be675a7b 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -19,6 +19,31 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/debug.h" + +/* RIFF stream parsing */ +struct chunk_entry; +struct chunk_entry { + FOURCC id; + DWORD size; + FOURCC type; /* valid only for LIST and RIFF chunks */ + ULARGE_INTEGER offset; /* chunk offset from start of stream */ + const struct chunk_entry *parent; /* enclosing RIFF or LIST chunk */ +}; + +HRESULT chunk_next(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT chunk_read(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; +HRESULT chunk_skip(IStream *stream, struct chunk_entry *chunk) DECLSPEC_HIDDEN; + +HRESULT chunk_read_data(IStream *stream, struct chunk_entry *chunk, void *data, ULONG size) + DECLSPEC_HIDDEN; +HRESULT chunk_read_wstr(IStream *stream, struct chunk_entry *chunk, WCHAR *str, ULONG size) + DECLSPEC_HIDDEN; + +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; + + +/* IDirectMusicObject base object */ struct dmobject { IDirectMusicObject IDirectMusicObject_iface; IPersistStream IPersistStream_iface; @@ -38,6 +63,14 @@ HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface, HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface, DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; +/* Helper for IDirectMusicObject::ParseDescriptor */ +HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, + DMUS_OBJECTDESC *desc, DWORD supported) DECLSPEC_HIDDEN; +/* Additional supported flags for dmobj_parsedescriptor. + DMUS_OBJ_NAME is 'UNAM' chunk in UNFO list */ +#define DMUS_OBJ_NAME_INAM 0x1000 /* 'INAM' chunk in UNFO list */ +#define DMUS_OBJ_NAME_INFO 0x2000 /* 'INAM' chunk in INFO list */ + /* Generic IPersistStream methods */ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index f0e14826d4..ab76890e0f 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -577,175 +577,39 @@ static const IDirectMusicSegment8Vtbl dmsegment8_vtbl = { /* IDirectMusicSegment8Impl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, - IStream *pStream, DMUS_OBJECTDESC *pDesc) + 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, %p)\n", iface, pStream, pDesc); - - /* FIXME: should this be determined from stream? */ - pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = CLSID_DirectMusicSegment; - - 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_SEGMENT_FORM) { - TRACE_(dmfile)(": segment 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; - } - case DMUS_FOURCC_TRACK_LIST: { - TRACE_(dmfile)(": TRACK 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 = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - 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); - break; - } else if (Chunk.fccID == mmioFOURCC('W','A','V','E')) { - TRACE_(dmfile)(": wave form (loading not yet implemented)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - } 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%s\n", debugstr_DMUS_OBJECTDESC (pDesc)); - - return S_OK; + struct chunk_entry riff = {0}; + DWORD supported = DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION; + HRESULT hr; + + TRACE("(%p,%p, %p)\n", iface, stream, desc); + + if (!stream || !desc) + return E_POINTER; + + if ((hr = chunk_read(stream, &riff)) != S_OK) + return hr; + if (riff.id != FOURCC_RIFF || !(riff.type == DMUS_FOURCC_SEGMENT_FORM || + riff.type == mmioFOURCC('W','A','V','E'))) { + TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); + chunk_skip(stream, &riff); + return E_FAIL; + } + + if (riff.type == DMUS_FOURCC_SEGMENT_FORM) + supported |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; + else + supported |= DMUS_OBJ_NAME_INFO; + hr = dmobj_parsedescriptor(stream, &riff, desc, supported); + if (FAILED(hr)) + return hr; + + desc->guidClass = CLSID_DirectMusicSegment; + desc->dwValidData |= DMUS_OBJ_CLASS; + + TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + return S_OK; } static const IDirectMusicObjectVtbl dmobject_vtbl = { diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 1438a8d142..848e4f5a28 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -794,7 +794,8 @@ static void test_parsedescriptor(void) "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); else ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + todo_wine_if(forms[i].needs_size) + ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); /* All desc chunks */ alldesc[1] = forms[i].form; @@ -806,9 +807,7 @@ static void test_parsedescriptor(void) valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; if (forms[i].form != mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; - todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) - 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, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", @@ -825,9 +824,7 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) - 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); IStream_Release(stream); /* UNFO list with INAM */ @@ -838,7 +835,7 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine_if(forms[i].form != mmioFOURCC('W','A','V','E')) + todo_wine_if(forms[i].needs_size) ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -853,12 +850,10 @@ static void test_parsedescriptor(void) valid = DMUS_OBJ_CLASS; if (forms[i].form == mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME; - todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) - 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); if (forms[i].form == mmioFOURCC('W','A','V','E')) - todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), - "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); + ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", + wine_dbgstr_w(desc.wszName)); IStream_Release(stream); IDirectMusicObject_Release(dmo); -- 2.14.3

1 0

WineConf 2018 RSVP form
by Henri Verbeet March 8, 2018

March 8, 2018

We once again have an RSVP form at https://www.winehq.org/wineconf/rsvp. If absence of that form was what was keeping you from registering for this year's WineConf, this is what you've been waiting for. If you've already registered by e-mail or IRC, you don't need to register again. (But we don't mind if you do.) Henri

1 0

[PATCH 6/6] wined3d: Pass a wined3d_context structure to texture2d_download_data().
by Henri Verbeet March 8, 2018

March 8, 2018

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12023e2..35aee73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -561,9 +561,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win * correct texture. */ /* Context activation is done by the caller. */ static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, DWORD dst_location) + const struct wined3d_context *context, DWORD dst_location) { const struct wined3d_format *format = texture->resource.format; + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int src_row_pitch, src_slice_pitch; @@ -2070,7 +2071,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; @@ -2094,7 +2094,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location); + texture2d_download_data(texture, sub_resource_idx, context, dst_location); ++texture->download_count; return TRUE; -- 2.1.4

2 1

[PATCH v2 1/4] devenum: Always scan for devices in CreateClassEnumerator().
by Zebediah Figura March 8, 2018

March 8, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 22 ---------------------- dlls/devenum/tests/devenum.c | 2 -- 2 files changed, 24 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 7cfdbff..7c03852 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -547,12 +547,6 @@ static void register_vfw_codecs(void) RegCloseKey(basekey); } -static HANDLE DEVENUM_populate_handle; -static const WCHAR DEVENUM_populate_handle_nameW[] = - {'_','_','W','I','N','E','_', - 'D','e','v','e','n','u','m','_', - 'P','o','p','u','l','a','t','e',0}; - static HRESULT register_codecs(void) { HRESULT res; @@ -566,21 +560,6 @@ static HRESULT register_codecs(void) REGFILTERPINS2 rfp2; HKEY basekey; - if (DEVENUM_populate_handle) - return S_OK; - DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW); - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - /* Webcams can take some time to scan if the driver is badly written and it enables them, - * so have a 10 s timeout here - */ - if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT) - WARN("Waiting for object timed out\n"); - TRACE("No need to rescan\n"); - return S_OK; - } - TRACE("Scanning for devices\n"); - /* Since devices can change between session, for example because you just plugged in a webcam * or switched from pulseaudio to alsa, delete all old devices first */ @@ -878,6 +857,5 @@ static HRESULT register_codecs(void) register_vfw_codecs(); - SetEvent(DEVENUM_populate_handle); return res; } diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 7e3270f..a08dece 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -445,11 +445,9 @@ static void test_codec(void) /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ -todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); IPropertyBag_Release(prop_bag); -- 2.7.4

1 3

[PATCH 1/3] devenum: Always scan for devices in CreateClassEnumerator().
by Zebediah Figura March 8, 2018

March 8, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 22 ---------------------- dlls/devenum/tests/devenum.c | 2 -- 2 files changed, 24 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 7cfdbff..7c03852 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -547,12 +547,6 @@ static void register_vfw_codecs(void) RegCloseKey(basekey); } -static HANDLE DEVENUM_populate_handle; -static const WCHAR DEVENUM_populate_handle_nameW[] = - {'_','_','W','I','N','E','_', - 'D','e','v','e','n','u','m','_', - 'P','o','p','u','l','a','t','e',0}; - static HRESULT register_codecs(void) { HRESULT res; @@ -566,21 +560,6 @@ static HRESULT register_codecs(void) REGFILTERPINS2 rfp2; HKEY basekey; - if (DEVENUM_populate_handle) - return S_OK; - DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW); - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - /* Webcams can take some time to scan if the driver is badly written and it enables them, - * so have a 10 s timeout here - */ - if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT) - WARN("Waiting for object timed out\n"); - TRACE("No need to rescan\n"); - return S_OK; - } - TRACE("Scanning for devices\n"); - /* Since devices can change between session, for example because you just plugged in a webcam * or switched from pulseaudio to alsa, delete all old devices first */ @@ -878,6 +857,5 @@ static HRESULT register_codecs(void) register_vfw_codecs(); - SetEvent(DEVENUM_populate_handle); return res; } diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 7e3270f..a08dece 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -445,11 +445,9 @@ static void test_codec(void) /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ -todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); IPropertyBag_Release(prop_bag); -- 2.7.4

1 3

[PATCH] kernel32: Implement FindNLSStringEx. Tests included.
by Sergio Gómez Del Real March 8, 2018

March 8, 2018

Fixes PowerShell issue at https://bugs.winehq.org/show_bug.cgi?id=41911 Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/locale.c | 99 +++++++++++++++++++++++++++++++++++++++ include/winnls.h | 5 ++ 4 files changed, 212 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 60809f45fd..3a0bef93e7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -505,7 +505,7 @@ @ stub FindNextVolumeMountPointW @ stdcall FindNextVolumeW(long ptr long) # @ stub FindNLSString -# @ stub FindNLSStringEx +@ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) @ stdcall FindResourceA(long str str) @ stdcall FindResourceExA(long str str long) @ stdcall FindResourceExW(long wstr wstr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e4c323ead6..123f8b2f3e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5941,3 +5941,110 @@ INT WINAPI ResolveLocaleName(LPCWSTR name, LPWSTR localename, INT len) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +/****************************************************************************** + * FindNLSStringEx (KERNEL32.@) + */ + +INT WINAPI FindNLSStringEx(const WCHAR *localename, DWORD flags, const WCHAR *src, + INT src_size, const WCHAR *value, INT value_size, + INT *found, LPNLSVERSIONINFO version_info, LPVOID reserved, + LPARAM sort_handle) +{ + + DWORD mask = flags; + + TRACE("%s %x %s %d %s %d %p %p %p %ld\n", wine_dbgstr_w(localename), flags, + wine_dbgstr_w(src), src_size, wine_dbgstr_w(value), value_size, found, + version_info, reserved, sort_handle); + FIXME("strings should be normalized once NormalizeString() is implemented\n"); + + if (version_info != NULL || reserved != NULL || sort_handle != 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + if (localename == NULL || !IsValidLocaleName(localename)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + if (src == NULL || src_size == 0 || src_size < -1 || + value == NULL || value_size == 0 || value_size < -1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return -1; + } + if ((flags & (FIND_FROMSTART | FIND_FROMEND | FIND_STARTSWITH | FIND_ENDSWITH)) == 0) + flags |= FIND_FROMSTART; + else + { + /* flags are mutually exclusive */ + mask &= (FIND_FROMSTART | FIND_FROMEND | FIND_STARTSWITH | FIND_ENDSWITH); + while ((mask & 1) == 0) + mask >>= 1; + mask >>=1; + if (mask) + { + SetLastError(ERROR_INVALID_FLAGS); + return -1; + } + } + /* caller can delegate string length, but promises to zero-end it */ + if (src_size == -1) + src_size = strlenW(src); + if (value_size == -1) + value_size = strlenW(value); + + src_size -= value_size; + if (src_size < 0) + { + SetLastError(ERROR_SUCCESS); + return -1; + } + + mask = flags & ~(FIND_FROMSTART | FIND_FROMEND | FIND_STARTSWITH | FIND_ENDSWITH); + if (flags & FIND_FROMSTART) + { + int j; + for (j = 0; j < src_size; j++) + { + if (CompareStringEx(localename, mask, src + j, value_size, value, value_size, NULL, NULL, 0) == CSTR_EQUAL) + { + if (found) + *found = value_size; + return j; + } + } + SetLastError(ERROR_SUCCESS); + return -1; + } + else if (flags & FIND_STARTSWITH) + { + if (CompareStringEx(localename, mask, src, value_size, value, value_size, NULL, NULL, 0) == CSTR_EQUAL) + { + if (found) + *found = value_size; + return 0; + } + SetLastError(ERROR_SUCCESS); + return -1; + } + else if (flags & FIND_ENDSWITH) + { + if (CompareStringEx(localename, mask, src + src_size, value_size, value, value_size, NULL, NULL, 0) == CSTR_EQUAL) + { + if (found) + *found = value_size; + return src_size; + } + SetLastError(ERROR_SUCCESS); + return -1; + } + else + { + FIXME("unsupported FINDFROMEND flag\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return -1; + } +} diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ce2f13b6dc..6d1c2578ab 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -103,6 +103,7 @@ static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULON static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMTW *, LPWSTR, int); +static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM); static void InitFunctionPointers(void) { @@ -135,6 +136,7 @@ static void InitFunctionPointers(void) X(GetThreadPreferredUILanguages); X(GetUserPreferredUILanguages); X(GetNumberFormatEx); + X(FindNLSStringEx); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -5329,6 +5331,102 @@ static void test_GetUserPreferredUILanguages(void) HeapFree(GetProcessHeap(), 0, buffer); } +static void test_FindNLSStringEx(void) +{ + INT res; + static WCHAR en_simpleW[] = {'S','i','m','p','l','e','T','e','s','t',0}; + static WCHAR en_pletW[] = {'p','l','e','T',0}; + static WCHAR en_simpW[] = {'S','i','m','p',0}; + static WCHAR en_testW[] = {'T','e','s','t',0}; + static WCHAR comb_s_accent1W[] = {0x1e69, 'o','u','r','c','e',0}; + static WCHAR comb_s_accent2W[] = {0x0073,0x323,0x307,'o','u','r','c','e',0}; + static WCHAR comb_q_accent1W[] = {0x0071,0x0307,0x323,'u','o','t','e',0}; + static WCHAR comb_q_accent2W[] = {0x0071,0x0323,0x307,'u','o','t','e',0}; + static WCHAR singleton_angstromW[] = {0x212b,'m','e','r','i','c','a',0}; + static WCHAR singleton_angstrom_decomW[] = {0x41,0x30a,'m','e','r','i','c','a',0}; + struct test_data { + const WCHAR *locale; + DWORD flags; + WCHAR *src; + INT src_size; + WCHAR *value; + INT val_size; + INT found; + INT expected_ret; + INT expected_found; + int todo; + }; + + static struct test_data test_arr[] = + { + { localeW, FIND_FROMSTART, en_simpleW, sizeof(en_simpleW)/sizeof(WCHAR)-1, + en_pletW, sizeof(en_pletW)/sizeof(WCHAR)-1, 0, 3, 4, 0 }, + { localeW, FIND_STARTSWITH, en_simpleW, sizeof(en_simpleW)/sizeof(WCHAR)-1, + en_simpW, sizeof(en_simpW)/sizeof(WCHAR)-1, 0, 0, 4, 0 }, + { localeW, FIND_ENDSWITH, en_simpleW, sizeof(en_simpleW)/sizeof(WCHAR)-1, + en_testW, sizeof(en_testW)/sizeof(WCHAR)-1, 0, 6, 4, 0 }, + { localeW, FIND_FROMSTART, comb_s_accent1W, sizeof(comb_s_accent1W)/sizeof(WCHAR)-1, + comb_s_accent2W, sizeof(comb_s_accent2W)/sizeof(WCHAR)-1, 0, 0, 6, 1 }, + { localeW, FIND_FROMSTART, comb_q_accent1W, sizeof(comb_q_accent1W)/sizeof(WCHAR)-1, + comb_q_accent2W, sizeof(comb_q_accent2W)/sizeof(WCHAR)-1, 0, 0, 7, 1 }, + { localeW, FIND_FROMSTART, singleton_angstromW, sizeof(singleton_angstromW)/sizeof(WCHAR)-1, + singleton_angstrom_decomW, sizeof(singleton_angstrom_decomW)/sizeof(WCHAR)-1, 0, 0, 7, 1 }, + { 0 } + }; + struct test_data *ptest; + + res = pFindNLSStringEx(invalidW, FIND_FROMSTART, fooW, 3, fooW, + 3, NULL, NULL, NULL, 0); + ok(res, "Expected failure of FindNLSStringEx. Return value was %d\n", res); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected ERROR_INVALID_PARAMETER as last error; got %d\n", GetLastError()); + + res = pFindNLSStringEx(localeW, FIND_FROMSTART | FIND_ENDSWITH, fooW, 3, fooW, + 3, NULL, NULL, NULL, 0); + ok(res, "Expected failure of FindNLSStringEx. Return value was %d\n", res); + ok(ERROR_INVALID_FLAGS == GetLastError(), + "Expected ERROR_INVALID_FLAGS as last error; got %d\n", GetLastError()); + + res = pFindNLSStringEx(localeW, FIND_FROMSTART, NULL, 3, fooW, 3, + NULL, NULL, NULL, 0); + ok(res, "Expected failure of FindNLSStringEx. Return value was %d\n", res); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected ERROR_INVALID_PARAMETER as last error; got %d\n", GetLastError()); + + res = pFindNLSStringEx(localeW, FIND_FROMSTART, fooW, -5, fooW, 3, + NULL, NULL, NULL, 0); + ok(res, "Expected failure of FindNLSStringEx. Return value was %d\n", res); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected ERROR_INVALID_PARAMETER as last error; got %d\n", GetLastError()); + + res = pFindNLSStringEx(localeW, FIND_FROMSTART, fooW, 3, NULL, 3, + NULL, NULL, NULL, 0); + ok(res, "Expected failure of FindNLSStringEx. Return value was %d\n", res); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected ERROR_INVALID_PARAMETER as last error; got %d\n", GetLastError()); + + res = pFindNLSStringEx(localeW, FIND_FROMSTART, fooW, 3, fooW, -5, + NULL, NULL, NULL, 0); + ok(res, "Expected failure of FindNLSStringEx. Return value was %d\n", res); + ok(ERROR_INVALID_PARAMETER == GetLastError(), + "Expected ERROR_INVALID_PARAMETER as last error; got %d\n", GetLastError()); + + for (ptest = test_arr; ptest->src != NULL; ptest++) + { + todo_wine_if(ptest->todo) + { + res = pFindNLSStringEx(ptest->locale, ptest->flags, ptest->src, ptest->src_size, + ptest->value, ptest->val_size, &ptest->found, NULL, NULL, 0); + ok(res == ptest->expected_ret, + "Expected FindNLSStringEx to return %d. Returned value was %d\n", + ptest->expected_ret, res); + ok(ptest->found == ptest->expected_found, + "Expected FindNLSStringEx to output %d. Value was %d\n", + ptest->expected_found, ptest->found); + } + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -5375,6 +5473,7 @@ START_TEST(locale) test_GetSystemPreferredUILanguages(); test_GetThreadPreferredUILanguages(); test_GetUserPreferredUILanguages(); + test_FindNLSStringEx(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } diff --git a/include/winnls.h b/include/winnls.h index 8cb8af6e8e..ab22bc3cac 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -352,6 +352,10 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define NORM_IGNOREKANATYPE 0x00010000 #define NORM_IGNOREWIDTH 0x00020000 #define NORM_LINGUISTIC_CASING 0x08000000 +#define FIND_STARTSWITH 0x00100000 +#define FIND_ENDSWITH 0x00200000 +#define FIND_FROMSTART 0x00400000 +#define FIND_FROMEND 0x00800000 #define CP_ACP 0 #define CP_OEMCP 1 @@ -961,6 +965,7 @@ WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); +WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,LPNLSVERSIONINFO,void *,LPARAM); #ifdef __cplusplus } -- 2.14.1

2 1

[PATCH 2/2] mshtml/tests: Added more IDOMEvent::preventDefault tests.
by Jacek Caban March 8, 2018

March 8, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+)

2 1

[PATCH v3 1/2] wmp: Add IWMPMedia stub
by Anton Romanov March 8, 2018

March 8, 2018

Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/player.c | 293 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wmp/tests/Makefile.in | 3 + dlls/wmp/tests/av.mp4 | Bin 0 -> 1493 bytes dlls/wmp/tests/oleobj.c | 86 +++++++++++++ dlls/wmp/tests/rsrc.rc | 22 ++++ dlls/wmp/wmp_private.h | 29 +++++ 7 files changed, 426 insertions(+), 8 deletions(-) create mode 100644 dlls/wmp/tests/av.mp4 create mode 100644 dlls/wmp/tests/rsrc.rc diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 25787fa759..cc0e9a9d98 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -308,6 +308,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) if(!ref) { release_client_site(This); ConnectionPointContainer_Destroy(This); + destroy_player(This); heap_free(This); } diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 2628fa4b5d..1febb3f6ce 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmp); +static inline WMPMedia *impl_from_IWMPMedia(IWMPMedia *iface) +{ + return CONTAINING_RECORD(iface, WMPMedia, IWMPMedia_iface); +} + static inline WindowsMediaPlayer *impl_from_IWMPPlayer4(IWMPPlayer4 *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IWMPPlayer4_iface); @@ -98,15 +103,23 @@ static HRESULT WINAPI WMPPlayer4_close(IWMPPlayer4 *iface) static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *pbstrURL) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pbstrURL); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pbstrURL); + if(This->wmpmedia == NULL) { + return S_FALSE; + } + return IWMPMedia_get_sourceURL(This->wmpmedia, pbstrURL); } static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(url)); - return E_NOTIMPL; + IWMPMedia *media; + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + if(url == NULL) { + return E_POINTER; + } + media = create_media_from_url(url); + return IWMPPlayer4_put_currentMedia(iface, media); } static HRESULT WINAPI WMPPlayer4_get_openState(IWMPPlayer4 *iface, WMPOpenState *pwmpos) @@ -148,15 +161,28 @@ static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings * static HRESULT WINAPI WMPPlayer4_get_currentMedia(IWMPPlayer4 *iface, IWMPMedia **ppMedia) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppMedia); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ppMedia); + if(This->wmpmedia == NULL) { + return S_FALSE; + } + IWMPMedia_AddRef(This->wmpmedia); + *ppMedia = This->wmpmedia; + return S_OK; } static HRESULT WINAPI WMPPlayer4_put_currentMedia(IWMPPlayer4 *iface, IWMPMedia *pMedia) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pMedia); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pMedia); + if(pMedia == NULL) { + return E_POINTER; + } + if(This->wmpmedia != NULL) { + IWMPMedia_Release(This->wmpmedia); + } + This->wmpmedia = pMedia; + IWMPMedia_AddRef(This->wmpmedia); + return S_OK; } static HRESULT WINAPI WMPPlayer4_get_mediaCollection(IWMPPlayer4 *iface, IWMPMediaCollection **ppMediaCollection) @@ -1157,6 +1183,241 @@ static const IWMPControlsVtbl WMPControlsVtbl = { WMPControls_playItem, }; +static HRESULT WINAPI WMPMedia_QueryInterface(IWMPMedia *iface, REFIID riid, void **ppv) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + TRACE("(%p)\n", This); + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMPMedia_iface; + }else if(IsEqualGUID(&IID_IDispatch, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IWMPMedia_iface; + }else if(IsEqualGUID(&IID_IWMPMedia, riid)) { + TRACE("(%p)->(IID_IWMPMedia %p)\n", This, ppv); + *ppv = &This->IWMPMedia_iface; + }else { + WARN("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMPMedia_AddRef(IWMPMedia *iface) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This->url); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI WMPMedia_GetTypeInfoCount(IWMPMedia *iface, UINT *pctinfo) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_GetTypeInfo(IWMPMedia *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_GetIDsOfNames(IWMPMedia *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_Invoke(IWMPMedia *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_isIdentical(IWMPMedia *iface, IWMPMedia *other, VARIANT_BOOL *pvBool) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p, %p)\n", This, other, pvBool); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *pbstrSourceUrl) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pbstrSourceUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *pbstrName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pbstrName); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR pbstrName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pbstrName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_imageSourceWidth(IWMPMedia *iface, LONG *pWidth) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pWidth); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_imageSourceHeight(IWMPMedia *iface, LONG *pHeight) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_markerCount(IWMPMedia *iface, LONG* pMarkerCount) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pMarkerCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getMarkerTime(IWMPMedia *iface, LONG MarkerNum, DOUBLE *pMarkerTime) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pMarkerTime); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, BSTR *pbstrMarkerName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pbstrMarkerName); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pDuration); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, pbstrDuration); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_get_attributeCount(IWMPMedia *iface, LONG *plCount) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p)\n", This, plCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getAttributeName(IWMPMedia *iface, LONG lIndex, BSTR *pbstrItemName) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, lIndex, pbstrItemName); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR *pbstrVal) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(bstrItemName), pbstrVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_setItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR bstrVal) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s, %s)\n", This, debugstr_w(bstrItemName), debugstr_w(bstrVal)); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_getItemInfoByAtom(IWMPMedia *iface, LONG lAtom, BSTR *pbstrVal) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%d, %p)\n", This, lAtom, pbstrVal); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_isMemberOf(IWMPMedia *iface, IWMPPlaylist *pPlaylist, VARIANT_BOOL *pvarfIsMemberOf) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%p, %p)\n", This, pPlaylist, pvarfIsMemberOf); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMPMedia_isReadOnlyItem(IWMPMedia *iface, BSTR bstrItemName, VARIANT_BOOL *pvarfIsReadOnly) +{ + WMPMedia *This = impl_from_IWMPMedia(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(bstrItemName), pvarfIsReadOnly); + return E_NOTIMPL; +} + +static const IWMPMediaVtbl WMPMediaVtbl = { + WMPMedia_QueryInterface, + WMPMedia_AddRef, + WMPMedia_Release, + WMPMedia_GetTypeInfoCount, + WMPMedia_GetTypeInfo, + WMPMedia_GetIDsOfNames, + WMPMedia_Invoke, + WMPMedia_get_isIdentical, + WMPMedia_get_sourceURL, + WMPMedia_get_name, + WMPMedia_put_name, + WMPMedia_get_imageSourceWidth, + WMPMedia_get_imageSourceHeight, + WMPMedia_get_markerCount, + WMPMedia_getMarkerTime, + WMPMedia_getMarkerName, + WMPMedia_get_duration, + WMPMedia_get_durationString, + WMPMedia_get_attributeCount, + WMPMedia_getAttributeName, + WMPMedia_getItemInfo, + WMPMedia_setItemInfo, + WMPMedia_getItemInfoByAtom, + WMPMedia_isMemberOf, + WMPMedia_isReadOnlyItem +}; + void init_player(WindowsMediaPlayer *wmp) { wmp->IWMPPlayer4_iface.lpVtbl = &WMPPlayer4Vtbl; @@ -1167,3 +1428,19 @@ void init_player(WindowsMediaPlayer *wmp) wmp->invoke_urls = VARIANT_TRUE; wmp->auto_start = VARIANT_TRUE; } + +void destroy_player(WindowsMediaPlayer *wmp) +{ + if(wmp->wmpmedia) + IWMPMedia_Release(wmp->wmpmedia); +} + +IWMPMedia* create_media_from_url(BSTR url){ + + WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; + media->url = heap_strdupW(url); + media->ref = 1; + + return &media->IWMPMedia_iface; +} diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index df770c78c6..dded3a4a7e 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -2,3 +2,6 @@ TESTDLL = wmp.dll IMPORTS = ole32 oleaut32 user32 gdi32 C_SRCS = oleobj.c + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/wmp/tests/av.mp4 b/dlls/wmp/tests/av.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..1431e98dd3f5bb28c282d3d732a3a1fc13cf3d63 GIT binary patch literal 1493 zcmeHHO-sW-5Z$D$cn}OyK`=rq^=7}c+G`IUJa`ik#7o*uZD_U$*=<2j`7uHf{1GDl z1OJ2v!Gm5r>6;{NZ56!et&eVJ_RZ{@-Py2=F|(~MeMfqNF`bdc*b#oM${1U02eu9V zMQ}^yjZE%({o(a)Y&97zZ2!~blBKX3W>_ST2tck=HTAD{cZ(a)Vo&eT`}nJY3bAx=4GZa z`b{u30X;KsOfrA+Qdsb;0;`MQx#~tW!HuCOUU|%5K~!R<&M$QfHdhiFrtM0VXpus! z8w+y59SdAe(a)Y%E99^ge_ClAreVu!myqQRus?~Q!2$C&d&tH)iNa<paP^xAL?DW*gV zJmyUv*c2zwHkSH<n(a)jvhshTeQ3#sJjGAQR1Zxn5mK=T+nGsvN>0=u^4bYPYW!*CPt zTN*aoSS3n(!+3qqfYDcs1sIL`ye3uDqbLP`;L_xqDBmInpmH=QpDe|$U`GJ2p{zzd z&Pvttk^tpyV>J6*S+Hlqjx2(a)qU;BwW2rS>HV~<gE;!E4QQ633y;7KMC5(a)ko$puM+W Ks#QwWO7#=93TT)B literal 0 HcmV?d00001 diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 42ed858b85..b4b0296ff2 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -18,12 +18,16 @@ #define WIN32_LEAN_AND_MEAN #define COBJMACROS +#include <stdarg.h> #include <initguid.h> +#include <windef.h> +#include <winbase.h> #include <windows.h> #include <wmp.h> #include <olectl.h> #include "wine/test.h" +#include "wine/heap.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -49,6 +53,12 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_OR_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(1), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_EXPECT(GetContainer); DEFINE_EXPECT(GetExtendedControl); DEFINE_EXPECT(GetWindow); @@ -60,6 +70,32 @@ DEFINE_EXPECT(GetWindowContext); DEFINE_EXPECT(ShowObject); DEFINE_EXPECT(OnShowWindow_FALSE); +static const WCHAR mp4file[] = {'a','v','.','m','p','4',0}; +static inline WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + static HWND container_hwnd; static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) @@ -859,9 +895,12 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings *settings, *settings_qi; IWMPPlayer4 *player4; IWMPPlayer *player; + IWMPMedia *media; IWMPControls *controls; VARIANT_BOOL vbool; HRESULT hres; + BSTR filename; + BSTR url; hres = IOleObject_QueryInterface(oleobj, &IID_IWMPPlayer4, (void**)&player4); ok(hres == S_OK, "Could not get IWMPPlayer4 iface: %08x\n", hres); @@ -878,6 +917,52 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPControls_Release(controls); + media = NULL; + hres = IWMPPlayer4_QueryInterface(player4, &IID_IWMPMedia, (void**)&media); + ok(hres == E_NOINTERFACE, "get_currentMedia SUCCEEDED: %08x\n", hres); + ok(media == NULL, "media != NULL\n"); + + /* Test media put/get */ + media = NULL; + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_FALSE, "get_currentMedia SUCCEEDED\n"); + ok(media == NULL, "media != NULL\n"); + + filename = SysAllocString(load_resource(mp4file)); + + + SET_EXPECT(GetContainer); + SET_EXPECT(Invoke_USERMODE); + hres = IWMPPlayer4_put_URL(player4, filename); + ok(hres == S_OK, "IWMPPlayer4_put_URL failed: %08x\n", hres); + todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); + todo_wine CHECK_CALLED(Invoke_USERMODE); + + url = NULL; + SET_EXPECT(Invoke_USERMODE); + hres = IWMPPlayer4_get_URL(player4, &url); + todo_wine ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); + todo_wine ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + todo_wine CHECK_CALLED(Invoke_USERMODE); + SysFreeString(url); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); + ok(media != NULL, "media = (%p)\n", media); + + SET_EXPECT(GetContainer); + hres = IWMPPlayer4_put_currentMedia(player4, media); + ok(hres == S_OK, "put_currentMedia failed: %08x\n", hres); + todo_wine CHECK_CALLED_OR_BROKEN(GetContainer); + + IWMPMedia_Release(media); + + hres = IWMPPlayer4_get_currentMedia(player4, &media); + ok(hres == S_OK, "get_currentMedia failed: %08x\n", hres); + ok(media != NULL, "media = (%p)\n", media); + + IWMPMedia_Release(media); + settings = NULL; hres = IWMPPlayer4_get_settings(player4, &settings); ok(hres == S_OK, "get_settings failed: %08x\n", hres); @@ -934,6 +1019,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) IWMPSettings_Release(settings); IWMPPlayer_Release(player); + SysFreeString(filename); } #define test_rect_size(a,b,c) _test_rect_size(__LINE__,a,b,c) diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc new file mode 100644 index 0000000000..fb30ae6940 --- /dev/null +++ b/dlls/wmp/tests/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resource file for wmp tests. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: av.mp4 */ +av.mp4 RCDATA "av.mp4" diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index a3baaf7206..465721bf4d 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -20,6 +20,7 @@ #include "windows.h" #include "wine/heap.h" +#include "wine/unicode.h" #include "ole2.h" #include "wmp.h" @@ -34,6 +35,14 @@ typedef struct { IID iid; } ConnectionPoint; +typedef struct { + IWMPMedia IWMPMedia_iface; + + LONG ref; + + WCHAR *url; +} WMPMedia; + struct WindowsMediaPlayer { IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; @@ -58,9 +67,13 @@ struct WindowsMediaPlayer { VARIANT_BOOL enable_error_dialogs; ConnectionPoint *wmpocx; + + IWMPMedia *wmpmedia; }; void init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; +void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; +IWMPMedia* create_media_from_url(BSTR url); void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; @@ -69,3 +82,19 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; + +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + WCHAR *ret; + + if(str) { + size_t size = strlenW(str)+1; + ret = heap_alloc(size*sizeof(WCHAR)); + if(ret) + memcpy(ret, str, size*sizeof(WCHAR)); + }else { + ret = NULL; + } + + return ret; +} -- 2.16.2

2 3

[PATCH] testbot: Simplify updating a Step's status.
by Francois Gouget March 8, 2018

March 8, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Steps.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 45ec6359f..40dfc0a44 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -146,12 +146,7 @@ sub UpdateStatus($$) return $Status if ($Status ne "queued" && $Status ne "running"); my %Has; - my $Tasks = $self->Tasks; - foreach my $TaskKey (@{$Tasks->GetKeys()}) - { - my $Task = $Tasks->GetItem($TaskKey); - $Has{$Task->UpdateStatus($Skip)} = 1; - } + map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->GetItems()}); # Inherit the tasks most significant status. # Note that one or more tasks may have been requeued during the cleanup phase -- 2.16.1

1 0