March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/tests: Add some tests for querying pin information.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: b79a7ffdfdb4cc8de4777bb3693ea17b7e34dd0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79a7ffdfdb4cc8de4777bb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 19:00:29 2019 -0600 quartz/tests: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index eb81479..0745f01 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -323,6 +323,77 @@ static void test_find_pin(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_pin_info(void) +{ + const WCHAR *filename = load_resource(mp3file); + IBaseFilter *filter = create_mpeg_splitter(); + ULONG ref, expect_ref; + IFilterGraph2 *graph; + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + BOOL ret; + + graph = connect_input(filter, filename); + + hr = IBaseFilter_FindPin(filter, inputW, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_ref = get_refcount(filter); + ref = get_refcount(pin); + ok(ref == expect_ref, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, inputW), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, inputW), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, audioW, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, audioW), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, audioW), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + START_TEST(mpegsplit) { CoInitialize(NULL); @@ -330,6 +401,7 @@ START_TEST(mpegsplit) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Nikolay Sivov : user32: Make GetWindowLong() fail for some values on 64-bit.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: c2f4e2b338906918c77634631ff82f106570e02e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f4e2b338906918c7763463… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:53:43 2019 +0300 user32: Make GetWindowLong() fail for some values on 64-bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 4 ---- dlls/user32/win.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d9a8e85..639eef4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6346,7 +6346,6 @@ static void test_set_window_long_size(void) /* GWLP_WNDPROC */ SetLastError(0xdeadbeef); wnd_proc = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); -todo_wine ok(!wnd_proc && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); @@ -6427,12 +6426,10 @@ todo_wine SetLastError(0xdeadbeef); ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); SetLastError(0xdeadbeef); ret = GetWindowLongW(hwnd, GWLP_HINSTANCE); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); SetLastError(0xdeadbeef); @@ -6451,7 +6448,6 @@ todo_wine /* GWLP_HWNDPARENT */ SetLastError(0xdeadbeef); ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); SetLastError(0xdeadbeef); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f5ac867..0bb9fd9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2690,7 +2690,19 @@ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) */ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) { - return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), FALSE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), FALSE ); + } } @@ -2699,7 +2711,19 @@ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) */ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) { - return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), TRUE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), TRUE ); + } }

1 0

Jactry Zeng : mfplat: Add MFCreateMFByteStreamOnStreamEx() stub.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: e09bc9a0b1c66e4912ca9abbe1bde276a7d3b104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e09bc9a0b1c66e4912ca9abb… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Feb 27 23:10:51 2019 +0800 mfplat: Add MFCreateMFByteStreamOnStreamEx() stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 1 + include/mfidl.idl | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a8963ca..0bf7cbf 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -4165,3 +4165,13 @@ void WINAPI MFHeapFree(void *p) TRACE("%p\n", p); HeapFree(GetProcessHeap(), 0, p); } + +/*********************************************************************** + * MFCreateMFByteStreamOnStreamEx (mfplat.@) + */ +HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream) +{ + FIXME("(%p, %p): stub\n", stream, bytestream); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c43746e..c6234b0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -46,6 +46,7 @@ @ stdcall MFCreateFile(long long long wstr ptr) @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) +@ stdcall MFCreateMFByteStreamOnStreamEx(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stdcall MFCreateMediaEvent(long ptr long ptr ptr) diff --git a/include/mfidl.idl b/include/mfidl.idl index c8f011b..01e86ef 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -318,6 +318,7 @@ interface IMFSequencerSource : IUnknown cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,")

1 0

Zhiyi Zhang : ntoskrnl.exe: Implement ExUuidCreate().
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 948d39c52905c6927d67b5eefaeb4a8fab537db1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=948d39c52905c6927d67b5ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Feb 27 11:08:42 2019 +0800 ntoskrnl.exe: Implement ExUuidCreate(). This is mostly a copy of UuidCreate() in rpcrt4 with NTSTATUS return code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 2 ++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7578ebc..52e0228 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -41,6 +41,7 @@ #include "dbt.h" #include "winreg.h" #include "setupapi.h" +#include "ntsecapi.h" #include "ddk/csq.h" #include "ddk/ntddk.h" #include "ddk/ntifs.h" @@ -4128,3 +4129,35 @@ static struct _OBJECT_TYPE token_type = }; POBJECT_TYPE SeTokenObjectType = &token_type; + +/************************************************************************* + * ExUuidCreate (NTOSKRNL.@) + * + * Creates a 128bit UUID. + * + * RETURNS + * + * STATUS_SUCCESS if successful. + * RPC_NT_UUID_LOCAL_ONLY if UUID is only locally unique. + * + * NOTES + * + * Follows RFC 4122, section 4.4 (Algorithms for Creating a UUID from + * Truly Random or Pseudo-Random Numbers) + */ +NTSTATUS WINAPI ExUuidCreate(UUID *uuid) +{ + RtlGenRandom(uuid, sizeof(*uuid)); + /* Clear the version bits and set the version (4) */ + uuid->Data3 &= 0x0fff; + uuid->Data3 |= (4 << 12); + /* Set the topmost bits of Data4 (clock_seq_hi_and_reserved) as + * specified in RFC 4122, section 4.4. + */ + uuid->Data4[0] &= 0x3f; + uuid->Data4[0] |= 0x80; + + TRACE("%s\n", debugstr_guid(uuid)); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 975f6c0..438f720 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -185,7 +185,7 @@ @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime @ stub ExUnregisterCallback -@ stub ExUuidCreate +@ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType @ stub Exi386InterlockedDecrementLong diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 452e510..fb8cacc 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -202,7 +202,9 @@ typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERF PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; +typedef GUID UUID; +NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID);

1 0

Zebediah Figura : quartz/mpegsplit: Fix sink pin name.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: dc6e0a6cb51a6216ead828947fb94d35fdfa353b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc6e0a6cb51a6216ead82894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 28 19:00:26 2019 -0600 quartz/mpegsplit: Fix sink pin name. This fixes a bug with Neocron 2, which uses FindPin() to retrieve the sink pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 7 ++++++- dlls/quartz/mpegsplit.c | 6 +++++- dlls/quartz/parser.c | 10 +++++++--- dlls/quartz/parser.h | 7 +++++-- dlls/quartz/waveparser.c | 6 +++++- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 6f27c29..40020bb 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1429,6 +1429,7 @@ static const IBaseFilterVtbl AVISplitterImpl_Vtbl = HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { + static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; HRESULT hr; AVISplitterImpl * This; @@ -1445,7 +1446,11 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) This->streams = NULL; This->oldindex = NULL; - hr = Parser_Create(&(This->Parser), &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); + hr = Parser_Create(&This->Parser, &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, + sink_name, AVISplitter_Sample, AVISplitter_QueryAccept, + AVISplitter_InputPin_PreConnect, AVISplitter_Flush, + AVISplitter_Disconnect, AVISplitter_first_request, + AVISplitter_done_process, NULL, AVISplitter_seek, NULL); if (FAILED(hr)) return hr; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 5869f16..226fcac 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -870,6 +870,7 @@ static const IAMStreamSelectVtbl AMStreamSelectVtbl = HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { + static const WCHAR sink_name[] = {'I','n','p','u','t',0}; MPEGSplitterImpl *This; HRESULT hr = E_FAIL; @@ -885,7 +886,10 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) return E_OUTOFMEMORY; ZeroMemory(This, sizeof(MPEGSplitterImpl)); - hr = Parser_Create(&(This->Parser), &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, MPEGSplitter_process_sample, MPEGSplitter_query_accept, MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); + hr = Parser_Create(&This->Parser, &MPEGSplitter_Vtbl, &CLSID_MPEG1Splitter, + sink_name, MPEGSplitter_process_sample, MPEGSplitter_query_accept, + MPEGSplitter_pre_connect, MPEGSplitter_cleanup, MPEGSplitter_disconnect, + MPEGSplitter_first_request, NULL, NULL, MPEGSplitter_seek, NULL); if (FAILED(hr)) { CoTaskMemFree(This); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 664cecf..b0cb500 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl Parser_Seeking_Vtbl; static const IPinVtbl Parser_OutputPin_Vtbl; static const IPinVtbl Parser_InputPin_Vtbl; @@ -93,7 +92,12 @@ static const BaseFilterFuncTable BaseFuncTable = { Parser_GetPinCount }; -HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, const CLSID* pClsid, PFN_PROCESS_SAMPLE fnProcessSample, PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate) +HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, + const CLSID* pClsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE fnProcessSample, + PFN_QUERY_ACCEPT fnQueryAccept, PFN_PRE_CONNECT fnPreConnect, + PFN_CLEANUP fnCleanup, PFN_DISCONNECT fnDisconnect, REQUESTPROC fnRequest, + STOPPROCESSPROC fnDone, SourceSeeking_ChangeStop stop, + SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate) { HRESULT hr; PIN_INFO piInput; @@ -109,7 +113,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, c /* construct input pin */ piInput.dir = PINDIR_INPUT; piInput.pFilter = &pParser->filter.IBaseFilter_iface; - lstrcpynW(piInput.achName, wcsInputPinName, ARRAY_SIZE(piInput.achName)); + lstrcpynW(piInput.achName, sink_name, ARRAY_SIZE(piInput.achName)); if (!start) start = Parser_ChangeStart; diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 840e475..8660cf2 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -53,8 +53,11 @@ typedef struct Parser_OutputPin extern HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt); -extern HRESULT Parser_Create(ParserImpl*, const IBaseFilterVtbl *, const CLSID*, PFN_PROCESS_SAMPLE, PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, - PFN_CLEANUP, PFN_DISCONNECT, REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop stop, SourceSeeking_ChangeStart start, SourceSeeking_ChangeRate rate); +HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, + const CLSID *clsid, const WCHAR *sink_name, PFN_PROCESS_SAMPLE, + PFN_QUERY_ACCEPT, PFN_PRE_CONNECT, PFN_CLEANUP, PFN_DISCONNECT, + REQUESTPROC, STOPPROCESSPROC, SourceSeeking_ChangeStop, + SourceSeeking_ChangeStart, SourceSeeking_ChangeRate) DECLSPEC_HIDDEN; /* Override the _Release function and call this when releasing */ extern void Parser_Destroy(ParserImpl *This); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index fa9cd45..834b634 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -417,6 +417,7 @@ static const IBaseFilterVtbl WAVEParser_Vtbl = HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) { + static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; HRESULT hr; WAVEParserImpl * This; @@ -430,7 +431,10 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) /* Note: This memory is managed by the transform filter once created */ This = CoTaskMemAlloc(sizeof(WAVEParserImpl)); - hr = Parser_Create(&(This->Parser), &WAVEParser_Vtbl, &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); + hr = Parser_Create(&This->Parser, &WAVEParser_Vtbl, &CLSID_WAVEParser, + sink_name, WAVEParser_Sample, WAVEParser_QueryAccept, + WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, + WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr)) return hr;

1 0

Nikolay Sivov : user32: Do not touch some of the values on 64-bit with SetWindowLong().
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: d00ed8e7b94390f831873278b399b6862f3cc484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00ed8e7b94390f831873278… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 00:53:42 2019 +0300 user32: Do not touch some of the values on 64-bit with SetWindowLong(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 31 ++++++- 2 files changed, 258 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d00ed8e7b94390f83187…

1 0

Nikolay Sivov : mfplat/tests: Add a test for deferred item posting.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: f42b3a1f102db932d033e7d4e04ecf6166a795c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42b3a1f102db932d033e7d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:06 2019 +0300 mfplat/tests: Add a test for deferred item posting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 6 ++--- dlls/mfplat/queue.c | 47 +++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 62 ++++++++++++++++++++++++++++++++++++++++++++-- include/mfapi.h | 2 ++ 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c4e0b2a..39fd7a9 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -28,7 +28,7 @@ @ stub MFCalculateBitmapImageSize @ stub MFCalculateImageSize @ stub MFCancelCreateFile -@ stub MFCancelWorkItem +@ stdcall MFCancelWorkItem(int64) @ stub MFCompareFullToPartialMediaType @ stub MFCompareSockaddrAddresses @ stub MFConvertColorInfoFromDXVA @@ -124,8 +124,8 @@ @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError @ stub MFRemovePeriodicCallback -@ stub MFScheduleWorkItem -@ stub MFScheduleWorkItemEx +@ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index ebc2ad4..7c8790b 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -385,3 +385,50 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result) return hr; } + +static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + FIXME("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return E_NOTIMPL; +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +{ + TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); + + return schedule_work_item(result, timeout, key); +} + +/*********************************************************************** + * MFScheduleWorkItemEx (mfplat.@) + */ +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key) +{ + IMFAsyncResult *result; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", callback, state, wine_dbgstr_longlong(timeout), key); + + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) + return hr; + + hr = schedule_work_item(result, timeout, key); + + IMFAsyncResult_Release(result); + + return hr; +} + +/*********************************************************************** + * MFCancelWorkItem (mfplat.@) + */ +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) +{ + FIXME("%s.\n", wine_dbgstr_longlong(key)); + + return E_NOTIMPL; +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 609faa5..cc8a0f4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -43,6 +43,7 @@ static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteS static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); static void (WINAPI *pMFHeapFree)(void *p); +static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -318,6 +319,7 @@ static void init_functions(void) X(MFCreateMemoryBuffer); X(MFHeapAlloc); X(MFHeapFree); + X(MFPutWaitingWorkItem); #undef X } @@ -718,13 +720,13 @@ static ULONG WINAPI testcallback_Release(IMFAsyncCallback *iface) static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) { - ok(0, "Unexpected call.\n"); + ok(flags != NULL && queue != NULL, "Unexpected arguments.\n"); return E_NOTIMPL; } static HRESULT WINAPI testcallback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { - ok(0, "Unexpected call.\n"); + ok(result != NULL, "Unexpected result object.\n"); return E_NOTIMPL; } @@ -1035,6 +1037,61 @@ static void test_MFHeapAlloc(void) pMFHeapFree(res); } +static void test_scheduled_items(void) +{ + IMFAsyncCallback callback = { &testcallbackvtbl }; + IMFAsyncResult *result; + MFWORKITEM_KEY key, key2; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); +todo_wine + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); +todo_wine + ok(hr == MF_E_NOT_FOUND || broken(hr == S_OK) /* < win10 */, "Unexpected hr %#x.\n", hr); + + if (!pMFPutWaitingWorkItem) + { + skip("Waiting items are not supported.\n"); + return; + } + + hr = MFCreateAsyncResult(NULL, &callback, NULL, &result); + ok(hr == S_OK, "Failed to create result, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = pMFPutWaitingWorkItem(NULL, 0, result, &key2); + ok(hr == S_OK, "Failed to add waiting item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key2); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + IMFAsyncResult_Release(result); + + hr = MFScheduleWorkItem(&callback, NULL, -5000, &key); + ok(hr == S_OK, "Failed to schedule item, hr %#x.\n", hr); + + hr = MFCancelWorkItem(key); + ok(hr == S_OK, "Failed to cancel item, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1056,6 +1113,7 @@ START_TEST(mfplat) test_MFCopyImage(); test_MFCreateCollection(); test_MFHeapAlloc(); + test_scheduled_items(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 7c47213..4b7d758 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -115,6 +115,8 @@ HRESULT WINAPI MFInvokeCallback(IMFAsyncResult *result); HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown *state); HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result); +HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, INT64 timeout, MFWORKITEM_KEY *key); +HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes);

1 0

Michael Stefaniuc : dwrite: Remove useless casts to self.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 6f5436f9f4b0bbb664d9ac3b78a634ccb33230bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f5436f9f4b0bbb664d9ac3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:27 2019 +0100 dwrite: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/opentype.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 948c1df..3742366 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2420,7 +2420,7 @@ static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT3 BOOL is_system_collection(IDWriteFontCollection *collection) { void *obj; - return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; + return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, &obj) == S_OK; } static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index de79fd4..4cd5ce4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2520,7 +2520,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.effect); + changed = set_layout_range_iface_attr(&dest_iface->iface, value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest_bool->value != value->u.underline; @@ -2560,7 +2560,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ dest_spacing->min_advance = value->u.spacing.min_advance; break; case LAYOUT_RANGE_ATTR_TYPOGRAPHY: - changed = set_layout_range_iface_attr((IUnknown**)&dest_iface->iface, (IUnknown*)value->u.typography); + changed = set_layout_range_iface_attr(&dest_iface->iface, (IUnknown*)value->u.typography); break; default: ; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b13f424..4772236 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -538,7 +538,7 @@ struct ot_lookup_table WORD subtable[1]; }; -#define GLYPH_NOT_COVERED ((unsigned int)~0u) +#define GLYPH_NOT_COVERED (~0u) struct ot_coverage_format1 {

1 0

Huw Davies : user32/listbox: Use helper functions for item initialization.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 0092a4bb19e808342d2761d72b5ad21e8825fa03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0092a4bb19e808342d2761d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 28 15:10:29 2019 +0200 user32/listbox: Use helper functions for item initialization. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 75257ad..127ba35 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -166,6 +166,11 @@ static WCHAR *get_item_string( const LB_DESCR *descr, UINT index ) return HAS_STRINGS(descr) ? descr->items[index].str : NULL; } +static void set_item_string( const LB_DESCR *descr, UINT index, WCHAR *string ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].str = string; +} + static UINT get_item_height( const LB_DESCR *descr, UINT index ) { return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; @@ -189,7 +194,7 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) descr->items[index].selected = state; } -static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR data) +static void insert_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; @@ -198,11 +203,6 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); - - item->str = str; - item->data = HAS_STRINGS(descr) ? 0 : data; - item->height = 0; - item->selected = FALSE; } static void remove_item_data(LB_DESCR *descr, UINT index) @@ -1609,8 +1609,12 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; if (!resize_storage(descr, descr->nb_items + 1)) return LB_ERR; - insert_item_data(descr, index, str, data); + insert_item_data(descr, index); descr->nb_items++; + set_item_string(descr, index, str); + set_item_data(descr, index, HAS_STRINGS(descr) ? 0 : data); + set_item_height(descr, index, 0); + set_item_selected_state(descr, index, FALSE); /* Get item height */

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper to get the size of an item.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 80ff468748a19a89b78c73cfbb49584122697af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ff468748a19a89b78c73cf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 28 15:10:30 2019 +0200 user32/listbox: Use a helper to get the size of an item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 127ba35..219910b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -122,6 +122,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static size_t get_sizeof_item( const LB_DESCR *descr ) +{ + return sizeof(LB_ITEMDATA); +} + static BOOL resize_storage(LB_DESCR *descr, UINT items_size) { LB_ITEMDATA *items; @@ -132,7 +137,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + items = heap_realloc(descr->items, items_size * get_sizeof_item(descr)); if (!items) { SEND_NOTIFICATION(descr, LBN_ERRSPACE); @@ -146,7 +151,7 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, - (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); + (items_size - descr->nb_items) * get_sizeof_item(descr)); } return TRUE; } @@ -196,24 +201,26 @@ static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) static void insert_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item + 1, item, (descr->nb_items - index) * size); } static void remove_item_data(LB_DESCR *descr, UINT index) { + size_t size = get_sizeof_item(descr); LB_ITEMDATA *item; if (!descr->items) return; item = descr->items + index; if (index < descr->nb_items) - memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); + memmove(item, item + 1, (descr->nb_items - index) * size); } /*********************************************************************

1 0