January 2019 - Wine-Devel - list.winehq.org

[PATCH v2 4/4] mfplat: Implement IMFByteStream::{Read,Write,GetCurrentPosition} for bytestream from file.
by Jactry Zeng Jan. 30, 2019

Jan. 30, 2019

Superseded patch 157467. ChangeLog: v2: - Remove a redundant test. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 40 +++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 42 +++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 80c1b3e3ba..a606592638 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -858,6 +858,7 @@ typedef struct _mfbytestream HANDLE handle; LARGE_INTEGER length; QWORD position; + DWORD mode; } file; } u; } mfbytestream; @@ -964,7 +965,9 @@ static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWOR FIXME("%p, %p\n", This, position); - return E_NOTIMPL; + *position = This->u.file.position; + + return S_OK; } static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) @@ -991,10 +994,21 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + DWORD read = 0; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("%p, %p, %u, %p\n", This, data, count, byte_read); - return E_NOTIMPL; + if(This->u.file.mode == MF_ACCESSMODE_WRITE) + return E_ACCESSDENIED; + + if(!ReadFile(This->u.file.handle, data, count, &read, NULL)) + return S_FALSE; + + This->u.file.position += read; + if(byte_read) + *byte_read = read; + + return S_OK; } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1019,10 +1033,25 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + DWORD written_len = 0; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("%p, %p, %u, %p\n", This, data, count, written); - return E_NOTIMPL; + if(This->u.file.mode == MF_ACCESSMODE_READ) + return E_ACCESSDENIED; + + if(!WriteFile(This->u.file.handle, data, count, &written_len, NULL)) + return E_FAIL; + + if(!GetFileSizeEx(This->u.file.handle, &This->u.file.length)) + return E_FAIL; + + This->u.file.position = SetFilePointer(This->u.file.handle, 0, NULL, FILE_CURRENT); + + if(written) + *written = written_len; + + return S_OK; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, @@ -1429,6 +1458,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open return E_FAIL; } object->u.file.position = 0; + object->u.file.mode = accessmode; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 00bea72bc5..a066bc109c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -624,7 +624,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); CHECK_BS_LEN(bytestream, file_size); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); /* test MF_OPENMODE_RESET_IF_EXIST */ @@ -632,7 +632,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); CHECK_BS_LEN(bytestream, 0); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); file_size = GetFileSize(handle, NULL); @@ -770,17 +770,17 @@ static void test_bytestream_from_file(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_Flush(bytestream); todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Flush should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); @@ -791,17 +791,17 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_POS(bytestream, sizeof(asf_header)); hr = IMFByteStream_Flush(bytestream); todo_wine ok(hr == S_OK, "IMFByteStream_Flush failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_POS(bytestream, sizeof(asf_header)); CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); @@ -811,7 +811,7 @@ static void test_bytestream_from_file(void) ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_POS(bytestream, sizeof(asf_header)); IMFByteStream_Release(bytestream); file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ReadFile(file, buffer, sizeof(buffer), &read, NULL); @@ -823,20 +823,20 @@ static void test_bytestream_from_file(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); - todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); CHECK_BS_LEN(bytestream, 0); hr = IMFByteStream_SetLength(bytestream, 2000); ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); @@ -844,7 +844,7 @@ static void test_bytestream_from_file(void) hr = IMFByteStream_GetLength(bytestream, &length); ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); DeleteFileW(asffile); -- 2.20.1

1 0

[PATCH v2 3/4] mfplat: Implement IMFByteStream::{GetLength, SetLength} for bytestream from file.
by Jactry Zeng Jan. 30, 2019

Jan. 30, 2019

Superseded patch 157466. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 38 ++++++++++--- dlls/mfplat/tests/mfplat.c | 111 ++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a4fd7329e8..80c1b3e3ba 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -853,7 +853,12 @@ typedef struct _mfbytestream union { IStream *stream; - HANDLE file; + struct + { + HANDLE handle; + LARGE_INTEGER length; + QWORD position; + } file; } u; } mfbytestream; @@ -907,7 +912,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { - CloseHandle(This->u.file); + CloseHandle(This->u.file.handle); HeapFree(GetProcessHeap(), 0, This); } @@ -927,18 +932,30 @@ static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length { mfbytestream *This = impl_from_IMFByteStream(iface); - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + *length = This->u.file.length.QuadPart; + + return S_OK; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + if(!SetFilePointer(This->u.file.handle, length, NULL, FILE_BEGIN)) + return E_FAIL; + + if(!SetEndOfFile(This->u.file.handle)) + return E_FAIL; + + if(This->u.file.position) + if(!SetFilePointer(This->u.file.handle, This->u.file.position, NULL, FILE_BEGIN)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) @@ -1404,7 +1421,14 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; - object->u.file = file; + object->u.file.handle = file; + if(!GetFileSizeEx(file, &object->u.file.length)) + { + CloseHandle(file); + heap_free(object); + return E_FAIL; + } + object->u.file.position = 0; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 56575b9538..00bea72bc5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -52,6 +52,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -620,7 +623,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); @@ -628,7 +631,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); @@ -744,6 +747,109 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_Flush(bytestream); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Flush should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Flush(bytestream); + todo_wine ok(hr == S_OK, "IMFByteStream_Flush failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 2000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -759,6 +865,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_bytestream_from_file(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v2 1/4] mfplat: Reimplement MFCreateMFByteStreamOnStream() for saving data stream really.
by Jactry Zeng Jan. 30, 2019

Jan. 30, 2019

Superseded patch 157465. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 189 ++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 11 +++ 2 files changed, 198 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..9497e304cd 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -849,6 +849,8 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -1070,6 +1072,182 @@ static const IMFByteStreamVtbl mfbytestream_vtbl = mfbytestream_Close }; +static ULONG WINAPI stream_mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if(!ref) + { + IStream_Release(This->stream); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI stream_mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, endstream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p, %p)\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p)\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p, %p)\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, + LONGLONG offset, DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%u, %s, 0x%08x, %p)\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl stream_mfbytestream_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + stream_mfbytestream_Release, + stream_mfbytestream_GetCapabilities, + stream_mfbytestream_GetLength, + stream_mfbytestream_SetLength, + stream_mfbytestream_GetCurrentPosition, + stream_mfbytestream_SetCurrentPosition, + stream_mfbytestream_IsEndOfStream, + stream_mfbytestream_Read, + stream_mfbytestream_BeginRead, + stream_mfbytestream_EndRead, + stream_mfbytestream_Write, + stream_mfbytestream_BeginWrite, + stream_mfbytestream_EndWrite, + stream_mfbytestream_Seek, + stream_mfbytestream_Flush, + stream_mfbytestream_Close +}; + static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) { return CONTAINING_RECORD(iface, mfbytestream, attributes.IMFAttributes_iface); @@ -1134,16 +1312,23 @@ static const IMFAttributesVtbl mfbytestream_attributes_vtbl = HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) { mfbytestream *object; + HRESULT hr; - TRACE("(%p, %p): stub\n", stream, bytestream); + TRACE("(%p, %p)\n", stream, bytestream); object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; init_attribute_object(&object->attributes, 0); - object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->IMFByteStream_iface.lpVtbl = &stream_mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + hr = IStream_QueryInterface(stream, &IID_IStream, (void **)&object->stream); + if(FAILED(hr)) + { + heap_free(object); + return hr; + } *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..0ccc680aca 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -54,6 +54,15 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -450,8 +459,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); -- 2.20.1

1 0

[PATCH] dwrite/tests: Add some tests for setting glyph properties from GDEF.
by Nikolay Sivov Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 293 ++++++++++++++++++++++++++++++++++- 1 file changed, 292 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 251887f508..99b415a3fb 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -27,8 +27,10 @@ #include "initguid.h" #include "windows.h" +#include "winternl.h" #include "dwrite_3.h" +#include "wine/heap.h" #include "wine/test.h" static IDWriteFactory *factory; @@ -44,6 +46,42 @@ static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f #define FSI 0x2068 #define PDI 0x2069 +#define MS_GDEF_TAG DWRITE_MAKE_OPENTYPE_TAG('G','D','E','F') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#define GET_LE_WORD(x) RtlUshortByteSwap(x) +#define GET_LE_DWORD(x) RtlUlongByteSwap(x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) +#define GET_LE_WORD(x) (x) +#define GET_LE_DWORD(x) (x) +#endif + +struct ot_gdef_classdef_format1 +{ + WORD format; + WORD start_glyph; + WORD glyph_count; + WORD classes[1]; +}; + +struct ot_gdef_class_range +{ + WORD start_glyph; + WORD end_glyph; + WORD glyph_class; +}; + +struct ot_gdef_classdef_format2 +{ + WORD format; + WORD range_count; + struct ot_gdef_class_range ranges[1]; +}; + enum analysis_kind { ScriptAnalysis, LastKind @@ -1364,6 +1402,207 @@ static void get_fontface_advances(IDWriteFontFace *fontface, FLOAT emsize, const } } +enum ot_gdef_class +{ + GDEF_CLASS_UNCLASSIFIED = 0, + GDEF_CLASS_BASE = 1, + GDEF_CLASS_LIGATURE = 2, + GDEF_CLASS_MARK = 3, + GDEF_CLASS_COMPONENT = 4, + GDEF_CLASS_MAX = GDEF_CLASS_COMPONENT, +}; + +struct dwrite_fonttable +{ + BYTE *data; + void *context; + unsigned int size; +}; + +static const void *table_read_ensure(const struct dwrite_fonttable *table, unsigned int offset, unsigned int size) +{ + if (size > table->size || offset > table->size - size) + return NULL; + + return table->data + offset; +} + +static WORD table_read_be_word(const struct dwrite_fonttable *table, unsigned int offset) +{ + const WORD *ptr = table_read_ensure(table, offset, sizeof(*ptr)); + return ptr ? GET_BE_WORD(*ptr) : 0; +} + +static int gdef_class_compare_format2(const void *g, const void *r) +{ + const struct ot_gdef_class_range *range = r; + UINT16 glyph = *(UINT16 *)g; + + if (glyph < GET_BE_WORD(range->start_glyph)) + return -1; + else if (glyph > GET_BE_WORD(range->end_glyph)) + return 1; + else + return 0; +} + +static unsigned int get_glyph_class(const struct dwrite_fonttable *table, UINT16 glyph) +{ + unsigned int glyph_class = GDEF_CLASS_UNCLASSIFIED, offset; + WORD format, count; + + offset = table_read_be_word(table, 4); + + format = table_read_be_word(table, offset); + + if (format == 1) + { + const struct ot_gdef_classdef_format1 *format1; + + count = table_read_be_word(table, offset + FIELD_OFFSET(struct ot_gdef_classdef_format1, glyph_count)); + format1 = table_read_ensure(table, offset, FIELD_OFFSET(struct ot_gdef_classdef_format1, classes[count])); + if (format1) + { + WORD start_glyph = GET_BE_WORD(format1->start_glyph); + if (glyph >= start_glyph && (glyph - start_glyph) < count) + { + glyph_class = GET_BE_WORD(format1->classes[glyph - start_glyph]); + if (glyph_class > GDEF_CLASS_MAX) + glyph_class = GDEF_CLASS_UNCLASSIFIED; + } + } + } + else if (format == 2) + { + const struct ot_gdef_classdef_format2 *format2; + + count = table_read_be_word(table, offset + FIELD_OFFSET(struct ot_gdef_classdef_format2, range_count)); + format2 = table_read_ensure(table, offset, FIELD_OFFSET(struct ot_gdef_classdef_format2, ranges[count])); + if (format2) + { + const struct ot_gdef_class_range *range = bsearch(&glyph, format2->ranges, count, + sizeof(struct ot_gdef_class_range), gdef_class_compare_format2); + glyph_class = range && glyph <= GET_BE_WORD(range->end_glyph) ? + GET_BE_WORD(range->glyph_class) : GDEF_CLASS_UNCLASSIFIED; + if (glyph_class > GDEF_CLASS_MAX) + glyph_class = GDEF_CLASS_UNCLASSIFIED; + } + } + + return glyph_class; +} + +static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, unsigned int size) +{ + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + BOOL exists = FALSE; + unsigned int index; + HRESULT hr; + + hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(exists, "Failed to find locale name %d.\n", exists); + + hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); + ok(hr == S_OK, "Failed to get name string, hr %#x.\n", hr); +} + +static void test_glyph_props(IDWriteTextAnalyzer *analyzer, const WCHAR *family, const WCHAR *face, + IDWriteFontFace *fontface) +{ + unsigned int i, ch, count, offset; + struct dwrite_fonttable gdef; + DWRITE_UNICODE_RANGE *ranges; + IDWriteFontFace1 *fontface1; + BOOL exists = FALSE; + HRESULT hr; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_GDEF_TAG, (const void **)&gdef.data, &gdef.size, + &gdef.context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (!exists) + return; + + offset = table_read_be_word(&gdef, 4); + if (!offset) + { + IDWriteFontFace_ReleaseFontTable(fontface, gdef.context); + return; + } + + if (FAILED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1))) + { + IDWriteFontFace_ReleaseFontTable(fontface, gdef.context); + return; + } + + hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, 0, NULL, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + + ranges = heap_alloc(count * sizeof(*ranges)); + + hr = IDWriteFontFace1_GetUnicodeRanges(fontface1, count, ranges, &count); + ok(hr == S_OK, "Failed to get ranges, hr %#x.\n", hr); + + for (i = 0; i < count; ++i) + { + if (ranges[i].first > 0xffff) + break; + + for (ch = ranges[i].first; ch <= ranges[i].last; ch++) + { + DWRITE_SHAPING_TEXT_PROPERTIES text_props[10]; + DWRITE_SHAPING_GLYPH_PROPERTIES glyph_props[10]; + UINT16 glyphs[10], clustermap[10], glyph; + unsigned int actual_count, glyph_class; + DWRITE_SCRIPT_ANALYSIS sa; + WCHAR text[1]; + + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &ch, 1, &glyph); + ok(hr == S_OK, "Failed to get glyph index, hr %#x.\n", hr); + + if (!glyph) + continue; + + sa.script = 999; + sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + text[0] = (WCHAR)ch; + memset(glyph_props, 0, sizeof(glyph_props)); + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, text, 1, fontface, FALSE, FALSE, &sa, NULL, + NULL, NULL, NULL, 0, ARRAY_SIZE(glyphs), clustermap, text_props, glyphs, glyph_props, &actual_count); + ok(hr == S_OK, "Failed to shape, hr %#x.\n", hr); + if (actual_count > 1) + continue; + + glyph_class = get_glyph_class(&gdef, glyphs[0]); + + switch (glyph_class) + { + case GDEF_CLASS_MARK: + ok(glyph_props[0].isDiacritic && glyph_props[0].isZeroWidthSpace, + "%#x -> %u: unexpected glyph properties %u/%u. Class %u. Font %s - %s.\n", + text[0], glyphs[0], glyph_props[0].isDiacritic, glyph_props[0].isZeroWidthSpace, + glyph_class, wine_dbgstr_w(family), wine_dbgstr_w(face)); + break; + default: + break; + } + + if (glyph_props[0].isDiacritic) + ok(glyph_props[0].isZeroWidthSpace, + "%#x -> %u: unexpected glyph properties %u/%u. Class %u. Font %s - %s.\n", text[0], glyphs[0], + glyph_props[0].isDiacritic, glyph_props[0].isZeroWidthSpace, glyph_class, + wine_dbgstr_w(family), wine_dbgstr_w(face)); + } + } + + heap_free(ranges); + + IDWriteFontFace_ReleaseFontTable(fontface, gdef.context); + IDWriteFontFace1_Release(fontface1); +} + static void test_GetGlyphs(void) { static const WCHAR test1W[] = {'<','B',' ','C',0}; @@ -1373,6 +1612,7 @@ static void test_GetGlyphs(void) DWRITE_SHAPING_TEXT_PROPERTIES props[20]; UINT32 maxglyphcount, actual_count; FLOAT advances[10], advances2[10]; + IDWriteFontCollection *syscoll; IDWriteTextAnalyzer *analyzer; IDWriteFontFace *fontface; DWRITE_SCRIPT_ANALYSIS sa; @@ -1380,6 +1620,7 @@ static void test_GetGlyphs(void) UINT16 clustermap[10]; UINT16 glyphs1[10]; UINT16 glyphs2[10]; + unsigned int i, j; HRESULT hr; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); @@ -1505,8 +1746,58 @@ if (0) { ok(sa.script == 0, "got %u\n", sa.script); ok(!shapingprops[0].isZeroWidthSpace, "got %d\n", shapingprops[0].isZeroWidthSpace); - IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface); + + /* Test setting glyph properties from GDEF. */ +if (strcmp(winetest_platform, "wine")) +{ + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscoll, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); + + for (i = 0; i < IDWriteFontCollection_GetFontFamilyCount(syscoll); ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + WCHAR familyW[256]; + + hr = IDWriteFontCollection_GetFontFamily(syscoll, i, &family); + ok(hr == S_OK, "Failed to get font family, hr %#x.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get family names, hr %#x.\n", hr); + get_enus_string(names, familyW, ARRAY_SIZE(familyW)); + IDWriteLocalizedStrings_Release(names); + + for (j = 0; j < IDWriteFontFamily_GetFontCount(family); ++j) + { + IDWriteFont *font; + WCHAR faceW[256]; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font instance, hr %#x.\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + hr = IDWriteFont_GetFaceNames(font, &names); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + get_enus_string(names, faceW, ARRAY_SIZE(faceW)); + IDWriteLocalizedStrings_Release(names); + + test_glyph_props(analyzer, familyW, faceW, fontface); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(syscoll); +} + + IDWriteTextAnalyzer_Release(analyzer); } static BOOL has_feature(const DWRITE_FONT_FEATURE_TAG *tags, UINT32 count, DWRITE_FONT_FEATURE_TAG feature) -- 2.20.1

1 0

[PATCH 4/4] mfplat: Implement IMFByteStream::{Read,Write,GetCurrentPosition} for bytestream from file.
by Jactry Zeng Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 40 ++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 43 +++++++++++++++++++------------------- 2 files changed, 57 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 80c1b3e3ba..a606592638 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -858,6 +858,7 @@ typedef struct _mfbytestream HANDLE handle; LARGE_INTEGER length; QWORD position; + DWORD mode; } file; } u; } mfbytestream; @@ -964,7 +965,9 @@ static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWOR FIXME("%p, %p\n", This, position); - return E_NOTIMPL; + *position = This->u.file.position; + + return S_OK; } static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) @@ -991,10 +994,21 @@ static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *end static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) { mfbytestream *This = impl_from_IMFByteStream(iface); + DWORD read = 0; - FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + TRACE("%p, %p, %u, %p\n", This, data, count, byte_read); - return E_NOTIMPL; + if(This->u.file.mode == MF_ACCESSMODE_WRITE) + return E_ACCESSDENIED; + + if(!ReadFile(This->u.file.handle, data, count, &read, NULL)) + return S_FALSE; + + This->u.file.position += read; + if(byte_read) + *byte_read = read; + + return S_OK; } static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, @@ -1019,10 +1033,25 @@ static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { mfbytestream *This = impl_from_IMFByteStream(iface); + DWORD written_len = 0; - FIXME("%p, %p, %u, %p\n", This, data, count, written); + TRACE("%p, %p, %u, %p\n", This, data, count, written); - return E_NOTIMPL; + if(This->u.file.mode == MF_ACCESSMODE_READ) + return E_ACCESSDENIED; + + if(!WriteFile(This->u.file.handle, data, count, &written_len, NULL)) + return E_FAIL; + + if(!GetFileSizeEx(This->u.file.handle, &This->u.file.length)) + return E_FAIL; + + This->u.file.position = SetFilePointer(This->u.file.handle, 0, NULL, FILE_CURRENT); + + if(written) + *written = written_len; + + return S_OK; } static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, @@ -1429,6 +1458,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open return E_FAIL; } object->u.file.position = 0; + object->u.file.mode = accessmode; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 712b4abe2c..1d8473c1bc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -630,7 +630,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); CHECK_BS_LEN(bytestream, file_size); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); /* test MF_OPENMODE_RESET_IF_EXIST */ @@ -638,7 +638,7 @@ static void test_MFCreateFile(void) MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); CHECK_BS_LEN(bytestream, 0); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); file_size = GetFileSize(handle, NULL); @@ -776,17 +776,17 @@ static void test_bytestream_from_file(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); CHECK_BS_LEN(bytestream, sizeof(asf_header)); read = 0; hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); - todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d\n", read); - todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + ok(read == sizeof(asf_header), "got wrong read length: %d\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + CHECK_BS_POS(bytestream, sizeof(asf_header)); memset(buffer, 0, sizeof(buffer)); hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); hr = IMFByteStream_Flush(bytestream); todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Flush should fail: 0x%08x.\n", hr); hr = IMFByteStream_SetLength(bytestream, 200); @@ -797,17 +797,17 @@ static void test_bytestream_from_file(void) MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); - todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + CHECK_BS_POS(bytestream, 0); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(asf_header), "got wrong written length: %d\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header)); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_POS(bytestream, sizeof(asf_header)); hr = IMFByteStream_Flush(bytestream); todo_wine ok(hr == S_OK, "IMFByteStream_Flush failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_POS(bytestream, sizeof(asf_header)); CHECK_BS_LEN(bytestream, sizeof(asf_header)); hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); @@ -817,7 +817,7 @@ static void test_bytestream_from_file(void) ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); - todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_POS(bytestream, sizeof(asf_header)); IMFByteStream_Release(bytestream); file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ReadFile(file, buffer, sizeof(buffer), &read, NULL); @@ -829,20 +829,20 @@ static void test_bytestream_from_file(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); written = 0xdeadbeef; hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); - todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); - todo_wine ok(written == sizeof(test_data), "got wrong written length: %d\n", written); + ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + ok(written == sizeof(test_data), "got wrong written length: %d\n", written); CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); - todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + CHECK_BS_POS(bytestream, sizeof(test_data)); IMFByteStream_Release(bytestream); hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_NONE, asffile, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); CHECK_BS_LEN(bytestream, 0); hr = IMFByteStream_SetLength(bytestream, 2000); ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); @@ -850,7 +850,8 @@ static void test_bytestream_from_file(void) hr = IMFByteStream_GetLength(bytestream, &length); ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); - todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); + CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); DeleteFileW(asffile); -- 2.20.1

1 0

[PATCH 3/4] mfplat: Implement IMFByteStream::{GetLength,SetLength} for bytestream from file.
by Jactry Zeng Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 38 ++++++++++--- dlls/mfplat/tests/mfplat.c | 111 ++++++++++++++++++++++++++++++++++++- 2 files changed, 140 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a4fd7329e8..80c1b3e3ba 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -853,7 +853,12 @@ typedef struct _mfbytestream union { IStream *stream; - HANDLE file; + struct + { + HANDLE handle; + LARGE_INTEGER length; + QWORD position; + } file; } u; } mfbytestream; @@ -907,7 +912,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { - CloseHandle(This->u.file); + CloseHandle(This->u.file.handle); HeapFree(GetProcessHeap(), 0, This); } @@ -927,18 +932,30 @@ static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length { mfbytestream *This = impl_from_IMFByteStream(iface); - FIXME("%p, %p\n", This, length); + TRACE("(%p)->(%p)\n", This, length); - return E_NOTIMPL; + *length = This->u.file.length.QuadPart; + + return S_OK; } static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); - return E_NOTIMPL; + if(!SetFilePointer(This->u.file.handle, length, NULL, FILE_BEGIN)) + return E_FAIL; + + if(!SetEndOfFile(This->u.file.handle)) + return E_FAIL; + + if(This->u.file.position) + if(!SetFilePointer(This->u.file.handle, This->u.file.position, NULL, FILE_BEGIN)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) @@ -1404,7 +1421,14 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open init_attribute_object(&object->attributes, 0); object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; - object->u.file = file; + object->u.file.handle = file; + if(!GetFileSizeEx(file, &object->u.file.length)) + { + CloseHandle(file); + heap_free(object); + return E_FAIL; + } + object->u.file.position = 0; *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 488dbfbce6..712b4abe2c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -52,6 +52,9 @@ DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17, DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +static const byte asf_header[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11, + 0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; #define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) @@ -626,7 +629,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, file_size); + CHECK_BS_LEN(bytestream, file_size); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); @@ -634,7 +637,7 @@ static void test_MFCreateFile(void) hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, filename, &bytestream); ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); - todo_wine CHECK_BS_LEN(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); todo_wine CHECK_BS_POS(bytestream, 0); IMFByteStream_Release(bytestream); handle = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); @@ -750,6 +753,109 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_bytestream_from_file(void) +{ + IMFByteStream *bytestream; + HRESULT hr; + HANDLE file; + static WCHAR asffile[] = {'t','e','s','t','.','a','s','f',0}; + byte buffer[1024] = {0}; + byte test_data[] = {0x1,0x2,0x3,0x4}; + ULONG written, read; + QWORD length; + + file = CreateFileW(asffile, GENERIC_READ|GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + WriteFile(file, asf_header, sizeof(asf_header), &written, NULL); + CloseHandle(file); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + read = 0; + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == S_OK, "IMFByteStream_Read failed: 0x%08x.\n", hr); + todo_wine ok(read == sizeof(asf_header), "got wrong read length: %d\n", read); + todo_wine ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + memset(buffer, 0, sizeof(buffer)); + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Write should fail: 0x%08x.\n", hr); + hr = IMFByteStream_Flush(bytestream); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Flush should fail: 0x%08x.\n", hr); + hr = IMFByteStream_SetLength(bytestream, 200); + ok(hr == E_FAIL, "IMFByteStream_SetLength should fail: 0x%08x.\n", hr); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + hr = IMFByteStream_Read(bytestream, buffer, sizeof(buffer), &read); + todo_wine ok(hr == E_ACCESSDENIED, "IMFByteStream_Read should fail: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, asf_header, sizeof(asf_header), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(asf_header), "got wrong written length: %d\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + hr = IMFByteStream_Flush(bytestream); + todo_wine ok(hr == S_OK, "IMFByteStream_Flush failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + CHECK_BS_LEN(bytestream, sizeof(asf_header)); + + hr = IMFByteStream_SetLength(bytestream, sizeof(asf_header) + 2); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == sizeof(asf_header) || length == (sizeof(asf_header) + 2) /* xp */, + "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, sizeof(asf_header)); + IMFByteStream_Release(bytestream); + file = CreateFileW(asffile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ReadFile(file, buffer, sizeof(buffer), &read, NULL); + ok(read == sizeof(asf_header) + 2, "got wrong read length: %d\n", read); + ok(!memcmp(buffer, asf_header, sizeof(asf_header)), "got wrong content.\n"); + memset(buffer, 0, sizeof(buffer)); + CloseHandle(file); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_APPEND_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + written = 0xdeadbeef; + hr = IMFByteStream_Write(bytestream, test_data, sizeof(test_data), &written); + todo_wine ok(hr == S_OK, "IMFByteStream_Write failed: 0x%08x.\n", hr); + todo_wine ok(written == sizeof(test_data), "got wrong written length: %d\n", written); + CHECK_BS_LEN(bytestream, sizeof(asf_header) + 2); + todo_wine CHECK_BS_POS(bytestream, sizeof(test_data)); + IMFByteStream_Release(bytestream); + + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_RESET_IF_EXIST, + MF_FILEFLAGS_NONE, asffile, &bytestream); + ok(hr == S_OK, "MFCreateFile failed: 0x%08x.\n", hr); + todo_wine CHECK_BS_POS(bytestream, 0); + CHECK_BS_LEN(bytestream, 0); + hr = IMFByteStream_SetLength(bytestream, 2000); + ok(hr == S_OK, "IMFByteStream_SetLength failed: 0x%08x.\n", hr); + length = 0xdeadbeef; + hr = IMFByteStream_GetLength(bytestream, &length); + ok(hr == S_OK, "IMFByteStream_GetLength failed: 0x%08x.\n", hr); + ok(length == 0 || length == 2000 /* xp */, "got wrong length: %s.\n", wine_dbgstr_longlong(length)); + todo_wine CHECK_BS_POS(bytestream, 0); + IMFByteStream_Release(bytestream); + + DeleteFileW(asffile); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -765,6 +871,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_bytestream_from_file(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH 1/4] mfplat: Reimplement MFCreateMFByteStreamOnStream() for saving data stream really.
by Jactry Zeng Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 189 ++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 11 +++ 2 files changed, 198 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..9497e304cd 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -849,6 +849,8 @@ typedef struct _mfbytestream { mfattributes attributes; IMFByteStream IMFByteStream_iface; + + IStream *stream; } mfbytestream; static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) @@ -1070,6 +1072,182 @@ static const IMFByteStreamVtbl mfbytestream_vtbl = mfbytestream_Close }; +static ULONG WINAPI stream_mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if(!ref) + { + IStream_Release(This->stream); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI stream_mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%s)\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p)\n", This, endstream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p)\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p, %p)\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p)\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %u, %p, %p)\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, + LONGLONG offset, DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)->(%u, %s, 0x%08x, %p)\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI stream_mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl stream_mfbytestream_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + stream_mfbytestream_Release, + stream_mfbytestream_GetCapabilities, + stream_mfbytestream_GetLength, + stream_mfbytestream_SetLength, + stream_mfbytestream_GetCurrentPosition, + stream_mfbytestream_SetCurrentPosition, + stream_mfbytestream_IsEndOfStream, + stream_mfbytestream_Read, + stream_mfbytestream_BeginRead, + stream_mfbytestream_EndRead, + stream_mfbytestream_Write, + stream_mfbytestream_BeginWrite, + stream_mfbytestream_EndWrite, + stream_mfbytestream_Seek, + stream_mfbytestream_Flush, + stream_mfbytestream_Close +}; + static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) { return CONTAINING_RECORD(iface, mfbytestream, attributes.IMFAttributes_iface); @@ -1134,16 +1312,23 @@ static const IMFAttributesVtbl mfbytestream_attributes_vtbl = HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) { mfbytestream *object; + HRESULT hr; - TRACE("(%p, %p): stub\n", stream, bytestream); + TRACE("(%p, %p)\n", stream, bytestream); object = heap_alloc( sizeof(*object) ); if(!object) return E_OUTOFMEMORY; init_attribute_object(&object->attributes, 0); - object->IMFByteStream_iface.lpVtbl = &mfbytestream_vtbl; + object->IMFByteStream_iface.lpVtbl = &stream_mfbytestream_vtbl; object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + hr = IStream_QueryInterface(stream, &IID_IStream, (void **)&object->stream); + if(FAILED(hr)) + { + heap_free(object); + return hr; + } *bytestream = &object->IMFByteStream_iface; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..0ccc680aca 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -54,6 +54,15 @@ DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22, static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; +#define CHECK_REF(obj,ref) _check_ref((IUnknown*)obj, ref, __LINE__) +static void _check_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -450,8 +459,10 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 1); hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_REF(stream, 2); hr = IMFByteStream_QueryInterface(bytestream, &IID_IUnknown, (void **)&unknown); -- 2.20.1

1 0

[PATCH] widl: Fix handling context handle return type in mixed mode.
by Jacek Caban Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/tests/server.c | 2 -- tools/widl/server.c | 20 ++++++++++++++------ tools/widl/typegen.c | 16 +++++++++++----- 3 files changed, 25 insertions(+), 13 deletions(-)

1 0

[PATCH 2/2] crypt32: Support password protected PFX blobs.
by Hans Leidekker Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/pfx.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index bbdf3e45d2..cde2f19f7e 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -32,6 +32,7 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/library.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -239,6 +240,21 @@ done: #endif +static char *password_to_ascii( const WCHAR *str ) +{ + char *ret; + unsigned int i = 0; + + if (!(ret = heap_alloc( (strlenW(str) + 1) * sizeof(*ret) ))) return NULL; + while (*str) + { + if (*str > 0x7f) WARN( "password contains non-ascii characters\n" ); + ret[i++] = *str++; + } + ret[i] = 0; + return ret; +} + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS @@ -250,6 +266,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor HCERTSTORE store = NULL; CERT_KEY_CONTEXT key_ctx; HCRYPTPROV prov = 0; + char *pwd = NULL; int ret; TRACE( "(%p, %p, %08x)\n", pfx, password, flags ); @@ -258,21 +275,17 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor SetLastError( ERROR_INVALID_PARAMETER ); return NULL; } - if (password) - { - FIXME( "password not supported\n" ); - return NULL; - } if (flags & ~(CRYPT_EXPORTABLE|CRYPT_USER_KEYSET|PKCS12_NO_PERSIST_KEY)) { FIXME( "flags %08x not supported\n", flags ); return NULL; } + if (password && !(pwd = password_to_ascii( password ))) return NULL; if ((ret = pgnutls_pkcs12_init( &p12 )) < 0) { pgnutls_perror( ret ); - return NULL; + goto error; } pfx_data.data = pfx->pbData; @@ -280,10 +293,10 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor if ((ret = pgnutls_pkcs12_import( p12, &pfx_data, GNUTLS_X509_FMT_DER, 0 )) < 0) { pgnutls_perror( ret ); - return NULL; + goto error; } - if ((ret = pgnutls_pkcs12_simple_parse( p12, "", &key, &chain, &chain_len, NULL, NULL, NULL, 0 )) < 0) + if ((ret = pgnutls_pkcs12_simple_parse( p12, pwd ? pwd : "", &key, &chain, &chain_len, NULL, NULL, NULL, 0 )) < 0) { pgnutls_perror( ret ); goto error; @@ -351,6 +364,7 @@ error: CryptReleaseContext( prov, 0 ); CertCloseStore( store, 0 ); pgnutls_pkcs12_deinit( p12 ); + heap_free( pwd ); return NULL; #endif -- 2.20.1

1 0

[PATCH 1/2] crypt32: Add support for importing RSA private keys from PFX blobs.
by Hans Leidekker Jan. 30, 2019

Jan. 30, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/pfx.c | 133 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/store.c | 27 +++++++- 2 files changed, 159 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index c4fb34dbbc..bbdf3e45d2 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -56,6 +56,8 @@ MAKE_FUNCPTR(gnutls_pkcs12_import); MAKE_FUNCPTR(gnutls_pkcs12_init); MAKE_FUNCPTR(gnutls_pkcs12_simple_parse); MAKE_FUNCPTR(gnutls_x509_crt_export); +MAKE_FUNCPTR(gnutls_x509_privkey_export_rsa_raw2); +MAKE_FUNCPTR(gnutls_x509_privkey_get_pk_algorithm2); #undef MAKE_FUNCPTR static void gnutls_log( int level, const char *msg ) @@ -90,6 +92,8 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_pkcs12_init) LOAD_FUNCPTR(gnutls_pkcs12_simple_parse) LOAD_FUNCPTR(gnutls_x509_crt_export) + LOAD_FUNCPTR(gnutls_x509_privkey_export_rsa_raw2) + LOAD_FUNCPTR(gnutls_x509_privkey_get_pk_algorithm2) #undef LOAD_FUNCPTR if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) @@ -118,6 +122,121 @@ void gnutls_uninitialize(void) wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } + +#define RSA_MAGIC_KEY ('R' | ('S' << 8) | ('A' << 16) | ('2' << 24)) +#define RSA_PUBEXP 65537 + +static HCRYPTPROV import_key( gnutls_x509_privkey_t key, DWORD flags ) +{ + int i, ret; + unsigned int bitlen; + gnutls_datum_t m, e, d, p, q, u, e1, e2; + BLOBHEADER *hdr; + RSAPUBKEY *rsakey; + HCRYPTPROV prov = 0; + HCRYPTKEY cryptkey; + BYTE *buf, *src, *dst; + DWORD size; + + if ((ret = pgnutls_x509_privkey_get_pk_algorithm2( key, &bitlen )) < 0) + { + pgnutls_perror( ret ); + return 0; + } + + if (ret != GNUTLS_PK_RSA) + { + FIXME( "key algorithm %u not supported\n", ret ); + return 0; + } + + if ((ret = pgnutls_x509_privkey_export_rsa_raw2( key, &m, &e, &d, &p, &q, &u, &e1, &e2 )) < 0) + { + pgnutls_perror( ret ); + return 0; + } + + size = sizeof(*hdr) + sizeof(*rsakey) + (bitlen * 9 / 16); + if (!(buf = heap_alloc( size ))) goto done; + + hdr = (BLOBHEADER *)buf; + hdr->bType = PRIVATEKEYBLOB; + hdr->bVersion = CUR_BLOB_VERSION; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_RSA_KEYX; + + rsakey = (RSAPUBKEY *)(hdr + 1); + rsakey->magic = RSA_MAGIC_KEY; + rsakey->bitlen = bitlen; + rsakey->pubexp = RSA_PUBEXP; + + dst = (BYTE *)(rsakey + 1); + if (m.size == bitlen / 8 + 1 && !m.data[0]) src = m.data + 1; + else if (m.size != bitlen / 8) goto done; + else src = m.data; + for (i = bitlen / 8 - 1; i >= 0; i--) *dst++ = src[i]; + + if (p.size == bitlen / 16 + 1 && !p.data[0]) src = p.data + 1; + else if (p.size != bitlen / 16) goto done; + else src = p.data; + for (i = bitlen / 16 - 1; i >= 0; i--) *dst++ = src[i]; + + if (q.size == bitlen / 16 + 1 && !q.data[0]) src = q.data + 1; + else if (q.size != bitlen / 16) goto done; + else src = q.data; + for (i = bitlen / 16 - 1; i >= 0; i--) *dst++ = src[i]; + + if (e1.size == bitlen / 16 + 1 && !e1.data[0]) src = e1.data + 1; + else if (e1.size != bitlen / 16) goto done; + else src = e1.data; + for (i = bitlen / 16 - 1; i >= 0; i--) *dst++ = src[i]; + + if (e2.size == bitlen / 16 + 1 && !e2.data[0]) src = e2.data + 1; + else if (e2.size != bitlen / 16) goto done; + else src = e2.data; + for (i = bitlen / 16 - 1; i >= 0; i--) *dst++ = src[i]; + + if (u.size == bitlen / 16 + 1 && !u.data[0]) src = u.data + 1; + else if (u.size != bitlen / 16) goto done; + else src = u.data; + for (i = bitlen / 16 - 1; i >= 0; i--) *dst++ = src[i]; + + if (d.size == bitlen / 8 + 1 && !d.data[0]) src = d.data + 1; + else if (d.size != bitlen / 8) goto done; + else src = d.data; + for (i = bitlen / 8 - 1; i >= 0; i--) *dst++ = src[i]; + + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET )) + { + if (GetLastError() != NTE_EXISTS) goto done; + if (!CryptAcquireContextW( &prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL, 0 )) + { + WARN( "CryptAcquireContextW failed %08x\n", GetLastError() ); + goto done; + } + } + + if (!CryptImportKey( prov, buf, size, 0, flags, &cryptkey )) + { + WARN( "CryptImportKey failed %08x\n", GetLastError() ); + CryptReleaseContext( prov, 0 ); + prov = 0; + } + else CryptDestroyKey( cryptkey ); + +done: + free( m.data ); + free( e.data ); + free( d.data ); + free( p.data ); + free( q.data ); + free( u.data ); + free( e1.data ); + free( e2.data ); + heap_free( buf ); + return prov; +} + #endif HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) @@ -129,6 +248,8 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor gnutls_x509_crt_t *chain; unsigned int chain_len, i; HCERTSTORE store = NULL; + CERT_KEY_CONTEXT key_ctx; + HCRYPTPROV prov = 0; int ret; TRACE( "(%p, %p, %08x)\n", pfx, password, flags ); @@ -168,6 +289,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor goto error; } + if (!(prov = import_key( key, flags & CRYPT_EXPORTABLE ))) goto error; if (!(store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, 0, NULL ))) { WARN( "CertOpenStore failed %08x\n", GetLastError() ); @@ -203,6 +325,16 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor } heap_free( crt_data ); + key_ctx.cbSize = sizeof(key_ctx); + key_ctx.hCryptProv = prov; + key_ctx.dwKeySpec = AT_KEYEXCHANGE; + if (!CertSetCertificateContextProperty( ctx, CERT_KEY_CONTEXT_PROP_ID, 0, &key_ctx )) + { + WARN( "CertSetCertificateContextProperty failed %08x\n", GetLastError() ); + CertFreeCertificateContext( ctx ); + goto error; + } + if (!CertAddCertificateContextToStore( store, ctx, CERT_STORE_ADD_ALWAYS, NULL )) { WARN( "CertAddCertificateContextToStore failed %08x\n", GetLastError() ); @@ -216,6 +348,7 @@ HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *passwor return store; error: + CryptReleaseContext( prov, 0 ); CertCloseStore( store, 0 ); pgnutls_pkcs12_deinit( p12 ); return NULL; diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 94aba7b1d1..b13fee6cd1 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3284,7 +3284,11 @@ static void test_PFXImportCertStore(void) { HCERTSTORE store; CRYPT_DATA_BLOB pfx; - DWORD count; + const CERT_CONTEXT *cert; + CERT_KEY_CONTEXT key; + CERT_INFO *info; + DWORD count, size; + BOOL ret; SetLastError( 0xdeadbeef ); store = PFXImportCertStore( NULL, NULL, 0 ); @@ -3298,6 +3302,27 @@ static void test_PFXImportCertStore(void) if (!store) return; count = countCertsInStore( store ); ok( count == 1, "got %u\n", count ); + + cert = CertFindCertificateInStore( store, X509_ASN_ENCODING, 0, CERT_FIND_ANY, NULL, NULL ); + ok( cert != NULL, "got %u\n", GetLastError() ); + ok( cert->dwCertEncodingType == X509_ASN_ENCODING, "got %u\n", cert->dwCertEncodingType ); + ok( cert->pbCertEncoded != NULL, "pbCertEncoded not set\n" ); + ok( cert->cbCertEncoded == 1123, "got %u\n", cert->cbCertEncoded ); + ok( cert->pCertInfo != NULL, "pCertInfo not set\n" ); + ok( cert->hCertStore == store, "got %p\n", cert->hCertStore ); + + info = cert->pCertInfo; + ok( info->dwVersion == CERT_V1, "got %u\n", info->dwVersion ); + ok( !strcmp(info->SignatureAlgorithm.pszObjId, szOID_RSA_SHA256RSA), + "got \"%s\"\n", info->SignatureAlgorithm.pszObjId ); + + size = sizeof(key); + ret = CertGetCertificateContextProperty( cert, CERT_KEY_CONTEXT_PROP_ID, &key, &size ); + ok( ret, "got %08x\n", GetLastError() ); + ok( key.cbSize == sizeof(key), "got %u\n", key.cbSize ); + ok( key.hCryptProv, "hCryptProv not set\n" ); + ok( key.dwKeySpec == AT_KEYEXCHANGE, "got %u\n", key.dwKeySpec ); + CertCloseStore( store, 0 ); } -- 2.20.1

1 0