March 2020 - Wine-devel - list.winehq.org

[PATCH v3] comctl32: Initialize early font metrics in edit control.
by Roman Pišl 26 Mar '20

26 Mar '20

v2: Introduced helper function. v3: Improved helper function (I really didn't like the previous). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/edit.c | 38 ++++++++++++++++-------- dlls/comctl32/tests/edit.c | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d02d7af7b9..e7a3f9b7f9 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3724,25 +3724,14 @@ static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm) return MAKELONG(left, right); } -/********************************************************************* - * - * WM_SETFONT - * - * With Win95 look the margins are set to default font value unless - * the system font (font == 0) is being set, in which case they are left - * unchanged. - * - */ -static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) +static DWORD set_font(EDITSTATE *es, HFONT font) { TEXTMETRICW tm; HDC dc; HFONT old_font = 0; - RECT clientRect; DWORD margins; es->font = font; - EDIT_InvalidateUniscribeData(es); dc = GetDC(es->hwndSelf); if (font) old_font = SelectObject(dc, font); @@ -3754,6 +3743,26 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); + return margins; +} + +/********************************************************************* + * + * WM_SETFONT + * + * With Win95 look the margins are set to default font value unless + * the system font (font == 0) is being set, in which case they are left + * unchanged. + * + */ +static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) +{ + RECT clientRect; + DWORD margins; + + EDIT_InvalidateUniscribeData(es); + margins = set_font(es, font); + /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); @@ -4488,6 +4497,11 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) else if (es->style & WS_BORDER) SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); + /* + * Initialize font metrics - line_height and char_width so that + * early messages before WM_CREATE don't lead to division by zero. + */ + set_font(es, 0); return TRUE; cleanup: diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index cec6025077..3bfbee4ddd 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1768,6 +1768,64 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that early messages don't crash or cause unexpected behavior */ + SendMessageA(hwnd, EM_SETSEL, 0, 0); + SendMessageA(hwnd, WM_SIZE, 0, 0); + + return result; + + case WM_CREATE: + /* test that early messages don't crash or cause unexpected behavior */ + SendMessageA(hwnd, EM_SETSEL, 0, 0); + SendMessageA(hwnd, WM_SIZE, 0, 0); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_early_messages(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -3393,6 +3451,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_early_messages(); test_margins(); test_margins_font_change(); test_text_position(); -- 2.20.1

2 3

[PATCH v2 1/5] jscript: Retrieve the item's dispatch in a helper function.
by Gabriel Ivăncescu 26 Mar '20

26 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 45 +++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 31277c6..d6fa7c9 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -129,6 +129,30 @@ static void release_named_item_script_obj(named_item_t *item) item->script_obj = NULL; } +static HRESULT retrieve_named_item_disp(IActiveScriptSite *site, named_item_t *item) +{ + IUnknown *unk; + HRESULT hr; + + if(!site) + return E_UNEXPECTED; + + hr = IActiveScriptSite_GetItemInfo(site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hr)) { + WARN("GetItemInfo failed: %08x\n", hr); + return hr; + } + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hr)) { + WARN("object does not implement IDispatch\n"); + return hr; + } + + return S_OK; +} + named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsigned flags) { named_item_t *item; @@ -140,25 +164,10 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig hr = create_named_item_script_obj(ctx, item); if(FAILED(hr)) return NULL; } + if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { - IUnknown *unk; - - if(!ctx->site) - return NULL; - - hr = IActiveScriptSite_GetItemInfo(ctx->site, item_name, - SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hr)) { - WARN("GetItemInfo failed: %08x\n", hr); - continue; - } - - hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); - IUnknown_Release(unk); - if(FAILED(hr)) { - WARN("object does not implement IDispatch\n"); - continue; - } + hr = retrieve_named_item_disp(ctx->site, item); + if(FAILED(hr)) continue; } return item; -- 2.21.0

2 7

[PATCH v2] strmbase: Support FORMAT_VideoInfo2 in strmbase_dump_media_type().
by Zebediah Figura 26 Mar '20

26 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: rebase on top of master... dlls/strmbase/mediatype.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 64035b5e6b1..c2560352aae 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -20,6 +20,7 @@ */ #include "strmbase_private.h" +#include "dvdmedia.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); @@ -103,9 +104,34 @@ void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) { VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat; - TRACE("source %s, target %s, bitrate %u, error rate %u, %s sec/frame, ", - wine_dbgstr_rect(&vih->rcSource), wine_dbgstr_rect(&vih->rcTarget), - vih->dwBitRate, vih->dwBitErrorRate, debugstr_time(vih->AvgTimePerFrame)); + if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource)); + if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); + if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); + if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); + TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", + vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, + vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), + vih->bmiHeader.biSizeImage); + if (vih->bmiHeader.biXPelsPerMeter || vih->bmiHeader.biYPelsPerMeter) + TRACE(", resolution %dx%d", vih->bmiHeader.biXPelsPerMeter, vih->bmiHeader.biYPelsPerMeter); + if (vih->bmiHeader.biClrUsed) TRACE(", %d colours", vih->bmiHeader.biClrUsed); + if (vih->bmiHeader.biClrImportant) TRACE(", %d important colours", vih->bmiHeader.biClrImportant); + TRACE(".\n"); + } + else if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2) && mt->cbFormat >= sizeof(VIDEOINFOHEADER2)) + { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2 *)mt->pbFormat; + + if (!IsRectEmpty(&vih->rcSource)) TRACE("source %s, ", wine_dbgstr_rect(&vih->rcSource)); + if (!IsRectEmpty(&vih->rcTarget)) TRACE("target %s, ", wine_dbgstr_rect(&vih->rcTarget)); + if (vih->dwBitRate) TRACE("bitrate %u, ", vih->dwBitRate); + if (vih->dwBitErrorRate) TRACE("error rate %u, ", vih->dwBitErrorRate); + TRACE("%s sec/frame, ", debugstr_time(vih->AvgTimePerFrame)); + if (vih->dwInterlaceFlags) TRACE("interlace flags %#x, ", vih->dwInterlaceFlags); + if (vih->dwCopyProtectFlags) TRACE("copy-protection flags %#x, ", vih->dwCopyProtectFlags); + TRACE("aspect ratio %u/%u, ", vih->dwPictAspectRatioX, vih->dwPictAspectRatioY); + if (vih->u.dwControlFlags) TRACE("control flags %#x, ", vih->u.dwControlFlags); TRACE("size %dx%d, %u planes, %u bpp, compression %s, image size %u", vih->bmiHeader.biWidth, vih->bmiHeader.biHeight, vih->bmiHeader.biPlanes, vih->bmiHeader.biBitCount, debugstr_fourcc(vih->bmiHeader.biCompression), -- 2.25.1

1 0

[PATCH 2/2] oleaut32: Fix handling dual interfaces in ITypeInfo::GetRefTypeInfo.
by Jacek Caban 26 Mar '20

26 Mar '20

Based on patch by Puetz Kevin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/tests/tmarshal.idl | 23 +++++++++++++ dlls/oleaut32/tests/typelib.c | 58 +++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 59 +++++++++++++++++++------------- 3 files changed, 114 insertions(+), 26 deletions(-)

1 0

[PATCH 1/2] rpcrt4: Fix use after free in get_iface_info.
by Jacek Caban 26 Mar '20

26 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rpcrt4/ndr_typelib.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[PATCH v2] ntdll: Don't fail if LDR_MODULE.Flags is modified during load
by Myah Caron 26 Mar '20

26 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48817 Signed-off-by: Myah Caron <qsniyg(a)mail.com> --- v2: - Simplify the patch, it seems like only the flags are cached, but they're cached throughout the lifetime of the program, so copy them to WINE_MODREF instead. - The patch should apply now --- dlls/ntdll/loader.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1b641f1b9d..a8f3470962 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -119,6 +119,7 @@ static const WCHAR dllW[] = {'.','d','l','l',0}; typedef struct _wine_modref { LDR_MODULE ldr; + ULONG initial_flags; dev_t dev; ino_t ino; int alloc_deps; @@ -1201,6 +1202,8 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.EntryPoint = (char *)hModule + nt->OptionalHeader.AddressOfEntryPoint; } + wm->initial_flags = wm->ldr.Flags; + InsertTailList(&NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList); InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, @@ -1311,9 +1314,9 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved /* Skip calls for modules loaded with special load flags */ - if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; + if (wm->initial_flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry || !(wm->ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; + if (!entry || !(wm->initial_flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; if (TRACE_ON(relay)) { @@ -1404,7 +1407,9 @@ static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ) if (lpReserved) wm->ldr.LoadCount = -1; /* pin it if imported by the main exe */ if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); + /* The flags can be modified by DLL dependencies */ + wm->initial_flags = wm->ldr.Flags; + /* Recursively attach all DLLs this one depends on */ for ( i = 0; i < wm->nDeps; i++ ) { -- 2.25.1

3 3

[PATCH] comctl32/edit: Initialize font metrics to nonzero in WM_NCCREATE.
by Roman Pišl 26 Mar '20

26 Mar '20

v2: Introduced helper function. v3: Improved helper function (I really didn't like the previous). v4: Simpler and less intrusive solution (tested on all affected apps from bugzilla). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/edit.c | 7 +++++ dlls/comctl32/tests/edit.c | 59 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d02d7af7b9..3a1a5b791d 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4488,6 +4488,13 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs) else if (es->style & WS_BORDER) SetWindowLongW(hwnd, GWL_STYLE, es->style & ~WS_BORDER); + /* + * Initialize to avoid division by zero, + * a proper value is set during WM_Create. + */ + es->line_height = 1; + es->char_width = 1; + return TRUE; cleanup: diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index cec6025077..3bfbee4ddd 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1768,6 +1768,64 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that early messages don't crash or cause unexpected behavior */ + SendMessageA(hwnd, EM_SETSEL, 0, 0); + SendMessageA(hwnd, WM_SIZE, 0, 0); + + return result; + + case WM_CREATE: + /* test that early messages don't crash or cause unexpected behavior */ + SendMessageA(hwnd, EM_SETSEL, 0, 0); + SendMessageA(hwnd, WM_SIZE, 0, 0); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_early_messages(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -3393,6 +3451,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_early_messages(); test_margins(); test_margins_font_change(); test_text_position(); -- 2.20.1

1 0

[v2 PATCH 3/3] mfreadwrite: Move Sink Writer stubs to separate file.
by Nikolay Sivov 26 Mar '20

26 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: added missing file dlls/mfreadwrite/Makefile.in | 3 +- dlls/mfreadwrite/mf_private.h | 22 +++ dlls/mfreadwrite/{main.c => reader.c} | 209 +--------------------- dlls/mfreadwrite/writer.c | 238 ++++++++++++++++++++++++++ 4 files changed, 264 insertions(+), 208 deletions(-) create mode 100644 dlls/mfreadwrite/mf_private.h rename dlls/mfreadwrite/{main.c => reader.c} (92%) create mode 100644 dlls/mfreadwrite/writer.c diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index ce63ad5824..733732b431 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = mfuuid uuid mfplat ole32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + reader.c \ + writer.c IDL_SRCS = mf_classes.idl diff --git a/dlls/mfreadwrite/mf_private.h b/dlls/mfreadwrite/mf_private.h new file mode 100644 index 0000000000..4e23ab7b3e --- /dev/null +++ b/dlls/mfreadwrite/mf_private.h @@ -0,0 +1,22 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +extern HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, + REFIID riid, void **out) DECLSPEC_HIDDEN; +extern HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, + REFIID riid, void **out) DECLSPEC_HIDDEN; diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/reader.c similarity index 92% rename from dlls/mfreadwrite/main.c rename to dlls/mfreadwrite/reader.c index 138a5adc28..3b024fc80c 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/reader.c @@ -38,6 +38,8 @@ #include "wine/heap.h" #include "wine/list.h" +#include "mf_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static HINSTANCE mfinstance; @@ -151,12 +153,6 @@ struct source_reader CRITICAL_SECTION cs; }; -struct sink_writer -{ - IMFSinkWriter IMFSinkWriter_iface; - LONG refcount; -}; - static inline struct source_reader *impl_from_IMFSourceReader(IMFSourceReader *iface) { return CONTAINING_RECORD(iface, struct source_reader, IMFSourceReader_iface); @@ -182,11 +178,6 @@ static struct source_reader_async_command *impl_from_async_command_IUnknown(IUnk return CONTAINING_RECORD(iface, struct source_reader_async_command, IUnknown_iface); } -static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) -{ - return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); -} - static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -2060,202 +2051,6 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at return hr; } -static HRESULT WINAPI sink_writer_QueryInterface(IMFSinkWriter *iface, REFIID riid, void **out) -{ - TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); - - if (IsEqualIID(riid, &IID_IMFSinkWriter) || - IsEqualIID(riid, &IID_IUnknown)) - { - *out = iface; - IMFSinkWriter_AddRef(iface); - return S_OK; - } - - WARN("Unsupported %s.\n", debugstr_guid(riid)); - *out = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI sink_writer_AddRef(IMFSinkWriter *iface) -{ - struct sink_writer *writer = impl_from_IMFSinkWriter(iface); - ULONG refcount = InterlockedIncrement(&writer->refcount); - - TRACE("%p, %u.\n", iface, refcount); - - return refcount; -} - -static ULONG WINAPI sink_writer_Release(IMFSinkWriter *iface) -{ - struct sink_writer *writer = impl_from_IMFSinkWriter(iface); - ULONG refcount = InterlockedDecrement(&writer->refcount); - - TRACE("%p, %u.\n", iface, refcount); - - if (!refcount) - { - heap_free(writer); - } - - return refcount; -} - -static HRESULT WINAPI sink_writer_AddStream(IMFSinkWriter *iface, IMFMediaType *type, DWORD *index) -{ - FIXME("%p, %p, %p.\n", iface, type, index); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_SetInputMediaType(IMFSinkWriter *iface, DWORD index, IMFMediaType *type, - IMFAttributes *parameters) -{ - FIXME("%p, %u, %p, %p.\n", iface, index, type, parameters); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_BeginWriting(IMFSinkWriter *iface) -{ - FIXME("%p.\n", iface); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_WriteSample(IMFSinkWriter *iface, DWORD index, IMFSample *sample) -{ - FIXME("%p, %u, %p.\n", iface, index, sample); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_SendStreamTick(IMFSinkWriter *iface, DWORD index, LONGLONG timestamp) -{ - FIXME("%p, %u, %s.\n", iface, index, wine_dbgstr_longlong(timestamp)); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_PlaceMarker(IMFSinkWriter *iface, DWORD index, void *context) -{ - FIXME("%p, %u, %p.\n", iface, index, context); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_NotifyEndOfSegment(IMFSinkWriter *iface, DWORD index) -{ - FIXME("%p, %u.\n", iface, index); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_Flush(IMFSinkWriter *iface, DWORD index) -{ - FIXME("%p, %u.\n", iface, index); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_Finalize(IMFSinkWriter *iface) -{ - FIXME("%p.\n", iface); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_GetServiceForStream(IMFSinkWriter *iface, DWORD index, REFGUID service, - REFIID riid, void **object) -{ - FIXME("%p, %u, %s, %s, %p.\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); - - return E_NOTIMPL; -} - -static HRESULT WINAPI sink_writer_GetStatistics(IMFSinkWriter *iface, DWORD index, MF_SINK_WRITER_STATISTICS *stats) -{ - FIXME("%p, %u, %p.\n", iface, index, stats); - - return E_NOTIMPL; -} - -static const IMFSinkWriterVtbl sink_writer_vtbl = -{ - sink_writer_QueryInterface, - sink_writer_AddRef, - sink_writer_Release, - sink_writer_AddStream, - sink_writer_SetInputMediaType, - sink_writer_BeginWriting, - sink_writer_WriteSample, - sink_writer_SendStreamTick, - sink_writer_PlaceMarker, - sink_writer_NotifyEndOfSegment, - sink_writer_Flush, - sink_writer_Finalize, - sink_writer_GetServiceForStream, - sink_writer_GetStatistics, -}; - -static HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, - REFIID riid, void **out) -{ - struct sink_writer *object; - HRESULT hr; - - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IMFSinkWriter_iface.lpVtbl = &sink_writer_vtbl; - object->refcount = 1; - - hr = IMFSinkWriter_QueryInterface(&object->IMFSinkWriter_iface, riid, out); - IMFSinkWriter_Release(&object->IMFSinkWriter_iface); - return hr; -} - -static HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, - REFIID riid, void **out) -{ - struct sink_writer *object; - HRESULT hr; - - object = heap_alloc(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IMFSinkWriter_iface.lpVtbl = &sink_writer_vtbl; - object->refcount = 1; - - hr = IMFSinkWriter_QueryInterface(&object->IMFSinkWriter_iface, riid, out); - IMFSinkWriter_Release(&object->IMFSinkWriter_iface); - return hr; -} - -/*********************************************************************** - * MFCreateSinkWriterFromMediaSink (mfreadwrite.@) - */ -HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes *attributes, IMFSinkWriter **writer) -{ - TRACE("%p, %p, %p.\n", sink, attributes, writer); - - return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); -} - -/*********************************************************************** - * MFCreateSinkWriterFromURL (mfreadwrite.@) - */ -HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, - IMFSinkWriter **writer) -{ - FIXME("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); - - return E_NOTIMPL; -} - static HRESULT create_source_reader_from_object(IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) { IMFMediaSource *source = NULL; diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c new file mode 100644 index 0000000000..234ce395b3 --- /dev/null +++ b/dlls/mfreadwrite/writer.c @@ -0,0 +1,238 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define NONAMELESSUNION + +#include "mfapi.h" +#include "mfidl.h" +#include "mfreadwrite.h" +#include "mf_private.h" + +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +struct sink_writer +{ + IMFSinkWriter IMFSinkWriter_iface; + LONG refcount; +}; + +static struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) +{ + return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); +} + +static HRESULT WINAPI sink_writer_QueryInterface(IMFSinkWriter *iface, REFIID riid, void **out) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFSinkWriter) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFSinkWriter_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI sink_writer_AddRef(IMFSinkWriter *iface) +{ + struct sink_writer *writer = impl_from_IMFSinkWriter(iface); + ULONG refcount = InterlockedIncrement(&writer->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI sink_writer_Release(IMFSinkWriter *iface) +{ + struct sink_writer *writer = impl_from_IMFSinkWriter(iface); + ULONG refcount = InterlockedDecrement(&writer->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(writer); + } + + return refcount; +} + +static HRESULT WINAPI sink_writer_AddStream(IMFSinkWriter *iface, IMFMediaType *type, DWORD *index) +{ + FIXME("%p, %p, %p.\n", iface, type, index); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_SetInputMediaType(IMFSinkWriter *iface, DWORD index, IMFMediaType *type, + IMFAttributes *parameters) +{ + FIXME("%p, %u, %p, %p.\n", iface, index, type, parameters); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_BeginWriting(IMFSinkWriter *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_WriteSample(IMFSinkWriter *iface, DWORD index, IMFSample *sample) +{ + FIXME("%p, %u, %p.\n", iface, index, sample); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_SendStreamTick(IMFSinkWriter *iface, DWORD index, LONGLONG timestamp) +{ + FIXME("%p, %u, %s.\n", iface, index, wine_dbgstr_longlong(timestamp)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_PlaceMarker(IMFSinkWriter *iface, DWORD index, void *context) +{ + FIXME("%p, %u, %p.\n", iface, index, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_NotifyEndOfSegment(IMFSinkWriter *iface, DWORD index) +{ + FIXME("%p, %u.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_Flush(IMFSinkWriter *iface, DWORD index) +{ + FIXME("%p, %u.\n", iface, index); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_Finalize(IMFSinkWriter *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_GetServiceForStream(IMFSinkWriter *iface, DWORD index, REFGUID service, + REFIID riid, void **object) +{ + FIXME("%p, %u, %s, %s, %p.\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI sink_writer_GetStatistics(IMFSinkWriter *iface, DWORD index, MF_SINK_WRITER_STATISTICS *stats) +{ + FIXME("%p, %u, %p.\n", iface, index, stats); + + return E_NOTIMPL; +} + +static const IMFSinkWriterVtbl sink_writer_vtbl = +{ + sink_writer_QueryInterface, + sink_writer_AddRef, + sink_writer_Release, + sink_writer_AddStream, + sink_writer_SetInputMediaType, + sink_writer_BeginWriting, + sink_writer_WriteSample, + sink_writer_SendStreamTick, + sink_writer_PlaceMarker, + sink_writer_NotifyEndOfSegment, + sink_writer_Flush, + sink_writer_Finalize, + sink_writer_GetServiceForStream, + sink_writer_GetStatistics, +}; + +HRESULT create_sink_writer_from_sink(IMFMediaSink *sink, IMFAttributes *attributes, + REFIID riid, void **out) +{ + struct sink_writer *object; + HRESULT hr; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFSinkWriter_iface.lpVtbl = &sink_writer_vtbl; + object->refcount = 1; + + hr = IMFSinkWriter_QueryInterface(&object->IMFSinkWriter_iface, riid, out); + IMFSinkWriter_Release(&object->IMFSinkWriter_iface); + return hr; +} + +HRESULT create_sink_writer_from_stream(IMFByteStream *stream, IMFAttributes *attributes, + REFIID riid, void **out) +{ + struct sink_writer *object; + HRESULT hr; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFSinkWriter_iface.lpVtbl = &sink_writer_vtbl; + object->refcount = 1; + + hr = IMFSinkWriter_QueryInterface(&object->IMFSinkWriter_iface, riid, out); + IMFSinkWriter_Release(&object->IMFSinkWriter_iface); + return hr; +} + +/*********************************************************************** + * MFCreateSinkWriterFromMediaSink (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes *attributes, IMFSinkWriter **writer) +{ + TRACE("%p, %p, %p.\n", sink, attributes, writer); + + return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); +} + +/*********************************************************************** + * MFCreateSinkWriterFromURL (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, + IMFSinkWriter **writer) +{ + FIXME("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); + + return E_NOTIMPL; +} + -- 2.25.1

1 0

[PATCH v2 2/2] dmime: Reimplement IDirectMusicAudioPath Activate
by Michael Stefaniuc 26 Mar '20

26 Mar '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Spotted while working on 34753, its calling Activate with TRUE but then stops the sound buffer. The documenation says that it should stop the playback when paramter is FALSE. https://docs.microsoft.com/en-us/previous-versions/ms808948%28v%3dmsdn.10%29 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Normalize the application provided BOOL input. dlls/dmime/audiopath.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 1aadba92ae..078d843d46 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -216,21 +216,23 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud return E_INVALIDARG; } -static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate (IDirectMusicAudioPath *iface, BOOL fActivate) +static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath *iface, BOOL activate) { - struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d): stub\n", This, fActivate); - if (!fActivate) { - if (!This->fActive) return S_OK; - This->fActive = FALSE; - } else { - if (This->fActive) return S_OK; - This->fActive = TRUE; - if (NULL != This->pDSBuffer) { - IDirectSoundBuffer_Stop(This->pDSBuffer); + struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); + + FIXME("(%p, %d): semi-stub\n", This, activate); + + if (!!activate == This->fActive) + return S_FALSE; + + if (!activate && This->pDSBuffer) { + /* Path is being deactivated */ + IDirectSoundBuffer_Stop(This->pDSBuffer); } - } - return S_OK; + + This->fActive = !!activate; + + return S_OK; } static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration) -- 2.25.1

1 0

[PATCH v2 1/2] dmime: Store flags when parsing track data
by Michael Stefaniuc 26 Mar '20

26 Mar '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Drop check for item != NULL. That's always true when InsertTrack() succeedes. dlls/dmime/dmime_private.h | 1 + dlls/dmime/segment.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 576ebc1ae8..9759039a03 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -77,6 +77,7 @@ extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSo typedef struct _DMUS_PRIVATE_SEGMENT_TRACK { struct list entry; /* for listing elements */ DWORD dwGroupBits; + DWORD flags; IDirectMusicTrack* pTrack; } DMUS_PRIVATE_SEGMENT_TRACK, *LPDMUS_PRIVATE_SEGMENT_TRACK; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 0455b6c5dd..f5dbf4b995 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -614,8 +614,9 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, IPersistStream *ps = NULL; IStream *clone; DMUS_IO_TRACK_HEADER thdr; - DMUS_IO_TRACK_EXTRAS_HEADER txhdr; + DMUS_IO_TRACK_EXTRAS_HEADER txhdr = {0}; HRESULT hr; + DMUS_PRIVATE_SEGMENT_TRACK *item; TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); @@ -647,7 +648,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { - FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); + FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); } } @@ -672,6 +673,11 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, goto done; hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); + if (FAILED(hr)) + goto done; + + item = LIST_ENTRY(list_tail(&This->Tracks), DMUS_PRIVATE_SEGMENT_TRACK, entry); + item->flags = txhdr.dwFlags; done: if (ps) -- 2.25.1

1 0